gentoo resync : 07.08.2021

4 files changed, 43 insertions, 27 deletions

diff --git a/games-simulation/lincity-ng/Manifest b/games-simulation/lincity-ng/Manifest
index 4c7f25ad1079..ff3b8facf44b 100644
--- a/games-simulation/lincity-ng/Manifest
+++ b/games-simulation/lincity-ng/Manifest
@@ -1,3 +1,4 @@
+AUX lincity-ng-2.9_beta-flags.patch 235 BLAKE2B 262c4080bae5d88197cd6ff3ac20dd8740127504aefc5c947aef330ddfef6af6f0a423ec888e810398e2a5c5d3f5a2bab0ea6de9376b9be02187be5c61620ef3 SHA512 be56ba3aea08e425741c4ccb1cd87a23a595b5b974cdeb52e0e91b1b8579588bfee3b6052ab9728fbec41aa312107cabec19e1d7c27680d2c979351e5d8394ca
 DIST lincity-ng-2.9_beta.tar.gz 115799513 BLAKE2B 038c69172af9a62b35199823ef56200e170a8eafef2849bc6d8797bbc20ffa01656d05b1ba0725d4d33e217602f6695d3bdf2774b90b85c6e257e13e019bebcb SHA512 194b7389d7172b7987eda14cbbf2dd91aa503af36db9cf3bdf07ab6ae5e0068ac00988fec6068d65da6bdf14dee623bba57a58192e2a9659e741a7c9036e6d65
-EBUILD lincity-ng-2.9_beta.ebuild 1382 BLAKE2B ddca268df7af315fffe16c84ff7224356e3174abc7d634268199f11e9b15e70b84b578bc218196e5cf9ecdb266d1cc26819cc71f862c4cc88c2361c8ec71339b SHA512 f2c0cf3735e6f5e42a309ff20f85d3e31dc810c79258d27944f8f3803ef3bc4f637ba54d829dba2a2d3171bb597950a0c3f5b00bc710517db5dc95c67e4365cc
-MISC metadata.xml 341 BLAKE2B 971b9b371fbe6bbb577214a2fcb2f39948f4f8abe02398fd7f6e86d650434f778bc8e1556a6d08be49149da35f848e7e8a23e56034626823704872e88ada99e5 SHA512 0c2607743dbc1b832fad2d9edf774b51c9e816cca447c5991cd3958f001fded11bfd0fd0b90316ddab7c3371b0ec98d6f4ada27054e5d74e3295cf2cd1beeb90
+EBUILD lincity-ng-2.9_beta.ebuild 1469 BLAKE2B 9533955630a368f8ac4373d357c95592eb11feb5db57e210f4910e9454af36275f6490ca40b5186edc1840f6ffc0bf10daad9bc5d76b3c78655f84ac8496de20 SHA512 76757c1dd3e8d5d5d1dfc5b3c781b90cff96e1204f3acb18b7bfe915c40bba1b0e4be672b99b5a0e07540f67d4cc34ebd261a30b8462ce8dce0bb4d5989230b6
+MISC metadata.xml 402 BLAKE2B bb9f0732f1f4d82689c556ea23ef87b93da2802b533f4aabec8f1e9d44eb2e6fe7d3740ff3bacc87983f240c651715f61356026d1e9c1de8ae7462ffcee48c8f SHA512 53b57dcf1dc3843d7a6d1f4425f357273e287e010c975f12e9bd178bec3ff415560ca3d391edbf3d7873dad8cef7d54132bc78a59caf4d0f5e50e879d71eb118
diff --git a/games-simulation/lincity-ng/files/lincity-ng-2.9_beta-flags.patch b/games-simulation/lincity-ng/files/lincity-ng-2.9_beta-flags.patch
new file mode 100644
index 000000000000..1c960123c216
--- /dev/null
+++ b/games-simulation/lincity-ng/files/lincity-ng-2.9_beta-flags.patch
@@ -0,0 +1,10 @@
+--- a/Jamrules
++++ b/Jamrules
+@@ -23,5 +23,4 @@
+     case optimize :
+-        CFLAGS += -O3 -g -Wall ;
+-        CXXFLAGS += -O3 -g -Wall ;
+-        LIBS += -g ;
++        CFLAGS += -Wall ;
++        CXXFLAGS += -Wall ;
+     case debug :
diff --git a/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild b/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
index c49cae5849f8..793d68044eab 100644
--- a/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
+++ b/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools libtool multiprocessing toolchain-funcs
+inherit autotools multiprocessing toolchain-funcs
 
 DESCRIPTION="City simulation game"
 HOMEPAGE="https://github.com/lincity-ng/lincity-ng"
 SRC_URI="https://github.com/lincity-ng/lincity-ng/archive/lincity-ng-${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P/_/-}"
 
-LICENSE="GPL-2 BitstreamVera CC-BY-SA-2.0"
+LICENSE="GPL-2+ BitstreamVera CC-BY-SA-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-games/physfs
+RDEPEND="
+	dev-games/physfs
 	dev-libs/libxml2:2
-	media-libs/libsdl[sound,joystick,opengl,video]
+	media-libs/libsdl[joystick,opengl,sound,video]
 	media-libs/sdl-gfx
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
@@ -24,35 +25,38 @@ RDEPEND="dev-games/physfs
 	sys-libs/zlib
 	virtual/opengl"
 DEPEND="${RDEPEND}"
-BDEPEND="dev-util/ftjam
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/ftjam
+	sys-devel/gettext
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${P/_/-}"
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch
+)
 
 src_prepare() {
 	default
 
-	# Missing CREDITS files actually breaks the install.
-	sed -i -r "s/\b(COPYING[^ ]*|CREDITS)\b//g" Jamfile || die
+	AT_M4DIR=mk/autoconf eautoreconf
+
+	# strip down autogen.sh / makerelease.sh for needed additional actions
+	sed -i -e '1a\set -e' -e '1n;/# generate Jam/,$!d;/^$/,$d' autogen.sh || die
+	sed -i -e '1a\set -e' -e '/^$/,$d' makerelease.sh || die
 
-	# Can't use eautoreconf as it does weird jam stuff.
-	autotools_run_tool ./autogen.sh
-	elibtoolize
+	./autogen.sh || die "Failed to generate Jamconfig.in"
+	./makerelease.sh || die "Failed to generate CREDITS"
 }
 
 src_compile() {
-	jam -q -dx \
-		-j$(makeopts_jobs) \
-		-sAR="$(tc-getAR) ru" \
-		-sRANLIB="$(tc-getRANLIB)" \
-		|| die "jam failed"
+	tc-export CC RANLIB
+	export AR="$(tc-getAR) cru" #739376
+
+	jam -q -dx -j$(makeopts_jobs) || die
 }
 
 src_install() {
-	jam -sDESTDIR="${D}" \
-		-sappdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-		-sapplicationsdir="${EPREFIX}/usr/share/applications" \
-		-spixmapsdir="${EPREFIX}/usr/share/pixmaps" \
-		install \
-		|| die "jam install failed"
+	jam -q -dx -sDESTDIR="${D}" -sPACKAGE_VERSION=${PVR} install || die
+
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
 }
diff --git a/games-simulation/lincity-ng/metadata.xml b/games-simulation/lincity-ng/metadata.xml
index 7dd75a46b634..af89c7a1eb31 100644
--- a/games-simulation/lincity-ng/metadata.xml
+++ b/games-simulation/lincity-ng/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">lincity-ng/lincity-ng</remote-id>
 		<remote-id type="sourceforge">lincity-ng.berlios</remote-id>
 	</upstream>
 </pkgmetadata>