Respect LDFLAGS properly

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

5 files changed, 33 insertions, 15 deletions

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index fd28f686d966..92ac7f28920f 100644
--- a/x11-drivers/xf86-input-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-input-virtualbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-input-virtualbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.51 2011/01/06 22:52:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.52 2011/01/07 18:54:54 polynomial-c Exp $
+
+  07 Jan 2011; Lars Wendler <polynomial-c@gentoo.org>
+  xf86-input-virtualbox-4.0.0.ebuild:
+  Respect LDFLAGS properly. Thanks to xarthisius for providing a feasible fix.
 
 *xf86-input-virtualbox-4.0.0 (06 Jan 2011)
 
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.0.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.0.ebuild
index 9e239423079a..a0b5667c5e42 100644
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.0.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.0.ebuild,v 1.1 2011/01/06 22:52:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.0.ebuild,v 1.2 2011/01/07 18:54:54 polynomial-c Exp $
 
 EAPI=2
 
@@ -32,15 +32,19 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}_OSE"
 
 src_prepare() {
-		if kernel_is -ge 2 6 33 ; then
-			# evil patch for new kernels - header moved
-			grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:' || die "Failed replacing"
-		fi
-		# Remove shipped binaries (kBuild,yasm), see bug #232775
-		rm -rf kBuild/bin tools
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:' || die "Failed replacing"
+	fi
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# 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
+	#Respect LDFLAGS
+	sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
 }
 
 src_configure() {
@@ -94,7 +98,9 @@ pkg_postinst() {
 		elog ""
 		elog "in the Core Pointer's InputDevice section (Section \"InputDevice\")"
 		elog ""
-		elog "Starting with 1.5 version, X.Org Server can do mouse auto-detection."
+		elog "Up to version 1.8, X.Org Server can do mouse auto-detection."
 		elog "This ebuild provides a working default which has been installed into:"
 		elog "    /etc/hal/fdi/policy/90-vboxguest.fdi"
+		elog "This is no longer necessary for X.Org Server 1.9 or higher. Use"
+		elog "the server's udev autodetection with such versions."
 }
diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 63e0e6390cef..6ccc9cfe91be 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-virtualbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.53 2011/01/06 22:55:40 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.54 2011/01/07 18:50:20 polynomial-c Exp $
+
+  07 Jan 2011; Lars Wendler <polynomial-c@gentoo.org>
+  xf86-video-virtualbox-4.0.0.ebuild:
+  Respect LDFLAGS properly. Thanks to xarthisius for providing a feasible fix.
 
 *xf86-video-virtualbox-4.0.0 (06 Jan 2011)
 
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.2.12.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.2.12.ebuild
index d0aa31a30035..ee7133748b69 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.2.12.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-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/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.2.12.ebuild,v 1.2 2010/12/31 14:44:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.2.12.ebuild,v 1.3 2011/01/07 18:50:20 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild
index f34e7f9cffa5..fcc61348a729 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild,v 1.1 2011/01/06 22:55:40 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild,v 1.2 2011/01/07 18:50:20 polynomial-c Exp $
 
 EAPI=2
 
@@ -76,6 +76,10 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch"
 		epatch "${FILESDIR}/${PN}-4-makeself-check.patch"
 		epatch "${FILESDIR}/${PN}-4-mkisofs-check.patch"
+
+		# Respect LDFLAGS
+		sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
+			-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
 }
 
 src_configure() {