version bump

4 files changed, 96 insertions, 1 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index bbb4ebaf7d3c..a108f4e94bc3 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.1 2003/06/08 19:33:05 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.2 2003/07/01 20:19:16 aliz Exp $
+
+*meld-0.8.2 (01 Jul 2003)
+
+  01 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> meld-0.8.2.ebuild :
+  Version bump.
 
 *meld-0.8.1 (08 Jun 2003)
 
diff --git a/dev-util/meld/files/digest-meld-0.8.2 b/dev-util/meld/files/digest-meld-0.8.2
new file mode 100644
index 000000000000..9f339fc5c1d7
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-0.8.2
@@ -0,0 +1 @@
+MD5 e547340b3f8271a2135a0cea9c9b1c2f meld-0.8.2.tgz 86388
diff --git a/dev-util/meld/files/meld-0.8.2-gentoo.diff b/dev-util/meld/files/meld-0.8.2-gentoo.diff
new file mode 100644
index 000000000000..b692e36a148b
--- /dev/null
+++ b/dev-util/meld/files/meld-0.8.2-gentoo.diff
@@ -0,0 +1,51 @@
+diff -ur meld-0.8.2.orig/meld meld-0.8.2/meld
+--- meld-0.8.2.orig/meld	2003-07-01 20:06:46.000000000 +0000
++++ meld-0.8.2/meld	2003-07-01 20:08:33.000000000 +0000
+@@ -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
+diff -ur meld-0.8.2.orig/meld.desktop meld-0.8.2/meld.desktop
+--- meld-0.8.2.orig/meld.desktop	2003-07-01 20:06:46.000000000 +0000
++++ meld-0.8.2/meld.desktop	2003-07-01 20:09:17.000000000 +0000
+@@ -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
+diff -ur meld-0.8.2.orig/meldapp.py meld-0.8.2/meldapp.py
+--- meld-0.8.2.orig/meldapp.py	2003-07-01 20:06:46.000000000 +0000
++++ meld-0.8.2/meldapp.py	2003-07-01 20:10:27.000000000 +0000
+@@ -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")
+diff -ur meld-0.8.2.orig/misc.py meld-0.8.2/misc.py
+--- meld-0.8.2.orig/misc.py	2003-07-01 20:06:46.000000000 +0000
++++ meld-0.8.2/misc.py	2003-07-01 20:16:42.000000000 +0000
+@@ -49,7 +49,7 @@
+ def appdir(pathin):
+     """Return where the application is installed.
+     """
+-    where = os.path.dirname(sys.argv[0])
++    where = /usr/share/meld
+     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)
diff --git a/dev-util/meld/meld-0.8.2.ebuild b/dev-util/meld/meld-0.8.2.ebuild
new file mode 100644
index 000000000000..a911414073bb
--- /dev/null
+++ b/dev-util/meld/meld-0.8.2.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.2.ebuild,v 1.1 2003/07/01 20:19:16 aliz 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/*
+}