gentoo auto-resync : 21:12:2024 - 06:30:51

7 files changed, 7 insertions, 169 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 5ca558b463f6..74c618890acc 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index 6120742eacc1..1237afa3ef24 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,5 +1,5 @@
 DIST alacarte-3.50.0.tar.xz 255404 BLAKE2B c22aeb83f707e4860c9a84311da2bf87e79db8b8859b8c45d5c1d0f6ead896f15b83cd112ac248fbb83b2bf839afbc90d2a24685c767ebaaaa850dfab8b26d35 SHA512 12578c35e8e68c83b46d81edc59444a92dc672a4a91bb4b443bbc0b26d94a3badf5598602dfc62dfbbabce7e3392c081c39055a201d60d4813b23e061014ee17
 DIST alacarte-3.52.0.tar.xz 255700 BLAKE2B 8a59c5ccd1ba8ee892aee39625ecd56c4cf9500b104f943775bef613a4d8f6ef50cdce1d436a1f2c95268864ab43a72f8e182a2e15f47b3980193c887e91f8c2 SHA512 711166b1d772483be1ca3044f9402ec62dd6bb9c09b71b09944886bac91a72fe9838a60a4cf24649dce33148844b586446c17954129c6bc7aaa3096ba01e1463
 EBUILD alacarte-3.50.0.ebuild 757 BLAKE2B e0b30682157fa068702c6bca5ae988dae61068c795acfd39fd8efd52a76bd241a1daf74dc8704a80910f3ee6654b4a7eb982101634333fd40b4554a4d6c26e08 SHA512 190825a6f40ffd86f28f25c0029aa327f9426ca5e8607f0f9a3fc937828213e8ebe40f44a0e29799dd3274f7de1ee2a697b2effc78a44e283aa83306529d6eb0
-EBUILD alacarte-3.52.0.ebuild 759 BLAKE2B ad9cdb2f597243644f9213756eff08cbfacfe6f46195346822a366c38ef1d426ec8d04de73206ca127cb5d0bf6e9e89c49a1a934335923907817fbfd88e0dd02 SHA512 2235f911a0307e049ac4f25d63aef583794aacdd96d885d50ba5b0dc179a269b151e6bd38e3f731551a483a181b7d13a88ad03362d134189fe9f3f7589e73db7
+EBUILD alacarte-3.52.0.ebuild 757 BLAKE2B e0b30682157fa068702c6bca5ae988dae61068c795acfd39fd8efd52a76bd241a1daf74dc8704a80910f3ee6654b4a7eb982101634333fd40b4554a4d6c26e08 SHA512 190825a6f40ffd86f28f25c0029aa327f9426ca5e8607f0f9a3fc937828213e8ebe40f44a0e29799dd3274f7de1ee2a697b2effc78a44e283aa83306529d6eb0
 MISC metadata.xml 349 BLAKE2B ae2cfe74f06d4c6aa4143f187cd3ed6934e6e131e4a997330c9d6ca11a2cd45b2835ef2b1bfab8570e5554fcce81237b025fc0683a74eaf62076e7c4f2cd2914 SHA512 7426942c020db80792d9d382763a005dc0956e6f7c02bb0e3a58e56cb69c37ce643da77524ac7273b8302bb0efb2e2c80dbb621d06809a7091395756e0f0cd06
diff --git a/x11-misc/alacarte/alacarte-3.52.0.ebuild b/x11-misc/alacarte/alacarte-3.52.0.ebuild
index 9204609f05b5..adaff6e9295b 100644
--- a/x11-misc/alacarte/alacarte-3.52.0.ebuild
+++ b/x11-misc/alacarte/alacarte-3.52.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index ed5aee61b1a3..56da245d264c 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -2,11 +2,8 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337
 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
 AUX vgl.initd-r4 865 BLAKE2B 40e417f0dce3f2cf65c4154b40fdc4b8a1ded87e96f5c7ed047eb5a8870c547aceaed12b9a0324e3eacfe03e46194da61af179cc6dc2a77a6fdcf30d8d92a874 SHA512 42f79d94fb6e69cab90e1630168d9daf3a8062bb85515c46551960c22d6ed38b6e5ef40e4db310c377adb8d7c3ef09840a81cdb25a15032a977e15253315b2e7
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
-AUX virtualgl-3.1-drop-register.patch 1678 BLAKE2B dfb756d013ae7ea40ce6ce2de20c0aabf2bab53975510a4ccd593ae11c3e47f467209f64c9d009d6b1e20cc46eba52ee2569172a64176f43df8273119658eda5 SHA512 c9a231682239f3ae6603a4aec723aaca39321f838971ae08f67a0484ac8dcf22ea7f5e4d5bd4bbe9ed83f8a5946e903c7b54e4290cb632101a0f10f6ba5e42fe
-DIST VirtualGL-3.0.2.tar.gz 1220143 BLAKE2B 72c6f46ee4c10c81516c9c3cfea610875375376050e266df3019fdfcc6426d10355292ce96cb0821e3934a8017daa8ab9a183049d714aa61c1e54a1b503527f4 SHA512 fe649460265def2858dde76fc9ad0c9183bc5ccf97da2689c43d7157d0a187f0fab784efb2ae17dbface4e7973a300e4b82f8bb7d563e80b67c3199b86068f37
 DIST VirtualGL-3.1.1.tar.gz 1223341 BLAKE2B d82a3b8afddc165d4a99b281593662c7584b2d0060e1332bbb1dd621dc1098d4eb1e9c7b3d9a989fa08e89dfafe0001bff905c90aaefb0e0b7532e233a21e0e4 SHA512 40007910dce4ba1aa6bb00fc1e57af8e9d6a77a5a6c795d8f13c9883abc44787871a0bede8621de2fb042585f471281ba9e8bbd16d81c4049ddca8539f535e7e
-DIST VirtualGL-3.1.tar.gz 1248818 BLAKE2B 556e2a05811b89ddfecc371d75888f09c7a59bb2c7e3f265eae4631627cf3e586114735b2616cd6292fbcea089e81326736013a7b1d47ad1746365e72e313627 SHA512 cd1109b4dee426918e61348b22b3bfb0c45102bbb0bcde9b78c36b607a396bbff7d7c72cf3bf9626128da0f1776c42bbb59be863239e60e0f7307d2a73de463b
-EBUILD virtualgl-3.0.2.ebuild 2875 BLAKE2B 7597f349f52b7f4ee89b01d9d710a51c306f9ef5409f9ed3ebd21d63eed06b866f456576b3ec45fa79cec3f23083df5a41ec1fa4cb453d5356f84de8086b3599 SHA512 c735ee841e764a59e51c300a3a87456ca83f9ab72aab439b4e5a92ffe3947bece553e20bace5c343e018556c6dc39b6fa06a5d081d54b4e71d3a53ed5b30fea6
-EBUILD virtualgl-3.1-r1.ebuild 2847 BLAKE2B 9235c21aca162d9f3f8909bc5cbfd3bf68292c3970ad3cf18433157625d7ca00fdbb995339bd046962dcecf0e602f94cd5d9470f2bd29616bb2a5db6eb661c2d SHA512 bb10194d2cf4196871a7169eb00c4c7abf95884673ce697f139dfc913f1debdc85173e1c2438c1389c628a49e562d3d17bba03ea60fa062d092943c673cab05e
+DIST VirtualGL-3.1.2.tar.gz 1224655 BLAKE2B 92a971eed54d5b184eeee2302fee90ae86443291c5b246152f522d8ab92db86d3c6be258b4ce5a2e8fa05b639f9b9b91f6fd0920213103510b3a821a6629d7d7 SHA512 5f51691d66645cfca74997b36c442daf4d3fd54ab93b48e501a275a0e8fcc4ecaa71e24665619d40c5561c9598a8d3c224fb3b7ecd3afb56fe0a6ecc350aec5e
 EBUILD virtualgl-3.1.1.ebuild 2786 BLAKE2B c2aff95863d9481509af4005f28becba83997f384094a896115af33a47836c6e8aef470525bf3016557e18528a29b4bf622e2d628c05292e3dab48e2ca0cb40a SHA512 f751eeee6e4f1752dba8f611b8954ecbe53a4b1f85a913c140c91d0bb0f9ffacc63db1aced5191820cb5da22c34ae6e853c683325931fff76a30d5d10bd73df2
+EBUILD virtualgl-3.1.2.ebuild 2788 BLAKE2B 75c32db643d271ebd67127d95c4e4ab18a1ac61a6b367aa2306ebe276ab29ce31fde8a1a74172c3a90ab67de1c41805b956c0e1f30920f95b6c302eff223908c SHA512 32aefea5be5617d3002e3540fb810e4c1764c7341ec397535e61b547194b678ceb1c47126825f39a54e68d4d4fa1a7e0c547aa1658165643ea4686ca255fd56c
 MISC metadata.xml 822 BLAKE2B 8fd6340ff5f167066f17763ef771da259b47fcb140d9bfdf887260e58a02bbdf95ce49bd36fc970024cc3c6dc5daac19e8975bb787dcd45219c729e0a8e0570f SHA512 b3b7fb03192d77f07cffce45364e3387055d641ddb676f9523e91d280bdc674b0c96d042b9ab39e56498a716152e3533b4633dabbed1e7fbe9c805acaa0f9a5d
diff --git a/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch b/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch
deleted file mode 100644
index 5e7153c3c383..000000000000
--- a/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/VirtualGL/virtualgl/pull/233
-From: Brahmajit Das <brahmajit.xyz@gmail.com>
-Date: Thu, 1 Jun 2023 14:45:17 +0530
-Subject: [PATCH] Dropping use of register keyword
-
-The usage of register keyword was deprecated in c++14 and it's
-completely removed in c++17. Found will building virtualgl on gentoo
-with clang-16.
-
-Bug: https://bugs.gentoo.org/898876
-Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
---- a/server/fltk/src/Fl_Text_Buffer.cxx
-+++ b/server/fltk/src/Fl_Text_Buffer.cxx
-@@ -1286,7 +1286,7 @@ int Fl_Text_Buffer::substitute_null_characters( char *string, int len ) {
- ** routine if no substitution has been done.
- */
- void Fl_Text_Buffer::unsubstitute_null_characters( char *string ) {
--  register char * c, subsChar = mNullSubsChar;
-+  char * c, subsChar = mNullSubsChar;
- 
-   if ( subsChar == '\0' )
-     return;
---- a/server/fltk/src/Fl_arg.cxx
-+++ b/server/fltk/src/Fl_arg.cxx
-@@ -314,7 +314,7 @@ without express or implied warranty.
- 
- static int ReadInteger(char* string, char** NextString)
- {
--  register int Result = 0;
-+  int Result = 0;
-   int Sign = 1;
-     
-   if (*string == '+')
-@@ -337,7 +337,7 @@ int XParseGeometry(const char* string, int* x, int* y,
- 		   unsigned int* width, unsigned int* height)
- {
-   int mask = NoValue;
--  register char *strind;
-+  char *strind;
-   unsigned int tempWidth = 0, tempHeight = 0;
-   int tempX = 0, tempY = 0;
-   char *nextCharacter;
---- a/util/md5.c
-+++ b/util/md5.c
-@@ -193,7 +193,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
-  */
- void MD5Transform(uint32 buf[4], uint32 in[16])
- {
--  register uint32 a, b, c, d;
-+  uint32 a, b, c, d;
- 
-   a = buf[0];
-   b = buf[1];
diff --git a/x11-misc/virtualgl/virtualgl-3.0.2.ebuild b/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
deleted file mode 100644
index 27cb5efb4750..000000000000
--- a/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="https://downloads.sourceforge.net/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
-	keepdir /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
-	# and eglinfo to veglinto because of conflict with mesa-progs[egl]
-	mv "${D}"/usr/bin/{,v}glxinfo || die
-	mv "${D}"/usr/bin/{,v}eglinfo || die
-
-	# Remove license files, bug 536284
-	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}
diff --git a/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-3.1.2.ebuild
index 5e5505059f3f..1b1bb38f63a8 100644
--- a/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.1.2.ebuild
@@ -12,16 +12,15 @@ else
 	MY_PN="VirtualGL"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	SRC_URI="https://github.com/VirtualGL/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
 HOMEPAGE="https://www.virtualgl.org/"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
 
 SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE=""
 
 RDEPEND="
 	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
@@ -47,10 +46,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-drop-register.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 \