version bump and cleanup

13 files changed, 50 insertions, 224 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 56472d96b1bd..7822aea50c77 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,14 @@
 # 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.9 2003/10/30 09:22:00 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.10 2003/11/22 19:29:19 liquidx Exp $
+
+*meld-0.9.1 (22 Nov 2003)
+
+  22 Nov 2003; Alastair Tse <liquidx@gentoo.org> meld-0.8.3.ebuild,
+  meld-0.8.5.ebuild, meld-0.9.0-r1.ebuild, meld-0.9.0.ebuild,
+  meld-0.9.1.ebuild, files/meld-0.8.3-gentoo.diff,
+  files/meld-0.8.5-gentoo.diff:
+  version bump. refactor patch to new improved paths.py by the meld authors
 
 *meld-0.9.0-r1 (30 Oct 2003)
 
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index eea085f29cf2..42d3602c120e 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,10 +1,9 @@
-MD5 f3623f3b77410997279bf2780f0c009d ChangeLog 1600
-MD5 9e907a4e8582a60be0e398fc6a0d115e meld-0.9.0-r1.ebuild 1176
-MD5 5152cd8d080164eba5302a0c2e6658c8 meld-0.9.1.ebuild 1178
+MD5 47d4598e5c5a54f1cda5fcf8eb626640 ChangeLog 1918
+MD5 e77767e745c1090964b2a75d9f05bfa5 meld-0.9.0-r1.ebuild 1176
+MD5 e2291d556bfff0b029556e0928456dd9 meld-0.9.1.ebuild 1630
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 9535ffb3344b955b67d3ba1bda584fe9 files/digest-meld-0.9.0-r1 59
 MD5 31cc2ad6c4f8abcf7bc7f136bd2721c2 files/digest-meld-0.9.1 59
-MD5 a82b214a1e2501e96a7afc74ce5d20c2 files/meld-0.8.3-gentoo.diff 2055
-MD5 625ae6345226923ab97f411268a4258b files/meld-0.8.5-gentoo.diff 2017
 MD5 1058b470e388a7de762db6f847abea48 files/meld-0.9.0-gentoo.diff 1631
 MD5 44ce8783b6cfb819a0bab9398ecdc02e files/meld-0.9.0-gtktoolbar.patch 546
+MD5 29df7f6e551b1ee13ec940e12d35067f files/meld-0.9.1-gentoo.diff 232
diff --git a/dev-util/meld/files/digest-meld-0.8.3 b/dev-util/meld/files/digest-meld-0.8.3
deleted file mode 100644
index b81d97f6e73d..000000000000
--- a/dev-util/meld/files/digest-meld-0.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7cfc8a7bb229e3771a6a3f2f48ea029 meld-0.8.3.tgz 87573
diff --git a/dev-util/meld/files/digest-meld-0.8.5 b/dev-util/meld/files/digest-meld-0.8.5
deleted file mode 100644
index 5f2b8e2398c8..000000000000
--- a/dev-util/meld/files/digest-meld-0.8.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 463553f70bda8c400843fd34270de2fd meld-0.8.5.tgz 107995
diff --git a/dev-util/meld/files/digest-meld-0.9.0 b/dev-util/meld/files/digest-meld-0.9.0
deleted file mode 100644
index e6312bc7ecd6..000000000000
--- a/dev-util/meld/files/digest-meld-0.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ade97f490ff61f2a5b85a3cc6d885232 meld-0.9.0.tgz 116391
diff --git a/dev-util/meld/files/digest-meld-0.9.1 b/dev-util/meld/files/digest-meld-0.9.1
new file mode 100644
index 000000000000..1a9922839ac4
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-0.9.1
@@ -0,0 +1 @@
+MD5 1dfd1205c405bc263fc49ea1d92d47bf meld-0.9.1.tgz 118854
diff --git a/dev-util/meld/files/meld-0.8.3-gentoo.diff b/dev-util/meld/files/meld-0.8.3-gentoo.diff
deleted file mode 100644
index 20d14a42e308..000000000000
--- a/dev-util/meld/files/meld-0.8.3-gentoo.diff
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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/files/meld-0.8.5-gentoo.diff b/dev-util/meld/files/meld-0.8.5-gentoo.diff
deleted file mode 100644
index 77c9546d6cc8..000000000000
--- a/dev-util/meld/files/meld-0.8.5-gentoo.diff
+++ /dev/null
@@ -1,67 +0,0 @@
---- meld
-+++ 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.desktop
-+++ 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
---- meldapp.py
-+++ 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")
---- misc.py		2003-08-31 23:27:14.172632240 +0200
-+++ misc.py	2003-08-31 23:27:14.172632240 +0200
-@@ -55,14 +55,7 @@
-     return ret
- 
- 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), None, 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.
---- dirdiff.py
-+++ 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/files/meld-0.9.1-gentoo.diff b/dev-util/meld/files/meld-0.9.1-gentoo.diff
new file mode 100644
index 000000000000..715279ccb500
--- /dev/null
+++ b/dev-util/meld/files/meld-0.9.1-gentoo.diff
@@ -0,0 +1,10 @@
+--- meld.desktop
++++ 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
diff --git a/dev-util/meld/meld-0.8.3.ebuild b/dev-util/meld/meld-0.8.3.ebuild
deleted file mode 100644
index f936e3147867..000000000000
--- a/dev-util/meld/meld-0.8.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.5 2003/09/17 08:37:45 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/pyorbit-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/*
-}
diff --git a/dev-util/meld/meld-0.8.5.ebuild b/dev-util/meld/meld-0.8.5.ebuild
deleted file mode 100644
index e991b64eb420..000000000000
--- a/dev-util/meld/meld-0.8.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.5.ebuild,v 1.5 2003/09/17 17:53:47 agriffis 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 ~alpha"
-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/pyorbit-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/*
-}
diff --git a/dev-util/meld/meld-0.9.0-r1.ebuild b/dev-util/meld/meld-0.9.0-r1.ebuild
index 2272a86833c8..8c21eabea578 100644
--- a/dev-util/meld/meld-0.9.0-r1.ebuild
+++ b/dev-util/meld/meld-0.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.9.0-r1.ebuild,v 1.1 2003/10/30 09:22:00 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.9.0-r1.ebuild,v 1.2 2003/11/22 19:29:19 liquidx Exp $
 
 inherit python
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/meld/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="x86 ~alpha"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
diff --git a/dev-util/meld/meld-0.9.0.ebuild b/dev-util/meld/meld-0.9.1.ebuild
index 1a857a82d902..6ffd528aee6a 100644
--- a/dev-util/meld/meld-0.9.0.ebuild
+++ b/dev-util/meld/meld-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # 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.9.0.ebuild,v 1.2 2003/10/30 09:22:00 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.9.1.ebuild,v 1.1 2003/11/22 19:29:19 liquidx Exp $
 
 inherit python
 
@@ -22,22 +22,41 @@ DEPEND=">=dev-lang/python-2.2
 
 src_unpack(){
 	unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.9.0-gentoo.diff
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.9.0-gtktoolbar.patch
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.9.1-gentoo.diff
+	#EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.9.0-gtktoolbar.patch
+}
+
+src_compile() {
+	emake || die "make failed"
 }
 
 src_install() {
+	# do manual injection of *dirs instead of using make install
+	# to get around lack of DESTDIR
+	cd ${S}
+	python tools/install_paths libdir=/usr/lib/meld < meld > meld.install
+	newbin meld.install meld
+
 	insinto /usr/lib/meld
 	doins *.py
-	dobin meld
+	python tools/install_paths \
+		localedir=/usr/share/locale \
+		docdir=/usr/share/doc/${PF} \
+		sharedir=/usr/share/meld < paths.py > paths.py.install
+
+	newins paths.py.install paths.py
+
 	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/*
+	insinto /usr/share/doc/${PF}
+	doins manual/*
 }
 
 pkg_postinst() {