QA: fix handling of LDFLAGS.

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

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 820f756c6ac9b4656cf43c553afc113362783fda..50cb44766a2e08589d3f689804a7027e5787b170 100644 (file)
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.76 2011/11/22 15:54:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.77 2011/11/22 18:52:30 flameeyes Exp $
+
+  22 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/gpsd-3.3-ldflags.patch, gpsd-3.3.ebuild:
+  QA: fix handling of LDFLAGS.
 
   22 Nov 2011; Mike Frysinger <vapier@gentoo.org> gpsd-3.3.ebuild:
   Replace STAGING_PREFIX with SYSROOT.

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 2478a2bcb06c99e2a5ead218f5931416211fcb9a..b8cd276a8b543b0e6b30901dc61628e442a55cbc 100644 (file)
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 2.95-disable-strip.patch 382 RMD160 e9e94c7593b60c12dde86dc4d769ff0ff7a60413 SHA1 4ae5f084998b1538bf5428fd37016f48d57da0ee SHA256 435a6fa9c1ea46befc24af760da9ef96f4a66b9bf98c2b9d5d3f9ba2c72b4080
 AUX 2.95-fix-ldflags.patch 721 RMD160 4be1b2ea581d8aef35896acd9098bc298b3199ad SHA1 c8b03243da8d747429632eab871fa40e412be509 SHA256 3a93468ca101c876549bdda0a1d129ca5803706e4291f9fc8e7c74d2015ecf5a
 AUX 2.96-fix-ldflags.patch 1000 RMD160 a1d4fa399bf9dee71b7adebd2ed2f01d39e7c4f7 SHA1 05530775b53cd5f60f619af8d95499822b42c779 SHA256 a83e03fa5b7b4286724339f44d4933427b7e80cea82887a89a0a7b9cd665a8df
 AUX 2.96-fix-tests.patch 944 RMD160 c04e257c4aec8147f24d5c8f1850718f3756f128 SHA1 bcba7823b35a8bb487d93ce875bae32131ae9e10 SHA256 2dced865a8a8951855b9ee8fc5586aa9be3f0c7513c8299c4632ca32a31d2074
 AUX 2.96-pkgconfig.patch 1377 RMD160 20ff8e65763981f4f7075dc0a86764bd02017d75 SHA1 203172648b7b1e16e3b28a5815238adf4649a1fc SHA256 8b20899afd3e0e391664461ef359eef1ed6bfc49ba633c90e683178637359e15
+AUX gpsd-3.3-ldflags.patch 543 RMD160 d438420d25adc27438e9e3f34fddf807d5e84111 SHA1 5ce4ea4aa4c291bbea135b63e064344245ebc5a5 SHA256 7a7a145ff644d811a550e4459b6c7833d8e2ad825fcc6679be6ede2d125c3174
 AUX gpsd-3.3-pkg-config.patch 1925 RMD160 eeae061c8e807ada8f736d89e3146847bc9a1d47 SHA1 a0dcf519bab808af1675b84171997eaf620b2073 SHA256 1b97692277e94969c547e3cb35185554655500ebbab2e84467456a0c03a1bc79
 AUX gpsd-3.3-release-rev.patch 1206 RMD160 4db37f9d998cc56c32cb1deb0679dd9ba11c0f21 SHA1 e7e3e0a1fda9fd55ea5c0c86ecdcd33972840b79 SHA256 37688ad979c9915e25952f461fefa313682e3f62b8093a7b5205e1e9164df2e5
 AUX gpsd-3.3-setup.py 448 RMD160 3b06265cde87612040ef2955f097fe2b87b433a7 SHA1 e8d1b510aed5b6c267b92c059ceaef255ce0756f SHA256 3a8f18f7f1e957c1b33ea25046dc4116422d087dd9f880f7bf2ad8fd0153f4c4
@@ -17,13 +18,13 @@ DIST gpsd-2.96bis.tar.gz 1554605 RMD160 ea09b73709627f95470dbd023e5ffc48209fde6a
 DIST gpsd-3.3.tar.gz 1401206 RMD160 73442e2bccac87a7ba4349ec63c443edbf05a131 SHA1 82a2ffe825c30c2152f2696221dbeeb82a4e9dd5 SHA256 1dbc1813f94f7f05fbf3341bf0154bae26903d1fb90c33b63d5458373ea931b9
 EBUILD gpsd-2.95-r1.ebuild 2674 RMD160 3cfe82ffac9f57d771b6728420d106debd49c22e SHA1 86ba4ecde7158a24c535675036f638c9f6683ecc SHA256 d8e81c1b8b9531fc59ea1c9da7710c76c23802faec8e6d404732ed557058ed7b
 EBUILD gpsd-2.96-r1.ebuild 2840 RMD160 75cc21a587c3ef12bb891f8a2dc7ee30fa7cfb1f SHA1 bdf8663fb324ca8ddbe81b58348d12b6a03174ca SHA256 04bab92bbe716753ff6bcd719fa958e32440e7bcc219c6d409936edda0fed695
-EBUILD gpsd-3.3.ebuild 4101 RMD160 def523b442bcb7c144082d241c0a3e8c0031a54d SHA1 185d8af43de11b568da4a4814214daf2ecd603bf SHA256 1363bc95c5208feea0185bc6f5aaff23f04fce3c3dff1f64dbffd5ced2cd9d2e
-MISC ChangeLog 14155 RMD160 3b2773b14c34110069b87a59745484d24f6978d8 SHA1 51c1cd6bdcf28ca65f70e4344a012253000a58cd SHA256 f627e55238f5a1940376e441cb5c584cf41385a7a7b022702c74fbf640eaedf3
+EBUILD gpsd-3.3.ebuild 4145 RMD160 454a2da60f501ac74e252c7ea24c974b1fef01df SHA1 71da34e59fbb43815fed0653af9e3290ddef9da7 SHA256 2eea0510ce1e65d67cd65a41a7191bee6f0d0dfdc4eb5a6f218ed61a4bc47186
+MISC ChangeLog 14296 RMD160 31fe14d449100aee8c8e8b0d7293f5131a49929a SHA1 296e670fb703135d4891b02296038ca32b03b865 SHA256 4a59887e29f7ae11f35324617134022632050e63c6ebbcb54c9efeeea8eccab5
 MISC metadata.xml 572 RMD160 405fe380fe1257019ea02155b4f3c5316cb38380 SHA1 3a4945cdf750d48c8468650c1218c22f77872ccd SHA256 602da5f9768c2f0866c924db204baff61765479af03c71cfe3ae99ed8df7d436
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7LxakACgkQaC/OocHi7Jai3QD8Dingy11BrVwzPUucB1T2q6pI
-/BhUbYcTLfj7lFPJCMoA/1dCvfqp7dxY8WrfTPBWk83f6QwBjnQPhwS1Dy844z6D
-=fxjg
+iEYEARECAAYFAk7L73EACgkQAiZjviIA2XhIrACdESib5DrkCcA4eUBn+ibEb3ba
+JZ0AnRins+P0Xj8dVzOoPeXHircr95PO
+=BWci
 -----END PGP SIGNATURE-----

diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-ldflags.patch b/sci-geosciences/gpsd/files/gpsd-3.3-ldflags.patch
new file mode 100644 (file)
index 0000000..3fa23ae
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.3-ldflags.patch
@@ -0,0 +1,13 @@
+Index: gpsd-3.3/SConstruct
+===================================================================
+--- gpsd-3.3.orig/SConstruct
++++ gpsd-3.3/SConstruct
+@@ -214,7 +214,7 @@ for i in ["AR", "ARFLAGS", "CCFLAGS", "C
+             env.Replace(**{j: os.getenv(i)})
+ for flags in ["LDFLAGS", "LINKFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
+     if os.environ.has_key(flags):
+-        env.MergeFlags({flags : [os.getenv(flags)]})
++        env.MergeFlags({flags : Split(os.getenv(flags))})
+ 
+ 
+ # Placeholder so we can kluge together something like VPATH builds.

diff --git a/sci-geosciences/gpsd/gpsd-3.3.ebuild b/sci-geosciences/gpsd/gpsd-3.3.ebuild
index 5a7c27cfaeccbd95fb6865bb164889bef4429165..9cb9965f5fe7b74820f7ff79c9090c24c7b41733 100644 (file)
--- a/sci-geosciences/gpsd/gpsd-3.3.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.3.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/sci-geosciences/gpsd/gpsd-3.3.ebuild,v 1.3 2011/11/22 15:54:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.3.ebuild,v 1.4 2011/11/22 18:52:30 flameeyes Exp $
 
 EAPI="4"
 
@@ -53,6 +53,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${P}-release-rev.patch
        epatch "${FILESDIR}"/${P}-udev-install.patch
        epatch "${FILESDIR}"/${P}-pkg-config.patch
+       epatch "${FILESDIR}"/${P}-ldflags.patch
 
        # Avoid useless -L paths to the install dir
        sed -i \