Fix x11 RDEPEND/DEPEND

Package-Manager: portage-2.1.3.16

4 files changed, 28 insertions, 22 deletions

diff --git a/media-libs/libmpeg2/ChangeLog b/media-libs/libmpeg2/ChangeLog
index fbb670441530..a63af13664fb 100644
--- a/media-libs/libmpeg2/ChangeLog
+++ b/media-libs/libmpeg2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmpeg2
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.60 2007/08/13 21:04:21 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.61 2007/10/26 00:49:21 beandog Exp $
+
+  26 Oct 2007; Steve Dibb <beandog@gentoo.org> libmpeg2-0.4.0b.ebuild,
+  libmpeg2-0.4.1.ebuild:
+  Fix x11 RDEPEND/DEPEND
 
   13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   libmpeg2-0.4.1.ebuild:
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index 3fd867e35d02..9b3258a851e9 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -16,18 +16,18 @@ RMD160 55939dd2417015c1bf8052fe506495d55514337b files/libmpeg2-0.4.1-use-readelf
 SHA256 56d43bb88a4179dbc3859c77ca445b89bbdd1223ee8d78bcc7d7148dee7ae534 files/libmpeg2-0.4.1-use-readelf-for-test.patch 869
 DIST mpeg2dec-0.4.0b.tar.gz 473846 RMD160 44df6c21e88d2c3029ef418ea46e2d6796c90004 SHA1 7ad99a810802f216893022fa14fa078ac49d67d7 SHA256 9416376952812e5b479745d67a2bf874fbcad10137517314ce7de37abb756df8
 DIST mpeg2dec-0.4.1.tar.gz 494539 RMD160 5377ae45abdd37fabcea6d3d0a9d74e493b84483 SHA1 80be8b16dff4caa4253470d1a3b563fdc0177fcb SHA256 c74a76068f8ec36d4bb59a03bf1157be44118ca02252180e8b358b0b5e3edeee
-EBUILD libmpeg2-0.4.0b.ebuild 1822 RMD160 13bcf54f465ee142df8d64f0fcb29d5a6235b06a SHA1 b054088aaa47affd951f67dab16d05baceb17890 SHA256 3d30adbb7dda6b64066de7ed4cc81efe702051a21972547c63397dbe747a2290
-MD5 986fd5f8e99efd1cf3cb64f6cce51fdf libmpeg2-0.4.0b.ebuild 1822
-RMD160 13bcf54f465ee142df8d64f0fcb29d5a6235b06a libmpeg2-0.4.0b.ebuild 1822
-SHA256 3d30adbb7dda6b64066de7ed4cc81efe702051a21972547c63397dbe747a2290 libmpeg2-0.4.0b.ebuild 1822
-EBUILD libmpeg2-0.4.1.ebuild 1312 RMD160 4703c828b2de31996d6988baae09883c4d955154 SHA1 17071656ad1be4b385f153d792f29f4cad233b22 SHA256 02170108f7ee8f58c27aca484566fd13611c4dfa3dacb04e81cc620f18dfc936
-MD5 49d87eb4f0bd3f2e673e185234d627bb libmpeg2-0.4.1.ebuild 1312
-RMD160 4703c828b2de31996d6988baae09883c4d955154 libmpeg2-0.4.1.ebuild 1312
-SHA256 02170108f7ee8f58c27aca484566fd13611c4dfa3dacb04e81cc620f18dfc936 libmpeg2-0.4.1.ebuild 1312
-MISC ChangeLog 7474 RMD160 7a129af7632c6415a84a5047e1875c65024551a4 SHA1 e0544b3642fd9f8f8643e205da23821631fd5238 SHA256 ca8b1a4a0262b2c76a000d3de9b4b7476b2e394b5a2644d59559397f000ed500
-MD5 fad88e24d9758d47f34843f4ac2cffa6 ChangeLog 7474
-RMD160 7a129af7632c6415a84a5047e1875c65024551a4 ChangeLog 7474
-SHA256 ca8b1a4a0262b2c76a000d3de9b4b7476b2e394b5a2644d59559397f000ed500 ChangeLog 7474
+EBUILD libmpeg2-0.4.0b.ebuild 1850 RMD160 d6372f467d3197de4f94ec3b4812379be2a61751 SHA1 a8d3ac003abd5a66cbe780acd6054cebf47070b8 SHA256 ad8a11f4e536ad1c0b71221a2135365fe99bec3d1b17346cfc74b8dff76f0cd4
+MD5 bdd0022c7cafc191670dd00ae3327de8 libmpeg2-0.4.0b.ebuild 1850
+RMD160 d6372f467d3197de4f94ec3b4812379be2a61751 libmpeg2-0.4.0b.ebuild 1850
+SHA256 ad8a11f4e536ad1c0b71221a2135365fe99bec3d1b17346cfc74b8dff76f0cd4 libmpeg2-0.4.0b.ebuild 1850
+EBUILD libmpeg2-0.4.1.ebuild 1338 RMD160 b486051b9683d1e9b9bd3d17abec9016a2138cc5 SHA1 29656bdc81f5e16a9cfa55459eecebf6e795fce4 SHA256 7779ffee6c3c11bf82e2e7109a28ccb07f19784aa4113469b0f154104a408118
+MD5 9f28eb8af58412ae943cee48c6b9f256 libmpeg2-0.4.1.ebuild 1338
+RMD160 b486051b9683d1e9b9bd3d17abec9016a2138cc5 libmpeg2-0.4.1.ebuild 1338
+SHA256 7779ffee6c3c11bf82e2e7109a28ccb07f19784aa4113469b0f154104a408118 libmpeg2-0.4.1.ebuild 1338
+MISC ChangeLog 7593 RMD160 a83a18f5eddcc65e83044a1a718f64cf61227441 SHA1 62939450157f90d30ee95d03a6f5033bb4d2d320 SHA256 a2b17ea332c2a2e53986044699545f59b3fbf6538c24bebcee656644acdaf26d
+MD5 4c82e9d289cea4c8debf9fbb0a5cce37 ChangeLog 7593
+RMD160 a83a18f5eddcc65e83044a1a718f64cf61227441 ChangeLog 7593
+SHA256 a2b17ea332c2a2e53986044699545f59b3fbf6538c24bebcee656644acdaf26d ChangeLog 7593
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
diff --git a/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild b/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
index 7692f21e7999..0d0ae5bd5900 100644
--- a/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild,v 1.35 2006/11/26 13:37:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild,v 1.36 2007/10/26 00:49:21 beandog Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -16,16 +16,17 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="sdl X"
 
-DEPEND="sdl? ( media-libs/libsdl )
+RDEPEND="sdl? ( media-libs/libsdl )
 	X? (
 		x11-libs/libXv
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libXt
-		x11-proto/xextproto
 	)"
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xextproto )"
 
-S=${WORKDIR}/${MY_P/b/}
+S="${WORKDIR}"/${MY_P/b/}
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-libs/libmpeg2/libmpeg2-0.4.1.ebuild b/media-libs/libmpeg2/libmpeg2-0.4.1.ebuild
index 3ff7295908d1..4b554bfcd58a 100644
--- a/media-libs/libmpeg2/libmpeg2-0.4.1.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.1.ebuild,v 1.11 2007/08/13 21:04:21 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.1.ebuild,v 1.12 2007/10/26 00:49:21 beandog Exp $
 
 inherit eutils libtool
 
@@ -14,16 +14,17 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="sdl X"
 
-DEPEND="sdl? ( media-libs/libsdl )
+RDEPEND="sdl? ( media-libs/libsdl )
 	X? (
 		x11-libs/libXv
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libXt
-		x11-proto/xextproto
 	)"
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xextproto )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}