From d8e7564fabea8929cf5b9232c82583230283f971 Mon Sep 17 00:00:00 2001
From: "Liguros - Gitlab CI/CD [develop]" <gitlab@liguros.net>
Date: Tue, 10 Nov 2020 06:49:55 +0000
Subject: Updating liguros repo

---
 .../files/python-iptables-1.0.0-ldconfig-fix.patch | 21 ++++++++++++++
 .../python-iptables-1.0.0-r1.ebuild                | 32 ++++++++++++++++++++++
 .../python-iptables/python-iptables-1.0.0.ebuild   | 28 -------------------
 3 files changed, 53 insertions(+), 28 deletions(-)
 create mode 100644 dev-python/python-iptables/files/python-iptables-1.0.0-ldconfig-fix.patch
 create mode 100644 dev-python/python-iptables/python-iptables-1.0.0-r1.ebuild
 delete mode 100644 dev-python/python-iptables/python-iptables-1.0.0.ebuild

(limited to 'dev-python/python-iptables')

diff --git a/dev-python/python-iptables/files/python-iptables-1.0.0-ldconfig-fix.patch b/dev-python/python-iptables/files/python-iptables-1.0.0-ldconfig-fix.patch
new file mode 100644
index 000000000000..14fe9eae38da
--- /dev/null
+++ b/dev-python/python-iptables/files/python-iptables-1.0.0-ldconfig-fix.patch
@@ -0,0 +1,21 @@
+diff --git a/iptc/xtables.py b/iptc/xtables.py
+index cf21029..8f62164 100644
+--- a/iptc/xtables.py
++++ b/iptc/xtables.py
+@@ -4,6 +4,7 @@ import ctypes as ct
+ import os
+ import sys
+ import weakref
++import pathlib
+ 
+ from . import version
+ from .util import find_library, find_libc
+@@ -805,7 +806,7 @@ _lib_xtables, xtables_version = find_library(_searchlib)
+ _xtables_libdir = os.getenv("XTABLES_LIBDIR")
+ if _xtables_libdir is None:
+     import re
+-    ldconfig_path_regex = re.compile('^(/.*):$')
++    ldconfig_path_regex = re.compile(r'^(/.*): \(.*$')
+     import subprocess
+     ldconfig = subprocess.Popen(
+         ('/sbin/ldconfig', '-N', '-v'),
diff --git a/dev-python/python-iptables/python-iptables-1.0.0-r1.ebuild b/dev-python/python-iptables/python-iptables-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..b6c20c1fedc9
--- /dev/null
+++ b/dev-python/python-iptables/python-iptables-1.0.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for iptables"
+HOMEPAGE="https://github.com/ldx/python-iptables"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-firewall/iptables"
+
+# tests manipulate live iptables rules, so disable them by default
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/python-iptables-1.0.0-ldconfig-fix.patch"
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-iptables/python-iptables-1.0.0.ebuild b/dev-python/python-iptables/python-iptables-1.0.0.ebuild
deleted file mode 100644
index 07911aabf607..000000000000
--- a/dev-python/python-iptables/python-iptables-1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for iptables"
-HOMEPAGE="https://github.com/ldx/python-iptables"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-firewall/iptables"
-
-# tests manipulate live iptables rules, so disable them by default
-RESTRICT="test"
-
-distutils_enable_sphinx doc
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-- 
cgit v1.3.1