net-analyzer/linkchecker: Call python_pkg_setup where necessary, #454820; fix usage of new python eclasses; make installation with USE=-nagios cleaner

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

4 files changed, 33 insertions, 22 deletions

diff --git a/net-analyzer/linkchecker/ChangeLog b/net-analyzer/linkchecker/ChangeLog
index 81eaf893b3ce..ab1323acc9c8 100644
--- a/net-analyzer/linkchecker/ChangeLog
+++ b/net-analyzer/linkchecker/ChangeLog
@@ -1,6 +1,11 @@
 # 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.86 2013/01/16 11:49:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.87 2013/01/31 12:59:35 jlec Exp $
+
+  31 Jan 2013; Justin Lecher <jlec@gentoo.org> linkchecker-7.9.ebuild,
+  linkchecker-8.2.ebuild, linkchecker-8.3.ebuild:
+  Call python_pkg_setup where necessary, #454820; fix usage of new python
+  eclasses; make installation with USE=-nagios cleaner
 
   16 Jan 2013; Justin Lecher <jlec@gentoo.org> linkchecker-8.3.ebuild,
   metadata.xml:
diff --git a/net-analyzer/linkchecker/linkchecker-7.9.ebuild b/net-analyzer/linkchecker/linkchecker-7.9.ebuild
index a5994f50cb9b..6bfef070f0b6 100644
--- a/net-analyzer/linkchecker/linkchecker-7.9.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-7.9.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-7.9.ebuild,v 1.7 2013/01/15 16:17:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-7.9.ebuild,v 1.8 2013/01/31 12:59:35 jlec Exp $
 
 EAPI=4
 
@@ -47,6 +47,10 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	python_pkg_setup
+}
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/7.4-missing-files.patch \
diff --git a/net-analyzer/linkchecker/linkchecker-8.2.ebuild b/net-analyzer/linkchecker/linkchecker-8.2.ebuild
index 486911673b7a..c1b01da0e106 100644
--- a/net-analyzer/linkchecker/linkchecker-8.2.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-8.2.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.2.ebuild,v 1.4 2013/01/15 16:17:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.2.ebuild,v 1.5 2013/01/31 12:59:35 jlec Exp $
 
 EAPI=4
 
@@ -47,6 +47,10 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	python_pkg_setup
+}
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/8.0-missing-files.patch \
diff --git a/net-analyzer/linkchecker/linkchecker-8.3.ebuild b/net-analyzer/linkchecker/linkchecker-8.3.ebuild
index 4acd06142bfb..4b7a771da02d 100644
--- a/net-analyzer/linkchecker/linkchecker-8.3.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-8.3.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.3.ebuild,v 1.3 2013/01/16 11:49:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.3.ebuild,v 1.4 2013/01/31 12:59:35 jlec Exp $
 
 EAPI=5
 
@@ -44,25 +44,21 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
-DISTUTILS_NO_PARALLEL_BUILD=true
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/8.0-missing-files.patch \
-		"${FILESDIR}"/${P}-unbundle.patch \
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/8.0-missing-files.patch
+		"${FILESDIR}"/${P}-unbundle.patch
 		"${FILESDIR}"/${PN}-8.0-desktop.patch
-	distutils-r1_src_prepare
+		)
+	distutils-r1_python_prepare_all
 }
 
-src_compile() {
-	distutils-r1_src_compile
-	if use doc; then
-		emake -C doc/html
-	fi
+python_compile_all() {
+	use doc && emake -C doc/html
 }
 
-src_install() {
-	distutils-r1_src_install
+python_install_all() {
+	distutils-r1_python_install_all
 	if ! use X; then
 		delete_gui() {
 				rm -rf \
@@ -71,10 +67,12 @@ src_install() {
 		}
 		python_foreach_impl delete_gui
 	fi
-	if use doc; then
-		dohtml doc/html/*
-	fi
+	use doc && dohtml doc/html/*
 	use bash-completion && dobashcomp config/linkchecker-completion
 	insinto /usr/$(get_libdir)/nagios/plugins
-	use nagios && doins linkchecker-nagios
+	if use nagios; then
+		doins linkchecker-nagios
+	else
+		rm -f "${ED}"/usr/bin/linkchecker-nagios* || die
+	fi
 }