New version, bug 230665; Includes folder comparison speedups, UI tweaks and cleanups, and various bug fixes

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 i686)

3 files changed, 85 insertions, 1 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/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
+}