Fix wrong usage of python eclass, #366137

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 29 insertions, 19 deletions

diff --git a/net-analyzer/linkchecker/ChangeLog b/net-analyzer/linkchecker/ChangeLog
index 3c555df1ff0f..e0492b1288d5 100644
--- a/net-analyzer/linkchecker/ChangeLog
+++ b/net-analyzer/linkchecker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/linkchecker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.49 2011/04/27 11:34:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.50 2011/05/06 06:49:56 jlec Exp $
+
+  06 May 2011; Justin Lecher <jlec@gentoo.org> linkchecker-5.2.ebuild,
+  linkchecker-5.5.ebuild:
+  Fix wrong usage of python eclass, #366137
 
   27 Apr 2011; Justin Lecher <jlec@gentoo.org> linkchecker-5.5.ebuild:
   Added missing dependency on dev-python/qscintilla-python
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 551579ec663d..8f26633382ae 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 AUX 5.2-missing-files.patch 501 RMD160 2ffe7986d10432bbd270fd30f0b918cbf7494bb4 SHA1 2a386d086095fa6ae968f60f10b91b352e8961a2 SHA256 afc49e999155fec42662704795dd8404d6ca87630e3b5df0d071fb1d027b500d
 DIST LinkChecker-5.2.tar.gz 591994 RMD160 ed6ef885df80f4e0d9d8810b99d739a5df1f0bbb SHA1 fe129355f20e5eb7c028ba4612fd1167c2bcd330 SHA256 ae6790305d26d27fad86b0cc87d4af12db69b2db33021727395298b96d3b4039
 DIST LinkChecker-5.5.tar.gz 623925 RMD160 4e227dac21a9fa2c3f428e737feaab5da143ed4b SHA1 8a7da78f11ab7c43c2c3145eca68cc82740813e2 SHA256 b5b69c3183fe8da489aee15bc78793506b0ec3a41c664c80ecbc790bc2a96a7e
-EBUILD linkchecker-5.2.ebuild 991 RMD160 6aa4f8f0a198eccbe07d14e693902bd97ab41f65 SHA1 1c8715713e22c309947f8d5129085629525b16dc SHA256 ed361a607cb2a69a9967b982a142b6a93b45e794f6c9a895a60726e95d4e62a3
-EBUILD linkchecker-5.5.ebuild 1027 RMD160 3b6e7aab1f12f0a2876bbe0e788511afe7c308f1 SHA1 8324bb61b0070228282f91043d1d6c7cff4ec7b3 SHA256 4cb50aacfffada3adaa7b969c88b15b7c2bc16aed9a244ce863143a93208de81
-MISC ChangeLog 6483 RMD160 6aeb105e82a7ae5357d00fcddf23935f99f26e06 SHA1 328e8971a4875ee2541021c6cf684f8b90ad1bbb SHA256 d481e41eb461938ef26577ef26e68d0c2dd58b88bcf9f4f00bb0cecb289a2f65
+EBUILD linkchecker-5.2.ebuild 1057 RMD160 15977cf70f2e1a3a82d7cf7a54d1412d58b5834b SHA1 8408f0176c568ee5698235ec5c0224bdee44b0be SHA256 9f5dcb38369a4863776f1a22c4a816e73edb27cbbd0bc7ad98087cbdc436abdc
+EBUILD linkchecker-5.5.ebuild 1093 RMD160 5e64b2a402bc607809deda8edc44869cf016e041 SHA1 c10576568946a7bf9f0a68c02c67c0b7c084dbb5 SHA256 bdfb5b2fcece00b6867d2bcbfac3473d3685ba74a948efdfe3e50f7b51c8ea8b
+MISC ChangeLog 6625 RMD160 f84ffe2f2c52c3cf3baeab4af0e71b385599879a SHA1 db9f4b39c982dccd05e4eb68b9c7ef8c72040796 SHA256 bdd1a57f204af0eb5c0749ffccd28c02a03397034656d09c415da1ee27dea3ac
 MISC metadata.xml 223 RMD160 d103626bf675fcbd59d665e802d8854269dff731 SHA1 84c55768ecdcda816237b2784f792eb7d8777d29 SHA256 a449c2ba8a1a7c556970d16995c7735a1de3d5f65a21ae711eeec898e3767abc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk23/0IACgkQgAnW8HDreRb5xACfWpQlYyUEtD5JeZD8NYfK8i50
-gIgAn3L0j6xcfOE0HbHfi9eLXwi9uZAu
-=Kdrb
+iEYEARECAAYFAk3DmhoACgkQgAnW8HDreRbebQCglKvYdg4Ve1ugpiYKSvf+pR8L
+RFQAnR+mVuCGImCxXJiH7O+ici3/2I/p
+=wvNX
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/linkchecker/linkchecker-5.2.ebuild b/net-analyzer/linkchecker/linkchecker-5.2.ebuild
index fd4717ee1da3..fe2e1905b20d 100644
--- a/net-analyzer/linkchecker/linkchecker-5.2.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.6 2011/04/27 09:35:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-5.2.ebuild,v 1.7 2011/05/06 06:49:56 jlec Exp $
 
 EAPI="3"
 
@@ -36,9 +36,12 @@ src_prepare() {
 
 src_install() {
 	distutils_src_install
-	if ! use X; then
-		rm -rf \
-			"${ED}"/usr/bin/linkchecker-gui \
-			"${ED}"/$(python_get_sitedir)/linkcheck/gui || die
-	fi
+	installation() {
+		if ! use X; then
+			rm -rf \
+				"${ED}"/usr/bin/linkchecker-gui* \
+				"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
+		fi
+	}
+	python_execute_function installation
 }
diff --git a/net-analyzer/linkchecker/linkchecker-5.5.ebuild b/net-analyzer/linkchecker/linkchecker-5.5.ebuild
index 10bce4275116..1da0cc1ce1f2 100644
--- a/net-analyzer/linkchecker/linkchecker-5.5.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-5.5.ebuild,v 1.3 2011/04/27 11:34:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-5.5.ebuild,v 1.4 2011/05/06 06:49:56 jlec Exp $
 
 EAPI="3"
 
@@ -39,9 +39,12 @@ src_prepare() {
 
 src_install() {
 	distutils_src_install
-	if ! use X; then
-		rm -rf \
-			"${ED}"/usr/bin/linkchecker-gui \
-			"${ED}"/$(python_get_sitedir)/linkcheck/gui || die
-	fi
+	installation() {
+		if ! use X; then
+			rm -rf \
+				"${ED}"/usr/bin/linkchecker-gui* \
+				"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
+		fi
+	}
+	python_execute_function installation
 }