Removed pam USE flag again

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

5 files changed, 31 insertions, 36 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 8524138bb500..536708d6bcd4 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.78 2011/07/24 00:26:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.79 2011/07/25 08:25:48 polynomial-c Exp $
+
+  25 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.0.10.ebuild,
+  virtualbox-4.0.12.ebuild, virtualbox-4.1.0.ebuild:
+  Removed pam USE flag again.
 
   24 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.0.10.ebuild,
   virtualbox-4.0.12.ebuild, virtualbox-4.1.0.ebuild:
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 795a161a7db2..63e73baaf38a 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -25,26 +25,26 @@ DIST VirtualBox-4.0.10.tar.bz2 69567366 RMD160 125aaea11ece10b5270f96795efcbc519
 DIST VirtualBox-4.0.12.tar.bz2 69566771 RMD160 f25d361c19d25a883918b0e8f2ae9bc1c2dd83e8 SHA1 9e49c6a5a7b7b224a970655643cce52aac43eb0c SHA256 0175c4118af1f9633f33a055a0b0cc0b5a2d95a63b44269af2139eb2fd07e5a9
 DIST VirtualBox-4.1.0.tar.bz2 72503565 RMD160 1a5b1d21f66bb5aa6d76b924c4af66dfd419b7cc SHA1 0a477a9425ad5531b409a70d9d0a19599462cc42 SHA256 f7bb9e0a4fe9bb406e24fa5733432534b1c8d70d6c87280875233f69bb3120de
 EBUILD virtualbox-3.2.12-r4.ebuild 9658 RMD160 49e35b5aea7ba596b7bda564a5226fd33a8d9db4 SHA1 9d4ab5a271b018d9fd99741afe0949444142fe63 SHA256 cb820c7f10f8be365acab120ee3ca464f212ae691a9cfb793e996c1ca280420f
-EBUILD virtualbox-4.0.10.ebuild 12128 RMD160 42f77c1eb427c968a4f5b37c90e2db895a0a918f SHA1 66705a42c2c768800b12f46515e6470c95bc0381 SHA256 ca24a77c2f2b24b066f6e7b69c05e8d2cc4ae88b9b00ed737fb501449df70f18
-EBUILD virtualbox-4.0.12.ebuild 12032 RMD160 e0908529223e155455b44ff5c5a4b158e11df459 SHA1 9140bb9bcd6d9b6c00e0f5a93c1a857c20134694 SHA256 f59461faf67773caa7996dc8f06811b0de7faef97f9e0ba3a6a5bb3b62f6781e
-EBUILD virtualbox-4.1.0.ebuild 12081 RMD160 f902eef22ac73419d17e7b778e2fa73274a01124 SHA1 83f279a340300a783b86df401114986aaf380453 SHA256 6877cacd959c716b7edf79360be60d28fb3368922167e83dcf59bd593ece022a
+EBUILD virtualbox-4.0.10.ebuild 12010 RMD160 77d6b4afbcad7425d517e8f2437d436ca0f06a07 SHA1 4d0a92bebb5ebe35b56cf5be566f09c896dc2c70 SHA256 a0a1307a6c141a69f444b6f16aca1f99b8ca142c4628726e1f73b55f08d0c895
+EBUILD virtualbox-4.0.12.ebuild 11914 RMD160 82092f83b833380dfff8000d6057639c48bf56a8 SHA1 abfe0879ddb5632af83473315644bbdf6cf5dd99 SHA256 38e527ff84adc9c678b3464e07f3df3417ccad3309f42ff2f7f2ff357859c361
+EBUILD virtualbox-4.1.0.ebuild 11963 RMD160 11ef387f5c02493cc36123559fa9eb0c85627267 SHA1 aff46902ccdec4b138708bf5625e5d10849e0082 SHA256 0e14ba57f1c88743b74720cd0523a6363ed419dc8048a4bc0ca29c89995473aa
 EBUILD virtualbox-9999.ebuild 5623 RMD160 3e3eeabc7dfcddc0583974335494f51b23c8327b SHA1 fcc07a44770a14802e337c9ff2a87f19b2d149f3 SHA256 301e900d619a1fd9c9e38793671fb0ab843c2d973bda2612e64e34c1fdbf3c8d
-MISC ChangeLog 7199 RMD160 b7e8eceb39f08479f3ad428297f09cad32536f8d SHA1 6dacb1c4e6ba1a23956a77a8a8663b51ca6aacdd SHA256 2639b42d42075849abfb9badc9f5ce80f2cec65ae1bdde45e7bcf6a371872ecb
+MISC ChangeLog 7363 RMD160 71b9138877e171a16accd314fd20abd2ac1f237b SHA1 6af6ba05fc520ee85f37e83a9e7b3a763120eaf6 SHA256 fa9239be98f7bbf9c664204cbab160df556ad4ca732f8acd5c975396ae0c342e
 MISC metadata.xml 787 RMD160 ba43b02e20c2649a3bfb0dbf1b7d8ce30d5c0beb SHA1 6efd8b7802c97c203b8be8154bb2913cd3e24266 SHA256 9250eb6045eadd27afda974481dbea721de9f5d5157dddc3f0786ba2fcc98d21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOK2bKAAoJEPiazRVxLXTFptkP/iFO3//I0W+KoOwQtIvI3EOW
-p4fTMllxPTXxbUm1D+/izUBuOVD+J0IlsnILPNZJTEufsWX96JbyeZ/80lGknFmt
-Te/6W6fEJvx2DS/NboX8/1Cza7j9c/7eJ4TAWfjJXyRvdsWD+/HkPsaQZUyb3DbH
-PJC2cGQ/B7fKuQsfgUq1BfFCg7wgwU4Z1g8XzDPLy6X9OcO63Utc3MOTrzWdUwak
-trDPgE5/jt/dQNq0J48Z/OePAyrbGu5pMylj0j72Nx1WCstvvHFnLzb4g6Bup6xg
-+lCNwDdxhgAnlW3xuidwSBzO3AtFn9vOlz1+2llWWy90dKnbmY0k3YEnkFan7/+K
-W9hvdM9apTz6KnjjfOm9TdXW0pYQ8RnTupULsAFwgBApUA9b/Rp6ONMMrW9uLyiK
-++7SbR0a4ELilvzgB2gANDjc4KHnV4mmhQFZYVzlD1W3nZ7P0vfmPI1LjkYhHE+D
-kN2JmlxrjkYCQZJSV3Wv/Gcwb7M4GJuN6+yvPpeEZaC0gEq99Xjnb07A/tJqe5oT
-H7nK4xaAERCbv85zhHiuEz6fgqCQ0zET673g1ZHO6j73lMwLaF6a4Hfxslst4bt1
-SiChvFRGOpA1mWf9PwEAOSQdD03ZDoXCFecjMAEMjlrMN/09JHBOL+HotFcnAEpb
-fpHqs7khJDLUhoUNSZvA
-=VcyN
+iQIcBAEBCgAGBQJOLSiUAAoJEPiazRVxLXTF3IIQANytpXo1z7B9bgRsYwE15yHO
+Sm598vPGu4acgfN9+EJlBNQj4+IsnqKelxX4aLErvFaVFDA0mTuy/4gQF95Q6PVl
+S6/pav94YCySxPoI7pX4okwgyy+xvpkkPNQumQetmuE36Do6j/8JnU7DdlA+LSNc
+9GPpwCvXxZd9vLA7hQPgISRqNrl2IDfQfVm3mLlRXGVJZROBVbbMZMEqabhqTSbz
+c7tXgGBLX8cieKAhIvoZIm0JkJk/UeMD9bSugFu+FDwYx27P7qiPCVR9L+/qv5/x
+SpsjKzd0NLq0x9qLweKl2dXJH1Dnioyh0ttDqnnSHe9m3kuEg4BncC9yCJ67I7gR
++BGrj91NdI/h8ZgekY+yeXb2A1v+wdfFrVIqFttWUlq6F+05Dy1lniY0scMYg7aJ
+7kDZsEr4vlgX5CjXUaEObwd1CNW8wJgdJESiC9eWN+rpHoufh+yXS//kzIwUVN/v
+10Fv1DmfdH2Awt1n3vmMd7HDmhucwiIP5cMGVW+vOHK9m8Hjo6MAeMpYeBYLmG/d
+pgoWDoyx7gml8Fq1WkETliSTjW8UlF4JdxsrETZU4zwrH4UHUZf9gETFkS87wt0R
+pNeOUa+lLEOLZ+TesAWEz+PxrnUv++/Fal9IazKpfbYJJlaumAl0HcQAw0WNZsG7
+E7at2cfokGf8kiZ9sc2S
+=4A6Z
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/virtualbox-4.0.10.ebuild b/app-emulation/virtualbox/virtualbox-4.0.10.ebuild
index 19375dc33190..1a15af17ca66 100644
--- a/app-emulation/virtualbox/virtualbox-4.0.10.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.0.10.ebuild,v 1.2 2011/07/24 00:26:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.0.10.ebuild,v 1.3 2011/07/25 08:25:48 polynomial-c Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.virtualbox.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+IUSE="+additions alsa doc extensions headless java pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -56,7 +56,7 @@ DEPEND="${RDEPEND}
 	sys-devel/dev86
 	sys-power/iasl
 	media-libs/libpng
-	pam? ( sys-libs/pam )
+	sys-libs/pam
 	sys-libs/libcap
 	doc? (
 		dev-texlive/texlive-basic
@@ -160,9 +160,6 @@ src_prepare() {
 	# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
 	epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
 
-	# Make pam optional (bug #351404)
-	use pam || { sed '/VBOX_WITH_PAM =/s@1@0@' -i Config.kmk || die ; }
-
 	# add correct java path
 	if use java ; then
 		sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
diff --git a/app-emulation/virtualbox/virtualbox-4.0.12.ebuild b/app-emulation/virtualbox/virtualbox-4.0.12.ebuild
index 489cb33c7638..9d0ae18b023e 100644
--- a/app-emulation/virtualbox/virtualbox-4.0.12.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.0.12.ebuild,v 1.3 2011/07/24 00:26:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.0.12.ebuild,v 1.4 2011/07/25 08:25:48 polynomial-c Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.virtualbox.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+IUSE="+additions alsa doc extensions headless java pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -56,7 +56,7 @@ DEPEND="${RDEPEND}
 	sys-devel/dev86
 	sys-power/iasl
 	media-libs/libpng
-	pam? ( sys-libs/pam )
+	sys-libs/pam
 	sys-libs/libcap
 	doc? (
 		dev-texlive/texlive-basic
@@ -160,9 +160,6 @@ src_prepare() {
 	# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
 	epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
 
-	# Make pam optional (bug #351404)
-	use pam || { sed '/VBOX_WITH_PAM =/s@1@0@' -i Config.kmk || die ; }
-
 	# add correct java path
 	if use java ; then
 		sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
diff --git a/app-emulation/virtualbox/virtualbox-4.1.0.ebuild b/app-emulation/virtualbox/virtualbox-4.1.0.ebuild
index b2e9ddd9e65f..71860e990f30 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.0.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.0.ebuild,v 1.2 2011/07/24 00:26:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.0.ebuild,v 1.3 2011/07/25 08:25:48 polynomial-c Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.virtualbox.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+IUSE="+additions alsa doc extensions headless java pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -56,7 +56,7 @@ DEPEND="${RDEPEND}
 	sys-devel/dev86
 	sys-power/iasl
 	media-libs/libpng
-	pam? ( sys-libs/pam )
+	sys-libs/pam
 	sys-libs/libcap
 	doc? (
 		dev-texlive/texlive-basic
@@ -162,9 +162,6 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${P}-vboxpci-build.patch
 
-	# Make pam optional (bug #351404)
-	use pam || { sed '/VBOX_WITH_PAM =/s@1@0@' -i Config.kmk || die ; }
-
 	# add correct java path
 	if use java ; then
 		sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \