gentoo auto-resync : 15:02:2024 - 23:36:26

4 files changed, 2 insertions, 92 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index f5cf83ef71ae..1c568994be80 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index 5d2ac69a39ce..e35264bb6ddc 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -1,6 +1,4 @@
 AUX stratagus-2.3.0-doc.patch 378 BLAKE2B 673afcbcf6131a49d03b683db2b430795b30226a97d4355ba88780bc4543f08c51b49c3726a79bc93620cd23595e2dcef62452d6afc989aa2ea06f616ce86fa6 SHA512 185b4a82d4960369bdff7c5522418553838d0d2c0947d8f75a55bf7a22741b9be20a20b60ae086ee04bd31ecf963c5c58167ef6b57b777659832a82d79726483
-DIST stratagus-3.3.1.tar.gz 1582605 BLAKE2B 375769346276c034efdef5fcb7282b89a33fd26266c1d8d56b78dfe33ad301ad85c113eedc7f23c79182da225bf6a4dc07704113f118e35e78db2502d291f466 SHA512 7ee3d31db6f30d1e927a87dd788c035b5cf69b44c914556412d18eb66bdfa252bd905bc341a3fd4c5100466b30e216a05fb678ecde690945a7fe0b1992c6b4f4
 DIST stratagus-3.3.2.tar.gz 1582937 BLAKE2B c39a9f009693c8c6dc7e62b885851a707a25c039b66765ce42dbd851643650b287bd45d0c0ea6fb03a2ddde01a41bf156a1d018ad4f06e0d39e9435a24c79672 SHA512 0e5d0127ba4e1025ceb7f46c91d90b82dc7c1b194030738abf95bd2c9cadc04d7431f333a514fc6d6b300ea3a1f5c7405bea735471f72fa547031634a23b01d1
-EBUILD stratagus-3.3.1.ebuild 1598 BLAKE2B 574d26be536f7b04793de71529156b0392683b8ecd8d1feacfe5378935a8d33c508bbc4a75b4d722545af6a0bc14191d284ca655010000fe4841d91ea21dcce3 SHA512 56181d096e287a8569f1df65d24fca809de29220778a672675353d07881d8b62b6358883f2b21fa31f450fcd0a85021387477de359d584f6c7ecebd856ee8731
-EBUILD stratagus-3.3.2.ebuild 1598 BLAKE2B 574d26be536f7b04793de71529156b0392683b8ecd8d1feacfe5378935a8d33c508bbc4a75b4d722545af6a0bc14191d284ca655010000fe4841d91ea21dcce3 SHA512 56181d096e287a8569f1df65d24fca809de29220778a672675353d07881d8b62b6358883f2b21fa31f450fcd0a85021387477de359d584f6c7ecebd856ee8731
+EBUILD stratagus-3.3.2-r1.ebuild 1530 BLAKE2B b3d9e6afc3aa630b4901e9b2480bb1bc3fa1cc5cefbc0e563aef72f3028c9517467a6394028fae8ee4009cbdb904f6f8fe35a0a78a2741bed96bc6a1ababe896 SHA512 2db6c0b7716680cbc70ef17d5e728f2b4a4f64fabc4fed479bd449c05fa259e49c5c74708814b5dfbdf88f66d00fb98ccfc10b24f05552b0a938bca0ab4c5444
 MISC metadata.xml 443 BLAKE2B e38b590d6ffb78fec164e08102dd69c0b1a178754706996c54439505d1ce4d313f5b8fc5e74b119112873cf1dda99c5b4bfae8868af2f5a3516c76a716d31b38 SHA512 5a09ce0416094c63b546b4cd1fbb683574fc1f5b21d9176a8de08d32b5054cfccf712a99716fa7d4d26d3cddf6a08030cb6892ffc8bf05e632a18319ea41ca3f
diff --git a/games-engines/stratagus/stratagus-3.3.1.ebuild b/games-engines/stratagus/stratagus-3.3.2-r1.ebuild
index 1828b8874857..b6dc099614a2 100644
--- a/games-engines/stratagus/stratagus-3.3.1.ebuild
+++ b/games-engines/stratagus/stratagus-3.3.2-r1.ebuild
@@ -55,14 +55,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-2.3.0-doc.patch
 )
 
-src_prepare() {
-	sed -i -e 's:-Werror::' CMakeLists.txt || die
-	cmake_src_prepare
-}
-
 src_configure() {
 	# there are in-source switches
-	use debug && CMAKE_BUILD_TYPE=Debug
+	use debug && local -x CPPFLAGS="${CPPFLAGS} -DDEBUG"
 
 	local mycmakeargs=(
 		-DGAMEDIR="${EPREFIX}/usr/bin"
diff --git a/games-engines/stratagus/stratagus-3.3.2.ebuild b/games-engines/stratagus/stratagus-3.3.2.ebuild
deleted file mode 100644
index 1828b8874857..000000000000
--- a/games-engines/stratagus/stratagus-3.3.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-inherit cmake lua-single optfeature
-
-DESCRIPTION="A realtime strategy game engine"
-HOMEPAGE="
-	https://stratagus.com/stratagus.html
-	https://github.com/Wargus/stratagus/
-"
-SRC_URI="
-	https://github.com/Wargus/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 debug doc mng theora vorbis"
-REQUIRED_USE="
-	${LUA_REQUIRED_USE}
-	theora? ( vorbis )
-"
-
-DEPEND="
-	${LUA_DEPS}
-	dev-db/sqlite:3
-	dev-lua/toluapp[${LUA_SINGLE_USEDEP}]
-	media-libs/libpng:0
-	x11-libs/libX11
-	media-libs/libsdl2[sound,opengl,video]
-	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-image[png]
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	mng? ( media-libs/libmng )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-		theora? ( media-libs/libtheora )
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-2.3.0-doc.patch
-)
-
-src_prepare() {
-	sed -i -e 's:-Werror::' CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	# there are in-source switches
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	local mycmakeargs=(
-		-DGAMEDIR="${EPREFIX}/usr/bin"
-		-DDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DWITH_BZIP2=$(usex bzip2)
-		-DWITH_MNG=$(usex mng)
-		-DWITH_OGGVORBIS=$(usex vorbis)
-		-DWITH_THEORA=$(usex theora)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_DEV=ON
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "MIDI music support" "media-libs/sdl2-mixer[midi]"
-}