3 files changed, 0 insertions, 183 deletions
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index 66ed95543fb8..67f919db52fd 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1,6 +1,3 @@
-AUX openmsx-16.0-libsdl-joystick-fix.patch 2101 BLAKE2B b2381fe41d014106f87a11ccc8f5f301bf033d4ff281a11280b4b8459cf62f81c29a2d07220466ab7cb59005f14157857f3ff566e1f00ddfc104ba68b199dfd5 SHA512 f2aa3b1e69879db9a315e6485db67382228827caa2d362f9f1843a76741d2bb6f909ed05664d88608c01910914e3c40d2e5600a78b276111e242f51145e3c9cb
-DIST openmsx-16.0.tar.gz 3997584 BLAKE2B 040bb3f6ff0338740b5212aae21db2c97fcee0e8c8ada1bc84a59d94b1b72180c4b2d5eff8cc4ae84dd95bc77f121e15c2f818f1f2e05ba7dc4781b63770db38 SHA512 a06ec56a8a768356b628e59e587ec85898643b04379da5c72bbbd8e48a0533da34a451b7e4d2a2f540f14e6bbcf833534a1bdac9014ce0c35dfd4ca179618f48
 DIST openmsx-17.0.tar.gz 4045461 BLAKE2B 46c70ce3f853aecebf8bdeddc5786903634d88d013497383490d79b0dbf455f48a70b3658b9913db197cf7e66cbc6f4da37da58b1b24d77c75b731e842c663df SHA512 4fc87efd2bfbcd12bebb4e005b18b1cb2048f5d8f3188ef9b55f1e003c8d021fb47bd67d647137daa6a8640b5656b0db363f3b62158d690ddb5f7bf1af3459e1
-EBUILD openmsx-16.0-r1.ebuild 2940 BLAKE2B 63a22b96330eb87055d2910d910aa5ee31f30354a3aa87ad290572975b77401613eb18e9986ca3e2456fb4c15b0ad2922215968eb0c65fdf7767fe64742068ce SHA512 46be0450204bb95639a0822f6bf90824c8b728ceae2c67e79731da1b52f6a82ca0c62fe8fe41ef3a0dcf4bc71535e54c46d09976d90d12d18efe14713814dab6
 EBUILD openmsx-17.0.ebuild 2882 BLAKE2B 2aa8a567b5080dd487b9c7c69138df9acf2e3523fe57a57d5cfa74a7659028d1d8eba3aaa04696f941865c8878f175b8bc8249dda1dc5884b61a959c6dc12834 SHA512 4ce326368598aa63b83eb8da63f6f4f5250f4b8c5ba2bc078e4c2fbaaa26a14b9b261885e729c1f16d152fb66ec37c9a4fc36e5200acbde404c9659e824aa896
 MISC metadata.xml 442 BLAKE2B 579f3b84332385ce6f79c1f927bb3d4b1b112954695bd30425849946ec3994158a855fc9dbff8407775ad532a105e518ba30b4e72f3e42d3b64e2cadffaa9220 SHA512 a24a4c4cef293439f8ea46ad1261507160ea5024cbc53947915e6306a1356d5682440fa1eb230a98e715214c53024fa7ffe4aa97f1bb3f385c66c1ee69b8323f
diff --git a/games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch b/games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch
deleted file mode 100644
index ff4e4c31e0cd..000000000000
--- a/games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From eb5ddae80bdc6793de42ee67dd72e2da9d632ba8 Mon Sep 17 00:00:00 2001
-From: Maarten ter Huurne <maarten@treewalker.org>
-Date: Sat, 23 Jan 2021 03:25:38 +0100
-Subject: [PATCH] Fix compile errors and warnings when SDL_JOYSTICK_DISABLED is
- defined
-
-If there is no base class, it's impossible to override the destructor.
-
-There were warning suppressors for 3 out of 5 arguments that are unused
-when SDL_JOYSTICK_DISABLED is defined; I added the othe two.
----
- src/input/JoyMega.hh  | 6 +++++-
- src/input/Joystick.cc | 2 ++
- src/input/Joystick.hh | 8 ++++++--
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/input/JoyMega.hh b/src/input/JoyMega.hh
-index 8422bcd2a..05371e27d 100644
---- a/src/input/JoyMega.hh
-+++ b/src/input/JoyMega.hh
-@@ -25,7 +25,11 @@ public:
- 	JoyMega(MSXEventDistributor& eventDistributor,
- 	         StateChangeDistributor& stateChangeDistributor,
- 	         SDL_Joystick* joystick);
--	~JoyMega() override;
-+	~JoyMega()
-+#ifndef SDL_JOYSTICK_DISABLED
-+		override
-+#endif
-+		;
- 
- #ifndef SDL_JOYSTICK_DISABLED
- 	// Pluggable
-diff --git a/src/input/Joystick.cc b/src/input/Joystick.cc
-index 04b4826cd..90b344c42 100644
---- a/src/input/Joystick.cc
-+++ b/src/input/Joystick.cc
-@@ -32,6 +32,8 @@ void Joystick::registerAll(MSXEventDistributor& eventDistributor,
- #ifdef SDL_JOYSTICK_DISABLED
- 	(void)eventDistributor;
- 	(void)stateChangeDistributor;
-+	(void)commandController;
-+	(void)globalSettings;
- 	(void)controller;
- #else
- 	for (auto i : xrange(SDL_NumJoysticks())) {
-diff --git a/src/input/Joystick.hh b/src/input/Joystick.hh
-index 18dd3c1c0..6a0f38d9d 100644
---- a/src/input/Joystick.hh
-+++ b/src/input/Joystick.hh
-@@ -38,9 +38,13 @@ public:
- 	Joystick(MSXEventDistributor& eventDistributor,
- 	         StateChangeDistributor& stateChangeDistributor,
- 	         CommandController& commandController,
--		 GlobalSettings& globalSettings,
-+	         GlobalSettings& globalSettings,
- 	         SDL_Joystick* joystick);
--	~Joystick() override;
-+	~Joystick()
-+#ifndef SDL_JOYSTICK_DISABLED
-+		override
-+#endif
-+		;
- 
- #ifndef SDL_JOYSTICK_DISABLED
- 	// Pluggable
diff --git a/games-emulation/openmsx/openmsx-16.0-r1.ebuild b/games-emulation/openmsx/openmsx-16.0-r1.ebuild
deleted file mode 100644
index e321fddfea00..000000000000
--- a/games-emulation/openmsx/openmsx-16.0-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
-
-DESCRIPTION="MSX emulator that aims for perfection"
-HOMEPAGE="https://openmsx.org/"
-SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+joystick"
-
-RDEPEND="dev-lang/tcl:0=
-	media-libs/alsa-lib
-	media-libs/libogg
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick=,sound,video]
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/sdl2-ttf
-	>=media-libs/glew-1.3.2:0=
-	sys-libs/zlib
-	virtual/opengl"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}/${P}-libsdl-joystick-fix.patch" )
-
-DOC_CONTENTS="
-If you want to if you want to emulate real MSX systems and not
-only the free C-BIOS machines, put the system ROMs in one of
-the following directories: /usr/share/${PN}/systemroms
-or ~/.openMSX/share/systemroms
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^LDFLAGS:=/d' \
-		-e '/LINK_FLAGS_PREFIX/d' \
-		-e '/LINK_FLAGS+=/s/-s//' \
-		-e '/LINK_FLAGS+=\$(TARGET_FLAGS)/s/$/ $(LDFLAGS)/' \
-		build/main.mk \
-		|| die
-	sed -i -e '/SYMLINK/s:true:false:' build/custom.mk || die
-	sed -i -e 's/GPL.txt//' doc/node.mk || die
-
-	# Build system only configured to use bundled version - but not from the
-	# directory it's distributed in
-	cp "${S}/Contrib/catch2/catch.hpp" "${S}/src/unittest" || die
-}
-
-src_configure() {
-	tc-export CXX
-
-	# Doesn't compile without this, and build system doesn't consistently add
-	# it properly for all compilers
-	append-cxxflags '-std=c++17'
-
-	default
-}
-
-src_compile() {
-	emake \
-		CXXFLAGS="${CXXFLAGS}" \
-		INSTALL_SHARE_DIR="${EPREFIX}/usr/share/${PN}" \
-		V=1
-}
-
-src_test() {
-	# To get tests, we need to build with OPENMSX_FLAVOUR=unittest and then the
-	# build is stored in a directory of the pattern
-	# ${WORKDIR}/derived/*-unittest/. This is separate from the actual build,
-	# stored in ${WORKDIR}/derived/*-opt. The unittest binary and the workdir
-	# binary are in each of these directories under their `bin` directories.
-	emake \
-		V=1 \
-		CXXFLAGS="${CXXFLAGS}" \
-		OPENMSX_FLAVOUR=unittest
-
-	# There will only ever be one *-unittest directory
-	"${S}"/derived/*-unittest/bin/openmsx || die
-}
-
-src_install() {
-	# To guarantee installing the proper binary in case tests were built,
-	# specify the default OPENMSX_FLAVOUR
-	emake \
-		V=1 \
-		INSTALL_BINARY_DIR="${ED}/usr/bin" \
-		INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
-		INSTALL_DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		OPENMSX_FLAVOUR=opt \
-		install
-
-	einstalldocs
-	readme.gentoo_create_doc
-
-	for i in 16 32 48 64 128 256 ; do
-		newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png"
-	done
-	make_desktop_entry "${PN}" "openMSX"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_pkg_postinst
-}