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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 16 insertions, 10 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/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} )"