Fixed bug #482986 and bug #456354. Adjusted dependencies a bit

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 33 insertions, 27 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index d43e830c5b07..6688fb1f2fd2 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.159 2013/10/15 14:11:40 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.160 2013/10/18 11:43:08 polynomial-c Exp $
+
+  18 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.2.18.ebuild,
+  virtualbox-4.3.0.ebuild:
+  Fixed compilation with vboxwebsrv USE flag being enabled. Thanks to Nenad
+  Peric for providing a fix in bug #482986. Restricted gsoap dependency version
+  (bug #456354). Adjusted dependencies a bit.
 
   15 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.1.26.ebuild,
   virtualbox-4.2.18.ebuild, virtualbox-4.3.0.ebuild:
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 8ac3b3996172..efe8cafed929 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -13,27 +13,27 @@ DIST VirtualBox-4.1.26.tar.bz2 74552384 SHA256 229773b45bb18374aa091d4ef585f3893
 DIST VirtualBox-4.2.18.tar.bz2 76893031 SHA256 9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74 SHA512 c267cef156476992773135b5a154164f30841c4f2d4afa5e6c7c74a320384f621d141bff5f7164968767c3d86035befcb59e34b7a912a8a5ae3bede2d24e9c60 WHIRLPOOL 665e4895db5c0fd623fd08c6b9f4df69e5e5d27ebd3063a4216721460782691d2936567be68a4af7bed57b88fd5b2a41805df76551b1aac200ccff0101055a56
 DIST VirtualBox-4.3.0.tar.bz2 89452701 SHA256 8ea8988a041163c34bff1da6b278d7729cecd4596f5eb778575c5ac9ac95bc12 SHA512 455907296efa9fed98efd435554a00c168f5b3b1c2b237dfb41281a2cfa6da76e4f6d8cd763db15dbe8be20b145ba30690f61e4f4dd4efafd31b3014752da3f1 WHIRLPOOL 728613d31bf0dadcb45d4a55886afb617648e76ed41e3094a6fd750e5a98ce70b21df3188174fefb4b8db5f3c688697ee07830c0a0a0c0c4307163ac457726e1
 DIST virtualbox-4.1.22-patches-01.tar.xz 3752 SHA256 2ff58f8d2bdfdcbf1ae4bbe9f68ad1256f1ae37091fd4b392582a062d206962f SHA512 9bba2a4352d52cddd27f55b4ad0e9de250c1d29359a8859f61fc413e53ac62206321c5e347391ca478b942967bd7974a3a469eb3bb133c79d7033692afe559dd WHIRLPOOL 1aa98913e7d4e1ddf5f775db200cddc18a7ed4d7dd915dda0dab6bffbf33bfd63a785cc7381bca74e4780e7dce21f18314dc093b9c6ba02addfd1330f3b61aa9
-DIST virtualbox-4.2.2-patches-01.tar.xz 3612 SHA256 5b844b3740bebfa0e7652cb6c5c89d94a333c7aa0873aa8a0aa653f7c9f3c06b SHA512 d12da10898c5bd440b6fd2211385bc223ff832fdce11b118cc56562903c8c87abcb1eeec3bbc2d4b5b22b1aa4a652e978277af7096a65276469be9e704a1aa69 WHIRLPOOL 58d43f0d2eeb30800b285c307871be64765301f7037d72752eb063286589fcccd12e6d8fd26610164701178fd497ca65127e91eb8f8d53db0889ccd7d7b988a9
+DIST virtualbox-4.2.18-patches-01.tar.xz 3788 SHA256 9a147e3a3da7e1e07b70aed67042c822897c7874ccaa3690c9497862373d8222 SHA512 021f8a566ede223ead5a2605bff3917195165c543f760ee7af004ab97d5dcf0771e6ccb62148d7986a34872ea8c35db952286fb8534b1f69804e192701bd8108 WHIRLPOOL 9818df1703636fecfbda1bbeb4d167d845701fe9de2827a97573a26ffb3cb9feaa22ee2849c45d3ea700a9c305185eb404b15572b0f4e666f8a8e6158a48b9eb
 EBUILD virtualbox-4.1.26.ebuild 12296 SHA256 01cc60107f53c6259671c87c9ecf7b2f06e39d40a70661961adf43910e6cc282 SHA512 80c6f3b2b07eb0758de11386e24b0b6f6ee00ee9591f50312629c48f268362319a8fb14e7f39411e82673e9bc5b81a33f470b28a91bf875897ab02f078cbddff WHIRLPOOL 20bfcd1ebf56ad8b0c9fd21bc575b99cc87d596988c6e9ac381af02584ebdf1e6de94760326e7ac29b973ad14631648cf0a3a10b52abbb5bd362a5eee336b0b8
-EBUILD virtualbox-4.2.18.ebuild 12235 SHA256 23f0b1fa36179743ee662c1f6adedbb755557b75ceff4458d06f004bd7e4fba5 SHA512 8744bb06c46ca01d880403d023c3d23960bfebac2b230a07e9955161a3bea8a3daf645c83b352af180a6efdcdf3a9ca288aef42db7b5929fccc3de258c772a8d WHIRLPOOL 13e74a4e5fbd3215dd0d182a27e90c9e4676d34508c13a155a6ba1b5dc84fc5b898eeec72e456475c7995c341b23c7c82d4527f63e22ba1c60e45edd248c121d
-EBUILD virtualbox-4.3.0.ebuild 12417 SHA256 64d55cc766f2bed0c8287658e74f53df6b0187f996378b9692c769b3f4da8b80 SHA512 ca1e5f4c2990f43bc578ed3ff11ee8bae44cc41e685aa2c4f33aea5aec5f4961fa7b8677021771b7ae39a03ab874b081b2d02898ae863a922944148def3a8301 WHIRLPOOL 7c777d0db71e6103ae82f4b107a6d5a0e58d8ea69047bebeb9aaa5ee00a0f7ac2bb855c10256a3d9e3e9200c11391d14c0357c3cf8c75155dd1fd1a827d96412
+EBUILD virtualbox-4.2.18.ebuild 12225 SHA256 a636c62bb3db5f303e29c497c503e4fbb0be41a20f9feb52a7acd84e53e30f0f SHA512 3dc13a0ed472e8b95131a96a6474e1f6b0d0e96f91234a155b1a8960919f1818251494e9f6cfc37fc2a1a48eb8ed33f5b585f3f1cc8cc0576f5b22942253b5b4 WHIRLPOOL 3e552ef3fd2f3c17ae60c81464fd55cb30acf266d5db1b8a27e19467945577de76a8601865d9d50f8f2fa56200ffcdfda61b085d67ed06cea68df50fa0ffbff5
+EBUILD virtualbox-4.3.0.ebuild 12407 SHA256 06b27ca95da4d1b43ef1f3005640e1a40041cfa8d5588739273c81e209047b6c SHA512 df99c7e0d949d093c87cda59c420535b4539d579c3c384da24301fc772ad23102f22210c4a4fce06ed533b0ef46c84574c7771cef4be636f3999c077f7863be5 WHIRLPOOL c22555ff448a63171144147c309cd8705d786be53552df2ca903120f7edf9caa6433b73f15700e0cdfb7a3aded02047c7a90970dd5b4b55c33a1e41bcf891427
 EBUILD virtualbox-9999.ebuild 5123 SHA256 8cd24ad4cc1fab5562d58ebcf531b3131796eb24c40489d98bfb2078cd0b3803 SHA512 3c4658a749419a64f7ed8636e62f385db059639d58a2152ac1b136f54f8577407ba0553f612511ea7819eb4e26727ab516f62b11faac5d2e4b6de73892206430 WHIRLPOOL 317967e118951cda333e6db60a6e8f37df7a53599d752271d8f29873caa1e9bb22774963e8972989516031516b293c5b8dd9f7f5e680ac785d7f16437bf8c2ca
-MISC ChangeLog 22963 SHA256 432d9892866834ca9e3e6d2a5aff115b5e9f8e7145feba148e0614cf811056bb SHA512 d30de07d1b5c40aca7d480c52a7e81408b952b4b6b18dc2c027a8302b5820ddd34ba4376122974f8887b95fcb643949c504c46754649ece6e7f479e4fedeaab9 WHIRLPOOL dc8c9f4b06781148d8a17d540affa3145dee0c7e4c89a8433ca9f765c81718cd8ba5d1b390d3bb76dc5fb9ed1e8f929643631a7d70b01921384f10d6cf6dec5d
+MISC ChangeLog 23273 SHA256 ec156b7b440505e2b3cc944e145addefbfdf8df9deed1349a648e295f7d143b2 SHA512 54133dcae51b3b67d3cf33fb016aa11065d703b95231c2e960e88c7a56d26227aa0cb53a831c54a6ed1a3cfd7a27fcead5b8e83b5d5318ddfed54e0a1a06ebf2 WHIRLPOOL 626cf7f38098e8252e90ef8c8c12dea5f0e562f51cc78abcaf4c1d3a3b06425daf2ba68b8aa9398c8bff0bb5b17ae2bb0001e462af1b165fcbff70f046455f5e
 MISC metadata.xml 673 SHA256 5cf3053a2f23eff40c24dfdb7af90d4bf905df95a7406f6298ae9e5e547cbe79 SHA512 79b4b7477041212815e0b509016b692ac719625534ba93540ac5afe655e47ed2ed27d7ba51b494a49a6ac603733ba0b66a2a517f27e4d0e6b7563eb7d4e640ec WHIRLPOOL 6bcb7711e01036fa3ff064ffdc5021da6fca464d4da77d8e93d033304c7c1d3ed105723d5d5e7fa3328daec929c7c7a90c9c82572bb082765f286b53c3feb688
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSXU0eAAoJEPiazRVxLXTFkGsQAMkS4Aiy+niYPEz7Dsv3Xfv+
-xBbvOqYfOJoaOAJo8TcaffaHhza7VwkY8XkD4D+YzzXa4Y37R3AIpJpPOpwsg5v+
-Jv+h2uM2wVKNaOqxxY0MhSOj0cAkLxgYxIwm8cLC7CmnMoYuaLpE0x3azeIXPqsn
-9mb+r73rLUSL3V9svaIpmJi7RIwb705GS6X2D21QHCU2cPZVuea5wI00i5fpAp9A
-AaQqKw3JgqMWX/ewfQ7+YzsUeXlF7sVEbjR7dTOwMbxCyKvREJZH3+4E1uxNc9lj
-MkFNihVWby102cwrxKGUSTU+MsQygwW1aUuX/SPCUUARk/DSAx5eRutZ6Vy0KG/r
-JRLfS7B/sxLtpTripSh87kIEP3lE6DVX2tWJGOKnDBg5KGedETILdQUKQq1QJIhR
-EoWNMPz7nPPYIeZmXt9F+n0UuNg4sKPSoUdKwaIRGbRla5NJDm9b2VYhwQN1Mgq1
-LHBfjQWAnJkglsA/cNgyC6xDWNpLFSpZmnET1bhWsv84/OvUl+2SkreULkII8CwV
-ZvmbMC5K2r6nVlhGrb30KYltNKFiiVqxIBfUu1TPk4DcM5bMLGtSE/CXG/9nR4vt
-FZ3+J9+hnd2u9JBVxaw0/R8qHmyhPllu+wW0S6xU3Tzt4v1cCPIpfsl1mKhKn/02
-zFy43/UYaDyS+vdZlBca
-=vyk3
+iQIcBAEBCAAGBQJSYR7NAAoJEPiazRVxLXTFw9gQAIEUN2o2RcIdEcL6Eyx5tuj4
+/jd5Dzf1jG52Chmcdasvym3p2Nkl4Bmik8pn5GKD/kMx94W11K4Cv0hULNJLYxFJ
+Nifse4tmRinlSmEtlWXGg4B+nEQsf57zv8StaYdF3KWiH7nNay21AJM7Kirfrs2R
+ndoBK1L7W8SZIJj99sL749otWX7pgcz8LD0MPQ8Z9MSg4vdA34Zk16Cn306swwsF
+57ow7M7PeVpl6NWzRmp9QwsUj+4JTRIal6/ytsuXd0yaMsMMK2/es9U4kbuDF5DJ
+nR8UQL56V/yobVosrYL8WQEHOm8Wet0PSytsjrQ3iFHklRJbf0wfQmd61UqdWR0N
+CCDO03ZBh8Wu1PTzX/PiSH2GuNunlZdZ8B0WGNK4Hgkrlv3ghw6l2mgYBBuxB6YA
+5FgFMAfvOstiakVzbF7Sx44Rk5ARz6tuV9ZQ1e0DVtCjvH5VtNcFnkmlvAXFscdc
+j8LWeYzPyUlGg47OdgkcV2gEq214mt3HQ3YuyDfgFOdK90ZeATG8Op5FQMUeQtQq
+BfYO+fD4/CUx427Z6tpb+doL4IkvvKG64lFY6jCgW+mHssp1TyFelNssEn0Q/NuC
+GRYZHD6dYjpOg2AfYhmT14AXiBESfzr1OvzLJF8MinciOIDKA5G9oUdoDJ3JEHfI
+/oKv13hn84yb0eLzXYOd
+=PtpZ
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/virtualbox-4.2.18.ebuild b/app-emulation/virtualbox/virtualbox-4.2.18.ebuild
index 814ccbc878e4..788aa6b95181 100644
--- a/app-emulation/virtualbox/virtualbox-4.2.18.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.18.ebuild,v 1.2 2013/10/15 14:11:40 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.18.ebuild,v 1.3 2013/10/18 11:43:08 polynomial-c Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
 MY_P=VirtualBox-${MY_PV}
 SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.2-patches-01.tar.xz"
+	http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.2.18-patches-01.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
@@ -29,6 +29,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 	net-misc/curl
 	dev-libs/openssl
 	dev-libs/libxml2
+	media-libs/libpng
 	sys-libs/zlib
 	>=virtual/udev-171
 	!headless? (
@@ -53,7 +54,6 @@ DEPEND="${RDEPEND}
 	>=dev-lang/yasm-0.6.2
 	sys-devel/bin86
 	sys-power/iasl
-	media-libs/libpng
 	pam? ( sys-libs/pam )
 	sys-libs/libcap
 	doc? (
@@ -69,7 +69,7 @@ DEPEND="${RDEPEND}
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	!headless? ( x11-libs/libXinerama )
 	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )
+	vboxwebsrv? ( <net-libs/gsoap-2.8.13 )
 	${PYTHON_DEPS}"
 PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
 	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
diff --git a/app-emulation/virtualbox/virtualbox-4.3.0.ebuild b/app-emulation/virtualbox/virtualbox-4.3.0.ebuild
index e96eba7f6c3f..de33e4350cda 100644
--- a/app-emulation/virtualbox/virtualbox-4.3.0.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.0.ebuild,v 1.2 2013/10/15 14:11:39 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.0.ebuild,v 1.3 2013/10/18 11:43:08 polynomial-c Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
 MY_P=VirtualBox-${MY_PV}
 SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.2-patches-01.tar.xz"
+	http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.2.18-patches-01.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
@@ -29,6 +29,8 @@ RDEPEND="!app-emulation/virtualbox-bin
 	net-misc/curl
 	dev-libs/openssl
 	dev-libs/libxml2
+	media-libs/libpng
+	media-libs/libvpx
 	sys-libs/zlib
 	>=virtual/udev-171
 	!headless? (
@@ -53,8 +55,6 @@ DEPEND="${RDEPEND}
 	>=dev-lang/yasm-0.6.2
 	sys-devel/bin86
 	sys-power/iasl
-	media-libs/libpng
-	media-libs/libvpx
 	pam? ( sys-libs/pam )
 	sys-libs/libcap
 	doc? (
@@ -70,7 +70,7 @@ DEPEND="${RDEPEND}
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	!headless? ( x11-libs/libXinerama )
 	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )
+	vboxwebsrv? ( <net-libs/gsoap-2.8.13 )
 	${PYTHON_DEPS}"
 PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
 	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"