Updating liguros repo

25 files changed, 71 insertions, 114 deletions

diff --git a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
index e53336158f59..6355b8a6163d 100644
--- a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
@@ -51,11 +51,4 @@ python_install_all() {
 
 python_install() {
 	distutils-r1_python_install
-
-	if ! python_is_python3; then
-		printf "# Placeholder for python2\n" \
-			> "${D}$(python_get_sitedir)/${PN,,}/__init__.py"
-
-		python_optimize
-	fi
 }
diff --git a/dev-python/apsw/apsw-3.25.2_p1.ebuild b/dev-python/apsw/apsw-3.25.2_p1.ebuild
index 53b6d83933e4..565e720ea169 100644
--- a/dev-python/apsw/apsw-3.25.2_p1.ebuild
+++ b/dev-python/apsw/apsw-3.25.2_p1.ebuild
@@ -27,7 +27,6 @@ S=${WORKDIR}/${MY_P}
 PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" )
 
 python_compile() {
-	python_is_python3 || append-cflags -fno-strict-aliasing
 	distutils-r1_python_compile --enable=load_extension
 }
 
diff --git a/dev-python/apsw/apsw-3.32.2_p1.ebuild b/dev-python/apsw/apsw-3.32.2_p1.ebuild
index 83032725e3f2..97162e87c0f6 100644
--- a/dev-python/apsw/apsw-3.32.2_p1.ebuild
+++ b/dev-python/apsw/apsw-3.32.2_p1.ebuild
@@ -27,7 +27,6 @@ S=${WORKDIR}/${MY_P}
 PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" )
 
 python_compile() {
-	python_is_python3 || append-cflags -fno-strict-aliasing
 	distutils-r1_python_compile --enable=load_extension
 }
 
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index ab950ba332d4..0c5b142be805 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -17,11 +17,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
+DEPEND="test? ( ${RDEPEND} )"
 
 PATCHES=(
 	"${FILESDIR}/betamax-0.8.1-tests.patch"
diff --git a/dev-python/billiard/billiard-3.6.0.0.ebuild b/dev-python/billiard/billiard-3.6.0.0.ebuild
index 82bfd4614ce4..b74678baef8c 100644
--- a/dev-python/billiard/billiard-3.6.0.0.ebuild
+++ b/dev-python/billiard/billiard-3.6.0.0.ebuild
@@ -29,14 +29,6 @@ DEPEND="
 # The usual req'd for tests
 DISTUTILS_IN_SOURCE_BUILD=1
 
-python_compile() {
-	if !  python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
 python_compile_all() {
 	use doc && esetup.py build_sphinx --builder="html" --source-dir=Doc/
 }
diff --git a/dev-python/bsddb3/bsddb3-6.2.7.ebuild b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
index 5f683c40cef4..747ee30ed677 100644
--- a/dev-python/bsddb3/bsddb3-6.2.7.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
@@ -63,17 +63,6 @@ python_configure_all() {
 	export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
 }
 
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
 python_test() {
-	if python_is_python3; then
-		PYTHONPATH=Lib3 "${EPYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
-	else
-		PYTHONPATH=Lib "${EPYTHON}" test.py -v || die "Testing failed with ${EPYTHON}"
-	fi
+	PYTHONPATH=Lib3 "${EPYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
 }
diff --git a/dev-python/cytoolz/cytoolz-0.10.0.ebuild b/dev-python/cytoolz/cytoolz-0.10.0.ebuild
index 705b417b4ec3..fafdd29e3338 100644
--- a/dev-python/cytoolz/cytoolz-0.10.0.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.10.0.ebuild
@@ -25,12 +25,6 @@ DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}]
 		>=dev-python/toolz-0.8[${PYTHON_USEDEP}] )"
 
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-
-	distutils-r1_python_compile
-}
-
 python_test() {
 	pushd "${BUILD_DIR}"/lib/ > /dev/null || die
 	PYTHONPATH=.:${PN} nosetests --with-doctest ${PN} || die "tests failed under ${EPYTHON}"
diff --git a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
index d992f5472e73..f00090d518b8 100644
--- a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
@@ -58,13 +58,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_prepare() {
-	if ! python_is_python3; then
-		# this is for python3 only
-		rm -r eventlet/green/http || die
-	fi
-}
-
 python_install_all() {
 	if use examples; then
 		docompress -x "/usr/share/doc/${PF}/examples"
diff --git a/dev-python/fs/fs-2.4.9-r1.ebuild b/dev-python/fs/fs-2.4.9-r1.ebuild
index bfb2fa5ed160..32a274cb0f55 100644
--- a/dev-python/fs/fs-2.4.9-r1.ebuild
+++ b/dev-python/fs/fs-2.4.9-r1.ebuild
@@ -39,11 +39,7 @@ BDEPEND="test? (
 )"
 
 python_test() {
-	# python2_7 tests require dev-python/typing which is
-	# now in stdlib so ignore tests. py2.7 is going away.
-	if python_is_python3; then
-		esetup.py test || die "tests failed"
-	fi
+	esetup.py test
 }
 
 pkg_postinst() {
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 6177519da1f5..546fb4e822de 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,2 +1,3 @@
 DIST humanize-2.4.1.tar.gz 46827 BLAKE2B e9b37283c5a4db1c5b2a9ef61919fe02a4e5720711129910e51b0b3481290c9bfa4e29225db75c37d83884c00065fa71b599ed42fac41414f481167d33091a98 SHA512 5d8534d2e97f375c7ec065dd239334a2a5da9d058f7c0312cb2683c3e42f5b8f99e117782e0888a6e5348f43958523df6609c294f5af7c971d81bd29679a0500
 DIST humanize-2.5.0.tar.gz 48126 BLAKE2B a0351352cacc53da2e45e9417963dd7fa5e06e568a2d8ee9c770b15dc9d977d27ba8419e9c18acb05093956a86fbed4379fe2004e73a2e1f8c99df3d80704170 SHA512 ffd8df6041108cdcc20dbad2b04e6e4d7ba010065574bb0c2f19a4bbb55687265a3f834223588f71825736737d8c710fa98f3549035369a90e385b92efea8ee1
+DIST humanize-2.6.0.tar.gz 53753 BLAKE2B 7908100cde103846554264df887ddb54223900cdbf1e52b2a19f029084b2997ab7a02e275f437d0cc04c3c42d6f8c371fbdab23468cdeb8f98a8cd6a64c1c288 SHA512 d1e57672c80ccabc48dadb2bafe65ac0b5b23de13907d7d51a06b6a1f2f01ef254e36afa203c9393420ad3bb5aaa22616a0d5c4c71cc53cf47727436be0b1599
diff --git a/dev-python/humanize/humanize-2.6.0.ebuild b/dev-python/humanize/humanize-2.6.0.ebuild
new file mode 100644
index 000000000000..4892c4615ec7
--- /dev/null
+++ b/dev-python/humanize/humanize-2.6.0.ebuild
@@ -0,0 +1,36 @@
+# 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} pypy3 )
+# The package uses pkg_resources to determine its version
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	# The package uses pkg_resources to determine its version
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/numexpr/numexpr-2.6.9.ebuild b/dev-python/numexpr/numexpr-2.6.9.ebuild
index fd730445e7fc..3e8eac795fa5 100644
--- a/dev-python/numexpr/numexpr-2.6.9.ebuild
+++ b/dev-python/numexpr/numexpr-2.6.9.ebuild
@@ -40,15 +40,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS}"
-		append-cflags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
 python_test() {
 	pushd "${BUILD_DIR}"/lib >/dev/null || die
 	"${EPYTHON}" \
diff --git a/dev-python/numexpr/numexpr-2.7.1.ebuild b/dev-python/numexpr/numexpr-2.7.1.ebuild
index 00becd921368..c02d56dc3b8d 100644
--- a/dev-python/numexpr/numexpr-2.7.1.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.1.ebuild
@@ -42,15 +42,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS}"
-		append-cflags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
 python_test() {
 	pushd "${BUILD_DIR}"/lib >/dev/null || die
 	"${EPYTHON}" \
diff --git a/dev-python/numpy/numpy-1.17.4-r3.ebuild b/dev-python/numpy/numpy-1.17.4-r3.ebuild
index 7b63588cfd37..c16170fa3f61 100644
--- a/dev-python/numpy/numpy-1.17.4-r3.ebuild
+++ b/dev-python/numpy/numpy-1.17.4-r3.ebuild
@@ -103,11 +103,7 @@ python_prepare_all() {
 python_compile() {
 	export MAKEOPTS=-j1 #660754
 
-	local python_makeopts_jobs=""
-	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
-	distutils-r1_python_compile \
-		${python_makeopts_jobs} \
-		${NUMPY_FCONFIG}
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
 }
 
 python_test() {
diff --git a/dev-python/pytables/pytables-3.4.4.ebuild b/dev-python/pytables/pytables-3.4.4.ebuild
index c92d14b48aad..4c098a1ffc35 100644
--- a/dev-python/pytables/pytables-3.4.4.ebuild
+++ b/dev-python/pytables/pytables-3.4.4.ebuild
@@ -51,14 +51,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS}"
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
 python_test() {
 	cd "${BUILD_DIR}"/lib* || die
 	${EPYTHON} tables/tests/test_all.py || die
diff --git a/dev-python/pytables/pytables-3.6.1.ebuild b/dev-python/pytables/pytables-3.6.1.ebuild
index ac088affbd60..8c7d179951a8 100644
--- a/dev-python/pytables/pytables-3.6.1.ebuild
+++ b/dev-python/pytables/pytables-3.6.1.ebuild
@@ -52,10 +52,6 @@ python_prepare_all() {
 }
 
 python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS}"
-		append-cflags -fno-strict-aliasing
-	fi
 	distutils-r1_python_compile -j1
 }
 
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
index fce7a4f45d1e..aaec63e8bf7b 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
@@ -45,12 +45,6 @@ python_prepare_all() {
 }
 
 python_test() {
-	# at this point let's not fix python2 stuff
-	if ! python_is_python3; then
-		ewarn "Tests broken on python2, not runninge tests for ${EPYTHON}"
-		return 0
-	fi
-
 	distutils_install_for_testing
 
 	esetup.py test || die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/python-debian/python-debian-0.1.36.ebuild b/dev-python/python-debian/python-debian-0.1.36.ebuild
index 9990d05cc044..855f46d2d6d2 100644
--- a/dev-python/python-debian/python-debian-0.1.36.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.36.ebuild
@@ -23,10 +23,7 @@ RDEPEND="
 
 BDEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-arch/dpkg
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
-	)
+	test? ( app-arch/dpkg )
 "
 
 PATCHES=( "${FILESDIR}/0.1.36-disable-apt-pkg.patch" )
diff --git a/dev-python/rpy/rpy-2.9.0.ebuild b/dev-python/rpy/rpy-2.9.0.ebuild
index fe8dd346983f..22b9e4d4b0e6 100644
--- a/dev-python/rpy/rpy-2.9.0.ebuild
+++ b/dev-python/rpy/rpy-2.9.0.ebuild
@@ -38,10 +38,6 @@ PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
 S="${WORKDIR}/${MY_P}"
 
 python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
 	distutils-r1_python_compile
 }
 
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index 2b31e1481ce5..3d29dd12db08 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1 +1,2 @@
 DIST rtslib-fb-2.1.69.tar.gz 69825 BLAKE2B d5bc7a526495922e9c00f81d11f5436b77a917aa1c29450a54a4099fc7b97f9b3c3b8d623158bd02f8c1080e5b646c5f67f673496b1bd5bef5aa664df43eeb74 SHA512 8ff956c8b593a1d0a79a9a527502ddd1422bc27f272bfa708d145a66779de1af65adb20d822bee59c5b60282fb16f15429c10477d3523c04b215f963ec850073
+DIST rtslib-fb-2.1.73.tar.gz 73883 BLAKE2B 2e1a9306386b019ed7d4f89dc976959020f981812a28f0a8f4c520f311ec6ce08da2e45115d394cab272296bd84e16fd1c15a6aecdf4650d52f96e294aed4cc5 SHA512 70bfad6a055af1242f989fcab706b5a49ebe8c1ed7183ac3f739eb54e0c628cc27efe9823dd017c33d735847888a142a791fdba3e5f4d4817290df7f8b6347f0
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.73.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.73.ebuild
new file mode 100644
index 000000000000..d8bffa421281
--- /dev/null
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.73.ebuild
@@ -0,0 +1,24 @@
+# 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 systemd
+
+DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
+HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit "${FILESDIR}/target.service"
+}
diff --git a/dev-python/soupsieve/soupsieve-1.9.5.ebuild b/dev-python/soupsieve/soupsieve-1.9.5.ebuild
index b0964f1ad6ee..9c4b7571ab57 100644
--- a/dev-python/soupsieve/soupsieve-1.9.5.ebuild
+++ b/dev-python/soupsieve/soupsieve-1.9.5.ebuild
@@ -18,10 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT+=" !test? ( test )"
 
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)
-"
-BDEPEND="${RDEPEND}
+BDEPEND="
 	test? (
 		dev-python/beautifulsoup[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/soupsieve/soupsieve-1.9.6.ebuild b/dev-python/soupsieve/soupsieve-1.9.6.ebuild
index 5d74a19ebc4f..89b99d917423 100644
--- a/dev-python/soupsieve/soupsieve-1.9.6.ebuild
+++ b/dev-python/soupsieve/soupsieve-1.9.6.ebuild
@@ -18,10 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT+=" !test? ( test )"
 
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)
-"
-BDEPEND="${RDEPEND}
+BDEPEND="
 	test? (
 		dev-python/beautifulsoup[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
index 2259f21f791f..2deda3926489 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
@@ -26,9 +26,8 @@ DEPEND="${RDEPEND}
 		dev-python/sphinx-testing[${PYTHON_USEDEP}] )"
 
 python_prepare() {
-	if python_is_python3; then
-		sed -i -e "s/import urllib/import urllib.request as urllib/" sphinxcontrib/jinja.py || die
-	fi
+	sed -e "s/import urllib/import urllib.request as urllib/" \
+		-i sphinxcontrib/jinja.py || die
 }
 
 python_test() {
diff --git a/dev-python/sphinx/sphinx-1.7.5-r2.ebuild b/dev-python/sphinx/sphinx-1.7.5-r2.ebuild
index 536245221b49..70547a9e5944 100644
--- a/dev-python/sphinx/sphinx-1.7.5-r2.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.5-r2.ebuild
@@ -34,7 +34,6 @@ RDEPEND="
 	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' -2)
 	latex? (
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
@@ -47,7 +46,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' -2)
 		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]