gentoo resync : 01.10.2021

5 files changed, 75 insertions, 120 deletions

diff --git a/games-rpg/sumwars/Manifest b/games-rpg/sumwars/Manifest
index 336a93801e15..2b20974f4958 100644
--- a/games-rpg/sumwars/Manifest
+++ b/games-rpg/sumwars/Manifest
@@ -1,4 +1,3 @@
-AUX sumwars-0.5.8-cmake_lua_version.patch 286 BLAKE2B abe2013a9e0928cac9625719014eeb3cae3592938fc16930c73d6ffebf188c1b4120abc51d9c0a77896479384e9153cceb25ff87b30390873690b7d23b71b975 SHA512 5962aa04b8c296b30248de424375107274119971e9db3020d0b66f121b36cb65f840423a097839674311ffa986d73a93e735c6e4fb592a971c6eec890c9e4af1
 DIST sumwars-0.5.8-src.tar.bz2 107811288 BLAKE2B d7eef29ae9ba91d7a368730169d49c4b84e5db5cdbd4be7aa183e91baa50fd45be2b91928903e9cb17d947c2a4947094138c65efe076cdc85f14fbfacadddbd1 SHA512 ccf156f4484b0aeb8984631321d6691dc180ad63fdfa59d92aaa05ada3e871fc10656f32f9ba1b65abe7342e1481e14ca01f025ffc0ec5797cd8e91d97240cf1
-EBUILD sumwars-0.5.8-r100.ebuild 2053 BLAKE2B 290340af0e0a176c5f20ccd4a7be053a1cc849c1f4567691fe13f5704c7babfc8fbe8292f399e2c57c61b78d4f3f1f8ef8a1e39b006912be9bc7295f7e0b4111 SHA512 a856057bdbbb59b88a7099961ebe7a65e129533c303945bf7e7759c5e025b36732317a472ea51d76e170c9f66f490af47f41110c5c56f3dbd6e01e8d97e2c899
-MISC metadata.xml 522 BLAKE2B 627ddf8a130658dd4b86eb6c163b193de7b8b09df888875159cf9fa2868aa40fb247757a3f2f4a933d6755cca56f472a598c7c3cbe53120520e459d5d69fec4b SHA512 2069d6d03230d619c95f0118170a8efea814cf424df65bdbe77bea77a4b0a133750247a3082b6ab3d7a0465e29066428b7a841c1c5da9156af237f0eb07560bd
+EBUILD sumwars-0.5.8-r101.ebuild 1629 BLAKE2B 4d0dd8c2aacc52b88579e6b20b0dd6900bd5e8e051581e3cab34a90e893e4c5c29e2726caae72786cfec1baf2b591773972a8b911bfa17c5634149a711bf733b SHA512 29a4d12c56a597117bb6f76f576d5f46fc7230d0c8401683bc52563995ee3e176a9f5b87fe15ac44a68121d04b819e3eeb0f49f32bd83d2a6c7d1f82a83adea4
+MISC metadata.xml 394 BLAKE2B 5e8e48edcb035a6be70458f84861f10f459a4a7342eb93e4ffa5214082001c6b7756aebe290bf512b7fea7d5be32af8477689dcef95bd0f6ac2a8047dd68cc87 SHA512 afde8de34962c9b448d081a5512dbc3cffebae767f5f5495ecf4907d9b9a67503009d98ac189072c33ef515c3eaea5b933dd0d714fe418670e19c430259331ca
diff --git a/games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch b/games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch
deleted file mode 100644
index eed17e93dcd5..000000000000
--- a/games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -179,7 +179,7 @@
-  FIND_PACKAGE(GNUWIN REQUIRED)
- ENDIF (WIN32)
- FIND_PACKAGE(OIS REQUIRED)
--FIND_PACKAGE(Lua REQUIRED)
-+FIND_PACKAGE(Lua ${LUA_VERSION} EXACT REQUIRED)
- FIND_PACKAGE(CEGUI REQUIRED)
- SET(CEGUI_VERSION_RESOURCES "gui_0.8")
- 
diff --git a/games-rpg/sumwars/metadata.xml b/games-rpg/sumwars/metadata.xml
index 38362758353c..b6bf04ac1ccb 100644
--- a/games-rpg/sumwars/metadata.xml
+++ b/games-rpg/sumwars/metadata.xml
@@ -5,12 +5,10 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<changelog>http://sumwars.org/mantis/changelog_page.php</changelog>
-		<bugs-to>https://sumwars.org/mantis/index.php</bugs-to>
-		<remote-id type="sourceforge">sumwars</remote-id>
-	</upstream>
 	<use>
 		<flag name="tools">Builds editor tools</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">sumwars</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-rpg/sumwars/sumwars-0.5.8-r100.ebuild b/games-rpg/sumwars/sumwars-0.5.8-r100.ebuild
deleted file mode 100644
index f6f1badd5aec..000000000000
--- a/games-rpg/sumwars/sumwars-0.5.8-r100.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-inherit cmake desktop flag-o-matic lua-single xdg-utils
-
-DESCRIPTION="a multi-player, 3D action role-playing game"
-HOMEPAGE="http://sumwars.org"
-SRC_URI="mirror://sourceforge/sumwars/${P//_/-}-src.tar.bz2"
-
-LICENSE="GPL-3 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+tools debug"
-
-LANGS="de en it pl pt ru uk"
-for L in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${L}"
-done
-unset L
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="${LUA_DEPS}
-	>=dev-games/cegui-0.8[ogre]
-	>=dev-games/ogre-1.7.4-r1[freeimage,opengl]
-	dev-games/ois
-	dev-games/physfs
-	>=dev-libs/tinyxml-2.6.2-r2
-	media-libs/freealut
-	media-libs/openal
-	media-libs/libogg
-	media-libs/libvorbis
-	>=net-libs/enet-1.3.0
-	x11-libs/libX11
-	x11-libs/libXrandr
-	tools? ( dev-libs/boost )"
-DEPEND=${RDEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.8-cmake_lua_version.patch
-)
-CMAKE_REMOVE_MODULES_LIST="FindLua FindLua51"
-
-S=${WORKDIR}/${PN}-${PV%_*}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	local l langs
-	for l in ${LANGS}; do
-		if use l10n_${l}; then
-			langs="${langs} ${l}"
-		fi
-	done
-
-	[[ -z "${langs}" ]] && langs="en"
-
-	# configure sumwars with cmake
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=""
-		-DLUA_VERSION="$(lua_get_version)"
-		-DSUMWARS_BUILD_TOOLS="$(usex tools)"
-		-DSUMWARS_DOC_DIR="/usr/share/doc/${PF}"
-		-DSUMWARS_EXECUTABLE_DIR="/usr/bin"
-		-DSUMWARS_LANGUAGES="${langs}"
-		-DSUMWARS_NO_ENET=ON
-		-DSUMWARS_NO_TINYXML=ON
-		-DSUMWARS_PORTABLE_MODE=OFF
-		-DSUMWARS_POST_BUILD_COPY=OFF
-		-DSUMWARS_RANDOM_REGIONS=ON
-		-DSUMWARS_SHARE_DIR="/usr/share/${PN}"
-		-DSUMWARS_STANDALONE_MODE=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	newicon -s 128 share/icon/SumWarsIcon_128x128.png ${PN}.png
-	make_desktop_entry ${PN} "Summoning Wars"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-rpg/sumwars/sumwars-0.5.8-r101.ebuild b/games-rpg/sumwars/sumwars-0.5.8-r101.ebuild
new file mode 100644
index 000000000000..c77b37294846
--- /dev/null
+++ b/games-rpg/sumwars/sumwars-0.5.8-r101.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_REMOVE_MODULES_LIST=( FindLua{,51} )
+LUA_COMPAT=( lua5-1 )
+inherit cmake desktop flag-o-matic lua-single
+
+MY_L10N=( de en it pl pt ru uk )
+
+DESCRIPTION="Multi-player, 3D action role-playing game"
+HOMEPAGE="https://sourceforge.net/projects/sumwars/"
+SRC_URI="mirror://sourceforge/sumwars/${P/_/-}-src.tar.bz2"
+
+LICENSE="GPL-3 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug tools ${MY_L10N[*]/#/l10n_}"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="
+	${LUA_DEPS}
+	dev-games/cegui[ogre,truetype]
+	dev-games/ogre:=[freeimage,opengl]
+	dev-games/ois
+	dev-games/physfs
+	dev-libs/tinyxml
+	media-libs/freealut
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3=
+	x11-libs/libX11
+	x11-libs/libXrandr
+	tools? ( dev-libs/boost:= )"
+RDEPEND="
+	${DEPEND}
+	media-libs/freeimage[jpeg,png]"
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local l langs=
+	for l in "${MY_L10N[@]}"; do
+		use l10n_${l} && langs+="${l} "
+	done
+
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	local mycmakeargs=(
+		-DLua_FIND_VERSION_MAJOR=$(ver_cut 1 $(lua_get_version))
+		-DLua_FIND_VERSION_MINOR=$(ver_cut 2 $(lua_get_version))
+		-DLua_FIND_VERSION_COUNT=2
+		-DLua_FIND_VERSION_EXACT=ON
+		-DSUMWARS_BUILD_TOOLS=$(usex tools)
+		-DSUMWARS_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DSUMWARS_LANGUAGES="${langs:-en}"
+		-DSUMWARS_NO_ENET=ON
+		-DSUMWARS_NO_TINYXML=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newicon share/icon/SumWarsIcon_128x128.png ${PN}.png
+	make_desktop_entry ${PN} "Summoning Wars"
+}