diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-05-06 06:49:56 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-05-06 06:49:56 +0000 |
| commit | af04655f287e07350c72182bed8717fccc11d512 (patch) | |
| tree | d776801e936875743d52abfa1abb3f3881320910 /net-analyzer | |
| parent | Missing depend gnome-base/libgnomeprintui added. Almost-silent build failure ... (diff) | |
| download | gentoo-2-af04655f287e07350c72182bed8717fccc11d512.tar.gz gentoo-2-af04655f287e07350c72182bed8717fccc11d512.tar.bz2 gentoo-2-af04655f287e07350c72182bed8717fccc11d512.zip | |
Fix wrong usage of python eclass, #366137
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/linkchecker/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/linkchecker/linkchecker-5.2.ebuild | 15 | ||||
| -rw-r--r-- | net-analyzer/linkchecker/linkchecker-5.5.ebuild | 15 |
3 files changed, 23 insertions, 13 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/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 } |