gentoo resync : 25.04.2020

4 files changed, 157 insertions, 3 deletions

diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 65eb31c55246..7a30d8819ab5 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -5,6 +5,19 @@ AUX s25rttr-0.8.1-fpic.patch 1508 BLAKE2B f53042695c3fa65fb2ced0afb8307fd9e56d12
 AUX s25rttr-0.8.1-gcc6.patch 1504 BLAKE2B 6cbb0fcd59ebedbb0e9faf49bc192944b70ceee9a0abdc3b5256717672da190a6337ed2ad4d52d28aedc1b0e29704c9fe36b6a67aafe9aceb28bd350895efb12 SHA512 3a10ee4c6329c1dcc514e2b4d5edec41b56ac72c08955b24eeced94d1c9757703fe0732d833718dd99a4e5d70857a8e84347d8036c683b9b82d37916bd2cf951
 AUX s25rttr-0.8.1-miniupnpc-api-14.patch 1385 BLAKE2B a5fe9c6937dfe154685ac1e0debab0b5ef3e6c3e27a792f947e1c5a93f772f2d9829602c87db76d9a421d723e652c01f3e015643801d0c136002164f366a5fca SHA512 163a83ac734ff2accca133c20c0e15f7f21140e41661add4229f2a878baebebf09eb82420b2d0b0a7a77042be35608bd00c30006265395e842ae28d64b8986f6
 AUX s25rttr-0.8.1-soundconverter.patch 767 BLAKE2B 7a3772caa5624ee18a73cff0fb41531798022ef845feb4e1bb7bae560207efe82fb084fec7c0d9dfdde02c293db6fe3c2ea9290a5a6fd59cc59fee37a32693b7 SHA512 e62de5e040e89d53b73a0b7202eab0b32382656978e6c4471b1f3b996c9c679c9de13a8db671d719a79b985b062be3e67e75dacd4d9b5efb58e63c30bde1c10c
+AUX s25rttr-loosen-libs.patch 491 BLAKE2B 78ac7fa85a5bbcf9151e1f3b0fc62a6e0a839ea60cf4a55367627ad8484fd8935e4286b1d6d2799ccc0583de70d918a170e2398e6d400dbd142c22f0ebe9f5e0 SHA512 dd77d491ae8689e5f5b652d9b1764d3076a0f1ccebc14baf9fd9affc93d8670daad829c3d505fffbafec52e21f0b4b8fd5952ecd48b732ab378ccbd08d63c1e8
+DIST s25client-784eb58fc1eb42751042d82f16cc92617fc6c2ae.tar.gz 20212703 BLAKE2B e7e73dda1f95d92578f17c68015ef71f58f4c3f96a45f0fc199a93852aa7a3efcd22d4d09ee3a2a9fcf054f2cda1f237f153ad5b1aa4f5d19b894a4f5d73e549 SHA512 f6634ad3b38530c537cd79e79a759228ff25cfad4552b07d9957a04dc29819e501c606dc9a9366da52102addf6c66e9eeaa92e8ebedbb0c8bea2fb6627068f86
 DIST s25rttr-0.8.1.tar.xz 39644940 BLAKE2B 80268ac6ee20da983b4c3a90d8a9ebd5903734547fb48036963f435498a3395964afba990498a306a89009da50d023982a1dbd502e1ed618734c6a8d44ba2368 SHA512 31a7d640e1ecd5488ef02d0ed3adcaeb9b5ae5f6af5e006deb4100fde3eb8ec567e34519e9c2b82f38c9972d62790a6f6978d5da6c6dfca7f1c153fa65f22df2
+DIST s25rttr-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz 156126 BLAKE2B 05eeccc890549b8dd3fa004c61b73be65f1fcf20867b7f4a46d0963f80b4a76fca611915ea72a401bdc49a81997d3d4500c5f5378a7cd55cbbfab6bcf647261a SHA512 470414d41cb6bad4e428858114f3c91139abfb1bf3ae02bb322d51bfabba8c0aad6796e183ccbb57624ed3484fea3f463636561ac8a359b6be7b90cfd5c0696a
+DIST s25rttr-languages-b1978170473bbf39a24254814e1b1f967a51ef4c.tar.gz 663317 BLAKE2B 71bb99b3ab6b4ce4bfbb97a7a5ceaf4fb9d1de561f62b42a14e0755d564b1fc7fff0ae66e25414f70fa92bb321e35c6088cd0366ecbef484f3eb598ba8357eb2 SHA512 ec21edcbd35ac3aa5935a19a1735b7af84230f0551850f15f16d40ea5d3409ef9f14a55fc665e203b267886290e2f158ae807bb51f87492004c4a81b22ee6bfe
+DIST s25rttr-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz 17008 BLAKE2B 98486acff6e56581b5dd06bba9892da739bf1947151f036ade31354c340b6dd79e1b77cd42475bc38225515392062c4e5dbf9ab28349356368db0ca90a81ee65 SHA512 1827edf6470f20a4b6a1b991a31af411e2cc5ceae36a65d54dbd6927dcf46949c4ad729ac982242da9a8ec9d141531d6c99792af761370b2252872bdbb7da8f0
+DIST s25rttr-liblobby-7d85ec40f03af619a6734f20edb28d991b3d61f2.tar.gz 23394 BLAKE2B d3ed80917665165d839a5b607d8793b238335b1b6afabe9eaa403188797ba821b949699b58126d50619820f694104b005f92b948ce09e18d6629b9b6dff85baa SHA512 c2cc34c78acf04f0e0eee7a9a9a11564cb49d98cdaaa0bf36f3adda980beefa1831ec70dd1b0b0cf10841325f3ac0fc7e9a0564255156c76b8c98b1ffded34ae
+DIST s25rttr-libsiedler2-800d58ea072c35d3cf9832d2f6a5cdae92fc0445.tar.gz 490533 BLAKE2B f71a5d19b9aa2ae268c3b658d96c1efc4784c223cfa050962df4b9fc75b96d939769e72391f9d2354887e3aba106043be3f365b2d695ffd66df2d2877ada01c5 SHA512 38629c532332b257f1c09e8a592c937d795ae39c16696614d50ec2cfd212d35db0110a8d1d561f0f17c875228e4de4e6f2b83cd2c8c00fc7c9320c75f88e13b3
+DIST s25rttr-libutil-c91488e4d2f0079a864c4be80eaba24a871e9772.tar.gz 112761 BLAKE2B 47d563877960f234a5d5547d08b426f9c97f234d09a5def11b67c578f734afeeb0309e40b1b5d2d9a11080dd2f10ad9d73d41481bf0f1489db9d785a02513966 SHA512 1b2480d84cd00a40c7f6df0162505c123859b350d8c241631046e5a91bde6d668667af64803e015234ae13a69e7f0e97aff5c08858396c0d298a2bd033262d35
+DIST s25rttr-mygettext-7e46bbb3e24891348f5629887efb0173690e83b8.tar.gz 18869 BLAKE2B 63cf0ab2f62ab17b9078aaa7ab9f6f56326cf21b4292de5086de053f1e6ba62e23931eb63bb4494855a61a5e8d971b067a42819c12d4363a5c0ad624f9dabfaa SHA512 f049f9a4500f00b0e1159f1110ddfde752055de09d62a0d07a466cdfe5cfd0e564b89f2b9dd8f2a9adc30e619690008e8dda9fe1cd4f7ec1d541018f9fe680b4
+DIST s25rttr-s25edit-04b5e725036a0568e8da15447167c240563dbaba.tar.gz 198454 BLAKE2B 9fb488a03ddd3ca5b476cc48b8629935f41c41b1b0bd2674adc048e674c1102d5e74dc8232df01956fb6db6451697e1d9bc5a4da4825dd9ce2c83608c366fd39 SHA512 ca5d79bdaeac08334aa47a08f8a550f09a8cc6507f86a05e0e90d49b6c181247e9d6cc880d5c05a926da82562e946d7fbd3abc339e178cab32891474e42bef60
+DIST s25rttr-s25maps-11a5f3e95405b7cf8088641efb4939eba9639cbc.tar.gz 8014338 BLAKE2B 793bbcf0f068c41585376990b9fe13137010f43fe3e91d82beda8c7fd8939f987d778a74de6695e4ebe86893234e419382e1e48d1737a144116de9cc63a212aa SHA512 099fd10ceabaf5284fdb686f1d281d8c3eb07351215bff9785323370b1c40101a9350c81f06f6c6592e63e5e680566777aa52559d8fe6087501c1eaafec43d8f
+DIST s25rttr-turtle-5f8421b1d270665347280d4cab1caf159d6858de.tar.gz 98238 BLAKE2B 854f765aee17328e818b806b69b529376f6f5a89a55b9d84dd7f41adc57314cbbd1844f3125ea750e7ac9ebcfeaa4c08d7c95fc8802bb4cc657ddd738a2370e8 SHA512 0b74b37ef28b1a2acf433491749d498e4de43567bc526faddb677953b5aa5e7ca74fab659d81a2cf4a29e440463150e7b5ac15d0e87f2ecad47523c44f629d25
 EBUILD s25rttr-0.8.1-r3.ebuild 2392 BLAKE2B 304edfe688991e36627395906f7002697107c34e3ff411db81bd03cac46246478d36b26ddd56ca216a9f8603dea6898f99a531a73a61a2a763c6e0b726a36c03 SHA512 3743f18cb7bdbe44a577e5decc660ff1a54fc7f26ca6c1958965eacd2222588ce8f91b60432121afa29f526aa2d3b7d6101e49ccd9f85ffc02a34012d7b73ccf
-MISC metadata.xml 463 BLAKE2B 33a0cc242b253cb1a3446cc2705cfb32bf0cd125c990bf0b8d527c3c9de546c390dd8fbad984c2a2a6264a25e0f889b63e86287024aa666dfdac94a5aacc3664 SHA512 dd5ea72d1f7ceda9bb2f033c8482e2978924ebee1a61e00fb515b0b0e846553bb1a4024aa739ae1f51608dcb90d0138d6679df1133a8140bfa2bfdb48163c885
+EBUILD s25rttr-0.9.0_pre20200418.ebuild 4572 BLAKE2B 6d7a9a199d49611d60fec2f6af4876fc8de0b552a0cdbecf1e938a816b55a097641f0469a438e020bbb37eac2b36f9733e2e1dec027c0d866d47d68e520093a3 SHA512 98c71cadc9210a31c999159e3fe6bef0c3c1c4864f658266472deb0916b47ea6a9921f7ebaeb61e5e1ed8f7f4afb19f0331c76f6288216b01507a25bc90a61d7
+MISC metadata.xml 347 BLAKE2B ca0f64b6265a6a9297cd7fb42b007f8d822298f52630bcc6b25bbcdf3854514ea865d3f8407f0754b66a720028b5059962af993c889707fdda4419d445e8d4f1 SHA512 d2602cf6ae2637800c4b1d6448cf557998311ee0e24ac621c221d99fd21ae3bbd4a08963d8185d2afa6c1a63c2cf94f95bd893b7fbe01e9c777266850747ee62
diff --git a/games-strategy/s25rttr/files/s25rttr-loosen-libs.patch b/games-strategy/s25rttr/files/s25rttr-loosen-libs.patch
new file mode 100644
index 000000000000..421cde2cd74f
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-loosen-libs.patch
@@ -0,0 +1,13 @@
+diff --git a/libs/libGamedata/CMakeLists.txt b/libs/libGamedata/CMakeLists.txt
+index b09569530..3d908226c 100644
+--- a/libs/libGamedata/CMakeLists.txt
++++ b/libs/libGamedata/CMakeLists.txt
+@@ -12,7 +12,7 @@ FILE(GLOB SOURCES_OTHER *.cpp *.h)
+ SOURCE_GROUP(other FILES ${SOURCES_OTHER})
+ 
+ # CMake < 3.2 treats version 5.2.x as not equal to 5.2 but we want to allow all 5.2 versions
+-find_package(Lua 5.2 EXACT REQUIRED)
++find_package(Lua 5.1 REQUIRED)
+ 
+ include(GatherDll)
+ gather_dll(Lua)
diff --git a/games-strategy/s25rttr/metadata.xml b/games-strategy/s25rttr/metadata.xml
index 7603c5eda305..f33c5b74bd90 100644
--- a/games-strategy/s25rttr/metadata.xml
+++ b/games-strategy/s25rttr/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<changelog>http://www.siedler25.org/index.php?com=dynamic&amp;mod=9&amp;PHPSESSID=e5fa4f90c4db5df0cb1e417e128300b5</changelog>
-		<bugs-to>https://bugs.launchpad.net/s25rttr</bugs-to>
+		<remote-id type="github">Return-To-The-Roots/s25client</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild
new file mode 100644
index 000000000000..fb3053465056
--- /dev/null
+++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop 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="784eb58fc1eb42751042d82f16cc92617fc6c2ae"
+SRC_URI="
+	https://github.com/Return-To-The-Roots/s25client/archive/${COMMIT}.tar.gz -> s25client-${COMMIT}.tar.gz
+	https://github.com/mat007/turtle/archive/5f8421b1d270665347280d4cab1caf159d6858de.tar.gz -> ${PN}-turtle-5f8421b1d270665347280d4cab1caf159d6858de.tar.gz
+	https://github.com/Return-To-The-Roots/languages/archive/b1978170473bbf39a24254814e1b1f967a51ef4c.tar.gz -> ${PN}-languages-b1978170473bbf39a24254814e1b1f967a51ef4c.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/7d85ec40f03af619a6734f20edb28d991b3d61f2.tar.gz -> ${PN}-liblobby-7d85ec40f03af619a6734f20edb28d991b3d61f2.tar.gz
+	https://github.com/Return-To-The-Roots/libsiedler2/archive/800d58ea072c35d3cf9832d2f6a5cdae92fc0445.tar.gz -> ${PN}-libsiedler2-800d58ea072c35d3cf9832d2f6a5cdae92fc0445.tar.gz
+	https://github.com/Return-To-The-Roots/libutil/archive/c91488e4d2f0079a864c4be80eaba24a871e9772.tar.gz -> ${PN}-libutil-c91488e4d2f0079a864c4be80eaba24a871e9772.tar.gz
+	https://github.com/Return-To-The-Roots/mygettext/archive/7e46bbb3e24891348f5629887efb0173690e83b8.tar.gz -> ${PN}-mygettext-7e46bbb3e24891348f5629887efb0173690e83b8.tar.gz
+	https://github.com/Return-To-The-Roots/s25edit/archive/04b5e725036a0568e8da15447167c240563dbaba.tar.gz -> ${PN}-s25edit-04b5e725036a0568e8da15447167c240563dbaba.tar.gz
+	https://github.com/Return-To-The-Roots/s25maps/archive/11a5f3e95405b7cf8088641efb4939eba9639cbc.tar.gz -> ${PN}-s25maps-11a5f3e95405b7cf8088641efb4939eba9639cbc.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 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2
+	>=dev-lang/lua-5.1:=
+	>=dev-libs/boost-1.64: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
+"
+
+S="${WORKDIR}/s25client-${COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-loosen-libs.patch
+)
+
+# 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_SAMPLERATE=ON
+		-DRTTR_VERSION="${PV}"
+	)
+
+	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
+}