Stable on amd64 (bug #371935)

(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)

4 files changed, 25 insertions, 11 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 1180e4048e99..8524138bb500 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,11 @@
 # 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.77 2011/07/22 10:30:56 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.78 2011/07/24 00:26:44 polynomial-c Exp $
+
+  24 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.0.10.ebuild,
+  virtualbox-4.0.12.ebuild, virtualbox-4.1.0.ebuild:
+  Made pam support optional (bug #351404). Marked 4.0.12 version as stable on
+  amd64 (was forgotten by the arch team) for bug #371935.
 
   22 Jul 2011; Thomas Kahle <tomka@gentoo.org> virtualbox-4.0.12.ebuild:
   x86 stable per bug 371935
diff --git a/app-emulation/virtualbox/virtualbox-4.0.10.ebuild b/app-emulation/virtualbox/virtualbox-4.0.10.ebuild
index ab4e25da265f..19375dc33190 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.1 2011/06/28 20:46:39 polynomial-c Exp $
+# $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 $
 
 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 pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+IUSE="+additions alsa doc extensions headless java pam 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
-	sys-libs/pam
+	pam? ( sys-libs/pam )
 	sys-libs/libcap
 	doc? (
 		dev-texlive/texlive-basic
@@ -160,6 +160,9 @@ 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 6a43629d0e61..489cb33c7638 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.2 2011/07/22 10:30:56 tomka Exp $
+# $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 $
 
 EAPI=4
 
@@ -21,8 +21,8 @@ HOMEPAGE="http://www.virtualbox.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="+additions alsa doc extensions headless java pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+KEYWORDS="amd64 x86"
+IUSE="+additions alsa doc extensions headless java pam 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
-	sys-libs/pam
+	pam? ( sys-libs/pam )
 	sys-libs/libcap
 	doc? (
 		dev-texlive/texlive-basic
@@ -160,6 +160,9 @@ 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 91166d4dc1c0..b2e9ddd9e65f 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.1 2011/07/19 22:27:10 polynomial-c Exp $
+# $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 $
 
 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 pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+IUSE="+additions alsa doc extensions headless java pam 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
-	sys-libs/pam
+	pam? ( sys-libs/pam )
 	sys-libs/libcap
 	doc? (
 		dev-texlive/texlive-basic
@@ -162,6 +162,9 @@ 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):" \