Add PYTHON_ABI to -lboost_python. Bug #444522

Package-Manager: portage-2.1.11.37/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

4 files changed, 47 insertions, 22 deletions

diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index 4ac9a80a384e..6dcf3697e073 100644
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/deluge
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.178 2012/12/17 20:40:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.179 2012/12/20 20:07:24 hwoarang Exp $
+
+  20 Dec 2012; Markos Chandras <hwoarang@gentoo.org> deluge-1.3.5-r1.ebuild,
+  deluge-9999.ebuild:
+  Add $PYTHON_ABI to -lboost_python. Bug #444522. Thanks to Avner Peled
+  <avnerus@gmail.com> for the patch
 
 *deluge-1.3.5-r1 (17 Dec 2012)
 
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 56c6bc62dc27..3be058869433 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -7,25 +7,25 @@ AUX deluged.init 2053 SHA256 04cacfadc79e738d8cccc4de6ffe735697c01e17c0e96d9604b
 DIST deluge-1.3.3.tar.lzma 2094978 SHA256 c40e0f5757bc3912e9628e1a68dfa41cd487beca370c315f5d31261b931cea05
 DIST deluge-1.3.5.tar.lzma 2100244 SHA256 cdb97fd64cc2131da812fad026f49e82f82b6a214e592222145ddcfb19174247 SHA512 755b5cd72dcdff0cb54d1fac5ad539f42db78a4ea8a71e13d5d493810c2d1b69865bd0026ddc14ea8fc51eb454398248524ad91bbbc8303792dd8a0513900d45 WHIRLPOOL 7f19c6ee4785b48d8c20b00ee67dfeccf1355c0ae36faf953f411bd3e977d11b7fb4fac1456cf91e0ff117021b25e6673432afd03cc1270178486867c5b89c88
 EBUILD deluge-1.3.3.ebuild 1807 SHA256 0f716d0c09b1170a1e9387488d8e23b3758167a500feb3137e0d56bddb5cd101 SHA512 1f47c616b69391ec20bbb2472884a661c7bb6eaed1f597577cad2371ea159318685736f3ed68355d95b33db8196a2569e48ab5218abd906827e1d6537a9e0ca7 WHIRLPOOL 41f4df321e444007646614c77215ea41303c90271742cf332cabbed8bfc017234c29c99e84b9f36f0cb90fddbeee9f6f9465cdb04fe5c67f64ed259e69e1c2e1
-EBUILD deluge-1.3.5-r1.ebuild 1972 SHA256 4b870c87f24d3c7a036a20e88c3208389a17b832bc7d553880b1bf22e31a91d8 SHA512 545b92a7a03c6d8b2efc91ff4556d880a5b18bd1923f4ab1063d85d01a2aa109e679e0170769113c4c3df011f2f555328b286c30c0e199f6420b667859d06c63 WHIRLPOOL 2b1b7fea43e66d10a6aa45b23aaa32c6cd992fbe3bfab0b235723a732408d74a8722b273e4f681a0ffd8cb2c5d8d9083347ee50c035ed797d031e87c6e4fb1e7
+EBUILD deluge-1.3.5-r1.ebuild 2313 SHA256 24d388760ae92d85e0b7d88fad974f6578c2c4065f02e82bf350069e360e7cb7 SHA512 b308659520a01f1607db387f201d8b28d35d3c1ba5e2b6c90ed469fbcbec046f604ee24ac2987a8b6040dd573025e99e9d2cb6eea301ca45fcba05d328632f54 WHIRLPOOL 080b452e2a1fa9f2d811e0bd094dd5783442c797b0a68ba74d80acf2f00a1905bc68b2782f013d64335c05aa4901522d187fc383b09d9d04b3ce45ab851e0da9
 EBUILD deluge-1.3.5.ebuild 1890 SHA256 593ccd278bdfff2dbe6d2de2b284ad69835773209ec5b6730b6b8bb35441109e SHA512 c9706e7bf96b037a22496e04017a690dde649b8f7d64d09eb89a5d940d62d195004f974ab4b08ba59c3d3e62573ae5864f8e2b7fd0617c8f1091f61366f268da WHIRLPOOL 110f37556f6c716d8c6ad138c518a91fb71368654865d07428ef02cb261b1a199e77619aae2300fec81b8076f3874431356194b10851408d3313ab3528f226a2
-EBUILD deluge-9999.ebuild 1890 SHA256 470197e36e6f5f423231195706f1e96f5c18bfcd3d9c57f01aaf7b45b201a63f SHA512 6f14cfb83f936f9e7ac74e063df6355db3ba8dcffcfa2e819ca1cf10717d80bd35a5c1f43741de6347b553e841bcb86016bc8377c44b7dccaaa7ba62ff29dc05 WHIRLPOOL a0494db1a5a03c311c8007e1ce6d58d8a547c5801deeb7108ade04c78b77494dbd3e74b9f2739e0c8c79011e1fad28897f06f589a9071ca4a4ac271bbb1404ac
-MISC ChangeLog 24777 SHA256 5a163ff9d56605407355600e19523c73640a7078dba0a258e4490f5cd19d3b18 SHA512 e4ace929dd00db6867a1e0ac6861bafa27a6f052b93f10ef5c79bde6945bbb5e3ad81df2cc158983d64748947f420ee28bd708ff45059856f43f6196754f94e5 WHIRLPOOL a18a5c2eedbd3a17643ac26e3e525235f95939d4fa59c2a214847dcbe70c24470e61028e08f107d4e80788e2e18e116d8f845d906759f60f0d0c0b85d65528b9
+EBUILD deluge-9999.ebuild 2225 SHA256 ed6186975d155925cbac16583b685df1e4c7539f859dea40440d7ef681619377 SHA512 fa5432517ac5506843f5dcd3575889ab315b3b9ecc7f18070c5b98a11eafc4f09667cdc8e97090d006d326962ebde2a2195505fdda54ec2f6abe94505d2d7d4c WHIRLPOOL 0e89076cf0b1fa37053fc762bd23f9087255c52ebff22d64a1be76616df7ef73699ccd06f129bb5a02c77aa29cee65be14d867615b3b71b0130cc59f5baebad3
+MISC ChangeLog 24985 SHA256 27d9d113643eccc9fd23a02d968ac3af397b627cbde402d7e20ba36f5e6368f7 SHA512 dc3137cb3184c616cf321664cfb2e31d1075825f1fce90202f66cd619b3f6070f1e116470a1d890f40811fb919cd1864f46b8912f2ff457d87fa05b2b90aa3a8 WHIRLPOOL c899a15270c2efa954435bd92804e2d6857625d577cf10780ed9719b52177ea5189daee08aff09fcf5eefbd4aba665f192f9102c4264a60345d92296f22cdc89
 MISC metadata.xml 356 SHA256 659ce61ec4c1475764f4d7a515780577bcdfc81e814291fa429ed77fcb6c4bdb SHA512 c4aac10613fd08fb8e65b7f1e4141c569981d77629608a70309fbe0d5eade6c117d1a5883bf1baa37e6ced100fba807798594551219cfbb89a748dfdf730914d WHIRLPOOL 95f609ffb59d9e893047c83d51459e1f5b4197dbf1bf9f0cf85ef47f7903217f56fa3d479b5c2134469bd359c703b20c2dd77263e0f51811a41a46694b681582
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQz4MxAAoJEPqDWhW0r/LCvtYQAMLjRgqMeHyltARgGNrCQnTr
-F6RaRVJEISMaAMudCFVIWKBdXQ2vyso7vCmEc6crO/u3siQWSMMmhUb6RstyYd6h
-rkFhBE1fURj8xbCNsptjLaB5Oj+fxRfgEzRbj7Tgx7mbdLLDGscoxD4fz3ri6Wjm
-RpDpPY4c6z6KTJd3s37dEBa07g9lp3tOYD7nX3jDDdL/+D9HXYXaoZgQxIwqXecl
-AwqahfcUdR5iEBK+MUpPj6scaSIz47/HVG9VXHrfvTzPpeJp9enwEifhzHqBoJGw
-CCnjnm6sI2OX+Us6BMmxH29jAi3mNFWcunoGX1M++DgUkoXjJwEXWqUUD3JbhwrA
-IxCXTvpaN5R/+Z41z9L4E1gf+gSstWu3pYgt5hCbzSYreatWji5AaVdCZntNXQEh
-11Y40OG0YX5OA8Rc/S7emRHx+8s98DLTz1KhQHQj2TT5cKqnnuSAvrrhy113AyTe
-PD68lV9KH2YyOHTGLWiKvtcV4zHyCspGWrxdnfUT95IXslgmnfZa+Y2aCLk0mHQq
-AuRjgEBrVzbOGGj9DIiRfPU5a/kLqOvcAojou3mMurGtA0l9hOttfN3TUDJeRi5f
-fQrcTN7ZeP09VbwSvvUP3RCnuG+XSRNYPJp8MN93CKGAgNFNTcV+fXVWevH9750M
-2IMDK6Eyj/izHduz72PQ
-=6sHc
+iQIcBAEBCAAGBQJQ02/2AAoJEPqDWhW0r/LCq10P/RUqfKJEqGw5wmmtZ9sSIFkF
+gr8ywicCM1+nvUIxu88sLarASuGvEv6X+MokXNDZKJhQf0f8fKVcT63FO1hsDHlW
+U5ecZ/YiFdjuf1qIb4jxSuFRJdooOtV1MFcTxRGH9TbIs0aYeUBVSq80FqTR1GR4
+BcxX6bWPOx4Om68/Ol8QVfEdp+ZWrTYAGNUn6U1CakkMqPBW7WAizeUbPFX1+fXx
+FbhaGUtPKiBRFingzp02clCfKHi+tV7BJZQI1Cfa/t2r8AMhgmIDeFnQbJQ4xR6y
+yU4K9ioivMrttq+ORpRvDg18NzJggyY4RRta7jVSKnC8zilpI335oGOyCdTwWNVW
+97hB0N1j0ORR/lE6qo/KCIdBRzQJ5gF6A8/9dAeWu/I7CGtILLeINwKh4Ali3DEP
+eM7hOle3RMD5Bcw/BWC/hDUTQQPLrBPUF0la2ICxxM2BxUW352PHOqZv2IXBrAxz
+D20WSlCu6YlDB88aAvl+GabjQ0fm9Hc+p2XTM3Mtg6OVRvGUQMI3QmZupYK5ESol
+KnFnYTaJIdwtBq65OzgnLuaGCaNChdMaPv4Hk91nItJ0nAsJpG3Wim/b4mPyBr3+
+RD7wKxIaWdwZXHWL+XEJom/zpByHskaoYTokCXkf1hVtfF0YOMB/J4ZRrjjve80r
+aLkfEmr+sDFnYpTsFpru
+=k2Lj
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/deluge/deluge-1.3.5-r1.ebuild b/net-p2p/deluge/deluge-1.3.5-r1.ebuild
index 7a7ba7d88ee9..e3be2a40e997 100644
--- a/net-p2p/deluge/deluge-1.3.5-r1.ebuild
+++ b/net-p2p/deluge/deluge-1.3.5-r1.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r1.ebuild,v 1.1 2012/12/17 20:40:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r1.ebuild,v 1.2 2012/12/20 20:07:24 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
 
-inherit distutils eutils flag-o-matic
+inherit distutils eutils flag-o-matic python
 
 DESCRIPTION="BitTorrent client with a client/server model."
 HOMEPAGE="http://deluge-torrent.org/"
@@ -37,14 +39,22 @@ RDEPEND="${DEPEND}
 	setproctitle? ( dev-python/setproctitle )
 	webinterface? ( dev-python/mako )"
 
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
 pkg_setup() {
 	append-ldflags $(no-as-needed)
-	python_set_active_version 2
 	python_pkg_setup
 }
 
 src_prepare() {
 	distutils_src_prepare
+	fix_boost_python() {
+		# fix libboost_python. It needs the python ABI on the side. #444522
+		sed -i -e "s/'boost_python'/'boost_python-${PYTHON_ABI}'/" setup.py \
+			|| die "sed setup.py failed"
+	}
+	python_execute_function -s fix_boost_python
+
 	python_convert_shebangs -r 2 .
 	epatch "${FILESDIR}/${P}-rb_libtorrent-disable-python-bindings"
 }
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 09afd06a3efa..9226f3acd9e8 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.29 2012/04/22 17:37:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.30 2012/12/20 20:07:24 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
 
 inherit distutils flag-o-matic git-2
 
@@ -39,14 +41,22 @@ RDEPEND="${DEPEND}
 	setproctitle? ( dev-python/setproctitle )
 	webinterface? ( dev-python/mako )"
 
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
 pkg_setup() {
 	append-ldflags $(no-as-needed)
-	python_set_active_version 2
 	python_pkg_setup
 }
 
 src_prepare() {
 	distutils_src_prepare
+	fix_boost_python() {
+		# fix libboost_python. It needs the python ABI on the side. #444522
+		sed -i -e "s/'boost_python'/'boost_python-${PYTHON_ABI}'/" setup.py \
+			|| die "sed setup.py failed"
+	}
+	python_execute_function -s fix_boost_python
+
 	python_convert_shebangs -r 2 .
 }