Fix python stuff, bug #542434

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

9 files changed, 233 insertions, 188 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index 0aacaf38157e..ce77d9fb4368 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/rb_libtorrent
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.190 2015/03/17 20:30:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.191 2015/03/23 12:07:50 jlec Exp $
+
+  23 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  +files/rb_libtorrent-0.16.17-python.patch,
+  +files/rb_libtorrent-1.0.2-python.patch, metadata.xml,
+  rb_libtorrent-0.16.17-r2.ebuild, rb_libtorrent-0.16.19.ebuild,
+  rb_libtorrent-1.0.2.ebuild, rb_libtorrent-1.0.3.ebuild:
+  Fix python stuff, bug #542434
 
 *rb_libtorrent-0.16.19 (17 Mar 2015)
 
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
index b40c6663b737..780388ffbf1b 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX rb_libtorrent-0.16.17-python.patch 2021 SHA256 7535389f66bcb599265486743a739cbb65ff13a96eccf1175bc887625a2b674e SHA512 d0de7c2059e8c5f722a43ce49738c84b4ab463a1ff638953b057fb263da08e1d209626c8e1f434bca0c7b6072f6ec546cc04ae5abfd6f24c303929b151ab5112 WHIRLPOOL 69b42bd394ea2563e1057a68e40dcce7b15684a3f23b3247201e7b8c1dd3ca49bdd72486a68d4515558695c524fae10e625cca134c1f4aff5966a107b7a3322a
+AUX rb_libtorrent-1.0.2-python.patch 1240 SHA256 c7b2ac410f99cb69f68c8ee47503cae286544e1f5617eddc265575982a27bab2 SHA512 7f3aecf15977dcfe5f879d3674f083801260cc51590120119a4589e0225f8ab0b35e9b9ed8711e7f1ef7a07bc80b500af8a8973c8610c8d3c86fa01d82db65b2 WHIRLPOOL 30d05f2dc923a09324bcbd92daee27b149a1979adcdd931d3a0e08281612323e2f9716e421aeef76f01e38a3bc7b7080c7088b4a24cba1e469bc7f5434b6fe6b
 DIST libtorrent-rasterbar-0.16.10.tar.gz 2985640 SHA256 4c0d78b28af8051ff8a19a3a3e10a5edfec50945b8f3c9a76612111c47d671bc SHA512 a8b5d762f2b50ded1f8589efeedf2d1e0b5cc39d71bcc1840658137c1058cd03fe249c6855c5c483304aafb74b616d241456fecf00dec50608aa82af9f795819 WHIRLPOOL 20cc12a8bfcafd079a0d8ab6132bb3a4aa289089ed12c895bc2b2047b5a10a15a3ba20d6f0f767ba0e01f19dc3e1baa05518d08454b502a8b125e513bf05ce51
 DIST libtorrent-rasterbar-0.16.17.tar.gz 3018881 SHA256 67a1d29c626d991d6e39c2f9828ca70c4053d057070ce01fff9b4ad37e64aff0 SHA512 532b2438e24c3ecad239480a1bd6241a0d73d40f8d5bdcf61ddfcee1a41f1644c9004d4f234968efd50158224219b78852ec936a05b75b15f3442b594460cdd6 WHIRLPOOL 755e201741ed77cf91cb0976cbaa83c645647341d2cfe40564552599f2792ba76bd02e82a94669d80b199f1a1d6290824686d2bb52d6b0da8663d2274176f3eb
 DIST libtorrent-rasterbar-0.16.19.tar.gz 3030253 SHA256 9ebd3fa8accfa27d0c81cdbbe15d7b411ea1deec34ac6325dec7197f05d82982 SHA512 8e605802cb1ae80228d253adba44da6f5af39e7d65c59f65e15444ed1122500529ee068f6d3608b1c2a249f18b4de695073f7b67772fa445618757697d779340 WHIRLPOOL 4429d07bd95f398a09f283a7cbcf6611aeb8ac5d2b8ed76d98f89d601aa6ed66e6eb8f044b351fad6cca3606351ccc67081dba7c8dd8d9c3c433eae84aedeb2c
@@ -8,29 +10,29 @@ DIST libtorrent-rasterbar-1.0.2.tar.gz 3259318 SHA256 3c8c8e1484dfe6321271c4e51e
 DIST libtorrent-rasterbar-1.0.3.tar.gz 3278768 SHA256 329b607f382c2553dc0c6f50728c37f1e8e869ed16baefb7af27dd28bff40165 SHA512 79d9536baaa7d4be613b06e33a2bd442ed6ec61388f8ebd223ac6a6c855ffc0ff9e0350d9a7ee928579470cd7f9f4dd5e3afad8a8e41fec2c70e81072495ef9f WHIRLPOOL 10e58f1391462670913f5d326a6fd4d5c1a9c97b74854c60ca98e05b8896f2d0f82f37e2891f18bcfea63ae4eb6731dc2ea1676a45aa265c27152aa3c1d087f3
 EBUILD rb_libtorrent-0.16.10.ebuild 1980 SHA256 1b1b8234aa147a13739a7593974d7730de468e4d58cb03bd9cd30b6580df9605 SHA512 2a8f3bf1a7b07620ffdbf8c626d590c0f3d974357feff72429743a1da4f8630d1b23970e5cfbf47a9bf60e2138d86e9528fcc6e2343a833f783160a19277d4c5 WHIRLPOOL 2a591dcf3c65acba37d97ea5c6d447a1e614219bf5997977c51c1aa67ccd202d89ab7df76056208742e4aae67962f103619909c5bf492bbfc0118e91d5c9526a
 EBUILD rb_libtorrent-0.16.17-r1.ebuild 2006 SHA256 102ce33f7fcc84cf411eef4641fecc5b06628a47c488cf2df7c98f8d4f1536bd SHA512 de346d6b84e3ef4dd85d5ca732c0d53cd46c6adf49b7e0f95498b0a8bfe781adbf97c93f7c1fac853b3d1ce580fa7b11706ff70d86bdae81056491013b69c7a4 WHIRLPOOL dceabcfeea84b2290686de4dbc9d1f7e3d915fa6469df01b2e0975432b429264d9109bbb6881ec48735b5066522b9c94b6d157323f126ea44c04b77cf50206aa
-EBUILD rb_libtorrent-0.16.17-r2.ebuild 2034 SHA256 92c8ad9073c45bfaad4c343b6dff4b4afd444ba60982cfdd319dc1da5f1f8df3 SHA512 5e63b0c8c73d77894020ec31cce3d04c75a5cf28e5a6db49c9ab32655570afb1fea15fe5d4796555e9776abbf13ae82b066e38f707de941e65dc5b3cb11921e8 WHIRLPOOL b78e04b2e72b65ffb76bfcb491e5604da31fb3ce10dfc7ff3e1d4e608391f445a319efb9275aff9681e6de7b921188fe0679fa06cd9e2c77d23ba164233c7477
+EBUILD rb_libtorrent-0.16.17-r2.ebuild 1878 SHA256 94889afdd80797ef58261fbf028730455c9531f3bc089e3cba24f5670e504929 SHA512 e4dc91feb28b19ce8ad4626f57e3a1c9119c881202723a18b4ded87b97da9773da389c0cf686c6b277cbf99fcc6128981c002e663a14b7686fc33b3ece14327c WHIRLPOOL 7fe4dcbc5fba83aa360efd38e20c021b5aca1441c635d27eab351e241216f1b4e3b60aa340e72d07516b214a91830c71366d78a9d57f13c6e1e9fb2c9579f641
 EBUILD rb_libtorrent-0.16.17.ebuild 1968 SHA256 219c68c57d8ab707847a3e607cd6b8cb0e2aeb27f1b3919b2a773554734bca46 SHA512 64d3c062972a95a55b62c1bebe25b21cc0a805c78129a2be33862e5de3ecbd756ed1596d020ed8c7e55b1a8ff960f8f64827ed67d36580d05fb1238a6db4d197 WHIRLPOOL 34bee6511ae0d12ddf9374905a2bf877d0a33d8c213a8b0f99fcb74cc6d9df06283c0778b15afaefc7fe6c1022334541628efe302e478c55264ad62b8f96a7f7
-EBUILD rb_libtorrent-0.16.19.ebuild 2031 SHA256 b58b3d466b0f72781b763c61e4cec3b38175ee59a08d4b02c122d6d0d71c546b SHA512 3f1bf1a79443aba1712ce0dfba2643d9a6941c21237782d66570dcffff056f7078358be75f839dbec41d273591b91c0ac7ea8641758f027665478302c188b3e4 WHIRLPOOL f2f05b65c09ca76bf5959920b26556837bfe6d920b0ff293930d30027e54ed1c4f81b252c45173d66c1c4a99e08188fc098260fda09ffdd2a6e076682a0234fa
-EBUILD rb_libtorrent-1.0.2.ebuild 1997 SHA256 e728f2167b8de274475967b1ec574464ef8139778631d330fff2bea2f140c6c0 SHA512 6bd8966dc3a8f3f74bc88fbd4c6689e4be9fc890950f8fe6f5f12f2d1c0946ea0aa0aa1c95c0ca63f4488e650e689feb2dccec4ab501aecf7c92a57517c3bc9b WHIRLPOOL 1858c179eb09323c3b9d4fa69a02ceae4862c04f4238c32a1ffc79665d9fb4fa418e5ba3b7898937277c4671350e05077112cdfcf35c71760f0ae4b23d9ec8f2
-EBUILD rb_libtorrent-1.0.3.ebuild 2020 SHA256 3bdfc49b5b16917c88a9f26ad497b0e4c8e2780131c6f0e7a20e88e9ea74fb0b SHA512 daafb98a7ea3e5815e10d8b7ef6ca437ba9477a4be23171de40ec5ffd0eb5b0b114be8d8a02587a0c6fb3ccd22f274da418fabef7fc22e8d1b8d18d78524f671 WHIRLPOOL 4305e204f57edaf5060d750fba753a171fa1dbbfe660544768323337421053f9ff2afa5286f2576e9407ca1e17316d6892c7721472c95c48811c419fdb82c811
-MISC ChangeLog 31164 SHA256 342421391f4c9f9419fbc2420bc349a6094f52fcfb3ca32e5973e32a205a5915 SHA512 e930c4bb1e473cfa792eefec7280ebb02312f1c5b7b571b46612477bf9469a6feb56af65562efe93891da216f637c3e42e515bea363d66fd9d59457577203b50 WHIRLPOOL 6dd5e52656f063379bd76c98d4ef30ce381ad87e297217836848a48ae5c192c5ba0ede4fb7660433d6c909afc592845f1a7d9ff31c6b19ad44167c8b42908e19
-MISC metadata.xml 338 SHA256 c3c6440b48a876a0f8126eaf17c31f5f77f2eaf2d84068c9d43bfba6cd5d187c SHA512 b9b57d5e8f907705b27f55f31bc4d7e68c8f076162d2ca2f6a34be64a0e17c80f20798f15df493d7a1ba29d88148b1ddb49ef757acda58f2b7e1b5d1126d9418 WHIRLPOOL 1ca916d0c644bd428c6f21cd7c126cf6b8783a5b84eb4468712f6843bb14bff6869d39440af9c482a0bb9d40fd037aace45524609476b7e83d92420a757892f5
+EBUILD rb_libtorrent-0.16.19.ebuild 1884 SHA256 5508744ab112126e55d1668685bbaf398ea928cacd8e4fe09399fbbee0cd7413 SHA512 3603195ecd740bc6c2c0b0bad0b50332b25c5e7c1ee431bf9a717c56f9a9a71d4db0c17b4357683eb14baa35bbdf56abb6789fa5acb50e5686453c466baeb04f WHIRLPOOL e142ddc024d5f42f5d10da46e478f7cf597e9d15e97d9bfefeb3487697d41da8e67f7614d4d850c6ee34c9ed5da198c94f391508f38c1e90e4ccf667769b700b
+EBUILD rb_libtorrent-1.0.2.ebuild 1902 SHA256 e86d01bed023224ea2b4a66324974a079e75743613660da05125bd78f59490e8 SHA512 3c12106e092430aa2febb6c5c907e4f09d8b91a7cdb293765374a33d30196b32ae7acdd30c1b028856f8bb7121b96b2959dcf5e84eb519b1911d8d3901f4693c WHIRLPOOL 659caf2be7397067929f39f5dc6e52ebb848b287ff2fc27cb4971acfcc03e011f28699815529ce5baacbf555c68004e6383a29048a11c5c965441dff9bc5c40d
+EBUILD rb_libtorrent-1.0.3.ebuild 1909 SHA256 4c26d3794909eb526eef972eab5874047ec242b2e57d0598b5190ea0e9e472fb SHA512 77c0d4287f864e8585f6ef2e0fbffed1149ca759b0320c2c367c34c292dd7a557a0591cf037f8bcad102bc4d54020bd3ca2634bf3aa3f57d108d64e66d9b732d WHIRLPOOL f5683f5b99976fa34b72e1029f2be8ed013e8c77768844fdcb73cc9173a1cd99dc3880896b5ed8c8110dfe6308bfe0300acb097c5282e1a393edb04955d8f060
+MISC ChangeLog 31465 SHA256 eb6b92e014a6ac84d116b0c0517419a09a947c82de62b051465dc2b3becb4665 SHA512 e5209206a45155c50c42f0e63d2a03b02b60115d66e69b5e2f8ee05619ce71d38e694ec1f6ce9f74473ac6bc5f3ece1f4b450ca78ea2e9f584c00440e5a1b27f WHIRLPOOL 899d2cf2a7fe4401bcb74dae2438efdc8685e42f0b4fe08cba2748181ec5879967d7e0bf94171f58fda8307eb1d5e9f518f95f4a81fe1d0bc852c983a3e59fdc
+MISC metadata.xml 349 SHA256 6e357ba7cb729f6985cdfc9a69b5c7d5126a08751f64c4fe7f2db5034ecb0c1a SHA512 2daac05a1f02373fa84dbeabb913feba851cdcd375d6e4f86f6975a1c3ba0a1a4578c59d775dae9bb9f9a45986fe4cec9a80439aaff443e7b5d52b600a9fbb26 WHIRLPOOL 7eaa42ad28d208136aeb0137edea92203795657e7d93166ddee189e3300ec9ddb4db97f5bcf267e1276b39b265feadcaeeec5ef6495f53f99143dfaea0cf84cc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVCI7jXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88AOQP/iNSktwAa9WaxkE4yy6igvkT
-aO0BL7JpUBzj0KvI/i+8jQpFnjByo8HLowLaN9LccRlHePDJYlpKGuyo+iOB1PNS
-Y34/nuHmi+3YibTccGpG7sxgBpnZ0lcgIMAd+AaFsJKHSLMnDhBfa7ws4+//rt1c
-JkNlrMXiQMJRT+KF1zxTd3Lv3CNsoSsL0LXly87LkiHJ3AJsLym5wVXVy7gzjqGc
-BSTAwf2ekAfdilOyPk4nfjfrnUz76p4zgyJ+eW7l6FITNeECWN3uJndSIHiPZTtZ
-xKqSy17NcNjP76rXpltgfomD14tNQQ0R1ipSGj/xETaicX6sjxhOiwogULXPUMQC
-ZkE364fQNNF6VOD3ohHzVXdhe1dUU69XYd8Ht2TUpQ6v3tWTHS9BEImmC+PhllWK
-78J0HhVcO77l13kgZ/c9pzJ3ineWcW+CVIMkrpHZ/vMlTU44jQj8WN9wdGjZZNIB
-i8k3wseinQQg5CtDs47lojVzYwMEGv3WhEs5yoFksPqo2U9PvaczWHdCTz7LtXt/
-rDGAQMkgF1uL6ySRNGNDLQhwhhWyHdjC9m81mR4F5ruAc9Sdak8Zixtt2fzGF8aM
-OtA1/6SumUwJiM566s9etGtm5ELSriLIUUiw1Sio/ON5TfHTOmtwMm0BLf6SY7VS
-em2Dd88MxQMjDuyMVMUa
-=yuiM
+iQJ8BAEBCgBmBQJVEAIXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirc24P/1zv0WepoTXznCCdlh7NW+o9
+o4eXd92Vt205MixgeIRE+oV5WPNyGC07YzwPkdOqtIR7VyUDw67vfYdiJb4haxFh
+M6HFUXChyygPooSKvI7YJKrjw6TAjpABZ5KKb3sV1mUU/Ln5xrXZfb875c8OTPXd
+6tzpfnzDseMWGsjsj6El7QNvVuiytL40M30YtUPtJ8pSaz22iAylUKBOSU1cqLlu
+uGf0WCVEh4HCzkptLhZC8aIG/A5YJmU/hbVZKNdB3cApEONMqRbIXkyk21S7hGNg
+3Ag75ExdQ6N3JfpiSVIeoVT+7FEVkHLHMpny7/S5xjzgK9RGggf35R3rooFHGVK9
+EomFl80kYerPACvzkZab5mWamh3wflcXQirSJFFsUEq5YTFghwGlIPBVrKlSQ9s/
+qYnHUxm+uXcBSiil7hI0SSK8k8796TbZKPem8KSkoENJYjE64XebBkjT5MoK43L3
+r7nYPXbpNJvhz/a7s7ujVTpNfPM216thTBB58ZNykR3kCtzBWOzvedLdPIgb19XF
+KjlIN7VbH74qb9q0mvn1jIIsbSFv4PVslxXUBT4gLm4meeh51g+E4s/u8mPFcQL8
+AKyc+K3Q5kVEG+nEdNAt+nZ3ENokB2KZMBAZCa8L7ksJuzMBA3zKfKTKg+S0bvqT
+FYx/GWxTyOM6QMvgsgZS
+=qhRi
 -----END PGP SIGNATURE-----
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.16.17-python.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.16.17-python.patch
new file mode 100644
index 000000000000..16b8b812051a
--- /dev/null
+++ b/net-libs/rb_libtorrent/files/rb_libtorrent-0.16.17-python.patch
@@ -0,0 +1,43 @@
+ bindings/python/setup.py.in |  6 +++---
+ configure.ac                | 10 +---------
+ 2 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in
+index e58045e..a55f444 100644
+--- a/bindings/python/setup.py.in
++++ b/bindings/python/setup.py.in
+@@ -61,10 +61,10 @@ if "CFLAGS" in config_vars and "-Wstrict-prototypes" in config_vars["CFLAGS"]:
+ if "OPT" in config_vars and "-Wstrict-prototypes" in config_vars["OPT"]:
+ 	config_vars["OPT"] = config_vars["OPT"].replace("-Wstrict-prototypes", " ")
+ 
+-source_list = os.listdir(os.path.join(os.path.dirname(__file__), "src"))
+-source_list = [os.path.join("src", s) for s in source_list if s.endswith(".cpp")]
++source_list = os.listdir(os.path.join('@srcdir@', "src"))
++source_list = [os.path.join('@srcdir@', "src", s) for s in source_list if s.endswith(".cpp")]
+ 
+-extra_cmd = '@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_SYSTEM_LIB@ @BOOST_PYTHON_LIB@ @PTHREAD_LIBS@ @OPENSSL_LIBS@ @OPENSSL_LDFLAGS@ @OPENSSL_INCLUDES@'
++extra_cmd = '@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_SYSTEM_LIB@ @PTHREAD_LIBS@ @OPENSSL_LIBS@ @OPENSSL_LDFLAGS@ @OPENSSL_INCLUDES@' + '-lboost_python-%s-mt' % (platform.python_version()[:3])
+ 
+ setup( name='python-libtorrent',
+ 	version='@PACKAGE_VERSION@',
+diff --git a/configure.ac b/configure.ac
+index f727b81..9b4ccee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -539,15 +539,7 @@ AS_CASE(["$ARG_ENABLE_PYTHON_BINDING"],
+       AC_MSG_RESULT([yes])
+ 
+       AM_PATH_PYTHON([2.4], [], AC_MSG_ERROR([Python interpreter not found.]))
+-      AX_PYTHON_DEVEL([>= '2.4'])
+-      AX_BOOST_PYTHON()
+-
+-      AS_IF([test -z "$BOOST_PYTHON_LIB"],
+-            [AC_MSG_ERROR([Boost.Python library not found. Try using --with-boost-python=lib.])])
+-    ],
+-  ["no"], [
+-      AC_MSG_RESULT([no])
+-    ],
++      AX_PYTHON_DEVEL([>= '2.4'])],
+   [AC_MSG_RESULT([$ARG_ENABLE_PYTHON_BINDING])
+    AC_MSG_ERROR([Unknown option "$ARG_ENABLE_PYTHON_BINDING". Use either "yes" or "no".])]
+ )
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.2-python.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.2-python.patch
new file mode 100644
index 000000000000..511a21c41ac0
--- /dev/null
+++ b/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.2-python.patch
@@ -0,0 +1,38 @@
+ bindings/python/setup.py |  2 +-
+ configure.ac             | 10 +---------
+ 2 files changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/bindings/python/setup.py b/bindings/python/setup.py
+index 961395f..c38ef52 100644
+--- a/bindings/python/setup.py
++++ b/bindings/python/setup.py
+@@ -36,7 +36,7 @@ def target_specific():
+ 
+ try:
+ 	with open('compile_flags') as _file:
+-		extra_cmd = _file.read()
++		extra_cmd = _file.read()  + '-lboost_python-%s-mt' % (platform.python_version()[:3])
+ 
+ except:
+ 	extra_cmd = None
+diff --git a/configure.ac b/configure.ac
+index ebb1f7e..dddc403 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -539,15 +539,7 @@ AS_CASE(["$ARG_ENABLE_PYTHON_BINDING"],
+       AC_MSG_RESULT([yes])
+ 
+       AM_PATH_PYTHON([2.4], [], AC_MSG_ERROR([Python interpreter not found.]))
+-      AX_PYTHON_DEVEL([>= '2.4'])
+-      AX_BOOST_PYTHON()
+-
+-      AS_IF([test -z "$BOOST_PYTHON_LIB"],
+-            [AC_MSG_ERROR([Boost.Python library not found. Try using --with-boost-python=lib.])])
+-    ],
+-  ["no"], [
+-      AC_MSG_RESULT([no])
+-    ],
++      AX_PYTHON_DEVEL([>= '2.4'])],
+   [AC_MSG_RESULT([$ARG_ENABLE_PYTHON_BINDING])
+    AC_MSG_ERROR([Unknown option "$ARG_ENABLE_PYTHON_BINDING". Use either "yes" or "no".])]
+ )
diff --git a/net-libs/rb_libtorrent/metadata.xml b/net-libs/rb_libtorrent/metadata.xml
index 08864fd10def..1b1e03f840ff 100644
--- a/net-libs/rb_libtorrent/metadata.xml
+++ b/net-libs/rb_libtorrent/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
-	<maintainer>
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">libtorrent</remote-id>
-	</upstream>
+  <herd>net-p2p</herd>
+  <maintainer>
+    <email>hwoarang@gentoo.org</email>
+    <name>Markos Chandras</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">libtorrent</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild
index daa91bc40789..99a5000816d3 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild,v 1.3 2015/03/17 20:08:16 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild,v 1.4 2015/03/23 12:07:50 jlec Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+AUTOTOOLS_AUTORECONF=true
 
-inherit multilib python-r1 versionator
+inherit autotools-utils multilib distutils-r1
 
 MY_P=${P/rb_/}
 MY_P=${MY_P/torrent/torrent-rasterbar}
@@ -20,12 +23,14 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc examples python ssl static-libs test"
-RESTRICT="test"
 
-RDEPEND=">=dev-libs/boost-1.48:=[threads]
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/boost-1.48:=[threads]
 	sys-libs/zlib
 	examples? ( !net-p2p/mldonkey )
-	ssl? ( dev-libs/openssl:= )
+	ssl? ( dev-libs/openssl:0= )
 	python? (
 		${PYTHON_DEPS}
 		dev-libs/boost[python,${PYTHON_USEDEP}]
@@ -33,51 +38,33 @@ RDEPEND=">=dev-libs/boost-1.48:=[threads]
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.2"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
 
-src_prepare() {
-	use python && python_copy_sources
-}
+PATCHES=( "${FILESDIR}"/${P}-python.patch )
 
 src_configure() {
-	local myconf=(
+	local myeconfargs=(
 		--disable-silent-rules # bug 441842
+		--with-boost-libdir=/usr/$(get_libdir)
 		$(use_enable debug)
 		$(use_enable test tests)
 		$(use_enable examples)
 		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		--with-boost-libdir=/usr/$(get_libdir)
+		$(use_enable python python-binding)
+		$(usex debug "--enable-logging=verbose" "")
 	)
+	autotools-utils_src_configure
+	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_configure
+}
 
-	use debug && myconf+=( --enable-logging=verbose )
-
-	econf "${myconf[@]}" --disable-python-binding
-
-	if use python; then
-		python_configure() {
-			run_in_build_dir econf "${myconf[@]}" --enable-python-binding --with-boost-python=boost_python-${EPYTHON#python}
-		}
-
-		python_foreach_impl python_configure
-	fi
+src_compile() {
+	autotools-utils_src_compile
+	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_compile
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	if use python; then
-		python_install() {
-			emake -C "${BUILD_DIR}"/bindings/python \
-				DESTDIR="${D}" install
-		}
-
-		python_foreach_impl python_install
-	fi
+	use doc && HTML_DOCS=( docs/. )
 
-	use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
-	dodoc ChangeLog AUTHORS NEWS README
-	if use doc; then
-		dohtml docs/*
-	fi
+	autotools-utils_src_install
+	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_install
 }
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild
index 7134e5a845db..696f15f78b68 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild,v 1.1 2015/03/17 20:30:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild,v 1.2 2015/03/23 12:07:50 jlec Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+AUTOTOOLS_AUTORECONF=true
 
-inherit multilib python-r1 versionator
+inherit autotools-utils multilib distutils-r1
 
 MY_P=${P/rb_/}
 MY_P=${MY_P/torrent/torrent-rasterbar}
@@ -20,12 +23,14 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc examples python ssl static-libs test"
-RESTRICT="test"
 
-RDEPEND=">=dev-libs/boost-1.48:=[threads]
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/boost-1.48:=[threads]
 	sys-libs/zlib
 	examples? ( !net-p2p/mldonkey )
-	ssl? ( dev-libs/openssl:= )
+	ssl? ( dev-libs/openssl:0= )
 	python? (
 		${PYTHON_DEPS}
 		dev-libs/boost[python,${PYTHON_USEDEP}]
@@ -33,51 +38,33 @@ RDEPEND=">=dev-libs/boost-1.48:=[threads]
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.2"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
 
-src_prepare() {
-	use python && python_copy_sources
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.16.17-python.patch )
 
 src_configure() {
-	local myconf=(
+	local myeconfargs=(
 		--disable-silent-rules # bug 441842
+		--with-boost-libdir=/usr/$(get_libdir)
 		$(use_enable debug)
 		$(use_enable test tests)
 		$(use_enable examples)
 		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		--with-boost-libdir=/usr/$(get_libdir)
+		$(use_enable python python-binding)
+		$(usex debug "--enable-logging=verbose" "")
 	)
+	autotools-utils_src_configure
+	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_configure
+}
 
-	use debug && myconf+=( --enable-logging=verbose )
-
-	econf "${myconf[@]}" --disable-python-binding
-
-	if use python; then
-		python_configure() {
-			run_in_build_dir econf "${myconf[@]}" --enable-python-binding --with-boost-python=boost_python-${EPYTHON#python}
-		}
-
-		python_foreach_impl python_configure
-	fi
+src_compile() {
+	autotools-utils_src_compile
+	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_compile
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	if use python; then
-		python_install() {
-			emake -C "${BUILD_DIR}"/bindings/python \
-				DESTDIR="${D}" install
-		}
-
-		python_foreach_impl python_install
-	fi
+	use doc && HTML_DOCS=( docs/. )
 
-	use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
-	dodoc ChangeLog AUTHORS NEWS README
-	if use doc; then
-		dohtml docs/*
-	fi
+	autotools-utils_src_install
+	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_install
 }
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.2.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.2.ebuild
index 12f7e3accfb3..960fe5277c24 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-1.0.2.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-1.0.2.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.2.ebuild,v 1.2 2014/11/15 08:33:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.2.ebuild,v 1.3 2015/03/23 12:07:50 jlec Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+AUTOTOOLS_AUTORECONF=true
 
-inherit multilib python-r1
+inherit autotools-utils multilib distutils-r1
 
 MY_P=${P/rb_/}
 MY_P=${MY_P/torrent/torrent-rasterbar}
@@ -23,59 +26,47 @@ IUSE="debug doc examples python ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-DEPEND=">=dev-libs/boost-1.53:=[threads]
-	>=sys-devel/libtool-2.2
+RDEPEND="
+	>=dev-libs/boost-1.53:=[threads]
 	sys-libs/zlib
 	examples? ( !net-p2p/mldonkey )
+	ssl? ( dev-libs/openssl:0= )
 	python? (
 		${PYTHON_DEPS}
 		dev-libs/boost[python,${PYTHON_USEDEP}]
-	)
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2"
 
-src_prepare() {
-	use python && python_copy_sources
-}
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${P}-python.patch )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
 
 src_configure() {
-	local myconf=(
+	local myeconfargs=(
 		--disable-silent-rules # bug 441842
+		--with-boost-libdir=/usr/$(get_libdir)
 		$(use_enable debug)
 		$(use_enable test tests)
 		$(use_enable examples)
 		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		--with-boost-libdir=/usr/$(get_libdir)
+		$(use_enable python python-binding)
+		$(usex debug "--enable-logging=verbose" "")
 	)
+	autotools-utils_src_configure
+	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_configure
+}
 
-	use debug && myconf+=( --enable-logging=verbose )
-
-	econf "${myconf[@]}" --disable-python-binding
-	if use python; then
-		python_configure() {
-			run_in_build_dir econf "${myconf[@]}" --enable-python-binding --with-boost-python=boost_python-${EPYTHON#python}
-		}
-
-		python_foreach_impl python_configure
-	fi
+src_compile() {
+	autotools-utils_src_compile
+	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_compile
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	if use python; then
-		python_install() {
-			emake -C "${BUILD_DIR}"/bindings/python \
-				DESTDIR="${D}" install
-		}
-
-		python_foreach_impl python_install
-	fi
+	use doc && HTML_DOCS=( docs/. )
 
-	use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
-	dodoc ChangeLog AUTHORS NEWS README
-	if use doc; then
-		dohtml docs/*
-	fi
+	autotools-utils_src_install
+	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_install
 }
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.3.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.3.ebuild
index 522ceddc91f7..74a62e0783c2 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-1.0.3.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-1.0.3.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.3.ebuild,v 1.3 2015/03/03 22:24:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.3.ebuild,v 1.4 2015/03/23 12:07:50 jlec Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+AUTOTOOLS_AUTORECONF=true
 
-inherit eutils multilib python-r1
+inherit autotools-utils multilib distutils-r1
 
 MY_P=${P/rb_/}
 MY_P=${MY_P/torrent/torrent-rasterbar}
@@ -23,60 +26,47 @@ IUSE="debug doc examples python ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND=">=dev-libs/boost-1.53:=[threads]
+RDEPEND="
+	>=dev-libs/boost-1.53:=[threads]
 	sys-libs/zlib
 	examples? ( !net-p2p/mldonkey )
+	ssl? ( dev-libs/openssl:0= )
 	python? (
 		${PYTHON_DEPS}
 		dev-libs/boost[python,${PYTHON_USEDEP}]
-	)
-	ssl? ( dev-libs/openssl:= )"
+	)"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.2"
 
-src_prepare() {
-	use python && python_copy_sources
-	epatch_user
-}
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-python.patch )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
 
 src_configure() {
-	local myconf=(
+	local myeconfargs=(
 		--disable-silent-rules # bug 441842
+		--with-boost-libdir=/usr/$(get_libdir)
 		$(use_enable debug)
 		$(use_enable test tests)
 		$(use_enable examples)
 		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		--with-boost-libdir=/usr/$(get_libdir)
+		$(use_enable python python-binding)
+		$(usex debug "--enable-logging=verbose" "")
 	)
+	autotools-utils_src_configure
+	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_configure
+}
 
-	use debug && myconf+=( --enable-logging=verbose )
-
-	econf "${myconf[@]}" --disable-python-binding
-	if use python; then
-		python_configure() {
-			run_in_build_dir econf "${myconf[@]}" --enable-python-binding --with-boost-python=boost_python-${EPYTHON#python}
-		}
-
-		python_foreach_impl python_configure
-	fi
+src_compile() {
+	autotools-utils_src_compile
+	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_compile
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	if use python; then
-		python_install() {
-			emake -C "${BUILD_DIR}"/bindings/python \
-				DESTDIR="${D}" install
-		}
-
-		python_foreach_impl python_install
-	fi
+	use doc && HTML_DOCS=( docs/. )
 
-	use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
-	dodoc ChangeLog AUTHORS NEWS README
-	if use doc; then
-		dohtml docs/*
-	fi
+	autotools-utils_src_install
+	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_install
 }