Fix broken configure patch, #544612

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

3 files changed, 31 insertions, 33 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index ce77d9fb4368..f5a4c714e6bb 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,10 @@
 # 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.191 2015/03/23 12:07:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.192 2015/03/28 11:41:12 jlec Exp $
+
+  28 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  files/rb_libtorrent-0.16.17-python.patch:
+  Fix broken configure patch, #544612
 
   23 Mar 2015; Justin Lecher <jlec@gentoo.org>
   +files/rb_libtorrent-0.16.17-python.patch,
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
index 780388ffbf1b..5d253f544b61 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX rb_libtorrent-0.16.17-python.patch 2021 SHA256 7535389f66bcb599265486743a739cbb65ff13a96eccf1175bc887625a2b674e SHA512 d0de7c2059e8c5f722a43ce49738c84b4ab463a1ff638953b057fb263da08e1d209626c8e1f434bca0c7b6072f6ec546cc04ae5abfd6f24c303929b151ab5112 WHIRLPOOL 69b42bd394ea2563e1057a68e40dcce7b15684a3f23b3247201e7b8c1dd3ca49bdd72486a68d4515558695c524fae10e625cca134c1f4aff5966a107b7a3322a
+AUX rb_libtorrent-0.16.17-python.patch 1796 SHA256 202e3437de2b747c80d402786dc2397ef8afff9107975b0cf3b0a3302c9d89ab SHA512 d906b6f212214f858f4a95a81fd35f2d3400a486119dafeb26697c62c03a4db474ca71961b5f1508190203e192d7954f9249ec2fed0c44610867e214fb7b0444 WHIRLPOOL fd590cc16e496ea6889178d97847dbb2032245b3721187c793c049f7357db7e8e2590e09d62984b850ed40583ca77aa3dc58a0ce41466afb24a603bbb28a2995
 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
@@ -15,24 +15,24 @@ EBUILD rb_libtorrent-0.16.17.ebuild 1968 SHA256 219c68c57d8ab707847a3e607cd6b8cb
 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 ChangeLog 31595 SHA256 5a55009c3839fd5384b342efb5f71b31ac2cd8ca7eae8c525c16083605da24d8 SHA512 6336a69201843932568d8e2d81065e3029ddc80ded8d2781282095877a1a49919eb67693cca658035de58f91d27aaefcf951e40a31b7c70b1ce994acebf9b63f WHIRLPOOL 62875765f01b50c13652ebd5954cca398c308079583951ab9819ff33e02a2a4c97259da8e22c1f9be54fc1e8a997a01af8f1435b15beedd8ced30f559ec3c74d
 MISC metadata.xml 349 SHA256 6e357ba7cb729f6985cdfc9a69b5c7d5126a08751f64c4fe7f2db5034ecb0c1a SHA512 2daac05a1f02373fa84dbeabb913feba851cdcd375d6e4f86f6975a1c3ba0a1a4578c59d775dae9bb9f9a45986fe4cec9a80439aaff443e7b5d52b600a9fbb26 WHIRLPOOL 7eaa42ad28d208136aeb0137edea92203795657e7d93166ddee189e3300ec9ddb4db97f5bcf267e1276b39b265feadcaeeec5ef6495f53f99143dfaea0cf84cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVEAIXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVFpNcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirI40P/R/i5nsy/drzm63lSIOqzZ8m
++DLVZ9h2qFg5qAR4MQTEX39yM4yvbx9cq4E0FrX/pTamXzwfQI4i/ZBIezx4/QnH
+jIIWXLD7Q88Vkj5RRwf+hcTZht9s+uDUnofaW9kc9m2UD01vEHGOyIkLcuqhngbv
+RsKF6B9s04itQFBofZZsUJ0BfN7jdtWwi2h/ObWRwSsLLBFrLe1xF0KR0N8e9MBJ
+hgPVLN+jDflhZeinlI0zEy49uoqa/XFerrlgQ8l8zcgtXWEzjfNxiIaL8d36wVfj
+sXNcRDQ5e94wIuKmoRVaN2cKPYec9NG/tNkGnB3U+dVIB8g1UAyPBr+biPt8a5go
+/RVU4hyCzrSGJbNKv59WtqrrItp+cRgC0Mxw0xv5xBrdSL7xSB7xDIv4yxEOpM1Y
+eFTFGLb5Lu7GLzoqO5JODJhKfNv0r+8fa5o/Wxt6bIrjEmSNy5Ohv57qAq1TafHv
+SEwWR4E82fwfuzrkEGzUhhuDcN/KzxtX6CYUv6MHJk6LBW0QCsjYPOWcG8HJ+DoH
+6wFBlcO7QNvuAHtyXiAIQpfMvYpNKwGG9BLQJCitUcP9+a9HMHI8pXCTfkCQn/S8
+YbAcYyEP7QD6/9sivHrjKVpBxDVjDi/WxSEXNll1Ko8Xck93avb9b4XWW02U4jnL
+ar/XPcxoKv/ZVmpMF5VO
+=GQ6e
 -----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
index 16b8b812051a..6f8432040842 100644
--- 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
@@ -1,9 +1,9 @@
- bindings/python/setup.py.in |  6 +++---
- configure.ac                | 10 +---------
- 2 files changed, 4 insertions(+), 12 deletions(-)
+ bindings/python/setup.py.in | 6 +++---
+ configure.ac                | 4 ----
+ 2 files changed, 3 insertions(+), 7 deletions(-)
 
 diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in
-index e58045e..a55f444 100644
+index adc474c..3faf982 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"]:
@@ -21,23 +21,17 @@ index e58045e..a55f444 100644
  setup( name='python-libtorrent',
  	version='@PACKAGE_VERSION@',
 diff --git a/configure.ac b/configure.ac
-index f727b81..9b4ccee 100644
+index 55ee13a..bdbf2a3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -539,15 +539,7 @@ AS_CASE(["$ARG_ENABLE_PYTHON_BINDING"],
-       AC_MSG_RESULT([yes])
+@@ -559,10 +559,6 @@ AS_CASE(["$ARG_ENABLE_PYTHON_BINDING"],
  
        AM_PATH_PYTHON([2.4], [], AC_MSG_ERROR([Python interpreter not found.]))
--      AX_PYTHON_DEVEL([>= '2.4'])
+       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".])]
- )
+     ],
+   ["no"], [
+       AC_MSG_RESULT([no])