fixes #67784 and #93437 and cleanup older ebuilds.

(Portage version: 2.0.51.19)

10 files changed, 41 insertions, 146 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index d159a6373bb4..df162e2c6d0f 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.20 2005/03/30 16:24:47 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.21 2005/05/29 21:48:03 allanonjl Exp $
+
+*meld-0.9.4.1-r1 (29 May 2005)
+
+  29 May 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +meld-0.9.4.1-r1.ebuild:
+  fixes #67784 and #93437
 
   30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> meld-0.9.4.1.ebuild:
   Stable on ppc.
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 1aa1c3a6dbb6..145e20010751 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,13 +1,8 @@
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 1c8520565d19c7321d89431c35d2eb91 meld-0.9.0-r1.ebuild 1175
-MD5 06f9664a9cf308bc3ea7935a80f50c08 ChangeLog 2994
 MD5 96ed5fd3c9961f4e4787f897e666bddb meld-0.9.2.ebuild 1538
-MD5 d6d5cc5b169c6f0053ee7f09aa554010 meld-0.9.1.ebuild 1636
 MD5 46b08e3752195ea4162e574e4fa5dff8 meld-0.9.4.1.ebuild 1785
-MD5 1058b470e388a7de762db6f847abea48 files/meld-0.9.0-gentoo.diff 1631
-MD5 204fd0bd70dc55fec4d8b060a3165d94 files/digest-meld-0.9.2 63
+MD5 6a3cee12569f60c46094ec623bc5663d ChangeLog 3136
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 763374c83c29d1a83cfeaa9400257ba7 meld-0.9.4.1-r1.ebuild 2065
+MD5 a594b965f0dc8995e79d245c4cb37fd3 files/digest-meld-0.9.4.1-r1 65
 MD5 a594b965f0dc8995e79d245c4cb37fd3 files/digest-meld-0.9.4.1 65
-MD5 29df7f6e551b1ee13ec940e12d35067f files/meld-0.9.1-gentoo.diff 232
-MD5 44ce8783b6cfb819a0bab9398ecdc02e files/meld-0.9.0-gtktoolbar.patch 546
-MD5 31cc2ad6c4f8abcf7bc7f136bd2721c2 files/digest-meld-0.9.1 59
-MD5 9535ffb3344b955b67d3ba1bda584fe9 files/digest-meld-0.9.0-r1 59
+MD5 204fd0bd70dc55fec4d8b060a3165d94 files/digest-meld-0.9.2 63
diff --git a/dev-util/meld/files/digest-meld-0.9.0-r1 b/dev-util/meld/files/digest-meld-0.9.0-r1
deleted file mode 100644
index e6312bc7ecd6..000000000000
--- a/dev-util/meld/files/digest-meld-0.9.0-r1
+++ /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
deleted file mode 100644
index 1a9922839ac4..000000000000
--- a/dev-util/meld/files/digest-meld-0.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1dfd1205c405bc263fc49ea1d92d47bf meld-0.9.1.tgz 118854
diff --git a/dev-util/meld/files/digest-meld-0.9.4.1-r1 b/dev-util/meld/files/digest-meld-0.9.4.1-r1
new file mode 100644
index 000000000000..c177a2890077
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-0.9.4.1-r1
@@ -0,0 +1 @@
+MD5 cd5f02e084529c581ce52a22647ca4dc meld-0.9.4.1.tar.bz2 333123
diff --git a/dev-util/meld/files/meld-0.9.0-gentoo.diff b/dev-util/meld/files/meld-0.9.0-gentoo.diff
deleted file mode 100644
index 58c58bc52d98..000000000000
--- a/dev-util/meld/files/meld-0.9.0-gentoo.diff
+++ /dev/null
@@ -1,56 +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.9.0/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.
-
-
diff --git a/dev-util/meld/files/meld-0.9.0-gtktoolbar.patch b/dev-util/meld/files/meld-0.9.0-gtktoolbar.patch
deleted file mode 100644
index dfecdc8e1fea..000000000000
--- a/dev-util/meld/files/meld-0.9.0-gtktoolbar.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- meldapp.py.old	2003-10-28 13:23:43.000000000 +0000
-+++ meldapp.py	2003-10-28 13:23:50.000000000 +0000
-@@ -461,5 +461,5 @@
-         if self.toolbar_style == 0:
-             style = self._gconf.get_string('/desktop/gnome/interface/toolbar_style')
--            style = {"both":gtk.TOOLBAR_BOTH, "both_horiz":gtk.TOOLBAR_BOTH_HORIZ,
-+            style = {"both":gtk.TOOLBAR_BOTH, "both-horiz":gtk.TOOLBAR_BOTH_HORIZ,
-                      "icon":gtk.TOOLBAR_ICONS, "icons":gtk.TOOLBAR_ICONS,
-                      "text":gtk.TOOLBAR_TEXT}[style]
diff --git a/dev-util/meld/files/meld-0.9.1-gentoo.diff b/dev-util/meld/files/meld-0.9.1-gentoo.diff
deleted file mode 100644
index 715279ccb500..000000000000
--- a/dev-util/meld/files/meld-0.9.1-gentoo.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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.9.0-r1.ebuild b/dev-util/meld/meld-0.9.0-r1.ebuild
deleted file mode 100644
index cc0b8f943376..000000000000
--- a/dev-util/meld/meld-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.5 2005/01/27 21:34:02 agriffis Exp $
-
-inherit python eutils
-
-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}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.9.0-gentoo.diff
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.9.0-gtktoolbar.patch
-}
-
-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/*
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/lib/meld
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/meld
-}
diff --git a/dev-util/meld/meld-0.9.1.ebuild b/dev-util/meld/meld-0.9.4.1-r1.ebuild
index af5c4d8df242..fd30f30d6576 100644
--- a/dev-util/meld/meld-0.9.1.ebuild
+++ b/dev-util/meld/meld-0.9.4.1-r1.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.9.1.ebuild,v 1.6 2005/01/27 21:34:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.9.4.1-r1.ebuild,v 1.1 2005/05/29 21:48:03 allanonjl Exp $
 
-inherit python eutils
+inherit python gnome.org eutils
 
 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 ~sparc ~alpha"
+KEYWORDS="~x86 ~alpha ~sparc ~ppc ~amd64"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
@@ -20,10 +19,28 @@ DEPEND=">=dev-lang/python-2.2
 	>=dev-python/pygtk-1.99.15
 	>=dev-python/pyorbit-1.99.0"
 
-src_unpack(){
+# need to add optional dependency for pygtksourceview when it is in portage.
+# - liquidx (16 Oct 2004)
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+
+	if ! built_with_use pygtk gnome ; then
+		einfo ""
+		einfo "Meld requires pygtk be built with the gnome use flag set."
+		einfo "Please re-emerge pygtk with the gnome use flag set."
+		einfo ""
+		die "You need to re-emerge pygtk with gnome use flag."
+	fi
+}
+
+src_unpack() {
+
 	unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.9.1-gentoo.diff
-	#EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.9.0-gtktoolbar.patch
+	# Fix the .desktop icon name, see bug #73550
+	sed -i -e "s:Icon=meld:Icon=meld-icon.png:" ${S}/meld.desktop.in
+
 }
 
 src_compile() {
@@ -41,7 +58,7 @@ src_install() {
 	doins *.py
 	python tools/install_paths \
 		localedir=/usr/share/locale \
-		docdir=/usr/share/doc/${PF} \
+		docdir=/usr/share/doc/${P} \
 		sharedir=/usr/share/meld < paths.py > paths.py.install
 
 	newins paths.py.install paths.py
@@ -50,12 +67,14 @@ src_install() {
 	doins glade2/*
 	insinto /usr/share/meld/glade2/pixmaps
 	doins glade2/pixmaps/*
+	insinto /usr/share/pixmaps
+	newins glade2/pixmaps/icon.png meld-icon.png
 
 	insinto /usr/share/applications
 	doins meld.desktop
 
 	dodoc AUTHORS COPYING INSTALL TODO.txt
-	insinto /usr/share/doc/${PF}
+	insinto /usr/share/doc/${P}
 	doins manual/*
 }