summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2004-02-14 15:13:23 +0000
committerAlastair Tse <liquidx@gentoo.org>2004-02-14 15:13:23 +0000
commit31662df924f5a97377ee9a73a4c28998bc6e01c4 (patch)
tree9824e8ae416fa959c1ab861dec21d98c2240ff75 /dev-util/meld
parentversion bump and cleanup (Manifest recommit) (diff)
downloadgentoo-2-31662df924f5a97377ee9a73a4c28998bc6e01c4.tar.gz
gentoo-2-31662df924f5a97377ee9a73a4c28998bc6e01c4.tar.bz2
gentoo-2-31662df924f5a97377ee9a73a4c28998bc6e01c4.zip
version bump. changes thanks to suka <suka@gentoo.org> (#41367)
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog9
-rw-r--r--dev-util/meld/Manifest8
-rw-r--r--dev-util/meld/files/digest-meld-0.9.21
-rw-r--r--dev-util/meld/meld-0.9.2.ebuild65
4 files changed, 78 insertions, 5 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 28e243a69f18..ebf750f0e567 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/meld
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.11 2003/11/25 10:00:42 weeve Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.12 2004/02/14 15:13:23 liquidx Exp $
+
+*meld-0.9.2 (14 Feb 2004)
+
+ 14 Feb 2004; Alastair Tse <liquidx@gentoo.org> meld-0.9.2.ebuild:
+ version bump. changes thanks to suka <suka@gentoo.org> (#41367)
25 Nov 2003; Jason Wever <weeve@gentoo.org> meld-0.9.1.ebuild:
Added ~sparc keyword.
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index f8b62a0eeec7..d9dafabceb13 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,9 +1,11 @@
MD5 546c8a9e784be322685e1171d30ff15e ChangeLog 2006
+MD5 e77767e745c1090964b2a75d9f05bfa5 meld-0.9.0-r1.ebuild 1176
MD5 1e89be2535b55108ddd4c1329a63dc5f meld-0.9.1.ebuild 1635
+MD5 2f90198adbfcdb423f5da5d55832081c meld-0.9.2.ebuild 1600
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 e77767e745c1090964b2a75d9f05bfa5 meld-0.9.0-r1.ebuild 1176
+MD5 9535ffb3344b955b67d3ba1bda584fe9 files/digest-meld-0.9.0-r1 59
MD5 31cc2ad6c4f8abcf7bc7f136bd2721c2 files/digest-meld-0.9.1 59
-MD5 29df7f6e551b1ee13ec940e12d35067f files/meld-0.9.1-gentoo.diff 232
+MD5 204fd0bd70dc55fec4d8b060a3165d94 files/digest-meld-0.9.2 63
MD5 1058b470e388a7de762db6f847abea48 files/meld-0.9.0-gentoo.diff 1631
-MD5 9535ffb3344b955b67d3ba1bda584fe9 files/digest-meld-0.9.0-r1 59
MD5 44ce8783b6cfb819a0bab9398ecdc02e files/meld-0.9.0-gtktoolbar.patch 546
+MD5 29df7f6e551b1ee13ec940e12d35067f files/meld-0.9.1-gentoo.diff 232
diff --git a/dev-util/meld/files/digest-meld-0.9.2 b/dev-util/meld/files/digest-meld-0.9.2
new file mode 100644
index 000000000000..9a129c64d352
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-0.9.2
@@ -0,0 +1 @@
+MD5 0f084e1e3ea9c12f784a35c09570f857 meld-0.9.2.tar.bz2 126738
diff --git a/dev-util/meld/meld-0.9.2.ebuild b/dev-util/meld/meld-0.9.2.ebuild
new file mode 100644
index 000000000000..96a640b823ae
--- /dev/null
+++ b/dev-util/meld/meld-0.9.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.9.2.ebuild,v 1.1 2004/02/14 15:13:23 liquidx Exp $
+
+inherit python gnome.org
+
+DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
+HOMEPAGE="http://meld.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~sparc"
+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"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+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/${PF} \
+ 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/${PF}
+ doins manual/*
+}
+
+pkg_postinst() {
+ python_mod_optimize /usr/lib/meld
+}
+
+pkg_postrm() {
+ python_mod_cleanup /usr/lib/meld
+}