gentoo resync : 14.12.2020

4 files changed, 149 insertions, 2 deletions

diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 6d4c3ed9ac00..9dbef127137e 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,3 +1,4 @@
+AUX s25rttr-0.9.0_pre20200723-cmake_lua_version.patch 296 BLAKE2B cabdc87d6184e59f0896762f3d3434a137fed4fd1c2dae84d30dbee5d4903e68ba01c30b92d0d5290dec9b371807c317b462213a421cadd172b78b08407f66aa SHA512 074ac3e70fec0da6bd4a9602052989a8b6c26b5cfef669d6330d9177547bbeeeef2a4e6b9d83a9e9cbdf4ec33df7dcce50a862e3c9e533049ad8452df6073816
 DIST s25client-f0b97b120140c96bbeacae9c22633f899931db69.tar.gz 20184306 BLAKE2B 4204a62e0a57a614c5ae1a947741f8f92fd7cd75b203467716483baa6f68a7c608033f403337e66b00bc8c2851b03f04c25bf84cda124548cfe09a110478fc54 SHA512 c4f0b59a68a0d5ece57f06f51e7a977be0b41ae85ff57821b317c2bb822a2533a192e1dfaa1a738c6738e65505a70ec34b3e7b22a8bd6effc95a4279d5eb19da
 DIST s25rttr-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz 156126 BLAKE2B 05eeccc890549b8dd3fa004c61b73be65f1fcf20867b7f4a46d0963f80b4a76fca611915ea72a401bdc49a81997d3d4500c5f5378a7cd55cbbfab6bcf647261a SHA512 470414d41cb6bad4e428858114f3c91139abfb1bf3ae02bb322d51bfabba8c0aad6796e183ccbb57624ed3484fea3f463636561ac8a359b6be7b90cfd5c0696a
 DIST s25rttr-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz 698512 BLAKE2B 82bc98077ed18622083894a63044194f599375c93aa745e330ad8ba390e14d9829ebb7c8e62141758f41dff2b72d3afbe2a5b6ebb584c3293c244e6f0c88ff89 SHA512 47de2791a4d4707fa17344de8fff8a15dd4436dd6e8c75adbd95273739cf5022e39a1024edee228eb27294e4f1f0b2a91110a1249b3d4fe64641cace051e4544
@@ -9,5 +10,6 @@ DIST s25rttr-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz 19270 BLA
 DIST s25rttr-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz 198489 BLAKE2B 47ffced26f1cceb78c0137e31114e463f0f5ad15fdb47e6a2809080a7874ce484918a0527e97b33db98c4a0daa338712c1b1a8b4992ac47d96f4e3b7056ee5e8 SHA512 0f5b4a4eeb72a906c86dac74c1bb41f5d4756c58240f59403932e388e523bed7d841ffa1d18dfd87454ab8c60b33e74cef27aec93995e37539868148bbee9900
 DIST s25rttr-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz 8013451 BLAKE2B 042ab804f4ec9babf7c975629fa3bd6856fb1fa4de0c4715420bca7e0f2dd72cc0909134750ba70c69344985bdd7a3a74576536cee80d6dfaf688c8cf82da8c0 SHA512 3339ced1fcca0fc9a37382d23c3c43f46c5e51d4c14b2657a79cd15dbd79ba8025bf8133dbbe45eb125b5c88370c90422faf21b65d95f471af3bb43de54a3210
 DIST s25rttr-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz 98611 BLAKE2B 6187ab3109f1c9c20524752920e7b9f0e1de2c882bb09ce8c4d2d29899fbaf8a0e2627afc475f6c1527428d77e9a7a7c7332136ba5a79e33cad9c570fbc19042 SHA512 ba85c03cb3e857c501fcec0223ccb7dfccb99a961dd6594820640e133523f14275e764e196197ead05b739f490003b412e16ca2d0fcae8263ef4c256d252570a
-EBUILD s25rttr-0.9.0_pre20200723.ebuild 4573 BLAKE2B 39ddb5aae6ce13966cb459c1057199d472d721795503f0ea71feb8770eb02eb7047fd8a30ddc6d34e6d37a0e40755aac66dc11d0f3e1221ae3445c5923c3b1b3 SHA512 0680acd8cea4644015fca40b769de67da0a24e5bed86b94163e36c9226ac275b547aafd7f9408a4960666078a399fa909b37aeea6618e60f754d1f31793a3bd1
+EBUILD s25rttr-0.9.0_pre20200723-r100.ebuild 4749 BLAKE2B d9bc594b531fdb741d23b5bc033f6265d6051ac0e2d602231dbe4df369175a7d6fb697a1b2d5fe040f392b1dc58e35a8a426986afcac3d227fc3c2106d61b0af SHA512 f4418551f7e2f3963f73432b3f3d38cdb3418dfac17ce8b7e89a8ed0f549da0ab64f3a740c75224defc55a6ceb8bba52ecd3e2135addb323626d12e98d4a37ea
+EBUILD s25rttr-0.9.0_pre20200723.ebuild 4574 BLAKE2B e14c0ee7521e77e240e23796f0c9491175fd3117cba843acdc8050241eb6a8fc8a0d5e11aec1582aa1fd7cc5b433aa3caed6ee2d822dd3cf5c3039549bd9bc3a SHA512 69289d2ed4a0af9703c965e7798637c1437f996f0e9425b47de384dfcc2464bd91986d67686c509ab2ed198831d081c87063277877038f235733df58dd236680
 MISC metadata.xml 347 BLAKE2B ca0f64b6265a6a9297cd7fb42b007f8d822298f52630bcc6b25bbcdf3854514ea865d3f8407f0754b66a720028b5059962af993c889707fdda4419d445e8d4f1 SHA512 d2602cf6ae2637800c4b1d6448cf557998311ee0e24ac621c221d99fd21ae3bbd4a08963d8185d2afa6c1a63c2cf94f95bd893b7fbe01e9c777266850747ee62
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-cmake_lua_version.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-cmake_lua_version.patch
new file mode 100644
index 000000000000..07c8403ffe40
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/libs/libGamedata/CMakeLists.txt
++++ b/libs/libGamedata/CMakeLists.txt
+@@ -11,7 +11,7 @@
+ FILE(GLOB SOURCES_OTHER *.cpp *.h)
+ SOURCE_GROUP(other FILES ${SOURCES_OTHER})
+ 
+-find_package(Lua 5.1 REQUIRED)
++find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+ 
+ include(GatherDll)
+ gather_dll(Lua)
diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
new file mode 100644
index 000000000000..001f1128ae10
--- /dev/null
+++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit desktop flag-o-matic lua-single toolchain-funcs xdg cmake
+
+DESCRIPTION="Open source remake of The Settlers II: Gold Edition (needs original data files)"
+HOMEPAGE="https://www.siedler25.org/"
+
+# To generate from git repo:
+# echo -e "COMMIT=\"$(git rev-parse HEAD)\"\nSRC_URI=\"\n\thttps://github.com/Return-To-The-Roots/s25client/archive/\${COMMIT}.tar.gz -> s25client-\${COMMIT}.tar.gz" && git submodule --quiet foreach --recursive 'url=$(git remote get-url origin); gh=${url#*github.com[:/]}; gh=${gh%.git}; echo -e "\thttps://github.com/${gh}/archive/${sha1}.tar.gz -> \${PN}-${gh##*/}-${sha1}.tar.gz"' | egrep -v "/(dev-tools|libsamplerate|s25update)/" | sort && echo '"'
+COMMIT="f0b97b120140c96bbeacae9c22633f899931db69"
+SRC_URI="
+	https://github.com/Return-To-The-Roots/s25client/archive/${COMMIT}.tar.gz -> s25client-${COMMIT}.tar.gz
+	https://github.com/mat007/turtle/archive/9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz -> ${PN}-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz
+	https://github.com/Return-To-The-Roots/languages/archive/6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz -> ${PN}-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz
+	https://github.com/Return-To-The-Roots/libendian/archive/dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz -> ${PN}-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz
+	https://github.com/Return-To-The-Roots/liblobby/archive/9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz -> ${PN}-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz
+	https://github.com/Return-To-The-Roots/libsiedler2/archive/5cb9993a32504337c63fd894266991445e0dcd65.tar.gz -> ${PN}-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz
+	https://github.com/Return-To-The-Roots/libutil/archive/6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz -> ${PN}-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz
+	https://github.com/Return-To-The-Roots/mygettext/archive/b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz -> ${PN}-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz
+	https://github.com/Return-To-The-Roots/s25edit/archive/677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz -> ${PN}-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz
+	https://github.com/Return-To-The-Roots/s25maps/archive/5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz -> ${PN}-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz
+	https://github.com/satoren/kaguya/archive/38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz -> ${PN}-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz
+"
+
+LICENSE="GPL-2+ GPL-3 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	app-arch/bzip2
+	>=dev-libs/boost-1.73:0=[nls]
+	>=media-libs/libsamplerate-0.1.9
+	>=media-libs/libsdl2-2.0.10-r2[opengl,sound,video]
+	media-libs/libsndfile
+	media-libs/sdl2-mixer[vorbis,wav]
+	net-libs/miniupnpc
+	virtual/opengl
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( >=sys-devel/clang-5 )
+"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
+)
+
+S="${WORKDIR}/s25client-${COMMIT}"
+
+# Build type is checked but blank is valid.
+CMAKE_BUILD_TYPE=
+
+src_unpack() {
+	default
+
+	local SRC DST
+	for SRC in */; do
+		case "${SRC}" in
+			s25client-*)
+				continue ;;
+			s25maps-*)
+				DST=data/RTTR/MAPS ;;
+			*)
+				DST=${SRC%-*}
+				DST=external/${DST,,} ;;
+		esac
+
+		rmdir "${S}/${DST}" || die
+		mv "${SRC}" "${S}/${DST}" || die
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCCACHE_PROGRAM=OFF
+		-DCMAKE_SKIP_RPATH=ON
+		-DRTTR_BUILD_UPDATER=OFF
+		-DRTTR_ENABLE_OPTIMIZATIONS=OFF
+		-DRTTR_ENABLE_SANITIZERS=$(usex test)
+		-DRTTR_INCLUDE_DEVTOOLS=OFF
+		-DRTTR_LIBDIR="$(get_libdir)/${PN}"
+		-DRTTR_REVISION="${COMMIT}"
+		-DRTTR_USE_SYSTEM_LIBSAMPLERATE=ON
+		-DRTTR_VERSION="${PV##*_pre}" # Tests expect a date.
+		-DLUA_VERSION=$(lua_get_version)
+	)
+
+	if use test && tc-is-gcc; then
+		# Work around libasan and libsandbox both wanting to be first.
+		append-ldflags -static-libasan
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	SDL_AUDIODRIVER=dummy \
+	SDL_VIDEODRIVER=dummy \
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	doicon -s 64 tools/release/debian/s25rttr.png
+	make_desktop_entry s25client "Return to the Roots"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! has_version -r games-strategy/settlers-2-gold-data; then
+		elog "Install games-strategy/settlers-2-gold-data or manually copy the DATA"
+		elog "and GFX directories from original data files into"
+		elog "${EPREFIX}/usr/share/${PN}/S2."
+	fi
+}
diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723.ebuild
index 7a08ac7c44c6..11d885fb4840 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723.ebuild
@@ -33,7 +33,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/bzip2
-	>=dev-lang/lua-5.1:=
+	>=dev-lang/lua-5.1:0=
 	>=dev-libs/boost-1.73:0=[nls]
 	>=media-libs/libsamplerate-0.1.9
 	>=media-libs/libsdl2-2.0.10-r2[opengl,sound,video]