old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 6 insertions, 114 deletions

diff --git a/x11-misc/xdg-user-dirs/ChangeLog b/x11-misc/xdg-user-dirs/ChangeLog
index 2cb46d032c6a..2f17feb5258c 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/ChangeLog,v 1.39 2013/12/29 08:19:12 hattya Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/ChangeLog,v 1.40 2014/03/15 19:28:20 ssuominen Exp $
+
+  15 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xdg-user-dirs-0.14-strndup-nls.patch, -xdg-user-dirs-0.14.ebuild:
+  old
 
   29 Dec 2013; Akinori Hattori <hattya@gentoo.org> xdg-user-dirs-0.15.ebuild:
   ia64 stable wrt bug #485578
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
deleted file mode 100644
index 190d304309a8..000000000000
--- a/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.14-strndup-nls.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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
deleted file mode 100644
index 9329fa99fc44..000000000000
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 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.13 2013/04/26 10:12:45 ssuominen Exp $
-
-EAPI=5
-inherit autotools eutils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="gtk nls"
-
-RDEPEND=""
-DEPEND="nls? ( sys-devel/gettext )"
-PDEPEND="gtk? (
-	nls? ( x11-misc/xdg-user-dirs-gtk )
-	)"
-
-DOCS=( AUTHORS ChangeLog NEWS )
-
-src_prepare() {
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467032
-	epatch "${FILESDIR}"/${P}-strndup-nls.patch
-	eautoreconf # for the above patch
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}