Version bump

(Portage version: 2.1.2.9)

3 files changed, 60 insertions, 1 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index fa6f42583d26..110da999e555 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.62 2007/06/01 18:13:05 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.63 2007/06/11 09:32:58 leio Exp $
+
+*meld-1.1.5 (11 Jun 2007)
+
+  11 Jun 2007; Mart Raudsepp <leio@gentoo.org> +meld-1.1.5.ebuild:
+  Version bump
 
   01 Jun 2007; <leio@gentoo.org> -meld-1.1.4.ebuild:
   Remove old
diff --git a/dev-util/meld/files/digest-meld-1.1.5 b/dev-util/meld/files/digest-meld-1.1.5
new file mode 100644
index 000000000000..03f97991bbed
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-1.1.5
@@ -0,0 +1,3 @@
+MD5 a92e72a3b4392ee3e677720f9a75246f meld-1.1.5.tar.bz2 1036075
+RMD160 49f1eab51cc8544edf1c1833401863286749d474 meld-1.1.5.tar.bz2 1036075
+SHA256 5a46702cd86b89c004107ea522971ade398d95ccae378b4ebf16a3994baf345f meld-1.1.5.tar.bz2 1036075
diff --git a/dev-util/meld/meld-1.1.5.ebuild b/dev-util/meld/meld-1.1.5.ebuild
new file mode 100644
index 000000000000..c93c40d0ebbf
--- /dev/null
+++ b/dev-util/meld/meld-1.1.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.5.ebuild,v 1.1 2007/06/11 09:32:58 leio Exp $
+
+inherit python gnome2 eutils
+
+DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
+HOMEPAGE="http://meld.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc gnome"
+
+RDEPEND=">=dev-lang/python-2.3
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=dev-python/gnome-python-2.6.0
+	>=dev-python/pygtk-2.6.0
+	>=dev-python/pyorbit-1.99.0
+	gnome? ( dev-python/gnome-python-desktop )"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper"
+
+DOCS="AUTHORS README.CVS changelog help/"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix the .desktop icon name
+	#sed -i -e "s:Icon=meld:Icon=/usr/share/pixmaps/meld.png:" ./meld.desktop.in
+
+	# 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() {
+	emake || die "make failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/lib/meld
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib/meld
+}