version bump

4 files changed, 106 insertions, 2 deletions

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 9a4fa754dfe2..849317bf491f 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,8 +1,8 @@
 MD5 ffb236603fbdb43657048801a2ee5e0a meld-0.8.1.ebuild 957
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 1893ba4e0351e0b278127c77e0ef95f6 ChangeLog 648
+MD5 57821afb43407369c170ab111f79fa09 ChangeLog 811
 MD5 f32f9f33aa4207ef8bcda3cdbede0f2a meld-0.8.2.ebuild 967
-MD5 f32f9f33aa4207ef8bcda3cdbede0f2a meld-0.8.3.ebuild 967
+MD5 3fa7e0e8c6591e8b20f2347d187565a2 meld-0.8.3.ebuild 967
 MD5 774e0a890077f2d11ffba5afb4dd8dee files/meld-0.8.1-gentoo.diff 1443
 MD5 c99fc566baf1043d1736556c5b31357d files/digest-meld-0.8.1 58
 MD5 946ab2fafb24e4b2b9fa1e7c7dffb643 files/digest-meld-0.8.2 58
diff --git a/dev-util/meld/files/digest-meld-0.8.3 b/dev-util/meld/files/digest-meld-0.8.3
new file mode 100644
index 000000000000..b81d97f6e73d
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-0.8.3
@@ -0,0 +1 @@
+MD5 c7cfc8a7bb229e3771a6a3f2f48ea029 meld-0.8.3.tgz 87573
diff --git a/dev-util/meld/files/meld-0.8.3-gentoo.diff b/dev-util/meld/files/meld-0.8.3-gentoo.diff
new file mode 100644
index 000000000000..20d14a42e308
--- /dev/null
+++ b/dev-util/meld/files/meld-0.8.3-gentoo.diff
@@ -0,0 +1,65 @@
+--- meld-0.8.3.orig/meld
++++ meld-0.8.3/meld
+@@ -52,6 +52,12 @@
+     print "Due to incompatible API changes some functions may not operate as expected."
+ 
+ #
++# Add the library path to the system load path
++#
++import os
++sys.path = [os.curdir, '/usr/lib/meld'] + sys.path
++
++#
+ # main
+ #
+ import meldapp
+--- meld-0.8.3.orig/meld.desktop
++++ meld-0.8.3/meld.desktop
+@@ -6,6 +6,6 @@
+ Comment=Compare and merge your files.
+ TryExec=meld
+ Exec=meld
+-Path=./meld
+ Terminal=false
+ Categories=GNOME;Application;Development;
++Icon=/usr/share/meld/glade2/pixmaps/icon.png
+--- meld-0.8.3.orig/meldapp.py
++++ meld-0.8.3/meldapp.py
+@@ -453,7 +453,7 @@
+         gnome.url_show("http://meld.sourceforge.net")
+ 
+     def on_menu_users_manual_activate(self, button):
+-        gnome.url_show("file:///"+os.path.abspath(misc.appdir("manual/index.html") ) )
++        gnome.url_show("file:///usr/share/doc/meld-0.8.2/html/index.html")
+ 
+     def on_menu_about_activate(self, *extra):
+         about = gtk.glade.XML(misc.appdir("glade2/meld-app.glade"),"about").get_widget("about")
+--- meld-0.8.3.orig/misc.py
++++ meld-0.8.3/misc.py
+@@ -49,12 +49,7 @@
+ def appdir(pathin):
+     """Return where the application is installed.
+     """
+-    where = os.path.dirname(sys.argv[0])
+-    pathout = os.path.join( where, pathin )
+-    if not os.path.exists(pathout):
+-        run_dialog("Cannot find '%s'\nI looked in '%s'\n(%s)" % (pathin,where,pathout), gtk.MESSAGE_ERROR)
+-        sys.exit(1)
+-    return pathout
++    return os.path.join("/usr/share/meld", pathin)
+ 
+ class struct:
+     """Similar to a dictionary except that members may be accessed as s.member.
+--- meld-0.8.3.orig/dirdiff.py
++++ meld-0.8.3.orig/dirdiff.py
+@@ -78,7 +78,7 @@
+ 
+ 
+ COL_NEWER = tree.COL_END + 1
+-pixbuf_newer = gnomeglade.load_pixbuf(misc.appdir("glade2/pixmaps/tree-file-newer.png"), 14)
++pixbuf_newer = gnomeglade.load_pixbuf(misc.appdir("glade2/pixmaps/tree-file-new.png"), 14)
+ TYPE_PIXBUF = type(pixbuf_newer)
+ 
+ ################################################################################
+
+
diff --git a/dev-util/meld/meld-0.8.3.ebuild b/dev-util/meld/meld-0.8.3.ebuild
new file mode 100644
index 000000000000..97ee77d56fbb
--- /dev/null
+++ b/dev-util/meld/meld-0.8.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.8.3.ebuild,v 1.1 2003/08/05 10:55:38 liquidx Exp $
+
+DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
+HOMEPAGE="http://meld.sourceforge.net/"
+SRC_URI="mirror://sourceforge/meld/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+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/orbit-python-1.99.0"
+
+src_unpack(){
+    unpack ${A} ; cd ${S}
+    epatch ${FILESDIR}/${P}-gentoo.diff
+} 
+
+src_install() {
+	insinto /usr/lib/meld
+	doins *.py 
+	dobin meld
+	insinto /usr/share/meld/glade2
+	doins glade2/*
+	insinto /usr/share/meld/glade2/pixmaps
+	doins glade2/pixmaps/*
+	insinto /usr/share/applications
+	doins meld.desktop
+	dodoc AUTHORS COPYING INSTALL TODO.txt
+	dohtml manual/*
+}