gentoo auto-resync : 15:07:2023 - 04:39:16

5 files changed, 144 insertions, 79 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index b97b4e3164d3..70e56882c871 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 594ea8fe1a17..5f9e0ac4d81b 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,5 +1,3 @@
-DIST devilutionx-1.4.1.tar.xz 19679968 BLAKE2B 51ae007d5d1dce25a9af20b98017826534d835c2a74bfcd78cb4fb3c8e86b4e2e55a302e0412cbbcff8f931ad33a2baab806199769660351f31cc49fa91814b6 SHA512 9709600395abfd697bc45757bd2cf3e5cf0e07e2c55c86a48a73e9f52003c274724e26306b4fcb36c2eda0776c51dbab96599c0d14744244c8c037fd5dd14263
 DIST devilutionx-1.5.0.tar.xz 21951316 BLAKE2B efc6d3539eed25f917d30f3a858903952068bf4d4c66b0cd39f1a86ce3f98d9d67a8bce3a2467fa22e91bd2f552fbb593b602273e163422ab5f133133d513060 SHA512 df4998a86203372b82cb3be0348a1555ea95127a22ef050fed068215fd2223550f2b64364d83a58f829398169a29a5990d4332dc7f0adec6316f3a6c8e280ccb
-EBUILD devilutionx-1.4.1.ebuild 1998 BLAKE2B f28cb67d439a85fe1c062abdf38e2e5a449807825b4edbf23f158d693a2058efc6ca15f562499c118fe3780fc42249ed3fe3c3efef85ea779fee38c9a502748f SHA512 3384d4e416b163a5ec29199395ca55655ff5b44481d2857491aeb1cecc1cc15908c842c981da2802553137efce1e8bf946c3efd585f4e68eca0cb988c51794f4
 EBUILD devilutionx-1.5.0.ebuild 2133 BLAKE2B 9c3e64d67a2167f914a256a483056f94abe6c68b0e281c7be04571c8460e2e652d66ed57856c68d3552c59b98a8f699fca2ed0b7a8c04e838c1dc48fe62b9651 SHA512 01781cc7eb0783ea88f7a639061e47f3f16f640cc1c51b08642b01d402e12efef853ac2ec2464217d623f1cebb7aff01a6db1d7d490eb995f08c6051c61f1d8e
 MISC metadata.xml 542 BLAKE2B 25e292f201570a11d08f4f22922a9dfa1f54d51784be9b38f3b8396a44559ffe6d5f8799e20b8c2fa888ce97e8a45d257894c13924e303a7f93d04c0c046e231 SHA512 acb1603f7e41f47daf7f9fde6128b2f7c51c277cb97be62b87695cceb48fca653f90c2ca3e22238758a78aae4fa34f2de555e07f7e8d896a8ccf5e1c569e8083
diff --git a/games-engines/devilutionx/devilutionx-1.4.1.ebuild b/games-engines/devilutionx/devilutionx-1.4.1.ebuild
deleted file mode 100644
index e7608abb497b..000000000000
--- a/games-engines/devilutionx/devilutionx-1.4.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Diablo engine for modern operating systems"
-HOMEPAGE="https://github.com/diasurgical/devilutionX/"
-SRC_URI="https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}/${PN}-src-${PV}-5ad792133"
-
-LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BSL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +sodium test zerotier"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/bzip2:=
-	dev-libs/libfmt:=
-	media-libs/libsdl2[haptic,joystick,opengl,video]
-	media-libs/sdl2-image[png]
-	sys-libs/zlib:=
-	media-libs/sdl_audiolib
-	sodium? ( dev-libs/libsodium:= )"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/asio
-	dev-cpp/simpleini
-	test? ( dev-cpp/gtest )"
-BDEPEND="sys-devel/gettext"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# use system asio
-	echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
-
-	# ensure system copies are used
-	rm -r dist/{asio,simpleini,sdl_audiolib}-src || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCCACHE_PROGRAM=OFF #813768
-		-DDEBUG=$(usex debug)
-		-DDISABLE_LTO=ON # let CFLAGS control this
-		-DDISABLE_ZERO_TIER=$(usex !zerotier)
-		-DPACKET_ENCRYPTION=$(usex sodium)
-		-DPIE=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	local DOCS=( Packaging/nix/README.txt docs/*.md )
-	cmake_src_install
-
-	rm "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "In order to play the game, you will need to copy the following data file"
-		elog "from the original game, and optionally the hellfire expansion files:"
-		elog "	- DIABDAT.MPQ"
-		elog "	- hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
-		elog "to ~/.local/share/diasurgical/devilution/"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
-	fi
-}
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index c633bbca9b41..8cbb04edb14d 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -2,9 +2,11 @@ DIST scummvm-2.5.1.tar.xz 132828412 BLAKE2B 08fb2fa6cbeec3c1ec24a9b660aab4344f0d
 DIST scummvm-2.6.0.tar.xz 141331920 BLAKE2B 38cdce3e9b7954347d3ba05946c607aa5a62aa8fa1c2145030c1667632a4da43afd3f14ed19ebaf664bbf521610b2cfccc739c82dae95650572bfab81495cb80 SHA512 6bb2b22f9b11a8de2eaa48c520d63579f4907fa49d8b02d58702ece86945b38ea911376f5ae0dc6f3b6ed794ff32ca51fbf690e341401b4a03276b32e9bd7b69
 DIST scummvm-2.6.1.tar.xz 141354456 BLAKE2B b54001a53b3c899831745c94b1bf6020b462dfd49f6de35a609a6977846e7d036ee6c323c888c88379f4b6149dad31a1af5a38ae8d5231303dbba6a0ba97bb2f SHA512 984e35683ec4fa6a0715a20027d471ff432a2da060caf1b28557e42ae7b2b5c3b32c3ef4f3c1fb0ac9bcde69d01f789b3054fe9b0ddb0fe9fadbee462c1afcc5
 DIST scummvm-2.7.0.tar.xz 145171776 BLAKE2B 0f208919ca64cef56e513988635e02c84e5ce85cd328687bd566d17daee5a1386dd7986649655670117e3c211f10566b14f2a0b43bf3fe54ba68c542681b8a31 SHA512 099afbde36f73eec26059f63b541cf79dde7debf7068fb4fa4efd3ad09eecfccb57c92f0a21d120c56c6821e45133e0ca02e138beed98c16f2b273a965411271
+DIST scummvm-2.7.1.tar.xz 148127416 BLAKE2B a74ede3ea8e128d2ab28cac897ef372c1bbcb79de8afdb86c1d30323ddc4c23f72a2f98ee4023d548961d339b89362c50e7e58e358a00a3017950f5bd0e93774 SHA512 7fcefb849822c84df3f8c9b8c91c8ea15cdd4597404c927fda3b2ba0a6a18e82917be9511244d8ba8f693df8bfa2d368bdebdd4caaa9905007ce0463cc693760
 EBUILD scummvm-2.5.1-r1.ebuild 3336 BLAKE2B 62bab3ad57d8d49791c7c544d45a8fca33d2d0d29c4345b0aa990feec16cd854dd5c64f17bc09a59b64acd7bd1cc2f21a61effce47f7ef9835bc3f2a38d6fce5 SHA512 a44d58570026db7211c3a49fa5e97edbffae18027da780519abc686e5d8e19b698cb3cbb79a00b2670ec48774d0538589cf403b1c501e50c641eb7368da67878
 EBUILD scummvm-2.6.0-r1.ebuild 3265 BLAKE2B 625af8af3654f28548984d3512380c3be1dd6ec31b335ea67590e37a39206468e62115174b8bada2b806c7daab3ae45b3561fd9cc88370edd16021d801e99651 SHA512 bd01658c0dac146fa9f94cd5b0f43555a3694b797ed469c33aabfd04311974c30d796e938443208ee65ff25483cca323fdbe0018e6fa9be17badbe0a5a000648
 EBUILD scummvm-2.6.1.ebuild 3245 BLAKE2B bb8852cff25a78313889a370d50eab4c830347e3d35a069ef78a2a06d97e063cb14628dc5ff276c402f9f2cf56a36fb2409e287ff4e8940ec77214af8145327b SHA512 60d5b76d8bd5b93fdc3ba6dc5f6a189253e3560f90821f60dabce4a412c0ef534a5819bcd8f87abd740647ddbc296aa596e8ad3c281d1e8c5ad5b23aef9454c2
 EBUILD scummvm-2.7.0.ebuild 3245 BLAKE2B 39f39fb661e75e49ffc5293608e44c3266f7fa30c1fa88ced8d8926d85336d6d43daf4440fcd546a13f90d405ad5bd5128099b63f7e8566279456c3b7df33b04 SHA512 1a232aafb336991a0ce76dfc4b6629049f9bcb87ea2e28b68d252f132c95124b5d824b8a11bcbad7a2a5167a758b1b43d85bde1654ee1aa269e68cb14dc9b19b
+EBUILD scummvm-2.7.1.ebuild 3245 BLAKE2B 39f39fb661e75e49ffc5293608e44c3266f7fa30c1fa88ced8d8926d85336d6d43daf4440fcd546a13f90d405ad5bd5128099b63f7e8566279456c3b7df33b04 SHA512 1a232aafb336991a0ce76dfc4b6629049f9bcb87ea2e28b68d252f132c95124b5d824b8a11bcbad7a2a5167a758b1b43d85bde1654ee1aa269e68cb14dc9b19b
 EBUILD scummvm-9999.ebuild 3245 BLAKE2B bb8852cff25a78313889a370d50eab4c830347e3d35a069ef78a2a06d97e063cb14628dc5ff276c402f9f2cf56a36fb2409e287ff4e8940ec77214af8145327b SHA512 60d5b76d8bd5b93fdc3ba6dc5f6a189253e3560f90821f60dabce4a412c0ef534a5819bcd8f87abd740647ddbc296aa596e8ad3c281d1e8c5ad5b23aef9454c2
 MISC metadata.xml 1215 BLAKE2B 87d954f59103b0bdc1300094f195638f44dee1ddfeaadc40dc515248fea7b3da553313a1a6e8478b5e7a827c8971da5a3a56756ae5fc01464af1e8295623db5c SHA512 1a5592562aabd4d78f22dbed63446593b6082b676fcae152b7f1e173c92972d89fa1d99cc759991db55e42670fc122aeb1b22b5c0e7defcb7a3bf68eaea110a7
diff --git a/games-engines/scummvm/scummvm-2.7.1.ebuild b/games-engines/scummvm/scummvm-2.7.1.ebuild
new file mode 100644
index 000000000000..4f5504d6ddf4
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.7.1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
+HOMEPAGE="https://www.scummvm.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/scummvm/scummvm"
+else
+	SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S=${WORKDIR}/${P/_/}
+fi
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+IUSE="
+	a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2
+	mp3 +net opengl png sndio speech theora truetype unsupported vorbis
+	zlib
+"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+DEPEND="
+	>=media-libs/libsdl2-2.0.0[sound,joystick,video]
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac:= )
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib )
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:3
+	)
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	mp3? ( media-libs/libmad )
+	mpeg2? ( media-libs/libmpeg2 )
+	net? (
+		media-libs/sdl2-net
+		net-misc/curl
+	)
+	opengl? (
+		|| (
+			virtual/opengl
+			media-libs/mesa[gles2]
+			media-libs/mesa[gles1]
+		)
+	)
+	png? ( media-libs/libpng:0 )
+	sndio? ( media-sound/sndio:= )
+	speech? ( app-accessibility/speech-dispatcher )
+	truetype? ( media-libs/freetype:2 )
+	theora? ( media-libs/libtheora )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	app-arch/xz-utils
+	truetype? ( virtual/pkgconfig )
+	x86? ( dev-lang/nasm )
+"
+
+src_prepare() {
+	default
+
+	# -g isn't needed for nasm here
+	sed -i \
+		-e '/NASMFLAGS/ s/-g//' \
+		configure || die
+	sed -i \
+		-e '/INSTALL.*doc/d' \
+		-e '/INSTALL.*\/pixmaps/d' \
+		-e 's/-s //' \
+		ports.mk || die
+}
+
+src_configure() {
+	use x86 && append-ldflags -Wl,-z,noexecstack
+	tc-export STRINGS
+
+	local myconf=(
+		--backend=sdl
+		--host=${CHOST}
+		--enable-verbose-build
+		--prefix="${EPREFIX}/usr"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--opengl-mode=$(usex opengl auto none)
+		--with-sdl-prefix="${EPREFIX}/usr"
+		$(use_enable a52)
+		$(use_enable aac faad)
+		$(use_enable alsa)
+		$(use_enable debug)
+		$(use_enable !debug release-mode)
+		$(use_enable flac)
+		$(usex fluidsynth '' --disable-fluidsynth)
+		$(use_enable fribidi)
+		$(use_enable gif)
+		$(use_enable gtk)
+		$(use_enable jpeg)
+		$(use_enable lua)
+		$(use_enable mp3 mad)
+		$(use_enable mpeg2)
+		$(use_enable net libcurl)
+		$(use_enable net sdlnet)
+		$(use_enable png)
+		$(use_enable sndio)
+		$(use_enable speech tts)
+		$(use_enable theora theoradec)
+		$(use_enable truetype freetype2)
+		$(usex unsupported --enable-all-engines '')
+		$(use_enable vorbis)
+		$(use_enable zlib)
+		$(use_enable x86 nasm)
+	)
+	echo "configure ${myconf[@]}"
+	# not an autoconf script, so don't call econf
+	SDL_CONFIG="sdl2-config" \
+	./configure "${myconf[@]}" ${EXTRA_ECONF} || die
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR) cru" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+	default
+	doicon -s scalable icons/scummvm.svg
+}