gentoo resync : 04.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-04 22:28:33 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-04 22:28:33 +0100
commit: a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree: 8c764c1cc0576389ce22abd317bceba71ea5732d /x11-misc
parent: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)
50 files changed, 322 insertions, 692 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index ec1f47f5c30d..2ae69c136324 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
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>
diff --git a/x11-misc/barrier/Manifest b/x11-misc/barrier/Manifest
index 146fd4702651..9a229d3997d5 100644
--- a/x11-misc/barrier/Manifest
+++ b/x11-misc/barrier/Manifest
@@ -1,5 +1,5 @@
 AUX barrier-2.3.3-gtest.patch 3981 BLAKE2B f9a91a9b090ae4210d005db307d31930f7d2939f17e1c2bdbdbcd26b22743054f2d35c57c3e55ac6b6212e2d2274bcecad015c2afe8db909bfd4c030f976ae65 SHA512 82d78f658af279c8f2ec48cfa1dcec2cd6104d605b1157adeead73623fd0f7459141eb696619e71ea78ab1f7872369c78ef1ceeb9f90e7e7bed4b2a57aac5cca
 AUX barrier-2.3.3-tests.patch 4951 BLAKE2B 66996d3d9297bf0b188350154a380e522a0ddade4b1693fb62be6acbd624f327527b281cc3611b25b3cae0d084dc6af0eaae0e8487696c4b2589f76382381a4f SHA512 dcde430f1c0e1a4d65a4ed6afad1501f4ec6e448d0a56eeeadb46732fb8149fc7e74b5245e583ca8d4552ecca75dd59cabb9ba4ad549c8fda55e2178ede1ffed
 DIST barrier-2.3.3.tar.gz 5465909 BLAKE2B 3f881526f53113e48f1ea2e1592ebf2e932a8296fcba331243678963945001e7700dddc3bf8957f85285aec02c3d3700d31786cef291862a9b21780ee9e96cd6 SHA512 1ac945ce090d5bbdae7bab7d4ca802cc2d54c1644a12088203b240e38078d32d3b30ae2f764ba27d66c9d709e430b0eb1b4576314d99dd6177d8b88d19b89777
-EBUILD barrier-2.3.3.ebuild 1615 BLAKE2B 38a84d572cf3427a3b9c8bad95f27f6cf55853c1557f6f04c5af12b29316653074a5522cfabbf6691536df0d2875a4ad278843dbb8bd00ea781ced22b7db2996 SHA512 d09695d6b437a63d3c20b927b237488340dd0d09a377cf2de9714b4cce9cc9e391f82a69e0988f33c5a69a1a1eac8bca40914115fd30b8ec78d884d6f280df68
+EBUILD barrier-2.3.3.ebuild 1555 BLAKE2B 695de940747eb8de9b9517a67567ad40f1e72ce6cf19ab214e1311919ed521ca83a457ab84593c989c9e73f58bd27ce0341815852122a3beae09358d55f8a1a9 SHA512 9e4ff875cb5d7cb8d2399b5ca093c141ad28ba8374ae932bf327d84ebd7a4f1e4436946992b0b3a61757a12fd0f160fe418e8f99d16c1818c27242fb7886936c
 MISC metadata.xml 329 BLAKE2B bbddf11c798d648935ee56a6ee9cbf7a73d30f13a880264ed07db3b7710eb7329166838b4e1adbb157b699805c2d891bdfae2799c7bb1b6ea3419b97438a49de SHA512 84462a8601400583e7570ecfca9fac2539eb9be9c097ebeead8cfc42e2be95c61369934a0e1d9252e3ed8fa181f64116a3cc0228da27340f6c29bdf5b4133883
diff --git a/x11-misc/barrier/barrier-2.3.3.ebuild b/x11-misc/barrier/barrier-2.3.3.ebuild
index 6825e6d91efb..33d180e0a5d7 100644
--- a/x11-misc/barrier/barrier-2.3.3.ebuild
+++ b/x11-misc/barrier/barrier-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/debauchee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gui libressl test"
+IUSE="gui test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -32,8 +32,7 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 		net-dns/avahi[mdnsresponder-compat]
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 "
 DEPEND="
 	${RDEPEND}
diff --git a/x11-misc/bbkeys/Manifest b/x11-misc/bbkeys/Manifest
index 5c43aa6c60b2..fac1da2f647e 100644
--- a/x11-misc/bbkeys/Manifest
+++ b/x11-misc/bbkeys/Manifest
@@ -1,5 +1,5 @@
 DIST bbkeys-0.9.1.tar.gz 226941 BLAKE2B 43a946210f25679dfe7d5a383fbd3f938ae71b19a635a288590b958fc47f3588c690a1e901b44fdb1b31eb1a8ee7252ceeee85b5d012585b261de61cc0f012ab SHA512 c8643d51dbb8f080cf70149d545f33160d15f00a0c3cefdd6d3856dfdee224ff3f63fce0988669036249c75f70878be63711a697dfaa45d4357d2141a28b13bd
 DIST bbkeys-0.9.2.tar.gz 116313 BLAKE2B 03b9cb10b7a10380ef805f28605b0ed1969d2197ffc1a19704a3ae230d3555f265d721c800ec45e37af4fb28fa01587999c078d0122826589f688b146fbebef7 SHA512 3205bd37052589b6cba9447032e6906c09afc80b36d7f7869204d290faa7f5726b7b9de74ee06c73c25b794f88eb4e13663f8b096f78bd246d1764bc4ab8984d
 EBUILD bbkeys-0.9.1-r1.ebuild 602 BLAKE2B 8d032d2bee58ad01f326f34383803f5c379713ff83cc543bf2bc2e3290cf896b700ebe4787c6180c625c6dd21f2ad493afb8383a82f08cc76f835fba225e232a SHA512 6acad4c8b8e3e219561db3e6b3b4ee8a30e9555d3d029b9b930eb81a73fb631672a7257b3fed6c2b1427f89b72c104c9e9a48b8bfc5d3bbedd81b485bbaba52c
-EBUILD bbkeys-0.9.2.ebuild 885 BLAKE2B ac669d107eedef103b1d54375d45ede2de7e83956b86a000df72ee21835db8c18af8ceec7529f7d412e3a5d65d13efdc0935036722a4fcf9f2184c1405bdc9a6 SHA512 b1cdf04ad059865ea9062c184ac0cee91d7c20197c2adcb914dd61a47d1b31c8cb48997d42e7aa274d88ad3d19c691f77250a543ac3fc13f23c413a414af2793
+EBUILD bbkeys-0.9.2.ebuild 882 BLAKE2B 0ab7ea75f50730307649bccacfba6dc2b2a7050a3d99228600a810db58b46f1c4390834c6ec770abcced8cd3061a9febf5f7a5fcdf158e664af5b3a4bc0e4097 SHA512 0977ca4f73603125afa743d340b1e26d1e160fca6343a99c3a7c25c4c0a1bf96f490ed109556e0e36acce02d41c7d28f7cc77ea8cacfcf59a48981861d45ab78
 MISC metadata.xml 325 BLAKE2B dd8be4385732b9cc123228980b0c4cea920db00f50df5defcfeb2dbfaa6b632b55aa6e898d9804f3e068c706f0099d8bb0a8d1ca45ebf4ab5a54e663c13ea86c SHA512 2b43e8b6b4324dedcc5b1dcefddf9b6412cd5a87d07692792097a8f3ae83cc8fb54a66c6d498d25e1b4b1f2f1bdbecf1322558976b70bbe742fd44f68e45ba11
diff --git a/x11-misc/bbkeys/bbkeys-0.9.2.ebuild b/x11-misc/bbkeys/bbkeys-0.9.2.ebuild
index cd8940c01e51..b3a7f7456fcb 100644
--- a/x11-misc/bbkeys/bbkeys-0.9.2.ebuild
+++ b/x11-misc/bbkeys/bbkeys-0.9.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bbidulock/bbkeys/archive/${MY_PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/cdm/Manifest b/x11-misc/cdm/Manifest
index 7c01045fd70a..502fbe325d51 100644
--- a/x11-misc/cdm/Manifest
+++ b/x11-misc/cdm/Manifest
@@ -1,5 +1,3 @@
-DIST cdm-0.6.1_pre20180107.tar.gz 16541 BLAKE2B 19b7a8f6ef7541333b96bb3c2d6a9d3b7ce3bffdcf6653a3799d963d3b3bab3fe3553469a9cbf0f493109ad5308c739b25ce9e5801d0904f5d7b6e78b680e2fc SHA512 dc5587debb304636be25afdf60e8328b1eb9b961694813b089df504567f63cfeac6de17df715d589cec597f51044b8c121242ebefbe5bfeccf6aa072b1c03a40
 DIST cdm-0.7.tar.gz 16154 BLAKE2B ca240e253ad4ed6b5e634069b98c90c00852fc6d6550ca1f72b3399435264055cfca31f88f6061daa3e2e3445bd1a8ad9f950b44968df4c77d6c8150b2782a34 SHA512 51591b953ec83c06a5a4407c6d6083ac11e7095c7fb22e491ed3d6626217462529d3dd3590c2a256273b3668c7246b13bfd1f2f682f5bd860ca8a34aaca0b6f5
-EBUILD cdm-0.6.1_pre20180107.ebuild 1711 BLAKE2B e95970d40e744d251933e7e2d5b8ca2ce320c7871436b50a6468b782a5de0c5ef18dceb8fe4a760e65abb103a2d18a7bb81d4cabec1131cee473a7923fa524f9 SHA512 fab8b62fc5c2515960842ca440fc52f983caaf36910dc87b36bc82ae7513e455568ceee731cbcbb531fbbce714dac32aa0d4a0a95e4705842b857d35b4b84f7e
 EBUILD cdm-0.7.ebuild 1728 BLAKE2B 2b6153faddb988addf5ab5eb960f447e2e4f9ec488c034169f9de47c768d216f4866013f9272ad46632433e82909bd0f012dbb1f1af3e09e50940180750bd905 SHA512 5acf5c0a691869e3511498bb920e6367445c1fa1502b0952e875e26cf3114ff21f57a9eac13bdfa851cf64d12a754b673d42aa0c8b3081eec8fcfc51c981497e
 MISC metadata.xml 637 BLAKE2B 6d5322fbd964f18a178cd927700f56bd6401a78b7f1b3abce8d70e8f74a3817a913a63671bc5dea89cc654566d669cf6133888bcc87a2df3bcb8196cfbe23c5c SHA512 22848f9f08a03e9cf170d68ea2feb836ac84ae7c24074f2e029ac85dfcd8630ae8cd79518d01951c33d8ddf8dd8c8a89faf18da7308493951abff2f8c299e0cd
diff --git a/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild b/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild
deleted file mode 100644
index b6b34d366375..000000000000
--- a/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit pam
-
-DESCRIPTION="The Console Display Manager"
-HOMEPAGE="https://github.com/evertiro/cdm"
-SRC_URI="https://dev.gentoo.org/~gienah/snapshots/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pam"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-util/dialog
-	x11-apps/xdpyinfo
-	x11-apps/xinit
-	pam? ( sys-libs/pam )"
-
-src_prepare() {
-	default
-	sed -e 's@consolekit=yes@consolekit=no@' \
-			-i "${S}/src/cdmrc" || die "Could not turn off consolekit in cdmrc"
-}
-
-src_install() {
-	if use pam ; then
-		pamd_mimic system-local-login cdm auth account session
-	fi
-
-	insinto /usr/bin/
-	insopts -m0755
-	dobin src/${PN} src/${PN}-xlaunch
-
-	insinto /etc
-	insopts -Dm644
-	doins src/cdmrc
-
-	insinto /etc/profile.d/
-	insopts -Dm755
-	newins src/profile.sh zzz-${PN}.sh
-
-	# Install themes
-	insinto /usr/share/${PN}/themes
-	doins themes/*
-	# Copy documentation manually
-	dodoc ChangeLog-0.6 ChangeLog-before-0.6 README.md
-}
-
-pkg_postinst() {
-	ewarn "In order to use CDM you must first edit your /etc/cdmrc"
-	ewarn "At least the binlist, namelist and flaglist entries should be added or edited"
-	ewarn "to specify the X window managers and console shells that you want before"
-	ewarn "you start CDM.  Something like:"
-	ewarn "binlist=('xmonad' 'startkde' '/bin/zsh --login' '/bin/bash --login')"
-	ewarn "namelist=('XMonad' 'KDE' 'Console Zsh' 'Console Bash')"
-	ewarn "flaglist=(X X C C)"
-	ewarn "Ensure the flaglist X entries correspond to the X-Windows programs, and the"
-	ewarn "C entries correspond to console shells.  Then just login with your username."
-	ewarn "Remove xdm from default runlevel."
-}
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index a6e181062b93..63f560c6454f 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,7 +1,7 @@
-AUX 1.4.5-build-Fix-building-without-vapi.patch 1489 BLAKE2B ec5fc65a4b898c6c4a77c962a048042b3f9df532707bbc12bb5668d97c1683ea5ddc481b831f4e388ac10f16e728c840e7f420ab5061a4d1f25f50946000a35b SHA512 738d5a5570b7c22b87a851f4092b825ee2b1c0f59b1d4412b5e744eb1f5045ffb39146e1ffcd6b4b274db229fe872ef8352761161965ad175a2f45d334f00bab
+AUX 1.4.5-optional-introspection.patch 2436 BLAKE2B d2572caf95e94e12f64a1a15bdb2f686a0fc5196cd29b66f2ff7f312bd904167442b60e6cce05c738ffec0c06ed8da280e6738082afca2a9117576fcafd5f0a8 SHA512 46a0b28dccb54adfe562f3f5763ae6160588be7ce7d4bd6f691d15e4df3007d08a28c1c4f787abe05eb37ae5d07a058021553989c584180c924e6ab4a6a06016
 AUX 1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch 1768 BLAKE2B b8620120b46b9095235d33d92a862971ed6d3944ed7cdbfb44eb161104e96c571327965267ee8de10cfac71fa3956639f87c6d16dde81571f5f2e0c7db073779 SHA512 ca08f1325fde85da14f7a348df054ff47bc2a008f57f33c7cb8a8f60394bdb453da1e94402bc69cd16a9ac4899f0b75766b879b1a1cd8217b39557d4a3856158
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
 DIST colord-1.4.5.tar.xz 1869084 BLAKE2B 34c886bade6f71b0b81bbed216695d839873fba46423f6422b80ef2f62e88a403edd1686bb705ef78bcaeb352477e0581d784ccd388961cd42d880661b4b31ab SHA512 b6cc8087ceff4a99b7d764087208cc72e1219d9f6bb52bd3e3eb13bb62e3c1e99aefef36237dceff46925ab7680c76795f59057b7a4d1c8a123de6270708e03c
 EBUILD colord-1.3.5.ebuild 5020 BLAKE2B 0bf726b3dceb24289e27ff1db60e5bf02fa350b52e271539a101cb422d2beaa4a4014e2421c8842755d65991e4c26651234ecb0e15ffe3d0659fe51d9f436e85 SHA512 7d2050a8f9bd884498770ace429edc8c3fffa556f9bcd3861e17531988112b6e461a6b76cd0a1eb2d3ad95f1e01d493416ead82faa2aefcfd3a92ce6833a2805
-EBUILD colord-1.4.5.ebuild 3718 BLAKE2B c3024b1f3431c29bcf387c5ffb07eb0190fb6fa8e7118c9fa2ada0101a072535c294f028a8f26206c128ac97122d97471726d645828ff9341fd1ba39191560b0 SHA512 965604e7cae55a9fffcbdceac2e9c25c082c5cac16cfe0a5bf5d026e3d69d827365da51565d954ca8b9b6c7562709d089b3c2c39fd8cb179d04801e8c47d8f90
+EBUILD colord-1.4.5-r1.ebuild 3664 BLAKE2B 74774d26de158eed64280133dfcab40c9aec31f4a0ce0e858af92b924f1e715b48e09392462e0b210771cea1e75e7abbdee89712b50a9df8b56f9856f10852b9 SHA512 552f5e8c7652ad91a2331bc76066903aaacaff19593beb522d797d8fc5dc5dff95b7e9a68fac866da4ab924e061750cb54c1a39b922dd9579fc70099b56a1c09
 MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.4.5.ebuild b/x11-misc/colord/colord-1.4.5-r1.ebuild
index deeb744abd98..a3b707ebd6d4 100644
--- a/x11-misc/colord/colord-1.4.5.ebuild
+++ b/x11-misc/colord/colord-1.4.5-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	>=dev-libs/glib-2.58.0:2[${MULTILIB_USEDEP}]
 	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
 	dev-db/sqlite:3=[${MULTILIB_USEDEP}]
-	>=dev-libs/libgusb-0.2.7[${MULTILIB_USEDEP}]
+	>=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}]
 	udev? (
 		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
 		virtual/libudev:=[${MULTILIB_USEDEP}]
@@ -55,15 +55,10 @@ BDEPEND="
 	extra-print-profiles? ( media-gfx/argyllcms )
 	vala? ( $(vala_depend) )
 "
-# These dependencies are required to build native build-time programs.
-BDEPEND="${BDEPEND}
-	dev-libs/glib:2
-	media-libs/lcms
-"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-tests-Don-t-use-exact-floating-point-comparisons.patch
-	"${FILESDIR}"/${PV}-build-Fix-building-without-vapi.patch
+	"${FILESDIR}"/${PV}-optional-introspection.patch
 )
 
 src_prepare() {
@@ -97,6 +92,7 @@ multilib_src_configure() {
 		-Dargyllcms_sensor=$(multilib_native_usex argyllcms true false)
 		-Dreverse=false
 		-Dsane=$(multilib_native_usex scanner true false)
+		-Dintrospection=$(multilib_native_usex introspection true false)
 		-Dvapi=$(multilib_native_usex vala true false)
 		-Dprint_profiles=$(multilib_native_usex extra-print-profiles true false)
 		$(meson_use test tests)
diff --git a/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch b/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch
deleted file mode 100644
index cbf79a830c09..000000000000
--- a/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2bbcefa35225ba836b1672449f1de59ce9a90078 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 18 Apr 2021 16:46:52 -0400
-Subject: [PATCH] build: Fix building without vapi
-
----
- lib/colord/meson.build   | 2 +-
- lib/colorhug/meson.build | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/colord/meson.build b/lib/colord/meson.build
-index dbb3d19..3126046 100644
---- a/lib/colord/meson.build
-+++ b/lib/colord/meson.build
-@@ -146,6 +146,7 @@ pkgg.generate(
-   description : 'colord is a system daemon for managing color devices',
- )
- 
-+if get_option('vapi')
- libcolord_girtarget = gnome.generate_gir(colord,
-   sources : [
-     'cd-client.c',
-@@ -203,7 +204,6 @@ libcolord_girtarget = gnome.generate_gir(colord,
- libcolord_gir = libcolord_girtarget[0]
- libcolord_typelib = libcolord_girtarget[1]
- 
--if get_option('vapi')
- gnome.generate_vapi('colord',
-   sources: libcolord_girtarget[0],
-   packages: ['gio-2.0'],
-diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build
-index 9526ea4..9f17553 100644
---- a/lib/colorhug/meson.build
-+++ b/lib/colorhug/meson.build
-@@ -73,6 +73,7 @@ pkgg.generate(
-   description : 'ColorHug is a simple display hardware colorimeter',
- )
- 
-+if get_option('vapi')
- libcolorhug_gir = gnome.generate_gir(colorhug,
-   sources : [
-     'ch-common.c',
-@@ -107,6 +108,7 @@ libcolorhug_gir = gnome.generate_gir(colorhug,
-   ],
-   install : true
- )
-+endif
- 
- if get_option('tests')
-   e = executable(
--- 
-2.26.3
-
diff --git a/x11-misc/colord/files/1.4.5-optional-introspection.patch b/x11-misc/colord/files/1.4.5-optional-introspection.patch
new file mode 100644
index 000000000000..8bc4580bebe3
--- /dev/null
+++ b/x11-misc/colord/files/1.4.5-optional-introspection.patch
@@ -0,0 +1,64 @@
+From e73723cabe4d5a2e2b281d2f1ea751b2d75bccc6 Mon Sep 17 00:00:00 2001
+From: David Michael <fedora.dm0@gmail.com>
+Date: Fri, 30 Apr 2021 16:28:17 -0400
+Subject: [PATCH] build: Make introspection optional in meson
+
+It defaults to enabled to preserve existing behavior.
+---
+ lib/colord/meson.build   | 2 ++
+ lib/colorhug/meson.build | 2 ++
+ meson_options.txt        | 1 +
+ 3 files changed, 5 insertions(+)
+
+diff --git a/lib/colord/meson.build b/lib/colord/meson.build
+index dbb3d196..fe9d1cdb 100644
+--- a/lib/colord/meson.build
++++ b/lib/colord/meson.build
+@@ -146,6 +146,7 @@ pkgg.generate(
+   description : 'colord is a system daemon for managing color devices',
+ )
+ 
++if get_option('introspection')
+ libcolord_girtarget = gnome.generate_gir(colord,
+   sources : [
+     'cd-client.c',
+@@ -202,6 +203,7 @@ libcolord_girtarget = gnome.generate_gir(colord,
+ )
+ libcolord_gir = libcolord_girtarget[0]
+ libcolord_typelib = libcolord_girtarget[1]
++endif
+ 
+ if get_option('vapi')
+ gnome.generate_vapi('colord',
+diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build
+index 9526ea4d..c0ce2887 100644
+--- a/lib/colorhug/meson.build
++++ b/lib/colorhug/meson.build
+@@ -73,6 +73,7 @@ pkgg.generate(
+   description : 'ColorHug is a simple display hardware colorimeter',
+ )
+ 
++if get_option('introspection')
+ libcolorhug_gir = gnome.generate_gir(colorhug,
+   sources : [
+     'ch-common.c',
+@@ -107,6 +108,7 @@ libcolorhug_gir = gnome.generate_gir(colorhug,
+   ],
+   install : true
+ )
++endif
+ 
+ if get_option('tests')
+   e = executable(
+diff --git a/meson_options.txt b/meson_options.txt
+index c184898e..10517622 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -7,6 +7,7 @@ option('systemd', type : 'boolean', value : true, description : 'Enable systemd
+ option('argyllcms_sensor', type : 'boolean', value : true, description : 'Enable ArgllCMS sensor')
+ option('reverse', type : 'boolean', value : false, description : 'Enable reverse engineering tools')
+ option('sane', type : 'boolean', value : false, description : 'Enable SANE support')
++option('introspection', type : 'boolean', value : true, description : 'Build gobject-introspection typelib files')
+ option('vapi', type : 'boolean', value : false, description : 'Build vala bindings')
+ option('print_profiles', type : 'boolean', value : false, description : 'Build extra print profiles')
+ option('tests', type : 'boolean', value : true, description : 'Build self tests')
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 0c17f7458135..93017ea1a31c 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
-EBUILD compose-tables-1.7.0.ebuild 875 BLAKE2B 5d93734956b9b504d0ea254bbe96153f57c9934611607d85f744f52546dae92e10230c5137a1541358a7d9085db58a3f4b844a29ff640136eb00ca678ca0313f SHA512 1df97cdf5cbf43ab6b21c82abe66fd092a987fc090ebcddeb38afc890aa592698742d7d39526675ce3321e89cccba144241ad8ae97e7207e5677e10265904dcc
+EBUILD compose-tables-1.7.0.ebuild 875 BLAKE2B 175050ee8e184a4f740f4fc2bbfc55076ffd7609ab1736f0f8fa915d5c58938734e8d2f8bcc4e4554e4a41987b62d1bde5d427a9b16a3fb3a175a4639ca7c99f SHA512 8b38cb39673e97611c30dfb27e0a6bb751c9c9027e098fa09da52d31322cf8c17fa8052906c2aa6238d7253c66c31d9a6a67927af2ee93c8ef9f2570146f5828
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
index 7e7d9e2e4120..0a4741cd8b43 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
@@ -6,11 +6,11 @@ EAPI=7
 XORG_MULTILIB=no
 inherit xorg-3
 
+DESCRIPTION="X.Org Compose Key tables from libX11"
 # xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-DESCRIPTION="X.Org Compose Key tables from libX11"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
@@ -31,10 +31,10 @@ src_compile() {
 	emake -C nls
 }
 
-src_install() {
-	emake DESTDIR="${D}" -C nls install
-}
-
 src_test() {
 	:;
 }
+
+src_install() {
+	emake DESTDIR="${D}" -C nls install
+}
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 1bcf25cf27e6..4d44099a6987 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -4,6 +4,6 @@ DIST dunst-1.5.0.tar.gz 169272 BLAKE2B 63c33e62f61aefec67e5420d5afe41808cf8b377c
 DIST dunst-1.6.1.tar.gz 217267 BLAKE2B 267e5be6a079097fb5a677bd2451b0e5bcbcddadf4c4de9af87d4eab7dd90b61908f140db3f1238b6a79d370fc3bb89c062c6b4deeefae6c9c0069b55017e907 SHA512 079ffd0ff75f1865b68cb8db261849cbe4f68b5c632c39ef8f7a3d193ff3eba3734bca31cb7268f27c9a411aec56e4c484c383b419bc0b4755b7d80ede84cd96
 EBUILD dunst-1.4.1.ebuild 1042 BLAKE2B 80f0cab6a7592ed4da0bdee6a8d595f0910567357e3eaf808d279264fc40d1be9d5bd028fff0ac568c9a083e35b5bd461f8d1cd8bb4301926da8fb052668cade SHA512 1fa787b051a4fb4472da55f44bf8d7ddd0175becb13423d7af68468b4e4706dda2be7995443c658cdf65d7561801886bdf8a7a359c623edb61ca671e7d394bab
 EBUILD dunst-1.5.0.ebuild 951 BLAKE2B 92ce2b3a4e3b66fa84184f3a80847d9ae4d6d4fcef3fb83ec9353828132702a51653cba91b322725490ed8d554b3e0854015b0cb089181db03a5490ce893a055 SHA512 85c7b4acb808207ede30e9f28047861a295c377c3311dbd1112a5fc01c61b415ccd966e88ef501dd14f6c6d73d802f47a1af60d19bae3d3c0b8c1fd7013bd45e
-EBUILD dunst-1.6.1.ebuild 1303 BLAKE2B f3a91461b6c86a5f288fa248e2a83f4ce286b4281b504b30bbef9062bdbdcec24176d1179d522d8622e566687a098922e099d878f2200e86b72cfa44ea9dd9a6 SHA512 84a30e6963ffcb1a04dad5064e23b8683adbb7e04a351e75d492948a8982e7f52fe5d2e3609a924a5c7b97655af8bac9229e3d1bbe64bd5002b12e226383dfd2
-EBUILD dunst-9999.ebuild 1303 BLAKE2B f3a91461b6c86a5f288fa248e2a83f4ce286b4281b504b30bbef9062bdbdcec24176d1179d522d8622e566687a098922e099d878f2200e86b72cfa44ea9dd9a6 SHA512 84a30e6963ffcb1a04dad5064e23b8683adbb7e04a351e75d492948a8982e7f52fe5d2e3609a924a5c7b97655af8bac9229e3d1bbe64bd5002b12e226383dfd2
+EBUILD dunst-1.6.1.ebuild 1342 BLAKE2B ff602cf08af41dd3645840569e3aed19cd7937b0377e86a43f256103c85c9c9fef6c2a223fd3ab568befa2159418f7993f6865b3138e8b9cb292da19ef11d340 SHA512 b3b5be65c50a80f3031e6e2925f0a0ed654913e605c329619ea4853bd61fa49791d7cf22c32be9f36b3eac98d47bbc6262633eac331594ddd8819a42375e01f7
+EBUILD dunst-9999.ebuild 1342 BLAKE2B ff602cf08af41dd3645840569e3aed19cd7937b0377e86a43f256103c85c9c9fef6c2a223fd3ab568befa2159418f7993f6865b3138e8b9cb292da19ef11d340 SHA512 b3b5be65c50a80f3031e6e2925f0a0ed654913e605c329619ea4853bd61fa49791d7cf22c32be9f36b3eac98d47bbc6262633eac331594ddd8819a42375e01f7
 MISC metadata.xml 561 BLAKE2B 5e945d9c374ed86d48f7f5b1efefb11c8b12dff0c73b903e283f24c84ed698d6213d6b38a741272572068919583e3c87dad0d7e8f5c70a63be760cb6453bd403 SHA512 85eb2d4acb0da5bb6375a86a41861f6998db6c4a7f9c15fc06531a15cc25528b1b690768f258730edc88533df06680acddc453d194374c52d431339c6014bf22
diff --git a/x11-misc/dunst/dunst-1.6.1.ebuild b/x11-misc/dunst/dunst-1.6.1.ebuild
index db38e7cda0ae..9e6ef65b51bb 100644
--- a/x11-misc/dunst/dunst-1.6.1.ebuild
+++ b/x11-misc/dunst/dunst-1.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit systemd toolchain-funcs
 
 DESCRIPTION="Customizable and lightweight notification-daemon"
-HOMEPAGE="https://dunst-project.org/"
+HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -50,11 +50,11 @@ src_configure() {
 src_compile() {
 	emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0
 	sed -e "s|##PREFIX##|${EPREFIX}/usr|" \
-	    -i dunst.systemd.service.in > dunst.service
+		dunst.systemd.service.in > dunst.service || die
 }
 
 src_install() {
 	emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0 \
-	      DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	systemd_dounit dunst.service
+		DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	systemd_douserunit dunst.service
 }
diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild
index db38e7cda0ae..9e6ef65b51bb 100644
--- a/x11-misc/dunst/dunst-9999.ebuild
+++ b/x11-misc/dunst/dunst-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit systemd toolchain-funcs
 
 DESCRIPTION="Customizable and lightweight notification-daemon"
-HOMEPAGE="https://dunst-project.org/"
+HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -50,11 +50,11 @@ src_configure() {
 src_compile() {
 	emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0
 	sed -e "s|##PREFIX##|${EPREFIX}/usr|" \
-	    -i dunst.systemd.service.in > dunst.service
+		dunst.systemd.service.in > dunst.service || die
 }
 
 src_install() {
 	emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0 \
-	      DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	systemd_dounit dunst.service
+		DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	systemd_douserunit dunst.service
 }
diff --git a/x11-misc/matchbox-keyboard/Manifest b/x11-misc/matchbox-keyboard/Manifest
index ad917c39df01..2ddc0c500c34 100644
--- a/x11-misc/matchbox-keyboard/Manifest
+++ b/x11-misc/matchbox-keyboard/Manifest
@@ -1,4 +1,4 @@
 AUX matchbox-keyboard-0.1-r1-modernize_desktop.patch 290 BLAKE2B 55957826c261ff2263d7cb3b3a3a3de2159c9b64a83578e79895f9a5e32fee492e2cd5f2cbfee4947b45e1fcb19093ec0fcedbe700c1dd7871b9ad7ccb0fb2dc SHA512 251400c6c5279f23f34bdf1b8eefbb4fa609acc1f320092c4340beace32f7025a3da1770fa778645f0267ad4996ecbae30b4afaff66fe765f141e89b39721d3f
 DIST matchbox-keyboard-0.1.tar.bz2 103222 BLAKE2B 0de7bca1833e890170d705edec6ce2ace2b0be2734ab083d2e2c9f1b168ef3f70ba61792bb16e06052189fee7527f35847d1673faed6b47d1cd2db294577072e SHA512 8d961ea5934230b3f87380f2bd6b3ddcc0535ae8255897b1eef0a1f5d36fc826f4c9e349a20348d78b6a110c642257e5e7992aa995d5cff395e51e2eab1dc02a
-EBUILD matchbox-keyboard-0.1-r1.ebuild 734 BLAKE2B cc113d6da34bee3e4e294f1d24c65a8f0540a0fd0f4f57c75886163e0168fe81d25e74f3f886f921e56f02e37077261d0c58486cdf86ff820d338ecf7654dc11 SHA512 814b2c962b18dcaf689f3f030c034973666230f9988b093d963d7a0511b406c360c12033fd90b06d3701a09e60e4b1007760e08f3fe6cc20f8438f134ae78f86
+EBUILD matchbox-keyboard-0.1-r1.ebuild 680 BLAKE2B b52647d35c94a8fe3bce30780f1ba312ff4dd5c3f840e15df41112d43f607a68554a4a508281490a537776e19485c4a7e0c953bc2cb81e9554b1f3011fb9a098 SHA512 30a96551b362df1004572e112f726de6be62411f0f017a42506fd6599d022d12a8a5dfa122e401ac1ffb20a16a73ada7dd096f66f87f3629cf32c553ce6d3124
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild
index b98376f666de..4ceed10c88e9 100644
--- a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild
+++ b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit versionator eutils
+inherit versionator
 
 DESCRIPTION="Matchbox-keyboard is an on screen 'virtual' or 'software' keyboard"
 HOMEPAGE="http://matchbox-project.org/"
 SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE="debug cairo"
 
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README )
-PATCHES=( "${FILESDIR}"/${PN}-0.1-r1-modernize_desktop.patch )
-
 DEPEND="x11-libs/libfakekey
 	cairo? ( x11-libs/cairo[X] )
 	!cairo? ( x11-libs/libXft )"
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1-r1-modernize_desktop.patch
+)
 
 src_configure() {
 	econf $(use_enable debug) $(use_enable cairo)
diff --git a/x11-misc/openbox-menu/Manifest b/x11-misc/openbox-menu/Manifest
index 876aac2ede9a..e19c163faa70 100644
--- a/x11-misc/openbox-menu/Manifest
+++ b/x11-misc/openbox-menu/Manifest
@@ -1,9 +1,6 @@
-AUX openbox-menu-0.5.0-build.patch 2004 BLAKE2B 6284c4d0a8695b501de51014296d40e51b8af31f7ceba84af1ad7e091576703f7bd0325fb8ab741197565e92d66e2e225b4582111ac532b0e7245db352fe85a3 SHA512 52e425084837c1c198adbbb11b48ea59855ab5396159d45b01f55659bb2f506fd297ce4baebb544028df53063e8e9535129e049b47eff0f25917e81d20b93b97
 AUX openbox-menu-0.8.1-build.patch 486 BLAKE2B 90f74e4e3c7925e6e35098f1a3c64aed16a29f1622525d87feb93972cdf8f50de3580401bbe1264f10d0d94b864dbdb4db7b502a5387dd8ba07b29df0f52c244 SHA512 855cba1c4916b9d15eeb055d8e7dff71a4e805936738b4d8ed8e772051e1f573c6cab6b617ebb653f1226e635766d1b5fec39d28229a57d31fca1a873fa47074
 AUX openbox-menu-0.8.1-gtk3.patch 2511 BLAKE2B c6c915bacb681cb507ea36d653fe742ceb5ced7829001e854f4b96fd395d05773b1e8ecb9bed52823dd430277f7dae89193e020a8f1593d3e5f530839ab4d246 SHA512 7b6441186771529c996f71e7bb8538e18e2cf344abcca7d94b337a1180d66bb71b948674a1c4702bf2821f54168ac139c6602399be1b9c57f86a914762f21acb
 AUX openbox-menu-0.8.1-makefile.patch 3562 BLAKE2B 542a20fbda371b186a6130804f3b2ac8b5b07c4d11db662ac622699a59ac16fbd9e4a1e573d48a166f5950adbdea8d4f240482ae09610ed83433dbaf284109f0 SHA512 9ceb1a2d69e65625796431b34af9a1b58980293633dbe253ff103d2c3a97aca33984c66c2c85fea2c15fa16747d190d31642112c1c546bbee0b850341da61548
-DIST openbox-menu-0.8.0.tar.bz2 24229 BLAKE2B 8950d1bf55454f239a92cf17f8676295f7c769b73fce34ee2786b0a5dd18bd81b3dddfec7f5fcf77f697072abaea758d1d5c9d0f80d41c0a9d80709b845161c2 SHA512 955a5e16e7be001aec030358d3568aa6a3303d7138d6eb998494cd9ffa77de14ecf4bee163a9d49faf67939c85e303cbae51461f04f7eeaf44167a377c0f352d
 DIST openbox-menu-0.8.1.tar.gz 27960 BLAKE2B f4c78956c163b0d8ca2d601b05354217071e93307a0abc1536d1d373a3d402384b0a4d3c15252aaf9aae7c20b76b5b8aa69edfacbe11cfaa76b1aba8a7a4834e SHA512 de6454e88ac30b5cb1094ae427116808ad9dd2f37c8d2ae20dea77aa60d414a47149c09e8ea7d3c5c31182b728b8a4f13283f33c6e2a34d3cd4b64f91d4ef8da
-EBUILD openbox-menu-0.8.0.ebuild 860 BLAKE2B c6038b48b3dba9bfce6968adefb0a2a92f66f6fde29c2ebaef4977ab751698b60076ded674dca12788f7f2ea53d9579bb3138f4692f81aee275c8c7359dff0e4 SHA512 03dbc84fa49bfdc6fa19a748359aea939f9520ea6c36c5e9b6f631d2bc2ab34330dff2ec9b7e445f4cbae3e9c58135911c174b510c28b18ce9bf3875ebf57102
 EBUILD openbox-menu-0.8.1.ebuild 914 BLAKE2B 0780b2f73ee0052dcb20404cbedd82ccd88739e9b62650de0c5abd292d2bb37832622fa5b5a503fa47ed03fcea68c9b5276ab0801db181e27f2164d924a87024 SHA512 dd8dd8606f261b0a46cdb9bb3a3b978ad1203c3bc7c18b20400c2bc31758ea85de5a9406fdb590c56a2019ad718bb95e7aa4dc934525f6184e2d438253140bd4
 MISC metadata.xml 495 BLAKE2B a49aa76f309ee8d989a23090481b7f0dad37e8ee3836bea0cd3f5d9484df2d22f5663d6f45e3c06f559eaf0b2192fb79dadb892eb982328a152f132ebbba5ec5 SHA512 b6fe723f8eef23735d5e2f20f64b49d4ed000ef35632cf22ce3d0d62b08be19a6c7ed8c5c84512c28f3e8cc7906d4d28b727146abee64bef963ba81b51ad3200
diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch b/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch
deleted file mode 100644
index 5750e982be10..000000000000
--- a/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Wed Aug 21 14:26:38 UTC 2013
-Subject: several QA fixes
-
---- a/Makefile
-+++ b/Makefile
-@@ -1,17 +1,27 @@
--LIBS= `pkg-config --libs glib-2.0 gtk+-2.0 libmenu-cache`
--CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-2.0 libmenu-cache`
--CC=gcc
-+CC ?= gcc
-+PKG_CONFIG ?= pkg-config
-+
-+CFLAGS ?= -O2 -g
-+CFLAGS += -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0 gtk+-2.0 libmenu-cache)
-+LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 gtk+-2.0 libmenu-cache)
- #-DG_DISABLE_DEPRECATED
- 
--# Comment this line if you don't want icons to appear in menu
--CFLAGS+=-DWITH_ICONS
--# Uncomment this line if Openbox can display SVG icons 
--# Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must appear..
--# CFLAGS+=-DWITH_SVG
--
--prefix= /usr/local
--DESTDIR ?= $(prefix)
--BINDIR= ${DESTDIR}/bin
-+# set to 0 to turn off icons in menus
-+ICONS=1
-+
-+# set to 0 to turn off svg icons in menus
-+SVG_ICONS=1
-+
-+ifeq ($(SVG_ICONS),1)
-+CPPFLAGS += -DWITH_SVG
-+endif
-+
-+ifeq ($(ICONS),1)
-+CPPFLAGS += -DWITH_ICONS
-+endif
-+
-+prefix = /usr
-+BINDIR = ${prefix}/bin
- 
- SRC= $(shell ls *.c 2> /dev/null)
- OBJ= $(SRC:.c=.o)
-@@ -19,26 +29,29 @@
- all: $(OBJ) openbox-menu
- 
- %.o: %.c
--	$(CC) $(CFLAGS) -c $< -o $@
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
- 
- openbox-menu: $(OBJ)
--	$(CC) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS)
- 
--.PHONY: clean install doc changelog check
-+.PHONY: clean install install-strip doc changelog check
- 
- clean:
- 	@rm -f *.o openbox-menu
- 	@rm -rf doc
- 
- install:
-+	@install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu"
-+
-+install-strip:
- 	@strip -s openbox-menu
--	@install -Dm 755 openbox-menu $(BINDIR)/openbox-menu
-+	@install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu"
- 
- doc:
- 	robodoc --src . --doc doc/ --multidoc --index --html --cmode
- 
- check: openbox-menu
--	./openbox-menu > test.xml 
-+	./openbox-menu > test.xml
- 	xmllint test.xml
- 	rm test.xml
- 
diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild b/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
deleted file mode 100644
index bbdd608be6b7..000000000000
--- a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch toolchain-funcs
-
-DESCRIPTION="Another dynamic menu generator for Openbox"
-HOMEPAGE="http://fabrice.thiroux.free.fr/openbox-menu_en.html"
-SRC_URI="https://bitbucket.org/fabriceT/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+icons svg"
-REQUIRED_USE="svg? ( icons )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	lxde-base/menu-cache
-	x11-libs/gtk+:2
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	icons? ( x11-wm/openbox[imlib,svg?] )
-	!icons? ( x11-wm/openbox )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.0-build.patch
-	epatch_user
-	tc-export CC PKG_CONFIG
-}
-
-src_compile() {
-	emake \
-		$(usex icons 'ICONS=1' 'ICONS=0') \
-		$(usex svg 'SVG_ICONS=1' 'SVG_ICONS=0')
-}
diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest
index 8a7a2ef2ddb3..791cea41b81d 100644
--- a/x11-misc/qterm/Manifest
+++ b/x11-misc/qterm/Manifest
@@ -1,4 +1,3 @@
-AUX qterm-libressl.patch 1838 BLAKE2B 806757d7a8d63cbdffd2b6eb99bcb9333cdbcbe8e74ea5f5d73d53e1fca0fdc6c8aa25337f144aca0398606e771024fd52d96eb320a7d0f8f85c114850a29557 SHA512 927c2753d205c1d047f2c289ea170da65d9db1eb5713334a947e1aebe0a3c67e630d06a2607b0656e286e27813dca781e0e6f8215dfa483fc804b4dfdb19c171
 DIST qterm-0.7.3.tar.gz 901423 BLAKE2B e3f799946bfff4531e77d04fe535d53ef92093d1435aca32b06fa43c444c55798ab1c8408847dde81d1d24b5fda0c4a4f58fb563369f2c4669ba43929695cbd8 SHA512 93fdd24d79a81853654a4702ff55b2fad80c1cc734ec3230a297b3a2613cf24d41f4c645eadc5f34b6025f548e7c8cd5d291d4c29fc919f8966eeb8b44f5c046
-EBUILD qterm-0.7.3.ebuild 1232 BLAKE2B a6a50c25de78620c24210afe6d5d5f7daae19e0381fe7f2c35feb7c01520b3ab9d071642a4c5962fe4a46bb7296616cfadd989b5774236e21905a74140eba3d9 SHA512 43db3c5df8b8205c318c60f89480fd89b3a6d52ac8e749c0daf160da81bec4f096497cd4c80164fb5c1218c80230730037464ae387652f1397d63273e7fcff25
+EBUILD qterm-0.7.3.ebuild 1119 BLAKE2B c7f6a58a67a1fe5d845a3188a6046aa9fb9966cf968bdee274970870dca617b044fe72bbaf482eb4917815bc7b8ed28c152fac365bb14a737b0deca8a2729562 SHA512 181e47bfb5e2c6784bf8d32fb57d247d84d2c8aad0158b0fd856c6033ab1f0be74b02c8e1c2ac197767c71ea4ed528b96108d549f5d876f3bc205cf352730ae0
 MISC metadata.xml 293 BLAKE2B 6002fd21add821174cd04d8dc6ec845ef5c157b471c793a95677a8caa7a5cb29dd264a04fd2567b9b0e1db1c5e7be231f1687de178da32c978c662c32d08e3d2 SHA512 173faeb4d6ac45faa8f9997a26d1fe2fc915e5ec9174055103560dd154ee772fc930ad901c3b4288fbd69b88914955a018d0526bc8fbdcd197a8597157ab308a
diff --git a/x11-misc/qterm/files/qterm-libressl.patch b/x11-misc/qterm/files/qterm-libressl.patch
deleted file mode 100644
index d0e0ae1f9cb5..000000000000
--- a/x11-misc/qterm/files/qterm-libressl.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/src/ssh/libcrypto-compat.c
-+++ b/src/ssh/libcrypto-compat.c
-@@ -8,7 +8,7 @@
-  */
- 
- #include "libcrypto-compat.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #include <string.h>
- #include <openssl/engine.h>
- 
---- a/src/ssh/libcrypto-compat.h
-+++ b/src/ssh/libcrypto-compat.h
-@@ -9,7 +9,7 @@
- #include <openssl/evp.h>
- #include <openssl/hmac.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
- int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q);
---- a/src/ssh/socket.cpp
-+++ b/src/ssh/socket.cpp
-@@ -36,7 +36,7 @@
- SSH2SocketPriv::SSH2SocketPriv(SocketPrivate * plainSocket, QByteArray & banner, QObject * parent)
-         : SSHSocketPriv(parent), m_banner(banner), m_status(Init), m_sessionID(), m_channelList()
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     OpenSSL_add_all_ciphers();
- #endif
-     m_sessionID = NULL;
-@@ -56,7 +56,7 @@
- 
- SSH2SocketPriv::~SSH2SocketPriv()
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     EVP_cleanup();
- #endif
- }
-@@ -133,7 +133,7 @@
- #ifdef SSH_DEBUG
-     qDebug() << "init ssh1 session";
- #endif
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     OpenSSL_add_all_ciphers();
- #endif
-     m_inPacket = new SSH1InBuffer(plainSocket, this);
-@@ -148,7 +148,7 @@
- 
- SSH1SocketPriv::~SSH1SocketPriv()
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     EVP_cleanup();
- #endif
- }
diff --git a/x11-misc/qterm/qterm-0.7.3.ebuild b/x11-misc/qterm/qterm-0.7.3.ebuild
index 981295849dc6..6b63700224d9 100644
--- a/x11-misc/qterm/qterm-0.7.3.ebuild
+++ b/x11-misc/qterm/qterm-0.7.3.ebuild
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="libressl"
 
 RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -23,14 +22,12 @@ RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	x11-libs/libX11
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qthelp:5
 	x11-base/xorg-proto"
 
-PATCHES=( "${FILESDIR}"/${PN}-libressl.patch )
 DOCS=( README.rst RELEASE_NOTES TODO doc/script.txt )
 
 src_prepare() {
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index c6ab06c5a2bd..9078832555d6 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -5,5 +5,5 @@ AUX rss-glx-0.9.1-imagemagick-7.patch 5238 BLAKE2B fd3c02f9433d7d77dee0e4f6ec71a
 AUX rss-glx-0.9.1-matrixview-copy-font.patch 518 BLAKE2B 39ca9c83c71f88cf967731115fd8df28feca7d63cc1f462a8cacedcb332c1105445354f262f49a428a0f393b6217cfb3b1e5b9c35b61cfe29434f33b8649f554 SHA512 da60ea89d341a951f2880c86b0c624ea7f2e1f04350387db23229496a06b3bd6392ee1a4b723b69eeadcfd538eda01ca8dba6afe33e92ef4c88ecded05615fea
 AUX rss-glx-0.9.1-quesoglc.patch 736 BLAKE2B 62ec14f17ee76b04f4589d71a646fc77d3521ba512d0888612cae701fedfbcb2d81fd1717210fb663c322b0088555fa0783faba91b68991f422e4962a3dd0b02 SHA512 9e71e5f15017593a15d72f005cd365a7bde5974fc0e7555b6d4a61c5ab019d92597952af7afef0cef8cc32782a1ac66ab74d11df3fcd4dcdb716d04d1bcb1b4a
 DIST rss-glx_0.9.1.tar.bz2 5435799 BLAKE2B d8161f06469f1160a6e80bb47a333746fac82df4d92eb9d007c7d6fe3a32e1a54a30d4675f64b100fd5509977dfbda7e8821daa462f00cbf748cc7c4bb8afa72 SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961
-EBUILD rss-glx-0.9.1-r3.ebuild 3967 BLAKE2B 12925b77afbf143476c29c1be4b2fa2ed1dd8fd787af5d0ee6202dae605dfe48cc3171c7cfd56f6221f4f04181d0f5e2055ce8a9ccb48657af07928bf4c5c030 SHA512 a771b6186448f774025861714d9c1a5bd94347e168b55d428e1f094dc6a78f0167186d2214fd243a93409d6ee425ec5e65b04d3ee07f4dbfba42d3aeeda5ba2b
+EBUILD rss-glx-0.9.1-r3.ebuild 3963 BLAKE2B 1bf58b04e85b9d8bbe5aec2b39b8506a429fc1a0cdb5279635b8c09d474c6e9be0cf100da13acd2aac6a39adef8118ae4d14e19928ffc4275517727f458ff859 SHA512 ef65c54899cdf09e4015ebf957c2689c90a217dcc19a46ccd379791b15ec69127fb415b466484792b48a848f43c170d63b55a49897812f890eea305983200b80
 MISC metadata.xml 565 BLAKE2B 12058c9f2b265ad0871edf45d3432ee605ccecbf7b9c0f3dab5752dbaa061100203653ac01cf2bf251e3698163d542d133d6ceca26d2c7ddb3c1b885a3876c3f SHA512 acae3bfe457c4c171b9cb8458cfd455ed6e9d8b253dc3db659aa5d843e01fdfb68645911d34f200fc140bf2fcb9f19228d2ad169ad75dce5e2f9bc8f21f2f33e
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild
index 1af7c945fa98..28f3cef7b41c 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 IUSE="+bzip2 openal quesoglc"
 
 RDEPEND="
diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index 736c1abb87e8..3add6c1297e6 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,7 +1,9 @@
 DIST safeeyes-2.0.9.tar.gz 291147 BLAKE2B 61f56b7c73964f1663eff4da7965c54ff413535d55fcb3c4dbe2b5caef6f1d8e7330d5191711b87f274cbbf4458d0dff2c0dd6f5531755c556d81455438b46cc SHA512 6a168686faa716bc1da9966250bb55654ccab926775207ff1c2104b2da802ccbd50f916ed9f7cec55ffe2b5b12ea63b5bdefcfbf35f044a7fb9ba9cb4918b2b2
 DIST safeeyes-2.1.1.tar.gz 342791 BLAKE2B 0051267daacb1a8f5dcd6c88c0132d09483cc5181c59a19f34b956ea97672a44fbefc78b8b1ec2223428df159dab3074280afd3069618dc3b3257f3703e9078e SHA512 ad1f7810646010902b30effc899743c986a5bc56734f6ded0f22f0e428ec772b419aa11348d75c406f931b126737a809fabf9e029a4936976f889714629ac0b1
 DIST safeeyes-2.1.2.tar.gz 348431 BLAKE2B 03d51c435f62e00703aba4c1224a5a961b1a187d22e3470993a7bb4c2537dc27dfe784d4c53403905853fa79aaa1ef8e8bfb2333045a2e0d2ec48452483baa7f SHA512 2d67c198fbbf7d5813d900450c6608870f5ca692f533cbb68d36e7f34e197e2e9b52b3210b328318d5c64fc430092748ddd2dfa6e493a585fdada920f933a434
+DIST safeeyes-2.1.3.tar.gz 354494 BLAKE2B 5f7977a8de280f5022cb226689c5b1d48f494932babd014b9ee8affcf9aaa0ef8dfe3ed18c33dbfa4ebaf1c5bfdbed4efc3b69c1ce3065e3ff3c82e83fa71723 SHA512 8a708b3e8f40f75659092a2effb0318b0fb7f47345e3f430f6b83ff2fc3c7de46b2dc881bf69902055bc8233f539946e60822e6ab7a6149f2c99441af1191f48
 EBUILD safeeyes-2.0.9-r2.ebuild 1061 BLAKE2B f1f2da8fd981b9bae189691a6f3da6313c2b70138f3282cc536e20e0e30d9953236b81a65d8fe0f823129c1a4306673b530571da5a7c3959387bf9983335c2b2 SHA512 e9e1d7fdb90c1be5640bfa0457dcab4fdf8069198d76c9d66ea3011004b7b9963023a9b4730d8cf96dd6b0b5bcecfac78cdd003b64a37446c6dd69207c484a08
 EBUILD safeeyes-2.1.1.ebuild 1100 BLAKE2B b2bea10c80ec9014257debd33a69caa149ccbb0b3243a8f59e183ab04deefedfe6cd41147af6aba636368e5b5f00dba7e268b044c7efc7ee46c567298fb8ce5f SHA512 c93e668802febe7d6ca873017ada4f096c852da76fd06cc7752d3c1eab76eb437d53df7e856dbfd870100ee2adaf12d042be4f36dfb7c1338bdaa4411e2bdce0
 EBUILD safeeyes-2.1.2.ebuild 1100 BLAKE2B a698de06b0e7382e08c3bd19f07f997c9a1de6a7219623a448e6852105aab3d5aa124bba564d11b963493f0cd28b8ee99a9c991e4c07813f42a65f193b1e3f6d SHA512 f0164bda39aebc214d9a3a890b91760ee856da098bc799dbb67dbb8dbb3904f770302bae8a7595a90258c3239d34dcf4a1308183ac549e148af60956dee0b6c3
+EBUILD safeeyes-2.1.3.ebuild 1100 BLAKE2B a698de06b0e7382e08c3bd19f07f997c9a1de6a7219623a448e6852105aab3d5aa124bba564d11b963493f0cd28b8ee99a9c991e4c07813f42a65f193b1e3f6d SHA512 f0164bda39aebc214d9a3a890b91760ee856da098bc799dbb67dbb8dbb3904f770302bae8a7595a90258c3239d34dcf4a1308183ac549e148af60956dee0b6c3
 MISC metadata.xml 346 BLAKE2B 3840a2a7a8d6855de3408976ad5a12f0570ff312861f96fdebeeb944f8578c0aa0cbb9ac0324ba30dc455dc4550ed2b7666279a65262be79ddc06adfa1131103 SHA512 3eacc25749a3311010821adbf6319cad682aaba64cf1c5c4eb5fc90d1558495326394001c22c9474100de2037dd6cb922f53fb4d51b056a0b35791051151af7e
diff --git a/x11-misc/safeeyes/safeeyes-2.1.3.ebuild b/x11-misc/safeeyes/safeeyes-2.1.3.ebuild
new file mode 100644
index 000000000000..9f1c4ee65890
--- /dev/null
+++ b/x11-misc/safeeyes/safeeyes-2.1.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit xdg distutils-r1
+
+DESCRIPTION="Linux alternative to EyeLeo"
+HOMEPAGE="https://github.com/slgobinath/SafeEyes"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="${PYTHON_DEPS}"
+DEPEND="${CDEPEND}
+	>=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}]
+	"
+RDEPEND="${CDEPEND}
+	dev-libs/libappindicator:3[introspection]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/croniter[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+	media-sound/alsa-utils
+	x11-apps/xprop
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-misc/xprintidle
+	"
+
+DOCS=(
+	README.md
+)
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 6bba89236196..2df8dc745be3 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,8 +1,5 @@
 DIST googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz 876756 BLAKE2B f51050e656a449e7d8b7d4d920439825dc5857a8fac637b96191bbf668b6353b0e83c5221395f761ca8d1d29a20596ced4d8b4e08b3ce364a866cf7bcc977e4c SHA512 f77c747218dc5ae4858b2b4c58a401eb895493adf470a331d6bac32cd20542533ff3a77081db653bbc18b9f55f6864be04e1739ef4afaed7db39d7c698abf880
-DIST googletest-aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
 DIST synergy-1.12.0.png 31383 BLAKE2B 228487058d09ee4fe7d3c909a3aee567b63c0d1aeaecf0e724a7bc9c59e48abecac71f8074902fd4f02ff9347fe8f6488b0554fb78a253339b04fe8d2e958d24 SHA512 7044395b41a0d2e49d308c599710fa32398d11584e70da32d4a1ccb292b02437c09860ed14f7bdd113a646daf696988fd3c0b80f3ab52ebbcaddf4c846cdd7ab
-DIST synergy-core-1.13.0-stable.tar.gz 8657662 BLAKE2B b4da6abd1b396f71aa37531e1adf71ff06d4804b74659db362a8fe2701c44786108ecc8b52932038490dfad8b7ae617f13a365ebe1ecf559f50106772bda9102 SHA512 317f0aae7742a3ecaea2f3138364a5cd1a098d76a2decdb6558900112e5dd0b53c457b461201d25d3a33cc2d9189e1f7f4e777a80b98c87d693f51b636cbb564
 DIST synergy-core-1.13.1.41-stable.tar.gz 8663717 BLAKE2B 13d0722b183080361492382d3dd489b911cfe2384390c7b614d17df7f681dfbd8be94fa79cc4088602ea3d431fee793aaebc07f1d976cdd9c22493fba2212392 SHA512 3743ea4ccf8734928d021d414c2f10839056cdac64768f2e3e89b73392969b392030a0d9250041a1c2c21db06659088c8ca66d952c07395baada154df0311b87
-EBUILD synergy-1.13.0.ebuild 2457 BLAKE2B 7e80aa1fa1092a93a53f9ab2324a4d2fe791adb79697bb45f704eb9408dd21aaabdf13437eb6d4ec9c1fa0c3dc4e965ca9e96125347adee03615945b477725f2 SHA512 b7d7df1beb565846951b9f228ac3c8c6107e3b505845b868ded9c88eb4b95e0ee75f415ea8704d266b77cd492f3afbd6388e218e37430b5dfe580581e71a23a2
-EBUILD synergy-1.13.1.41.ebuild 2525 BLAKE2B ca6121e35ffd6cac1497b776edf0bba6159ede74363877611652c7e4ef9fa9d5b687f59376e5b716785059511028a5e6487bdd26a246060720d2d316a8fdcf8d SHA512 ba883f7782ca4b11871a45585573b549d3b53f1e43d68cf9941c510e017730e1abde1b5a42868ce772cbffc26cf71c226469c7987c6477d148341fe0fb16c569
+EBUILD synergy-1.13.1.41.ebuild 2465 BLAKE2B 4c841e8b2643d6098a99f6ca929d4dc0e40dfddc797c27920a440c8d6488931c275aa2112489055912b51a5e1745bed54198a8d1452dbedfb7b9a1afb2f61be8 SHA512 5916ec2e135a39fd83491f83d5953f6583501d13f1527319ad777799721d1eede814ffb1840f5884d5490fa6704a5e724ddfcc5260be231effed43345c9c1b9a
 MISC metadata.xml 332 BLAKE2B 04a719c2b19204a1ea7ed755c89b072b271760a85f3b2b7e734796deca104682c147372a1d154d4fdb493d7025e16cfc2012e7d352fdc88dde93d0f3df477b67 SHA512 8c447ce795a81157c40a2839d8845d6db89ee768f70aa397b686b5ec9a7e59fc66f9fec5561e25ab0aed68bcabc369c0c53660ee2a0b7e24b52e169d5debaae0
diff --git a/x11-misc/synergy/synergy-1.13.0.ebuild b/x11-misc/synergy/synergy-1.13.0.ebuild
deleted file mode 100644
index bc5d23654028..000000000000
--- a/x11-misc/synergy/synergy-1.13.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils virtualx
-
-MY_P=synergy-core-${PV}-stable
-GTEST_COMMIT=aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e
-
-DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
-HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core/"
-SRC_URI="
-	https://github.com/symless/${PN}-core/archive/v${PV}-stable.tar.gz
-		-> ${MY_P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/synergy-1.12.0.png
-	test? (
-		https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz
-			-> googletest-${GTEST_COMMIT}.tar.gz
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="libressl gui test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	x11-libs/libICE:=
-	x11-libs/libSM:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXi:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXtst:=
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	gui? (
-		dev-qt/linguist-tools:5
-	)"
-
-DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} )
-
-src_prepare() {
-	# broken on Xvfb
-	rm src/test/integtests/platform/XWindowsScreenTests.cpp || die
-
-	if use test; then
-		rmdir ext/googletest || die
-		mv "${WORKDIR}/googletest-${GTEST_COMMIT}" ext/googletest || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYNERGY_BUILD_LEGACY_GUI=$(usex gui)
-		-DSYNERGY_BUILD_LEGACY_INSTALLER=OFF
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-my_test() {
-	"${BUILD_DIR}"/bin/unittests &&
-	"${BUILD_DIR}"/bin/integtests
-}
-
-src_test() {
-	virtx my_test
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/bin/{synergy{c,s},syntool}
-
-	if use gui; then
-		newbin "${BUILD_DIR}"/bin/synergy qsynergy
-		newicon -s 256 "${DISTDIR}"/synergy-1.12.0.png qsynergy.png
-		make_desktop_entry qsynergy Synergy qsynergy 'Utility;'
-	fi
-
-	insinto /etc
-	newins doc/synergy.conf.example synergy.conf
-
-	newman doc/synergyc.man synergyc.1
-	newman doc/synergys.man synergys.1
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use gui && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use gui && xdg_icon_cache_update
-}
diff --git a/x11-misc/synergy/synergy-1.13.1.41.ebuild b/x11-misc/synergy/synergy-1.13.1.41.ebuild
index 7726b27d8d65..21abd7f2c78b 100644
--- a/x11-misc/synergy/synergy-1.13.1.41.ebuild
+++ b/x11-misc/synergy/synergy-1.13.1.41.ebuild
@@ -23,13 +23,12 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="libressl gui test zeroconf"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="gui test zeroconf"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:=
 	x11-libs/libICE:=
 	x11-libs/libSM:=
 	x11-libs/libX11:=
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 2fdd6c922a30..103ed2fef087 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -5,8 +5,8 @@ AUX vgl.initd-r4 865 BLAKE2B 40e417f0dce3f2cf65c4154b40fdc4b8a1ded87e96f5c7ed047
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
 DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3 SHA512 a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
 DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c SHA512 0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532
-EBUILD virtualgl-2.6.4-r1.ebuild 2929 BLAKE2B 2c591c97f2cb5fd44fb96d970a7e99f2c0c6414303a179e7a455e53a0699d38d7358b814b5d67a4bc58eb3bd666cb5b9956317ae3b8255fcb77c405a72e01323 SHA512 7d72262e2e9f00c4895aef235b054281fb4c93843055d7802029d3f38bce1bcfd3f577ea015004ed805505b3d958b28579bf3932d6fefaf3976c12fe4cdaec81
-EBUILD virtualgl-2.6.5-r1.ebuild 2929 BLAKE2B f1ff2337fecf6667c8d034801a69588c3ebf3265957192211470513c81667087a834f8507763f7348e93729644170de473fc807492625d1be099a6a79d65b4f0 SHA512 3307ede0fb1fbd75108e3533afcc129d02356f34532d33ac2a53acc7750214064508b045f498f997c7be222a154f63669613848b53a70cf9d448242819d1db0f
-EBUILD virtualgl-2.6.5-r3.ebuild 2929 BLAKE2B 9de240e7d4938d97e9322fba93db335766b33f084f4e7c507799bcac8caefb5941de4428f1718dcdab71afe7ed9dc6f6a9ea09f06141254c97c1c9f7610478de SHA512 b482b7657dd1069be2ef6132341752dc5f550e3eb20e933245c9fc5a1aaaa055d6bbdcc3060720982f519a7590ea9e968a61c22709605145170df96d77933839
-EBUILD virtualgl-9999.ebuild 2711 BLAKE2B bce5041ac76d32f7ecb088b99cfd95968499454174218ece577f40924667dd2a8eaadd25be775cfcb47b6375c0a09e1c3b75b62853d085cadaaac49b2d697f85 SHA512 0fd74021f9badc5d61691012377266ba271ecdf4588483a8f3a10697b779d37c220cf19857be695c7c222b2bc98acec20ab7a1db782c8c70357a54ed0ea5a8d7
+EBUILD virtualgl-2.6.4-r1.ebuild 2848 BLAKE2B d7cadf6fe5c35c80e16cc13392f36deb5a9061bf16dc61a8b3b835207ee61ee2160599077940c8649f410ce47bbeb27b92708a8d4f76b0aab37400c8ad1a01d8 SHA512 8a085aa3666ef3363e425d1094bc655a4ecaf17397db23be95c50bf0718c0a3837dc7e70fc80b30bda9d8c85c9983ab22c1854662d1135970517217ee90420b0
+EBUILD virtualgl-2.6.5-r1.ebuild 2848 BLAKE2B d7cadf6fe5c35c80e16cc13392f36deb5a9061bf16dc61a8b3b835207ee61ee2160599077940c8649f410ce47bbeb27b92708a8d4f76b0aab37400c8ad1a01d8 SHA512 8a085aa3666ef3363e425d1094bc655a4ecaf17397db23be95c50bf0718c0a3837dc7e70fc80b30bda9d8c85c9983ab22c1854662d1135970517217ee90420b0
+EBUILD virtualgl-2.6.5-r3.ebuild 2848 BLAKE2B eb2a75488e9b0665ad0fe1aa76df07a1883b6d8a7127f289a3662fb130ef0696dbda2d6df3ae3e19ceac845b613421b765facc76b68ded7e4107f8315e766355 SHA512 373e385252ea65083a47aeefcb9a2a6e4f49bdd9e97e44db1d9da525841e137151f9168cf6e8fcf1550d7d1e81673750eae05c9769df29a7eddc076be5a32c13
+EBUILD virtualgl-9999.ebuild 2630 BLAKE2B ca9e4537d5915ce4c0492560d9c50104da8299bc0153990aab9d27c186cffc0779401215e63acaeabb6f2250ab637601d829b5579b2dc2ed2c66c669e6191b2e SHA512 56e2e841bdeb21754519807803c2c07207afec59d02893b0192e071e8d68ebe32b12e95a26084ae2d52b88e2aa5b32b484e49adf2ce5690bb661c1e2be0a530d
 MISC metadata.xml 872 BLAKE2B d89ac0de99c9146812da5dfa0e6cb12d403e67f66fb5957ebe4bbeaf39e8512398d4e3fae7db92d5c896e8e72175066692efba1819233e40f676985fee2f713d SHA512 10d56438137d9398233e0e0b1ecc0b39c484d8154d40203990f2965c62b0f6a701228878b4e3241f040dd26301b2348842718271191167c03d18d6c44173fece
diff --git a/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
index 0778a983fa19..e01895a2c0f3 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,12 +22,11 @@ HOMEPAGE="https://www.virtualgl.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 	)
 	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
index f537ef884323..e01895a2c0f3 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
@@ -22,12 +22,11 @@ HOMEPAGE="https://www.virtualgl.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 	)
 	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
index a7857fad0339..73e5a82a2e38 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
@@ -22,12 +22,11 @@ HOMEPAGE="https://www.virtualgl.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 	)
 	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild
index c464597e5bcc..66a5b0070353 100644
--- a/x11-misc/virtualgl/virtualgl-9999.ebuild
+++ b/x11-misc/virtualgl/virtualgl-9999.ebuild
@@ -22,12 +22,11 @@ HOMEPAGE="https://www.virtualgl.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 	)
 	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 4ca07785f124..392529622bfd 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -2,11 +2,10 @@ AUX x11vnc-0.9.16-CVE-2020-29074.patch 774 BLAKE2B 5a8fcb123f1698e78f76eb1828f93
 AUX x11vnc-0.9.16-anonymous-ssl.patch 841 BLAKE2B d037f4f784fe12cedca33be6a638524785342d4da9c2cd73acf138b64978d8303ee45fe08cc7516dd7baeed596bf53647db82caf693022cceb2e0b43c94f5dab SHA512 8c56c76758eb117db590415debaa18eec441ef952dac607ab77182f414e0e5f76d4a1dd2e543e0542a0fd413a8ec5dc2661f1dbabb27a4d6b36eacb09327ce2c
 AUX x11vnc-0.9.16-crypto.patch 645 BLAKE2B a821861e4e4807e5e019c787d07791912083a3ae2d1e4c77eb3264adee65a68ea51c35fdfcd0d71b996f4af42ff8481c877f5f324180139857e5cfc7d0ac3db3 SHA512 6e9ec1eb5aba65999dda9048fb01e13c55cbbf6f3e226c23e20ee906891487a5c94efd09f54ac765ca1ed99290357403a0b2caa3a7226fc967b0e8ecf19360a6
 AUX x11vnc-0.9.16-fno-common.patch 1079 BLAKE2B eb1cbe8e959eeea0940b44d3804406d2b9a18261a279b05fa54dff1240674d51dc44ce4fff9ea64a6644e532c80499287bbb1025b06b47d3b2546eb76f32fbce SHA512 3acaa4e57921673aef14ce2e9931880bcbc8c3d73708124599b8ffc79be6c4fa43713184f01983f4f432e29137c3628902681aed275ca98c7a6f32cb10bc54ca
-AUX x11vnc-0.9.16-libressl.patch 4083 BLAKE2B 0b95dad69a0f7180edfe71da6df2c9e6025ba57ac984a04dc118e642b1ee2a6757c11d400a2e3641e71b367e4ea42d7557d48ba932d55ef839f122ea9170aab2 SHA512 041f57dc654bbf18c9fc741d42d9cc6f0646f619b2d3a473898b2e5d20609e7f475a7abfbd1e0fb9ed01017474aab0241ce04c37cec2e8acbd813f8ee678ee53
 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
 AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2
 AUX x11vnc.init.d-r1 1737 BLAKE2B ac457d4acf27e3a2e26b6315530d326efae4e5583770623362eed65e45aad5a596a13da5325de8ad4155a2d335d3a8a62a41a1bc01facfdefacd5d5e42005df0 SHA512 b39efb164beeda4cf62c530aae4a3127358cc7ccea888df09e48f6a3a53affad0d3f3fce9cfbcfb17e9de131ec945a51e2680d7410e14b169d0295aa4cf85e91
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
-EBUILD x11vnc-0.9.16-r4.ebuild 2049 BLAKE2B 70251f73469627e347c411f9de285bb2691448251deac7029f7e6fa4f682d19ed8c07c17a8b51531a83e4baaeb5a2f93a7f63ec9ff8f83037ff53ef481af1a23 SHA512 0a95a6d066e96fddc25a5024ffdf1ff886d8e936dbac5e3924f15b3aa5921a76d347b7e5f9ffe06ab01fb397b1ae637049d85758e9db4a5c6ae496d4daf8fba2
-EBUILD x11vnc-0.9.16-r5.ebuild 2052 BLAKE2B 1cdd11a5d490a8aa5357091f982cc717af36a45b37b93b5f2a735e1fbe283cd9287d2d860b45e86670409109b5e5cf5b8dc31653771da3b2db5ba97be049db6d SHA512 7da4c64a17ba7520cc675af0386cb128b0dbc202e6facea149afda49c3bd574759393ca93003f859b3eec87be097f5b1733757f2c0d6432bcc81bceec0547e7f
+EBUILD x11vnc-0.9.16-r4.ebuild 1951 BLAKE2B c80b9ce7a02a568f234122c9c8894db3fa6f7c89475e25f892c1f12ec7299804f6d8521dd53e8642ee09d65812fee05b59d891d6c38ae27e145aab36aaa94238 SHA512 7552208443082fe2013a834d045508ce2b5f7e8e116ed0ef12a3c41dde2c4068f0c145f56a33678ba5a92ee208ca32478509caf898da1c72a00a1fbfcf600f2a
+EBUILD x11vnc-0.9.16-r5.ebuild 1954 BLAKE2B c81558ce3126adb21bceb4eda6f5864b404854438b599ee19b252a66b5b13799244b6698f98dbf8733139463581b6caa4bbf601d8b3a08b8839f2bb8e3b45db0 SHA512 fab84e141b59eee7f1a2949afcd3fbe948cd7cc9bead8b76dcdb6167fad65e5c9dc1beb2e2211cefe363c5da2ddaca78803d9b7a207d20700e6d573c523b242d
 MISC metadata.xml 952 BLAKE2B 4ac05ec6aa72acea1a2eb3b8f5b6d2ae885d5dc9c53eceb352f9fdd24ef19d3f269acc438421a2d3b13a0b9e1dba92e05562b5017aee5f8409f1db4b9d424d7e SHA512 4860713eb293d1aa29342953129b92525fb0ef5b6cd5462f1e5a425c6d28bc70a5cb421f2755643ecb42921e574b6eefb932cef80a420458f25ed12211da1c8e
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
deleted file mode 100644
index 8e5d8a692175..000000000000
--- a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/src/sslhelper.c b/src/sslhelper.c
-index 04c2e27..fb9daa6 100644
---- a/src/sslhelper.c
-+++ b/src/sslhelper.c
-@@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, int rwflag,
- static int crl_callback(X509_STORE_CTX *callback_ctx) {
- 	const ASN1_INTEGER *revoked_serial;
- 	X509_STORE_CTX *store_ctx;
--#if OPENSSL_VERSION_NUMBER > 0x10100000L
-+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 	X509_OBJECT *obj;
- #else
- 	X509_OBJECT obj;
-@@ -829,7 +829,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- 	* the current certificate in order to verify it's integrity. */
- 	store_ctx = X509_STORE_CTX_new();
- 	X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
--#if OPENSSL_VERSION_NUMBER > 0x10100000L
-+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 	obj = X509_OBJECT_new();
- 	rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, subject, obj);
- 	crl = X509_OBJECT_get0_X509_CRL(obj);
-@@ -865,7 +865,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- 			rfbLog("Invalid signature on CRL\n");
- 			X509_STORE_CTX_set_error(callback_ctx,
- 				X509_V_ERR_CRL_SIGNATURE_FAILURE);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 			X509_OBJECT_free(obj);
- #else
- 			X509_OBJECT_free_contents(&obj);
-@@ -883,7 +883,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- 			rfbLog("Found CRL has invalid nextUpdate field\n");
- 			X509_STORE_CTX_set_error(callback_ctx,
- 				X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 			X509_OBJECT_free(obj);
- #else
- 			X509_OBJECT_free_contents(&obj);
-@@ -894,14 +894,14 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- 			rfbLog("Found CRL is expired - "
- 				"revoking all certificates until you get updated CRL\n");
- 			X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CRL_HAS_EXPIRED);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 			X509_OBJECT_free(obj);
- #else
- 			X509_OBJECT_free_contents(&obj);
- #endif
- 			return 0; /* Reject connection */
- 		}
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 			X509_OBJECT_free(obj);
- #else
- 			X509_OBJECT_free_contents(&obj);
-@@ -912,7 +912,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- 	 * the current certificate in order to check for revocation. */
- 	store_ctx = X509_STORE_CTX_new();
- 	X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
--#if OPENSSL_VERSION_NUMBER > 0x10100000L
-+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 	obj = X509_OBJECT_new();
- 	rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, issuer, obj);
- 	crl = X509_OBJECT_get0_X509_CRL(obj);
-@@ -942,7 +942,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- 					"revoked per CRL from issuer %s\n", serial, serial, cp);
- 				OPENSSL_free(cp);
- 				X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CERT_REVOKED);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 				X509_OBJECT_free(obj);
- #else
- 				X509_OBJECT_free_contents(&obj);
-@@ -950,7 +950,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- 				return 0; /* Reject connection */
- 			}
- 		}
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 			X509_OBJECT_free(obj);
- #else
- 			X509_OBJECT_free_contents(&obj);
-@@ -1596,7 +1596,7 @@ static int switch_to_anon_dh(void) {
- 	if (ssl_client_mode) {
- 		return 1;
- 	}
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 	/* Security level must be set to 0 for unauthenticated suites. */
- 	SSL_CTX_set_security_level(ctx, 0);
- #endif
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
index 85403ad5c8bb..747abaec59d9 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
+IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
 	>=net-libs/libvncserver-0.9.8[ssl=]
@@ -20,10 +20,7 @@ COMMON_DEPEND="
 	x11-libs/libXcursor
 	x11-libs/libXext
 	>=x11-libs/libXtst-1.1.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	xcomposite? ( x11-libs/libXcomposite )
 	xdamage? ( x11-libs/libXdamage )
 	xfixes? ( x11-libs/libXfixes )
@@ -43,7 +40,6 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86
 	"${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85
-	"${FILESDIR}"/${P}-libressl.patch
 	"${FILESDIR}"/${P}-fno-common.patch
 	"${FILESDIR}"/${P}-CVE-2020-29074.patch
 )
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild
index cf172b51fea4..0980e502c5f2 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
+IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
 	>=net-libs/libvncserver-0.9.8[ssl=]
@@ -20,10 +20,7 @@ COMMON_DEPEND="
 	x11-libs/libXcursor
 	x11-libs/libXext
 	>=x11-libs/libXtst-1.1.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	xcomposite? ( x11-libs/libXcomposite )
 	xdamage? ( x11-libs/libXdamage )
 	xfixes? ( x11-libs/libXfixes )
@@ -43,7 +40,6 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86
 	"${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85
-	"${FILESDIR}"/${P}-libressl.patch
 	"${FILESDIR}"/${P}-fno-common.patch
 	"${FILESDIR}"/${P}-CVE-2020-29074.patch
 )
diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest
index 67bbb544d65b..209e287c031c 100644
--- a/x11-misc/x2x/Manifest
+++ b/x11-misc/x2x/Manifest
@@ -3,4 +3,4 @@ DIST x2x-1.27.tar.gz 16776 BLAKE2B 8f78d801c1911928b0d5bb37b406bcf5285d3a54daf50
 DIST x2x_1.27-8-initvars.patch.gz 494 BLAKE2B 97d48f4a2e7b65fd6755860c51399e5b6343bd0c7e6c79c7dd311792a899a02ed0ac6991d16495e96ca34913fbcec011b106bac6d0f9798540fb5704ca12f4cf SHA512 53060affef7575106932380063616473103c738193fdeab9118e0fb9ec1d1de2fe63f4112e5af82fe38198d0b42a10effde574bb9dee95c8fefdbdf680dbdf01
 DIST x2x_1.27-8.diff.gz 13291 BLAKE2B 4a4a0bf34a864596cff2f0722163bfe53968e30892bd0a18ed18ca6c3ef8f5bc763b215381c46792b499839397dbecab033bd9095646fad36613ad11beba1240 SHA512 8201ab5fd0efd93adec53cec3b48f7b4de907b2db184ffa6e85a1e16739b4d0021f4562820d0b4730a0f6a2779985b5574973c2b0ceb04b241f0d7dc15060b71
 EBUILD x2x-1.27-r3.ebuild 1472 BLAKE2B d31f4329ed5974fcda95f5f8c40b9989d0533bae79a4f6aa3c5e3bd1b100b158819095b433603527054d79e89082761fee5c29d121f7eebd4e20f8c85d8c2d08 SHA512 6d6a8605cf947b97701f2581a93973e6a8356c9dcdc0d2f9d0bcf77930c7800673044f4192f2ebb7e9b35e9ae2fa1bb6f25591cfbe022563d78af68586bb6aa6
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-misc/x2x/metadata.xml b/x11-misc/x2x/metadata.xml
index 2ba8e9e851e4..7a38bb900964 100644
--- a/x11-misc/x2x/metadata.xml
+++ b/x11-misc/x2x/metadata.xml
@@ -1,8 +1,5 @@
 <?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-needed -->
 </pkgmetadata>
diff --git a/x11-misc/xplanet/Manifest b/x11-misc/xplanet/Manifest
index de471aadc508..c5371f37df6b 100644
--- a/x11-misc/xplanet/Manifest
+++ b/x11-misc/xplanet/Manifest
@@ -1,5 +1,6 @@
+AUX xplanet-1.3.1-freetype_pkgconfig.patch 1226 BLAKE2B 36a63ea973ecc20cf04fe9444cf48601478aee18cdb74effbc9e40984209df32a94c0b091c112ab618e43ea1169c3f79d4b36720ad8a193bbade3f3e8749367e SHA512 924c1fbe5851be9619eb77fdce35314a4efa5f65cb09961f03b3af7478764a745a7344031881fc5eeaad206c05a6c554bfb0e4d69d1373b07f019297591cde10
 AUX xplanet-1.3.1-giflib.patch 1232 BLAKE2B 6f7e5a1c9388ed1d9cb13e6ec38ee53b0b5a1d2e3aeddab414cb24322582cab457850bfa75c2ef4d7575d9166be2a8f2303a7fb674d155d6ea00786575d471ff SHA512 56547a679361b7adf47191dfa5c011f93f1de288857f93a981c1bcdab6b4bc78c81b568748586f41fe0c49b634e5d7373875c579c0dfc05a5e256200889d7384
 AUX xplanet-1.3.1-remove-null-comparison.patch 6773 BLAKE2B 580f2275f40e9c182bcd201906565debd644843ea592f23c62283fb9c9f974ea1bf11e94c793dce24c042b048843165392f065cee37bcea2353527026b29de17 SHA512 a3ac916070eadd2b0dbd33fbe584f5d5d2f621556389f8d0542d591d5b384eb75bfd9e9bd7411b335bfa1e530f638c1c348063a90ebf5ae62ae65995ccb3949d
 DIST xplanet-1.3.1.tar.gz 1236035 BLAKE2B 71a5f856476e11333f5b97b4f7829c4376c570a44433b5a5ba1cfdf7cc425b1c9b89588cac3e0763e0c641a8b93c43bfc5f724fc3b9e3b5b418cabfa7193e0da SHA512 06ce3187fbd364f4ccee768fceca559690c905c870e2fb25ca32453ce09c564ba3455ec539f1e3da177de23a0611f767b375efe2e10b601d09313c0d068e35e0
-EBUILD xplanet-1.3.1-r1.ebuild 1627 BLAKE2B 2b292c51a77114b277a83e9a774f328a9712de229f0e0164aa99f7358bc4053649ce92a17c335190939705ab641451ff7e0247b4b87aa11b25cdd0c55bca22f1 SHA512 92e275404aedb5a28c77e415040bd05d84337e34062f781a8d54ffa89ef2884305dd0e9c273db4fe29e051c6a767f627085053fe07ea15bdc25f42a412aafdb6
+EBUILD xplanet-1.3.1-r2.ebuild 1566 BLAKE2B 76a39af13814e165a89180997b3ee273ce1a2044dd6fd46c6d57d28630de2e417a92cf7fae1bc0738a6c7275b17a0fc3e4593d73c4b208651689e40d0faab909 SHA512 821fd70b70cc9e8b23a1515bf6860d67094ea731efdd5a92151ddfba6a0e8d6619713bad20f63765d9a8951326687e53421528e06cf3f19ef12b3ea4826044e4
 MISC metadata.xml 244 BLAKE2B 226e613f84c971b753a4fa1760c169df3055140c07223abea160b458e3c900cc2c483444e3b365f5b8f89146b1a59d956dfc259934285c864fb7ca09bc1efe4f SHA512 9f1707f688ea67a2670c45acbb02e50e626f82c4552856be0b3ae799133818a757e2f727471f860ebf462ef283ec70a9c21ad295f6fec6300f215dbe131fa623
diff --git a/x11-misc/xplanet/files/xplanet-1.3.1-freetype_pkgconfig.patch b/x11-misc/xplanet/files/xplanet-1.3.1-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..534a32e9ef7c
--- /dev/null
+++ b/x11-misc/xplanet/files/xplanet-1.3.1-freetype_pkgconfig.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/788136
+
+--- xplanet-1.3.1/acinclude.m4
++++ xplanet-1.3.1/acinclude.m4
+@@ -48,23 +48,22 @@
+ 
+ AC_DEFUN([AC_FIND_FREETYPE],
+ [
+-
++PKG_PROG_PKG_CONFIG
+ AC_ARG_WITH(freetype,AC_HELP_STRING([--with-freetype],[Enable Freetype support for TrueType fonts (YES)]))
+ 
+ have_freetype='no'
+-if test "$with_freetype" != 'no'; then
+-  AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+-  if test "$FREETYPE_CONFIG" = no; then
+-    AC_MSG_WARN(*** Xplanet will be built without freetype support ***)
+-  else
+-    FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags` -I`$FREETYPE_CONFIG --prefix`/include"
+-    FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
+-    AC_SUBST(FREETYPE_CFLAGS)
+-    AC_SUBST(FREETYPE_LIBS)
+-    AC_DEFINE(HAVE_LIBFREETYPE,,Define if you have freetype)
++AS_IF([test "$with_freetype" != 'no'], [
++  PKG_CHECK_MODULES([FREETYPE], [freetype2], [
++    AC_DEFINE([HAVE_LIBFREETYPE],,[Define if you have freetype])
+     have_freetype='yes'
+-  fi
+-fi
++  ], [
++    AS_IF([test "$with_freetype" != 'yes'], [
++      AC_MSG_WARN(*** Xplanet will be built without freetype support ***)
++    ], [
++      AC_MSG_ERROR(*** freetype support requested but not found ***)
++    ])
++  ])
++])
+ ])
+ 
+ AC_DEFUN([AC_FIND_PANGO],
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
index 7fd20ea87c28..ac79390deb72 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit flag-o-matic
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Render images of the earth into the X root window"
 HOMEPAGE="http://xplanet.sourceforge.net/"
@@ -32,8 +32,8 @@ RDEPEND="
 		x11-libs/libXt
 	)
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	truetype? ( virtual/pkgconfig )
 	X? ( x11-base/xorg-proto )
 "
@@ -41,39 +41,32 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-giflib.patch
 	"${FILESDIR}"/${P}-remove-null-comparison.patch
+	"${FILESDIR}"/${P}-freetype_pkgconfig.patch #788136
 )
 
+src_prepare() {
+	default
+	eautoreconf #788136
+}
+
 src_configure() {
 	# econf says 'checking pnm.h presence... no'
 	use png && append-cppflags -I"${EPREFIX}"/usr/include/netpbm
 
-	local myconf=()
-
-	use X \
-		&& myconf+=( --with-x --with-xscreensaver ) \
-		|| myconf+=( --with-x=no --with-xscreensaver=no )
-
-	use gif \
-		&& myconf+=( --with-gif ) \
-		|| myconf+=( --with-gif=no )
-
-	use jpeg \
-		&& myconf+=( --with-jpeg ) \
-		|| myconf+=( --with-jpeg=no )
-
-	use tiff \
-		&& myconf+=( --with-tiff ) \
-		|| myconf+=( --with-tiff=no )
-
-	use png \
-		&& myconf+=( --with-png --with-pnm ) \
-		|| myconf+=( --with-png=no --with-pnm=no )
-
-	use truetype \
-		&& myconf+=( --with-freetype --with-pango ) \
-		|| myconf+=( --with-freetype=no --with-pango=no )
+	local myconf=(
+		--with-freetype$(usex truetype '' '=no')
+		--with-gif$(usex gif '' '=no')
+		--with-jpeg$(usex jpeg '' '=no')
+		--with-pango$(usex truetype '' '=no')
+		--with-png$(usex png '' '=no')
+		--with-pnm$(usex png '' '=no')
+		--with-tiff$(usex tiff '' '=no')
+		--with-x$(usex X '' '=no')
+		--with-xscreensaver$(usex X '' '=no')
+	)
+	econf --with-cspice=no "${myconf[@]}"
+}
 
-	econf \
-		--with-cspice=no \
-		"${myconf[@]}"
+src_compile() {
+	emake AR=$(tc-getAR)
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-04 22:28:33 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-04 22:28:33 +0100
commit	a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree	8c764c1cc0576389ce22abd317bceba71ea5732d /x11-misc
parent	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)