gentoo Easter resync : 12.04.2020

5 files changed, 3 insertions, 149 deletions

diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 11f46f8a3fcc..1dd745f10471 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,7 +1,3 @@
-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 1311 BLAKE2B 70a1606ac3db1370fc5160ec421d89ec4639653834e4ae683e087c9dc8fa648614d7744a2aa44963301c50723f9619880afcf00464d1191b1b416854ccddd0cd SHA512 d8c818491c267f59bf95c9a458915e39257f683453f74d5cb9dbe1a72850980e93a1bfea8ff3e4f38263a281be1ef4d4dca737f5baada4202665b3675ec68adc
-EBUILD cssutils-1.0.2-r1.ebuild 1507 BLAKE2B 617dd1fb973ebd1640767324c07592460d400b1c3dc8b187d85721f7e523e2d8179d5408fd33250751bb305e72d8b1256c3e1bb672f05bae38a14a004d0c6695 SHA512 a54bf52cdc82bd8a5bf231bb490cd349033a5123eb38439123554a6ae08b3d96d52d7b738d10d42ee1d6a4a1a0e3ad36f85d041b16d177213ad7d0aaf50cdc3e
-EBUILD cssutils-1.0.2-r2.ebuild 1540 BLAKE2B 7e6116b5fd91101d367c8e5101e372e737b4872465a51acc42781aa609df033171e642c854674c82a3709797d38609927eaeff125f1981c3193ec839a30d58a7 SHA512 0824d32068a39cce0f6ad3ce534298d526acccafc4d39e9cb0775a362f26f802a3190bc00af7ec940390a25821848d0e3e3bf03e10354870d12a3918aedbd8f4
+EBUILD cssutils-1.0.2-r2.ebuild 1540 BLAKE2B e70787201ef9669a8d7f6c60621520ff477a9d7de1270f4bb5edc77687a16a636cb8950af29cc91312d2434173ba677b0d39fc765b4895472288e29f81b374a6 SHA512 11fcd91ad69a098b8b7394c021798fc4ec3fdfbe638bf9b41d39156b557a97bb4cfc41d9bb4c7bb7d31ee2146191ae59ceff5743b1c9ce3f167939a97033e67b
 MISC metadata.xml 556 BLAKE2B c7ecbc812459a9f52c8931f9bff561d5d21a3b8282bfa299320fcc456a33e3a87811db58ef62ccf5ee359062d3095c6cdc60574eec518516a099cd51242d8c91 SHA512 1797d4788446c3ac72abd12c722e81325f032bab8e19ab89d83883ceae354bd1e38669673c1daf3ecb522988481546884c6960d28536b55a9168bb6edf6f22a0
diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild
deleted file mode 100644
index f3e9e622067b..000000000000
--- a/dev-python/cssutils/cssutils-1.0.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-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 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}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pypy-test-backport.patch
-)
-
-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/tests/test_errorhandler.py
-	fi
-
-	# requires old pbr, does it really?
-	sed \
-		-e '/tests_require/d' \
-		-i setup.py || die
-
-	EPATCH_OPTS="--binary"
-
-	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}"
-}
diff --git a/dev-python/cssutils/cssutils-1.0.2-r1.ebuild b/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
deleted file mode 100644
index 4c06df2a752a..000000000000
--- a/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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}"
-}
diff --git a/dev-python/cssutils/cssutils-1.0.2-r2.ebuild b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
index 3385328393b0..cd0c3a9f7292 100644
--- a/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
@@ -9,12 +9,12 @@ PYTHON_COMPAT=( python3_{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/"
+HOMEPAGE="https://pypi.org/project/cssutils/ https://bitbucket.org/cthedot/cssutils https://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"
+KEYWORDS="amd64 arm arm64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch b/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch
deleted file mode 100644
index f5f1bda3516d..000000000000
--- a/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch

-# User Daniel <kingdread@gmx.de>

-# Date 1448482419 -3600

-# Node ID 01a19d494b6f31e91c54ae39c5a6f43f6292a85d

-# Parent  3a01bd18118a6466ad93aa23caaa4164528b59ac

-Fix tests on PyPy 2

-

-Tests fail because of the extra "u" prefix in the error message

-

-diff --git a/src/cssutils/tests/test_profiles.py b/src/cssutils/tests/test_profiles.py

---- a/src/cssutils/tests/test_profiles.py

-+++ b/src/cssutils/tests/test_profiles.py

-@@ -2,6 +2,7 @@

- __version__ = '$Id: test_cssvalue.py 1443 2008-08-31 13:54:39Z cthedot $'

- 

- import sys

-+import platform

- import basetest

- import cssutils

- 

-@@ -124,6 +125,11 @@

-             expmsg = u"invalid literal for int(): x" 

-         elif sys.platform.startswith('java'):

-             expmsg = u"invalid literal for int() with base 10: x"

-+        # PyPy adds the u prefix, but only in versions lower than Python 3

-+        elif (platform.python_implementation() == "PyPy" and

-+              sys.version_info < (3, 0)):

-+            expmsg = u"invalid literal for int() with base 10: u'x'"

-+

-             

-         self.assertRaisesMsg(Exception, expmsg, 

-                              cssutils.profile.validate, u'-test-funcval', u'x')