gentoo resync : 18.03.2018

3 files changed, 2 insertions, 34 deletions

diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 36715e009e56..7451b56e550b 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,6 +1,4 @@
 AUX xdg-user-dirs-0.15-libiconv.patch 298 BLAKE2B 5028bfcafccc0310c192894cbeee12627b5b599cc5b612b6a38dcec45e36b9aa1f4ab2cdc31f29899b278088e61776bff51b5216adbf6c2497370c7966b17a50 SHA512 227b134d0782067f8c8688832036da8cb1afbcda247349db3502867e3f1b1eaa09885f2419762712ab9ce82655d4bb9a7ec17f63afdb9f00be5efcfd895ca7d4
-DIST xdg-user-dirs-0.15.tar.gz 243747 BLAKE2B 79ecef7689f5445b43d8f46fe9ddf735e6b699e74315619864f7049b22102fa25d38bfefdd6918a5680844fe9b7f13fc168032dac53334a166e80bc0bea1efc9 SHA512 2365003d4c116326357755dbeb462d5d7a4fd1391fe0b4ced5597db1017dff230676773aa8cd4bdd9dbb1bfb59c1c71d08ed860a047e0e9c2ab2487c814c7ca9
 DIST xdg-user-dirs-0.16.tar.gz 255933 BLAKE2B 827e1ec8265592cc2abe4861945fc0cb32ce777fc951df3a00e4f7e53f53f49e1c57ae242c6d3ff62eacd75ff7965fbb482aa4f8d2b4c2aece3b535e3a83ee47 SHA512 245513d1b16adc970b4a3c0b4a078cdeda62d36b39e4561754d8331e76ee0013a769d8c2e43c94f8b5c378619ee58bca534721a8675ceaeccbb3fdf69cf6f7ae
-EBUILD xdg-user-dirs-0.15.ebuild 946 BLAKE2B 574471c324d42839798a311ad3262beb2ccfdd5936e6c2fc7ee02b79a8a47158468524f77c3671d826a4e16c0684484485aabbcb7f9b7e8785d83546a557eb9a SHA512 371f7d7c2f5b56bf19cfba64a5c4e8b7bba2d36237887475cfdcefb5fb0283a050d03823f1c4afa557c9a36b88df852a758eb48e0d9c05447fc73915b2acbca6
-EBUILD xdg-user-dirs-0.16.ebuild 960 BLAKE2B c7e5f32f53f2d3dfe7c0572f2370883eec9fcf1d138a9d59f865d92cb33999fc6d869c06db379da6f730bfaccbfc2493ececba654d72ac0d172d83562a165cb5 SHA512 7de8f1bc6913dc577e861fe1db33cff0380f83a26f9a37f719f1e70bb1cc683d7495c84daae8c10254860baa88e03fc3ce83ca920bebdd7cbf28e46276827916
+EBUILD xdg-user-dirs-0.16.ebuild 959 BLAKE2B 36080eb6514d9b536481282d200d632e0278b4b7b6e07d565929510229048ad243c8e36a0665eb6a67119a0b649c9ce3ec1a6edb3b2439ca867de63b2b72d4bc SHA512 48190c1c871cc07cb546ff8a3945ef49561bfa3032e214916aada73a68e7d9ab69d5f340c551a3b600b03a5398d9c61c1e53af17c1df18ec9650802e89ec0a55
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild
deleted file mode 100644
index 7ed8fb165ad0..000000000000
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A tool to help manage 'well known' user directories"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
-SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="gtk"
-
-RDEPEND=""
-# libxslt is mandatory because 0.15 tarball is broken, re:
-# https://bugs.freedesktop.org/show_bug.cgi?id=66251
-DEPEND="app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	sys-devel/gettext"
-PDEPEND="gtk? ( 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}-libiconv.patch
-	eautoreconf # for the above patch
-}
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild
index 1453192c1dda..95cd41166a69 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="gtk"
 
 RDEPEND=""