diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2006-09-11 16:59:53 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2006-09-11 16:59:53 +0000 |
| commit | 545205dba3739736f98b3d3465b525b9115bd120 (patch) | |
| tree | 78c44175b01def99cc3bdfbc34245c624740466b /dev-util/meld | |
| parent | mask gtkmm-2.10.1 (diff) | |
| download | gentoo-2-545205dba3739736f98b3d3465b525b9115bd120.tar.gz gentoo-2-545205dba3739736f98b3d3465b525b9115bd120.tar.bz2 gentoo-2-545205dba3739736f98b3d3465b525b9115bd120.zip | |
Don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass
#145833
(Portage version: 2.1.1_pre5-r1)
Diffstat (limited to 'dev-util/meld')
| -rw-r--r-- | dev-util/meld/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/meld/meld-1.1.3.ebuild | 5 | ||||
| -rw-r--r-- | dev-util/meld/meld-1.1.4.ebuild | 5 |
3 files changed, 14 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index f921199c85d8..e69fde143a32 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,11 @@ # 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.40 2006/09/11 16:41:20 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.41 2006/09/11 16:59:53 agriffis Exp $ + + 11 Sep 2006; Aron Griffis <agriffis@gentoo.org> meld-1.1.3.ebuild, + meld-1.1.4.ebuild: + Don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass + #145833 *meld-1.1.4 (11 Sep 2006) diff --git a/dev-util/meld/meld-1.1.3.ebuild b/dev-util/meld/meld-1.1.3.ebuild index 6469f4d8d914..4e6c0e782527 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.8 2006/07/16 09:39:39 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.3.ebuild,v 1.9 2006/09/11 16:59:53 agriffis Exp $ inherit python gnome2 eutils @@ -42,6 +42,9 @@ src_unpack() { # fix the prefix so its not in */local/* sed -i -e 's:/usr/local:/usr:' INSTALL + + # don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833 + sed -i -e '/scrollkeeper-update/s/\t/&#/' help/*/GNUmakefile } src_compile() { diff --git a/dev-util/meld/meld-1.1.4.ebuild b/dev-util/meld/meld-1.1.4.ebuild index eda2185df2ed..b7b322220d62 100644 --- a/dev-util/meld/meld-1.1.4.ebuild +++ b/dev-util/meld/meld-1.1.4.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.4.ebuild,v 1.1 2006/09/11 16:41:20 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.4.ebuild,v 1.2 2006/09/11 16:59:53 agriffis Exp $ inherit python gnome2 eutils @@ -42,6 +42,9 @@ src_unpack() { # fix the prefix so its not in */local/* sed -i -e 's:/usr/local:/usr:' INSTALL + + # don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833 + sed -i -e '/scrollkeeper-update/s/\t/&#/' help/*/GNUmakefile } src_compile() { |