Fix compilation with gettext-0.15, patch provided by Ed Catmur #143120

(Portage version: 2.1.1_pre5-r1)

3 files changed, 194 insertions, 2 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index f325d9ccd80c..dc92411c1e30 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.42 2006/09/11 17:02:18 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.43 2006/09/11 17:24:53 agriffis Exp $
+
+  11 Sep 2006; Aron Griffis <agriffis@gentoo.org>
+  -files/meld-1.0.0-frpo.patch, +files/fix-po.patch, meld-1.1.4.ebuild:
+  Fix compilation with gettext-0.15, patch provided by Ed Catmur #143120
 
   11 Sep 2006; John N. Laliberte <allanonjl@gentoo.org> metadata.xml:
   remove myself as maintainer, leave to the herd.
diff --git a/dev-util/meld/files/fix-po.patch b/dev-util/meld/files/fix-po.patch
new file mode 100644
index 000000000000..12915d61cdb1
--- /dev/null
+++ b/dev-util/meld/files/fix-po.patch
@@ -0,0 +1,185 @@
+--- po/ru.po.orig	2006/08/27 09:11:02	1.1
++++ po/ru.po	2006/08/27 09:11:53
+@@ -190,57 +190,57 @@
+ #, python-format
+ msgid "%i second"
+ msgid_plural "%i seconds"
+-msgstr[0] "секунда"
+-msgstr[1] "секунды"
+-msgstr[2] "секунд"
++msgstr[0] "%i секунда"
++msgstr[1] "%i секунды"
++msgstr[2] "%i секунд"
+ 
+ #: ../dirdiff.py:571
+ #, python-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+-msgstr[0] "минута"
+-msgstr[1] "минуты"
+-msgstr[2] "минут"
++msgstr[0] "%i минута"
++msgstr[1] "%i минуты"
++msgstr[2] "%i минут"
+ 
+ #: ../dirdiff.py:572
+ #, python-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+-msgstr[0] "час"
+-msgstr[1] "часа"
+-msgstr[2] "часов"
++msgstr[0] "%i час"
++msgstr[1] "%i часа"
++msgstr[2] "%i часов"
+ 
+ #: ../dirdiff.py:573
+ #, python-format
+ msgid "%i day"
+ msgid_plural "%i days"
+-msgstr[0] "день"
+-msgstr[1] "дня"
+-msgstr[2] "дней"
++msgstr[0] "%i день"
++msgstr[1] "%i дня"
++msgstr[2] "%i дней"
+ 
+ #: ../dirdiff.py:574
+ #, python-format
+ msgid "%i week"
+ msgid_plural "%i weeks"
+-msgstr[0] "неделя"
+-msgstr[1] "недели"
+-msgstr[2] "недель"
++msgstr[0] "%i неделя"
++msgstr[1] "%i недели"
++msgstr[2] "%i недель"
+ 
+ #: ../dirdiff.py:575
+ #, python-format
+ msgid "%i month"
+ msgid_plural "%i months"
+-msgstr[0] "месяц"
+-msgstr[1] "месяца"
+-msgstr[2] "месяцев"
++msgstr[0] "%i месяц"
++msgstr[1] "%i месяца"
++msgstr[2] "%i месяцев"
+ 
+ #: ../dirdiff.py:576
+ #, python-format
+ msgid "%i year"
+ msgid_plural "%i years"
+-msgstr[0] "год"
+-msgstr[1] "года"
+-msgstr[2] "лет"
++msgstr[0] "%i год"
++msgstr[1] "%i года"
++msgstr[2] "%i лет"
+ 
+ #. Abbreviation for insert,overwrite so that it will fit in the status bar
+ #: ../filediff.py:224
+--- po/hu.po.orig	2006-02-24 19:19:25.000000000 -0500
++++ po/hu.po	2006-09-11 13:18:43.000000000 -0400
+@@ -99,49 +99,42 @@
+ msgid "%i second"
+ msgid_plural "%i seconds"
+ msgstr[0] "%i másodperc"
+-msgstr[1] "%i másodperc"
+ 
+ #: ../dirdiff.py:570
+ #, python-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+ msgstr[0] "%i perc"
+-msgstr[1] "%i perc"
+ 
+ #: ../dirdiff.py:571
+ #, python-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+ msgstr[0] "%i óra"
+-msgstr[1] "%i óra"
+ 
+ #: ../dirdiff.py:572
+ #, python-format
+ msgid "%i day"
+ msgid_plural "%i days"
+ msgstr[0] "%i nap"
+-msgstr[1] "%i nap"
+ 
+ #: ../dirdiff.py:573
+ #, python-format
+ msgid "%i week"
+ msgid_plural "%i weeks"
+ msgstr[0] "%i hét"
+-msgstr[1] "%i hét"
+ 
+ #: ../dirdiff.py:574
+ #, python-format
+ msgid "%i month"
+ msgid_plural "%i months"
+ msgstr[0] "%i hónap"
+-msgstr[1] "%i hónap"
+ 
+ #: ../dirdiff.py:575
+ #, python-format
+ msgid "%i year"
+ msgid_plural "%i years"
+ msgstr[0] "%i év"
+-msgstr[1] "%i év"
+ 
+ #. Abbreviation for insert,overwrite so that it will fit in the status bar
+ #: ../filediff.py:214
+--- po/ja.po.orig	2006-03-05 06:03:44.000000000 -0500
++++ po/ja.po	2006-09-11 13:19:58.000000000 -0400
+@@ -97,49 +97,42 @@
+ msgid "%i second"
+ msgid_plural "%i seconds"
+ msgstr[0] "%i 秒"
+-msgstr[1] "%i 秒"
+ 
+ #: ../dirdiff.py:570
+ #, python-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+ msgstr[0] "%i 分"
+-msgstr[1] "%i 分"
+ 
+ #: ../dirdiff.py:571
+ #, python-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+ msgstr[0] "%i 時間"
+-msgstr[1] "%i 時間"
+ 
+ #: ../dirdiff.py:572
+ #, python-format
+ msgid "%i day"
+ msgid_plural "%i days"
+ msgstr[0] "%i 日"
+-msgstr[1] "%i 日"
+ 
+ #: ../dirdiff.py:573
+ #, python-format
+ msgid "%i week"
+ msgid_plural "%i weeks"
+ msgstr[0] "%i 週間"
+-msgstr[1] "%i 週間"
+ 
+ #: ../dirdiff.py:574
+ #, python-format
+ msgid "%i month"
+ msgid_plural "%i months"
+ msgstr[0] "%i ヶ月"
+-msgstr[1] "%i ヶ月"
+ 
+ #: ../dirdiff.py:575
+ #, python-format
+ msgid "%i year"
+ msgid_plural "%i years"
+ msgstr[0] "%i 年"
+-msgstr[1] "%i 年"
+ 
+ #. Abbreviation for insert,overwrite so that it will fit in the status bar
+ #: ../filediff.py:215
diff --git a/dev-util/meld/meld-1.1.4.ebuild b/dev-util/meld/meld-1.1.4.ebuild
index b7b322220d62..372ee3de8f1a 100644
--- a/dev-util/meld/meld-1.1.4.ebuild
+++ b/dev-util/meld/meld-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.4.ebuild,v 1.2 2006/09/11 16:59:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.4.ebuild,v 1.3 2006/09/11 17:24:53 agriffis Exp $
 
 inherit python gnome2 eutils
 
@@ -37,6 +37,9 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 
+	# Fix build with gettext-0.15, patch by Ed Catmur #143120
+	epatch ${FILESDIR}/fix-po.patch
+
 	# Fix the .desktop icon name
 	sed -i -e "s:Icon=meld:Icon=/usr/share/pixmaps/meld.png:" ./meld.desktop.in