From: Stefan Schweizer <genstef@gentoo.org>
Date: Sat, 7 Apr 2007 15:52:41 +0000 (+0000)
Subject: Fix USE=-nls, bug 171190
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ed74ca18f94b7d14e88fb00131ac0f036a1732b0;p=gentoo.git

Fix USE=-nls, bug 171190
Package-Manager: portage-2.1.2.3
---

diff --git a/media-gfx/gimp-print/ChangeLog b/media-gfx/gimp-print/ChangeLog
index abb79cebd81f..6fe92b113629 100644
--- a/media-gfx/gimp-print/ChangeLog
+++ b/media-gfx/gimp-print/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp-print
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.79 2007/03/14 16:20:09 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.80 2007/04/07 15:52:41 genstef Exp $
+
+  07 Apr 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/gimp-print-5.1.0-nonls.patch, gimp-print-5.1.0.ebuild:
+  Fix USE=-nls, bug 171190
 
 *gimp-print-5.1.0 (14 Mar 2007)
 
diff --git a/media-gfx/gimp-print/Manifest b/media-gfx/gimp-print/Manifest
index 3895755811b4..bc8824c9cd4a 100644
--- a/media-gfx/gimp-print/Manifest
+++ b/media-gfx/gimp-print/Manifest
@@ -2,6 +2,10 @@ AUX gimp-print-4.2.7-asneeded.patch 1632 RMD160 b67ce5afee6b944229a4b33e4630a664
 MD5 a05ec877703c18041a47316cc21318c0 files/gimp-print-4.2.7-asneeded.patch 1632
 RMD160 b67ce5afee6b944229a4b33e4630a66451df4eab files/gimp-print-4.2.7-asneeded.patch 1632
 SHA256 ce30ce227e6a5b605a0b25f695e69c6fb680d30fae3f4f2d9be40ab6b5dfb134 files/gimp-print-4.2.7-asneeded.patch 1632
+AUX gimp-print-5.1.0-nonls.patch 644 RMD160 4247b20cdf92699c614681f75814dc9ee6857f30 SHA1 5a8765b592cd4bff10bbcdaa42401ffe2b6cc81b SHA256 50299f14547b955be738ba4a5b8632a699dfb6d75f1bd030df2a4b2c134f7f87
+MD5 5b5e881cf37bdf1bfbf0437b3c5b13bb files/gimp-print-5.1.0-nonls.patch 644
+RMD160 4247b20cdf92699c614681f75814dc9ee6857f30 files/gimp-print-5.1.0-nonls.patch 644
+SHA256 50299f14547b955be738ba4a5b8632a699dfb6d75f1bd030df2a4b2c134f7f87 files/gimp-print-5.1.0-nonls.patch 644
 DIST gimp-print-4.2.7.tar.gz 5178122 RMD160 b517b1d3cff22347053c634ed96202588d93b63e SHA1 5a928b7fa8e83d2858d15e2bd22d143c2cd35bd8 SHA256 a6cfcbb4bf32d12a553252b98e6a6fdb5d44fe37debad4480bbc9326e2c69489
 DIST gutenprint-5.0.0.tar.bz2 4612717 RMD160 e3f2975cf1a23827b49be5608433d427a94558fb SHA1 ab45fed987b7ab1ec6a19e15d7d14ba9a414b622 SHA256 78a5326341f95a584e4d98b7dad7a56fb763211ecfc07f603af6336fa94d07a3
 DIST gutenprint-5.1.0.tar.bz2 4704727 RMD160 6eb4b3e7f4b4b70e133b2e0043b8a8153801ce48 SHA1 222596fd434f8b2719e49fcb541a3fced9959688 SHA256 7d9298bbc6ba06d3175f7b4b3060cbc406d9f96a4da965850f8f1ca227b9acf6
@@ -13,14 +17,14 @@ EBUILD gimp-print-5.0.0.ebuild 2382 RMD160 5a2f02585be4601e9d1e1e6d80a97099c82a8
 MD5 eecaf00f29b6547464f36d319f2327e2 gimp-print-5.0.0.ebuild 2382
 RMD160 5a2f02585be4601e9d1e1e6d80a97099c82a88a7 gimp-print-5.0.0.ebuild 2382
 SHA256 39f4dc3f3deb8f72455f53a71accb046f4a8a3db4ad70c320650da7abf48b311 gimp-print-5.0.0.ebuild 2382
-EBUILD gimp-print-5.1.0.ebuild 2401 RMD160 57899401c60c3f2677651f39dd71cd5d96bc837b SHA1 7ee3273ee06080ad49436dab97c08f15e6d8d51c SHA256 8b2c58e432f4c37bda9ee817676804466b266feb8a446b820364ac2e7767a82a
-MD5 7cd0ae3d012b7cd7a80f1c24d8e8e262 gimp-print-5.1.0.ebuild 2401
-RMD160 57899401c60c3f2677651f39dd71cd5d96bc837b gimp-print-5.1.0.ebuild 2401
-SHA256 8b2c58e432f4c37bda9ee817676804466b266feb8a446b820364ac2e7767a82a gimp-print-5.1.0.ebuild 2401
-MISC ChangeLog 11909 RMD160 6807ecbbbc98405ec436a35baa1444fe2329d208 SHA1 75ec6fa4320f90290d6b4c94b674ec1f4506aa00 SHA256 9a8e0c254145f4ec0a0797c8658871f2299d26a2f97837d49bd6df7f1fa6951e
-MD5 05e5fdae0639e3ef22e65a7997288964 ChangeLog 11909
-RMD160 6807ecbbbc98405ec436a35baa1444fe2329d208 ChangeLog 11909
-SHA256 9a8e0c254145f4ec0a0797c8658871f2299d26a2f97837d49bd6df7f1fa6951e ChangeLog 11909
+EBUILD gimp-print-5.1.0.ebuild 2450 RMD160 21fe166e6a6c6dacf643ecffa6bf10bd444394a0 SHA1 8de769c84ab93c9bf25f35fedafcd97410962c96 SHA256 f362e59371dcc767dcd990bdf0b8ae853515f21ae95df592fb09b41b2068e12d
+MD5 e123c122dab7ac21e5f2806a8980d42e gimp-print-5.1.0.ebuild 2450
+RMD160 21fe166e6a6c6dacf643ecffa6bf10bd444394a0 gimp-print-5.1.0.ebuild 2450
+SHA256 f362e59371dcc767dcd990bdf0b8ae853515f21ae95df592fb09b41b2068e12d gimp-print-5.1.0.ebuild 2450
+MISC ChangeLog 12054 RMD160 6bcc2953478f5b451b4bfa9c3077d1b74895f751 SHA1 fdab38f5736d436107331a1f886e01f3ee810178 SHA256 42cb505bab648704f05854451b993f9cc6e6e56a3defc5bc2dc407cd1f202cff
+MD5 1636c6ad08667b6addd7149f9a89bf7b ChangeLog 12054
+RMD160 6bcc2953478f5b451b4bfa9c3077d1b74895f751 ChangeLog 12054
+SHA256 42cb505bab648704f05854451b993f9cc6e6e56a3defc5bc2dc407cd1f202cff ChangeLog 12054
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
diff --git a/media-gfx/gimp-print/files/gimp-print-5.1.0-nonls.patch b/media-gfx/gimp-print/files/gimp-print-5.1.0-nonls.patch
new file mode 100644
index 000000000000..039bca3cc5eb
--- /dev/null
+++ b/media-gfx/gimp-print/files/gimp-print-5.1.0-nonls.patch
@@ -0,0 +1,22 @@
+--- gutenprint-5.1.0/src/cups/genppd.c.orig	2007-04-07 16:58:54.000000000 +0200
++++ gutenprint-5.1.0/src/cups/genppd.c	2007-04-07 17:00:24.000000000 +0200
+@@ -276,7 +276,9 @@
+   const stp_printer_t	*p;		/* Printer driver */
+   const char		*lang = "C";
+   char			*s;
++#ifdef ENABLE_NLS
+   char			**all_langs = getlangs();
++#endif
+   char			filename[1024],		/* Filename */
+ 			ppd_location[1024];	/* Installed location */
+ 
+@@ -474,7 +476,9 @@
+       verbose = 0;
+       break;
+     case 'c':
++#ifdef ENABLE_NLS
+       baselocaledir = optarg;
++#endif
+ #  ifdef DEBUG
+       fprintf(stderr, "DEBUG: baselocaledir: %s\n", baselocaledir);
+ #  endif
diff --git a/media-gfx/gimp-print/gimp-print-5.1.0.ebuild b/media-gfx/gimp-print/gimp-print-5.1.0.ebuild
index eabf03106dc0..c3db22f5bec0 100644
--- a/media-gfx/gimp-print/gimp-print-5.1.0.ebuild
+++ b/media-gfx/gimp-print/gimp-print-5.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.1.0.ebuild,v 1.1 2007/03/14 16:20:09 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.1.0.ebuild,v 1.2 2007/04/07 15:52:41 genstef Exp $
 
 inherit flag-o-matic eutils libtool
 
@@ -40,6 +40,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch ${FILESDIR}/gimp-print-5.1.0-nonls.patch
 
 	elibtoolize
 }