Version Bump, fixed missing dep on PyQt4, #317799, introduced USE=X, fix Python ABIs compatibility, #315075

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 69 insertions, 26 deletions

diff --git a/net-analyzer/linkchecker/ChangeLog b/net-analyzer/linkchecker/ChangeLog
index 00772347fe65..b9bfd5eeb0e0 100644
--- a/net-analyzer/linkchecker/ChangeLog
+++ b/net-analyzer/linkchecker/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/linkchecker
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.41 2009/10/05 17:54:56 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.42 2010/04/30 15:22:10 jlec Exp $
+
+*linkchecker-5.2 (30 Apr 2010)
+
+  30 Apr 2010; Justin Lecher <jlec@gentoo.org>
+  +files/5.2-missing-files.patch, -linkchecker-5.0.2.ebuild,
+  +linkchecker-5.2.ebuild, metadata.xml:
+  Version Bump, fixed missing dep on PyQt4, #317799, introduced USE=X, fix
+  Python ABIs compatibility, #315075
 
   05 Oct 2009; Fabian Groffen <grobian@gentoo.org> linkchecker-5.0.2.ebuild:
   Marked ~ppc-macos and ~x64-solaris
diff --git a/net-analyzer/linkchecker/files/5.2-missing-files.patch b/net-analyzer/linkchecker/files/5.2-missing-files.patch
new file mode 100644
index 000000000000..39e9ed370d67
--- /dev/null
+++ b/net-analyzer/linkchecker/files/5.2-missing-files.patch
@@ -0,0 +1,13 @@
+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/logging.conf',
+-        '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/linkchecker-5.0.2.ebuild b/net-analyzer/linkchecker/linkchecker-5.0.2.ebuild
deleted file mode 100644
index a05c93f0cfb0..000000000000
--- a/net-analyzer/linkchecker/linkchecker-5.0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-5.0.2.ebuild,v 1.3 2009/10/05 17:54:56 grobian Exp $
-
-inherit distutils
-
-MY_P="${P/linkchecker/LinkChecker}"
-
-DESCRIPTION="Check websites for broken links"
-HOMEPAGE="http://linkchecker.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.5"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/net-analyzer/linkchecker/linkchecker-5.2.ebuild b/net-analyzer/linkchecker/linkchecker-5.2.ebuild
new file mode 100644
index 000000000000..e88d94bfc463
--- /dev/null
+++ b/net-analyzer/linkchecker/linkchecker-5.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-5.2.ebuild,v 1.1 2010/04/30 15:22:10 jlec Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+PYTHON_MODNAME="linkcheck"
+
+inherit distutils eutils
+
+MY_P="${P/linkchecker/LinkChecker}"
+
+DESCRIPTION="Check websites for broken links"
+HOMEPAGE="http://linkchecker.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-solaris"
+IUSE="X"
+
+DEPEND="X? ( dev-python/PyQt4[X,assistant] )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-missing-files.patch
+}
+
+src_install() {
+	distutils_src_install
+	if ! use X; then
+		rm -rf \
+			"${ED}"/usr/bin/linkchecker-gui \
+			"${ED}"/$(python_get_sitedir)/linkcheck/gui || die
+	fi
+}
diff --git a/net-analyzer/linkchecker/metadata.xml b/net-analyzer/linkchecker/metadata.xml
index 9f3fdee2246b..c8cb9f104784 100644
--- a/net-analyzer/linkchecker/metadata.xml
+++ b/net-analyzer/linkchecker/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>jlec@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>