summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris White <chriswhite@gentoo.org>2004-07-31 06:35:45 +0000
committerChris White <chriswhite@gentoo.org>2004-07-31 06:35:45 +0000
commitc4c644fbca971249a40a63b5ffdff2f0abd20328 (patch)
tree1a17c0d1fd0efa8bda20c35520b93a15bdda727b /media-video/mplayer
parentTook pre5-r2 down to unstable. See Bug #55456 for more information. (diff)
downloadhistorical-c4c644fbca971249a40a63b5ffdff2f0abd20328.tar.gz
historical-c4c644fbca971249a40a63b5ffdff2f0abd20328.tar.bz2
historical-c4c644fbca971249a40a63b5ffdff2f0abd20328.zip
Fixed some use logic with live and network.
Diffstat (limited to 'media-video/mplayer')
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/Manifest6
-rw-r--r--media-video/mplayer/mplayer-1.0_pre4-r7.ebuild4
-rw-r--r--media-video/mplayer/mplayer-1.0_pre5-r2.ebuild4
4 files changed, 12 insertions, 8 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 314eccfcd7a0..d866c9fdecc1 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.189 2004/07/31 06:17:52 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.190 2004/07/31 06:35:45 chriswhite Exp $
+
+ 31 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+ mplayer-1.0_pre5-r2.ebuild:
+ Fixed some use logic with live and network.
31 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r2.ebuild:
Took pre5-r2 down to unstable. See Bug #55456 for more information.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index b60ba88df72c..03d7bff10fdd 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,4 @@
-MD5 e2f563e4639ae1efa4ee29ecd09000d7 ChangeLog 34797
+MD5 7fc16b624da99913946bba6c63dd09eb ChangeLog 34953
MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
MD5 b813a65769af5d2a2ca1ceba1347974d mplayer-0.92-r1.ebuild 11511
MD5 7eeb1235c1263ecb110925e53de1eb06 mplayer-1.0_pre2-r1.ebuild 11375
@@ -9,9 +9,9 @@ MD5 1c2c6d32766ce3bf0974895533252491 mplayer-1.0_pre4-r1.ebuild 11659
MD5 fbdd96b2a3f0f78bdc8cbded3bb3927b mplayer-1.0_pre4-r2.ebuild 11948
MD5 6b9e16c4f08ac48748812909ed431f31 mplayer-1.0_pre4-r3.ebuild 13034
MD5 d13f33f9022f7abccfe9b14f96531057 mplayer-1.0_pre4-r4.ebuild 13157
-MD5 78759f7ac9a56be57281d50713718a4d mplayer-1.0_pre4-r7.ebuild 12626
+MD5 fed6df32005b8668d76e67cbc821575d mplayer-1.0_pre4-r7.ebuild 12647
MD5 071a354aa3c0e9290b6dcfc8c3621d87 mplayer-1.0_pre4.ebuild 11319
-MD5 db8e3451bebcf89d99a80cc95627932d mplayer-1.0_pre5-r2.ebuild 14275
+MD5 ed1e890fbc67122f4657951df127263c mplayer-1.0_pre5-r2.ebuild 14291
MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
index 2294eea05103..a43a8efa7485 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.9 2004/07/30 21:39:04 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.10 2004/07/31 06:35:45 chriswhite Exp $
inherit eutils flag-o-matic kmod
@@ -187,7 +187,7 @@ src_compile() {
myconf="${myconf} $(use_enable png)"
fi
- if use ia64; then
+ if use ia64 || use !network; then
myconf="${myconf} --disable-live"
else
myconf="${myconf} $(use_enable live)"
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild
index 26602833d7e2..0629385a5fc2 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild,v 1.13 2004/07/31 06:17:52 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild,v 1.14 2004/07/31 06:35:45 chriswhite Exp $
inherit eutils flag-o-matic kmod
@@ -206,7 +206,7 @@ src_compile() {
myconf="${myconf} $(use_enable ipv6 inet6)"
myconf="${myconf} $(use_enable joystick)"
myconf="${myconf} $(use_enable lirc)"
- if use ia64; then
+ if use ia64 || use !network; then
myconf="${myconf} --disable-live"
else
myconf="${myconf} $(use_enable live)"