gentoo resync : 27.03.2021

6 files changed, 158 insertions, 7 deletions

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 22cad3249473..90f39a10af22 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,10 +1,12 @@
 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 2929 BLAKE2B 2c591c97f2cb5fd44fb96d970a7e99f2c0c6414303a179e7a455e53a0699d38d7358b814b5d67a4bc58eb3bd666cb5b9956317ae3b8255fcb77c405a72e01323 SHA512 7d72262e2e9f00c4895aef235b054281fb4c93843055d7802029d3f38bce1bcfd3f577ea015004ed805505b3d958b28579bf3932d6fefaf3976c12fe4cdaec81
-EBUILD virtualgl-2.6.5.ebuild 2929 BLAKE2B f1ff2337fecf6667c8d034801a69588c3ebf3265957192211470513c81667087a834f8507763f7348e93729644170de473fc807492625d1be099a6a79d65b4f0 SHA512 3307ede0fb1fbd75108e3533afcc129d02356f34532d33ac2a53acc7750214064508b045f498f997c7be222a154f63669613848b53a70cf9d448242819d1db0f
-EBUILD virtualgl-9999.ebuild 2711 BLAKE2B 6e80ffef02dbb840712e2d8767a3de5acde047a119e3550ad341174d7206ebb811b86a2fade4af739a66363d681106811c6b78a55d8e01160d59ee85a58e6cbd SHA512 53dc4e4e1bd74c0866d165e8e76cc36717081408046ebb798cf31abfcca27d0b93048ebb9a66c513a5914a8f455127d89b667ad210696eb849380f85457bcc10
-MISC metadata.xml 870 BLAKE2B 535c3227a42afcefcfab99a41737afff1fbd0b35c8980ebcea6103b52465c43a61064a81e48c92349de90e15d150fdae0d772daa63c8d6597f0e336448920a68 SHA512 72837c96523aa69cfbdaa4c5e464a46c8e37170e58ec7e283df09849fbbe27502befc594913ab8b195f1f1f657b2957eda184a6c68220cc302244b737c969282
+EBUILD virtualgl-2.6.5-r1.ebuild 2929 BLAKE2B f1ff2337fecf6667c8d034801a69588c3ebf3265957192211470513c81667087a834f8507763f7348e93729644170de473fc807492625d1be099a6a79d65b4f0 SHA512 3307ede0fb1fbd75108e3533afcc129d02356f34532d33ac2a53acc7750214064508b045f498f997c7be222a154f63669613848b53a70cf9d448242819d1db0f
+EBUILD virtualgl-2.6.5-r3.ebuild 2931 BLAKE2B e9a769d4716232887209d0cbd8cc0bbd13aa04f31eb53157297abb576b96af40a1510abc3453d0f828b8be1871f2446eddca0d102f6e6fa8f59f46e462224046 SHA512 c7dfcad24fcb99ba54bd91d5857ae14fd723b0a40c7a796aba58e6227620db2272ade528b1aeed5695345b9f4a3ca4c549d225de533b6748c7048c1a9c8f5664
+EBUILD virtualgl-9999.ebuild 2711 BLAKE2B bce5041ac76d32f7ecb088b99cfd95968499454174218ece577f40924667dd2a8eaadd25be775cfcb47b6375c0a09e1c3b75b62853d085cadaaac49b2d697f85 SHA512 0fd74021f9badc5d61691012377266ba271ecdf4588483a8f3a10697b779d37c220cf19857be695c7c222b2bc98acec20ab7a1db782c8c70357a54ed0ea5a8d7
+MISC metadata.xml 872 BLAKE2B d89ac0de99c9146812da5dfa0e6cb12d403e67f66fb5957ebe4bbeaf39e8512398d4e3fae7db92d5c896e8e72175066692efba1819233e40f676985fee2f713d SHA512 10d56438137d9398233e0e0b1ecc0b39c484d8154d40203990f2965c62b0f6a701228878b4e3241f040dd26301b2348842718271191167c03d18d6c44173fece
diff --git a/x11-misc/virtualgl/files/vgl.initd-r4 b/x11-misc/virtualgl/files/vgl.initd-r4
new file mode 100644
index 000000000000..d40686266e0c
--- /dev/null
+++ b/x11-misc/virtualgl/files/vgl.initd-r4
@@ -0,0 +1,45 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: description="*" and other OpenRC 0.9+ candies
+
+depend() {
+	need display-manager
+	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/metadata.xml b/x11-misc/virtualgl/metadata.xml
index f00a92b3f612..2bbb956d2001 100644
--- a/x11-misc/virtualgl/metadata.xml
+++ b/x11-misc/virtualgl/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>NP-Hardass@gentoo.org</email>
-		<name>NP-Hardass</name>
+		<email>np-hardass@gentoo.org</email>
+		<name>Adam Feldman</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
diff --git a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
index f537ef884323..f537ef884323 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
new file mode 100644
index 000000000000..62e7240015fe
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
@@ -0,0 +1,104 @@
+# 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="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}]
+	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-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
+
+	# 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
index b1f2ed56343a..c464597e5bcc 100644
--- a/x11-misc/virtualgl/virtualgl-9999.ebuild
+++ b/x11-misc/virtualgl/virtualgl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -82,7 +82,7 @@ src_install() {
 	dodir /var/lib/VirtualGL
 	fowners root:video /var/lib/VirtualGL
 	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd-r3" vgl
+	newinitd "${FILESDIR}/vgl.initd-r4" vgl
 	newconfd "${FILESDIR}/vgl.confd-r2" vgl
 
 	exeinto /usr/libexec