gettext compile fix (undef. ref. to _()). Closes bug #83815

Package-Manager: portage-2.0.51.19

6 files changed, 103 insertions, 24 deletions

diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index 3f399c502d69..dce8d1570351 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/libgtkhtml
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.112 2005/03/10 02:19:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.113 2005/03/18 15:15:51 dsd Exp $
+
+  18 Mar 2005; Daniel Drake <dsd@gentoo.org>
+  +files/libgtkhtml-3.2-i18n.patch, libgtkhtml-3.2.3.ebuild,
+  libgtkhtml-3.2.4.ebuild, libgtkhtml-3.2.5.ebuild:
+  gettext compile fix (undef. ref. to _()). Closes bug #83815
 
   09 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> libgtkhtml-3.2.4.ebuild:
   Stable on sparc
diff --git a/gnome-extra/libgtkhtml/Manifest b/gnome-extra/libgtkhtml/Manifest
index 611873098b04..471b97793d76 100644
--- a/gnome-extra/libgtkhtml/Manifest
+++ b/gnome-extra/libgtkhtml/Manifest
@@ -1,31 +1,42 @@
-MD5 1d33cef59f37bae5fd205d658677d2ef ChangeLog 14319
-MD5 4e12417cd487cc2755a296a5e679ccf3 libgtkhtml-2.6.1.ebuild 935
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 8eb7d73f7ddc4b82bf6f9a25dab630d4 libgtkhtml-2.6.0.ebuild 933
-MD5 b8553abb72b97f7ad8017b89b2b69632 libgtkhtml-2.4.0.ebuild 836
 MD5 cef56458cfff6875b7b8c92ffd6f6228 libgtkhtml-2.4.1.ebuild 847
-MD5 0b5667b6e8a680f3446112c2dd0c4b85 libgtkhtml-3.0.10-r1.ebuild 1332
+MD5 8e0c5acb911bbc5f48c8e5bade0f719c libgtkhtml-3.2.5.ebuild 1179
+MD5 fc2f4b2aa2c9953bc390417b937edd34 libgtkhtml-3.6.0.ebuild 1097
 MD5 4412eea3538c99bfb62745bdf47850ae libgtkhtml-2.6.2.ebuild 947
+MD5 0b5667b6e8a680f3446112c2dd0c4b85 libgtkhtml-3.0.10-r1.ebuild 1332
+MD5 b8553abb72b97f7ad8017b89b2b69632 libgtkhtml-2.4.0.ebuild 836
+MD5 1fb59ba75952bcedf78bc69c28c36f23 libgtkhtml-3.2.4.ebuild 1173
+MD5 4e12417cd487cc2755a296a5e679ccf3 libgtkhtml-2.6.1.ebuild 935
+MD5 450305579827e7439e0ecf31f9b6955e libgtkhtml-2.6.3.ebuild 945
+MD5 b1e39a5301dfb56efa0fd94de504606b ChangeLog 14535
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 694c7e4709dbd86ba9218cfa6036b499 libgtkhtml-3.2.3.ebuild 1196
 MD5 0c37e3ffa931ead9868867fe88b9499f libgtkhtml-3.0.10.ebuild 1199
-MD5 bb75f6d2c98350dc6093ba5558672a6d libgtkhtml-3.2.3.ebuild 1097
-MD5 64ed1764b706b3d220aa62b3f6425f44 libgtkhtml-3.2.4.ebuild 1067
-MD5 abf6d79bb9239a9d7e968e1ad3e09c67 libgtkhtml-3.2.5.ebuild 1070
-MD5 450305579827e7439e0ecf31f9b6955e libgtkhtml-2.6.3.ebuild 945
-MD5 fc2f4b2aa2c9953bc390417b937edd34 libgtkhtml-3.6.0.ebuild 1097
-MD5 eb876ffb327ae10a0bdbc7efda2ca329 files/digest-libgtkhtml-2.6.1 69
-MD5 1f2800f5de2c490d27d8befe0bf150e3 files/digest-libgtkhtml-2.6.0 69
+MD5 c802878860f7a2692df330e54e635c0c files/libgtkhtml-3.0.7-libtool.patch 656
+MD5 91961ab08a6720382576581f1c879963 files/libgtkhtml-3.0.8-alpha.patch 700
 MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10 68
+MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
+MD5 e34bf128bd5fd129fbc7ed28558c2d5b files/libgtkhtml-3.0.9-gtk-2.4.patch 3582
+MD5 b954bf799749526cc35e4d73e5ebbaba files/libgtkhtml-3.2-i18n.patch 1411
 MD5 c4945ff6d58733accdf9ff738ddc34b1 files/digest-libgtkhtml-2.4.0 69
 MD5 a5a0241e2812997e4266c6ba1df009ee files/digest-libgtkhtml-2.4.1 69
-MD5 e34bf128bd5fd129fbc7ed28558c2d5b files/libgtkhtml-3.0.9-gtk-2.4.patch 3582
-MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
-MD5 c802878860f7a2692df330e54e635c0c files/libgtkhtml-3.0.7-libtool.patch 656
-MD5 91961ab08a6720382576581f1c879963 files/libgtkhtml-3.0.8-alpha.patch 700
-MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10-r1 68
-MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/libgtkhtml-fix_preedit.patch 2439
+MD5 1f2800f5de2c490d27d8befe0bf150e3 files/digest-libgtkhtml-2.6.0 69
+MD5 eb876ffb327ae10a0bdbc7efda2ca329 files/digest-libgtkhtml-2.6.1 69
 MD5 61ab3b67f222041451c0d1fa3f69df9d files/digest-libgtkhtml-2.6.2 69
+MD5 9b8c5022b2135422ff58e52a18662863 files/digest-libgtkhtml-2.6.3 69
 MD5 100e54c4c0cff7ebf097652fd2276015 files/digest-libgtkhtml-3.2.3 67
 MD5 714aa2ab68649c7292585791ef3b2cf8 files/digest-libgtkhtml-3.2.4 67
 MD5 8ad22906ca369e77ef84242fd95d1900 files/digest-libgtkhtml-3.2.5 67
-MD5 9b8c5022b2135422ff58e52a18662863 files/digest-libgtkhtml-2.6.3 69
 MD5 162b47fd756ffe48091b4775dd7ea57a files/digest-libgtkhtml-3.6.0 67
+MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/libgtkhtml-fix_preedit.patch 2439
+MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10-r1 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCOvEJiJcSIUGNthERAseeAJ952CvU4JElxzIb4g1iJLhdvS2JhACgw0Pf
+hHRIq6qz/KDOjjQ7rrOeD/s=
+=xXjh
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgtkhtml/files/libgtkhtml-3.2-i18n.patch b/gnome-extra/libgtkhtml/files/libgtkhtml-3.2-i18n.patch
new file mode 100644
index 000000000000..e4ad9a3f8123
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/libgtkhtml-3.2-i18n.patch
@@ -0,0 +1,45 @@
+--- gtkhtml-3.2.5/src/gtkhtml.c.orig	2005-03-13 16:04:23.000000000 +0000
++++ gtkhtml-3.2.5/src/gtkhtml.c	2005-03-13 16:07:42.000000000 +0000
+@@ -27,7 +27,7 @@
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gtk/gtk.h>
+ #include <string.h>
+-
++#include <glib/gi18n-lib.h>
+ #include <gnome.h>
+ 
+ #include "../a11y/factory.h"
+--- gtkhtml-3.2.5/src/htmlbutton.c.orig	2005-03-13 16:03:52.000000000 +0000
++++ gtkhtml-3.2.5/src/htmlbutton.c	2005-03-13 16:08:00.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include "htmlform.h"
+ #include <string.h>
+ #include <libgnome/gnome-i18n.h>
++#include <glib/gi18n-lib.h>
+ 
+ HTMLButtonClass html_button_class;
+ 
+--- gtkhtml-3.2.5/src/htmlengine-print.c.orig	2005-03-13 16:06:27.000000000 +0000
++++ gtkhtml-3.2.5/src/htmlengine-print.c	2005-03-13 16:09:36.000000000 +0000
+@@ -23,6 +23,8 @@
+ #include <gtk/gtk.h>
+ #include <libgnome/gnome-i18n.h>
+ #include <libgnomeui/gnome-dialog-util.h>
++#include <glib/gi18n-lib.h>
++
+ #include "gtkhtml.h"
+ #include "gtkhtml-private.h"
+ #include "gtkhtml-properties.h"
+--- gtkhtml-3.2.5/src/test.c.orig	2005-03-13 16:10:20.000000000 +0000
++++ gtkhtml-3.2.5/src/test.c	2005-03-13 16:12:28.000000000 +0000
+@@ -36,8 +36,10 @@
+ #include <gtk/gtkbutton.h>
+ #include <gtk/gtksignal.h>
+ 
++#include <config.h>
+ #include <libgnome/gnome-i18n.h>
+ #include <libgnomeui/gnome-ui-init.h>
++#include <glib/gi18n-lib.h>
+ 
+ #include "gtkhtml.h"
+ #include "gtkhtmldebug.h"
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild
index 797749e8923a..e46b075d7ec6 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild,v 1.10 2005/01/20 00:06:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild,v 1.11 2005/03/18 15:15:51 dsd Exp $
 
 inherit gnome2 eutils versionator
 
@@ -38,3 +38,9 @@ USE_DESTDIR="1"
 SCROLLKEEPER_UPDATE="0"
 ELTCONF="--reverse-deps"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-3.2-i18n.patch || die "gettext fix"
+}
+
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild
index 51e57fe08d84..d7cce1ffd127 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild,v 1.6 2005/03/12 19:41:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild,v 1.7 2005/03/18 15:15:51 dsd Exp $
 
-inherit gnome2 versionator
+inherit gnome2 versionator eutils
 
 MY_P=${P/lib/}
 MY_PN=${PN/lib/}
@@ -38,3 +38,9 @@ USE_DESTDIR="1"
 SCROLLKEEPER_UPDATE="0"
 ELTCONF="--reverse-deps"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-3.2-i18n.patch || die "gettext fix"
+}
+
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild
index b3169c1eeda3..911aca64c0d6 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild,v 1.1 2005/03/02 05:25:37 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild,v 1.2 2005/03/18 15:15:51 dsd Exp $
 
-inherit gnome2 versionator
+inherit gnome2 versionator eutils
 
 MY_P=${P/lib/}
 MY_PN=${PN/lib/}
@@ -38,3 +38,9 @@ USE_DESTDIR="1"
 SCROLLKEEPER_UPDATE="0"
 ELTCONF="--reverse-deps"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-3.2-i18n.patch || die "gettext fix"
+}
+