diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-03-28 13:32:02 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-03-28 13:32:02 +0000 |
| commit | c7dea88a315bd7a430e53f4db9254cf3c2a8f036 (patch) | |
| tree | 2c1894e1b9f92707e2c046b899db29e6e3815c78 /net-libs/rb_libtorrent | |
| parent | drop 4.3.x, bump 4.4.2, prepare security patch setting (diff) | |
| download | gentoo-2-c7dea88a315bd7a430e53f4db9254cf3c2a8f036.tar.gz gentoo-2-c7dea88a315bd7a430e53f4db9254cf3c2a8f036.tar.bz2 gentoo-2-c7dea88a315bd7a430e53f4db9254cf3c2a8f036.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-1.0.2-python.patch | 24 |
2 files changed, 14 insertions, 16 deletions
diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog index f5a4c714e6bb..db2f1a8b8156 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.192 2015/03/28 11:41:12 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.193 2015/03/28 13:32:02 jlec Exp $ + + 28 Mar 2015; Justin Lecher <jlec@gentoo.org> + files/rb_libtorrent-1.0.2-python.patch: + Fix broken configure patch, #544612 28 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-1.0.2-python.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.2-python.patch index 511a21c41ac0..e729a190c79a 100644 --- 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 @@ -1,6 +1,6 @@ - bindings/python/setup.py | 2 +- - configure.ac | 10 +--------- - 2 files changed, 2 insertions(+), 10 deletions(-) + bindings/python/setup.py | 2 +- + configure.ac | 4 ---- + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 961395f..c38ef52 100644 @@ -16,23 +16,17 @@ index 961395f..c38ef52 100644 except: extra_cmd = None diff --git a/configure.ac b/configure.ac -index ebb1f7e..dddc403 100644 +index ebb1f7e..3e07828 100644 --- a/configure.ac +++ b/configure.ac -@@ -539,15 +539,7 @@ AS_CASE(["$ARG_ENABLE_PYTHON_BINDING"], - AC_MSG_RESULT([yes]) +@@ -540,10 +540,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]) |