[gentoo-commits] repo/gentoo:master commit in: net-analyzer/linkchecker/files/, net-analyzer/linkchecker/, profiles/base/

[Andreas Sturmlechner]

commit:     638e403ca3580ef9ee1e7f54723c912065f2d6fe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 14 18:41:50 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 19:56:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=638e403c

net-analyzer/linkchecker: Drop old, PyQt4-based version

Closes: https://bugs.gentoo.org/634972
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-analyzer/linkchecker/Manifest                  |  1 -
 .../files/linkchecker-9.3-desktop.patch            | 34 ---------
 .../files/linkchecker-9.3-requests-check.patch     | 34 ---------
 net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild | 82 ----------------------
 profiles/base/package.use.mask                     |  4 --
 5 files changed, 155 deletions(-)

diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 7bd4fcb7980..20d81484882 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,2 +1 @@
-DIST LinkChecker-9.3.tar.gz 719896 BLAKE2B f0fb43d320c0d82d5cb8fdc277e74c820501d602fd5ea0004155db8fa9b27976c0fcd5af23eb2ceda21315b94c13ac1d5aed5507555889f16b6b47a92a8c18d8 SHA512 26686e5373aaa942b631b5184f8bda8fbe1410c8875bf8499a2b61dc18b7bdfa29a3c18edf98c28dc189a493a3f5794a0020a0211b7d5d3814b33994603dcc59
 DIST linkchecker-9.3.1.tar.gz 779286 BLAKE2B eec374a3455b5348533b29b03ab14558dd19a20e1058947eed9d8027a8b1705b63525e6b8fcf2c4feb59a782ca0e0ad8567e321ca4679320e9d6f256e14df990 SHA512 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305

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 40fa18a4598..00000000000
--- 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@×××××.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 905b7f71841..00000000000
--- 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@×××.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 dd9526e518a..00000000000
--- 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/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 4c6fb3ed2a7..ffeb89d7e94 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -63,10 +63,6 @@ dev-java/oracle-jre-bin:9 gentoo-vm
 # Requires audacious, which is masked. Bug 632513
 =media-libs/freeverb3-3.1.2_pre20151102-r1 jack
 
-# Andreas Sturmlechner <asturm@g.o> (29 Oct 2017)
-# Depends on deprecated x11-libs/qscintilla[qt4]/qt4, bug #634972
-net-analyzer/linkchecker X
-
 # Andreas Sturmlechner <asturm@g.o> (16 Oct 2017)
 # USE=qt4 depends on masked dev-qt/qtwebkit:4, bug #620754
 sci-physics/root qt4