diff options
| author |   John N. Laliberte <allanonjl@gentoo.org> | 2006-07-03 18:33:42 +0000 |
|---|---|---|
| committer | John N. Laliberte <allanonjl@gentoo.org> | 2006-07-03 18:33:42 +0000 |
| commit | 6e788565fea69c765491ae9d16d557d693e2a219 (patch) | |
| tree | b6602080eeda38bd1c3e0a030d677ff7a72c4913 /dev-util | |
| parent | Adjusted metadata, see bug #138062. (diff) | |
| download | gentoo-2-6e788565fea69c765491ae9d16d557d693e2a219.tar.gz gentoo-2-6e788565fea69c765491ae9d16d557d693e2a219.tar.bz2 gentoo-2-6e788565fea69c765491ae9d16d557d693e2a219.zip | |
break out built_with_use test, wrap in has_version. fixes #136402
(Portage version: 2.1.1_pre2-r2)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/meld/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/meld/meld-1.1.3.ebuild | 23 |
2 files changed, 14 insertions, 14 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 25acc7fb0c1d..e9f2f6ff4c52 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/meld # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.32 2006/02/21 18:29:33 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.33 2006/07/03 18:33:42 allanonjl Exp $ + + 03 Jul 2006; John N. Laliberte <allanonjl@gentoo.org> meld-1.1.3.ebuild: + break out built_with_use test, wrap in has_version. fixes #136402 *meld-1.1.3 (21 Feb 2006) diff --git a/dev-util/meld/meld-1.1.3.ebuild b/dev-util/meld/meld-1.1.3.ebuild index cca97543b791..e2312e393071 100644 --- a/dev-util/meld/meld-1.1.3.ebuild +++ b/dev-util/meld/meld-1.1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.3.ebuild,v 1.1 2006/02/21 18:29:33 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.3.ebuild,v 1.2 2006/07/03 18:33:42 allanonjl Exp $ inherit python gnome2 eutils @@ -20,29 +20,26 @@ DEPEND=">=dev-lang/python-2.3 >=dev-python/pyorbit-1.99.0 dev-python/gnome-python-extras" -USE_DESTDIR="1" DOCS="AUTHORS COPYING INSTALL README.CVS changelog help/" pkg_setup() { - if ! built_with_use '<dev-python/pygtk-2.8.0-r2' gnome ; then - einfo - einfo "Meld requires pygtk to be built with the gnome use flag set." - einfo "Please re-emerge pygtk with the gnome use flag set." - einfo - die "You need to re-emerge pygtk with gnome use flag." + if has_version "=dev-python/pygtk-2.6*"; then + if ! built_with_use "dev-python/pygtk" gnome ; then + einfo + einfo "Meld requires pygtk to be built with the gnome use flag set." + einfo "Please re-emerge pygtk with the gnome use flag set." + einfo + die "You need to re-emerge pygtk with gnome use flag." + fi fi } src_unpack() { - unpack ${A} - cd ${S} + gnome2_src_unpack # Fix the .desktop icon name sed -i -e "s:Icon=meld:Icon=/usr/share/pixmaps/meld.png:" ./meld.desktop.in - # fix omf scrollkeeper - gnome2_omf_fix help/*/GNUmakefile - # fix the prefix so its not in */local/* sed -i -e 's:/usr/local:/usr:' INSTALL } |