gentoo resync : 15.01.2020

4 files changed, 62 insertions, 6 deletions

diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 4fbdeede59bf..4d63e5c3bbc7 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,6 +1,7 @@
 AUX cssutils-1.0.1-pypy-test-backport.patch 1215 BLAKE2B 8a6859fb3721a1c36541c816d10da5109a525bb8f92e07df79c0bf0d002240f838a7b58b67779acf7c41f331b218fa3342385ed3ecb2d15e624f14cec1336536 SHA512 a0072d67f034b066a30ec9cd35b5f618ce8e0beea2b1236b6900d7e028b1ed7d6095ca0beaf0eacb3f7e8a4649e22b98951df9a303d4761f15d7472e2e57b41e
 DIST cssutils-1.0.1.tar.gz 353621 BLAKE2B 142320e2358acb1b5b95400f42fb5eb40840602bd204f68a1896ea92b35dfe2ce6f316d84cf5d21a2ef8047f4748294b908057fa12cab352b42d7ab2ffcfaa6f SHA512 932a128443cc31f689d91c7c75a04ddc79824b4e5c0779e48d30fa0a3a760cad82d8208264ec95a3b120c38962f2eabf6b3456aa8f81d24e9c9718e95fd6bf83
 DIST cssutils-1.0.2.tar.gz 367038 BLAKE2B e19edce100dbc05d6e469eb6b0ad234d7d4c9458aca1b2a3e72bdeff1a35dec64427353936a339e2071d8ba2e8804c5754f55a391955a61ef61ae56381269125 SHA512 4988893875a03923d3127e334654799e5c2ebcdc0a7f5b3fb5c9ab27d1b331caa5bf197161312a298531e0757843aa3259ceba5fa19947353eea24a5da53ceda
-EBUILD cssutils-1.0.1.ebuild 1326 BLAKE2B 2d4eaee06258b4f162c25cabf115e6a3682e4221911510230d934d85d753b883cb8726648dc7bd127289116cd1fb68e3d7f5e9fcbd354f123d5bb3eb2437ff14 SHA512 8a68f9668fcc65814b0a415769a479a3459973b425d513b3da547c0e57c06399fdbf3a90e43c7c0d9332018a4c04f3e3f8a48a789d51a1296faff77f9dfb811b
-EBUILD cssutils-1.0.2-r1.ebuild 1520 BLAKE2B e9ccef9164a52342daed990e429ec243bec4e0d9f0e06593739c2e839466733f4470687e705f50ddb6c5a2f9ee075cabf5e612f28afcecce92abcfdc2655e3c2 SHA512 0ae1090a63cc56370e8c232cd193e7ba1dd4e8951045a0bc6106cce0bdb27cd17f6a32590826e9c287a394d58876a878fb1b62a8a654c9d924011f18f6eaa56c
+EBUILD cssutils-1.0.1.ebuild 1317 BLAKE2B 529ad01400b420b33ee03db7094c8832b54b9e6fcbeaef55619a9c60e0a14c2497f92dfe0f56d706eb68f8745d49429185bc1faf5ca8505ed0d68330d32dfee5 SHA512 a0b5b2648bd8be6f322dbe52cafc885f1d335309e6996149ee19adb45ebf518b613f334e555c36ea9756e87f6d2ded62837de9dbdd55b6107b134d398172a3db
+EBUILD cssutils-1.0.2-r1.ebuild 1513 BLAKE2B 9ef184a37a60d62ee5e5f267f001923a481c9e03cb273a72647c232e04bd5f77cb20531ed1f2655fc901243429915303cc94c108cf96d761a555ccf20607dd19 SHA512 21fbc26e09d1e9aa34624181ce5758f3e58e432c8e15e3c46d7ad71ff473909263fd7884b9b7c3e460c9fcba3b859b434a71588e566556c135a4f90e2f8a4c36
+EBUILD cssutils-1.0.2-r2.ebuild 1517 BLAKE2B d7ccd17ba289edbb14a95ad42a79454687877b0e2e6b5f7a28625660dccafb925dc7dc70f5cce884f856e2ffb4ebc9d5391dd4b619ce19448cf31c1117babc42 SHA512 0f3e392f202817be0872c57992c27ed9fe693eda830252a587630a0fe224aac73bda8ab99d678baa888201fac097641bcbb4b1bcf8fe3c6fb9cb31e800631a5b
 MISC metadata.xml 669 BLAKE2B 1d3cf25cab5d7a828451da5ec24ccae08e31141e6ec2ffe3efaead8284a4a7763a1c5d053138bbbc2f3846a45dcb6bb353efaffdf0a83fc110f13a6af13ed1ac SHA512 3fe0661179833d29c8a5e5ae2b7d872ad860354c58bff8e18935f5876fd95cf8fdfbb4ebda9719198dfce891647d04f263d213b74eca635005098a89a0402294
diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild
index dce1a69ac358..8e3bc6478cb3 100644
--- a/dev-python/cssutils/cssutils-1.0.1.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssutils/cssutils-1.0.2-r1.ebuild b/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
index 2791f39a7dfa..9536111a6c7f 100644
--- a/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssutils/cssutils-1.0.2-r2.ebuild b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..ba3995b9145c
--- /dev/null
+++ b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CSS Cascading Style Sheets library"
+HOMEPAGE="https://pypi.org/project/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Disable test failing with dev-python/pyxml installed.
+	if has_version dev-python/pyxml; then
+		sed -e "s/test_linecol/_&/" \
+			-i src/cssutils/tests/test_errorhandler.py \
+			|| die
+	fi
+
+	# requires old pbr, does it really?
+	sed \
+		-e '/tests_require/d' \
+		-i setup.py || die
+
+	# fix casing of call to Windows-1252. Remove when upstream fixes casing.
+	sed -i -e 's/encutils.tryEncodings(test)/encutils.tryEncodings(test).lower()/' \
+	src/cssutils/tests/test_encutils/__init__.py || die "fixing test_encutils failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die
+	# esetup.py test
+	# exclude tests that connect to the network
+	set --  nosetests \
+		-e test_parseUrl -e test_handlers -P "${BUILD_DIR}/lib/cssutils/tests"
+	echo "$@"
+	"$@" || die "Testing failed with ${EPYTHON}"
+}