7 files changed, 3 insertions, 267 deletions
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 87703456de91..5bbbe4564669 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,16 +1,9 @@
-AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5
-AUX snes9x-1.59-build-system.patch 1303 BLAKE2B 48a349bc5d56fcf154faab76cf76fcbb98808ce7933ff5e6da2cbf2b22d62819367e2ac1224f66735108de44419375d6f6eb2c2a4a104a4d492148866b6e829e SHA512 abbd0bfea5ad23f652e8249adbdf1118a4efa2ed43301b1786bbd91a253e98fb7ff99f68ff62c128972fe0af47aee9fa48fa9e3218b0a33c9e68f468fbe2b9e8
-AUX snes9x-1.61-libretro-flags.patch 693 BLAKE2B 4f027c9278f866476ba0d2f0884fe105da31e40e7362dfece81d0cddaf74e411f8e6b1a59e4fbb41389a2829695e39ce29c5de29ae055f744feb9320fc9ef255 SHA512 b0851e9da76e9a05f1893014564e8833c72cf7025c4c9f9f44665374f1f69e44fd5400125459bca1656c7920e033b11e33e0a1a3fb0af8a25c1bd0b3db6870da
 AUX snes9x-1.62.1-flags.patch 606 BLAKE2B 5a315f88bf25c48ca0510535a0ccb0dd04052c8dac5fdd108799877d75c9232f1f0d1c9fbaf310f224a63fc7511d836398c369e4aeb4fc33e3148149970d3e51 SHA512 e67f102f2f0f93962a159bb15a5e51524dff829a538f53e58ea4b631ae849b2ad9ca8b7b7143a34265d0ceb6d60c07416e2a9afbcce74257a554629b65e7908b
 AUX snes9x-1.62.1-gcc13.patch 600 BLAKE2B bcbcea61810146bd23d3f1d5f556b654e1f98d215ac56a4ab71f757b01d7761023516bc4afcce5e89c0372168d95565f1d9834e0fb862e09f9b264c000534f01 SHA512 80fba03debf1a30ed5d2654cd759443f2e89d779d5f1771eaa85e4b6fe4ac5370e2c2cb33d2c6df297c257778bc2f8e75e91508873052241414b2858ac2bc69b
 AUX snes9x-1.62.1-optional-wayland.patch 718 BLAKE2B 5c2bbd791f9e910416f3debe693275c2945a572506156e7309ed960397f0a289361caaf2034e78b727b445a49193dc3c1faf6bf0285f1d95315bf5cea712f101 SHA512 6ff22754f7f36d49ad56d219be07c4359aae27c0cc216acb12efc7c525dd87ca32c92e1a2cf8d65d7acd2941fd10605dc790b53d7274b5b11f51bb6d94bde905
 DIST glslang-6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7.tar.gz 3694607 BLAKE2B c6ba30fc561c6053c3f685f2b7529053f56e0869e4c05013a1c59f39b4c97847c3e50c30859dce6f0c17c9f9bf21b96ebc04b510bcdc33f4ced87d892a36f94c SHA512 49efe8841bbe2d603d5dd03bdb273bb991ee6ea509081048c01b7c4de6d4cad42f223755e1cb391c426993fba72ed3878e28bcce8dd7f6eeb5adf873705b7d62
-DIST snes9x-1.61-glslang.tar.gz 3188787 BLAKE2B 36ed327fbb2aec3657fe300b98f2e45cfe039596a64bca3076ecb079f7c33aa14ac09a96e5a174ad51faf0c4d585d82aaadec3d8209cf8d3ca55d70e316b1642 SHA512 de2ebc0cd89d22582c079006ac45a812e3aaaad9a44c77c68530aa1468fbc840c6ae25a4356d4e9fc697524cd721d26506d85bc35eac98452eabce0bc098b5a4
-DIST snes9x-1.61-spirv.tar.gz 676662 BLAKE2B ab18406c99e4e04c6c497b5f447dcaccb7d5a60f42bf1cea31afee04ee664e74916b32736c1aea1e7106494154e48e5cbe9b5d6a0652667c4d0e2020814cd9bd SHA512 bfa3cc944450db59a57a685eea12b0ed0b5059d55a092ac5cdf6f4dc03c1e2d2e62fa5a576156c772340e12136b10d7ed790bb35b4aece2ee8405e64f826e31b
-DIST snes9x-1.61.tar.gz 3016890 BLAKE2B 3e94dee5172bf48d2461a3a1403fc7e7fc8069df6dddf5b5e1da59ee140297bd0b7cee6948b5eb154c1eec38aebe3ab29a9fae3dfb4abdce41769d2ace43dee1 SHA512 8b644f5b7136e89fd222bcb430fc736c74a3e383d7e6c7f0880235f6fa4c0f77abbf02493f8d654a12e87701111643e33877bc21bb3dfcc9b82a056fa1b1d880
 DIST snes9x-1.62.3.tar.gz 3423799 BLAKE2B 0eaea11d4f0fa03b01d7ae86a559ad76df31d6e5a485ee09f75ec81824296a2f3182da6180dd60eb4bb9722cd3d8ce6ac3e0c1ae7c7740f2828fde1231c19a2a SHA512 005222bc054fbdfef92acc3ce5ad1f4b18eaff4382ab352d61e5c9c3fbe952ca085e964535e628730976f795c568e9e8751e6ef997f864c719c421d67d9e04db
 DIST spirv-cross-4e2fdb25671c742a9fbe93a6034eb1542244c7e1.tar.gz 1714902 BLAKE2B ae2b9816755679552c21b7f4446cda5b0626ba56143767445014b011234183afe55b4abbdf2a5849cad3d9e17871362bbac4da6b7969b578f564a8cbb3f3b269 SHA512 ec47b1d966006c6e654e84e7fa16124c774de3ca6fd508d3cfe0568e3df79eee3f5aeedfae1d744b99e162beeee23afe498249b2291091bc14c0357db304bebe
 DIST vulkan-headers-a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2.tar.gz 1832285 BLAKE2B 9278a17ede62f1a839ed230d2eefe3eb7ed46d3e25d4a44504f8d247c7b1c83d38166bec143f3b8e068d5c112585299d90ec16e9c41be6096c61f2eb5e127287 SHA512 b35541413efb5124691e0d13403acc00a85af51e3165828e892e90f059a7d7dc83f9bde43c6a7a1f471ae6eb8ec0155ee873adcc7afb537d5adbaccafcd7d849
-EBUILD snes9x-1.61.ebuild 3519 BLAKE2B aed7717315000d6ca7fbb25336b859b54a45a9af51ce7a5948dd28251ee98f6ea540d3390b75e2bed6e180fa80334e3fef757f37d61054252fc1cacabfb48bbb SHA512 eba8d739a0a7c2ad84714a0b5bc6f596fe676789d4d1447ceaf8121316a6b96b09a46f748f8b0a051c454479cce524f751615bf1776bcd4daf28168abb86a07f
-EBUILD snes9x-1.62.3.ebuild 4477 BLAKE2B ae2112b4fec31fea02b2ec16ce25a5c2640177491eaf8d874533e12eff936eac81b15f81fb09c9bfefe8cefc4868c3793f2113f211f1e65425360e059d27628d SHA512 d75067757b3085a39bd854faf63690eb10ddcb624c27d34f896be2b91c50e23515cdb7cc6f44b52bb13ba935f65296ab76fe29f26acea2b3875e2876c0120a9a
-MISC metadata.xml 608 BLAKE2B 9e770ccbcf8a5c12fccf33febd962f5f64f3378d9eabacaea208c28bed78fd909004a822e221bb6155bef1e2fd8908544075e57d3f48232fff2fb7c2c93cb7e4 SHA512 21718e0e03cad23eabd7e360ba347e77fef1e4af97945e3436b6d494cf5c1f8c7336d5987eda79c4b8359057ebe3d56fc41c0de66d227183470a19c34e393ff9
+EBUILD snes9x-1.62.3.ebuild 4478 BLAKE2B 7bbdc7c8a46b742cacd3900343e52832b791896387c73f7f065390233c7f7c354cc83ab64f21130b5d3cc7b0a6cfcdc9f5708e3ae635c76505c08639c2ccd5e0 SHA512 a15e9e7bb108a27c7523e06e52d49443066923f9c724641a33e4dcbe71884645dc2b43be5e70cae71a4e44980a1c26b76d5ddf5360785a89e07da2904430c82d
+MISC metadata.xml 541 BLAKE2B a2cfd5b1e98ab3b26cbd30a144b62e9b414dabfcc4e8cb54f9ffcf947a4dd52d8e9837ed1273dff8ac1ce73a236809ee9a29cbfb227fc12b0894dc8f495b7ef2 SHA512 a498f91647965d25efbc3f2d75f777b692c4f9583cdbe5447ab39a27158156f36e629a5ec9b12ccf73e8251c07600227328ba2105267d76963452f0ac0c580a3
diff --git a/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch b/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
deleted file mode 100644
index 7a0fe8a8bde8..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/unix/configure.ac
-+++ b/unix/configure.ac
-@@ -4,7 +4,7 @@ AC_REVISION([$Revision: 1.1 $])
- 
- AC_CONFIG_SRCDIR([unix.cpp])
- 
--AC_CANONICAL_TARGET
-+AC_CANONICAL_HOST
- 
- AC_PROG_CC
- AC_PROG_CXX
-@@ -38,7 +38,7 @@ AC_DEFUN([AC_S9X_COMPILER_FLAG],
- 				return (argc);
- 			}
- 		],
--		[snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"])
-+		[snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"], [snes9x_cv_option_$2="yes"])
- 	])
- 
- 	CXXFLAGS="[$]OLD_CXXFLAGS"
-@@ -94,7 +94,7 @@ AC_MSG_CHECKING([whether the OS is Linux])
- 
- AC_CACHE_VAL([snes9x_cv_linux_os],
- [
--	case "$target" in
-+	case "$host" in
- 		*-*-linux*)
- 			snes9x_cv_linux_os="yes"
- 			;;
-@@ -332,7 +332,7 @@ AC_DEFUN([AC_S9X_CHECK_SAR],
- 			return (i < 0 ? 0 : 1);
- 		}
- 	],
--	[snes9x_sar_$1="yes"], [snes9x_sar_$1="no"])
-+	[snes9x_sar_$1="yes"], [snes9x_sar_$1="no"], [snes9x_sar_$1=$GCC])
- 
- 	CXXFLAGS="[$]OLD_CXXFLAGS"
- 
diff --git a/games-emulation/snes9x/files/snes9x-1.59-build-system.patch b/games-emulation/snes9x/files/snes9x-1.59-build-system.patch
deleted file mode 100644
index 2d8f9f05e59f..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.59-build-system.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- snes9x-1.59/unix/configure.ac
-+++ snes9x-1.59/unix/configure.ac
-@@ -56,37 +56,6 @@
- # *** Execution begins here ***
- # *****************************
- 
--# Test what compiler flags we should use.
--
--AC_ARG_ENABLE([debug],
--	[AS_HELP_STRING([--enable-debug],
--		[leave debug information in the final binary (default: no)])],
--	[], [enable_debug="no"])
--
--if test "x$enable_debug" = "xyes"; then
--	AC_S9X_COMPILER_FLAG([-g],  [g])
--	AC_S9X_COMPILER_FLAG([-O0], [o0])
--else
--	AC_S9X_COMPILER_FLAG([-O3], [o3], [
--		AC_S9X_COMPILER_FLAG([-O2], [o2], [
--			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
--	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
--fi
--
--AC_ARG_ENABLE([mtune],
--	[AS_HELP_STRING([--enable-mtune],
--		[use the specified value for the -mtune/-mcpu flag (default: no)])],
--	[], [enable_mtune="no"])
--
--if test "x$enable_mtune" != "xno"; then
--	AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
--	[
--		AC_MSG_WARN([-mtune failed, trying -mcpu...])
--		AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
--			[AC_MSG_ERROR([Please specify a working value for --enable-mtune.])])
--	])
--fi
--
- AC_S9X_COMPILER_FLAG([-fno-exceptions],       [no_exceptions])
- AC_S9X_COMPILER_FLAG([-fno-rtti],             [no_rtti])
- AC_S9X_COMPILER_FLAG([-pedantic],             [pedantic])
diff --git a/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch b/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch
deleted file mode 100644
index 297c7d78257d..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-CXXFLAGS is used as a "common" flags variable and passed to CFLAGS,
-but want to use user's CFLAGS for CC rather than CXXFLAGS. Workaround
-with a temporary variable and also drop -O3/lto from defaults.
---- a/libretro/Makefile
-+++ b/libretro/Makefile
-@@ -4,3 +4,5 @@
- 
--LTO ?= -flto
-+LTO :=
-+ORIG_CXXFLAGS := $(CXXFLAGS)
-+CXXFLAGS :=
- SPACE :=
-@@ -580,4 +582,4 @@
- else
--   CFLAGS += -O3 -DNDEBUG
--   CXXFLAGS += -O3 -DNDEBUG
-+   CFLAGS += -DNDEBUG
-+   CXXFLAGS += -DNDEBUG
- endif
-@@ -612,3 +614,4 @@
- CXXFLAGS	+= -DRIGHTSHIFT_IS_SAR -D__LIBRETRO__ -DALLOW_CPU_OVERCLOCK
--CFLAGS		:= $(CXXFLAGS)
-+CFLAGS		:= $(CXXFLAGS) $(CFLAGS)
-+CXXFLAGS	+= $(ORIG_CXXFLAGS)
- CFLAGS          += -DHAVE_STDINT_H
diff --git a/games-emulation/snes9x/metadata.xml b/games-emulation/snes9x/metadata.xml
index 8f63c2fe45fa..32c1701b6637 100644
--- a/games-emulation/snes9x/metadata.xml
+++ b/games-emulation/snes9x/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="glslang">Build support for slang-type shaders</flag>
 		<flag name="libretro">Build libretro port</flag>
 		<flag name="netplay">Enable playing ROMs over the network (not recommended)</flag>
 	</use>
diff --git a/games-emulation/snes9x/snes9x-1.61.ebuild b/games-emulation/snes9x/snes9x-1.61.ebuild
deleted file mode 100644
index 7300fb65bb2a..000000000000
--- a/games-emulation/snes9x/snes9x-1.61.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools meson toolchain-funcs xdg
-
-GLSLANG_COMMIT="bcf6a2430e99e8fc24f9f266e99316905e6d5134"
-SPIRV_COMMIT="1458bae62ec67ea7d12c5a13b740e23ed4bb226c"
-
-DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
-HOMEPAGE="https://github.com/snes9xgit/snes9x/"
-SRC_URI="
-	https://github.com/snes9xgit/snes9x/archive/${PV}.tar.gz -> ${P}.tar.gz
-	gui? ( glslang? (
-		https://github.com/KhronosGroup/glslang/archive/${GLSLANG_COMMIT}.tar.gz -> ${P}-glslang.tar.gz
-		https://github.com/KhronosGroup/SPIRV-Cross/archive/${SPIRV_COMMIT}.tar.gz -> ${P}-spirv.tar.gz
-	) )"
-
-LICENSE="
-	Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB
-	gui? ( glslang? ( Apache-2.0 BSD ) )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="alsa debug glslang gui libretro netplay opengl oss png portaudio pulseaudio wayland xinerama +xv"
-REQUIRED_USE="glslang? ( gui opengl )"
-RESTRICT="bindist test" # has no tests but can lead to bug #737044
-
-RDEPEND="
-	sys-libs/zlib:=[minizip]
-	x11-libs/libX11
-	x11-libs/libXext
-	alsa? ( media-libs/alsa-lib )
-	gui? (
-		dev-cpp/cairomm:0
-		dev-cpp/glibmm:2
-		dev-cpp/gtkmm:3.0[wayland?]
-		dev-libs/glib:2
-		dev-libs/libsigc++:2
-		media-libs/libsdl2[joystick]
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3[wayland?]
-		x11-libs/libXrandr
-		x11-misc/xdg-utils
-		opengl? ( media-libs/libepoxy )
-		portaudio? ( media-libs/portaudio )
-		pulseaudio? ( media-sound/pulseaudio )
-		wayland? ( dev-libs/wayland )
-	)
-	libretro? ( !games-emulation/libretro-snes9x )
-	png? ( media-libs/libpng:= )
-	xinerama? ( x11-libs/libXinerama )
-	xv? ( x11-libs/libXv )"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	opengl? ( media-libs/libglvnd )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.59-build-system.patch
-	"${FILESDIR}"/${PN}-1.61-libretro-flags.patch
-)
-
-src_prepare() {
-	if use gui && use glslang; then
-		rmdir shaders/{glslang,SPIRV-Cross} || die
-		mv ../glslang-${GLSLANG_COMMIT} shaders/glslang || die
-		mv ../SPIRV-Cross-${SPIRV_COMMIT} shaders/SPIRV-Cross || die
-	fi
-
-	default
-
-	rm -r unzip || die
-
-	cd unix || die
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC CXX # for libretro
-
-	local econfargs=(
-		$(use_enable alsa sound-alsa)
-		$(use_enable debug debugger)
-		$(use_enable netplay)
-		$(use_enable png screenshot)
-		$(use_enable xinerama)
-		$(use_enable xv xvideo)
-		--enable-gamepad
-		--enable-gzip
-		--enable-zip
-		--with-system-zip
-	)
-
-	cd unix || die
-	econf "${econfargs[@]}"
-
-	if use gui; then
-		local emesonargs=(
-			$(meson_use alsa)
-			$(meson_use debug debugger)
-			$(meson_use glslang slang) # TODO?: unbundle
-			$(meson_use opengl)
-			$(meson_use oss)
-			$(meson_use png screenshot)
-			$(meson_use portaudio)
-			$(meson_use pulseaudio)
-			$(meson_use wayland)
-			$(meson_use xv)
-			-Dsystem-zip=true
-			-Dzlib=true
-		)
-
-		EMESON_SOURCE=${S}/gtk
-		meson_src_configure
-	fi
-}
-
-src_compile() {
-	if use libretro; then
-		emake -C libretro
-		# rebuild objects given libretro uses different defines (bug #791475)
-		rm *.o || die
-	fi
-
-	emake -C unix
-
-	use gui && meson_src_compile
-}
-
-src_install() {
-	if use libretro; then
-		exeinto /usr/$(get_libdir)/libretro
-		doexe libretro/snes9x_libretro.so
-	fi
-
-	dobin unix/${PN}
-
-	local DOCS=(
-		README.md
-		docs/{changes,control-inputs,controls,snapshots}.txt
-		unix/snes9x.conf.default
-	)
-	einstalldocs
-
-	if use gui; then
-		meson_src_install
-		dodoc gtk/AUTHORS
-	fi
-}
diff --git a/games-emulation/snes9x/snes9x-1.62.3.ebuild b/games-emulation/snes9x/snes9x-1.62.3.ebuild
index 53678735c21a..6f28481e8585 100644
--- a/games-emulation/snes9x/snes9x-1.62.3.ebuild
+++ b/games-emulation/snes9x/snes9x-1.62.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools cmake flag-o-matic python-any-r1 toolchain-funcs xdg
 
 # TODO: try unbundling, albeit compatibility with (and between) these