5 files changed, 71 insertions, 50 deletions
diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest
index f28d131e02b8..3dcd03568895 100644
--- a/x11-misc/arandr/Manifest
+++ b/x11-misc/arandr/Manifest
@@ -1,3 +1,4 @@
+AUX arandr-0.1.10-manpages.patch 1193 BLAKE2B 59816489bc196d73f32e810db5f6b661e38edc5838d925f1866e3ad0786b3db6986623eb617864a39e038829991fee3f7e865dfbc07a868526973ba09d00232f SHA512 926ae7720aec2d4ca35c4ad085e6b8e1b03d3aa87102efd8a122241ed6790a192d30629a576a028d73ac344423019f36f309f42afffb88bdf96adbc2b233e48f
 DIST arandr-0.1.10.tar.gz 100203 BLAKE2B b5754dda4c4f9c5e957a9fc75b7236480417b899c2705bc5aee514899c664d39b5902921c69ac425aff99f3a6ea512bfc0c2c0259519c1a6e0fc553f6e367cc2 SHA512 12c2fe5b36f8d8e688d990e352c1cfa3e8512c0b647b78a8af93f9472704e4867fac4c56c207465fb7b420c9022dc545dea8ad8a29af3037758ab4587dcd38ba
-EBUILD arandr-0.1.10.ebuild 1082 BLAKE2B f5d8d2ddb6d7d4fb455dbfef0c099e98e7fa07ce49f99f5299595f2aa8b1f9a7d07deb32c9d39360305b65bd4c3466bbe71f6b512e759538d63adf25832d291f SHA512 c11d01f1c3344106d36378ca4fb4ebe8bdfbecb0e1658cca54be5aadfd3d097193db22a6258b37eeabb3b2e7cbbb51c2f367da8426d8b14fde0f2dcae71af974
-MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
+EBUILD arandr-0.1.10-r1.ebuild 601 BLAKE2B 7fc2c7fda679cebed0db0956c3d24f6ca3501cf98fae29aab7d8a26d381b3c4f5b6111cfff94306c9bb65ad6e33341d5a713c5b97a8996690dd327a388a26693 SHA512 508fe3ea24f94272aae5b3753e768d26fd617d7d4e9a97dab35a82f98fb6796856f67cf6cb0e6daafae6c2aad82e6beaaaaa084de69a73102daf9fcae944a345
+MISC metadata.xml 531 BLAKE2B 7581895e920faf92a32441fa7ae03ea94a95179a94454b36f7dadeeccac20a0d1d2c4255d18021ab61b4eeb554aad628ece83d4123b1a04f6851733818853d8a SHA512 c183a664e0ee5b836633e1a583764000178e08e79fe86ea0dba19097260ae75792805ddc88042ceb2d5772b93652ce09122a26728d7f82b3c2d32416cf6263ca
diff --git a/x11-misc/arandr/arandr-0.1.10-r1.ebuild b/x11-misc/arandr/arandr-0.1.10-r1.ebuild
new file mode 100644
index 000000000000..2da6f3298b6f
--- /dev/null
+++ b/x11-misc/arandr/arandr-0.1.10-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="no"
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Another XRandR GUI"
+HOMEPAGE="https://christian.amsuess.com/tools/arandr/"
+SRC_URI="https://christian.amsuess.com/tools/arandr/files/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+RDEPEND="
+	dev-python/pygobject:3=[${PYTHON_USEDEP},cairo]
+	x11-apps/xrandr
+"
+
+BDEPEND="dev-python/docutils[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-0.1.10-manpages.patch" )
diff --git a/x11-misc/arandr/arandr-0.1.10.ebuild b/x11-misc/arandr/arandr-0.1.10.ebuild
deleted file mode 100644
index d7ff5629bcc5..000000000000
--- a/x11-misc/arandr/arandr-0.1.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Another XRandR GUI"
-HOMEPAGE="https://christian.amsuess.com/tools/arandr/"
-SRC_URI="https://christian.amsuess.com/tools/arandr/files/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/pygobject:3=[${PYTHON_USEDEP}]
-	x11-apps/xrandr
-"
-DEPEND="
-	>=dev-python/docutils-0.6[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local i p
-	# simulate gettext behavior:
-	#  LINGUAS unset => install all
-	#  LINGUAS="" => install none
-	#  LINGUAS="de fr" => install de and fr
-	if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set
-		for i in $(cd "${S}"/data/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language
-			if ! has ${i} ${LINGUAS} ; then # if language is disabled
-				rm data/po/${i}.po || die
-			fi
-		done
-	fi
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	gunzip "${D}"/usr/share/man/man1/{${PN},unxrandr}.1.gz || die
-}
diff --git a/x11-misc/arandr/files/arandr-0.1.10-manpages.patch b/x11-misc/arandr/files/arandr-0.1.10-manpages.patch
new file mode 100644
index 000000000000..8e02c4928f36
--- /dev/null
+++ b/x11-misc/arandr/files/arandr-0.1.10-manpages.patch
@@ -0,0 +1,31 @@
+--- a/setup.py
++++ b/setup.py
+@@ -101,8 +101,8 @@
+         self.mkpath('build')
+ 
+         for (sourcefile, gzfile) in [
+-                ('data/arandr.1.txt', os.path.join('build', 'arandr.1.gz')),
+-                ('data/unxrandr.1.txt', os.path.join('build', 'unxrandr.1.gz')),
++                ('data/arandr.1.txt', os.path.join('build', 'arandr.1')),
++                ('data/unxrandr.1.txt', os.path.join('build', 'unxrandr.1')),
+                 ]:
+ 
+             if newer(sourcefile, gzfile):
+@@ -111,7 +111,7 @@
+                 info('compressing man page to %s', gzfile)
+ 
+                 if not self.dry_run:
+-                    compressed = gzip.open(gzfile, 'w', 9)
++                    compressed = open(gzfile, 'wb')
+                     compressed.write(manpage)
+                     compressed.close()
+ 
+@@ -259,7 +259,7 @@
+             },
+         data_files = [
+             ('share/applications', ['data/arandr.desktop']), # FIXME: use desktop-file-install?
+-            ('share/man/man1', ['build/arandr.1.gz', 'build/unxrandr.1.gz']),
++            ('share/man/man1', ['build/arandr.1', 'build/unxrandr.1']),
+             ],
+         scripts = ['arandr', 'unxrandr'],
+ )
diff --git a/x11-misc/arandr/metadata.xml b/x11-misc/arandr/metadata.xml
index bc1b97e1eb76..b2976bd66ac5 100644
--- a/x11-misc/arandr/metadata.xml
+++ b/x11-misc/arandr/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		ARandR is designed to provide a simple visual front end for XRandR.
+		Relative monitor positions are shown graphically and can be changed in a drag-and-drop way.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">arandr/arandr</remote-id>
+	</upstream>
 </pkgmetadata>