5 files changed, 97 insertions, 92 deletions
diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest
index 36a25723e830..8161798f4ed7 100644
--- a/app-emulation/punes/Manifest
+++ b/app-emulation/punes/Manifest
@@ -1 +1 @@
-DIST punes-0.107.tar.gz 44024138 BLAKE2B 048df5bc9b019bafcd4eec75dc027de7cde9f8aa0d484ef96e5c41b091ba55c13b84ef7c7c36987b53206b1b7027758534479d0cc9fde63d89a48092c3f9d26d SHA512 eb3b7aa1c18765402e1e57e23dd4b019255320b795c0f578a4d5ae9f4e0c163613da07280e2a5abed80b9ba90e74c80b53b5fdd80e405103f0063ca55d0ee7bd
+DIST punes-0.111.tar.gz 57538299 BLAKE2B a900fe2bc9117e6739e58a43e457bfa466053d5a96ae5ad1333d7e0bc11eafb2408a96dc7e35ddf1a3cee50cafe99549a43d2abb629b106bbb1082878a845cc6 SHA512 6388cdf2b303e217adfe43b1b3b1ef66a75b6adfdb0363b213c47fc129b5815f3e96814ee25a3637147dc184203cef0438930c280f0c6249085ecac1220b435c
diff --git a/app-emulation/punes/files/punes-0.107_ffmpeg-configure.patch b/app-emulation/punes/files/punes-0.107_ffmpeg-configure.patch
deleted file mode 100644
index fd70e0d49ef0..000000000000
--- a/app-emulation/punes/files/punes-0.107_ffmpeg-configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 241b71fdacad10ad1e790e5a4e380ea1ffbe8a93 Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Thu, 21 Jan 2021 12:32:31 +0300
-Subject: [PATCH] Fix ffmpeg configure switch option
-
-autoconf's --with-PACKAGE/--without-PACKAGE requires $withval, not
-$enableval.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index fd9e0365..f63d50ea 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,7 +38,7 @@ AC_ARG_WITH([ffmpeg],
- 	AS_HELP_STRING([--with-ffmpeg],
- 		[Build with support for FFmpeg [autodetect] @<:@default: yes@:>@]
- 	),
--	[with_ffmpeg=$enableval], [with_ffmpeg=yes])
-+	[with_ffmpeg=$withval], [with_ffmpeg=yes])
- 
- AC_ARG_ENABLE([release],
- 	AS_HELP_STRING([--disable-release],
--- 
-2.26.2
-
diff --git a/app-emulation/punes/files/punes-0.111-FULLSCREEN_RESFREQ-fix.patch b/app-emulation/punes/files/punes-0.111-FULLSCREEN_RESFREQ-fix.patch
new file mode 100644
index 000000000000..065483ad058f
--- /dev/null
+++ b/app-emulation/punes/files/punes-0.111-FULLSCREEN_RESFREQ-fix.patch
@@ -0,0 +1,33 @@
+From e1516fcefe3dcc9710ae85cce0f536fd2d9fdcd6 Mon Sep 17 00:00:00 2001
+From: Fabio Cavallo <punes.development@gmail.com>
+Date: Sat, 23 Mar 2024 10:34:34 +0100
+Subject: [PATCH] Fixed compilation with FULLSCREEN_RESFREQ disabled (#388).
+
+--- a/src/core/emu.c
++++ b/src/core/emu.c
+@@ -43,11 +43,11 @@
+ #include "recent_roms.h"
+ #include "../../c++/crc/crc.h"
+ #include "gui.h"
++#include "nes20db.h"
+ #include "video/effects/pause.h"
+ #include "video/effects/tv_noise.h"
+ #if defined (FULLSCREEN_RESFREQ)
+ #include "video/gfx_monitor.h"
+-#include "nes20db.h"
+ #endif
+ 
+ #define RS_SCALE (1.0f / (1.0f + (float)RAND_MAX))
+--- a/src/gui/wdgOverlayUi.cpp
++++ b/src/gui/wdgOverlayUi.cpp
+@@ -34,9 +34,9 @@
+ #include "rewind.h"
+ #include "version.h"
+ #include "nes.h"
++#include "input/standard_controller.h"
+ #if defined (FULLSCREEN_RESFREQ)
+ #include "video/gfx_monitor.h"
+-#include "input/standard_controller.h"
+ #endif
+ 
+ void overlay_info_append_qstring(BYTE alignment, const QString &msg);
diff --git a/app-emulation/punes/punes-0.107.ebuild b/app-emulation/punes/punes-0.107.ebuild
deleted file mode 100644
index db719a74f5f9..000000000000
--- a/app-emulation/punes/punes-0.107.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg-utils
-
-DESCRIPTION="Nintendo Entertainment System (NES) emulator"
-HOMEPAGE="https://github.com/punesemu/puNES"
-SRC_URI="https://github.com/punesemu/puNES/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cg ffmpeg"
-
-RDEPEND="
-	ffmpeg? ( media-video/ffmpeg:= )
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	virtual/glu
-	virtual/opengl"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	cg? ( media-gfx/nvidia-cg-toolkit )
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-S="${WORKDIR}/puNES-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}_ffmpeg-configure.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i "/update-desktop-database/d" misc/Makefile.am || die
-	eautoreconf
-	# FIXME why eautoreconf can't handle this?
-	cd "src/extra/lib7zip-1.6.5" || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with cg opengl-nvidia-cg) \
-		$(use_with ffmpeg)
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-emulation/punes/punes-0.111.ebuild b/app-emulation/punes/punes-0.111.ebuild
new file mode 100644
index 000000000000..03071411bec5
--- /dev/null
+++ b/app-emulation/punes/punes-0.111.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Nintendo Entertainment System (NES) emulator"
+HOMEPAGE="https://github.com/punesemu/puNES"
+SRC_URI="https://github.com/punesemu/puNES/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/puNES-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X cg ffmpeg qt6"
+
+RDEPEND="
+	media-libs/alsa-lib
+	media-libs/libglvnd[X?]
+	virtual/glu
+	virtual/udev
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrandr
+	)
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	ffmpeg? ( media-video/ffmpeg:= )
+	qt6? (
+		dev-qt/qtbase:6[gui,network,opengl,widgets]
+		dev-qt/qtsvg:6
+	)
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)"
+
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	virtual/pkgconfig
+	qt6? ( dev-qt/qttools[linguist] )
+	!qt6? ( dev-qt/linguist-tools:5 )"
+
+PATCHES=(
+	"${FILESDIR}/punes-0.111-FULLSCREEN_RESFREQ-fix.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GIT_INFO=OFF
+		-DENABLE_QT6_LIBS=$(usex qt6)
+		-DDISABLE_PORTABLE_MODE=OFF
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FULLSCREEN_RESFREQ=$(usex X)
+		-DENABLE_OPENGL_CG=$(usex cg)
+	)
+	cmake_src_configure
+}