gentoo resync : 19.03.2019

4 files changed, 60 insertions, 85 deletions

diff --git a/games-simulation/lincity-ng/Manifest b/games-simulation/lincity-ng/Manifest
index 6da303dd5120..4c7f25ad1079 100644
--- a/games-simulation/lincity-ng/Manifest
+++ b/games-simulation/lincity-ng/Manifest
@@ -1,4 +1,3 @@
-AUX lincity-ng-2.0-build.patch 886 BLAKE2B b2b7680db28cf2d69352268c007b1ed86dc5e5340e7f48ad7f0f1aabf7da13d7f0c9a7b539c138698079bbad5401cf8c63d15dddd782dedee50350c0c87daa98 SHA512 0ac99a14e61ec3341dbe2d46f5a36e0a4d9e2dca4fceb2ddc8754a901eebdb2a8251c66fac36359688c77a2243ad4388142215bc57d6acd762723aee73c5f3d5
-DIST lincity-ng-2.0.tar.bz2 39475719 BLAKE2B 39992e6a2ef78e53eea1b0e347c968f6828089b5267e6d62dac7405ea91b182335431b1718ef9892b649b1437751959deb9fa407dfd899fd1dfca55145d059f2 SHA512 d85cd398145d1591f8640458c076f2a0b55713c39ede28b67d99adc7b76d38f09b58cd2ec84d9acac11bbaa794f6d97f6200f54efcdd4286315e6b3133284c55
-EBUILD lincity-ng-2.0.ebuild 1106 BLAKE2B 1c2538f2b9b7db2095619ea87ff75d0e8df2c15364d2b0743e6b7d29c2c3cd1c7422cd8fc77c5887d44d5a3dc89df1626d5a33009fbbbf508f17b86ab078aa69 SHA512 2422299580819a493afa66faf3c9df252d7bea336d73406fb06330412099345382a284428850c7a61f67c63d958b54963fed26462f09d5101a6574d88a726007
+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
diff --git a/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch b/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch
deleted file mode 100644
index ad2f2eeaff8d..000000000000
--- a/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon Jul 30 07:06:54 UTC 2012
-Subject: build system
-
-arguments to AR would be overwritten if we export AR
-
---- lincity-ng-2.0.orig/lincity-ng.desktop
-+++ lincity-ng-2.0/lincity-ng.desktop
-@@ -1,12 +1,11 @@
- [Desktop Entry]
- Type=Application
- Version=1.0
--Encoding=UTF-8
- Name=Lincity-NG
- GenericName=City Simulation Game
- GenericName[de]=Stadtsimulationsspiel
- Comment=Plan and Build a city and take care of transport, economics, electricityand others.
--Icon=lincity-ng.png
-+Icon=lincity-ng
- Exec=lincity-ng
- Terminal=false
- StartupNotify=false
---- lincity-ng-2.0.orig/mk/jam/unix.jam
-+++ lincity-ng-2.0/mk/jam/unix.jam
-@@ -45,4 +45,10 @@
-     $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LIBS)
- }
- 
-+# jam Archive action seems to include the arguments which will break our AR export
-+actions Archive
-+{
-+  $(AR) ru $(<) $(>)
-+}
-+
- 
diff --git a/games-simulation/lincity-ng/lincity-ng-2.0.ebuild b/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
deleted file mode 100644
index 5da88e889d4c..000000000000
--- a/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multiprocessing games
-
-DESCRIPTION="city/country simulation game for X and opengl"
-HOMEPAGE="https://sourceforge.net/projects/lincity-ng.berlios/"
-SRC_URI="mirror://sourceforge/lincity-ng.berlios/${P}.tar.bz2"
-
-LICENSE="GPL-2 BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT=mirror
-
-RDEPEND="virtual/opengl
-	sys-libs/zlib
-	dev-libs/libxml2
-	media-libs/libsdl[sound,joystick,opengl,video]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	media-libs/sdl-gfx
-	dev-games/physfs"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/ftjam"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	jam -q -dx -j $(makeopts_jobs) || die "jam failed"
-}
-
-src_install() {
-	jam -sDESTDIR="${D}" \
-		 -sappdocdir="/usr/share/doc/${PF}" \
-		 -sapplicationsdir="/usr/share/applications" \
-		 -spixmapsdir="/usr/share/pixmaps" \
-		 install \
-		 || die "jam install failed"
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING*
-	prepgamesdirs
-}
diff --git a/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild b/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
new file mode 100644
index 000000000000..c49cae5849f8
--- /dev/null
+++ b/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool 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"
+
+LICENSE="GPL-2 BitstreamVera CC-BY-SA-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-games/physfs
+	dev-libs/libxml2:2
+	media-libs/libsdl[sound,joystick,opengl,video]
+	media-libs/sdl-gfx
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-ttf
+	sys-libs/zlib
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/ftjam
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${P/_/-}"
+
+src_prepare() {
+	default
+
+	# Missing CREDITS files actually breaks the install.
+	sed -i -r "s/\b(COPYING[^ ]*|CREDITS)\b//g" Jamfile || die
+
+	# Can't use eautoreconf as it does weird jam stuff.
+	autotools_run_tool ./autogen.sh
+	elibtoolize
+}
+
+src_compile() {
+	jam -q -dx \
+		-j$(makeopts_jobs) \
+		-sAR="$(tc-getAR) ru" \
+		-sRANLIB="$(tc-getRANLIB)" \
+		|| die "jam failed"
+}
+
+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"
+}