gentoo auto-resync : 20:01:2023 - 06:00:45

3 files changed, 125 insertions, 6 deletions

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 7ca2d7f84b91..74644c6ac3e8 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -2,6 +2,8 @@ AUX vbam-2.1.4-arm-asm.patch 1288 BLAKE2B cee8723a05887cef699864e90a5cc14db82672
 AUX vbam-2.1.4-cmake_fix.patch 5436 BLAKE2B 4af1b32f33c99cb66f7b551853fc49a402f860918214efcabb57bd1138bbe2977659fa50432f371cb443456cc0b75cbcd4f917936ae5246e1bb72a8868833cdf SHA512 3d33468003820d83b0a64fd4c086369293757a88c7883eaaf255f3fbc7aa438f08f249345a582b5eeb5269a6bf0bf0df1274aafed54931cafebda4c4c7112247
 AUX vbam-2.1.4-libsdl2-2.0.14.patch 783 BLAKE2B 36d4f89965b5097ec848e5d88b2cb600438baca4c73be0d5897a0b528275e433f596a6bb7fe6fd5a5cb3518ed9d7ff8a6f4166152ba6aa15ef90cff23a6159b5 SHA512 f97772215b857069ef881e859fa846400592c437ee85b5b2fd0f463df8be8f5cb40b322361ffa4718e89ab7460ec96a696c0a5683ef0914b2d901af4aacfaa8c
 DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896
+DIST vbam-2.1.5.tar.gz 4779351 BLAKE2B ef27185e0af1ad07016834f89689b9d81f59b9dc15ea7ea22d2fc72e0c3b86aeb2f23b4cab846f64d40cab35f0ea5510381530e9e8d7889c12949f5630272237 SHA512 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7
 EBUILD vbam-2.1.4.ebuild 2251 BLAKE2B 9bb3ca90cfd3bec44a598002ad917dcc6b7a8312e538bc25ca2f59cbd7f532c7fa513fa6c5771d731da7971df50c02891829cfc77f3430bff9d2daa12ea4c4cd SHA512 1fa521b6579892189ed9046785de17a4a68575f95ffe35ef86ac92c92224ec45a109124befba9709c421b2e4b5d46342c5847fd9f6fa1a171547d1d3ead69512
-EBUILD vbam-9999.ebuild 2119 BLAKE2B 9d3e53a9c113dd5c63bc133e3bd58734fbe8c1c338621a3696d9435be51883b85994fb12f2a417bd82a6764a9641abb5c2002b0172b25de8e1012d0798b75fe6 SHA512 0dea0eda480ad7876c58c665e2d3ecaf3b90d7d20ac2ab4174a7bca529ad654650507b97272939d5a1c9ae87e454b42fa55615554d1d886c89e5c15c9103d5b7
+EBUILD vbam-2.1.5.ebuild 2236 BLAKE2B 7434145a698f17d1cab6f79e5679d55527af61495e530428fe3b01719e744a9da735161158e5116201dae8a709c5c404948e7ac750a4965637ce5760a5b2d1f3 SHA512 f08b26797919fd4e051f1710597b2f5e2c71f19363708a4278fdf17fe48a1d48d22f7f615b4acbd68cf51cc483413ae4c2b98a98f1a6463ac56c32983fbebeee
+EBUILD vbam-9999.ebuild 2236 BLAKE2B 7434145a698f17d1cab6f79e5679d55527af61495e530428fe3b01719e744a9da735161158e5116201dae8a709c5c404948e7ac750a4965637ce5760a5b2d1f3 SHA512 f08b26797919fd4e051f1710597b2f5e2c71f19363708a4278fdf17fe48a1d48d22f7f615b4acbd68cf51cc483413ae4c2b98a98f1a6463ac56c32983fbebeee
 MISC metadata.xml 480 BLAKE2B 43f103fa39cc5a54114a29e5a4d9f317a4cb05233dbeccd74a99218d22f1b93916873756c688fecb09f14d8b84772623d9e66fa64009a014f90cc95329d38d27 SHA512 f9a74a97be6da5686189baa7c5fcb05d9742e41611383b97d071f09fd36944b37d6dbf94309de661d7cd6e17349084f0cdb25ba2b761b44064504ad28f20a76a
diff --git a/games-emulation/vbam/vbam-2.1.5.ebuild b/games-emulation/vbam/vbam-2.1.5.ebuild
new file mode 100644
index 000000000000..e5c66f3e0817
--- /dev/null
+++ b/games-emulation/vbam/vbam-2.1.5.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit wxwidgets xdg cmake
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/visualboyadvance-m-${PV}"
+fi
+
+DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
+HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
+
+REQUIRED_USE="
+	ffmpeg? ( wxwidgets )
+	openal? ( wxwidgets )
+	|| ( sdl wxwidgets )
+"
+
+RDEPEND="
+	>=media-libs/libpng-1.4:=
+	media-libs/libsdl2[joystick]
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	link? ( >=media-libs/libsfml-2.0:= )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	wxwidgets? (
+		ffmpeg? ( media-video/ffmpeg:= )
+		openal? ( media-libs/openal )
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig
+	wxwidgets? ( virtual/imagemagick-tools )
+	amd64? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local mycmakeargs=(
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_LINK=$(usex link)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_SDL=$(usex sdl)
+		-DENABLE_WX=$(usex wxwidgets)
+		-DENABLE_ASM_CORE=$(usex x86)
+		-DENABLE_ASM_SCALERS=$(usex x86)
+		-DCMAKE_SKIP_RPATH=ON
+		-DENABLE_LTO=OFF
+		-DENABLE_ONLINEUPDATES=OFF
+		-DDISABLE_MACOS_PACKAGE_MANAGERS=ON
+	)
+
+	if use wxwidgets; then
+		mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use sdl ; then
+		dodoc doc/ReadMe.SDL.txt
+		doman src/debian/vbam.6
+	fi
+
+	use wxwidgets && doman src/debian/visualboyadvance-m.6
+}
+
+pkg_preinst() {
+	if use wxwidgets ; then
+		xdg_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	if use wxwidgets ; then
+		xdg_pkg_postinst
+	fi
+}
+
+pkg_postrm() {
+	if use wxwidgets ; then
+		xdg_pkg_postrm
+	fi
+}
diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 7cd76d64a0ef..e5c66f3e0817 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 inherit wxwidgets xdg cmake
@@ -29,12 +29,12 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=media-libs/libpng-1.4:0=
+	>=media-libs/libpng-1.4:=
 	media-libs/libsdl2[joystick]
-	link? ( >=media-libs/libsfml-2.0:= )
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
+	link? ( >=media-libs/libsfml-2.0:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
@@ -48,14 +48,16 @@ DEPEND="
 "
 BDEPEND="
 	app-arch/zip
+	virtual/pkgconfig
 	wxwidgets? ( virtual/imagemagick-tools )
+	amd64? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
 "
 
 src_configure() {
 	use wxwidgets && setup-wxwidgets
+
 	local mycmakeargs=(
 		-DENABLE_FFMPEG=$(usex ffmpeg)
 		-DENABLE_LINK=$(usex link)
@@ -67,10 +69,14 @@ src_configure() {
 		-DENABLE_ASM_SCALERS=$(usex x86)
 		-DCMAKE_SKIP_RPATH=ON
 		-DENABLE_LTO=OFF
+		-DENABLE_ONLINEUPDATES=OFF
+		-DDISABLE_MACOS_PACKAGE_MANAGERS=ON
 	)
+
 	if use wxwidgets; then
 		mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) )
 	fi
+
 	cmake_src_configure
 }
 
@@ -81,6 +87,7 @@ src_install() {
 		dodoc doc/ReadMe.SDL.txt
 		doman src/debian/vbam.6
 	fi
+
 	use wxwidgets && doman src/debian/visualboyadvance-m.6
 }