gentoo resync : 05.02.2020

4 files changed, 2 insertions, 89 deletions

diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 7926bbec661a..db1c448ff994 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,9 +1,6 @@
 AUX reportlab-3.5.13-disable-network-tests.patch 886 BLAKE2B fec5e11e9219e0ca320263539ca50016fa94829029b36922bf213544b827e736c6e060cd6946bc1584cf1b2b0a1a026b7df41c68d1081acba50956686663777b SHA512 561fd5f5a3cca662317fad3ae8262880b825765537fd2746042c92f290a0ced95ace7cd8d02316250f02843b4a27e0cf916bba6fb2efd4166cb19f3da6c7d6f2
 AUX reportlab-3.5.13-pillow-VERSION.patch 915 BLAKE2B 91f1177441882f055f0d9b1fb3c5eceb2acc0130e81e98ea0fc9ca1e9de332d438ecb223771e2c91a4b6d12d368f7974cdb3e1389a36be735c7fbeb9679214f9 SHA512 04d2c6a5f93f0fd00e903cc64ed71a03cdc898b3dbd94e8065712acff3b9f55c8e04fa78832ee90d91dbad129767a0357b59646f7284ff545236f5a4978b4ae3
-AUX reportlab-no-pip.patch 419 BLAKE2B c09e5ea741b04dbeb7791f713d9171995d99da73706201da9c14018b7a1789621ae53317ae8d170fc50fecf860b7b0c84c1016b24a505eef778ae6fc964fcf01 SHA512 1a5f4bced7be3c706b57c262dfd84fb539af42ae49541cf68d01963c8c79c96ad0a8389f36f486a485d258e9aa860c195e061c3c34070cfca3e64b52b6c89cd1
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
 DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
-EBUILD reportlab-3.3.0-r2.ebuild 1640 BLAKE2B 56ce615cf9df112a0bbc38c6177669d615de7ebbf941bb5308657233171c839570163e8eebebb1491abaf4be12931271031368eb40790274337d1c3ff3c57906 SHA512 11a8fe945c18ab2caaccae0fb5139109efb8d3eb450d278d0d6ac68ed2eb457dac12738d997693d399a6f0e1f6aa59400b0e724dbcc73734379a15bc957c63dc
-EBUILD reportlab-3.5.13-r1.ebuild 1512 BLAKE2B 3c16e3d9e51ad6f06262757295a2aeaffa0af7ddfe3f7439ba89f034c55caa226afc6f809ab0dd06b5497662a12f1759ace2114bf11b348616bc44facce68735 SHA512 1da526e05e20657ec6a8964b7e4acab2ba9f387c010bcf6662b960e6ad2c386c88ea934a58afff8e1064cdd44b054d292e06074c63bf2943b248d686ab5ddb05
+EBUILD reportlab-3.5.13-r1.ebuild 1508 BLAKE2B 3ec312200b9ee652d79ee8e1380be040b8cb2da1874b4286cdcbe0c78b495894e76b3894d7309d58fe3854652afdcb387780efe23301a851222ae8bdbc58a2c2 SHA512 9eb2e70d66dc8c0aad29b0d14dfe27bfcc2d1b4a5a98e130feb08081719ce4054881c83721ce29cc4bd3e43eea4429ec4c1e7f1b3862b87b915f2078a7985c37
 MISC metadata.xml 441 BLAKE2B b779c5502121b6730f77ce8cff7d8e64fd8510ccf778888a2cf49c5a370c54bd258e91bbb8354cf96350b3a1e5bfd799415c752a1750e3a84ca40e2cfc34b3db SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2
diff --git a/dev-python/reportlab/files/reportlab-no-pip.patch b/dev-python/reportlab/files/reportlab-no-pip.patch
deleted file mode 100644
index 332878e24dcf..000000000000
--- a/dev-python/reportlab/files/reportlab-no-pip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -538,7 +538,7 @@
-                 ],
-             
-             #this probably only works for setuptools, but distutils seems to ignore it
--            install_requires=['pillow>=2.4.0','pip>=1.4.1', 'setuptools>=2.2'],
-+            install_requires=['pillow>=2.4.0'],
-             )
-         print()
-         print('########## SUMMARY INFO #########')
diff --git a/dev-python/reportlab/reportlab-3.3.0-r2.ebuild b/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
deleted file mode 100644
index b090a00fc797..000000000000
--- a/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} ) # Tests crash with pypy
-
-inherit distutils-r1 flag-o-matic prefix
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="http://www.reportlab.com/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	<dev-python/pillow-6[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-	media-libs/libart_lgpl
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
-	app-arch/unzip
-"
-
-PATCHES=(
-	"${FILESDIR}"/reportlab-no-pip.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-python_prepare_all() {
-	sed -i \
-		-e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
-		-e 's|%(HOME)s/fonts|%(HOME)s/.fonts|g' \
-		src/reportlab/rl_config.py || die
-
-	eprefixify setup.py
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd tests > /dev/null || die
-	"${PYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( demos/. tools/pythonpoint/demos )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
index 02ff2d6238d0..d9dc2336fce3 100644
--- a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="