Bump to 1.1.4 (from 1.1.3). Remove 1.1.2, 1.0.0. #142318

Package-Manager: portage-2.1.1_pre5-r1

3 files changed, 67 insertions, 1 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index bebe4fd51fd7..f921199c85d8 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,12 @@
 # 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.39 2006/07/16 09:39:39 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.40 2006/09/11 16:41:20 agriffis Exp $
+
+*meld-1.1.4 (11 Sep 2006)
+
+  11 Sep 2006; Aron Griffis <agriffis@gentoo.org> -meld-1.0.0.ebuild,
+  -meld-1.1.2.ebuild, +meld-1.1.4.ebuild:
+  Bump to 1.1.4 (from 1.1.3).  Remove 1.1.2, 1.0.0. #142318
 
   16 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> meld-1.1.3.ebuild:
   ppc stable, bug #139053
diff --git a/dev-util/meld/files/digest-meld-1.1.4 b/dev-util/meld/files/digest-meld-1.1.4
new file mode 100644
index 000000000000..86dc17b3f05c
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-1.1.4
@@ -0,0 +1,3 @@
+MD5 e780a8f67183acf7f51b13aa4a62ac85 meld-1.1.4.tar.bz2 599912
+RMD160 ae327557458cae31660d3c30bcd6640f0406f1fa meld-1.1.4.tar.bz2 599912
+SHA256 040c7a633b8abfe646425be4835790d4515952ce0e2ffe8523c36751d93a472f meld-1.1.4.tar.bz2 599912
diff --git a/dev-util/meld/meld-1.1.4.ebuild b/dev-util/meld/meld-1.1.4.ebuild
new file mode 100644
index 000000000000..eda2185df2ed
--- /dev/null
+++ b/dev-util/meld/meld-1.1.4.ebuild
@@ -0,0 +1,57 @@
+# 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 $
+
+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"
+
+DEPEND=">=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
+	dev-python/gnome-python-extras"
+
+DOCS="AUTHORS COPYING INSTALL README.CVS changelog help/"
+
+pkg_setup() {
+	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() {
+	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
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/lib/meld
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib/meld
+}