commit: 09e978c98ea3a9177b4b96ef0ff796cef73d46e6 Author: Michael Weber <michael <AT> xmw <DOT> de> AuthorDate: Wed Oct 15 17:35:26 2014 +0000 Commit: Michael Weber <xmw <AT> gentoo <DOT> org> CommitDate: Wed Oct 15 17:35:26 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=09e978c9
cpython patch was accepted by upstream Package-Manager: portage-2.2.14_rc1 Manifest-Sign-Key: 62EEF090 --- dev-python/python-iptables/ChangeLog | 6 ++++++ .../files/python-iptables-0.2.0-tests.patch | 21 -------------------- .../files/python-iptables-0.4.0-python3.patch | 23 ---------------------- .../files/python-iptables-9999-cpython.patch | 12 ----------- .../python-iptables/python-iptables-9999.ebuild | 1 - 5 files changed, 6 insertions(+), 57 deletions(-) diff --git a/dev-python/python-iptables/ChangeLog b/dev-python/python-iptables/ChangeLog index 70584c4..9c2172f 100644 --- a/dev-python/python-iptables/ChangeLog +++ b/dev-python/python-iptables/ChangeLog @@ -1,3 +1,9 @@ + 15 Oct 2014; Michael Weber <[email protected]> + -files/python-iptables-0.2.0-tests.patch, + -files/python-iptables-0.4.0-python3.patch, + -files/python-iptables-9999-cpython.patch, python-iptables-9999.ebuild: + cpython patch was accepted by upstream + 08 Oct 2014; Michael Weber <[email protected]> -Manifest, -python-iptables-0.4.0-r1.ebuild: drop broken version diff --git a/dev-python/python-iptables/files/python-iptables-0.2.0-tests.patch b/dev-python/python-iptables/files/python-iptables-0.2.0-tests.patch deleted file mode 100644 index fb9d601..0000000 --- a/dev-python/python-iptables/files/python-iptables-0.2.0-tests.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/test.py b/test.py -index f426612..f598585 100755 ---- a/test.py -+++ b/test.py -@@ -3,16 +3,6 @@ - - import sys - --print "WARNING: this test will manipulate iptables rules." --print "Don't do this on a production machine." --while True: -- print "Would you like to continue? y/n", -- answer = raw_input() -- if answer in "yYnN" and len(answer) == 1: -- break --if answer in "nN": -- sys.exit(0) -- - from iptc.test import test_iptc, test_matches, test_targets - - results = [rv for rv in [test_iptc.run_tests(), test_matches.run_tests(), diff --git a/dev-python/python-iptables/files/python-iptables-0.4.0-python3.patch b/dev-python/python-iptables/files/python-iptables-0.4.0-python3.patch deleted file mode 100644 index f630792..0000000 --- a/dev-python/python-iptables/files/python-iptables-0.4.0-python3.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- python-iptables-0.4.0/setup.py -+++ python-iptables-0.4.0/setup.py -@@ -7,7 +7,7 @@ - # make pyflakes happy - __pkgname__ = None - __version__ = None --execfile("iptc/version.py") -+exec(open("iptc/version.py").read()) - - # build/install python-iptables - setup( ---- python-iptables-0.4.0/iptc/util.py -+++ python-iptables-0.4.0/iptc/util.py -@@ -66,6 +66,9 @@ - - def _find_library(*names): - ext = get_config_var('SO') -+ from sys import version_info -+ if version_info > (3, ): -+ ext = '.cpython-%i%i' % (version_info.major, version_info.minor) + ext - for name in names: - for n in (name, "lib" + name, name + ext, "lib" + name + ext): - lib = _do_find_library(n) diff --git a/dev-python/python-iptables/files/python-iptables-9999-cpython.patch b/dev-python/python-iptables/files/python-iptables-9999-cpython.patch deleted file mode 100644 index b7fe071..0000000 --- a/dev-python/python-iptables/files/python-iptables-9999-cpython.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- python-iptables-9999/iptc/util.py -+++ python-iptables-9999/iptc/util.py -@@ -66,6 +66,9 @@ - - def _find_library(*names): - ext = get_config_var('SO') -+ from sys import version_info -+ if version_info > (3, ): -+ ext = '.cpython-%i%i' % (version_info.major, version_info.minor) + ext - for name in names: - for n in (name, "lib" + name, name + ext, "lib" + name + ext): - lib = _do_find_library(n) diff --git a/dev-python/python-iptables/python-iptables-9999.ebuild b/dev-python/python-iptables/python-iptables-9999.ebuild index 7e9d0ac..c66d08c 100644 --- a/dev-python/python-iptables/python-iptables-9999.ebuild +++ b/dev-python/python-iptables/python-iptables-9999.ebuild @@ -25,7 +25,6 @@ RESTRICT=test PATCHES=( "${FILESDIR}/${P}-tests.patch" - "${FILESDIR}/${P}-cpython.patch" ) python_test() {
