Fixed bug #350237, #366305, #376531 and #382061

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

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index d5e6f45653d71d26c2753ac6a1ec6e15edac3565..b2c19adfc1e27e583f1bfd92df0f9d3243332e33 100644 (file)
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,13 @@
 # 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.87 2011/10/23 13:14:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.88 2011/10/24 21:57:11 polynomial-c Exp $
+
+  24 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.0.12.ebuild,
+  virtualbox-4.1.2.ebuild, virtualbox-4.1.4.ebuild:
+  Forced python-2 on installation (bug #350237). Made the package's decription
+  the same as virtualbox-bin (bug #366305). Made pam support optional with
+  changes provided by René 'Necoro' Neumann (bug #376531). Added
+  vboxwebsrv<->java dependency to REQUIRED_USE (bug #382061).
 
   23 Oct 2011; Patrick Lauer <patrick@gentoo.org> virtualbox-9999.ebuild:
   Fixing deps of the 9999 ebuild so that it might maybe build

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index ef611e7ab4ac92dee419466c25d2bac25674dec9..d15c8edbb9ce8958628748041d7191cdded05080 100644 (file)
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 10-virtualbox.rules 576 RMD160 3dddd2ffa03bc214fea9d2e8b3363399ffd898e5 SHA1 6840d9e79790d01621ba79e00228071eda98355d SHA256 9fe8aaa16b42e6730a2ebd6cf0fbc9ad0db0f45e06e554cc4ae06b4dfc0045e1
 AUX vboxwebsrv-confd 623 RMD160 ad4a86aa317d466e556d613e57a7fa6a195db986 SHA1 f6f0f568a10093f082b3f8e09c9dfa515a560adc SHA256 8a6773013072e3049fa3ede7b5117e59dde9b35bc3402fc31e9985361b5f9147
 AUX vboxwebsrv-initd 749 RMD160 3cfe8484be4fe67d7be25044a4ab79c44ad42492 SHA1 5dddd297edd74a2e12a731e19f663128d6289b4b SHA256 279addc442d19f982c6b209c8900fe9bd65d73e2dcf98b96cd08b168eb8bf54d
@@ -17,9 +20,26 @@ AUX virtualbox-ose.desktop-2 201 RMD160 9cf3ef83d1fda93142d192b0bb4eae9d6dc62118
 DIST VirtualBox-4.0.12.tar.bz2 69566771 RMD160 f25d361c19d25a883918b0e8f2ae9bc1c2dd83e8 SHA1 9e49c6a5a7b7b224a970655643cce52aac43eb0c SHA256 0175c4118af1f9633f33a055a0b0cc0b5a2d95a63b44269af2139eb2fd07e5a9
 DIST VirtualBox-4.1.2.tar.bz2 72730966 RMD160 0004a00c968ee835083416022240e212903f394d SHA1 52e35e0400fb12a5277a6e126478bb8f53c3e46d SHA256 b030faa24d6bad805cc1105876fb04befc0a8acd154c8e7dc1b32f323bc576bc
 DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9ab3f507 SHA1 6ec0dd31844da91c9773611a6fb553eef575e899 SHA256 aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb
-EBUILD virtualbox-4.0.12.ebuild 11911 RMD160 2687ae805daf246f41ba5b356f7a5b60490d1d10 SHA1 99155d99ce346a42ad51351d092219f4d7532cf4 SHA256 4039df52823799fc21798a58c95a69b00efb1a51740599ee58845a0646b411ca
-EBUILD virtualbox-4.1.2.ebuild 12003 RMD160 e628640dd88309798715cdb19b431f73773f6c41 SHA1 b95510f7f34fdbdb1cb8fb771a1d82685b97b4d3 SHA256 768ff2fd26cea39ddf196864103c7614fea8aeba06350702155bb6a4b94c7a0d
-EBUILD virtualbox-4.1.4.ebuild 12014 RMD160 5d8d7a0c3385c5583d6d5694e7a4536b84588824 SHA1 20a66e4038df19ce338e569624faead65590d9c7 SHA256 dcc00f85b34fe93c82a42995f0dcc1e7844d038d3319c159149a845ed3e9aa93
+EBUILD virtualbox-4.0.12.ebuild 12310 RMD160 b7a2a9407565d70832130db17b698a5c4c4a268d SHA1 67131c5476b8035e90ef72c389d5c73f3b38c404 SHA256 0ef0360d3252531e68a6c24c1369e9335f57c4dbeb8fa6ed8066ada4af9ae2c5
+EBUILD virtualbox-4.1.2.ebuild 12402 RMD160 da32a249c8e9cc97d13fee221a39ea96d1c88950 SHA1 8d41e530878c9e01a0bbb9ce3627e7fbd7b85bef SHA256 f8afeeb5d0c51caeefd49ab82ad034e840daa9e9282ef555a43e1755f77c125a
+EBUILD virtualbox-4.1.4.ebuild 12413 RMD160 6dc6146ecc5bde7764221620ab458c4f8c9f82d2 SHA1 b2d50d20f224e95f4b56eef2b5558cc8873e3d3b SHA256 a009dd53e258ee12c722334b7741c35a938715fd3c4805540dcc24c3217eb224
 EBUILD virtualbox-9999.ebuild 5702 RMD160 5910c24c277af2bac4f50c57ca97253994a16734 SHA1 782323a9c9a40ed52f350836f379a958b72a490b SHA256 1b2ab1d308157fa4adfb7827cdf8e4f6b643200876f02f96bd0b7bd9a6e45fb4
-MISC ChangeLog 8739 RMD160 316c1f0d7d16d68629cb163bbda3c04250b1390c SHA1 0be121424916be1e317ed6536ef27048c25270b9 SHA256 49f748996c4615d7ca8e7013846ce263c154fe1f08a6c353b7cd1e140e0761e8
+MISC ChangeLog 9159 RMD160 a4e36d8521d7456cfa1214b5407d3e351bce60ac SHA1 6bcae581e82bfb626433787012e3af1771b799f3 SHA256 9df7913b290d117907a3d09ed4e6c13812b52973d850a278416a73e180ee4423
 MISC metadata.xml 766 RMD160 1c69e37183d073f82b9fd2c8761b758cc33ccce8 SHA1 31295f3715624ada590d13fdc80c076380415ba0 SHA256 54cc5df43fbe674f4f04674566dfec523c0c912f8c94db26f4215727ab6850e5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOpd8/AAoJEPiazRVxLXTFeR4P/1JW/vCIxZdFWB8ZsJuabRJp
+BtlnYXuOTMOZ4TsF6vDGPqvaJDmhn4ujTaI23Cs90hK3nNy2Aos3+P4fPjzd+oDt
+U1Rl9joIPFzTlTk9FAK7NHN63HwM8ROfNt3MGcm9sxutcF+C3r+9p156MPIJ9Foq
+/xwAg6NEs1xfJ6/Nxdr72VSdU386NnMLrU1EHN0zZYRpetyPx3BN/pSHuizuojgi
+T80v/4t+T6LysZK8yuTXETcmwSwxU0OK005uBJf0a2+i0lJpG9EVTK2TmPgcaLWh
+pMLioCgQiXaFdgUlwlkN02GvjRf17TMAl/rk22OtBs1+JfkIEDdmqRlfI9paILUG
+PaIiNxuKyT5VgVCJkk9+WeFQeBdlreZEwYGw0snieaatW7SHo/kbPrWlvelIwCen
+iqPk2s6KvBVDaXBYueuQOup384wkoc45oJ9CskzkxubyP+9/2HLHQCYYyICGIljJ
+bEsVOSMwu57vlED9+kwPtttTWAjuP+GUhPD1ngucSkUDN+W+TgPLSrA1eTIpR+Jk
+V7p3SKAaaq0RHxLODRocwcPYQoGe2XLywR5ydzpho9lzhmpElEuL7n7YXHSQha/g
+wg1jt5/9g5SOTb1H3i2hPypt+/qcLxSYWkcxqDySgIDb1I5SxzmfxrKVCToM/fNx
+fGUBJNFFHiSKIBP0QAMq
+=OW9s
+-----END PGP SIGNATURE-----

diff --git a/app-emulation/virtualbox/virtualbox-4.0.12.ebuild b/app-emulation/virtualbox/virtualbox-4.0.12.ebuild
index 61eae1a32f52b22465f384acc5fb873f60be039a..9d505ea7b781cfd223b0c427a9962ca829db8ad7 100644 (file)
--- a/app-emulation/virtualbox/virtualbox-4.0.12.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.0.12.ebuild
@@ -1,10 +1,10 @@
 # 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.5 2011/08/20 21:05:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.0.12.ebuild,v 1.6 2011/10/24 21:57:11 polynomial-c Exp $
 
 EAPI=4
 
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils qt4-r2 toolchain-funcs java-pkg-opt-2
+inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
 
 if [[ ${PV} == "9999" ]] ; then
        # XXX: should finish merging the -9999 ebuild into this one ...
@@ -16,13 +16,13 @@ else
        S="${WORKDIR}/${MY_P}_OSE"
 fi
 
-DESCRIPTION="Software family of powerful x86 virtualization"
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
 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
@@ -71,7 +71,6 @@ DEPEND="${RDEPEND}
        alsa? ( >=media-libs/alsa-lib-1.0.13 )
        !headless? ( x11-libs/libXinerama )
        pulseaudio? ( media-sound/pulseaudio )
-       python? ( >=dev-lang/python-2.3[threads] )
        vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
 PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
        extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
@@ -110,7 +109,11 @@ QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
        usr/lib/virtualbox/VBoxOGLhostcrutil.so
        usr/lib/virtualbox/VBoxNetDHCP.so"
 
-REQUIRED_USE="java? ( sdk ) python? ( sdk )"
+REQUIRED_USE="
+       java? ( sdk )
+       python? ( sdk )
+       vboxwebsrv? ( java )
+"
 
 pkg_setup() {
        if built_with_use sys-devel/gcc hardened && gcc-config -c | grep -qv -E "hardenednopie|vanilla"; then
@@ -135,6 +138,8 @@ pkg_setup() {
                einfo "the OpenGL feature."
        fi
        java-pkg-opt-2_pkg_setup
+       python_set_active_version 2
+       python_pkg_setup
 }
 
 src_prepare() {
@@ -160,6 +165,14 @@ src_prepare() {
        # We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
        epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
 
+       # Use PAM only when pam USE flag is enbaled (bug #376531)
+       if ! use pam ; then
+               elog "Disabling PAM removes the possibility to use the VRDP features."
+               sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
+               sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
+                       src/VBox/HostServices/Makefile.kmk || die
+       fi
+
        # add correct java path
        if use java ; then
                sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
@@ -201,7 +214,7 @@ src_compile() {
        # strip-flags
 
        MAKE="kmk" emake \
-               VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo \
+               VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo_ \
                TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
                TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
                TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \

diff --git a/app-emulation/virtualbox/virtualbox-4.1.2.ebuild b/app-emulation/virtualbox/virtualbox-4.1.2.ebuild
index 2445da5c3d336019c7374a3bd42bc89a326eb408..87ae990c4cb29170bc4205c180d6895f822e9da6 100644 (file)
--- a/app-emulation/virtualbox/virtualbox-4.1.2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.2.ebuild
@@ -1,10 +1,10 @@
 # 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.2.ebuild,v 1.1 2011/08/17 23:37:47 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.2.ebuild,v 1.2 2011/10/24 21:57:11 polynomial-c Exp $
 
 EAPI=4
 
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils qt4-r2 toolchain-funcs java-pkg-opt-2
+inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
 
 if [[ ${PV} == "9999" ]] ; then
        # XXX: should finish merging the -9999 ebuild into this one ...
@@ -16,13 +16,13 @@ else
        S="${WORKDIR}/${MY_P}_OSE"
 fi
 
-DESCRIPTION="Software family of powerful x86 virtualization"
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
 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
@@ -71,7 +71,6 @@ DEPEND="${RDEPEND}
        alsa? ( >=media-libs/alsa-lib-1.0.13 )
        !headless? ( x11-libs/libXinerama )
        pulseaudio? ( media-sound/pulseaudio )
-       python? ( >=dev-lang/python-2.3[threads] )
        vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
 PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
        extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
@@ -110,7 +109,11 @@ QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
        usr/lib/virtualbox/VBoxOGLhostcrutil.so
        usr/lib/virtualbox/VBoxNetDHCP.so"
 
-REQUIRED_USE="java? ( sdk ) python? ( sdk )"
+REQUIRED_USE="
+       java? ( sdk )
+       python? ( sdk )
+       vboxwebsrv? ( java )
+"
 
 pkg_setup() {
        if built_with_use sys-devel/gcc hardened && gcc-config -c | grep -qv -E "hardenednopie|vanilla"; then
@@ -135,6 +138,8 @@ pkg_setup() {
                einfo "the OpenGL feature."
        fi
        java-pkg-opt-2_pkg_setup
+       python_set_active_version 2
+       python_pkg_setup
 }
 
 src_prepare() {
@@ -163,6 +168,14 @@ src_prepare() {
        # Don't build vboxpci.ko module (D'oh!)
        epatch "${FILESDIR}"/${P}-vboxpci-build.patch
 
+       # Use PAM only when pam USE flag is enbaled (bug #376531)
+       if ! use pam ; then
+               elog "Disabling PAM removes the possibility to use the VRDP features."
+               sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
+               sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
+                       src/VBox/HostServices/Makefile.kmk || die
+       fi
+
        # add correct java path
        if use java ; then
                sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
@@ -204,7 +217,7 @@ src_compile() {
        # strip-flags
 
        MAKE="kmk" emake \
-               VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo \
+               VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo_ \
                TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
                TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
                TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \

diff --git a/app-emulation/virtualbox/virtualbox-4.1.4.ebuild b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
index e0767184908a175c1de2ffe3d34c31a199ac63eb..edf56d07d98eb14ae37cb1200bfb04a8bd5b63d3 100644 (file)
--- a/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
@@ -1,10 +1,10 @@
 # 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.4.ebuild,v 1.1 2011/10/04 18:00:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.4.ebuild,v 1.2 2011/10/24 21:57:11 polynomial-c Exp $
 
 EAPI=4
 
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils qt4-r2 toolchain-funcs java-pkg-opt-2
+inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
 
 if [[ ${PV} == "9999" ]] ; then
        # XXX: should finish merging the -9999 ebuild into this one ...
@@ -16,13 +16,13 @@ else
        S="${WORKDIR}/${MY_P}_OSE"
 fi
 
-DESCRIPTION="Software family of powerful x86 virtualization"
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
 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
@@ -71,7 +71,6 @@ DEPEND="${RDEPEND}
        alsa? ( >=media-libs/alsa-lib-1.0.13 )
        !headless? ( x11-libs/libXinerama )
        pulseaudio? ( media-sound/pulseaudio )
-       python? ( >=dev-lang/python-2.3[threads] )
        vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
 PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
        extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
@@ -110,7 +109,11 @@ QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
        usr/lib/virtualbox/VBoxOGLhostcrutil.so
        usr/lib/virtualbox/VBoxNetDHCP.so"
 
-REQUIRED_USE="java? ( sdk ) python? ( sdk )"
+REQUIRED_USE="
+       java? ( sdk )
+       python? ( sdk )
+       vboxwebsrv? ( java )
+"
 
 pkg_setup() {
        if built_with_use sys-devel/gcc hardened && gcc-config -c | grep -qv -E "hardenednopie|vanilla"; then
@@ -135,6 +138,8 @@ pkg_setup() {
                einfo "the OpenGL feature."
        fi
        java-pkg-opt-2_pkg_setup
+       python_set_active_version 2
+       python_pkg_setup
 }
 
 src_prepare() {
@@ -163,6 +168,14 @@ src_prepare() {
        # Don't build vboxpci.ko module (D'oh!)
        epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
 
+       # Use PAM only when pam USE flag is enbaled (bug #376531)
+       if ! use pam ; then
+               elog "Disabling PAM removes the possibility to use the VRDP features."
+               sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
+               sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
+                       src/VBox/HostServices/Makefile.kmk || die
+       fi
+
        # add correct java path
        if use java ; then
                sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
@@ -204,7 +217,7 @@ src_compile() {
        # strip-flags
 
        MAKE="kmk" emake \
-               VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo \
+               VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo_ \
                TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
                TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
                TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \