Let the Makefile respect LDFLAGS (bug #332221).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 38 insertions, 12 deletions

diff --git a/net-wireless/gobi_loader/ChangeLog b/net-wireless/gobi_loader/ChangeLog
index f2816c32b3bb..60337c85ddf8 100644
--- a/net-wireless/gobi_loader/ChangeLog
+++ b/net-wireless/gobi_loader/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/gobi_loader
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gobi_loader/ChangeLog,v 1.3 2010/08/03 18:44:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gobi_loader/ChangeLog,v 1.4 2010/08/11 14:01:18 polynomial-c Exp $
+
+  11 Aug 2010; Lars Wendler <polynomial-c@gentoo.org>
+  gobi_loader-0.7-r1.ebuild, +files/gobi_loader-0.7-makefile.patch:
+  Let the Makefile respect LDFLAGS (bug #332221).
 
 *gobi_loader-0.7-r1 (03 Aug 2010)
 
diff --git a/net-wireless/gobi_loader/Manifest b/net-wireless/gobi_loader/Manifest
index 0c375f75e6d4..86a2d5bd43ca 100644
--- a/net-wireless/gobi_loader/Manifest
+++ b/net-wireless/gobi_loader/Manifest
@@ -1,4 +1,5 @@
+AUX gobi_loader-0.7-makefile.patch 686 RMD160 2565776fb06abd68041b28867ba1986169036140 SHA1 8acc0f0afd3a97816744c115d31c034076454604 SHA256 2c06ac0146f6fcbe78a08584a845a95bf923e27dee4cccbed7eba345f9ff19ff
 DIST gobi_loader-0.7.tar.gz 5056 RMD160 4e267e6cbeed215991888e7c9495cac72ee39ee2 SHA1 1f45d23818d0b0bb507c87803baecf46a0a065c2 SHA256 78bdc255451cde1caa406e146b01a88828480c9c43272de8cffdb61627be754a
-EBUILD gobi_loader-0.7-r1.ebuild 829 RMD160 673ce461705184c4bee11057bad2dd95c64a8499 SHA1 c0c3ca5fc0408695f543b0c0480d0bb35f7797bc SHA256 95745cd673757bb01d481bdfd9ea4db6884d83191f4d2caeaf2d3cfd4e17529c
-MISC ChangeLog 868 RMD160 fc1ae7e8193783e7e2943d9a0180a5d7e88083c5 SHA1 3b203a2fd5e5ee1ddd8d6e078d114b05ccc99a52 SHA256 f29c6887fa0bfd6ba2f9023a73cc8b25a056539c8ce26795f0b61f27e438b2cf
+EBUILD gobi_loader-0.7-r1.ebuild 848 RMD160 975506593630b58fb0deab9f2c0f55465d6897dd SHA1 392fd1776cf2982fb6261c50efb00d82c84f3557 SHA256 671fee59548066a0c50ac200b3016b48336a69a3f38ce69653d25607cbcc9a2f
+MISC ChangeLog 1041 RMD160 dc350a1c7e947c9a32856b20e80ce3b8f3feeab4 SHA1 285b8ab64dd29112bb41e82924b689db263a3d5f SHA256 babc3666f3d69b3d8c9b23482b60c2c91db0de3eafd0d50da2ca4f3b0d3a9c17
 MISC metadata.xml 401 RMD160 bd4273613004bd64f9268fa7a13606c812db11eb SHA1 3cd7519a0c49cadb894da49919ec99522f9dec3d SHA256 df1e4b8fc27b714ec9a2e58cd0d3fd4dee2c6ebbbc856fad8eb28b48aeef22ca
diff --git a/net-wireless/gobi_loader/files/gobi_loader-0.7-makefile.patch b/net-wireless/gobi_loader/files/gobi_loader-0.7-makefile.patch
new file mode 100644
index 000000000000..0e0b05a613fb
--- /dev/null
+++ b/net-wireless/gobi_loader/files/gobi_loader-0.7-makefile.patch
@@ -0,0 +1,22 @@
+--- gobi_loader-0.7/Makefile
++++ gobi_loader-0.7/Makefile
+@@ -1,15 +1,14 @@
+ VERSION = 0.7
+ 
+ gobi_loader: gobi_loader.c
+-	gcc -Wall gobi_loader.c -o gobi_loader
++	gcc ${CFLAGS} ${LDFLAGS} -Wall gobi_loader.c -o gobi_loader
+ 
+ all: gobi_loader
+ 
+ install: gobi_loader
+-	install -D gobi_loader ${prefix}/lib/udev/gobi_loader
+-	install -D 60-gobi.rules ${prefix}/lib/udev/rules.d/60-gobi.rules
+-	mkdir -p ${prefix}/lib/firmware
+-	-udevadm control --reload-rules
++	install -D gobi_loader ${D}${prefix}/%LIBDIR%/udev/gobi_loader
++	install -D 60-gobi.rules ${D}${prefix}/etc/udev/rules.d/60-gobi.rules
++	mkdir -p ${D}${prefix}/lib/firmware
+ 
+ uninstall:
+ 	-rm $(prefix)/lib/udev/gobi_loader
diff --git a/net-wireless/gobi_loader/gobi_loader-0.7-r1.ebuild b/net-wireless/gobi_loader/gobi_loader-0.7-r1.ebuild
index c0aecb2949cf..e59bb2527e9d 100644
--- a/net-wireless/gobi_loader/gobi_loader-0.7-r1.ebuild
+++ b/net-wireless/gobi_loader/gobi_loader-0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gobi_loader/gobi_loader-0.7-r1.ebuild,v 1.1 2010/08/03 18:44:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gobi_loader/gobi_loader-0.7-r1.ebuild,v 1.2 2010/08/11 14:01:18 polynomial-c Exp $
 
 EAPI="2"
 inherit eutils multilib
@@ -17,18 +17,17 @@ IUSE=""
 DEPEND="virtual/libusb:0"
 RDEPEND="${DEPEND}"
 
-src_install() {
-	# Makefile is bad
-	insinto /$(get_libdir)/udev
-	insopts -m0755
-	doins gobi_loader
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	sed "s:%LIBDIR%:$(get_libdir):" -i Makefile || die
+}
 
-	insinto /etc/udev/rules.d
-	insopts -m0644
-	doins 60-gobi.rules
+src_install() {
+	emake install || die
 }
 
 pkg_postinst() {
+	udevadm control --reload-rules
 	einfo
 	einfo "Put your firmware in /lib/firmware/gobi."
 	einfo