5 files changed, 13 insertions, 76 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 3af3b146125b..e47738637183 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/autorandr/Manifest b/x11-misc/autorandr/Manifest
index 5dfa2ff70ee9..a940e5b441cc 100644
--- a/x11-misc/autorandr/Manifest
+++ b/x11-misc/autorandr/Manifest
@@ -1,6 +1,5 @@
 AUX autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch 1682 BLAKE2B 6c168ffc8e0b217999e4780a9776c6ca7d1fd16868a00ec8301ab8b94412033a38cec28929bb21d7a39fe18544244a947891715a32fe1e80d927b3550dec8513 SHA512 8d3b1164e962bd6b6d741e22f1328b98037b6f2ea878ffe26da07f22947476ca35c5fa066462b913fda7319b8671055c3f28354261daf6e5c3301d7a85f5dc88
 DIST autorandr-1.12.1.tar.gz 45550 BLAKE2B 5b434325d13c00c3fa70b5d09edb540cdcf3bb921307c60f2c616231e7a87ea85f60e39500ed8116f28619139f71ecc4a8fa153ffadc6b8d74df570736a0d815 SHA512 a7e095eb96e7e0d3a5b3b2122d68a3d3a5121d8be7a86ddd9f837ad42b7a53ed5ee45151f23861c5b900e214a4dfc0c575f45fe70c8c5587562a4035458137a0
-EBUILD autorandr-1.12.1-r2.ebuild 1573 BLAKE2B c9d276c3e4ea2c9f925b2352cd3bacb418c12e9e79052e6d0301ac9c96f87f046df51ab8fcc77747efe5edfc5ef5f6a872602512332d37c1c6365738aec4675d SHA512 adf086f5c178231b6510994efe615f919ed9ccaee462f39e55a1fba265f09fc7569204aef37308ad06610a3e56305a860886c1e163c714c3507568a9be8b8cc2
-EBUILD autorandr-1.12.1.ebuild 1316 BLAKE2B 5c13c316e1a1878f7507178c15dea312af45867841bc70baa26f0ea5aab8f9e98a99e9953a85aacff68a075abacf914c9e8009726cc4890a733086ada9c2a74f SHA512 5b6f8d86a28c19763d690abfc65787e3a1b7fac32be2a5689e29fd2ef92928865771e12163f242e25be9297eaaba238d7fa6d13420ca645933a9ed0eb7905a83
+EBUILD autorandr-1.12.1-r2.ebuild 1571 BLAKE2B f52bf6b5a96a976206235c813cf4a25def2ee84aebecd544acceca5b9bfe685c7293d7699a3c8465f9e49c2d23739156f976291254e96a856b5adfae4d6294c6 SHA512 63b4d3e5b169a47f3d7e39b68f92bc0c94f4d6c3e1b2a4f0891cd3295bdca3199158cf346ee109e012dbf329215c238a0541d3e28b166854245ee2fc65eaa879
 EBUILD autorandr-9999.ebuild 1421 BLAKE2B 96fe4556497c046d77161a1895316420af00a70c6c8d26a0ad09158e957255a6077824c4a7a7aa9950f0a4c83c72ff3395f090fd1e9f16ae32a7e163908ba2cf SHA512 748a1bb5d38443225bad47aeb4d53b5673ecc047455123fec38ef1771af69e1d74247699360853fb9d24c2a1384b2c4b52ddc08aee6c415e0b13cf3d65c6d693
-MISC metadata.xml 355 BLAKE2B 51f7f0670462cbded6b65379488447fca9862fd75ecc262e3a627c268d184abae82feb8a3835486d2c39d18ad0882db6f1f6c9ff9df4fac19457b4ec3a1f6621 SHA512 a9e16f58beeda5d64b48240ef23dfe4349d8c962e08df19cd3fa60846891719fceba2f69b3affba64b8d6f8c2ec96b1dc544a4ada52efd53e6d15b1aa1734677
+MISC metadata.xml 450 BLAKE2B bb36360893882faa3306ce69953a4c699e613dd5608bd379c3a179cd68d79ce42171c01611fb08269b9521eca61c67825ea1d52711a0ac67fa99f919350b54bd SHA512 d676779669537dff4c0964d48996b3cdcbc1b6d7f3f00412b48614f42b86b6acdea05b646d3d9d048db6b19e0733bbc1281ed8dbea7d4ea36f19f14c5a055d29
diff --git a/x11-misc/autorandr/autorandr-1.12.1-r2.ebuild b/x11-misc/autorandr/autorandr-1.12.1-r2.ebuild
index 77f954a8aaa0..b85eaa90ea0c 100644
--- a/x11-misc/autorandr/autorandr-1.12.1-r2.ebuild
+++ b/x11-misc/autorandr/autorandr-1.12.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/phillipberndt/${PN}.git"
 else
 	SRC_URI="https://github.com/phillipberndt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Automatically select a display configuration based on connected devices"
diff --git a/x11-misc/autorandr/autorandr-1.12.1.ebuild b/x11-misc/autorandr/autorandr-1.12.1.ebuild
deleted file mode 100644
index 2235547cc76e..000000000000
--- a/x11-misc/autorandr/autorandr-1.12.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit bash-completion-r1 distutils-r1 systemd udev
-
-if [[ "${PV}" = "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/phillipberndt/${PN}.git"
-else
-	SRC_URI="https://github.com/phillipberndt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Automatically select a display configuration based on connected devices"
-HOMEPAGE="https://github.com/phillipberndt/autorandr"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="launcher udev"
-
-RDEPEND="
-	x11-apps/xrandr
-	launcher? ( x11-libs/libxcb )
-	udev? ( virtual/udev )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use launcher; then
-		emake contrib/autorandr_launcher/autorandr-launcher
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman autorandr.1
-
-	local targets=(
-		autostart_config
-		bash_completion
-		systemd
-		$(usev launcher)
-		$(usev udev)
-	)
-
-	emake DESTDIR="${D}" \
-		  BASH_COMPLETIONS_DIR="$(get_bashcompdir)" \
-		  SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" \
-		  UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		  $(printf "install_%s " "${targets[@]}")
-}
-
-pkg_postinst() {
-	if use udev; then
-		udev_reload
-	fi
-}
diff --git a/x11-misc/autorandr/metadata.xml b/x11-misc/autorandr/metadata.xml
index fa31b93bb669..e3c132257120 100644
--- a/x11-misc/autorandr/metadata.xml
+++ b/x11-misc/autorandr/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>flow@gentoo.org</email>
-	<name>Florian Schmaus</name>
-</maintainer>
-<use>
-	<flag name="launcher">Install the launcher, i.e., an alternative to the udev/systemd hooks</flag>
-</use>
+	<maintainer type="person">
+		<email>flow@gentoo.org</email>
+		<name>Florian Schmaus</name>
+	</maintainer>
+	<use>
+		<flag name="launcher">Install the launcher, i.e., an alternative to the udev/systemd hooks</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">phillipberndt/autorandr</remote-id>
+	</upstream>
 </pkgmetadata>