gentoo auto-resync : 17:08:2022 - 02:31:41

3 files changed, 59 insertions, 6 deletions

diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index d79042dcb0b9..4b07132d923f 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,4 +1,6 @@
-AUX xdg-user-dirs-0.15-libiconv.patch 298 BLAKE2B 5028bfcafccc0310c192894cbeee12627b5b599cc5b612b6a38dcec45e36b9aa1f4ab2cdc31f29899b278088e61776bff51b5216adbf6c2497370c7966b17a50 SHA512 227b134d0782067f8c8688832036da8cb1afbcda247349db3502867e3f1b1eaa09885f2419762712ab9ce82655d4bb9a7ec17f63afdb9f00be5efcfd895ca7d4
+AUX xdg-user-dirs-0.15-libiconv.patch 1120 BLAKE2B f0f5829c31eded3f3f860e005ead5302daf8f11f3a68a440a80dd136ac0da497b9321b009860838c5150968d8e4c601932e41295465ccf6b93ab9bbd27de9a8c SHA512 dbca90f745d71f7abf0c281a567e2831b6e1b028e8cf2613523724c00c683874a91b1cbac3a45ed074e404fcee805d6ba2518735a0b34929dcc7a1b869a4c37f
 DIST xdg-user-dirs-0.17.tar.gz 257291 BLAKE2B 75b44a841b7961977824581dbbc760282fa3a5eed0a5496746ff6e09cabe4dec022d0f6fb129a877d8310c1fb214035f1e917c0e327dd5267bb83c47bbe00d5f SHA512 a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
+DIST xdg-user-dirs-0.18.tar.gz 273556 BLAKE2B e9d05a2399040229eaed4947098bb587a3962860a0c162fd5bd939451df592130faa2fc5201440787a6a481e966f7769912b46ca1028e57a834fc7ddd950f904 SHA512 f523b2ba4f840a3c2a5730f72182fb5bb798187db769bfb7d36e9f780442813278a2c1bad656b4fb38428131241a51d07200a62b4d7b935d49a74be53f969716
 EBUILD xdg-user-dirs-0.17.ebuild 966 BLAKE2B 4c2a2064a9ec902948dca2eddc6aef1b5031c00e3d1dbe4435b8506843835f5ffe8410514e6ce0baac618d4e3dac548cef436fad2da1915af9468b3fe1d04781 SHA512 4d116bc4e801c09894a0590a2edf03219f9826c9927a2a23a7db074f48973e574a769ede4e69cb54001d534a70f8e1dd2d73a165109086b5e0dbe27216f6c077
+EBUILD xdg-user-dirs-0.18.ebuild 756 BLAKE2B eb3b57cf0963e653768d435fbd38e6043c3e89477d02f528feae4ce59229d956f645caacc9d1aac3b1b91fcf6931bd8a97b01aa32e7e5e6ae2f8003ac5ab38f2 SHA512 6583f8a8f499b6fbfebaa695effd4e3296fe92c246f413987274b0fca48514910b5ee5ff998e6271120c2c9274f7d7af756bed2259c7103c331b3d92ca1c7e3f
 MISC metadata.xml 233 BLAKE2B 0287c5840d68d6fa00f870fb7024dee6332bef9f8f8608afa0b5b2bfe15f1fefe5dc8a2de31964f4c7b0fb2787a58a3798884fd75e0314e61cf84079475c9a39 SHA512 534aef7349f0f6243a01e578013481c76b2516382638feec7705502de825d73ea54a3ae890e7171e6238a3bf0ecc5c88c9bc48890f4116a257031bae022c7202
diff --git a/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
index bf5910882c3b..7fa9e48b3230 100644
--- a/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
+++ b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
@@ -1,11 +1,32 @@
-http://bugs.gentoo.org/366885
-http://bugs.gentoo.org/499940
+https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/merge_requests/9
 
+From f310c0534c1394410e98e610cf5cd34d1f4c07e4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 16 Aug 2022 23:14:39 +0100
+Subject: [PATCH] Makefile.am: link with libiconv when needed
+
+Fixes issues on systems with libiconv separate from libc
+(e.g. Darwin/macOS, uclibc).
+
+We already ask configure to do detection for us
+of whether we need an explicit library link line
+for libintl and libiconv, so let's use the result.
+
+This will have no effect if the variable is empty
+of course, as will be the case on many systems
+(everywhere it worked before).
+
+We've been carrying this patch in Gentoo for quite some time
+with no issues.
+
+Bug: https://bugs.gentoo.org/366885
+Bug: https://bugs.gentoo.org/499940
+Signed-off-by: Sam James <sam@gentoo.org>
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -16,7 +16,7 @@
- xdgdir=$(sysconfdir)/xdg
- xdg_DATA=user-dirs.conf user-dirs.defaults
+@@ -22,7 +22,7 @@ xdg_DATA=user-dirs.conf user-dirs.defaults
+ xdgautostartdir=$(xdgdir)/autostart
+ xdgautostart_DATA = xdg-user-dirs.desktop
  
 -libraries = $(LIBINTL)
 +libraries = $(LIBINTL) $(LIBICONV)
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild
new file mode 100644
index 000000000000..e7768e1b855a
--- /dev/null
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="gtk"
+
+BDEPEND="app-text/docbook-xml-dtd:4.3
+	sys-devel/gettext"
+PDEPEND="gtk? ( x11-misc/xdg-user-dirs-gtk )"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+
+PATCHES=( "${FILESDIR}"/${PN}-0.15-libiconv.patch )
+
+src_prepare() {
+	default
+
+	# For libiconv patch
+	eautoreconf
+}