Respect LDFLAGS properly

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

3 files changed, 36 insertions, 22 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 9dad2d4c03c5..668de5b0d523 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.58 2011/01/06 22:57:31 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.59 2011/01/07 19:15:16 polynomial-c Exp $
+
+  07 Jan 2011; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-guest-additions-4.0.0.ebuild:
+  Respect LDFLAGS properly. Thanks to xarthisius for providing a feasible fix.
 
 *virtualbox-guest-additions-4.0.0 (06 Jan 2011)
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild
index 1e4419075c0c..5aecc08e2b94 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild,v 1.3 2010/12/31 14:44:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild,v 1.4 2011/01/07 19:15:16 polynomial-c Exp $
 
 inherit eutils linux-mod
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.0.0.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.0.0.ebuild
index e27dfd9e6acf..6cb1d9ae4a6d 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.0.0.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.0.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.0.0.ebuild,v 1.1 2011/01/06 22:57:31 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.0.0.ebuild,v 1.2 2011/01/07 19:15:16 polynomial-c Exp $
+
+EAPI=2
 
 inherit eutils linux-mod
 
@@ -51,30 +53,38 @@ pkg_setup() {
 }
 
 src_unpack() {
-		unpack ${A}
+	unpack ${A}
 
-		# Create and unpack a tarball with the sources of the Linux guest
-		# kernel modules, to include all the needed files
-		"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-		unpack ./vbox-kmod.tar.gz
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
 
-		# PaX fixes (see bug #298988)
-		epatch "${FILESDIR}"/vboxguest-log-use-c99.patch
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
 
-		# Remove shipped binaries (kBuild,yasm), see bug #232775
-		cd "${S}"
-		rm -rf kBuild/bin tools
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	epatch "${FILESDIR}"/vboxguest-log-use-c99.patch
+	popd &>/dev/null || die
 
-		# Disable things unused or splitted into separate ebuilds
-		cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
 
-		# stupid new header references...
-		for vboxheader in {product,revision}-generated.h ; do
-			for mdir in vbox{guest,sf} ; do
-				ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-					"${WORKDIR}/${mdir}/${vboxheader}"
-			done
+	# stupid new header references...
+	for vboxheader in {product,revision}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
 		done
+	done
+
+	# Respect LDFLAGS
+	sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
 }
 
 src_compile() {