Added patch to allow compilation on systems without gettext (bug #134436)

Package-Manager: portage-2.1_rc4-r3

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index 2b2091b8521597225c7e36dfe11b7bcb2fd5b59c..423526579a8731508fc19d5739f72a8cd403352b 100644 (file)
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/vte
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.120 2006/06/06 06:05:21 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.121 2006/06/08 06:00:44 leonardop Exp $
+
+  08 Jun 2006; Leonardo Boshell <leonardop@gentoo.org>
+  +files/vte-0.12-nonls.patch, vte-0.12.2.ebuild:
+  Added patch to allow compiling vte on systems without gettext (e.g.
+  uclibc-based). Patch contributed by Yuri Vasilevski on bug #134436.
 
 *vte-0.12.2 (06 Jun 2006)
 

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 20ed28ffc9bcf64ac1f2ce8640852c1294b1d636..f20d1ba8ae45600e3333dbc83620290ab75c1e79 100644 (file)
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -10,6 +10,10 @@ AUX vte-0.11.18-line-scroll.patch 2236 RMD160 71d3a5a3bbafceeec9080e85000ee607b1
 MD5 958781d1ff9822a3778d981228f9cc05 files/vte-0.11.18-line-scroll.patch 2236
 RMD160 71d3a5a3bbafceeec9080e85000ee607b1023a7e files/vte-0.11.18-line-scroll.patch 2236
 SHA256 3e2c52e09b1c026810deb1e08152e207e325def09b2df9cc080dd0b555c7d982 files/vte-0.11.18-line-scroll.patch 2236
+AUX vte-0.12-nonls.patch 3761 RMD160 5f259113d57b3ea1103994b84d55a5a22c3a7cb6 SHA1 776e40e51d7d546c745593fc682b469b1ed04571 SHA256 3609c8e85e4feee1389e408d0c66224c3ed868a115d01df9f5aafbc926d0f9f6
+MD5 191138f144b086f1d666c643bfa48237 files/vte-0.12-nonls.patch 3761
+RMD160 5f259113d57b3ea1103994b84d55a5a22c3a7cb6 files/vte-0.12-nonls.patch 3761
+SHA256 3609c8e85e4feee1389e408d0c66224c3ed868a115d01df9f5aafbc926d0f9f6 files/vte-0.12-nonls.patch 3761
 AUX vte-line-scroll.patch 2234 RMD160 96dc248294da960119e6adb1012651803d9e0141 SHA1 bf3766828904091e778e1dcf6e15d52bdc97e7c0 SHA256 7b83355aa1b96afdd30506617614ec1e02de7dc81a170f1d1c702c99c2b9ab07
 MD5 3805528034f3d01fa27e24f600618c0d files/vte-line-scroll.patch 2234
 RMD160 96dc248294da960119e6adb1012651803d9e0141 files/vte-line-scroll.patch 2234
@@ -39,14 +43,14 @@ EBUILD vte-0.12.0.ebuild 1283 RMD160 6ce163e21c0e9910b63e047953ffc1ac6790734a SH
 MD5 46a82f442614c1cde1058e3180c1d7e8 vte-0.12.0.ebuild 1283
 RMD160 6ce163e21c0e9910b63e047953ffc1ac6790734a vte-0.12.0.ebuild 1283
 SHA256 1811167e8997012de3f25faa15f06d7ecf1f6003c2081612a99bead4b7ae5eaa vte-0.12.0.ebuild 1283
-EBUILD vte-0.12.2.ebuild 1328 RMD160 24dfb2170e890defd5ff45bb4000918c69dae172 SHA1 d5043e35404ab64f64218e523d77e58c20d44afb SHA256 55ff828b0d9adeb9c7ac9d88932a2824f1f0648b1248b244dddd0fec01e1f53c
-MD5 b79858b9537885a153dbdd159e6cbb14 vte-0.12.2.ebuild 1328
-RMD160 24dfb2170e890defd5ff45bb4000918c69dae172 vte-0.12.2.ebuild 1328
-SHA256 55ff828b0d9adeb9c7ac9d88932a2824f1f0648b1248b244dddd0fec01e1f53c vte-0.12.2.ebuild 1328
-MISC ChangeLog 14262 RMD160 15bb5ef529515765ae010e9cf3bdd03d3c8b8af0 SHA1 4cba88818864fe17712f1e4239415248e652f936 SHA256 ad68489f73561abdd90b9435aeaf5e7af8e39298840ff30fbd8c2343ed48d2ec
-MD5 f23cb4f8aa2d0b12a52bedbf1ceffccb ChangeLog 14262
-RMD160 15bb5ef529515765ae010e9cf3bdd03d3c8b8af0 ChangeLog 14262
-SHA256 ad68489f73561abdd90b9435aeaf5e7af8e39298840ff30fbd8c2343ed48d2ec ChangeLog 14262
+EBUILD vte-0.12.2.ebuild 1463 RMD160 6af78598580d0a78aa0a157d9b53aac288e4bed1 SHA1 7d46c80c0fee31343a3c9c7fb141b073079b3664 SHA256 42bfe4e299357b07b2c7cddd866322f5359132f8a3c7558ff0ceaf5e29298056
+MD5 cd1d6173981a4f52f986417740cd8626 vte-0.12.2.ebuild 1463
+RMD160 6af78598580d0a78aa0a157d9b53aac288e4bed1 vte-0.12.2.ebuild 1463
+SHA256 42bfe4e299357b07b2c7cddd866322f5359132f8a3c7558ff0ceaf5e29298056 vte-0.12.2.ebuild 1463
+MISC ChangeLog 14508 RMD160 d8c5095b83ba73204a5d6164e3303011e9ae614d SHA1 62921404620c5cec1952045cfe902ca63474455a SHA256 e31b371dc5ecb8abc9c248271650ba86d514519480ab686f731bf627693c55c1
+MD5 b4b5637386c3a2960d5b3e05fcc2bcc6 ChangeLog 14508
+RMD160 d8c5095b83ba73204a5d6164e3303011e9ae614d ChangeLog 14508
+SHA256 e31b371dc5ecb8abc9c248271650ba86d514519480ab686f731bf627693c55c1 ChangeLog 14508
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158

diff --git a/x11-libs/vte/files/vte-0.12-nonls.patch b/x11-libs/vte/files/vte-0.12-nonls.patch
new file mode 100644 (file)
index 0000000..f15cc18
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.12-nonls.patch
@@ -0,0 +1,125 @@
+diff -Naurp vte-0.12.2.orig/src/iso2022.c vte-0.12.2/src/iso2022.c
+--- vte-0.12.2.orig/src/iso2022.c      2006-03-15 11:02:59.000000000 +0000
++++ vte-0.12.2/src/iso2022.c   2006-06-07 15:53:48.000000000 +0000
+@@ -35,7 +35,13 @@
+ #ifdef HAVE_LOCALE_H
+ #include <locale.h>
+ #endif
++
++#ifdef ENABLE_NLS
+ #include <glib/gi18n-lib.h>
++#else
++#define _(String) String
++#define bindtextdomain(package,dir)
++#endif
+ 
+ /* Maps which jive with XTerm's ESC ()*+ ? sequences, RFC 1468.  Add the
+  * PC437 map because despite knowing that XTerm doesn't support it, certain
+diff -Naurp vte-0.12.2.orig/src/reaper.c vte-0.12.2/src/reaper.c
+--- vte-0.12.2.orig/src/reaper.c       2006-06-07 15:47:11.000000000 +0000
++++ vte-0.12.2/src/reaper.c    2006-06-07 15:52:35.000000000 +0000
+@@ -34,7 +34,13 @@
+ #ifdef HAVE_LOCALE_H
+ #include <locale.h>
+ #endif
++
++#ifdef ENABLE_NLS
+ #include <glib/gi18n-lib.h>
++#else
++#define _(String) String
++#define bindtextdomain(package,dir)
++#endif
+ 
+ static VteReaper *singleton_reaper = NULL;
+ struct reaper_info {
+diff -Naurp vte-0.12.2.orig/src/vte.c vte-0.12.2/src/vte.c
+--- vte-0.12.2.orig/src/vte.c  2006-06-07 15:47:11.000000000 +0000
++++ vte-0.12.2/src/vte.c       2006-06-07 15:52:35.000000000 +0000
+@@ -47,7 +47,13 @@
+ #ifdef HAVE_LOCALE_H
+ #include <locale.h>
+ #endif
++
++#ifdef ENABLE_NLS
+ #include <glib/gi18n-lib.h>
++#else
++#define _(String) String
++#define bindtextdomain(package,dir)
++#endif
+ 
+ #ifndef HAVE_WINT_T
+ typedef gunichar wint_t;
+@@ -9557,7 +9563,7 @@ vte_terminal_class_init(VteTerminalClass
+ #endif
+ 
+       bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+-#ifdef HAVE_DECL_BIND_TEXTDOMAIN_CODESET
++#if HAVE_DECL_BIND_TEXTDOMAIN_CODESET
+       bind_textdomain_codeset(PACKAGE, "UTF-8");
+ #endif
+ 
+diff -Naurp vte-0.12.2.orig/src/vteaccess.c vte-0.12.2/src/vteaccess.c
+--- vte-0.12.2.orig/src/vteaccess.c    2006-03-15 11:02:59.000000000 +0000
++++ vte-0.12.2/src/vteaccess.c 2006-06-07 15:55:28.000000000 +0000
+@@ -34,7 +34,13 @@
+ #ifdef HAVE_LOCALE_H
+ #include <locale.h>
+ #endif
++
++#ifdef ENABLE_NLS
+ #include <glib/gi18n-lib.h>
++#else
++#define _(String) String
++#define bindtextdomain(package,dir)
++#endif
+ 
+ #define VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA "VteTerminalAccessiblePrivateData"
+ 
+diff -Naurp vte-0.12.2.orig/src/vteapp.c vte-0.12.2/src/vteapp.c
+--- vte-0.12.2.orig/src/vteapp.c       2006-03-15 11:02:59.000000000 +0000
++++ vte-0.12.2/src/vteapp.c    2006-06-07 15:54:19.000000000 +0000
+@@ -34,7 +34,12 @@
+ #include "debug.h"
+ #include "vte.h"
+ 
++#ifdef ENABLE_NLS
+ #include <glib/gi18n-lib.h>
++#else
++#define _(String) String
++#define bindtextdomain(package,dir)
++#endif
+ 
+ #define DINGUS1 "(((news|telnet|nttp|file|http|ftp|https)://)|(www|ftp)[-A-Za-z0-9]*\\.)[-A-Za-z0-9\\.]+(:[0-9]*)?"
+ #define DINGUS2 "(((news|telnet|nttp|file|http|ftp|https)://)|(www|ftp)[-A-Za-z0-9]*\\.)[-A-Za-z0-9\\.]+(:[0-9]*)?/[-A-Za-z0-9_\\$\\.\\+\\!\\*\\(\\),;:@&=\\?/~\\#\\%]*[^]'\\.}>\\) ,\\\"]"
+diff -Naurp vte-0.12.2.orig/src/vtebg.c vte-0.12.2/src/vtebg.c
+--- vte-0.12.2.orig/src/vtebg.c        2006-06-07 15:47:11.000000000 +0000
++++ vte-0.12.2/src/vtebg.c     2006-06-07 15:52:35.000000000 +0000
+@@ -25,7 +25,12 @@
+ #include "marshal.h"
+ #include "vtebg.h"
+ 
++#ifdef ENABLE_NLS
+ #include <glib/gi18n-lib.h>
++#else
++#define _(String) String
++#define bindtextdomain(package,dir)
++#endif
+ 
+ struct VteBgPrivate {
+       GList *cache;
+diff -Naurp vte-0.12.2.orig/src/vtexft.c vte-0.12.2/src/vtexft.c
+--- vte-0.12.2.orig/src/vtexft.c       2006-03-15 11:02:59.000000000 +0000
++++ vte-0.12.2/src/vtexft.c    2006-06-07 15:54:58.000000000 +0000
+@@ -37,7 +37,12 @@
+ #include "vtexft.h"
+ #include "vtetree.h"
+ 
++#ifdef ENABLE_NLS
+ #include <glib/gi18n-lib.h>
++#else
++#define _(String) String
++#define bindtextdomain(package,dir)
++#endif
+ 
+ #define FONT_INDEX_FUDGE 10
+ #define CHAR_WIDTH_FUDGE 10

diff --git a/x11-libs/vte/vte-0.12.2.ebuild b/x11-libs/vte/vte-0.12.2.ebuild
index 5e34b3069fe25c715839e65943476e1595ce24fd..fb074775a38c844c250b9ca4065b4e73981def25 100644 (file)
--- a/x11-libs/vte/vte-0.12.2.ebuild
+++ b/x11-libs/vte/vte-0.12.2.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/x11-libs/vte/vte-0.12.2.ebuild,v 1.1 2006/06/06 06:05:21 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.12.2.ebuild,v 1.2 2006/06/08 06:00:44 leonardop Exp $
 
 inherit eutils autotools gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc python opengl"
+IUSE="debug doc opengl python"
 
 RDEPEND=">=dev-libs/glib-2.6
        >=x11-libs/gtk+-2.6
@@ -27,23 +27,21 @@ RDEPEND=">=dev-libs/glib-2.6
        || ( x11-libs/libX11 virtual/x11 )
        virtual/xft"
 
+# No need to specify gettext. See bug #134436.
 DEPEND="${RDEPEND}
        doc? ( >=dev-util/gtk-doc-1.0 )
        >=dev-util/pkgconfig-0.9
-       >=dev-util/intltool-0.31
-       sys-devel/gettext"
+       >=dev-util/intltool-0.31"
 
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
 
 
 pkg_setup() {
-
        G2CONF="$(use_enable debug debugging) \
                $(use_enable python) \
                $(use_with opengl glX) \
                --with-xft2
                --with-pangox"
-
 }
 
 src_unpack() {
@@ -54,6 +52,9 @@ src_unpack() {
        # #91617.
        epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
 
+       # Allow compilation on systems without gettext (bug #134436).
+       epatch "${FILESDIR}"/${PN}-0.12-nonls.patch
+
        cd "${S}/gnome-pty-helper"
        eautoreconf || die "eautoreconf failed"
 }