10 files changed, 18 insertions, 188 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c8635a65573f..cc3ec96135ba 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index d6b4bc318975..08ec8e8fb716 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5
 DIST xdg-user-dirs-gtk-0.11.tar.xz 126488 BLAKE2B 45b8c3ab0b43214a1c1b39d368a283fb566bee115549468eb85e1e9e5407025690dbe320698df107523a3ea0d7cd8d0d3ef8d2296c80c79a74863d50eb581581 SHA512 2a650c6372126f807ac90fb0508e1b11636b38b5960a3037b547e9f1bb1a6b82653f20da7d5aae1144eebec040e3af89a02fbf70c1768724019b384f6d9cf85a
-EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1419 BLAKE2B 631002f8419c360e2cedbe7c74a3ee4ed0531fa6a2b3752b0125b4261292fa2996b9c5b3b8c41403e3999173803da8938ac8f326a6a4f32209941b0de6cf1bfd SHA512 f70a410d149e5f941325fdf94fcc9d5f8d46995bf8fd02259efd7a45e6c1e567370aab7ebdd35ee2b67f2e0506296c6655b76a5bc512868b59df69944c002f1c
 EBUILD xdg-user-dirs-gtk-0.11.ebuild 1421 BLAKE2B 81ed78dbcae192787813f07252cce256b660bfdde47c0759817def0bc5ab3441f4c2dc55762cd7625b3631dde36c3e295dbf191dd98766dff1cccc5635a8cf59 SHA512 684eadf7cbe786f4510409cf9571083a1dcf2f417939ed564ce2098309f981e8f32a62107427e8245fcc3802a34cef337d232e2746f264481e2c8ac9745688c8
-MISC metadata.xml 233 BLAKE2B 0287c5840d68d6fa00f870fb7024dee6332bef9f8f8608afa0b5b2bfe15f1fefe5dc8a2de31964f4c7b0fb2787a58a3798884fd75e0314e61cf84079475c9a39 SHA512 534aef7349f0f6243a01e578013481c76b2516382638feec7705502de825d73ea54a3ae890e7171e6238a3bf0ecc5c88c9bc48890f4116a257031bae022c7202
+MISC metadata.xml 323 BLAKE2B 394573fe3d848de05e5a6bad9795f85b45ba86996f2c8ef4d02606aa5c1365ac47fd3e08caf2c62b594ae95c292af88dd84ed0b0145456907d25a4a92d329482 SHA512 fec58920d40c6b10be41b61576d147639fa1570d8c91ad9a55aee05611590ac1268d60e97a5004b22a47c0848258bd388ff916c2d5c068f5b76c1689dbd41c40
diff --git a/x11-misc/xdg-user-dirs-gtk/metadata.xml b/x11-misc/xdg-user-dirs-gtk/metadata.xml
index d0b58801b31a..2fde1d689131 100644
--- a/x11-misc/xdg-user-dirs-gtk/metadata.xml
+++ b/x11-misc/xdg-user-dirs-gtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>freedesktop-bugs@gentoo.org</email>
-  </maintainer>
+	<maintainer type="project">
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="gnome-gitlab">GNOME/xdg-user-dirs-gtk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
deleted file mode 100644
index a51c28446720..000000000000
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	dev-libs/glib
-	>=x11-libs/gtk+-3.5.1:3
-	>=x11-misc/xdg-user-dirs-0.14
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="
-	This package tries to automatically use some sensible default
-	directories for your documents, music, video and other stuff.
-	If you want to change those directories to your needs, see
-	the settings in ~/.config/user-dirs.dirs
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/Encoding/d' \
-		-e 's:OnlyShowIn=GNOME;LXDE;Unity;:NotShowIn=KDE;:' \
-		user-dirs-update-gtk.desktop.in || die
-}
-
-src_configure() {
-	local -a myeconfargs=(
-		# Skip configure.ac disabling the cross-compiling pkg-config.
-		ac_cv_path_PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		# Skip searching for this program in the CBUILD root.
-		XDG_USER_DIRS_UPDATE="${EPREFIX}/usr/bin/xdg-user-dirs-update"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 9a8502901ee4..b177f34f0eb0 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 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 748 BLAKE2B a17e7b80b8d0078589b7c19725ffeb7ddbc4cf6ba10ede8015bbf04bec68ea36456405b0e338fd5eee8160965d8036f768c3770945c2bfe858e92d0837eb0906 SHA512 8525670ab4663a3e41b5ff585ea2f7c63f28d1c6cdc6495de0066efe93af5b61aae1c37d7362089d121e488bcdd973f6703d41733b6c7f213185cd7b24c6afde
-MISC metadata.xml 233 BLAKE2B 0287c5840d68d6fa00f870fb7024dee6332bef9f8f8608afa0b5b2bfe15f1fefe5dc8a2de31964f4c7b0fb2787a58a3798884fd75e0314e61cf84079475c9a39 SHA512 534aef7349f0f6243a01e578013481c76b2516382638feec7705502de825d73ea54a3ae890e7171e6238a3bf0ecc5c88c9bc48890f4116a257031bae022c7202
+MISC metadata.xml 323 BLAKE2B 8dc1eb4aa1970fc64d5ed22fc2e041a9c47d21b4cc12570ab2238ab0ea2349dc44925ad91be31720c7b35d9802c10e1f62d23eedc59ad9aa91c97537d2715da8 SHA512 89a366c15cd04b26e30494a05ae4ac5dba23da803c607ebea2cc1bc782e80f727c15f285a01f3e22862aa7d4ac131a39686153234d8d356438eeabaace1230f8
diff --git a/x11-misc/xdg-user-dirs/metadata.xml b/x11-misc/xdg-user-dirs/metadata.xml
index d0b58801b31a..53a236d2d5ca 100644
--- a/x11-misc/xdg-user-dirs/metadata.xml
+++ b/x11-misc/xdg-user-dirs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>freedesktop-bugs@gentoo.org</email>
-  </maintainer>
+	<maintainer type="project">
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">xdg/xdg-user-dirs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
deleted file mode 100644
index 4496577b85ac..000000000000
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-RDEPEND=""
-# libxslt is mandatory because 0.15 tarball is broken, re:
-# https://bugs.freedesktop.org/show_bug.cgi?id=66251
-BDEPEND="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 )
-PATCHES=( "${FILESDIR}"/${PN}-0.15-libiconv.patch )
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467032
-	eautoreconf # for the above patch
-}
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 729e6f70cc75..d594d3996439 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -2,5 +2,4 @@ AUX xdg-utils-egrep.patch 760 BLAKE2B 641a75615aa54000acee26ad65e802245c12db388f
 DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51
 DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71
 EBUILD xdg-utils-1.1.3_p20210805-r1.ebuild 2411 BLAKE2B d865d9ef3b77bca4f346ac0bfd7e331160dff65fee28a20f4316c27063be4e108b36d0d889f9539a3ae387ab34c006ec3688f6ad55119535cf9a10743addf78d SHA512 31e1afb2b8a199a38a56a5ffe3252146e0be6c539f86292578a58abcbb568183ac4b1ada97cf1128e6d039fe324cbd2a040b5793fbb80fec28c674caa41effba
-EBUILD xdg-utils-1.1.3_p20210805.ebuild 2310 BLAKE2B f56c24d95bb66e5ee34b2d201a83472bd1ab0f81586e2017afe1e2f72620404b31250038924d6b7266e473a8f85cd66b4529c9cc3a57e3e8010c21b2b10ea99c SHA512 6208c19056110e361a0dbefea246a8caaf38ed502b41558b5dc30787d7035660342039291e14c3e9f93a229623eb15771ac5a6b51cf7423034148a66f9c2819b
-MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
+MISC metadata.xml 319 BLAKE2B 4910953400fa3f3b0b72b8baba239a1e0c3466c38f84b6a60bc816620b789473179c151b1af68d0629ba7f79a1ea826b536f0f29678007bba025714ceb514061 SHA512 c07b03f20aeedd0ceaf7de137b76578142c703317d98ac7a57ae5143cab7523974a50aafa58e92c541d4a84ec0961b7de180d11d95c7da45f5698e3c19e7182d
diff --git a/x11-misc/xdg-utils/metadata.xml b/x11-misc/xdg-utils/metadata.xml
index d4390c2eb58e..e44a98a0f124 100644
--- a/x11-misc/xdg-utils/metadata.xml
+++ b/x11-misc/xdg-utils/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">xdg/xdg-utils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
deleted file mode 100644
index 930cb3204f98..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_COMMIT="1a58bc28f6844898532daf9ee1bf6da7764955a9"
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
-# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/24
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.1.3_p20200220-no-which.patch.xz"
-S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc gnome"
-REQUIRED_USE="gnome? ( dbus )"
-
-RDEPEND="
-	dev-util/desktop-file-utils
-	dev-perl/File-MimeInfo
-	dbus? (
-		sys-apps/dbus
-		gnome? (
-			dev-perl/Net-DBus
-			dev-perl/X11-Protocol
-		)
-	)
-	x11-misc/shared-mime-info
-	x11-apps/xprop
-	x11-apps/xset
-"
-BDEPEND="
-	>=app-text/xmlto-0.0.28-r3[text(+)]
-	app-alternatives/awk
-"
-
-DOCS=( ChangeLog README RELEASE_NOTES TODO )
-
-# Tests run random system programs, including interactive programs
-# that block forever
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-1.1.3_p20200220-no-which.patch
-)
-
-src_prepare() {
-	default
-
-	# If you choose to do git snapshot instead of patchset, you need to remember
-	# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
-	# all the files
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
-	default
-	emake -C scripts scripts-clean
-}
-
-src_install() {
-	default
-
-	newdoc scripts/xsl/README README.xsl
-	use doc && dodoc -r scripts/html
-
-	# Install default XDG_DATA_DIRS, bug #264647
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
-	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
-	doenvd 30xdg-data-local
-
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
-	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
-	doenvd 90xdg-data-base
-}
-
-pkg_postinst() {
-	[[ -x $(type -P gtk-update-icon-cache) ]] \
-		|| elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
-}