gentoo Easter resync : 12.04.2020

5 files changed, 3 insertions, 81 deletions

diff --git a/dev-python/urlgrabber/Manifest b/dev-python/urlgrabber/Manifest
index 7e0be654b74c..a7917d1fcb66 100644
--- a/dev-python/urlgrabber/Manifest
+++ b/dev-python/urlgrabber/Manifest
@@ -1,7 +1,3 @@
-AUX urlgrabber-3.9.1.patch 1057 BLAKE2B c285a0e3827c8c7f8e90e4869d67a92039b2d0fb1d7610cf89b05f598977b2d83859b81f7c03fd5f25fc4b27cd41a1c335124f9f17b2d5be0be1ab4fe844804a SHA512 0a02512f871f525f4b3a0126e92e92d1393876f477fe3ae4ff3b0780ba30c21349fb770da59f2af7acd008fcda6bb3c2193204f8334c9f5476bc4e0188bc60ec
 DIST urlgrabber-3.10.1.tar.gz 83735 BLAKE2B ea0b3c071f968b2632e89cf225906740685b0f1134d41cf8aaf7e6361110780f6c998b06e4d79527be7e7953c5c4a617d039477135135cc7fc13a0426f0d9ee0 SHA512 c44d32b17c5f8984d09ed46ae36b3e05dc69d041820cf979029bc325d8407bbd7e324f264be5886286cd99e123f51affec26638cab6e525f85e2a1c4247462d7
-DIST urlgrabber-3.9.1.tar.gz 72343 BLAKE2B 2c3d9e9a994e0a918bc364aae37664ad41ccb60a09c72c3862e7e79d44e50efedca362e321607ed2971822adc694a8a61b8a861625e830bbb897859e1c6888c9 SHA512 897f0bd09485c207d735a814fda7cf053c71262e31e87f358c473da770abaf7fd339ae6802df978091889c5d6fe123f74d5386d79c47f93b36cefbc22f44db47
-EBUILD urlgrabber-3.10.1-r1.ebuild 694 BLAKE2B 6333621206acdf9bfc5a5f345075cbb52b215de8fe0697e82db58398caf4d2dbcd4eb060307526c26d69e02cb97d49380eb563187cf9dbd892775b941838e901 SHA512 7ee9cf56984aab45b792464791cb8013a3ba77caf6cc74eafefe6cded770f15932f8808becc8ab7f3b96fd5ee983f2c93bdab7aa5e7635b28b7668922d54454a
-EBUILD urlgrabber-3.10.1.ebuild 517 BLAKE2B e8be7fc1fde7b723ba7fb5058aa38a6b615f8af61db2586df0fd23e8cec0d653010c2ebc3189c731bf624e4f37fdc6cff4ea50a7930900f4bcf81ea01ca4cbbe SHA512 eed0d9b83bafb08ca34bef640c3d73dd1d08383706c0d167e761485b0df9eae0c0ad1bb892179de43d357226e2bcfa0d41a8c02dad9c13e01f02024c2305cd2b
-EBUILD urlgrabber-3.9.1-r2.ebuild 565 BLAKE2B 508163200c054b72f278fe103471689196bba9b1fc8a6a1bfdaf39731e8dc0c08574d913ee60d411b60e726e833e3b2e8fe7e981d2d7e51d616fa87e82047734 SHA512 1e83b094a7a9803215d7175c6d460a3043a9fd53f1394ef24b569426946898910fa181d5b10b3052bd7a75f6f98af9480afad0954dc3c9f476cc2ef55cd32edf
+EBUILD urlgrabber-3.10.1-r1.ebuild 690 BLAKE2B 616a06222ba081083fd7b7091155de81a3dabe61c8d18368c86b6227717d3e797722fb4c0334b62414e44ddc8775b5dd00d20a18dfad3541efb6e3b992cb5810 SHA512 98fc0b1a057a877e34cf1984a50dd2e65a5abd013d0a930641ed4bcab80c4f4e7774fb3c37d1fa764b9fdcfebf8740eb957788830cc1707b749c06eae59e2f13
 MISC metadata.xml 1485 BLAKE2B a3ae1b3e600f302d2b5c32faae061fc44eb5924dbcacf1c9ea33b546bfb938b65f4541ab4a1427888f1233e3a19292275cdb2030b04f57f6aac1a36b2afe2444 SHA512 cb471d25797f7e39e9b27a6ad12131b2942e4f62128cdf02d53693b478c80a0cf3b48d0e562930149a98dcb2f71068e11475fe8c2bcddcbe010564beaa34df2b
diff --git a/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch b/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch
deleted file mode 100644
index bdcc9cb1d465..000000000000
--- a/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://yum.baseurl.org/gitweb?p=urlgrabber.git;a=commitdiff;h=f4e57ece7ded0f7ad83c8a40fe8423fab7812264
-http://yum.baseurl.org/gitweb?p=urlgrabber.git;a=commitdiff;h=89cc380a2a251a1d2d8b91cf6df170fa546597aa
-
-diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
-index f98f423..7b7f979 100644
---- a/urlgrabber/grabber.py
-+++ b/urlgrabber/grabber.py
-@@ -1532,11 +1589,14 @@
-     def _over_max_size(self, cur, max_size=None):
- 
-         if not max_size:
--            max_size = self.size
--        if self.opts.size: # if we set an opts size use that, no matter what
--            max_size = self.opts.size
-+            if not self.opts.size:
-+                max_size = self.size
-+            else:
-+                max_size = self.opts.size
-+
-         if not max_size: return False # if we have None for all of the Max then this is dumb
--        if cur > max_size + max_size*.10:
-+
-+        if cur > int(float(max_size) * 1.10):
- 
-             msg = _("Downloaded more than max size for %s: %s > %s") \
-                         % (self.url, cur, max_size)
diff --git a/dev-python/urlgrabber/urlgrabber-3.10.1-r1.ebuild b/dev-python/urlgrabber/urlgrabber-3.10.1-r1.ebuild
index 707c5ec479a3..d66088a5f87d 100644
--- a/dev-python/urlgrabber/urlgrabber-3.10.1-r1.ebuild
+++ b/dev-python/urlgrabber/urlgrabber-3.10.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND="dev-python/pycurl[${PYTHON_USEDEP}]"
diff --git a/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild b/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild
deleted file mode 100644
index 1fc385c1217c..000000000000
--- a/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for downloading files"
-HOMEPAGE="http://urlgrabber.baseurl.org"
-SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="dev-python/pycurl[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-# Entire testsuite relies on connecting to the i'net
diff --git a/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild b/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild
deleted file mode 100644
index 7c48e94bb3e4..000000000000
--- a/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for downloading files"
-HOMEPAGE="http://urlgrabber.baseurl.org"
-SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="dev-python/pycurl[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}.patch
-	)
-	distutils-r1_python_prepare_all
-}