Proper fix for respecting LDFLAGS by Julian Ospald, bug #491602

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 55 insertions, 21 deletions

diff --git a/dev-python/cx_Freeze/ChangeLog b/dev-python/cx_Freeze/ChangeLog
index 1a4207ef31d7..1ad76a8dd18b 100644
--- a/dev-python/cx_Freeze/ChangeLog
+++ b/dev-python/cx_Freeze/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/cx_Freeze
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/ChangeLog,v 1.8 2013/11/18 13:48:45 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/ChangeLog,v 1.9 2013/11/19 12:26:09 pinkbyte Exp $
+
+  19 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> cx_Freeze-4.3.1-r2.ebuild,
+  cx_Freeze-4.3.2.ebuild, +files/cx_Freeze-4.3.2-buildsystem.patch:
+  Proper fix for respecting LDFLAGS by Julian Ospald, bug #491602
 
 *cx_Freeze-4.3.2 (18 Nov 2013)
 
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 5643be6b883b..d2cccacb9a08 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cx_Freeze-4.3.2-buildsystem.patch 1417 SHA256 a25b4c60cc552be7bd5f5164cf0e2a3e82f0e906f3d54530df9787f36df6a910 SHA512 283c031e0064bf9a630ee68478930913d3fd778e2f8bbb95a56e2cb6bf5e3b905d292e020ab598691098cc2bbad4322fc7499f48c822c9fe23b2a7e1edd02b42 WHIRLPOOL 98f3785ca9e9b32b509879a1296a7d2b9edb7b1a0103d9dba2d9df51474e9cc4960b78a4008bedc9674ef11ef46c64e00cf6e850e9c4b58ae062f444023546e2
 DIST cx_Freeze-4.3.1.tar.gz 53441 SHA256 11f8818ab4e1754c81c1226ce3430f29e6ba231a22a153ce3794a5cc464fa11b SHA512 3fbd179e6b0dcdc926c8827745dfe52df01c0ba1a36f5ae01240d977a251517ce9dba6b6f276a2a292f4a0bd91e923899da1bbd08671cee687a912980481e9e9 WHIRLPOOL dcbc2d29eafd4e3f4361da7a6501fa929bd1bd66b0f29b0d9cd717609b30150ea43387468565d41e663d1f8425f7889122da929c8b160473cb0580d2630e02a5
 DIST cx_Freeze-4.3.2.tar.gz 55816 SHA256 d634aae1e1d20b660d24245450b8a5ea3ad9c443cd735d8fbe17c1d93b8b23df SHA512 2ff4d695ac5ff23b68d0ee32c94948beef7c6be9a2b606e43c77bf954fe96c0dba6fa5186e3995c2937c6b5862fb3b0dd3e21c518626c1905a13b6d0abdcd3ec WHIRLPOOL e3ee3cc1b893f18b3afea645bdb7d5c72d5363380aa18a2416d2693c9f185a57442083f4bf19760ffdf7fe8e587ab835c2dbe56ed713c3bf59679a0d92bb1fca
-EBUILD cx_Freeze-4.3.1-r2.ebuild 745 SHA256 f896f51c711581826c8f40524bdfd629bd770331b47ea1f396036b8f5019439a SHA512 bb074ebc421e9520c5ed46f17950cb07e41fa9526c995a9def7e1d2d024a619bca5e1b6af271403031dd4846d48137e1b824ca908895ba6021995cd32c7f1445 WHIRLPOOL 77099bad82fc856a15885e0424be6df013214790563f737b7678991c35bcd319978d90d02b468a495c1777e84e341eb03c9e683b53b6df0851b89c34217f6a44
-EBUILD cx_Freeze-4.3.2.ebuild 744 SHA256 01f9c54e66a2061dc8fc093de412d63edcb3f022f15e1c604624daa559d84685 SHA512 48d54282d84a1553297c2b4d8db37e552862be3207e01322a0892bb08426f06ff3f80ec96d756066f2ccbecb0fb1663bda0ce59535537df8e7edcbf96afc78ed WHIRLPOOL e511cf3042cc2fb97db4d8961dc71d0fea658dfda63de3c810094529c37f5c1b796111eee2eb02419685646d436f610be3a704be84dd393b00ce7eb03fff731f
-MISC ChangeLog 1412 SHA256 cc36a5a3972ef2b162e0b542fb24e351a73e8e918900675b75381b75c67d8c79 SHA512 9634f811ed9c823cbf337b57264e480909a809229c211c2ef7668bc33182ef69e185894ab33cc6554368ccd13c6cbe569151daf1b4aff67fcae4d09aa498a7f4 WHIRLPOOL 99f287d942dd6cefc1562ac3e0531591c5701674a648641791c26f4a74565b453b7249d21b5a2dfa000c317eef47dfbb31882d762c7960df768042d48785b62a
+EBUILD cx_Freeze-4.3.1-r2.ebuild 600 SHA256 c44e345c2db6bcdc78ce9c446cff35c4683a1d92e7aed8b27b284942350b834e SHA512 2e666b1dc2da986bec9e0c941f72595229b47706982f03b77b99780baee7f47950172877b4d03d73a07edfe3f80c54de392888c51248e2c7765854f9dd7a4ee0 WHIRLPOOL 7d5a617ef748f24f09ec6e375e8cb74dbe9493b2ff82da0cb0204d5d51c3fca8f01a0c0b86f4e1e97ce75701051f643f960d60c9122aa869afbc2fb6cfa4c448
+EBUILD cx_Freeze-4.3.2.ebuild 599 SHA256 0514b3af4e70f3b1c50e7b51b83883e37678345ab4aa1b89b4851238b0d05686 SHA512 bcb99148cbcc1ed6449d5e7e11e0701147d7620eecafa05e5b411e2ec254bdcdd055bb3dee96c4687ae62739f673febd2c899cf6261207f8795b62947c302c89 WHIRLPOOL 53b40c35374c61bee19a2be3d8d7b4ea4eb8a2680467f0918b7e82e63ff80b41e8ad16bca452b6e276e7431eed2cb8c67e79dea1bf87f3932ee2e996a75e1c61
+MISC ChangeLog 1624 SHA256 8c724fd6c8b5e654380d0b6b2c2b89cd3f7209178c0a36b861fb52c26ca99569 SHA512 6d7f95a74a042602cb9b807376fef1a481ed76d9042216bc1b4ac28b3aecb8ae70a85ad7a691cd5786204c048ce146dd40db7ec27ddf8ecff8be8d77c58128c1 WHIRLPOOL b611bcbaff41c61c8febdeb3b32c03d6086380499902fb60870afa4d0907426d07a4fd455d9a7b13ddb93a3e6d4e4bfdf656f1ee3d5e32a926c501279355f542
 MISC metadata.xml 254 SHA256 f422e27561552239050ffcff80d8de8bc5b2677e6ee8c828cf24d9e2ca0fe5b1 SHA512 9821417d6a2819a873402b46e65c323d0be4869b517ba3800d8fc4194a5ca1db48fa24c44a0faf8d884c9aef8cad78cd038ab39f06df923cc624970451112894 WHIRLPOOL 6f98e3627370eddb95992e261035df649f33c06402896dfd65198c214207ad6ea75b49afa7df16087c956c905358ad053b2738685ecf0ebb73c870784a844e9a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSihqlAAoJECo/aRed9267NtIH/0GhzjxSqYpv/TKsfvhIJUZt
-8lxoOhz+kdCK/zmRwBZ2HMl/tDpH9YKxUGDeSnyPgr5Ex984SpH3K1aeZuRE6mwJ
-EbktSY3yPsKmqwtqPdSnSZKb5hii8tgE5RgvA8zeA1sQtMq9ctm/02IAvGd6FQgq
-u2YdbtqUELcQh2D9FFF6iNVLQOV1X1qpRDQbldXf7Pz3WVkFuQKaMysr3U/Esj7s
-91pgbq0ekxNSiK1Fkmkg7mSkDLI58NQG2W+2xaB/LR64qHGlkz0pCnKSUDGDlV1Y
-tGcj6ViBcVC57mSiZmHGgtJHmg2p7maIJ97qOoYzffQk8HG1gGP4JHbwizWQ/ZU=
-=nxZA
+iQEcBAEBCAAGBQJSi1jnAAoJECo/aRed9267nC8H/i93nHzxeHwSXQmyNLYlI+Ep
+RbQr0b+IuA5s18NBlEoULpaz3zbtihvYg0W17C1nz5tYalNxQ6KayxLaqsjh4Zcm
+msbSn0VeBfSsqh3exsCYCzBCvqpck+ve4w14rtUTr1CTo8lra319nWenJ2Vxenih
+x1dA07NdIO6+jJ8I2AvqDExpAyxgV7DFDp88Hlft+WJ3bmwQJOCTjdlyOTpOPbVg
+VEwM2tLUIrJPylrO8IMdMpu7Hct4/uTjFTNDiFbedyywsL505wqBSaRQHdFXXsz0
+2lryDjl3maNIGKrOI9ZKQYkGnWHXT7nqVETpSDmCX9RQ9KKC5U/8qlqwU27Ek9I=
+=11mQ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild b/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild
index 879ecc824bf1..29c3ec57a886 100644
--- a/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild,v 1.2 2013/11/18 13:43:42 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild,v 1.3 2013/11/19 12:26:09 pinkbyte Exp $
 
 EAPI="5"
 
@@ -17,7 +17,6 @@ KEYWORDS="amd64 x86"
 
 DOCS=( README.txt )
 
-python_prepare() {
-	# do not strip binaries, respect LDFLAGS
-	sed -i -e '/extraArgs.append("-s")/s/extraArgs.append("-s")/extraArgs.extend(vars["LDFLAGS"].split())/' setup.py || die 'sed on setup.py failed'
-}
+PATCHES=(
+	"${FILESDIR}/${P}-buildsystem.patch" # bug #491602
+)
diff --git a/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild
index 02e8df26d192..07b045d18775 100644
--- a/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild,v 1.1 2013/11/18 13:48:45 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild,v 1.2 2013/11/19 12:26:09 pinkbyte Exp $
 
 EAPI="5"
 
@@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~x86"
 
 DOCS=( README.txt )
 
-python_prepare() {
-	# do not strip binaries, respect LDFLAGS
-	sed -i -e '/extraArgs.append("-s")/s/extraArgs.append("-s")/extraArgs.extend(vars["LDFLAGS"].split())/' setup.py || die 'sed on setup.py failed'
-}
+PATCHES=(
+	"${FILESDIR}/${P}-buildsystem.patch" # bug #491602
+)
diff --git a/dev-python/cx_Freeze/files/cx_Freeze-4.3.2-buildsystem.patch b/dev-python/cx_Freeze/files/cx_Freeze-4.3.2-buildsystem.patch
new file mode 100644
index 000000000000..288443bba495
--- /dev/null
+++ b/dev-python/cx_Freeze/files/cx_Freeze-4.3.2-buildsystem.patch
@@ -0,0 +1,31 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Nov 19 11:20:21 UTC 2013
+
+Respect LDFLAGS, remove stripping.
+Fixes Gentoo bug #491602
+
+--- a/cx_Freeze-4.3.2/setup.py
++++ b/cx_Freeze-4.3.2/setup.py
+@@ -78,11 +78,12 @@
+         extraArgs = ext.extra_link_args or []
+         if sys.platform != "win32":
+             vars = distutils.sysconfig.get_config_vars()
++            if vars["LINKFORSHARED"] and sys.platform != "darwin":
++                vars["LINKFORSHARED"] = vars["LINKFORSHARED"] + " " + os.environ["LDFLAGS"]
++                extraArgs.extend(vars["LINKFORSHARED"].split())
+             if not vars.get("Py_ENABLE_SHARED", 0):
+                 libraryDirs.append(vars["LIBPL"])
+                 libraries.append("python%s.%s" % sys.version_info[:2])
+-                if vars["LINKFORSHARED"] and sys.platform != "darwin":
+-                    extraArgs.extend(vars["LINKFORSHARED"].split())
+                 if vars["LIBS"]:
+                     extraArgs.extend(vars["LIBS"].split())
+                 if vars["LIBM"]:
+@@ -91,7 +92,6 @@
+                     extraArgs.extend(vars["BASEMODLIBS"].split())
+                 if vars["LOCALMODLIBS"]:
+                     extraArgs.extend(vars["LOCALMODLIBS"].split())
+-            extraArgs.append("-s")
+         elif ext.name.find("Win32GUI") > 0 \
+                 and self.compiler.compiler_type == "mingw32":
+             extraArgs.append("-mwindows")