gentoo resync : 15.02.2018

5 files changed, 2 insertions, 156 deletions

diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 04f9b5b17626..9dce37184a1d 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,12 +1,8 @@
 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-desktop.patch 1783 BLAKE2B 8735cdb6e486ad292cbbf397c59e57a33bd7fee4058250766deaf0c7039b76020e10aa7972a7e780726671c0346015a20ed502ac8a6a4172043d17d2e35fa313 SHA512 4100c7844548a7894157cf884ed3093e3cb4d11cad33bda605ce1328e7214fb40a229935716a1775978bfe96c87413b52fca4783d7a167027736a1284b8d39b0
-AUX linkchecker-9.3-requests-check.patch 1538 BLAKE2B a24a8471d5b42c07afaf17611860b10c001cfb2a2282219f70389bbdb18111901feefc2c73683f4661aa80311565d0bb4c0b2239140c944b617beb86df164988 SHA512 3ba20f160aa27a611d92ad5b6a31f134b64f52644ad1ac73d41dd7ea77fa3b5d743f3fd51cf5f6d4f3229ec27cfb0758d1d4c87dd14c95ab83c0af54236d5d96
 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.tar.gz 719896 BLAKE2B f0fb43d320c0d82d5cb8fdc277e74c820501d602fd5ea0004155db8fa9b27976c0fcd5af23eb2ceda21315b94c13ac1d5aed5507555889f16b6b47a92a8c18d8 SHA512 26686e5373aaa942b631b5184f8bda8fbe1410c8875bf8499a2b61dc18b7bdfa29a3c18edf98c28dc189a493a3f5794a0020a0211b7d5d3814b33994603dcc59
 DIST linkchecker-9.3.1.tar.gz 779286 BLAKE2B eec374a3455b5348533b29b03ab14558dd19a20e1058947eed9d8027a8b1705b63525e6b8fcf2c4feb59a782ca0e0ad8567e321ca4679320e9d6f256e14df990 SHA512 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305
-EBUILD linkchecker-9.3-r2.ebuild 2016 BLAKE2B 735b62d47111032c2a2e1530f542516588d17752381741124f52a22b83c55179119f3b7775effee058ff4ae01279f32ad74a49c298fc729d843b0b8799703631 SHA512 daba5c569f2be5f22df9a7c8330a47cdb8aade0329e90ac682aef133fa0b69e2315bb0aaa6470327595c4d9c61f586c65263279890c3f79d710fa9b3e962d3b5
-EBUILD linkchecker-9.3.1-r1.ebuild 1636 BLAKE2B ce818ae4c9e6b1fa3fdb03217e6bcc713065716b4972dcadbf1d0944907a1151c5340503be5f1ba345b4f8a5c315dcca488ebc83b78b7ffbf56d3a64aa733b9c SHA512 6f479a201387599ac7a638bbba14e4ea0b9de37fff1a00048182ed8ef137f45667cff6145018eeda22ecce545279049e9cc440c93bda536e6ad4f11966d5b82f
+EBUILD linkchecker-9.3.1-r1.ebuild 1635 BLAKE2B ffe1b02ded5cacb0a1906696634220f69a61d3a426a1cd1d592f88c11a0ac1bcfd2cbd44a6ad61bbd0f4b896bcde56be6ec277181cdde85da84bc18bbd306e36 SHA512 b91819cb02a957f9a3ae3e891e66a27305834983b92384430c24cdf82e2e1b744b17df16b60ffd80d70923de5f6fa1f83a02e27f747044a2b7753c0bcc9478b0
 EBUILD linkchecker-9999.ebuild 1195 BLAKE2B 91e070bf852276911bfa7550a40d287183854a5e503a7adacb1977b3cbdb7c668e17b9cc89fabe7b38c7f1fbfb2500b2e90dc3fc33bfaa5406b030ef5ffdf616 SHA512 8c07f7ad36675aa44905579f2ba56cc80b2b81693272bab03e87dde56f1893f66199307cc9d7498838f17ed55078a06315b2fb16788b613b411be9bda02b9cb1
 MISC metadata.xml 319 BLAKE2B dbf67b67a9a9a65ff108e9ee4c5881023a53533d9bbeee71e9ba1a55658f2a746b408859515f593ce2ef0fd93f938fbb17c5c7a70fa48eda4be977634d11e7c5 SHA512 2fbc3b85bcfd178e2614ef73d55c633e6e3b5ee59d39ca0a6099ffd7e8067e890f69252666d8d6d9a173371d95c4b1fbb8157cb94fd307ee20672fb9ff4182fb
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch b/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch
deleted file mode 100644
index 40fa18a45983..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c25bdb3f55a791bfa087fb5a3d8e3d5d62991745 Mon Sep 17 00:00:00 2001
-From: Christopher Meng <cickumqt@gmail.com>
-Date: Fri, 10 Jan 2014 19:57:47 +0800
-Subject: [PATCH] Fix non-standard deskop file
-
-desktop-file-validate /home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker-gui.desktop /home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop
-/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker-gui.desktop: error: value "Network;WebDevelopment" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
-/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop: error: value "True" for boolean key "Terminal" in group "Desktop Entry" contains invalid characters, boolean values must be "false" or "true"
-/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop: error: value "Network;WebDevelopment" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
----
- doc/linkchecker-gui.desktop | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/doc/linkchecker-gui.desktop b/doc/linkchecker-gui.desktop
-index 7e06b6e..09bd997 100644
---- a/doc/linkchecker-gui.desktop
-+++ b/doc/linkchecker-gui.desktop
-@@ -1,10 +1,10 @@
- [Desktop Entry]
--Name=LinkChecker GUI
-+Name=LinkChecker GUI
- GenericName=URL validator
- GenericName[de]=URL Validator
- Version=1.0
- Type=Application
- Exec=linkchecker-gui
- Terminal=false
--Categories=Network;WebDevelopment;
--Icon=logo48x48
-+Categories=Network;WebDevelopment;
-+Icon=linkchecker
--- 
-1.8.5.1
-
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch b/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch
deleted file mode 100644
index 905b7f718414..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c2ce810c3fb00b895a841a7be6b2e78c64e7b042 Mon Sep 17 00:00:00 2001
-From: Bastian Kleineidam <bastian.kleineidam@web.de>
-Date: Tue, 28 Jun 2016 21:55:10 +0200
-Subject: [PATCH] Fix python requests version check
-
----
- linkcheck/__init__.py | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/linkcheck/__init__.py b/linkcheck/__init__.py
-index 22a0cf5..1cec214 100644
---- a/linkcheck/__init__.py
-+++ b/linkcheck/__init__.py
-@@ -24,10 +24,17 @@
- # Needs Python >= 2.7.2 which fixed http://bugs.python.org/issue11467
- if not (hasattr(sys, 'version_info') or
-         sys.version_info < (2, 7, 2, 'final', 0)):
--    raise SystemExit("This program requires Python 2.7.2 or later.")
-+    import platform
-+    version = platform.python_version()
-+    raise SystemExit("This program requires Python 2.7.2 or later instead of %s." % version)
-+# require a reasonably recent requests module: 2.4.0 from 2014-08-29
- import requests
--if requests.__version__ <= '2.2.0':
--    raise SystemExit("This program requires Python requests 2.2.0 or later.")
-+# PEP 396 has only version strings, bummer! PEP 386 is also not helpful.
-+requests_version = requests.__version__.split('.')
-+# Depends on the version scheme of Python requests
-+if int(requests_version[0]) < 2 or \
-+   (int(requests_version[0]) == 2 and int(requests_version[1]) < 4):
-+    raise SystemExit("This program requires Python requests 2.4.0 or later instead of %s." % requests.__version__)
- 
- import os
- # add the custom linkcheck_dns directory to sys.path
diff --git a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild b/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
deleted file mode 100644
index dd9526e518aa..000000000000
--- a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit bash-completion-r1 distutils-r1 eutils multilib
-
-MY_PN="${PN/linkchecker/LinkChecker}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Check websites for broken links"
-HOMEPAGE="https://wummel.github.com/linkchecker/ https://pypi.python.org/pypi/linkchecker/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
-IUSE="gnome sqlite X"
-
-RDEPEND="
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	<dev-python/requests-2.15[${PYTHON_USEDEP}]
-	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	X? (
-		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-		)"
-DEPEND="
-	X? (
-		dev-qt/qthelp:4
-		dev-python/markdown2[${PYTHON_USEDEP}]
-		)"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-9.2-unbundle.patch
-		"${FILESDIR}"/${P}-bash-completion.patch
-		"${FILESDIR}"/${P}-desktop.patch
-		"${FILESDIR}"/${P}-requests-check.patch
-		)
-
-	emake -C doc/html
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	DOCS=(
-		doc/upgrading.txt
-		doc/python3.txt
-		doc/changelog.txt
-		doc/development.txt
-	)
-	distutils-r1_python_install_all
-	if ! use X; then
-		delete_gui() {
-				rm -rf \
-					"${ED}"/usr/bin/linkchecker-gui* \
-					"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-		}
-		python_foreach_impl delete_gui
-		rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
-	fi
-
-	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}
-	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.3.1-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
index d3c49f316f78..dd72dc62cfd6 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.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="gnome sqlite"
 
 RDEPEND="