added patch for --disable-nls, iconv not in libc, and missing strndup

Package-Manager: portage-2.2.01.18761-prefix/cvs/Linux i686

4 files changed, 95 insertions, 14 deletions

diff --git a/x11-misc/xdg-user-dirs/ChangeLog b/x11-misc/xdg-user-dirs/ChangeLog
index df8be234331d..ac24bf99bac9 100644
--- a/x11-misc/xdg-user-dirs/ChangeLog
+++ b/x11-misc/xdg-user-dirs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xdg-user-dirs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/ChangeLog,v 1.16 2011/05/20 05:43:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/ChangeLog,v 1.17 2011/06/14 12:40:01 mduft Exp $
+
+  14 Jun 2011; Markus Duft <mduft@gentoo.org> xdg-user-dirs-0.14.ebuild,
+  +files/xdg-user-dirs-0.14-strndup-nls.patch:
+  added patch for --disable-nls, iconv not in libc, and missing strndup
 
 *xdg-user-dirs-0.14 (20 May 2011)
 
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 9013780a73ea..e9d8585319e1 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX xdg-user-dirs-0.14-strndup-nls.patch 2139 RMD160 34c4aa391fd0fd7e1c6b4773fc14ebb95ce6cc96 SHA1 647e43ef2adfa8ffcce2841794fa8c945ad354cd SHA256 3ae19da9634fbd220e528ec42fc21fa3e51527ea25d5565735a7dec3f20ee151
 DIST xdg-user-dirs-0.13.tar.gz 233338 RMD160 105d70d6e56a1b3ea42ec1faf56273931b378f95 SHA1 52c25d7d27cec055004013fe5bd926c547f6a2d4 SHA256 6986e636634c8cf7335f5b340deaca7e32c33b1ee6a308754c3f40790a333b22
 DIST xdg-user-dirs-0.14.tar.gz 228994 RMD160 2e12b629b4a9365efb0b23eb5b9a2c39c6e20c5f SHA1 c59ef6280739772facaefbd29604bbfa1494ee5a SHA256 5f4e84f57c113f642ffdd646126855f45f1da955103119dbd2382edb516e6255
 EBUILD xdg-user-dirs-0.13.ebuild 832 RMD160 ab6efc002d68eb6029892ea315f8d1757dab5e53 SHA1 08a5f1b21a1cd00c8014a0cd4ca79f2a6b9714ab SHA256 ff1e82df8cd55992becf8cec0b5e74040edc7d4bb9e6591ac8f774961fdd7f8b
-EBUILD xdg-user-dirs-0.14.ebuild 731 RMD160 d4fea34c2e22427c93334038c1193210148e0b7e SHA1 801973306e5d8df07fa4f488dada936d83db4b10 SHA256 c08fb4fe981b6fb08dad01fc0009927d298c212956548bc374cfab7b3f78ee35
-MISC ChangeLog 2200 RMD160 d54bedbb57bc18c583cdbcec3a7a172e23f64028 SHA1 9eec2fdc7895bf07ddffcd3c8814423c14ac1d78 SHA256 09d10e2871244c377aa4a6fc11a0cb7c7a1f717fe7dc381ae5c3cb494c226603
+EBUILD xdg-user-dirs-0.14.ebuild 852 RMD160 7a0908b8fbbfe8b88f10d88210bec030c745c316 SHA1 93488f7e618a1aadbda54f99df8ffe066a0b2ef8 SHA256 6d55a83b713ebef44d3d95a7b7d943ab0f28fbe157f8768801e32869e0ec9a18
+MISC ChangeLog 2389 RMD160 c035f9446007826f4ac3cf9b531ddcf4eee69552 SHA1 b50fee0a64c37931ddc277e80953807569f2cf1e SHA256 5925ceaba68b4deace434b0abbf3094d21b5b269e3fed088bd0025f2c8ccbaec
 MISC metadata.xml 244 RMD160 244bfcdb5c3c5eab051189d8adf5e572866b8c64 SHA1 580ce8a447f3237ea98b1d289b440bc89245e89b SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk3V/zcACgkQXkR9YqOcLPHadgEAhe1i0dHxH+NxM3ibhHKDGZvP
-S/KTaMje1MF2uToYlnEA/j0+c9GwYA3H5n376b2B3qD32+X+FX9sGUZ3C2UicsrT
-=XpQL
------END PGP SIGNATURE-----
diff --git a/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.14-strndup-nls.patch b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.14-strndup-nls.patch
new file mode 100644
index 000000000000..190d304309a8
--- /dev/null
+++ b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.14-strndup-nls.patch
@@ -0,0 +1,79 @@
+reported upstream: https://bugs.freedesktop.org/show_bug.cgi?id=38279
+
+diff -ru xdg-user-dirs-0.14.orig/Makefile.am xdg-user-dirs-0.14/Makefile.am
+--- xdg-user-dirs-0.14.orig/Makefile.am	2011-06-14 09:37:35 +0200
++++ xdg-user-dirs-0.14/Makefile.am	2011-06-14 09:36:42 +0200
+@@ -16,7 +16,7 @@
+ xdgdir=$(sysconfdir)/xdg
+ xdg_DATA=user-dirs.conf user-dirs.defaults
+ 
+-libraries = $(LIBINTL)
++libraries = $(LIBINTL) $(LIBICONV)
+ 
+ bin_PROGRAMS =					\
+ 	xdg-user-dirs-update			\
+diff -ru xdg-user-dirs-0.14.orig/configure.ac xdg-user-dirs-0.14/configure.ac
+--- xdg-user-dirs-0.14.orig/configure.ac	2011-06-14 09:37:35 +0200
++++ xdg-user-dirs-0.14/configure.ac	2011-06-14 09:36:42 +0200
+@@ -64,6 +64,8 @@
+ else
+ 	AC_MSG_RESULT(no)
+ fi
++
++AC_CHECK_FUNCS([strndup])
+ 			       
+ AC_OUTPUT([ po/Makefile.in
+ Makefile
+diff -ru xdg-user-dirs-0.14.orig/xdg-user-dirs-update.c xdg-user-dirs-0.14/xdg-user-dirs-update.c
+--- xdg-user-dirs-0.14.orig/xdg-user-dirs-update.c	2011-06-14 09:37:35 +0200
++++ xdg-user-dirs-0.14/xdg-user-dirs-update.c	2011-06-14 09:41:35 +0200
+@@ -4,7 +4,9 @@
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifdef HAVE_GETTEXT
+ #include <libintl.h>
++#endif
+ #include <locale.h>
+ #include <pwd.h>
+ #include <stdio.h>
+@@ -360,7 +362,11 @@
+ 	}
+ 
+       paths = realloc (paths, sizeof (char *) * (numfiles + 2));
++#ifdef HAVE_STRNDUP
+       paths[numfiles++] = strndup (path, len);
++#else
++      paths[numfiles++] = strdup (path);
++#endif
+       paths[numfiles] = NULL;
+     }
+ 
+@@ -848,7 +854,11 @@
+       element_end = path;
+ 
+       element_copy = strdup_end (element, element_end);
++#ifdef HAVE_GETTEXT
+       translated = gettext (element_copy);
++#else
++      translated = element_copy;
++#endif
+ 
+       res = realloc (res, strlen (res) + 1 + strlen (translated) + 1);
+       if (has_slash)
+@@ -1000,6 +1010,7 @@
+   char *set_value = NULL;
+   char *locale_dir = NULL;
+   
++#ifdef HAVE_GETTEXT
+   setlocale (LC_ALL, "");
+   
+   if (is_directory (LOCALEDIR))
+@@ -1038,6 +1049,7 @@
+ 
+   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+   textdomain (GETTEXT_PACKAGE);
++#endif
+ 
+   force = 0;
+   for (i = 1; i < argc; i++)
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild
index 942a5b1f1293..51c36d583b9b 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild,v 1.1 2011/05/20 05:43:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild,v 1.2 2011/06/14 12:40:01 mduft Exp $
 
 EAPI=4
 
+inherit eutils autotools
+
 DESCRIPTION="A tool to help manage 'well known' user directories"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 SRC_URI="http://user-dirs.freedesktop.org/releases/${P}.tar.gz"
@@ -18,6 +20,11 @@ DEPEND="nls? ( sys-devel/gettext )"
 
 DOCS=( AUTHORS ChangeLog NEWS )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-strndup-nls.patch
+	eautoreconf # for the above patch
+}
+
 src_configure() {
 	econf $(use_enable nls)
 }