Respect LDFLAGS wrt bug 323919.

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

4 files changed, 38 insertions, 13 deletions

diff --git a/net-misc/nstx/ChangeLog b/net-misc/nstx/ChangeLog
index b84b97b8e739..3221acc56369 100644
--- a/net-misc/nstx/ChangeLog
+++ b/net-misc/nstx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/nstx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nstx/ChangeLog,v 1.10 2010/05/30 16:34:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nstx/ChangeLog,v 1.11 2010/07/05 07:31:13 xarthisius Exp $
+
+  05 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  nstx-1.1_beta6-r3.ebuild, +files/nstx-1.1_beta6_05-respect-ldflags.patch:
+  Respect LDFLAGS wrt bug 323919.
 
   30 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   nstx-1.1_beta6-r3.ebuild:
diff --git a/net-misc/nstx/Manifest b/net-misc/nstx/Manifest
index 4a544b5692cd..11f06df3b85e 100644
--- a/net-misc/nstx/Manifest
+++ b/net-misc/nstx/Manifest
@@ -3,6 +3,7 @@ AUX nstx-1.1_beta6_01-bind-interface-name.patch 4226 RMD160 34dcf9f47060a6ebdb0f
 AUX nstx-1.1_beta6_02-warn-on-frag.patch 736 RMD160 466cbaf1034ac998934bcd003e86c723bcac1968 SHA1 095593ab35835e13a09d8b5bcc70c3dda1bf057e SHA256 278b1399afa22d2077650db3bb877a19bf56fe75f53f87b3104c6a04af7a9484
 AUX nstx-1.1_beta6_03-delete-dwrite.patch 508 RMD160 13e68edf37c5b976a04d44eab81f6f4b4788b80c SHA1 50cb6328d607e38ac80e105c0fe4dbff9a25f592 SHA256 77165b0575a72c054cb43d4133a11d6a555e685e4e4775c2baed25871d5f6acd
 AUX nstx-1.1_beta6_04-delete-werror.patch 433 RMD160 2a74a19537ac54d6da8fe3affd948fb339ef7aaf SHA1 48c47127337ec8ba813450cfda9043f66275cc43 SHA256 362f07ae993e9480669673493055cfac4428a1fbe12e4ba88855794db5bf0a3e
+AUX nstx-1.1_beta6_05-respect-ldflags.patch 448 RMD160 569722cd45d1f0715d9016beda35789b60d5be31 SHA1 76d63305ef89c659f49fed6153654579a11a4fdb SHA256 30d0aad3e5c790d627de7472f23f0221855c5eb7828d35956197c33c2062f0e6
 AUX nstxcd.conf 2237 RMD160 864b340701eaa3ef30fe597439daeb36a6926d0a SHA1 394c3b183b8a4cf95dbd7adad01ab3d8c5220ec0 SHA256 b5db1816444f44899820119fa7cb05bbea0b0c2d41f0151dd7c1afbaae78c089
 AUX nstxcd.init 2444 RMD160 fbad89e8a045a9bab1b8525755c1dab24e58d2c0 SHA1 76f9c8e48ee250ddccbab8dbf716342500747ddd SHA256 0ff59f3b6c9f63057470f061660389d619cefd224a68f95e00a15be7e81cbc02
 AUX nstxd.conf 1377 RMD160 e7222ab1a736fa4ab918c4ab51e6500724eb7d9b SHA1 e716962bf806b9bf02c1d6803b9b7d1570a9e8dc SHA256 eed0298b1a7866a3f9ef2469467b8e18156464b0de9906fc9815bce0ebe6fea0
@@ -11,6 +12,6 @@ DIST nstx-1.1-beta6.tgz 20458 RMD160 1392d7f96c9668cc40b65fa30cbaf8cf1b64feb2 SH
 DIST nstx_1.1-beta6-4.diff.gz 7743 RMD160 dc4d153ee5c38b3813e1612fecf079683b72e8e0 SHA1 a80cbdfa2b0f8e21d43467a974bb64ffe76fcb32 SHA256 f2fc046cc08831599f2a95c874b7a028238c73e1f2cd4964ee86aa4c4307b8a8
 DIST nstx_1.1-beta6-5.diff.gz 10063 RMD160 746dd30e12bf5a74411b6a3b832e9e772382de3e SHA1 5973bca267d0e273b1c7aa159e88ac552676d2f3 SHA256 ee301d0bee2a3e44f576a6c8cf1534878264f6d79a489eae5ca7237262cd0d32
 EBUILD nstx-1.1_beta6-r2.ebuild 1036 RMD160 f710b69fba7e7d92aafcf3b6250da751c92bc2aa SHA1 987e3b7b8b5a6004a9a17aead27877dd38a90832 SHA256 78e602619c55ef8203cce54ce5158127c8cb5d9b04d357123819937a41299b95
-EBUILD nstx-1.1_beta6-r3.ebuild 1565 RMD160 c310ae5cd180a843ee252b772ce8e2ef3269374b SHA1 a1d25e3251e32bd77f535cd2883a8f33bb36a445 SHA256 1dfbac74fc248710b40bc3bd36177b1039a9f92ea05c2c228b874bc666caba75
-MISC ChangeLog 2142 RMD160 010ce6e283dea5e3daae8c080b8d57d11e4db9bc SHA1 d5c31be4aec42f5dccb5686a7d01c1c1e81a1a51 SHA256 e3ffbb6a374acd7feb816cb104c1573dc4e5a3dcc118efb8d9413ec64cc90a84
+EBUILD nstx-1.1_beta6-r3.ebuild 1625 RMD160 e8e895535b159dc90d82fcabe9c67c79f925a29d SHA1 f700739fb4f08ff02b4de1629f6474270491f6d5 SHA256 71ae2efa15dfb373d0acb829590d1a66b790f0c64da29a4a280ee03042c99060
+MISC ChangeLog 2307 RMD160 25606bf47be93ecc4d7b228d01a396f9024aa623 SHA1 cbf55f419a6b80232f6605b63aa5b8c0c0f4eeb0 SHA256 d522911e5fbb0a2f7c275231e4a5386810c67fd66327899fec671d80e5c93305
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/net-misc/nstx/files/nstx-1.1_beta6_05-respect-ldflags.patch b/net-misc/nstx/files/nstx-1.1_beta6_05-respect-ldflags.patch
new file mode 100644
index 000000000000..47edb029edb9
--- /dev/null
+++ b/net-misc/nstx/files/nstx-1.1_beta6_05-respect-ldflags.patch
@@ -0,0 +1,19 @@
+Respects LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=323919
+
+--- nstx-1.1-beta6/Makefile
++++ nstx-1.1-beta6/Makefile
+@@ -11,10 +11,10 @@
+ all: $(PROGS)
+ 
+ nstxd: $(NSTXD_OBJS)
+-	$(CC) $(CFLAGS) -o nstxd $(NSTXD_OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o nstxd $(NSTXD_OBJS)
+ 
+ nstxcd: $(NSTXCD_OBJS)
+-	$(CC) $(CFLAGS) -o nstxcd $(NSTXCD_OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o nstxcd $(NSTXCD_OBJS)
+ 
+ clean:
+ 	rm -f *.o $(PROGS) Makefile.bak *~ core
diff --git a/net-misc/nstx/nstx-1.1_beta6-r3.ebuild b/net-misc/nstx/nstx-1.1_beta6-r3.ebuild
index 0227c8f6d7d2..dd716a42ae5f 100644
--- a/net-misc/nstx/nstx-1.1_beta6-r3.ebuild
+++ b/net-misc/nstx/nstx-1.1_beta6-r3.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-misc/nstx/nstx-1.1_beta6-r3.ebuild,v 1.2 2010/05/30 16:34:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nstx/nstx-1.1_beta6-r3.ebuild,v 1.3 2010/07/05 07:31:13 xarthisius Exp $
 
 inherit versionator toolchain-funcs eutils linux-info
 
@@ -26,12 +26,13 @@ CONFIG_CHECK="~TUN"
 
 src_unpack() {
 	unpack "${MY_P}.tgz"
-	epatch "${DISTDIR}"/${DEBIAN_A}
-	epatch "${FILESDIR}"/${PN}-1.1_beta6_00-linux-tuntap.patch
-	epatch "${FILESDIR}"/${PN}-1.1_beta6_01-bind-interface-name.patch
-	epatch "${FILESDIR}"/${PN}-1.1_beta6_02-warn-on-frag.patch
-	epatch "${FILESDIR}"/${PN}-1.1_beta6_03-delete-dwrite.patch
-	epatch "${FILESDIR}"/${PN}-1.1_beta6_04-delete-werror.patch
+	epatch "${DISTDIR}"/${DEBIAN_A} \
+		"${FILESDIR}"/${PN}-1.1_beta6_00-linux-tuntap.patch \
+		"${FILESDIR}"/${PN}-1.1_beta6_01-bind-interface-name.patch \
+		"${FILESDIR}"/${PN}-1.1_beta6_02-warn-on-frag.patch \
+		"${FILESDIR}"/${PN}-1.1_beta6_03-delete-dwrite.patch \
+		"${FILESDIR}"/${PN}-1.1_beta6_04-delete-werror.patch \
+		"${FILESDIR}"/${PN}-1.1_beta6_05-respect-ldflags.patch
 }
 
 src_compile() {
@@ -40,9 +41,9 @@ src_compile() {
 
 src_install() {
 	into /usr
-	dosbin nstxcd nstxd
-	dodoc README Changelog
-	doman *.8
+	dosbin nstxcd nstxd || die
+	dodoc README Changelog || die
+	doman *.8 || die
 
 	newinitd "${FILESDIR}"/nstxd.init nstxd
 	newconfd "${FILESDIR}"/nstxd.conf nstxd