Move eselect-opengl into DEPEND only, so it can be uninstalled later.

Package-Manager: portage-2.1.3_rc9

4 files changed, 23 insertions, 31 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 580d1f5d71f9..5a128ce51f4f 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-xlibs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.61 2007/07/02 13:58:24 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.62 2007/07/30 07:42:25 dberkholz Exp $
+
+  30 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  emul-linux-x86-xlibs-7.0-r8.ebuild, emul-linux-x86-xlibs-10.0.ebuild:
+  Move eselect-opengl into DEPEND only, so it can be uninstalled later.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   emul-linux-x86-xlibs-7.0-r8.ebuild:
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 16397fff83f4..67914e140419 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST emul-linux-x86-xlibs-7.0-r5.tar.bz2 3235393 RMD160 e778ad9600bc573b650f87da440722ad680b9836 SHA1 2292dc98f4bea53dc794e5527b47b7a578cd2416 SHA256 36485a9841b35f1b2cb6543269e752d0bf74f90404cb69835370f7562c04f2c4
 DIST emul-linux-x86-xlibs-7.0-r7-emul.patch.bz2 12116 RMD160 cade978ec90b3f6ea28dfebaa14191aab09f0b7d SHA1 3fa7defb2c22714b43a7ee7d38fe1d5eb5a8af64 SHA256 5c1eeb1e01db414d5a562d154a3a4c89530d573f451a766eb25f46e289fb42cd
 DIST emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164 RMD160 4bd8ac76725230b4c05ab06bcf194de93e4ab4ca SHA1 3b939e76680efcfda313a0fc7234a944d9951ce4 SHA256 febb86cc07eaee8d449f9e4d994ae29c7f3c4e9067d8f93fd14b4e4c5b5a063d
@@ -44,18 +41,18 @@ DIST libXxf86vm-1.0.1.tbz2 54660 RMD160 65a6ec8c7c63b6e1d4b597069a246dc96efae375
 DIST libdrm-2.0.2.tbz2 105387 RMD160 217ebeabb59b940da2bbc0cbcd253cf7247988bb SHA1 677df18ae06e5b91a72eddec1c3d4d8a245dc469 SHA256 ad5bcce9a169dd378e1588134fdf0d8b3cdf1cd7e93bdce0973894a15a7fbed5
 DIST mesa-6.5.1-r1.tbz2 10752990 RMD160 b7603c2eefd089a5e708f29cc9881202637c1de4 SHA1 8cbfea668e9bc327233be56745384b4bfbbd3efe SHA256 d2546fd11aa74c61309a03b9958733a76845cdf552ca943bb590ce5580974468
 DIST openmotif-2.2.3-r9.tbz2 3918059 RMD160 a9f025efc703a2a90d62c77745ac186a8c765aed SHA1 d71f510cf1459907b81b6dc82d225a498a376c62 SHA256 3897019a7c10a0bf28d04cbb08e38e31586f25301f6329d508c5876dec141fac
-EBUILD emul-linux-x86-xlibs-10.0.ebuild 1994 RMD160 0c1e2976b51375fd4665672c6b4cf371aea801f7 SHA1 d9b0da466aa31ce66857080328fa782076ffcd15 SHA256 2274fe2582966db8a3f0c14481ecfff37540e188e8134ff4fd6e1424fd0c66fe
-MD5 fdf06cb6e0493136a4cae1c9d745b585 emul-linux-x86-xlibs-10.0.ebuild 1994
-RMD160 0c1e2976b51375fd4665672c6b4cf371aea801f7 emul-linux-x86-xlibs-10.0.ebuild 1994
-SHA256 2274fe2582966db8a3f0c14481ecfff37540e188e8134ff4fd6e1424fd0c66fe emul-linux-x86-xlibs-10.0.ebuild 1994
-EBUILD emul-linux-x86-xlibs-7.0-r8.ebuild 2587 RMD160 48721089327595ada888014d95f86e9e00632396 SHA1 c014e26d64500d77216c3452fb3359ae676619d0 SHA256 c746014e727fe14caad4de9d81da844bbb930a9c25bdce019e53cbc648d7dd20
-MD5 840cb947311f9f7e4fb5b39c91eea9b9 emul-linux-x86-xlibs-7.0-r8.ebuild 2587
-RMD160 48721089327595ada888014d95f86e9e00632396 emul-linux-x86-xlibs-7.0-r8.ebuild 2587
-SHA256 c746014e727fe14caad4de9d81da844bbb930a9c25bdce019e53cbc648d7dd20 emul-linux-x86-xlibs-7.0-r8.ebuild 2587
-MISC ChangeLog 11268 RMD160 4cb81d74e860c4d92b6d1f08ed42e0cda441d3ec SHA1 4843a45fb3a7dfd530c280f65112346105042826 SHA256 6ae37374eb02d93685332d7df4cbbf255f1d861280d5122aa3040d6548310e01
-MD5 19ac7186c2b19e8b50eed3b01d8bc138 ChangeLog 11268
-RMD160 4cb81d74e860c4d92b6d1f08ed42e0cda441d3ec ChangeLog 11268
-SHA256 6ae37374eb02d93685332d7df4cbbf255f1d861280d5122aa3040d6548310e01 ChangeLog 11268
+EBUILD emul-linux-x86-xlibs-10.0.ebuild 1996 RMD160 4b0886aa21b0883c0301cde0f98c8bf66d70e50b SHA1 4f9910108dfb6d5eb934fdcf9f3a83c7f6493993 SHA256 8e77de6b29ef5bc84be8b186cf583a72c3a236a4a5a52bed81e19b37205c8ff9
+MD5 9435d839a14aef4624850115530f8610 emul-linux-x86-xlibs-10.0.ebuild 1996
+RMD160 4b0886aa21b0883c0301cde0f98c8bf66d70e50b emul-linux-x86-xlibs-10.0.ebuild 1996
+SHA256 8e77de6b29ef5bc84be8b186cf583a72c3a236a4a5a52bed81e19b37205c8ff9 emul-linux-x86-xlibs-10.0.ebuild 1996
+EBUILD emul-linux-x86-xlibs-7.0-r8.ebuild 2589 RMD160 25be0fb9356d5e1c3403a43dd64796538333d333 SHA1 647945948fa3377ba59f1e5e886ec949ae53d1eb SHA256 63d377b79c4113450534098d5308a7ce757be5683af12bdd1f0e6f611280c44c
+MD5 721c37a4ccc53e9d64ebbbbefd32bada emul-linux-x86-xlibs-7.0-r8.ebuild 2589
+RMD160 25be0fb9356d5e1c3403a43dd64796538333d333 emul-linux-x86-xlibs-7.0-r8.ebuild 2589
+SHA256 63d377b79c4113450534098d5308a7ce757be5683af12bdd1f0e6f611280c44c emul-linux-x86-xlibs-7.0-r8.ebuild 2589
+MISC ChangeLog 11472 RMD160 090c69c80be60ca5f98b0236c5b4a5e3ab38a106 SHA1 4afe3dadcb607ac3b85c50843fdf4b218752198c SHA256 081fff73cc2599926a317790e54565422d22e8afc4444fbbe25da95a391f39bc
+MD5 c296d8fbe71e32bdf28586a81ab5652d ChangeLog 11472
+RMD160 090c69c80be60ca5f98b0236c5b4a5e3ab38a106 ChangeLog 11472
+SHA256 081fff73cc2599926a317790e54565422d22e8afc4444fbbe25da95a391f39bc ChangeLog 11472
 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30
 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
@@ -66,10 +63,3 @@ SHA256 e60d898a4e9e31c1167e9e3fb25a34ab309d17e58ca31d3ea0ae8b43e5739f57 files/di
 MD5 a55c4f343d9618bc1a4a150a5e8cb5b7 files/digest-emul-linux-x86-xlibs-7.0-r8 3347
 RMD160 b2aa26190ce707dd4b76781411a330eb969fad6d files/digest-emul-linux-x86-xlibs-7.0-r8 3347
 SHA256 d55a7ea48c2d304b9c92b8e50d8232e023aa53f2ba7b6a2cbbf33d4aa399d72a files/digest-emul-linux-x86-xlibs-7.0-r8 3347
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGiQSFppoStNGKGywRAnKKAKDA0jQL9aHpQf/vRs2vLipodw/NtACgnR5e
-7088tppGbmhkDzq8l1NbSGA=
-=EKSJ
------END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-10.0.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-10.0.ebuild
index 7db2cc9e2cd3..050399a5a6d1 100644
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-10.0.ebuild
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-10.0.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/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-10.0.ebuild,v 1.4 2007/03/02 15:02:25 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-10.0.ebuild,v 1.5 2007/07/30 07:42:25 dberkholz Exp $
 
 inherit emul-libs
 
@@ -44,10 +44,9 @@ LICENSE="fontconfig FTL GPL-2 LGPL-2 glut libdrm libICE libSM libX11 libXau
 KEYWORDS="-* amd64"
 IUSE="opengl"
 
-DEPEND=""
+DEPEND="opengl? ( app-admin/eselect-opengl )"
 RDEPEND=">=app-emulation/emul-linux-x86-baselibs-10.0
-	x11-libs/libX11
-	opengl? ( app-admin/eselect-opengl )"
+	x11-libs/libX11"
 
 pkg_postinst() {
 	#update GL symlinks
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r8.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r8.ebuild
index 61812031bb6a..0b3529d8f78b 100644
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r8.ebuild
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r8.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/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r8.ebuild,v 1.4 2007/07/02 13:58:24 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r8.ebuild,v 1.5 2007/07/30 07:42:25 dberkholz Exp $
 
 inherit eutils
 
@@ -43,9 +43,8 @@ RESTRICT="strip"
 QA_TEXTRELS_amd64="emul/linux/x86/usr/lib/opengl/xorg-x11/lib/libGL.so.1.2"
 QA_EXECSTACK_amd64="emul/linux/x86/usr/lib/opengl/xorg-x11/lib/libGL.so.1.2"
 
-DEPEND=""
-RDEPEND="opengl? ( app-admin/eselect-opengl )
-	virtual/libc
+DEPEND="opengl? ( app-admin/eselect-opengl )"
+RDEPEND="virtual/libc
 	>=app-emulation/emul-linux-x86-baselibs-2.5.5-r2"
 
 S=${WORKDIR}