gentoo auto-resync : 25:03:2024 - 19:01:08

4 files changed, 2 insertions, 96 deletions

diff --git a/media-libs/SoXt/Manifest b/media-libs/SoXt/Manifest
index 5d0f824d0d76..d4db31201483 100644
--- a/media-libs/SoXt/Manifest
+++ b/media-libs/SoXt/Manifest
@@ -1,6 +1,3 @@
-AUX SoXt-1.4.0-drop-register-keyword.patch 1253 BLAKE2B 857056775a0cc5959f05377d30ce1dc6f69dd7d6754330f97ffe0008c257a12471fb996d9df16a8bb4205486b40e15a8d621b0cf86fda73acd096d093f694a02 SHA512 748cb1421d549c4641339b3ab1b7b0482118b68d34ef79dcec2d9037ee79c8a221780ac676fd2872ee728a2c04b3f7ff3013d53016f26cb65a8eefcdbbfde6d1
-DIST SoXt-1.4.0-src.tar.gz 1369725 BLAKE2B 727c56644878e9d52441ca905558524ccd369de123e8018d7fef4d949aa4e96007fa3a1e9782490b4dc9d50a916686a118d37ec7094dc6a3522ede032b30b6ea SHA512 9c661396ec18c2cba8984be8c0875f51554c8845e1a85d9b202f9a0f4de8203566a46d9b276e20039861dbf7ff3a0ffa474d098866f8a7692b53a01e3f62977d
 DIST SoXt-1.4.1-src.tar.gz 1402559 BLAKE2B fd0f0433e1d5c231f4392f7cfa4e6e08bd9d872b46619c6daa9f4fa2157da27780b0a28d4cbb7ea8f3f3a881f90c789760cad2c2709f27bf9f4edb1cdfc1f86c SHA512 c379acb14b7f3a03664a3b1c10bdd14e836a54fb72f62cb728301755ee148b423203513a085534c2ea74704fd3c9a77ceabe1de089aa168c848518a9d690e53e
-EBUILD SoXt-1.4.0-r1.ebuild 1049 BLAKE2B 162a9f3c36035f7801dbb834df19c05ff3360360b364f075438d970a8cb3ad90123d9693f55ab7274233b7915f73644a16cce9309eef8e94eed48a5196f46116 SHA512 6a345b79d63aed9f234879360a6d392cfea3f61cf6688a2f9155cf0e9d8221373f4df93b9725eacf23cf270acc5373c80beac78d3ca1a965c7b592f6448516e2
-EBUILD SoXt-1.4.1.ebuild 1007 BLAKE2B 281f0620c9097d2b8bc84d30df0fceaf70f077796e6769e33ad95b636a3a2dc7bfe6a2148a228574a52d843ec485d2ca4b90bac2db1ef9839401a97a0f977864 SHA512 158878fe96cc1a86bf31a36e77d650837bc084d9d60e5d71cfb671a7bee388fa3bdd036f8c7d32740bca1ef688c2ec1614ea49f3aa2d7ef8931d2eac06109eb4
+EBUILD SoXt-1.4.1.ebuild 1005 BLAKE2B 62370bd8daa1d4ceea75a9c86ae8df338dec93bc0ae3eec89cea8b77a8032667e2842dd0c4a7d6eb2c05aeff0c859c7e5fe33feb1f5b22c2685a8110f3eb26fb SHA512 bdba48c778c0ec2d39414256015242e674fbfdf2a25227f730a8b89e06edfad03e6136acaeacbbb9963b83fae7bb000db99d7c8b52579d88d0b714fc4b6d33e0
 MISC metadata.xml 659 BLAKE2B 3b402f9fa90396baa373a263d4023d24c6099daac86af52a70fa9d48b9570d488a5565676dfb305ed06c817c57248afb50327f4227b206475f5b83b6162eb804 SHA512 5066a6d85c08974474c2cb8d27f328932a402b4e7649f6ac3cb9474beea2721b6e1d0728ba95166a2ca585b1a4e050ca0239acdf8ffe9e769f154a2000b423a2
diff --git a/media-libs/SoXt/SoXt-1.4.0-r1.ebuild b/media-libs/SoXt/SoXt-1.4.0-r1.ebuild
deleted file mode 100644
index ca85d1e5a7a5..000000000000
--- a/media-libs/SoXt/SoXt-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-MY_P=${P/soxt/SoXt}
-
-HOMEPAGE="https://github.com/coin3d/coin/wiki"
-DESCRIPTION="GUI binding for using Coin/Open Inventor with Xt/Motif"
-SRC_URI="https://github.com/coin3d/soxt/releases/download/${MY_P}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="debug doc"
-
-RDEPEND="
-	media-libs/coin
-	x11-libs/motif:0
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( app-text/doxygen )
-"
-
-S="${WORKDIR}/soxt"
-
-DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO BUGS.txt)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-drop-register-keyword.patch
-)
-
-src_configure() {
-	use debug && append-cppflags -DSOXT_DEBUG=1
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DSOXT_BUILD_DOCUMENTATION=$(usex doc)
-		-DSOXT_BUILD_INTERNAL_DOCUMENTATION=OFF
-		-DSOXT_VERBOSE=$(usex debug)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/SoXt/SoXt-1.4.1.ebuild b/media-libs/SoXt/SoXt-1.4.1.ebuild
index 6183699d5f97..dd4ccfdfaa84 100644
--- a/media-libs/SoXt/SoXt-1.4.1.ebuild
+++ b/media-libs/SoXt/SoXt-1.4.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="GUI binding for using Coin/Open Inventor with Xt/Motif"
 SRC_URI="https://github.com/coin3d/soxt/releases/download/v${PV}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="debug doc"
 
diff --git a/media-libs/SoXt/files/SoXt-1.4.0-drop-register-keyword.patch b/media-libs/SoXt/files/SoXt-1.4.0-drop-register-keyword.patch
deleted file mode 100644
index fcbfa7dfd357..000000000000
--- a/media-libs/SoXt/files/SoXt-1.4.0-drop-register-keyword.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/coin3d/soxt/pull/17
-From: Brahmajit Das <brahmajit.xyz@gmail.com>
-Date: Sat, 16 Sep 2023 07:32:47 +0000
-Subject: [PATCH] Fix C++17 does not allow register storage class specifier
-
-The register storage class was deprecated in C++14 and completely
-removed in C++17. Hence, we cannot use it anymore and would result in a
-build error.
-
-Bug: https://bugs.gentoo.org/896234
-Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
---- a/src/Inventor/Xt/widgets/SoXtGLArea.cpp
-+++ b/src/Inventor/Xt/widgets/SoXtGLArea.cpp
-@@ -468,7 +468,7 @@ createColormap(
-   } * cmapCache;
-   static int cacheEntries = 0;
-   static int cacheMalloced = 0;
--  register int i;
-+  int i;
-     
-   assert(widget->soxtGLArea.visualInfo);
- 
-@@ -564,7 +564,7 @@ Realize(
-   Mask * valueMask,
-   XSetWindowAttributes * attributes)
- {
--  register SoXtGLAreaWidget glw = (SoXtGLAreaWidget) widget;
-+  SoXtGLAreaWidget glw = (SoXtGLAreaWidget) widget;
-   SoXtGLAreaCallbackStruct cb;
-   Widget parentShell;
-   Status status;
-@@ -670,7 +670,7 @@ Destroy(
-   Widget parentShell;
-   Status status;
-   int countReturn;
--  register int i;
-+  int i;
- 
-   if (glw->soxtGLArea.myList && glw->soxtGLArea.attribList)
-     XtFree((char *) glw->soxtGLArea.attribList);
--- 
-2.42.0
-