diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-03-28 11:41:12 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-03-28 11:41:12 +0000 |
| commit | 901cd350c731889d7dd1160942da38df31c1a362 (patch) | |
| tree | 974e8c9a5c0bb2c5e135df32a8270a873c05cb8c /net-libs/rb_libtorrent | |
| parent | version bump, proxy for Simone (diff) | |
| download | gentoo-2-901cd350c731889d7dd1160942da38df31c1a362.tar.gz gentoo-2-901cd350c731889d7dd1160942da38df31c1a362.tar.bz2 gentoo-2-901cd350c731889d7dd1160942da38df31c1a362.zip | |
Fix broken configure patch, #544612
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'net-libs/rb_libtorrent')
| -rw-r--r-- | net-libs/rb_libtorrent/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/rb_libtorrent/files/rb_libtorrent-0.16.17-python.patch | 26 |
2 files changed, 15 insertions, 17 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/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]) |