net-analyzer/linkchecker: Add live ebuild; backport upstream fix and drop bad patch to fix help issue, #488360; drop old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

6 files changed, 91 insertions, 147 deletions

diff --git a/net-analyzer/linkchecker/ChangeLog b/net-analyzer/linkchecker/ChangeLog
index 870c597cd3f8..0a06739d3acd 100644
--- a/net-analyzer/linkchecker/ChangeLog
+++ b/net-analyzer/linkchecker/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/linkchecker
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.89 2013/11/06 13:36:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.90 2013/12/11 08:50:11 jlec Exp $
+
+*linkchecker-9999 (11 Dec 2013)
+*linkchecker-8.4-r1 (11 Dec 2013)
+
+  11 Dec 2013; Justin Lecher <jlec@gentoo.org> -linkchecker-8.2.ebuild,
+  -linkchecker-8.3.ebuild, -linkchecker-8.4.ebuild, +linkchecker-8.4-r1.ebuild,
+  +linkchecker-9999.ebuild, -files/8.0-missing-files.patch,
+  +files/linkchecker-8.4-help.patch:
+  Add live ebuild; backport upstream fix and drop bad patch to fix help issue,
+  #488360; drop old
 
 *linkchecker-8.4 (06 Nov 2013)
 
diff --git a/net-analyzer/linkchecker/files/8.0-missing-files.patch b/net-analyzer/linkchecker/files/8.0-missing-files.patch
deleted file mode 100644
index 165783ccb671..000000000000
--- a/net-analyzer/linkchecker/files/8.0-missing-files.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 38b4c15..716203d 100755
---- a/setup.py
-+++ b/setup.py
-@@ -375,7 +375,7 @@ myemail = "calvin@users.sourceforge.net"
- data_files = [
-     ('share/linkchecker',
-         ['config/linkcheckerrc', 'config/ca-certificates.crt',
--        'doc/html/lccollection.qhc', 'doc/html/lcdoc.qch']),
-+        'doc/html/lccollection.qhcp', 'doc/html/lcdoc.qhp']),
-     ('share/linkchecker/examples',
-         ['cgi-bin/lconline/leer.html.en',
-          'cgi-bin/lconline/leer.html.de',
diff --git a/net-analyzer/linkchecker/files/linkchecker-8.4-help.patch b/net-analyzer/linkchecker/files/linkchecker-8.4-help.patch
new file mode 100644
index 000000000000..32360b6ea89e
--- /dev/null
+++ b/net-analyzer/linkchecker/files/linkchecker-8.4-help.patch
@@ -0,0 +1,36 @@
+From a7c1cdd6f69a1b91a95361359e49494b4ed88701 Mon Sep 17 00:00:00 2001
+From: Bastian Kleineidam <bastian.kleineidam@web.de>
+Date: Tue, 10 Dec 2013 20:56:26 +0100
+Subject: [PATCH] Check for help files.
+
+---
+ linkcheck/configuration/__init__.py | 6 ++++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/linkcheck/configuration/__init__.py b/linkcheck/configuration/__init__.py
+index 3b72499..f40f285 100644
+--- a/linkcheck/configuration/__init__.py
++++ b/linkcheck/configuration/__init__.py
+@@ -96,7 +96,8 @@ def get_share_file (devel_dir, filename):
+     @param filename: filename to search for
+     @ptype filename: string
+     @return: the found filename or None
+-    @rtype: string or None
++    @rtype: string
++    @raises: ValueError if not found
+     """
+     paths = [
+         # when developing
+@@ -112,7 +113,8 @@ def get_share_file (devel_dir, filename):
+         if os.path.isfile(fullpath):
+             return fullpath
+     # not found
+-    return None
++    msg = "%s not found in %s; check your installation" % (filename, paths)
++    raise ValueError(msg)
+ 
+ 
+ # dynamic options
+-- 
+1.8.5.1
+
diff --git a/net-analyzer/linkchecker/linkchecker-8.2.ebuild b/net-analyzer/linkchecker/linkchecker-8.2.ebuild
deleted file mode 100644
index b53c2c265d6b..000000000000
--- a/net-analyzer/linkchecker/linkchecker-8.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.2.ebuild,v 1.6 2013/03/02 22:45:42 hwoarang Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.7"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
-PYTHON_MODNAME="linkcheck"
-PYTHON_USE_WITH=sqlite
-PYTHON_USE_WITH_OPT=bookmarks
-
-inherit bash-completion-r1 distutils eutils multilib
-
-MY_P="${P/linkchecker/LinkChecker}"
-
-DESCRIPTION="Check websites for broken links"
-HOMEPAGE="http://linkchecker.sourceforge.net/ http://pypi.python.org/pypi/linkchecker/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-solaris"
-IUSE="bash-completion bookmarks clamav doc geoip gnome login nagios syntax-check X"
-
-RDEPEND="
-	dev-python/dnspython
-	bash-completion? ( dev-python/optcomplete )
-	clamav? ( app-antivirus/clamav )
-	geoip? ( dev-python/geoip-python )
-	gnome? ( dev-python/pygtk:2 )
-	login? ( dev-python/twill )
-	syntax-check? (
-		dev-python/cssutils
-		dev-python/utidylib
-		)
-	X? (
-		|| ( >=dev-python/PyQt4-4.9.6-r1[X,help]
-			<dev-python/PyQt4-4.9.6-r1[X,assistant] )
-		dev-python/qscintilla-python
-		)"
-DEPEND="
-	doc? ( dev-qt/qthelp:4 )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/8.0-missing-files.patch \
-		"${FILESDIR}"/7.0-unbundle.patch \
-		"${FILESDIR}"/${PN}-8.0-desktop.patch
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		emake -C doc/html
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	if ! use X; then
-		delete_gui() {
-				rm -rf \
-					"${ED}"/usr/bin/linkchecker-gui* \
-					"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-		}
-		python_execute_function -q delete_gui
-	fi
-	if use doc; then
-		dohtml doc/html/*
-	fi
-	use bash-completion && dobashcomp config/linkchecker-completion
-	insinto /usr/$(get_libdir)/nagios/plugins
-	use nagios && doins linkchecker-nagios
-}
diff --git a/net-analyzer/linkchecker/linkchecker-8.4.ebuild b/net-analyzer/linkchecker/linkchecker-8.4-r1.ebuild
index 052780200328..3f13140608a3 100644
--- a/net-analyzer/linkchecker/linkchecker-8.4.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.4.ebuild,v 1.1 2013/11/06 13:36:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.4-r1.ebuild,v 1.1 2013/12/11 08:50:11 jlec Exp $
 
 EAPI=5
 
@@ -17,28 +17,28 @@ SRC_URI="mirror://github/wummel/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-solaris"
-IUSE="bash-completion clamav doc geoip gnome login nagios sqlite syntax-check X"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris"
+IUSE="bash-completion clamav geoip gnome login nagios sqlite syntax-check X"
 
 RDEPEND="
-	dev-python/dnspython
-	bash-completion? ( dev-python/optcomplete )
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	bash-completion? ( dev-python/optcomplete[${PYTHON_USEDEP}] )
 	clamav? ( app-antivirus/clamav )
-	geoip? ( dev-python/geoip-python )
-	gnome? ( dev-python/pygtk:2 )
-	login? ( dev-python/twill )
+	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
+	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	login? ( dev-python/twill[${PYTHON_USEDEP}] )
 	syntax-check? (
-		dev-python/cssutils
-		dev-python/utidylib
+		dev-python/cssutils[${PYTHON_USEDEP}]
+		dev-python/utidylib[${PYTHON_USEDEP}]
 		)
 	X? (
-		|| (
-			>=dev-python/PyQt4-4.9.6-r1[X,help]
-			<dev-python/PyQt4-4.9.6-r1[X,assistant] )
-		dev-python/qscintilla-python
+		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[${PYTHON_USEDEP}]
 		)"
 DEPEND="
-	doc? ( dev-qt/qthelp:4 )"
+	dev-qt/qthelp:4
+	dev-python/markdown2[${PYTHON_USEDEP}]
+"
 
 RESTRICT="test"
 
@@ -46,15 +46,14 @@ S="${WORKDIR}/${MY_P}"
 
 python_prepare_all() {
 	local PATCHES=(
-		"${FILESDIR}"/8.0-missing-files.patch
 		"${FILESDIR}"/${PN}-8.3-unbundle.patch
 		"${FILESDIR}"/${PN}-8.0-desktop.patch
+		"${FILESDIR}"/${P}-help.patch
 		)
-	distutils-r1_python_prepare_all
-}
 
-python_compile_all() {
-	use doc && emake -C doc/html
+	emake -C doc/html
+
+	distutils-r1_python_prepare_all
 }
 
 python_install_all() {
@@ -67,7 +66,7 @@ python_install_all() {
 		}
 		python_foreach_impl delete_gui
 	fi
-	use doc && dohtml doc/html/*
+	dohtml doc/html/*
 	use bash-completion && dobashcomp config/linkchecker-completion
 	if use nagios; then
 		insinto /usr/$(get_libdir)/nagios/plugins
diff --git a/net-analyzer/linkchecker/linkchecker-8.3.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild
index 1559aeeeb313..35487dd92dca 100644
--- a/net-analyzer/linkchecker/linkchecker-8.3.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild
@@ -1,60 +1,57 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.3.ebuild,v 1.5 2013/03/02 22:45:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-9999.ebuild,v 1.1 2013/12/11 08:50:11 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="sqlite?"
 
-inherit bash-completion-r1 distutils-r1 eutils multilib
+inherit bash-completion-r1 distutils-r1 eutils git-r3 multilib
 
 MY_P="${P/linkchecker/LinkChecker}"
 
 DESCRIPTION="Check websites for broken links"
 HOMEPAGE="http://wummel.github.com/linkchecker/ http://pypi.python.org/pypi/linkchecker/"
-SRC_URI="mirror://github/downloads/wummel/${PN}/${MY_P}.tar.xz"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/wummel/linkchecker.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-solaris"
-IUSE="bash-completion clamav doc geoip gnome login nagios sqlite syntax-check X"
+KEYWORDS=""
+IUSE="bash-completion clamav geoip gnome login nagios sqlite syntax-check X"
 
 RDEPEND="
-	dev-python/dnspython
-	bash-completion? ( dev-python/optcomplete )
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	bash-completion? ( dev-python/optcomplete[${PYTHON_USEDEP}] )
 	clamav? ( app-antivirus/clamav )
-	geoip? ( dev-python/geoip-python )
-	gnome? ( dev-python/pygtk:2 )
-	login? ( dev-python/twill )
+	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
+	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	login? ( dev-python/twill[${PYTHON_USEDEP}] )
 	syntax-check? (
-		dev-python/cssutils
-		dev-python/utidylib
+		dev-python/cssutils[${PYTHON_USEDEP}]
+		dev-python/utidylib[${PYTHON_USEDEP}]
 		)
 	X? (
-		|| (
-			>=dev-python/PyQt4-4.9.6-r1[X,help]
-			<dev-python/PyQt4-4.9.6-r1[X,assistant] )
-		dev-python/qscintilla-python
+		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[${PYTHON_USEDEP}]
 		)"
 DEPEND="
-	doc? ( dev-qt/qthelp:4 )"
+	dev-qt/qthelp:4
+	dev-python/markdown2[${PYTHON_USEDEP}]
+"
 
 RESTRICT="test"
 
-S="${WORKDIR}/${MY_P}"
-
 python_prepare_all() {
 	local PATCHES=(
-		"${FILESDIR}"/8.0-missing-files.patch
-		"${FILESDIR}"/${P}-unbundle.patch
+		"${FILESDIR}"/${PN}-8.3-unbundle.patch
 		"${FILESDIR}"/${PN}-8.0-desktop.patch
 		)
-	distutils-r1_python_prepare_all
-}
 
-python_compile_all() {
-	use doc && emake -C doc/html
+	emake -C doc/html
+
+	distutils-r1_python_prepare_all
 }
 
 python_install_all() {
@@ -67,10 +64,10 @@ python_install_all() {
 		}
 		python_foreach_impl delete_gui
 	fi
-	use doc && dohtml doc/html/*
+	dohtml doc/html/*
 	use bash-completion && dobashcomp config/linkchecker-completion
-	insinto /usr/$(get_libdir)/nagios/plugins
 	if use nagios; then
+		insinto /usr/$(get_libdir)/nagios/plugins
 		doins linkchecker-nagios
 	else
 		rm -f "${ED}"/usr/bin/linkchecker-nagios* || die