summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2004-10-16 20:08:44 +0000
committerAlastair Tse <liquidx@gentoo.org>2004-10-16 20:08:44 +0000
commit12b3a89ac293ab2bce77398a7cd8721ac2ccd5ac (patch)
treeb6d2162d74745d9d21c654b35868726a33f48f16 /dev-util/meld
parentFix stupid dependency on sys-libs/libtermcap-compat (i.e. remove it) #64212. ... (diff)
downloadgentoo-2-12b3a89ac293ab2bce77398a7cd8721ac2ccd5ac.tar.gz
gentoo-2-12b3a89ac293ab2bce77398a7cd8721ac2ccd5ac.tar.bz2
gentoo-2-12b3a89ac293ab2bce77398a7cd8721ac2ccd5ac.zip
version bump
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog7
-rw-r--r--dev-util/meld/Manifest22
-rw-r--r--dev-util/meld/files/digest-meld-0.9.4.11
-rw-r--r--dev-util/meld/meld-0.9.4.1.ebuild68
4 files changed, 82 insertions, 16 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 7716ade4d0d8..cd23cd9e9a3a 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/meld
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.15 2004/10/04 16:24:53 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.16 2004/10/16 20:08:44 liquidx Exp $
+
+*meld-0.9.4.1 (16 Oct 2004)
+
+ 16 Oct 2004; Alastair Tse <liquidx@gentoo.org> +meld-0.9.4.1.ebuild:
+ version bump (#50457) (#52219)
04 Oct 2004; Tom Martin <slarti@gentoo.org> meld-0.9.2.ebuild:
Marked ~amd64, resolving bug 60244. Thanks to Jukka Holappa
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 645f56c590c1..8379b253925a 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0acf65afed7d8f3172ca63f00b471f62 meld-0.9.2.ebuild 1536
+MD5 da805fd0770a29dd03611e35f3654e0d ChangeLog 2427
MD5 3bb34ed97f4f38b6e40f756acb1d6b06 meld-0.9.0-r1.ebuild 1175
MD5 2176453c8fa8644591c0ebb51546cc41 meld-0.9.1.ebuild 1636
-MD5 da805fd0770a29dd03611e35f3654e0d ChangeLog 2427
+MD5 0acf65afed7d8f3172ca63f00b471f62 meld-0.9.2.ebuild 1536
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 1058b470e388a7de762db6f847abea48 files/meld-0.9.0-gentoo.diff 1631
-MD5 29df7f6e551b1ee13ec940e12d35067f files/meld-0.9.1-gentoo.diff 232
+MD5 0acf65afed7d8f3172ca63f00b471f62 meld-0.9.4.1.ebuild 1536
+MD5 9535ffb3344b955b67d3ba1bda584fe9 files/digest-meld-0.9.0-r1 59
MD5 31cc2ad6c4f8abcf7bc7f136bd2721c2 files/digest-meld-0.9.1 59
MD5 204fd0bd70dc55fec4d8b060a3165d94 files/digest-meld-0.9.2 63
+MD5 1058b470e388a7de762db6f847abea48 files/meld-0.9.0-gentoo.diff 1631
MD5 44ce8783b6cfb819a0bab9398ecdc02e files/meld-0.9.0-gtktoolbar.patch 546
-MD5 9535ffb3344b955b67d3ba1bda584fe9 files/digest-meld-0.9.0-r1 59
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBYXmQCHk4+ZoBpvsRAt7rAKC3k9PX7uKMr3uz6D9T31F/4aQH+gCeIQAa
-tLHAWdRjh+IIcS05NJ5OvBE=
-=mL8B
------END PGP SIGNATURE-----
+MD5 29df7f6e551b1ee13ec940e12d35067f files/meld-0.9.1-gentoo.diff 232
+MD5 a594b965f0dc8995e79d245c4cb37fd3 files/digest-meld-0.9.4.1 65
diff --git a/dev-util/meld/files/digest-meld-0.9.4.1 b/dev-util/meld/files/digest-meld-0.9.4.1
new file mode 100644
index 000000000000..c177a2890077
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-0.9.4.1
@@ -0,0 +1 @@
+MD5 cd5f02e084529c581ce52a22647ca4dc meld-0.9.4.1.tar.bz2 333123
diff --git a/dev-util/meld/meld-0.9.4.1.ebuild b/dev-util/meld/meld-0.9.4.1.ebuild
new file mode 100644
index 000000000000..a9fe7b531583
--- /dev/null
+++ b/dev-util/meld/meld-0.9.4.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.9.4.1.ebuild,v 1.1 2004/10/16 20:08:44 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 ~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"
+
+# need to add optional dependency for pygtksourceview when it is in portage.
+# - liquidx (16 Oct 2004)
+
+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
+}