net-analyzer/linkchecker: Version Bump; fix new upstream location; move to EAPI=5 and distutils-r1

(Portage version: 2.2.0_alpha152/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

5 files changed, 128 insertions, 14 deletions

diff --git a/net-analyzer/linkchecker/ChangeLog b/net-analyzer/linkchecker/ChangeLog
index 893b538fa3df..191460723395 100644
--- a/net-analyzer/linkchecker/ChangeLog
+++ b/net-analyzer/linkchecker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/linkchecker
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.83 2012/12/26 06:56:19 pesa Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.84 2013/01/15 12:32:03 jlec Exp $
+
+*linkchecker-8.3 (15 Jan 2013)
+
+  15 Jan 2013; Justin Lecher <jlec@gentoo.org> linkchecker-8.2.ebuild,
+  +linkchecker-8.3.ebuild, +files/linkchecker-8.3-unbundle.patch, metadata.xml:
+  Version Bump; fix new upstream location; move to EAPI=5 and distutils-r1
 
   26 Dec 2012; Davide Pesavento <pesa@gentoo.org> linkchecker-7.9.ebuild,
   linkchecker-8.0.ebuild, linkchecker-8.1.ebuild, linkchecker-8.2.ebuild:
diff --git a/net-analyzer/linkchecker/files/linkchecker-8.3-unbundle.patch b/net-analyzer/linkchecker/files/linkchecker-8.3-unbundle.patch
new file mode 100644
index 000000000000..558bb2710d96
--- /dev/null
+++ b/net-analyzer/linkchecker/files/linkchecker-8.3-unbundle.patch
@@ -0,0 +1,28 @@
+ setup.py | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 36c2536..99fdf08 100644
+--- a/setup.py
++++ b/setup.py
+@@ -898,9 +898,6 @@ o a command line, GUI and web interface
+         'py2app': MyPy2app,
+         'register': MyRegister,
+     },
+-    package_dir = {
+-        'linkcheck_dns.dns': 'third_party/dnspython/dns',
+-    },
+     packages = [
+         'linkcheck',
+         'linkcheck.bookmarks',
+@@ -913,10 +910,6 @@ o a command line, GUI and web interface
+         'linkcheck.HtmlParser',
+         'linkcheck.logger',
+         'linkcheck.network',
+-        '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/linkchecker-8.2.ebuild b/net-analyzer/linkchecker/linkchecker-8.2.ebuild
index aec8cf1b20ee..8446a7b2ea57 100644
--- a/net-analyzer/linkchecker/linkchecker-8.2.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.2 2012/12/26 06:56:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.2.ebuild,v 1.3 2013/01/15 12:32:03 jlec Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
 PYTHON_MODNAME="linkcheck"
 
-inherit bash-completion-r1 distutils eutils
+inherit bash-completion-r1 distutils eutils multilib
 
 MY_P="${P/linkchecker/LinkChecker}"
 
diff --git a/net-analyzer/linkchecker/linkchecker-8.3.ebuild b/net-analyzer/linkchecker/linkchecker-8.3.ebuild
new file mode 100644
index 000000000000..1acde0c260ae
--- /dev/null
+++ b/net-analyzer/linkchecker/linkchecker-8.3.ebuild
@@ -0,0 +1,80 @@
+# 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.1 2013/01/15 12:32:03 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit bash-completion-r1 distutils-r1 eutils 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"
+
+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 )
+	bookmarks? ( dev-python/pysqlite:2 )
+	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? ( x11-libs/qt-assistant:4 )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+DISTUTILS_NO_PARALLEL_BUILD=true
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/8.0-missing-files.patch \
+		"${FILESDIR}"/${P}-unbundle.patch \
+		"${FILESDIR}"/${PN}-8.0-desktop.patch
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	if use doc; then
+		emake -C doc/html
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+	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
+	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/metadata.xml b/net-analyzer/linkchecker/metadata.xml
index 4c81bd541f92..ee2901a0ac8e 100644
--- a/net-analyzer/linkchecker/metadata.xml
+++ b/net-analyzer/linkchecker/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="bookmarks">Mozilla Bookmark parsing</flag>
-		<flag name="login">login form submission</flag>
-		<flag name="nagios">Install nagios cli plugin</flag>
-		<flag name="syntax-check">HTML/CSS syntax checks</flag>
-	</use>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="bookmarks">Mozilla Bookmark parsing</flag>
+    <flag name="login">login form submission</flag>
+    <flag name="nagios">Install nagios cli plugin</flag>
+    <flag name="syntax-check">HTML/CSS syntax checks</flag>
+  </use>
 </pkgmetadata>