disable gcc-4.3.x checks in configure; update live ebuild see bug #252151

svn path=/trunk/; revision=563

5 files changed, 74 insertions, 49 deletions

diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index d7ab37a..f151eb0 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -3,16 +3,17 @@
 # $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.9 2008/12/18 12:47:58 flameeyes Exp $
 
   19 Dec 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  +files/virtualbox-ose-2.1.0-allow-gcc43.patch,
   +virtualbox-ose-2.1.0.ebuild:
   Version bump; drop old VBoxAddIF,VBoxDeleteIF scripts; drop old
   /etc/vbox/interfaces file; add sys-libs/libcap to DEPEND; disable the
-  VBoxNetFlt kernel driver
+  VBoxNetFlt kernel driver, disable gcc-4.3.x checks in configure
 
 *virtualbox-ose-2.0.6 (18 Dec 2008)
 *virtualbox-ose-2.0.4-r1 (18 Dec 2008)
 *virtualbox-ose-1.6.6-r1 (18 Dec 2008)
 
-  18 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  18 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   +files/virtualbox-ose-fix-insecure-lockfiles.patch,
   +virtualbox-ose-1.6.6-r1.ebuild, +virtualbox-ose-2.0.4-r1.ebuild,
   +virtualbox-ose-2.0.6.ebuild, virtualbox-ose-9999.ebuild:
@@ -183,13 +184,13 @@
   04 Mar 2008; Markus Ullmann <jokey@gentoo.org> virtualbox-1.5.4-r1.ebuild:
   Stable on x86 wrt bug #208905
 
-  26 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  26 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
   virtualbox-1.5.6.ebuild:
   Fix patch naming.
 
 *virtualbox-1.5.6 (25 Feb 2008)
 
-  25 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  25 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
   +virtualbox-1.5.6.ebuild:
   Version bump, as requested by the proxy-maintainer Alessio Cassibba.
 
@@ -238,7 +239,7 @@
   Fix desktop entry for bug #196832, typo in wrapper and HAL warning. Thanks
   to Alessio for providing needed modifications
 
-  29 Oct 2007; Dawid Węgliński <cla@gentoo.org> virtualbox-1.5.2.ebuild:
+  29 Oct 2007; Dawid Węgliński <cla@gentoo.org> virtualbox-1.5.2.ebuild:
   Stable on x86
 
 *virtualbox-1.5.2 (22 Oct 2007)
@@ -315,7 +316,7 @@
   virtualbox-1.3.8.ebuild, virtualbox-9999.ebuild:
   Fix for sdl useflag bug #177335
 
-  21 Apr 2007; Raúl Porcel <armin76@gentoo.org> virtualbox-1.3.8.ebuild:
+  21 Apr 2007; Raúl Porcel <armin76@gentoo.org> virtualbox-1.3.8.ebuild:
   x86 stable
 
 *virtualbox-1.3.8 (16 Mar 2007)
diff --git a/app-emulation/virtualbox-ose/Manifest b/app-emulation/virtualbox-ose/Manifest
index 45dbe17..7b6c764 100644
--- a/app-emulation/virtualbox-ose/Manifest
+++ b/app-emulation/virtualbox-ose/Manifest
@@ -4,6 +4,7 @@ AUX virtualbox-ose-1.6.6-remove-unused.patch 3379 RMD160 d0a346f5ce9d236a5de2b05
 AUX virtualbox-ose-2-config 42 RMD160 7102b584e67b964dfd3c06e06b29eb91d33d7604 SHA1 1fe2ac29550c4b3ab4a82399ece3d08c8851c207 SHA256 fb619bc28ba651135730601240e192f9d02b9bef9954eb8026a716865db01b4d
 AUX virtualbox-ose-2-localconfig 1381 RMD160 fd10fadb7ee3c947c5a1e73192f326486a5e9c12 SHA1 c4967e9206efe6d679fc73dcf42d367c1a5828c7 SHA256 3173d244d93fa1996bfb72f15eda48398eee2ea8c2e68268d34f2f800a2f792f
 AUX virtualbox-ose-2-wrapper 2752 RMD160 55a297e64a5e72aebb8a3d644de2dc400e4109e7 SHA1 92406df4ee4f648fbaa23db96e8833e3fb5f7d60 SHA256 a4cf6e712abe6927517af880e8014de7c8567389ce58cb499fe76c48901ec5c1
+AUX virtualbox-ose-2.1.0-allow-gcc43.patch 1005 RMD160 1df49daed9cfeff53fccf1726907d775c9384b07 SHA1 f50b04f92db79f055c946f21d2671e8cdb7b03ff SHA256 6043e881307346b6beaed08dbe27b6bfc05a72191bdde62a66dec592767c21fd
 AUX virtualbox-ose-fix-insecure-lockfiles.patch 2579 RMD160 4b460669369a4da395a335c4357346d932275916 SHA1 0a692a1b6de3e643ca8e60de6da8b9a7613cd352 SHA256 32f253b9c212a66181f7bdab9c6d509dbf5f3220849d0aeb47d840aa9465fcdf
 AUX virtualbox-ose-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 SHA1 3268e5759286bdff1c5242598266e6c2a5b17e5d SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52
 AUX virtualbox-ose.desktop 202 RMD160 8b4b5c05743978d71edd4eaba71ae25f1d9d0d82 SHA1 3c10d2f12ea58ef35e785b8727a51fd3a0d66472 SHA256 9bbd26661317b106593d74b84cec3781b24c41bc40a2f98776e23d6b422ee4bb
@@ -14,7 +15,7 @@ DIST VirtualBox-2.1.0-OSE.tar.bz2 39382682 RMD160 8c35b83889fcba3bc263d54a052369
 EBUILD virtualbox-ose-1.6.6-r1.ebuild 5971 RMD160 7aeb43be0db7fc94951fc4d3130df9f8a2e4da47 SHA1 64d2507d100fa4210d255206532145cedc7649b9 SHA256 97b3362ca3427f99cb744dcaa9ce2919785a06c62639bf23b222b6241b3f0380
 EBUILD virtualbox-ose-2.0.4-r1.ebuild 6975 RMD160 7ec20e6205e7bb09988c00d1b4ee9d190f6fbab8 SHA1 0e7f243c0e40ae15ae9c12fff76cc083f1213597 SHA256 042bbeb05157366a4b44f8337152640ebb0e8fe32e6829df90c53944cf8933de
 EBUILD virtualbox-ose-2.0.6.ebuild 6868 RMD160 cd19c3fe8f8a669cbf4bebf4d9b2d306b8f06e20 SHA1 25d91ba562bb49c4e3e723b65be6351f181207cc SHA256 d1ae41ec151b666c65ea68a6eb0e66ebd7600ba6caddc0370c397a0113fd6bfb
-EBUILD virtualbox-ose-2.1.0.ebuild 6632 RMD160 1f590e313fb012a02918e57796ab9f136614e319 SHA1 d133c00b870078135a4d7985913a533035f67522 SHA256 bb27d9a2bce83bb1a2a74f36b7e2899c547c554d62f91bbd066b1243dceb0ee9
-EBUILD virtualbox-ose-9999.ebuild 5713 RMD160 35e08fb31f9e681a80a4f89fbe608bd359895844 SHA1 c792ec2a91802c9d3a822ca5403a28635a03af0b SHA256 c879ae15bded84eddd3939d003fda4275037623029e8e4a66d010bd7a2c1ccc7
-MISC ChangeLog 16127 RMD160 7780aa5af9e3be5b584160e864afb7853ac8e864 SHA1 f956f88836267ff3ce1d523989053e9382f893a8 SHA256 85d02e410fb50c248c88077dfe567e1f6b0921dbdff8a8ba66259f7fef8c2706
+EBUILD virtualbox-ose-2.1.0.ebuild 6731 RMD160 b6b2bc48fc61604f849d58e6a04626975944c6fa SHA1 70778db6f6312eaf5694696f250757e350ba681c SHA256 8c74387cbc7e8ebc05956ab35de1e0ffaec8c5fce3aded31f80285621aa737d2
+EBUILD virtualbox-ose-9999.ebuild 5847 RMD160 1c860b8f54c43cb5dc141d5914b6e595805be6af SHA1 b279548b86294e38f89dfb58f064325774adc599 SHA256 aa5022cb82a06e3fb2c1fdb7dba469500d4a75fbb573341e111989602d6b0eb2
+MISC ChangeLog 16227 RMD160 597f07107c30e59415dec98b7362561a6dfd67f2 SHA1 833c6e54816e2da230569ae693beb90d0ee42ca7 SHA256 4048152fb0a0ea8ee59e5824a8b3a68c81374bd85fb80caebd5dfe0948de8291
 MISC metadata.xml 532 RMD160 1fca6fac5f60adc258b878ecd959d2ca2adffafd SHA1 16730c1ea2b66f51e4eb6eaaa2bb570a9c56bb7d SHA256 578a25caafe911d389af1aeb097e4b732cdb48cdb33929af4ddbb1506ff09eeb
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-2.1.0-allow-gcc43.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-2.1.0-allow-gcc43.patch
new file mode 100644
index 0000000..1aae626
--- /dev/null
+++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-2.1.0-allow-gcc43.patch
@@ -0,0 +1,19 @@
+--- configure.orig	2008-12-23 16:34:42.000000000 +0100
++++ configure	2008-12-23 16:35:26.000000000 +0100
+@@ -389,16 +389,6 @@
+         fail really
+       elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "OS" = "darwin" ]; then
+         log_success "found version $cc_ver"
+-      elif [ $cc_maj -eq 4 -a $cc_min -eq 3 ]; then
+-        if [ -z "$CC_COMPAT" ]; then
+-          log ""
+-          log "  ** There are known problems with gcc version 4.3 when compiling the recompiler"
+-          log "  ** stuff. You need to specify a compatibility compiler with version < 4.3. Look"
+-          log "  ** for a package compat-gcc-34 on Fedora systems or something similar on other"
+-          log "  ** distributions and call configure with parameter --with-gcc-compat=gcc34."
+-          fail really
+-        fi
+-        log_success "found version $cc_ver + compat version $cc_compat_ver"
+       # gcc-4.0 is allowed for Darwin only
+       elif [ $cc_maj -lt 3 \
+              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-2.1.0.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-2.1.0.ebuild
index 1ad6456..561fa5a 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-2.1.0.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-2.1.0.ebuild
@@ -47,12 +47,14 @@ S=${WORKDIR}/${MY_P/-OSE/}
 MY_LIBDIR="$(get_libdir)"
 
 pkg_setup() {
-	# known problems with gcc 4.3 and the recompiler
-	# http://www.virtualbox.org/ticket/936
+	# gcc 4.3 is *not supported* by upstream, add a warning
 	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "43" ]]; then
-			eerror "there are known problems with gcc 4.3 and the virtualbox"
-			eerror "recompiler stuff. Please use at least a version of gcc < 4.3"
-			die "gcc 4.3 cannot build the virtualbox recompiler"
+			elog ""
+			elog "Warning:"
+			elog "gcc-$(gcc-major-version).$(gcc-minor-version) was detected"
+			elog "this gcc release is *not supported* by upstream, please"
+			elog "*don't* file bug reports upstream reporting gcc failures."
+			elog ""
 	fi
 
 	if ! use headless; then
@@ -97,6 +99,9 @@ src_unpack() {
 	sed -i \
 			-e "s/MY_LIBDIR/${MY_LIBDIR}/" LocalConfig.kmk \
 			|| die "LocalConfig.kmk sed failed"
+
+	# Disable gcc 4.3.x check in configure
+	epatch "${FILESDIR}/${P}-allow-gcc43.patch"
 }
 
 src_compile() {
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild
index 2ef3617..9cd0fcf 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild
@@ -20,8 +20,6 @@ RDEPEND="!app-emulation/virtualbox-bin
 	!app-emulation/virtualbox-modules
 	dev-libs/libIDL
 	>=dev-libs/libxslt-1.1.19
-	dev-libs/xalan-c
-	dev-libs/xerces-c
 	!headless? (
 		qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
 		x11-libs/libXcursor
@@ -34,7 +32,8 @@ DEPEND="${RDEPEND}
 	sys-devel/dev86
 	sys-power/iasl
 	media-libs/libpng
-	>=media-libs/alsa-lib-1.0.13
+	sys-libs/libcap
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( >=dev-lang/python-2.3 )"
 # sys-apps/hal is required at runtime (bug #197541)
@@ -44,7 +43,9 @@ RDEPEND="${RDEPEND}
 	sys-apps/hal"
 
 BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
+MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)
+			vboxnetflt(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
+MY_LIBDIR="$(get_libdir)"
 
 pkg_setup() {
 	# The VBoxSDL frontend needs media-libs/libsdl compiled
@@ -64,7 +65,6 @@ pkg_setup() {
 }
 
 src_compile() {
-
 	local myconf
 	# Don't build vboxdrv kernel module, disable deprecated qt3 support
 	myconf="--disable-kmods --disable-qt3"
@@ -112,26 +112,25 @@ src_install() {
 	# create configuration files
 	insinto /etc/vbox
 	newins "${FILESDIR}/${PN}-2-config" vbox.cfg
-	newins "${FILESDIR}/${PN}-interfaces" interfaces
+
+	# Set the right libdir
+	sed -i \
+			-e "s/MY_LIBDIR/${MY_LIBDIR}/" \
+			"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
 
 	# symlink binaries to the shipped wrapper
-	exeinto /usr/lib/${PN}
+	exeinto /usr/${MY_LIBDIR}/${PN}
 	newexe "${FILESDIR}/${PN}-2-wrapper" "VBox" || die
-	fowners root:vboxusers /usr/lib/${PN}/VBox
-	fperms 0750 /usr/lib/${PN}/VBox
-	newexe "${S}"/src/VBox/Installer/linux/VBoxAddIF.sh "VBoxAddIF" || die
-	fowners root:vboxusers /usr/lib/${PN}/VBoxAddIF
-	fperms 0750 /usr/lib/${PN}/VBoxAddIF
-
-	dosym /usr/lib/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/lib/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/lib/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/lib/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym /usr/lib/${PN}/VBoxAddIF /usr/bin/VBoxAddIF
-	dosym /usr/lib/${PN}/VBoxAddIF /usr/bin/VBoxDeleteIF
+	fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBox
+	fperms 0750 /usr/${MY_LIBDIR}/${PN}/VBox
+
+	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/${MY_LIBDIR}/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
 
 	# install binaries and libraries
-	insinto /usr/lib/${PN}
+	insinto /usr/${MY_LIBDIR}/${PN}
 	doins -r components
 
 	if use sdk; then
@@ -140,42 +139,42 @@ src_install() {
 
 	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl} *so *r0 *gc ; do
 		doins $each
-		fowners root:vboxusers /usr/lib/${PN}/${each}
-		fperms 0750 /usr/lib/${PN}/${each}
+		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/${each}
+		fperms 0750 /usr/${MY_LIBDIR}/${PN}/${each}
 	done
 
 	if use amd64; then
 		doins VBoxREM2.rel
-		fowners root:vboxusers /usr/lib/${PN}/VBoxREM2.rel
-		fperms 0750 /usr/lib/${PN}/VBoxREM2.rel
+		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxREM2.rel
+		fperms 0750 /usr/${MY_LIBDIR}/${PN}/VBoxREM2.rel
 	fi
 
 	if ! use headless; then
 			for each in VBox{SDL,Headless} ; do
 				doins $each
-				fowners root:vboxusers /usr/lib/${PN}/${each}
-				fperms 4750 /usr/lib/${PN}/${each}
-				pax-mark -m "${D}"/usr/lib/${PN}/${each}
+				fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/${each}
+				fperms 4750 /usr/${MY_LIBDIR}/${PN}/${each}
+				pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/${each}
 			done
 
-			dosym /usr/lib/${PN}/VBox /usr/bin/VBoxSDL
+			dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxSDL
 
 			if use qt4; then
 				doins VirtualBox
-				fowners root:vboxusers /usr/lib/${PN}/VirtualBox
-				fperms 4750 /usr/lib/${PN}/VirtualBox
-				pax-mark -m "${D}"/usr/lib/${PN}/VirtualBox
+				fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VirtualBox
+				fperms 4750 /usr/${MY_LIBDIR}/${PN}/VirtualBox
+				pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/VirtualBox
 
-				dosym /usr/lib/${PN}/VBox /usr/bin/VirtualBox
+				dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VirtualBox
 			fi
 
 			newicon "${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
 			domenu "${FILESDIR}"/${PN}.desktop
 	else
 			doins VBoxHeadless
-			fowners root:vboxusers /usr/lib/${PN}/VBoxHeadless
-			fperms 4750 /usr/lib/${PN}/VBoxHeadless
-			pax-mark -m "${D}"/usr/lib/${PN}/VBoxHeadless
+			fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxHeadless
+			fperms 4750 /usr/${MY_LIBDIR}/${PN}/VBoxHeadless
+			pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/VBoxHeadless
 	fi
 
 	insinto /usr/share/${PN}