Fix bug 537202 and python_export_best deprecation

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

4 files changed, 39 insertions, 8 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index b1be4219db7d..67b9b1ef35b6 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.151 2015/01/19 12:32:36 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.152 2015/01/30 22:05:10 tomka Exp $
+
+  30 Jan 2015; Thomas Kahle <tomka@gentoo.org>
+  +files/wicd-1.7.3-undefined-LANG.patch, wicd-1.7.3.ebuild:
+  Fix bug 537202 and python_export_best deprecation
 
 *wicd-1.7.3 (19 Jan 2015)
 
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 246cc30df2c2..aafc1cf9a316 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -10,6 +10,7 @@ AUX wicd-1.7.2.4-fix-desktop-categories.patch 831 SHA256 ee431b7435e3fbab5c6f098
 AUX wicd-1.7.2.4-second-urwid.patch 1378 SHA256 3eed2084f5631bdeb4a27ce1f729aa4be8cb12414af5364312b09005b75bc7b5 SHA512 8c9ddf06eeba28408f38ed9c1bfc2e9bcd8f8a9df86b3dd8675c82c673e38fd180dff113e7965cae5d4448f27ee5af4378daa34d147a15151811e854606a1d92 WHIRLPOOL 360151ca59baf2300309f851ac73faf3044d783c6901d2327f56bfc2ac7672f2d53ac7d7034ea072e314cf487499a5ef0e3c0255782c669d92ee0e7b42bf4ab5
 AUX wicd-1.7.2.4-urwid.patch 2281 SHA256 6770f31f3a701fcdb019562ec63e53653463aca471d0d907227f6608d671cdf2 SHA512 0376d1f5fc3d9cd857fafa30024b6e754d202bbebc0c7fd498b77fd4c34d70cacd4c2b1cf6f5bd4be0ef6f6e2617feceab3e5b734e91ab2efe6c69f1a6a14508 WHIRLPOOL 1ebdf2f3c1362aa70fbed202c9d5afdc42ca12e1876c39184c2d52e681207a531b0bfd28c3131e3eaca158cc4277f61e7b2369a7414b1405189200b11d8d026a
 AUX wicd-1.7.3-add-missing-gnome-shell-extension.patch 1695 SHA256 9e94c652e2a85d8a2bdff41b9a2d7c28dd9f552fb0bdc88cff61e2b9b4336deb SHA512 4a08360d192f040983e782a81f8a57b8407726531551f512f5ea8537c18c3abf8934a1c597e73945637e15c96ba0f26cfc63525d00981a7ab6897ef0ab4ed2e5 WHIRLPOOL 6fa2c1bd6d7397dfc28e354019eba31ff77a6f1716c0b4a0f9490528dd85ce673c32dfd2c94c157384298716bf3839af4b7505339cfd0586e8f3668d25829eea
+AUX wicd-1.7.3-undefined-LANG.patch 946 SHA256 747f5a0b87460148af67c37cb63c563dd0ec68b362a1853836515f4ccfed182e SHA512 c2d197d41a84975bb3caf44de9b05b741b6702c38079ecc917632f9eedcf2be71373416154013690620511f2e9e99fb0d88cee0b22292fe007795cde664e63e5 WHIRLPOOL 0b36b1d1cf4de2ec375f70e8bfbf7d453eb5104bd3aa1b0e4e2ade6b9e211f1d0759cdd7b78a356ce5ef2d8a4cf5017a2529e8f274b41408597d45315e171085
 AUX wicd-init-sve-start.patch 317 SHA256 20d7ada99465da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db SHA512 d62db40a156aa9e7b97b23b3ebceded77bcae18ae513c39b8e4ef8733c30429059a83f932c83b3cf0b90fd0aeeeadc6249a71498c569630df057037acf43f3fc WHIRLPOOL 7df520e4e3291e032d031763f43596e97b66bdcf8418f0a328b885e3ee7051807b7023fa0663e2f42010bc3b71e4d7852e954a5b8e00e2805f4487f409a0da31
 AUX wicd-init.d 434 SHA256 5546deda3d5fa8f6ee1125922f1217182b24d68a22f5a1212509bb13bf0156e2 SHA512 1c774c8243901378307ab588dcddf31d861360cf35ed7f89edca1767008c6f7a21db92067186ab141966c2c11105d39aac196945f950d355fe45ad1c27111628 WHIRLPOOL cee886c76f77f80162c5f5ad5beaf77e43f38e7c40fdae88ca28b59f50fd2c8db8422357e96d74a53b22602e5250237833a8c4158321dc8c7e1c0844058971cb
 DIST Icone-Wicd-Lucid.tar.gz 9015 SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e64007e8e1240fd1c259ac707e SHA512 0df0dbdf05b462264dca2dd9955454a82f688b0fbfa7c2ad70a424df57eb27b35561d37819fc88b5746cff8a54de5b7b43ec325d2f98a4a1a30e4d500e86d2f8 WHIRLPOOL 336f363092c9bac7523047b6052a856a699820147967820418c6ac1ca528c472d371c6c211c505c325b5eb001812042c01425b05e1dfdf2d4a528f96686c530a
@@ -17,13 +18,13 @@ DIST wicd-1.7.2.4.tar.gz 439297 SHA256 dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f
 DIST wicd-1.7.3.tar.gz 542341 SHA256 91e38857b1651d242ed7e3b3e3fd8b076b4d06a23eedb033310fae510ece8401 SHA512 3ff3f42cd228327641b584bf85ef785a7d490fa5a57d1aa695f9b4860dae086c240a60321832a0aeee2dfb23de70da1a9f6abce4f1b6ecab58455304407fd536 WHIRLPOOL 69a9042e77f78f6d0dabc73e0569023d5a6747b82e3c944aad51a74681765b1b439beef1a578fcba4f048dbba6cbeabe0aca54ea62076d7dacdcbc4100ef2025
 DIST wicd-mac4lin-icons.tar.xz 53136 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011
 EBUILD wicd-1.7.2.4-r3.ebuild 4789 SHA256 88559b4a78b6a4910cc5384c11705f38a94ad2e220beb136512d422a33049b01 SHA512 9f2089eb50dd8996006899a1a6009fa2b033160133a87bfd725e723e4bf3bc96866e806eb66223b1eb93d530894a65a3033287fa1cc6670065843805d817e1ed WHIRLPOOL 54b8acbedc22dca6d36c0035f3405caf656eb88bd5404c1dffabe78bc73fde61d2b626742b2990ce6d8dae4e468d4b5d749756f7a952569b6ce544d2d0b87f62
-EBUILD wicd-1.7.3.ebuild 4570 SHA256 9e10e68b5d192b64c70e82a957e4a9c49e1c8e47c9754ce12640264bd654dcb6 SHA512 5c60c54d93c1b440e5cb59066ddb149a446cf70dc6c538caf158ea1fb6479207b19e197445594a0a6876f0a0a081200c99f0f88e3e5d705f99a9565ed87254a7 WHIRLPOOL b2f72d7570b02dc7ae9c551ea8fe959f6de8e163df2809d21e92f7a0264eae80e95f9c7204288dc81c9f5a1d0d8d0ec2afa868b5bb65f5d7c29f2733076cd110
-MISC ChangeLog 25356 SHA256 ce161488a07d3bc9a2241a0d2273313a232809a9f603199f6b626a30e6a9c3d0 SHA512 5fc5c7a93fbaa4d30dbee8b269c057d9442f305931bcb56e0c4f13c55ceb1251ea80da499ead0730a6cbbaa20e7ac0d191345b2fb34b508d4eda6c80304b901c WHIRLPOOL 459785d38f60d61b6d30097b3bc9696470d725da281cf60ebbfdab75ad908ce9045e4a7b2729cf91a8376e2f77b54b5081b1911725cf56d228fe11d6f2d3eef8
+EBUILD wicd-1.7.3.ebuild 4665 SHA256 03c96834a957bba1aa2db70ef97cec1adbf2b2a9337bc02b21f9031ecde5fa87 SHA512 45375713e5a93449520a2f41bac1e0c9a77ee8c59aa2484cd414fb6a64f0a36440e78ed875170cee616701fc6b0c1757bc05bf2253458a6369cd065ce3aed9bc WHIRLPOOL 39738fc8ae7beb7eea422756147066765410bfcc7a9567b53a4495f4b6a2d8f5c51a217d895ccf7df77b9ea40653d91e36d300ffaa648b46c24feef5ada5deb2
+MISC ChangeLog 25517 SHA256 647fc77235c84ef19ddecde37e8b700c1507e479dce0cb427ab4704795d3116a SHA512 c3fc3ca28f78ec1282b537f0477fbd34fda786cf4d9f9d3df43eafaebd62f95b7bf4b5b91b9e6f5a43177cfc1f5b6cdc873034bb0e8874a49843f00631009bda WHIRLPOOL 1ccf3b8cf3221fe557e30ab5581ddf141469a4b3aab66daab9df50822f9e9c4128ac65781999a27ac27c1644bcbe1378b82f50a78ea968405358c738a6ce59cb
 MISC metadata.xml 891 SHA256 3fd1a6b6999cee3066c0512753841e4d9c05f1ed4480de0dc95c4b81cbf90404 SHA512 9bf83fa6bbb8e77b12589f9ebff0a5b8b50004ce6134c9cd7f4a552852892889ee9c5a007136b2ce58f59a49be0b1ae5e10e62791a556edb60e9cf9ee4799739 WHIRLPOOL 82c8e541c1dd5edea8afd36a1b070bdc7070442d3bdc701ba8850f9ff90659d0aca657c458858e61b5da934ef9444e8953c5d63f4a9fcc9d1de2e72a15f1c72b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlS9B8EACgkQid6yGVZcMrzejQEAoYy7Y6Boc0XzbMnyQEMi19Lj
-CbPZXm6Hk8JTiSCBZw4A/0IJZXfMVgA9GfcvGFreuQgGa/Pu9K2XdxRMgUcuzjGV
-=hF6T
+iF4EAREIAAYFAlTMAKYACgkQid6yGVZcMrx4ggD9EOodtt9c+sXFLjaqvjuK+LXV
+DiGRd3iohibY8SB/pCsA/3WZlgwkNkOGVxJJkITfHetCjz060XQb1eLTECghuXwg
+=BUjn
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch b/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch
new file mode 100644
index 000000000000..b854607d9583
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch
@@ -0,0 +1,24 @@
+Fixes compilation errors when os.environ['LANG'] is undefiend
+--- ./setup.py
++++ ./setup.py
+@@ -621,7 +621,7 @@ class compile_translations(Command):
+                 shutil.rmtree('translations/')
+             os.makedirs('translations')
+ 
+-            oldlang = os.environ['LANG']
++            oldlang = os.environ.get('LANG', None)
+             os.environ['LANG'] = 'C'
+ 
+             for pofile in sorted(glob('po/*.po')):
+@@ -656,7 +656,10 @@ class compile_translations(Command):
+                     os.makedirs('translations/' + lang + '/LC_MESSAGES/')
+                     os.system('pybabel compile -D wicd -i %s -l %s -d translations/' % (pofile, lang))
+ 
+-            os.environ['LANG'] = oldlang
++            if oldlang is not None:
++                os.environ['LANG'] = oldlang
++            else:
++                del os.environ['LANG']
+ 
+ class uninstall(Command):
+     description = "remove Wicd using uninstall.sh and install.log"
diff --git a/net-misc/wicd/wicd-1.7.3.ebuild b/net-misc/wicd/wicd-1.7.3.ebuild
index 186ffc4d9804..e6270f781b8e 100644
--- a/net-misc/wicd/wicd-1.7.3.ebuild
+++ b/net-misc/wicd/wicd-1.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.3.ebuild,v 1.1 2015/01/19 12:32:36 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.3.ebuild,v 1.2 2015/01/30 22:05:10 tomka Exp $
 
 EAPI=5
 
@@ -65,6 +65,8 @@ src_prepare() {
 	# Upstream bug https://bugs.launchpad.net/wicd/+bug/1412413
 	# Creates files -> give -p
 	epatch -p1 "${FILESDIR}"/${P}-add-missing-gnome-shell-extension.patch
+	# If LANG is undefined, build can fail (bug 537202)
+	epatch "${FILESDIR}"/${P}-undefined-LANG.patch
 	# get rid of opts variable to fix bug 381885
 	sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
 	# Need to ensure that generated scripts use Python 2 at run time.
@@ -98,7 +100,7 @@ src_configure() {
 	use ncurses || myconf="${myconf} --no-install-ncurses"
 	use pm-utils || myconf="${myconf} --no-install-pmutils"
 	use gnome-shell || myconf="${myconf} --no-install-gnome-shell-extensions"
-	python_export_best
+	python_setup
 	"${EPYTHON}" ./setup.py configure --no-install-docs \
 		--resume=/usr/share/wicd/scripts/ \
 		--suspend=/usr/share/wicd/scripts/ \