diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2014-03-15 19:28:25 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-03-15 19:28:25 +0000 |
commit | 0bdf97906af0b001bd458cccb157ec79e5b5e3f5 (patch) | |
tree | 7c5c68ef826da32d79c3c0b803a83f32f899872c /x11-misc | |
parent | Perform tests in a separate directory because "make check" removes the byte-c... (diff) | |
download | historical-0bdf97906af0b001bd458cccb157ec79e5b5e3f5.tar.gz historical-0bdf97906af0b001bd458cccb157ec79e5b5e3f5.tar.bz2 historical-0bdf97906af0b001bd458cccb157ec79e5b5e3f5.zip |
old
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/xdg-user-dirs/ChangeLog | 8 | ||||
-rw-r--r-- | x11-misc/xdg-user-dirs/Manifest | 15 | ||||
-rw-r--r-- | x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.14-strndup-nls.patch | 79 | ||||
-rw-r--r-- | x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild | 33 |
4 files changed, 14 insertions, 121 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/Manifest b/x11-misc/xdg-user-dirs/Manifest index 5d5e716a4248..a81709c5ce1f 100644 --- a/x11-misc/xdg-user-dirs/Manifest +++ b/x11-misc/xdg-user-dirs/Manifest @@ -1,17 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX xdg-user-dirs-0.14-strndup-nls.patch 2139 SHA256 3ae19da9634fbd220e528ec42fc21fa3e51527ea25d5565735a7dec3f20ee151 SHA512 c5ff36ff006facb9baf319a6139666dd582f11bd9f47a8aedca02b8fcbb160c7f64e1f510b1db2713cb12bdef3c19388b2258854634563302883504de9ae681b WHIRLPOOL c44578004ac74ba8213df232526a375a74b242e755b02ad0ae5a91b51f1806c2fa338ae168181987199e67fc9a64f03feb6844b34b7a74944f7b3eb4aae8f6cb -DIST xdg-user-dirs-0.14.tar.gz 228994 SHA256 5f4e84f57c113f642ffdd646126855f45f1da955103119dbd2382edb516e6255 SHA512 a3532d237d551145ac8d8e3b28c39471192e1e01f5ae97e26e2cfceedaab07d3f531528020246fb1d62755a14fce6ebb1ed01ad78ab5169558b95a460ec0180d WHIRLPOOL c6069147129f028d900b1437c67b680cd56b75bea3af4845cca3008e9389ebfb7657fa74398134ba3fc41a2a016e6977d9a4f29802d00315937422aec1305504 DIST xdg-user-dirs-0.15.tar.gz 243747 SHA256 20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786 SHA512 2365003d4c116326357755dbeb462d5d7a4fd1391fe0b4ced5597db1017dff230676773aa8cd4bdd9dbb1bfb59c1c71d08ed860a047e0e9c2ab2487c814c7ca9 WHIRLPOOL 12de27ae0c386f4db740ea5104233d6782d65686fb3df74f9c516d47d253e49f41ed25b75f2bcf9667b1f8e6e6fec66030ccdc6cadb1eb6a5f1a90ab9fe12e3b -EBUILD xdg-user-dirs-0.14.ebuild 1003 SHA256 8cfaacf726608c932f5417a9e1201de1dc64bc7197e92f73bf70428e670426cc SHA512 e4ad48f90063f8829a3a3545aeb708149c3fd7d7d738725cf85063507288389d36725e40dc9ea135c19911115cf9c28b014841924f1bb18165b9dafd05a1371c WHIRLPOOL 60819ee4ba09dda38c2ac9e97508ffd0d3c00330bd3f8634b0dce1dc52f9a6c078f58d13920daa602519a2c581731b048870876d9e4479c207d121fd129c070f EBUILD xdg-user-dirs-0.15.ebuild 856 SHA256 487d0ec5f3ed4ef3ea5a1b5355d00d72761522d1372206207324275af05f18a2 SHA512 974a9a7365d0ffa7b533cb6d513676bd522d5f98cef4f60ebe89e5db52c2b1d51545c86560f154f56a89633e59ed5af407afdf5539453743d08710e87ea83219 WHIRLPOOL 66559e676e46d38d7759c7cb0f34ac467924fba69bd4f65f7928ddc9e060d4d8509fc2fd3d924186c71d20e8f201de341c7b8f3ae8173a484255289562247594 -MISC ChangeLog 5132 SHA256 5612c53cc7c3a0b754d0ecb5325196fa0958f12c5e66fad84260363503f838a8 SHA512 35d71f069bcecf66a7a0cb4832d829ec7a298230fa4829cd20b27977a72de5d97448910845a2f1bb68f68f16d350aa24a79babfda3212dc3150675a7d19bc3c1 WHIRLPOOL c7f7dab27e1a55be711d1e4cc61fe42dcc4e601160d56bbe6fd4a19da8579ac09f02092b2f99079cfb3e82446cc4bffecdd41679794ca4c71e1b7d59aa7066a7 +MISC ChangeLog 5271 SHA256 89d2e45061e123badcc252960a27fdbebe4a570d8222f5b143cbcaadc6ca8733 SHA512 5cb809a902e90ce577fe9cd50876b7c042c8b9893e2995b166c73a42b9ab5a0672e92f7f69f7cf815360227cfb13e60a2063f976e758c002adede4d4f6a5ea76 WHIRLPOOL 0ce29233ee354f861ce0bcc4eaa86997811419cc9a006b29a320eaf6eafc7a478da2308cc31f771d405937dab6788ec7f9ec8e9fdba8264a8ad4a03e53340f3a MISC metadata.xml 244 SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c SHA512 9f697206cf152d13b2a3e26645959ab3353a34e4158832139689359aad999114afb8ed80e2f82464674f358434a891d74f2e94079c2c57fc7a125d17e735ff71 WHIRLPOOL 47f92e411c189c765f6665e28402aa0411ebe898b306925cf395ed23085738120fb4075682d6c86f5818de5a3d70cfeca2fda163e3eb83764ba0b4d8dce1fb04 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlK/2xgACgkQL46suuyRem0v/ACeM66D0WyoMtKS/HxQCiUHgkVl -oBUAnjg9baeXjaKJKfQ/KxSWTxYNC+R7 -=6Ped +iQEcBAEBCAAGBQJTJKjlAAoJEEdUh39IaPFNdCoH/2bHDHwAK6AXkr8Yk3y572K9 +pF3Tp9DJUkVrpl9LUwGblD93naJSd4ok494MB7Nw9uJOWojV9mG8xw2U/uRXjEfD +TtXIZf3m9LtK1/gNhupwIB2MtYqgMBE+sXSYO824dNtcIhNqThQXzGqocMDs52Kf +qF5xvT6keKlUX1EEF1Q4eAdm8wx/s0bxwF1sSE60L0RwLQ43LeobcxIaUMJUcaR2 +EdQBiIaO3e3cF6tjkDXx3rwjI7PIywi45qhDIb0/sk39EKmd5judB88nfuVvTR/Y +NfuE7fO9FwA4hGbEN3aH0mXLo3KDmYYtApYTHdaShefxMSFk4FaZV7VI9TTnjP4= +=b9ZL -----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 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) -} |