Bump to 1.1.4-r1

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

Package-Manager: portage-2.1.2-r12

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 2e17db25af9b9fed9acee50dacc3be0ab80f7f32..bba904a3c30d0d2001c4a428c0922c5a9ab92896 100644 (file)
--- 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/Manifest b/dev-util/meld/Manifest
index 3f925f7898ba7061928240d6545128a11cd7d29b..d67e820f1bded21e5c222c93006abde4f9cef34c 100644 (file)
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -5,15 +5,23 @@ AUX fix-po.patch 4005 RMD160 1f34be3c97b5af335a46781be36bba6fb951b531 SHA1 d2c84
 MD5 3ec863ae5648587f525dddd4cc614557 files/fix-po.patch 4005
 RMD160 1f34be3c97b5af335a46781be36bba6fb951b531 files/fix-po.patch 4005
 SHA256 6977f8fb96fbb1320e46beab7c9ddce0253b553de91c975f540a884bafd7f99b files/fix-po.patch 4005
+AUX meld-1.1.4-syntax.patch 1820 RMD160 c919c13e177299fff25c7e95860092b783c3b813 SHA1 bf052c7baef2230ce0ab1b69976cad6bd436f21a SHA256 a885ff0ba135e8553c1fa4e84005d7a0373fa61b33d8ffb8847a2bd71d2ffebe
+MD5 3e14b8277cb32b4c770ebca453a81c7f files/meld-1.1.4-syntax.patch 1820
+RMD160 c919c13e177299fff25c7e95860092b783c3b813 files/meld-1.1.4-syntax.patch 1820
+SHA256 a885ff0ba135e8553c1fa4e84005d7a0373fa61b33d8ffb8847a2bd71d2ffebe files/meld-1.1.4-syntax.patch 1820
 DIST meld-1.1.4.tar.bz2 599912 RMD160 ae327557458cae31660d3c30bcd6640f0406f1fa SHA1 52f51e5825b4e2bb56594a9f4e180908e714848f SHA256 040c7a633b8abfe646425be4835790d4515952ce0e2ffe8523c36751d93a472f
+EBUILD meld-1.1.4-r1.ebuild 1437 RMD160 f31dd2c28fdb0ef8a34b3b72e8db83696576ad10 SHA1 2a738fe57d7d0dda66c780890090a527256e2c06 SHA256 82a0749ae7a9624375da71a47161240466361481a84bf662b1d7a11bda2d10f7
+MD5 3cde1d239c362712cf68f5be6df09652 meld-1.1.4-r1.ebuild 1437
+RMD160 f31dd2c28fdb0ef8a34b3b72e8db83696576ad10 meld-1.1.4-r1.ebuild 1437
+SHA256 82a0749ae7a9624375da71a47161240466361481a84bf662b1d7a11bda2d10f7 meld-1.1.4-r1.ebuild 1437
 EBUILD meld-1.1.4.ebuild 1349 RMD160 f5051fa5604a71aa8ce447a54797881d9de941ae SHA1 a1f4394e63f86f113d9e7f20fc5b6bd7099e3d4b SHA256 79d2312d2714ff7cbf6a7d9d67febb9837f0c120c641085a568451f06cf62f54
 MD5 d895068bd7c5c9e64c1da8935d6d0cd8 meld-1.1.4.ebuild 1349
 RMD160 f5051fa5604a71aa8ce447a54797881d9de941ae meld-1.1.4.ebuild 1349
 SHA256 79d2312d2714ff7cbf6a7d9d67febb9837f0c120c641085a568451f06cf62f54 meld-1.1.4.ebuild 1349
-MISC ChangeLog 7873 RMD160 985a971956d50ba91472f86af93b69f359f5ce6c SHA1 3496e643699fe0b48b88c2e681fb5a78a95e63ed SHA256 ccec62d46987dfaa7908eb0ac382105b34b02fa36565b4b9cbb42fda6513bdd5
-MD5 659db5b9ca4d67d0b267c7ffa8ba2cf7 ChangeLog 7873
-RMD160 985a971956d50ba91472f86af93b69f359f5ce6c ChangeLog 7873
-SHA256 ccec62d46987dfaa7908eb0ac382105b34b02fa36565b4b9cbb42fda6513bdd5 ChangeLog 7873
+MISC ChangeLog 8102 RMD160 50d46e5df8ebf077ec85662d9dd56d7d449979c6 SHA1 a0fdab6ef36b92e29001c1dd13b3605795d34aba SHA256 fc8fbc68e09c82012b17dc719d38e10222b76069a66ccb0e5f6ef77ddeb00a3b
+MD5 046b6a69fd02f48bfe499d0f9fde2015 ChangeLog 8102
+RMD160 50d46e5df8ebf077ec85662d9dd56d7d449979c6 ChangeLog 8102
+SHA256 fc8fbc68e09c82012b17dc719d38e10222b76069a66ccb0e5f6ef77ddeb00a3b ChangeLog 8102
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -21,10 +29,13 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata
 MD5 366840d5e7f0bca6e5e1d56724dd6757 files/digest-meld-1.1.4 235
 RMD160 b7f6be12a22bf89fc13e6896ef35887ab184b86a files/digest-meld-1.1.4 235
 SHA256 0dc9c9acd57e433dd314f227d209444c7cd750c56d9a77ced153cbcadec5671f files/digest-meld-1.1.4 235
+MD5 366840d5e7f0bca6e5e1d56724dd6757 files/digest-meld-1.1.4-r1 235
+RMD160 b7f6be12a22bf89fc13e6896ef35887ab184b86a files/digest-meld-1.1.4-r1 235
+SHA256 0dc9c9acd57e433dd314f227d209444c7cd750c56d9a77ced153cbcadec5671f files/digest-meld-1.1.4-r1 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF5dnJomPajV0RnrERAuPlAJ0e00ZYHGzzunJUQ9DxLN7ypFgVjwCeNvEg
-EiLYX2chlM6eTO4jKo3bxqM=
-=0lPV
+iD8DBQFF6FRXomPajV0RnrERAjnaAJ9RVBc70gN9D7jwwaiKg4u3aZDqpQCghI2s
+0FXPRq2bqlCeY7q6nhiBwaM=
+=K0eG
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..86dc17b
--- /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 (file)
index 0000000..9c8b643
--- /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 (file)
index 0000000..dd990a5
--- /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
+}