gentoo resync : 11.05.2021

15 files changed, 97 insertions, 362 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c754422319d6..20800e009668 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index fc64549d4c9e..dfc2236be2dc 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,3 +1,3 @@
 DIST alacarte-3.36.0.tar.xz 201088 BLAKE2B 26c924a8a88c014358db38496cb8a20eca82e9b3d514a9feefa64db3674527cef454346c538a1cdb04ebbb384a64dee395738d8d2a19f4d2445e887f5714f8d6 SHA512 7406fef4c59f94f26d52ad6b52ddd8a5183e9ceb50834aecd5e83f60d996ab4efd09ecbc9d3568d65fe1dd9290e446b5c5c5f6ad89c7e81b0ef304d2a10476b9
-EBUILD alacarte-3.36.0.ebuild 813 BLAKE2B 233eb0c3efe2b3fd7d61986f9906815db3a31798eb554312341e731c3e293a40b08a380f1521c7990e5eb7b449f113be8c3f829b7a533e0b79a53f57e123af0e SHA512 bfc87d0f61ab51c8ab395f9ab3d01698242fa94d4fa9de50cf189a4194a1963a02c321ceb7bcdd793fb0ecc1355ddfb832514fca2bbaac16b443ccde5de97491
+EBUILD alacarte-3.36.0.ebuild 815 BLAKE2B bcab60781f6e562b107c1dcc1832e2035e184c7d607d01e29e26f416014c2eac03c8d3c099e77c78f384347f7bef809ab916aaa0629e49ecb76364ecacb9834f SHA512 b8397835702b33b0e5a54019cfccc77f19fdb21683b25f347d73fefdea72cf84d31fe9e087dc14413e8098a81d1bd2eb5bbff00c69f98e491fa2fac39a3a7cf8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-misc/alacarte/alacarte-3.36.0.ebuild b/x11-misc/alacarte/alacarte-3.36.0.ebuild
index bf24c79d1e82..5a2ea11ced13 100644
--- a/x11-misc/alacarte/alacarte-3.36.0.ebuild
+++ b/x11-misc/alacarte/alacarte-3.36.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="xml"
 inherit gnome2 python-single-r1
 
 DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="https://git.gnome.org/browse/alacarte"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index f6a26626a596..49765e2b9569 100644
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -1,4 +1,6 @@
 AUX idesk-0.7.5-glibc-2.12.patch 544 BLAKE2B 460044772e452f1b583513c8926e99d1021e80a3906cdcde918f7177da415ac9d898d2097088d37a223b424444d25d3e0fadac489549a85ac1b1a812525fb16e SHA512 f21f419d7facc62990a35b67e57bec2f9b46c76a6026a267348edfbd0207c14682cf1a3b8ca0ab4d508668a0c4dc9cc8ad06921b3218f077225bafc3f1ae9fc6
 DIST idesk-0.7.5.tar.bz2 185858 BLAKE2B b1cc2e423ff7f9f9db12fcfd46c0d9b03e29ad6b4b44f79ab6fca76b356b7df798532261364e30991dfacef9d377b69bf3dc9b5f44baf817b44629eb3805f3e6 SHA512 42c15cecc6e2cf6546420542fc4480902fd33c26c19ffc32e65eb04d09116d3b80f5539cde4ca86d4bec30ce96417752bfe7416ec83c531235d9064d06ec0475
+DIST idesk-v1.tar.gz 195147 BLAKE2B 2b2b0dacbfb1d8fb950c88d990e3674bf8b4cf82d9022ed2f7be1f32082c46ae32d8200957e2e19d0d21ea1e4d59ec092f4cba90e712f79700a04f05c3a3aa14 SHA512 3190fca7a5c9fb36b66159107d22b5f6e50b4573afa21a3a4d8b8e3e5953dabda077c924e45d2607b849ee5fea141eb80f5b89ce5288ebc2490679f319edf768
 EBUILD idesk-0.7.5-r3.ebuild 770 BLAKE2B 4e21319d663f3ac90702593679d7108f00bc04304874bd97f66883cea485316203ec05c22c8e68e9b375e00dbfa09e30456020bd63bba98722e54e8238ff6959 SHA512 37135af52eeedbc2e60a979d0a53b9f9ff966cb8a5310f8acfe1f03c6f7ffa2f470154b564de2e20f9543b6c1be399be18d24c09890a5738ce26f24e10ca3171
-MISC metadata.xml 242 BLAKE2B 6f21bf5a2cf25c8d763eafde5f613db8b797c431030a5e381512a1b15b0085750637bc3950a0708ef4fa5dc305a22ff5ab8f0ed444f183045065d9240f7a92e3 SHA512 d4088a2f6b8afb65f763519718ebb5930a7a162d72b7944bfbc5c97e7649e9fe0366ed770903cc66c20408eef2f2a558dca3e018fa8e6690dcdd6af2e96db54d
+EBUILD idesk-1.ebuild 797 BLAKE2B d9a0193a865492906f0b8557f08ef1ee001bde0cd4aef22ca43610449e5b55a51206aa0dab9b92608bd593db379a61641149e5b470c962ebcfe022e8228f64ed SHA512 6bc7ac6cfbe348ace0ce3bfade0851042acb83d4395340345f3f5f04b459ba210eb98f091e32968cda91a7bd2a6b9d78abb1dd319d13ca01a5b31ea87f5d0cd9
+MISC metadata.xml 255 BLAKE2B ac7b0caab1c9941dd352d459085d56533edda0de037713a793249233f73ca3413d23fb202dfcb27befdeb5652a3c0c3797eb2d0c320d64c60fa25bee5b1d8a7e SHA512 c3a74b8ed09f82b34aba7d40b892a5db84ecb72b5ab655b792d1f9f2d3667fb6fc043b641c38b2635bc10843bb696f72d84a241156fe647ec138adace10565a4
diff --git a/x11-misc/idesk/idesk-1.ebuild b/x11-misc/idesk/idesk-1.ebuild
new file mode 100644
index 000000000000..f9ed02875606
--- /dev/null
+++ b/x11-misc/idesk/idesk-1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Utility to place icons on the root window"
+HOMEPAGE="https://github.com/antonialoytorrens/idesk/"
+SRC_URI="https://github.com/antonialoytorrens/idesk/releases/download/v1/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	dev-libs/glib
+	dev-libs/libxml2
+	media-libs/freetype
+	media-libs/imlib2[X]
+	media-libs/libart_lgpl
+	x11-libs/gtk+:3
+	x11-libs/pango
+	x11-libs/startup-notification
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e 's,/usr/local/,/usr/,' examples/default.lnk || die
+}
+
+src_configure() {
+	econf --enable-libsn
+}
diff --git a/x11-misc/idesk/metadata.xml b/x11-misc/idesk/metadata.xml
index 857674af5437..289c83aa4cff 100644
--- a/x11-misc/idesk/metadata.xml
+++ b/x11-misc/idesk/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="sourceforge">idesk</remote-id>
+		<remote-id type="github">antonialoytorrens/idesk</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest
index c34c0ee93f58..b6a3a512be51 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -1,5 +1,6 @@
 DIST read-edid-1.4.2.tar.gz 84138 BLAKE2B 300d2bf71477ffaf4a3ee2a100f6935635e17db3bd8419ea13e6d7c7fafc2e2d9476bdeadb231c73a71e299ecf9e62dfe7830187167ac40b92ef6e65e54c509c SHA512 b52c763a7713661a542f707d48251257c9540c4b1ad517b7ddbbc051edf919600cf27f93c13e32d5d6d148dd08327dc91f11eecc0b6db82179d044cef5b52550
 DIST read-edid-3.0.2.tar.gz 17508 BLAKE2B bd27f01fba0b9bf5ca5e5d8d4af422cc14120ce280ec1abe047f31e11f85fbe1b8a8e729b97ef2272e2ab3354871175e91bc11f8c15b2aec0cd10d37aceba392 SHA512 779ebe7f1ffb6e7952762b5f886e07974f2c0fe5fa9be0722b928559466b56aae450f741817bb91bb2e33ca66ab27af39cea3c7af220c99b85dae81734138aac
 EBUILD read-edid-1.4.2.ebuild 398 BLAKE2B b148b8369304073919a5af6b03aa2376400246edddc0357572d5c155d6029c2feef0599252a8e700f5708c4bbe87319879344d7a948e291fdf0d7efefc105739 SHA512 67b788582eed4a5fff82932ca8a10e0aeee71f4bd3e3d8e14821cdc8fd99881bb1f2cf255f4bcbed9510144206bd3b28b69dc3c508e6e24d912e882d8a59274d
+EBUILD read-edid-3.0.2-r1.ebuild 1012 BLAKE2B 1d5a2606e5f4caa190b8c0834f66dc06cfc53896b38d9fc873be69c8c49283f5e7a4f441e3f93a5a1bd363cb05290214555e0ebfe879c485a70d81ee6ea72b93 SHA512 73a3e789017de2a63719871f80addff8e5ee82a56f47665415b386db51ba4394eaa265d7cc989999e2de855c7c82c228574a7859812ddcf556ef3a11b6dce827
 EBUILD read-edid-3.0.2.ebuild 629 BLAKE2B ef065bcab0c70fa24c771c7a07949652d6c4b97b0e210915bbe4cdb109f115765102db2754f10fdede931a9c66938c55f3aba3bddb346432b67da4cab6d2398e SHA512 9d07fd2d4045c9d73c3f422dbf6a1dce609568c58a666ae2e7e3a548cda236f79f30b3f0b493df1710ada9b2541293fe1d9154362bc84a31b74e3e302d588708
-MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
+MISC metadata.xml 392 BLAKE2B d9477711f154ae3dd3b22254d6e8117c27840af5629a7296a3a2dae88bbed00174d30dc8a658eb5c0400b7db2b9b38d9f598916256b40ddae0dd33830e532f89 SHA512 76a7b26f9af8ae7ca060114b5aa077610916880c4d75b565bbe766beaf0ef7a86f92f0c71dec57f9f7aee07c003dc2455f12e1b9c4529b505466d904ba0eb5f1
diff --git a/x11-misc/read-edid/metadata.xml b/x11-misc/read-edid/metadata.xml
index 3e5026ee3754..37810b80659d 100644
--- a/x11-misc/read-edid/metadata.xml
+++ b/x11-misc/read-edid/metadata.xml
@@ -5,4 +5,8 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<use>
+		<flag name="vbe-mode">Build get-edid with support for legacy, VBE-based interface.
+			Requires <pkg>dev-libs/libx86</pkg>.</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..fd3656658546
--- /dev/null
+++ b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic linux-info
+
+DESCRIPTION="Program that can get information from a PnP monitor"
+HOMEPAGE="http://www.polypux.org/projects/read-edid/"
+SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="vbe-mode"
+
+DEPEND="vbe-mode? ( >=dev-libs/libx86-1.1 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	CONFIG_CHECK="~I2C_CHARDEV"
+	ERROR_I2C_CHARDEV="I2C_CHARDEV support not enabled in the kernel. get-edid will "
+	if use vbe-mode; then
+		ERROR_I2C_CHARDEV+="fall back to the legacy, VBE-based interface."
+	else
+		ERROR_I2C_CHARDEV+="not work."
+	fi
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's|COPYING||g;s|share/doc/read-edid|share/doc/'"${PF}"'|g' \
+		CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	append-cflags -fcommon
+	local mycmakeargs=(
+		-DCLASSICBUILD=$(usex vbe-mode)
+	)
+	cmake_src_configure
+}
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 103ed2fef087..b841c62053e7 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,12 +1,7 @@
 AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337f46c53c318afeb79c01cdcabc2f55dae4d7f4d6e883b18814caac46d8c153a5328170f3af10c55 SHA512 d3940abb0c52957e8ec4ea15829151876384703ee5cff7a4d306d6de28f839ff76a9090a3af2106e7e8442104f3e16c57a8430b36d718490cd2637ecb99d9c8e
 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
-AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d
 AUX vgl.initd-r4 865 BLAKE2B 40e417f0dce3f2cf65c4154b40fdc4b8a1ded87e96f5c7ed047eb5a8870c547aceaed12b9a0324e3eacfe03e46194da61af179cc6dc2a77a6fdcf30d8d92a874 SHA512 42f79d94fb6e69cab90e1630168d9daf3a8062bb85515c46551960c22d6ed38b6e5ef40e4db310c377adb8d7c3ef09840a81cdb25a15032a977e15253315b2e7
 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 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
+EBUILD virtualgl-2.6.5-r4.ebuild 2775 BLAKE2B cf683d976c8aec5e293a10d2484ccc213d19a587673b79c6b431bc4313d32c6ee883890b6be5fa94227d9768595f3fd55c5984ce6fd892b66e84898f97a10aff SHA512 dc246bc99ac9e489749631feb76a4ed1e9317c147e2c9ef4c389d278753cbc0fc40dc82a59937849272cdd9377e2b46fa101942de42d3d6bb740d9c324e1cf1d
 MISC metadata.xml 872 BLAKE2B d89ac0de99c9146812da5dfa0e6cb12d403e67f66fb5957ebe4bbeaf39e8512398d4e3fae7db92d5c896e8e72175066692efba1819233e40f676985fee2f713d SHA512 10d56438137d9398233e0e0b1ecc0b39c484d8154d40203990f2965c62b0f6a701228878b4e3241f040dd26301b2348842718271191167c03d18d6c44173fece
diff --git a/x11-misc/virtualgl/files/vgl.initd-r3 b/x11-misc/virtualgl/files/vgl.initd-r3
deleted file mode 100644
index 951d73287d23..000000000000
--- a/x11-misc/virtualgl/files/vgl.initd-r3
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: description="*" and other OpenRC 0.9+ candies
-
-depend() {
-	need xdm
-	after sshd
-}
-
-start() {
-	ebegin "Starting VirtualGL"
-	truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key
-
-  set_xauth
-
-  if [ -z "$XAUTHORITY" ]; then
-
-    einfo "Waiting for xauthority..."
-
-    # wait for xauth file
-    while true; do 
-      set_xauth
-
-      if [ -e "$XAUTHORITY" ]; then
-        break;
-      fi
-
-      sleep 1
-    done 
-  fi
-
-
-	xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . $(xauth -f $XAUTHORITY list | awk '{print $3;exit}') && \
-		chmod 644 /var/lib/VirtualGL/vgl_xauth_key
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping VirtualGL"
-	[ -f /var/lib/VirtualGL/vgl_xauth_key ] && \
-		rm /var/lib/VirtualGL/vgl_xauth_key
-	eend $?
-}
diff --git a/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
deleted file mode 100644
index e01895a2c0f3..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
-	inherit git-r3
-else
-	MY_PN="VirtualGL"
-	MY_P="${MY_PN}-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="https://www.virtualgl.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="ssl"
-
-RDEPEND="
-	ssl? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	)
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libXv[${MULTILIB_USEDEP}]
-	x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	virtual/opencl[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	amd64? ( abi_x86_32? (
-		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-		>=x11-libs/libXtst-1.2.3[abi_x86_32]
-		>=x11-libs/libXv-1.0.10[abi_x86_32]
-		x11-libs/xcb-util-keysyms[abi_x86_32]
-		>=virtual/glu-9.0-r1[abi_x86_32]
-		virtual/opencl[abi_x86_32]
-		>=virtual/opengl-7.0-r1[abi_x86_32]
-	) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Use /var/lib, bug #428122
-	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
-		server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Completely breaks steam/wine for discrete graphics otherwise
-	# see https://github.com/VirtualGL/virtualgl/issues/16
-	append-ldflags "-Wl,--no-as-needed"
-
-	abi_configure() {
-		local mycmakeargs=(
-			-DVGL_USESSL="$(usex ssl)"
-			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-			-DTJPEG_INCLUDE_DIR=/usr/include
-			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
-			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-		)
-		cmake_src_configure
-	}
-	multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# Make config dir
-	dodir /var/lib/VirtualGL
-	fowners root:video /var/lib/VirtualGL
-	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd-r3" vgl
-	newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vgl-helper.sh"
-	systemd_dounit "${FILESDIR}/vgl.service"
-
-	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-	mv "${D}"/usr/bin/{,v}glxinfo || die
-
-	# Remove license files, bug 536284
-	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-
-	# Directory is created if needed at runtime
-	rm -r "${D}"/var/lib || die
-}
diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
deleted file mode 100644
index e01895a2c0f3..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
-	inherit git-r3
-else
-	MY_PN="VirtualGL"
-	MY_P="${MY_PN}-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="https://www.virtualgl.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="ssl"
-
-RDEPEND="
-	ssl? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	)
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libXv[${MULTILIB_USEDEP}]
-	x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	virtual/opencl[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	amd64? ( abi_x86_32? (
-		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-		>=x11-libs/libXtst-1.2.3[abi_x86_32]
-		>=x11-libs/libXv-1.0.10[abi_x86_32]
-		x11-libs/xcb-util-keysyms[abi_x86_32]
-		>=virtual/glu-9.0-r1[abi_x86_32]
-		virtual/opencl[abi_x86_32]
-		>=virtual/opengl-7.0-r1[abi_x86_32]
-	) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Use /var/lib, bug #428122
-	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
-		server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Completely breaks steam/wine for discrete graphics otherwise
-	# see https://github.com/VirtualGL/virtualgl/issues/16
-	append-ldflags "-Wl,--no-as-needed"
-
-	abi_configure() {
-		local mycmakeargs=(
-			-DVGL_USESSL="$(usex ssl)"
-			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-			-DTJPEG_INCLUDE_DIR=/usr/include
-			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
-			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-		)
-		cmake_src_configure
-	}
-	multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# Make config dir
-	dodir /var/lib/VirtualGL
-	fowners root:video /var/lib/VirtualGL
-	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd-r3" vgl
-	newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vgl-helper.sh"
-	systemd_dounit "${FILESDIR}/vgl.service"
-
-	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-	mv "${D}"/usr/bin/{,v}glxinfo || die
-
-	# Remove license files, bug 536284
-	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-
-	# Directory is created if needed at runtime
-	rm -r "${D}"/var/lib || die
-}
diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild
index 73e5a82a2e38..367b55b3cc79 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild
@@ -82,7 +82,7 @@ src_install() {
 	cmake-multilib_src_install
 
 	# Make config dir
-	dodir /var/lib/VirtualGL
+	keepdir /var/lib/VirtualGL
 	fowners root:video /var/lib/VirtualGL
 	fperms 0750 /var/lib/VirtualGL
 	newinitd "${FILESDIR}/vgl.initd-r4" vgl
@@ -97,7 +97,4 @@ src_install() {
 
 	# Remove license files, bug 536284
 	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-
-	# Directory is created if needed at runtime
-	rm -r "${D}"/var/lib || die
 }
diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild
deleted file mode 100644
index 66a5b0070353..000000000000
--- a/x11-misc/virtualgl/virtualgl-9999.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
-	inherit git-r3
-else
-	MY_PN="VirtualGL"
-	MY_P="${MY_PN}-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="https://www.virtualgl.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="ssl"
-
-RDEPEND="
-	ssl? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	)
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libXv[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	amd64? ( abi_x86_32? (
-		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-		>=x11-libs/libXtst-1.2.3[abi_x86_32]
-		>=x11-libs/libXv-1.0.10[abi_x86_32]
-		>=virtual/glu-9.0-r1[abi_x86_32]
-		>=virtual/opengl-7.0-r1[abi_x86_32]
-	) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Use /var/lib, bug #428122
-	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
-		server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Completely breaks steam/wine for discrete graphics otherwise
-	# see https://github.com/VirtualGL/virtualgl/issues/16
-	append-ldflags "-Wl,--no-as-needed"
-
-	abi_configure() {
-		local mycmakeargs=(
-			-DVGL_USESSL="$(usex ssl)"
-			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-			-DTJPEG_INCLUDE_DIR=/usr/include
-			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
-			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-		)
-		cmake_src_configure
-	}
-	multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# Make config dir
-	dodir /var/lib/VirtualGL
-	fowners root:video /var/lib/VirtualGL
-	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd-r4" vgl
-	newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vgl-helper.sh"
-	systemd_dounit "${FILESDIR}/vgl.service"
-
-	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-	mv "${D}"/usr/bin/{,v}glxinfo || die
-
-	# Remove license files, bug 536284
-	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}