version bump to fix #85325. Now depends on gnome-python-extras so it has support for line numbering and source highlighting.

Package-Manager: portage-2.0.51.19

5 files changed, 102 insertions, 3 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index df162e2c6d0f..832042610ee6 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.21 2005/05/29 21:48:03 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.22 2005/07/03 20:36:36 allanonjl Exp $
+
+*meld-0.9.5 (02 Jul 2005)
+
+  02 Jul 2005; John N. Laliberte <allanonjl@gentoo.org> metadata.xml,
+  +meld-0.9.5.ebuild:
+  version bump to fix #85325. Now depends on gnome-python-extras so it has
+  support for line numbering and source highlighting.
 
 *meld-0.9.4.1-r1 (29 May 2005)
 
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 2189efe1cd3b..304e16e7b702 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,8 +1,10 @@
 MD5 96ed5fd3c9961f4e4787f897e666bddb meld-0.9.2.ebuild 1538
 MD5 46b08e3752195ea4162e574e4fa5dff8 meld-0.9.4.1.ebuild 1785
-MD5 bc187df3c729c50cd1b03deeda6c551a ChangeLog 3139
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 1675df734c0ee0b201b90151b5edd4f4 ChangeLog 3388
+MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
 MD5 eeabce0c4942083a42738302deb53c3c meld-0.9.4.1-r1.ebuild 2071
+MD5 d84b937a4b699901bd79b64c52a7a4c5 meld-0.9.5.ebuild 1996
 MD5 a594b965f0dc8995e79d245c4cb37fd3 files/digest-meld-0.9.4.1-r1 65
 MD5 a594b965f0dc8995e79d245c4cb37fd3 files/digest-meld-0.9.4.1 65
 MD5 204fd0bd70dc55fec4d8b060a3165d94 files/digest-meld-0.9.2 63
+MD5 f5c312891794c9078a4c034256c3901c files/digest-meld-0.9.5 63
diff --git a/dev-util/meld/files/digest-meld-0.9.5 b/dev-util/meld/files/digest-meld-0.9.5
new file mode 100644
index 000000000000..1dda9b12bb0e
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-0.9.5
@@ -0,0 +1 @@
+MD5 dc86bf6f5ed1887da6a28ac1d91eb78d meld-0.9.5.tar.bz2 283080
diff --git a/dev-util/meld/meld-0.9.5.ebuild b/dev-util/meld/meld-0.9.5.ebuild
new file mode 100644
index 000000000000..389817eb3cff
--- /dev/null
+++ b/dev-util/meld/meld-0.9.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.9.5.ebuild,v 1.1 2005/07/03 20:36:36 allanonjl Exp $
+
+inherit python gnome.org eutils
+
+DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
+HOMEPAGE="http://meld.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~sparc ~ppc ~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=dev-python/gnome-python-1.99.15
+	>=dev-python/pygtk-1.99.15
+	>=dev-python/pyorbit-1.99.0
+	dev-python/gnome-python-extras
+	"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+
+	if ! built_with_use pygtk gnome ; then
+		einfo ""
+		einfo "Meld requires pygtk 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
+}
+
+src_unpack() {
+
+	unpack ${A}
+	# Fix the .desktop icon name, see bug #73550
+	sed -i -e "s:Icon=meld:Icon=meld-icon.png:" ${S}/meld.desktop.in
+
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	# do manual injection of *dirs instead of using make install
+	# to get around lack of DESTDIR
+	cd ${S}
+	python tools/install_paths libdir=/usr/lib/meld < meld > meld.install
+	newbin meld.install meld
+
+	insinto /usr/lib/meld
+	doins *.py
+	python tools/install_paths \
+		localedir=/usr/share/locale \
+		docdir=/usr/share/doc/${P} \
+		sharedir=/usr/share/meld < paths.py > paths.py.install
+
+	newins paths.py.install paths.py
+
+	insinto /usr/share/meld/glade2
+	doins glade2/*
+	insinto /usr/share/meld/glade2/pixmaps
+	doins glade2/pixmaps/*
+	insinto /usr/share/pixmaps
+	newins glade2/pixmaps/icon.png meld-icon.png
+
+	insinto /usr/share/applications
+	doins meld.desktop
+
+	dodoc AUTHORS COPYING INSTALL TODO.txt
+	insinto /usr/share/doc/${P}
+	doins manual/*
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/lib/meld
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib/meld
+}
diff --git a/dev-util/meld/metadata.xml b/dev-util/meld/metadata.xml
index da6fd63d0085..6ffa481fda37 100644
--- a/dev-util/meld/metadata.xml
+++ b/dev-util/meld/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<maintainer>
+	<email>allanonjl@gentoo.org</email>
+</maintainer>
 </pkgmetadata>