gentoo resync : 14.12.2020

3 files changed, 4 insertions, 106 deletions

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index c6fb9c89fd5d..c0bad4ffbf50 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -3,11 +3,9 @@ AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073
 AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
 AUX virtualgl-2.6.3-mesa-19.3.patch 3803 BLAKE2B cd2120dfc1fdc9c65cb65e428fd5bf98082c0bfcba3ce18ddd736bd1f421188ad9df4170bd6aa7bc2c8ef15f36398ec37a80554aa82e959e2e858faa910171d7 SHA512 6845a60071aac333ac1c2ad5c3861f9fbe8cdf9f28425817a18c2b6f8c280b5469ce3be4831a0bf8a6600955bf5177217ff684c61f728783f2d09be6885f2815
-DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
-DIST VirtualGL-2.6.3.tar.gz 1197037 BLAKE2B d331ddac80d98e5c1d6be90e90d06706ff3ea8c0c303aeab41536eb1a33014e5e100900f0f1f8734fad317d073c8259523dddb98d9658c2cfb2345ea1410fc0e SHA512 c01c602335d51c94840c32021a5ce4f982939d67efbe1458fce67582c5a76ac42f5b733998a8c8f04a77d57d7c2de01377f7cabcf848c01bfd9b2d8e0b318fea
 DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3 SHA512 a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
-EBUILD virtualgl-2.6.1-r1.ebuild 2709 BLAKE2B 95b4f319aeae46ee30ddd72eed37956bf465857e25e0397c8837a6e86689c2803513ab2d13385cd7e8ad879a78a5567fc33e3f0070a69d0ad26688c9a0694aed SHA512 2981a1b63d890e16159ae292e70a34e50deb363183eaa9910ff1501a15de61d279eb77bdf2cf5e0fc39100ad7dcff841a07f426eb60f6bf2d0cd5da25e4cdc01
-EBUILD virtualgl-2.6.3-r1.ebuild 2960 BLAKE2B 15f663fe63ebcf45c8efc7efa31af1bf2f98b39916533e335e30eb2fa03fba204e28e1c06c6a1e83c0f612a8b6cb56c22340ee77cf10685f60aec5f8eec86f2c SHA512 159f58a730f670615a26640e9b5f9d7e55b10562e2af06cc1dc93b5066b5c6d4b7095e0718ee3382f126376e0803446927afc7a5552dcf77d62b2794f6c1b504
+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.ebuild 2931 BLAKE2B 5150dca6a9a42c2a07a89253aa178bb84d5bfd3900fa9dd06376420f043a2a5a6d0fec04e49c035807e4fedb6141a002dceb419f28d12d7e3e0a582f6975992f SHA512 f710ee90dff478f5777cf5571e38b4b3ca5eb54897f04eda438f6684bc5a2de2c3292d43bea31fac627fdd1808789cf0ad8a0dac8738a8c9d513155e04baf5a1
 EBUILD virtualgl-9999.ebuild 2711 BLAKE2B 6e80ffef02dbb840712e2d8767a3de5acde047a119e3550ad341174d7206ebb811b86a2fade4af739a66363d681106811c6b78a55d8e01160d59ee85a58e6cbd SHA512 53dc4e4e1bd74c0866d165e8e76cc36717081408046ebb798cf31abfcca27d0b93048ebb9a66c513a5914a8f455127d89b667ad210696eb849380f85457bcc10
 MISC metadata.xml 840 BLAKE2B bce303f2b3aac9d5cccd03062f64761f6fadc1194fc78c5850e8ecc3ae00ae0282d21be2f64e2fed294255c3fc3405a48b8cab7270e2c6e20b557b72d1dd82ae SHA512 7b4ffc9dccfe1c5bee2168216854b4020d1854fd85402a4757b8cbd6cf11e90e85ddf352f210d02d55388569b1dafd953377793a35f4130bd45210625c95f3af
diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
deleted file mode 100644
index 15a2ad641c5e..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 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="libressl ssl"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl: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-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
-}
diff --git a/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
index ed68cde9f2f2..7decbf89ae3b 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	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}]
@@ -43,6 +44,7 @@ RDEPEND="
 		>=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]
@@ -50,11 +52,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	# Fix build issue w/ Mesa 19.3.0+ headers (fixed in next version)
-	"${FILESDIR}/${P}-mesa-19.3.patch"
-)
-
 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 \