Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-util/meld
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2008-07-19 17:43:31 +0000
committerMart Raudsepp <leio@gentoo.org>2008-07-19 17:43:31 +0000
commit54f980709dfbef1566b9ad57550beeaac6e8aba7 (patch)
tree32dbc8458035d3c8247c3d45ee6d3da5eed20355 /dev-util/meld
parentFix Manifest for =asymptote-1.41, distfile size should not be 0. (diff)
downloadhistorical-54f980709dfbef1566b9ad57550beeaac6e8aba7.tar.gz
historical-54f980709dfbef1566b9ad57550beeaac6e8aba7.tar.bz2
historical-54f980709dfbef1566b9ad57550beeaac6e8aba7.zip
New version, bug 230665; Includes folder comparison speedups, UI tweaks and cleanups, and various bug fixes
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 i686
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog9
-rw-r--r--dev-util/meld/Manifest13
-rw-r--r--dev-util/meld/files/meld-1.2-fr-help-install-fix.patch18
-rw-r--r--dev-util/meld/meld-1.2.ebuild59
4 files changed, 93 insertions, 6 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 2eeda14e0bc2..078aadfc55a8 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-util/meld
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.75 2008/05/29 16:48:04 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.76 2008/07/19 17:43:30 leio Exp $
+
+*meld-1.2 (19 Jul 2008)
+
+ 19 Jul 2008; Mart Raudsepp <leio@gentoo.org>
+ +files/meld-1.2-fr-help-install-fix.patch, +meld-1.2.ebuild:
+ New version, bug 230665; Includes folder comparison speedups, UI tweaks and
+ cleanups, and various bug fixes
29 May 2008; Ali Polatel <hawking@gentoo.org> meld-1.1.5.1.ebuild,
meld-1.1.5.1-r1.ebuild:
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 62a0bf0420d4..657638a069ce 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,15 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX meld-1.2-fr-help-install-fix.patch 819 RMD160 06c6bdfea5346139feb912bc259d750e0b744ae3 SHA1 0338d0331cad4efb4f2a51dd0307ff4be092254d SHA256 d3380b4cb233a66440c5f1738d8fe3b40b508ced7c4e4902d2d22a06ecfbfa30
DIST meld-1.1.5.1.tar.bz2 602859 RMD160 8ac6e0b6518388f188ab6a0f13ace67aad02fef4 SHA1 047bc68184ed18d490bc41658c7d2d3d8950696a SHA256 6d415c68670474e2800994bbf4162fa438fca1b1332cc34052d4cb9b8a51bc38
+DIST meld-1.2.tar.bz2 616975 RMD160 a06fee2f8f882a1edba329bd0be7797f89852920 SHA1 aa246307226332b865216d139c10de4c73562fc1 SHA256 361befb14a0391b21ab9d96ee1ebd93c09246a135c07a0636d6d50895ededc0f
EBUILD meld-1.1.5.1-r1.ebuild 1504 RMD160 aedbe990fb43942efaa4f6e42308079dfe184fc0 SHA1 08d13d21a5672b8dc09545c2c57ba343363b7104 SHA256 9913d2c1bf43c34b78af22680b07a4b9d2f10ba7f3d68fd7233879a86e9cfdf7
EBUILD meld-1.1.5.1.ebuild 1207 RMD160 3ba400cd955be3555f2bea1c0d38906a6aff899f SHA1 a9bfe86a1c653592c9fe8ccae83485a56171e0ef SHA256 55fad28cd6fd96ae958cf9852f675fd99b330916ef9cdeca06707076644abea4
-MISC ChangeLog 10312 RMD160 89c0017b31a8e63dfe6249946a1a113a5ba29707 SHA1 536482afedbf24c249260ce5acf8c01fa4378a86 SHA256 552c27e467448e40a38947e5ab2ccf5db48f4af3bfa955bb5b48262f5f0cf934
+EBUILD meld-1.2.ebuild 1613 RMD160 9f9e49f2ee19de26e7b49655885d6aa3d51fdb7d SHA1 9aab6746f8bcef6f36485d63584b437e08000fa8 SHA256 e216db306b813f76f1bb38d4773fe0003c6209d761d919454d2a4ec457b9d30b
+MISC ChangeLog 10557 RMD160 2a04d95294e1eda138072d3e5cd6db0d3bc58d63 SHA1 5572b9455920bf2025458e71b78e883fd3e68cde SHA256 8c9b118faea770dc39dd6e000d2a07f129428e463b9fa72aa6a1dbf8c76e8aed
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
-iEYEARECAAYFAkg+3kYACgkQQU4yORhF8iDwVgCgjJDxfSBUX/PGE6xxSI9FtH5U
-LgkAn049dcaluHLyYEovC7T3ugMjJzgH
-=ZTGs
+iEYEARECAAYFAkiCJ8IACgkQkeYb6olFHJfwBACgyTB3i+/uwOZwsjlQ0coe+KaN
+mp8An3V0vJ65u1ZllUbGsWC5HTitTm7b
+=7UML
-----END PGP SIGNATURE-----
diff --git a/dev-util/meld/files/meld-1.2-fr-help-install-fix.patch b/dev-util/meld/files/meld-1.2-fr-help-install-fix.patch
new file mode 100644
index 000000000000..4a07ad894dc8
--- /dev/null
+++ b/dev-util/meld/files/meld-1.2-fr-help-install-fix.patch
@@ -0,0 +1,18 @@
+From http://bugzilla.gnome.org/attachment.cgi?id=113669&action=view
+from upstream bug 540442. Bug 540848 describes the exact problem, while 540442
+might originally be about something else
+
+diff -p -up meld-1.2/help/fr/GNUmakefile~ meld-1.2/help/fr/GNUmakefile
+--- meld-1.2/help/fr/GNUmakefile~ 2008-03-31 22:44:53.000000000 +0200
++++ meld-1.2/help/fr/GNUmakefile 2008-06-27 10:37:54.000000000 +0200
+@@ -15,9 +15,8 @@ all $(OMF_NAME).install : $(OMF_NAME)
+
+ .PHONY : install
+ install : $(OMF_NAME).install
+- -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) $(XML_DIR_)/figures
++ -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_)
+ install -m 644 meld.$(LANG).xml $(XML_DIR_)/meld.xml
+- install -m 644 figures/*.png $(XML_DIR_)/figures
+ -install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
+ -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
+
diff --git a/dev-util/meld/meld-1.2.ebuild b/dev-util/meld/meld-1.2.ebuild
new file mode 100644
index 000000000000..49ca15c5530b
--- /dev/null
+++ b/dev-util/meld/meld-1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.2.ebuild,v 1.1 2008/07/19 17:43:30 leio Exp $
+
+inherit python gnome2 eutils multilib
+
+DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
+HOMEPAGE="http://meld.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~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}
+ dev-util/intltool
+ app-text/scrollkeeper"
+
+DOCS="AUTHORS README.CVS changelog help/"
+
+src_unpack() {
+ gnome2_src_unpack
+
+ # Fix installation bug for french help, mentioned in bug 230665
+ epatch "${FILESDIR}/${P}-fr-help-install-fix.patch"
+
+ # fix the prefix so its not in */local/*
+ sed -i -e 's:/usr/local:/usr:' INSTALL
+ sed -i -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" INSTALL
+
+ # don't install anything to /usr/share/doc/meld
+ sed -i -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" INSTALL
+
+ # let the python eclass handle python objects
+ sed -i -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' GNUmakefile
+
+ # 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/$(get_libdir)/meld
+}
+
+pkg_postrm() {
+ python_mod_cleanup /usr/$(get_libdir)/meld
+}