Add word-wrap items in glade, bug #246261.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 135 insertions, 2 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 78cdcb4add4f..8a7d9f738084 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.85 2008/11/12 21:53:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.86 2008/11/16 19:33:00 eva Exp $
+
+*meld-1.2-r1 (16 Nov 2008)
+
+  16 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/meld-1.2-wrap-list.patch, +meld-1.2-r1.ebuild:
+  Add word-wrap items in glade, bug #246261.
 
   12 Nov 2008; Brent Baude <ranger@gentoo.org> meld-1.2.ebuild:
   stable ppc64, bug 246061
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 44536dc14e71..a89d6cbf028e 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX meld-1.2-fr-help-install-fix.patch 819 RMD160 06c6bdfea5346139feb912bc259d750e0b744ae3 SHA1 0338d0331cad4efb4f2a51dd0307ff4be092254d SHA256 d3380b4cb233a66440c5f1738d8fe3b40b508ced7c4e4902d2d22a06ecfbfa30
+AUX meld-1.2-wrap-list.patch 3322 RMD160 3e34936ae64ff7c00c6294721f3bd79e2e67e8d4 SHA1 32389e752a947a1b57132dd4f7757c6573479aea SHA256 6c65d11b84be0a6c6ec2b39cc24f68b1f1ce75c8246d5c61b503ef65ea973520
 DIST meld-1.1.5.1.tar.bz2 602859 RMD160 8ac6e0b6518388f188ab6a0f13ace67aad02fef4 SHA1 047bc68184ed18d490bc41658c7d2d3d8950696a SHA256 6d415c68670474e2800994bbf4162fa438fca1b1332cc34052d4cb9b8a51bc38
 DIST meld-1.2.tar.bz2 616975 RMD160 a06fee2f8f882a1edba329bd0be7797f89852920 SHA1 aa246307226332b865216d139c10de4c73562fc1 SHA256 361befb14a0391b21ab9d96ee1ebd93c09246a135c07a0636d6d50895ededc0f
 EBUILD meld-1.1.5.1-r1.ebuild 1497 RMD160 1be9bf2a35108ae03fc121f621704ec781e183a1 SHA1 22220c6d5414f62c5d79b1b270a02d23fa925f72 SHA256 0f8607da349cf7dde2fe5afec815e70656d12c649cecc5d0421ddb481fb9f7ca
 EBUILD meld-1.1.5.1.ebuild 1207 RMD160 3ba400cd955be3555f2bea1c0d38906a6aff899f SHA1 a9bfe86a1c653592c9fe8ccae83485a56171e0ef SHA256 55fad28cd6fd96ae958cf9852f675fd99b330916ef9cdeca06707076644abea4
+EBUILD meld-1.2-r1.ebuild 1865 RMD160 7cf6cf5b69b845b9c4ed452ca8a245d15160c9de SHA1 8e94e7a4393aeed6d14b6b1c5e64517cfbb5b8be SHA256 2e7cf3903616283f378b58f921b297ced88171604ad7b2a7334b31a04048e648
 EBUILD meld-1.2.ebuild 1779 RMD160 30811a2691cd190d83bc6ba0f2a766a92332fbe7 SHA1 54434bc43f659cd5448085765413865249c3ebe7 SHA256 9e239a735a8f996083f2149decb144559ce73184f1c5507d4bba820600a9649e
-MISC ChangeLog 11474 RMD160 04f7593263e26e3535abc65da697def602a9b3ba SHA1 486384b00187eabc8323a1993a36c0a2e04e5319 SHA256 9f890a9d3ab125d6268b4cf89feec04a037b5e1a62b2a78554290be2485453a5
+MISC ChangeLog 11655 RMD160 d4fd12112e466011d396383e8c88a63131a8228e SHA1 0fff8d97cadf8cc697df5745e8c248eaad4ac76e SHA256 0880810ee3b2fb38b271630c911264dd38eb1ce7b7cade4a0ce1fd5fef7bc451
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkgg4MACgkQ1fmVwcYIWAbdSACgiPFgewpZWwl0igeiDZsTZATm
+y4wAoLScfqzDLDm48g1YZiFz9dictE9P
+=Qd9F
+-----END PGP SIGNATURE-----
diff --git a/dev-util/meld/files/meld-1.2-wrap-list.patch b/dev-util/meld/files/meld-1.2-wrap-list.patch
new file mode 100644
index 000000000000..e52074cf0b47
--- /dev/null
+++ b/dev-util/meld/files/meld-1.2-wrap-list.patch
@@ -0,0 +1,45 @@
+diff -dPNur meld-1.2/glade2/meldapp.glade meld-1.2-1/glade2/meldapp.glade
+--- meld-1.2/glade2/meldapp.glade	2008-06-20 01:17:32.000000000 +0200
++++ meld-1.2-1/glade2/meldapp.glade	2008-11-14 19:07:20.000000000 +0100
+@@ -1403,8 +1403,40 @@
+                                       <widget class="GtkOptionMenu" id="option_wrap_lines">
+                                         <property name="visible">True</property>
+                                         <property name="can_focus">True</property>
+-                                        <property name="response_id">0</property>
++                                        <property name="history">0</property>
+                                         <signal name="changed" handler="on_option_wrap_lines_changed"/>
++
++                                        <child>
++                                          <widget class="GtkMenu" id="menu1">
++
++                                            <child>
++                                              <widget class="GtkMenuItem" id="menu_wrap_none">
++                                                <property name="visible">True</property>
++                                                <property name="label" translatable="yes">_None</property>
++                                                <property name="use_underline">True</property>
++                                                <signal name="activate" handler="on_wrap_activate" last_modification_time="Wed, 17 Mar 2004 21:30:49 GMT"/>
++                                              </widget>
++                                            </child>
++
++                                            <child>
++                                              <widget class="GtkMenuItem" id="menu_wrap_char">
++                                                <property name="visible">True</property>
++                                                <property name="label" translatable="yes">_Character</property>
++                                                <property name="use_underline">True</property>
++                                                <signal name="activate" handler="on_wrap_activate" last_modification_time="Wed, 17 Mar 2004 21:30:49 GMT"/>
++                                              </widget>
++                                            </child>
++
++                                            <child>
++                                              <widget class="GtkMenuItem" id="menu_wrap_word">
++                                                <property name="visible">True</property>
++                                                <property name="label" translatable="yes">_Word</property>
++                                                <property name="use_underline">True</property>
++                                                <signal name="activate" handler="on_wrap_activate" last_modification_time="Wed, 17 Mar 2004 21:30:49 GMT"/>
++                                              </widget>
++                                            </child>
++                                          </widget>
++                                        </child>
+                                       </widget>
+                                       <packing>
+                                         <property name="expand">False</property>
diff --git a/dev-util/meld/meld-1.2-r1.ebuild b/dev-util/meld/meld-1.2-r1.ebuild
new file mode 100644
index 000000000000..ec7890828886
--- /dev/null
+++ b/dev-util/meld/meld-1.2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.2-r1.ebuild,v 1.1 2008/11/16 19:33:00 eva Exp $
+
+inherit python gnome2 eutils multilib
+
+DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
+HOMEPAGE="http://meld.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gnome"
+
+RDEPEND=">=dev-lang/python-2.3
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=dev-python/gnome-python-2.6.0
+	>=dev-python/pygtk-2.6.0
+	>=dev-python/pyorbit-1.99.0
+	gnome? ( dev-python/gnome-python-desktop )"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	app-text/scrollkeeper"
+
+DOCS="AUTHORS changelog help/"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix installation bug for french help, mentioned in bug 230665
+	epatch "${FILESDIR}/${P}-fr-help-install-fix.patch"
+
+	# Fix word-wrapping option list, bug #246261
+	epatch "${FILESDIR}/${P}-wrap-list.patch"
+
+	# fix the prefix so its not in */local/*
+	sed -i -e 's:/usr/local:/usr:' INSTALL
+	sed -i -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" INSTALL
+
+	# don't install anything to /usr/share/doc/meld
+	sed -i -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" INSTALL
+
+	# let the python eclass handle python objects
+	sed -i -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' GNUmakefile
+
+	# don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833
+	sed -i -e '/scrollkeeper-update/s/\t/&#/' help/*/GNUmakefile
+
+	strip-linguas -i "${S}/po"
+	local mylinguas=""
+	for x in ${LINGUAS}; do
+		mylinguas="${mylinguas} ${x}.po"
+	done
+
+	sed -i -e "s/PO:=.*/PO:=${mylinguas}/" po/GNUmakefile
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/meld
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/meld
+}