gentoo auto-resync : 24:01:2023 - 12:57:16

6 files changed, 53 insertions, 200 deletions

diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest
index 3623dd157467..bb78c4a72858 100644
--- a/app-emulation/punes/Manifest
+++ b/app-emulation/punes/Manifest
@@ -1,8 +1,3 @@
-AUX punes-0.107_ffmpeg-configure.patch 798 BLAKE2B da041283394db3a436478025fe3c8f5919f368bf00a5947fc688110d86691e987a52653e21215e05aab9d9861e7346fb526031c560da363570e6aeba11e4255c SHA512 443ad57c8659597f1beab1e5bb0a560f053986a6021785e24107463aa2351c1d6e26ee760cb1ec4a9913d8e01002a31f41d21a0b878e8925a66f02a858cebaa6
-AUX punes-0.109_ldflags.patch 1476 BLAKE2B 7bc1bc06ec5f55d6a0146396cfed22d46381d2e471f8cc8a3c1261528e67dc8b36e3bde786e8cf8426d0357a0fea51ae4c90a124fb8e5cf31e1cc3b0638cca8e SHA512 30ee7ad570e43f0b303a8c6ed6131fe2b1e6359c024f213b1f064712a23a4d743ed055c321726a4b585dbf4dda6934690fa45c84ef86e18eebf2561353730cea
-DIST punes-0.107.tar.gz 44024138 BLAKE2B 048df5bc9b019bafcd4eec75dc027de7cde9f8aa0d484ef96e5c41b091ba55c13b84ef7c7c36987b53206b1b7027758534479d0cc9fde63d89a48092c3f9d26d SHA512 eb3b7aa1c18765402e1e57e23dd4b019255320b795c0f578a4d5ae9f4e0c163613da07280e2a5abed80b9ba90e74c80b53b5fdd80e405103f0063ca55d0ee7bd
-DIST punes-0.109.tar.gz 48695769 BLAKE2B cc5a86b2f99dc3c97bc04386568fcb926d2a9c83f8c6dcaf28c022a136791ff481610ad578c996c643e0c0b107acb2be9a0fbfda0950435aad984f3506ec1983 SHA512 13cf3587c9936ff9f933d3394516d25fbd664fc2fd510af724c3bbbc6fefb12a019e8fe27cd52cd326ef8fba3721f4e1816ce5d3f3935f701081a142f04a3bc2
-DIST punes-0.109_musl.patch.xz 5520 BLAKE2B ea1c36d510303dd67b7e2005a3f099e328583c9762f74ccf9457a5f04268c44243b4fe18fc6498c176a999318f40c9a34ca2a3ed7de2d4dea953ab055901ad42 SHA512 507163d40849bbf782725f71409432a0cb4a79f5c3fccfaf78786322539a1bce0608b731a75c817b72f8a4e814d0cb21019cb23f621176042fb946754a4a9292
-EBUILD punes-0.107.ebuild 1241 BLAKE2B 5df5b93a315a152425c1bbeeb612b3a173d8682350d5b2f13740699752efeb9d96b99e57b578103e78b13edc3929344962dee8585a337fe5bc95bcdc036a39cc SHA512 149e4797185ae7d906ec4ef5ec29314eee21084829272379fdbf79d29519715d7e329174ef0485ab1a6448943e72781a2b6314b096a200ead2237e5a5138c2df
-EBUILD punes-0.109-r1.ebuild 1568 BLAKE2B e974710b926adcabeea13e0de0c73403dc06750da606b03990d7e15f2ccb3e3518206dfd07114cf0637c53067c6f151b3959f895476c55701e39fc93cd671629 SHA512 dff1d6a40e964f0d9c7a3fde8d5981d4289458219035c0f33ed5f5653298e2af020fdc55a6a8d525330e21951eeaa072f112b8cf3414782533c67ebb4e616b20
+DIST punes-0.110.tar.gz 49500935 BLAKE2B c4704ad6edc828f6332798e44939dc82e86fb0fed1d7a71e3377c7bb384a7fc40d2b9303dff13b1e92cf4bb189a5c4816c5c6ec2f2db1ab1c5d58d459b6c1ed9 SHA512 e0f503ac8c0cd0257eebb1401a6cf5045d03e348a5f915574b47c15930c029c93e36f5776c1364b7c7b6a27faa48a36173c4fd0342f24e9a3241ebd5e0a9d137
+EBUILD punes-0.110.ebuild 1060 BLAKE2B 0159bd33946e7633901018716ca92ada0b29d3d0f8349499464a8b940f271196284d2fb1c0efe8958481e488ca12c5ea5f5528eb293740cd925668ba2e5f9ffa SHA512 22a2bb531b4999be4bfa93140cbd595a36d46007ac7e1ea6c59ea92f8ccb8cc1b4ffb88a162141c42eec4a5bacfab41b0e6113496f501a2015e9a15281d8513a
 MISC metadata.xml 560 BLAKE2B ea221c8fefa3fc3e9f8942ae7cfd642384cde9ec10949bc148e17727e0633f718140fa15675a3268674c80e6b55177ff5573460abd687bc76420673f76aecc8a SHA512 7676ca51eb1d02c6564dfd9ef47975f349856ae9536e3f1d9771bf4c56a2aebe86622461ae50b5989c56fffa1cfa92fc6185f1d62d933c4db5016acc4c280a8f
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.109_ldflags.patch b/app-emulation/punes/files/punes-0.109_ldflags.patch
deleted file mode 100644
index ada9b28f137b..000000000000
--- a/app-emulation/punes/files/punes-0.109_ldflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/punesemu/puNES/commit/b79efed1b6e350076ea7a459dafd6c2f995bcb51
-
-From b79efed1b6e350076ea7a459dafd6c2f995bcb51 Mon Sep 17 00:00:00 2001
-From: fhorse <punes.development@gmail.com>
-Date: Tue, 7 Jun 2022 09:16:59 +0200
-Subject: [PATCH] https://github.com/punesemu/puNES/issues/213
-
-This commit allows compilation with Flatpak's build tools.
----
- src/extra/lib7zip-53abfeb/configure | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/extra/lib7zip-53abfeb/configure b/src/extra/lib7zip-53abfeb/configure
-index ca28ab144..504c02f6e 100755
---- a/src/extra/lib7zip-53abfeb/configure
-+++ b/src/extra/lib7zip-53abfeb/configure
-@@ -344,11 +344,11 @@ fi
- 
- # Unlike CFLAGS/CXXFLAGS/CC/CXX, LDFLAGS isn't handled by CMake, so we
- # need to parse it here.
--if [ "x${LDFLAGS}" != "x" ]; then
--    for varname in EXE MODULE SHARED STATIC; do
--        CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_${varname}_LINKER_FLAGS=$(quote "$LDFLAGS")"
--    done
--fi
-+#if [ "x${LDFLAGS}" != "x" ]; then
-+#    for varname in EXE MODULE SHARED STATIC; do
-+#        CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_${varname}_LINKER_FLAGS=$(quote "$LDFLAGS")"
-+#    done
-+#fi
- 
- #eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DCMAKE_INSTALL_LIBDIR="${LIBDIR}" ${CMAKE_ARGS}
- #eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_SHARED_LIB="OFF" -DP7ZIP_SOURCE_DIR="${P7ZIP_SOURCE_DIR}" ${CMAKE_ARGS}
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.109-r1.ebuild b/app-emulation/punes/punes-0.109-r1.ebuild
deleted file mode 100644
index f4591cbe10f9..000000000000
--- a/app-emulation/punes/punes-0.109-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs 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"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}_musl.patch.xz"
-S="${WORKDIR}/puNES-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cg ffmpeg"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	media-libs/libglvnd[X]
-	virtual/glu
-	virtual/udev
-	x11-libs/libX11
-	x11-libs/libXrandr
-	cg? ( media-gfx/nvidia-cg-toolkit )
-	ffmpeg? ( media-video/ffmpeg:= )"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	dev-util/cmake
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}_ldflags.patch
-	"${WORKDIR}"/${P}_musl.patch # 830471
-)
-
-src_prepare() {
-	default
-
-	# empty CMAKE_ARGS to avoid double CHOST (bug #877089), and also unused
-	# options (QA notices), use sed to avoid rebases because of the directory
-	sed -e '/x${DEBUG_VERSION}/i\CMAKE_ARGS=' \
-		-i src/extra/lib7zip-*/configure || die
-	tc-export CC CXX
-
-	# src/extra/lib7zip is not autotools, but
-	# is contained within AC_CONFIG_SUBDIRS
-	AT_NO_RECURSIVE=1 eautoreconf
-	cd src/extra/xdelta-3.1.0 || die
-	eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		$(use_with cg opengl-nvidia-cg)
-		$(use_with ffmpeg)
-	)
-
-	econf "${econfargs[@]}"
-}
diff --git a/app-emulation/punes/punes-0.110.ebuild b/app-emulation/punes/punes-0.110.ebuild
new file mode 100644
index 000000000000..9a5f143123d4
--- /dev/null
+++ b/app-emulation/punes/punes-0.110.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 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"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	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:= )"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GIT_INFO=OFF
+		-DENABLE_QT6_LIBS=OFF
+		-DDISABLE_PORTABLE_MODE=OFF
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FULLSCREEN_RESFREQ=$(usex X)
+		-DENABLE_OPENGL_CG=$(usex cg)
+	)
+	cmake_src_configure
+}