fix text beside icons bug

6 files changed, 71 insertions, 5 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index aa08be56c852..56472d96b1bd 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.8 2003/10/15 10:06:14 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.9 2003/10/30 09:22:00 liquidx Exp $
+
+*meld-0.9.0-r1 (30 Oct 2003)
+
+  30 Oct 2003; Alastair Tse <liquidx@gentoo.org> meld-0.9.0-r1.ebuild,
+  meld-0.9.0.ebuild, files/meld-0.9.0-gtktoolbar.patch:
+  fix bug with toolbar settings set to 'text beside icons' (#32038)
 
 *meld-0.9.0 (15 Oct 2003)
 
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index b3537736b8b2..ac5e108f9d26 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,8 +1,8 @@
-MD5 c42dea11ff293ce92ec0537625f62714 ChangeLog 1374
+MD5 f3623f3b77410997279bf2780f0c009d ChangeLog 1600
 MD5 0529fbd1af790404749eff4ba2e99ec3 meld-0.8.3.ebuild 953
 MD5 50ea05c2aff0e05d8e2b9e84f0be74bd meld-0.8.5.ebuild 962
-MD5 8bee421e851dbd70aeaa9f03793904b9 meld-0.9.0-r1.ebuild 1174
-MD5 8bee421e851dbd70aeaa9f03793904b9 meld-0.9.0.ebuild 1174
+MD5 6ec82ac0243030b304be5beaf054b97d meld-0.9.0-r1.ebuild 1177
+MD5 2e97b7264b057eeb9ad5f644deb2a3ce meld-0.9.0.ebuild 1174
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 ac9685b844f3fc43fdaae83ef92f5a3c files/digest-meld-0.8.3 58
 MD5 982119cc13218dccc27583fee2baefef files/digest-meld-0.8.5 59
diff --git a/dev-util/meld/files/digest-meld-0.9.0-r1 b/dev-util/meld/files/digest-meld-0.9.0-r1
new file mode 100644
index 000000000000..e6312bc7ecd6
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-0.9.0-r1
@@ -0,0 +1 @@
+MD5 ade97f490ff61f2a5b85a3cc6d885232 meld-0.9.0.tgz 116391
diff --git a/dev-util/meld/files/meld-0.9.0-gtktoolbar.patch b/dev-util/meld/files/meld-0.9.0-gtktoolbar.patch
new file mode 100644
index 000000000000..dfecdc8e1fea
--- /dev/null
+++ b/dev-util/meld/files/meld-0.9.0-gtktoolbar.patch
@@ -0,0 +1,9 @@
+--- 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/meld-0.9.0-r1.ebuild b/dev-util/meld/meld-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..2272a86833c8
--- /dev/null
+++ b/dev-util/meld/meld-0.9.0-r1.ebuild
@@ -0,0 +1,49 @@
+# 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 $
+
+inherit python
+
+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.0.ebuild b/dev-util/meld/meld-0.9.0.ebuild
index a1bba7540c44..1a857a82d902 100644
--- a/dev-util/meld/meld-0.9.0.ebuild
+++ b/dev-util/meld/meld-0.9.0.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.1 2003/10/15 10:06:14 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.9.0.ebuild,v 1.2 2003/10/30 09:22:00 liquidx Exp $
 
 inherit python
 
@@ -23,6 +23,7 @@ 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
 }
 
 src_install() {