version bump and stable bump for 0.8.3

10 files changed, 40 insertions, 113 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index c3795096d0fe..5421f37c6096 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2003/08/05 10:55:38 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.5 2003/09/02 12:41:11 liquidx Exp $
+
+*meld-0.8.5 (02 Sep 2003)
+
+  02 Sep 2003; Alastair Tse <liquidx@gentoo.org> meld-0.8.5.ebuild,
+  files/meld-0.8.5-gentoo.diff:
+  version bump. updated gentoo [o patch thanks to suka <suka@t0.or.at> (#27665)
 
 *meld-0.8.3 (05 Aug 2003)
 
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 4c962810dad4..49bb688e6486 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,14 +1,8 @@
-MD5 57821afb43407369c170ab111f79fa09 ChangeLog 811
-MD5 ffb236603fbdb43657048801a2ee5e0a meld-0.8.1.ebuild 957
-MD5 f32f9f33aa4207ef8bcda3cdbede0f2a meld-0.8.2.ebuild 967
-MD5 3fa7e0e8c6591e8b20f2347d187565a2 meld-0.8.3.ebuild 967
-MD5 3fa7e0e8c6591e8b20f2347d187565a2 meld-0.8.5.ebuild 967
+MD5 05597c4bf361bea233b0c47a7585088c ChangeLog 1019
+MD5 91bb586fb61d71e0610194333f670c7a meld-0.8.3.ebuild 966
+MD5 d440a34d8bee86307a7e050ce8002339 meld-0.8.5.ebuild 967
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 c99fc566baf1043d1736556c5b31357d files/digest-meld-0.8.1 58
-MD5 946ab2fafb24e4b2b9fa1e7c7dffb643 files/digest-meld-0.8.2 58
 MD5 ac9685b844f3fc43fdaae83ef92f5a3c files/digest-meld-0.8.3 58
 MD5 982119cc13218dccc27583fee2baefef files/digest-meld-0.8.5 59
-MD5 774e0a890077f2d11ffba5afb4dd8dee files/meld-0.8.1-gentoo.diff 1443
-MD5 5fb4bb4cf227397160317e332613f923 files/meld-0.8.2-gentoo.diff 1637
 MD5 a82b214a1e2501e96a7afc74ce5d20c2 files/meld-0.8.3-gentoo.diff 2055
 MD5 625ae6345226923ab97f411268a4258b files/meld-0.8.5-gentoo.diff 2017
diff --git a/dev-util/meld/files/digest-meld-0.8.1 b/dev-util/meld/files/digest-meld-0.8.1
deleted file mode 100644
index efcfa6ff0dcc..000000000000
--- a/dev-util/meld/files/digest-meld-0.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c45bae3f0ddb50834722502fa40a7d6 meld-0.8.1.tgz 72491
diff --git a/dev-util/meld/files/digest-meld-0.8.2 b/dev-util/meld/files/digest-meld-0.8.2
deleted file mode 100644
index 9f339fc5c1d7..000000000000
--- a/dev-util/meld/files/digest-meld-0.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e547340b3f8271a2135a0cea9c9b1c2f meld-0.8.2.tgz 86388
diff --git a/dev-util/meld/files/digest-meld-0.8.5 b/dev-util/meld/files/digest-meld-0.8.5
new file mode 100644
index 000000000000..5f2b8e2398c8
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-0.8.5
@@ -0,0 +1 @@
+MD5 463553f70bda8c400843fd34270de2fd meld-0.8.5.tgz 107995
diff --git a/dev-util/meld/files/meld-0.8.1-gentoo.diff b/dev-util/meld/files/meld-0.8.1-gentoo.diff
deleted file mode 100644
index 84b6666e28b8..000000000000
--- a/dev-util/meld/files/meld-0.8.1-gentoo.diff
+++ /dev/null
@@ -1,47 +0,0 @@
---- meld-0.8.1.orig/meld
-+++ meld-0.8.1/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.1.orig/meld.desktop
-+++ meld-0.8.1/meld.desktop
-@@ -6,6 +6,6 @@
- Comment=Compare and merge your files.
- TryExec=meld
- Exec=meld
--Path=/home/stephen/Projects/meld
- Terminal=false
- Categories=GNOME;Application;Development;
-+Icon=/usr/share/meld/glade2/pixmaps/icon.png
---- meld-0.8.1.orig/meldapp.py
-+++ meld-0.8.1/meldapp.py
-@@ -441,7 +441,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.1/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.1.orig/misc.py
-+++ meld-0.8.1/misc.py
-@@ -27,7 +27,7 @@
- def appdir(path):
-     """Return where the application is installed.
-     """
--    return os.path.join( os.path.dirname(sys.argv[0]), path )
-+    return os.path.join( "/usr/share/meld", path )
- 
- class struct:
-     """Similar to a dictionary except that members may be accessed as s.member.
diff --git a/dev-util/meld/files/meld-0.8.2-gentoo.diff b/dev-util/meld/files/meld-0.8.5-gentoo.diff
index c93c142444b2..77c9546d6cc8 100644
--- a/dev-util/meld/files/meld-0.8.2-gentoo.diff
+++ b/dev-util/meld/files/meld-0.8.5-gentoo.diff
@@ -1,5 +1,5 @@
---- meld-0.8.2.orig/meld
-+++ meld-0.8.2/meld
+--- meld
++++ meld
 @@ -52,6 +52,12 @@
      print "Due to incompatible API changes some functions may not operate as expected."
  
@@ -13,8 +13,8 @@
  # main
  #
  import meldapp
---- meld-0.8.2.orig/meld.desktop
-+++ meld-0.8.2/meld.desktop
+--- meld.desktop
++++ meld.desktop
 @@ -6,6 +6,6 @@
  Comment=Compare and merge your files.
  TryExec=meld
@@ -23,8 +23,8 @@
  Terminal=false
  Categories=GNOME;Application;Development;
 +Icon=/usr/share/meld/glade2/pixmaps/icon.png
---- meld-0.8.2.orig/meldapp.py
-+++ meld-0.8.2/meldapp.py
+--- meldapp.py
++++ meldapp.py
 @@ -453,7 +453,7 @@
          gnome.url_show("http://meld.sourceforge.net")
  
@@ -34,21 +34,34 @@
  
      def on_menu_about_activate(self, *extra):
          about = gtk.glade.XML(misc.appdir("glade2/meld-app.glade"),"about").get_widget("about")
---- meld-0.8.2.orig/misc.py
-+++ meld-0.8.2/misc.py
-@@ -49,12 +49,7 @@
+--- 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.
-     """
+-    """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)
+-        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)
++    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/meld-0.8.1.ebuild b/dev-util/meld/meld-0.8.1.ebuild
deleted file mode 100644
index 7f13b1c013d6..000000000000
--- a/dev-util/meld/meld-0.8.1.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.1.ebuild,v 1.1 2003/06/08 19:33:05 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}
-    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.3.ebuild b/dev-util/meld/meld-0.8.3.ebuild
index 97ee77d56fbb..47b7738a58d1 100644
--- a/dev-util/meld/meld-0.8.3.ebuild
+++ b/dev-util/meld/meld-0.8.3.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.8.3.ebuild,v 1.1 2003/08/05 10:55:38 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.8.3.ebuild,v 1.2 2003/09/02 12:41:11 liquidx Exp $
 
 DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
 HOMEPAGE="http://meld.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/meld/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
diff --git a/dev-util/meld/meld-0.8.2.ebuild b/dev-util/meld/meld-0.8.5.ebuild
index f14738597aea..0ac8ed3f1d8f 100644
--- a/dev-util/meld/meld-0.8.2.ebuild
+++ b/dev-util/meld/meld-0.8.5.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.8.2.ebuild,v 1.2 2003/07/06 00:06:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.8.5.ebuild,v 1.1 2003/09/02 12:41:11 liquidx Exp $
 
 DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
 HOMEPAGE="http://meld.sourceforge.net/"