Bump to 1.1.4-r1

	- Add patch to fix syntax highlighing by fixing mime type detection

(Portage version: 2.1.2-r12)

4 files changed, 109 insertions, 1 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 2e17db25af9b..bba904a3c30d 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.55 2007/02/28 19:39:31 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.56 2007/03/02 16:45:49 dang Exp $
+
+*meld-1.1.4-r1 (02 Mar 2007)
+
+  02 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/meld-1.1.4-syntax.patch, +meld-1.1.4-r1.ebuild:
+  Bump to 1.1.4-r1
+  	- Add patch to fix syntax highlighing by fixing mime type detection
 
   28 Feb 2007; Daniel Gryniewicz <dang@gentoo.org> meld-1.1.4.ebuild:
   Add scrollkeeper dep; bug #168704
diff --git a/dev-util/meld/files/digest-meld-1.1.4-r1 b/dev-util/meld/files/digest-meld-1.1.4-r1
new file mode 100644
index 000000000000..86dc17b3f05c
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-1.1.4-r1
@@ -0,0 +1,3 @@
+MD5 e780a8f67183acf7f51b13aa4a62ac85 meld-1.1.4.tar.bz2 599912
+RMD160 ae327557458cae31660d3c30bcd6640f0406f1fa meld-1.1.4.tar.bz2 599912
+SHA256 040c7a633b8abfe646425be4835790d4515952ce0e2ffe8523c36751d93a472f meld-1.1.4.tar.bz2 599912
diff --git a/dev-util/meld/files/meld-1.1.4-syntax.patch b/dev-util/meld/files/meld-1.1.4-syntax.patch
new file mode 100644
index 000000000000..9c8b6431a307
--- /dev/null
+++ b/dev-util/meld/files/meld-1.1.4-syntax.patch
@@ -0,0 +1,41 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN meld-1.1.4.orig/filediff.py meld-1.1.4/filediff.py
+--- meld-1.1.4.orig/filediff.py	2006-05-27 18:45:47.000000000 -0400
++++ meld-1.1.4/filediff.py	2007-03-02 11:37:55.000000000 -0500
+@@ -45,30 +45,15 @@ for sourceview in "gtksourceview sourcev
+         pass
+ 
+ if sourceview_available:
++    import gnomevfs
+     def set_highlighting_enabled(buf, fname, enabled):
+-        # gnome.vfs.get_mime_type seems to be broken. fake it.
+-        extmap = { "xml":"text/xml",
+-                   "glade":"text/xml",
+-                   "cpp":"text/x-cpp",
+-                   "cxx":"text/x-cpp",
+-                   "cc":"text/x-cpp",
+-                   "C":"text/x-cpp",
+-                   "c":"text/x-c",
+-                   "hpp":"text/x-cpp",
+-                   "hxx":"text/x-cpp",
+-                   "hh":"text/x-cpp",
+-                   "H":"text/x-cpp",
+-                   "h":"text/x-cpp",
+-                   "inl":"text/x-cpp",
+-                   "desktop": "application/x-desktop",
+-                   "diff": "text/x-diff",
+-                   "patch": "text/x-diff",
+-                   "html": "text/html",
+-                   "po": "text/x-po",
+-                   "py": "text/x-python" }
+-        ext = fname.split(".")[-1]
+         man = gsv.SourceLanguagesManager()
+-        gsl = man.get_language_from_mime_type( extmap.get(ext, "text/plain") )
++        cwd = gnomevfs.URI(os.getcwd())
++        if str(cwd)[-1] != '/':
++            cwd = cwd.append_string('/')
++        file = cwd.resolve_relative(fname)
++        file_info = gnomevfs.get_file_info(file, gnomevfs.FILE_INFO_GET_MIME_TYPE)
++        gsl = man.get_language_from_mime_type( file_info.mime_type )
+         if gsl:
+             buf.set_language(gsl)
+         buf.set_highlight(enabled)
diff --git a/dev-util/meld/meld-1.1.4-r1.ebuild b/dev-util/meld/meld-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..dd990a5eec10
--- /dev/null
+++ b/dev-util/meld/meld-1.1.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.4-r1.ebuild,v 1.1 2007/03/02 16:45:49 dang Exp $
+
+inherit python gnome2 eutils
+
+DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
+HOMEPAGE="http://meld.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~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}
+	app-text/scrollkeeper"
+
+DOCS="AUTHORS README.CVS changelog help/"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix build with gettext-0.15, patch by Ed Catmur #143120
+	epatch ${FILESDIR}/fix-po.patch
+
+	# Fix the .desktop icon name
+	sed -i -e "s:Icon=meld:Icon=/usr/share/pixmaps/meld.png:" ./meld.desktop.in
+
+	# fix the prefix so its not in */local/*
+	sed -i -e 's:/usr/local:/usr:' INSTALL
+
+	# don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833
+	sed -i -e '/scrollkeeper-update/s/\t/&#/' help/*/GNUmakefile
+
+	# Fix syntax highlighting.  Bug #169001
+	epatch ${FILESDIR}/${P}-syntax.patch
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/lib/meld
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib/meld
+}