gentoo resync : 20.02.2019

6 files changed, 2 insertions, 166 deletions

diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index e8234dfd25c1..89c3520ec08d 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,10 +1,5 @@
-AUX linkchecker-9.2-unbundle.patch 840 BLAKE2B ad18d9722b8fe84c3728d5c62e741eeec5c82856384950610519aa641c15b80483bd04c8c32ff1bd275d28dcd2e73a657a7d4d324cb7889f550849cfa9e3932e SHA512 899db2f7567d7f101ca995d2b8b26dfaedb854a856902cb3fd2bda50f872e9bd345d10acf7b4687635541a8c5cc69050146c317c7f2875d8841f98d5d8b9d7d4
 AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5cbd08e5651ad48e89e07c72382f0ea7da62a4070f2e4607880f4ccb44b015c953ca8b9734d10db77081d2ff027fcc30c7163e39 SHA512 736b4da75bf905845964e2a097d192fe075095656818d9e9fd118327510d8fe176c713d5e77752be99b2b13fc10dc4c07bd246cb8b77bd2a99056e6ef0fe4904
-AUX linkchecker-9.3.1-build-fix.patch 450 BLAKE2B 176f2617c0e2285473d500b351a918d9a48ef631662f6ecbfe7abe8ac37a6a8fd0406838193f068c42a9baeb09d9630e70aa518f51e480dfc3dc0c8ae17d6e9a SHA512 47c30bb1e2724ec96ca0c5223dce4ab0c79e30752be799498e84ff5953f78d9495265f59635a337690d28e6d44740296d9771c342cee6a88b30fe46bf2c58952
-AUX linkchecker-9.3.1-requests.patch 1870 BLAKE2B 6ac551b151b805f373b2bccf6d47e08158e85c894721c640d8d1701e177e52a4bd780b0b195503bf0e8e3709175f1ec73c8f7e24dd578aa63846cfd17b851e47 SHA512 fbfd999cdb48628bb3ce14bca2f114e104a69c0355a00c9b81a543c5ac10a8bec0ab71dcbbefc81bc8f468a7e17a9a89dcd5d795ce565b9452131ac2ee6e5fe3
-DIST linkchecker-9.3.1.tar.gz 779286 BLAKE2B eec374a3455b5348533b29b03ab14558dd19a20e1058947eed9d8027a8b1705b63525e6b8fcf2c4feb59a782ca0e0ad8567e321ca4679320e9d6f256e14df990 SHA512 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305
 DIST linkchecker-9.4.0.tar.gz 489909 BLAKE2B 1c9d9af96778f9d2b542a078ba9da8751d6f7bc170809d5eefef6e8e2d5587e969f1cba3d6ae116b6de981949dd638b0d78fc416ce5055b3156da308b5a95d67 SHA512 3423f710a46d921c4387ffcfe1a8632cb889bcfdb4d56cbabcae87ca41547221e854546efd6e440e798ea85531c34a35f3ab779cd6bc2b6e63095015ad0537ba
-EBUILD linkchecker-9.3.1-r1.ebuild 1635 BLAKE2B ffe1b02ded5cacb0a1906696634220f69a61d3a426a1cd1d592f88c11a0ac1bcfd2cbd44a6ad61bbd0f4b896bcde56be6ec277181cdde85da84bc18bbd306e36 SHA512 b91819cb02a957f9a3ae3e891e66a27305834983b92384430c24cdf82e2e1b744b17df16b60ffd80d70923de5f6fa1f83a02e27f747044a2b7753c0bcc9478b0
-EBUILD linkchecker-9.4.0.ebuild 1418 BLAKE2B 82f3c2ec15f63aab72a5eb364f00ab3c1146f30201ab05633d27eae985cd4d1f1f80580b21b050d8cde6b4746702f4b3e9e4105f8f1061a370ac65cc2d5193ad SHA512 ca2877a5c0df9fd851497f6fae47c42a6182f93f9e9197e66f41a4282e5f07601a69aff64b9323c8f9078f6f25aba4236527e28cce8e6d68d37730c7286d3388
+EBUILD linkchecker-9.4.0.ebuild 1417 BLAKE2B 1674975fc3c778beaf6e78b6d6f7320cbb6fb913d0fe0d5de029aea274b961cd9e5ec1adbfcd07745320327f1c1edbe6f73682ed40adec397894e37a1970c76f SHA512 0802830c19cdb9750ae4ad5d997452b4f3cd103dc41478618fdc971ab0a9e3ce4185abcabcaf89f804f2194e4367de681e77e8c776635ca6ed6396576db31119
 EBUILD linkchecker-9999.ebuild 1221 BLAKE2B 0193a2f063e41a641b2b008e4b84abce2aa41826d9a84f51582b21dcafaa5633bbeb6c771f232f9cafcc49c1d3c9f2ca50c3b473b9d208839e2d3b6153ef3abe SHA512 970acb72a0edc5fd6792b6d06bfc2807682ee9e7c275187b6b80248322e575363db3b485828845abbb58ed3e1dacdbce3fe98d0b6a8538df96dc2f1237e2c92d
 MISC metadata.xml 319 BLAKE2B dbf67b67a9a9a65ff108e9ee4c5881023a53533d9bbeee71e9ba1a55658f2a746b408859515f593ce2ef0fd93f938fbb17c5c7a70fa48eda4be977634d11e7c5 SHA512 2fbc3b85bcfd178e2614ef73d55c633e6e3b5ee59d39ca0a6099ffd7e8067e890f69252666d8d6d9a173371d95c4b1fbb8157cb94fd307ee20672fb9ff4182fb
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch b/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch
deleted file mode 100644
index 598f856b0007..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- setup.py | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/setup.py b/setup.py
-old mode 100755
-new mode 100644
-index dc30a7d..d62622b
---- a/setup.py
-+++ b/setup.py
-@@ -900,9 +900,6 @@ o a command line, GUI and web interface
-         'py2exe': MyPy2exe,
-         'py2app': MyPy2app,
-     },
--    package_dir = {
--        'linkcheck_dns.dns': 'third_party/dnspython/dns',
--    },
-     packages = [
-         'linkcheck',
-         'linkcheck.bookmarks',
-@@ -917,10 +914,6 @@ o a command line, GUI and web interface
-         'linkcheck.network',
-         'linkcheck.parser',
-         'linkcheck.plugins',
--        'linkcheck_dns.dns',
--        'linkcheck_dns.dns.rdtypes',
--        'linkcheck_dns.dns.rdtypes.ANY',
--        'linkcheck_dns.dns.rdtypes.IN',
-     ],
-     ext_modules = [
-         Extension('linkcheck.HtmlParser.htmlsax',
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch b/net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch
deleted file mode 100644
index bcfd2cc800e4..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/setup.py b/setup.py
-index b42ed8c..ec206e6 100755
---- a/setup.py
-+++ b/setup.py
-@@ -654,8 +654,7 @@ myemail = "bastian.kleineidam@web.de"
- 
- data_files = [
-     ('share/linkchecker',
--        ['config/linkcheckerrc',
--        'doc/html/lccollection.qhc', 'doc/html/lcdoc.qch']),
-+        ['config/linkcheckerrc']),
-     ('share/linkchecker/examples',
-         ['cgi-bin/lconline/leer.html.en',
-          'cgi-bin/lconline/leer.html.de',
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch b/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch
deleted file mode 100644
index 56c57fa37997..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9b12b5d66fa9b832f4d9e19a0b9dcb92607ee3e5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
-Date: Mon, 2 Oct 2017 20:18:54 -0400
-Subject: [PATCH] workaround new limitation in requests
-
-newer requests do not expose the internal SSL socket object so we
-cannot verify certificates. there was work to allow custom
-verification routines which we could use, but this never finished:
-
-https://github.com/shazow/urllib3/pull/257
-
-so right now, just treat missing socket information as if the cert was
-missing.
-
-Closes: #76
----
- linkcheck/checker/httpurl.py | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py
-index 161619c5..bde77c70 100644
---- a/linkcheck/checker/httpurl.py
-+++ b/linkcheck/checker/httpurl.py
-@@ -194,6 +194,10 @@ def _get_ssl_sock(self):
-         """Get raw SSL socket."""
-         assert self.scheme == u"https", self
-         raw_connection = self.url_connection.raw._connection
-+        if not raw_connection:
-+            # this happens with newer requests versions:
-+            # https://github.com/linkcheck/linkchecker/issues/76
-+            return None
-         if raw_connection.sock is None:
-             # sometimes the socket is not yet connected
-             # see https://github.com/kennethreitz/requests/issues/1966
-@@ -204,7 +208,10 @@ def _add_ssl_info(self):
-         """Add SSL cipher info."""
-         if self.scheme == u'https':
-             sock = self._get_ssl_sock()
--            if hasattr(sock, 'cipher'):
-+            if not sock:
-+                log.debug(LOG_CHECK, "cannot extract SSL certificate from connection")
-+                self.ssl_cert = None
-+            elif hasattr(sock, 'cipher'):
-                 self.ssl_cert = sock.getpeercert()
-             else:
-                 # using pyopenssl
diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
deleted file mode 100644
index dd72dc62cfd6..000000000000
--- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Check websites for broken links"
-HOMEPAGE="https://github.com/linkcheck/linkchecker"
-SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
-IUSE="gnome sqlite"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-"
-DEPEND=""
-
-RESTRICT="test"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-9.2-unbundle.patch"
-		"${FILESDIR}/${PN}-9.3-bash-completion.patch"
-		"${FILESDIR}/${PN}-9.3.1-build-fix.patch"
-		"${FILESDIR}/${PN}-9.3.1-requests.patch"
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	delete_gui() {
-		rm -rf \
-			"${ED}"/usr/bin/linkchecker-gui* \
-			"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-	}
-
-	DOCS=(
-		doc/upgrading.txt
-		doc/python3.txt
-		doc/changelog.txt
-		doc/development.txt
-	)
-	distutils-r1_python_install_all
-
-	python_foreach_impl delete_gui
-	rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
-
-	newicon doc/html/logo64x64.png ${PN}.png
-
-	docinto html
-	dodoc doc/html/*
-	newbashcomp config/linkchecker-completion ${PN}
-}
-
-pkg_postinst() {
-	optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
-	optfeature "Virus scanning" app-antivirus/clamav
-	optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
-}
diff --git a/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild b/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
index ea79afb87f71..ce086daf5a23 100644
--- a/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
 IUSE="sqlite"
 
 RDEPEND="