[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity-ng/, games-simulation/lincity-ng/files/
commit: 7ccf326f3ecdad47e8d3f5ac73e555a8fe5e97a6 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Aug 3 22:14:37 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Wed Aug 4 02:11:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ccf326f games-simulation/lincity-ng: EAPI 7->8, various fixes * Migrate to eautoreconf, autogen.sh jam stuff can be reduced only to a autoconf --trace call allowing eautoreconf to do its thing * Remove autotools_run_tool for InternalEclassUsage * Generate the previously skipped CREDITS file * Simplify install, PACKAGE_VERSION handles docdir (fine on prefix) * Add libxslt/gettext bdeps * Strip -O3 * tc-export CC, some calls disregard configure's carried value * export AR rather than use -sAR to handle bug #739376 Closes: https://bugs.gentoo.org/739376 Signed-off-by: Ionen Wolkens gentoo.org> .../files/lincity-ng-2.9_beta-flags.patch | 10 .../lincity-ng/lincity-ng-2.9_beta.ebuild | 54 -- 2 files changed, 39 insertions(+), 25 deletions(-) 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 000..1c960123c21 --- /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 c49cae5849f..793d68044ea 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 }
[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity-ng/, games-simulation/lincity-ng/files/
commit: 8998ee8411ce0e61a41fc9695fb2eccf3e35accb Author: James Le Cuirot gentoo org> AuthorDate: Wed Mar 6 22:17:36 2019 + Commit: James Le Cuirot gentoo org> CommitDate: Wed Mar 6 22:35:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8998ee84 games-simulation/lincity-ng: Drop old 2.0 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: James Le Cuirot gentoo.org> games-simulation/lincity-ng/Manifest | 1 - .../lincity-ng/files/lincity-ng-2.0-build.patch| 35 games-simulation/lincity-ng/lincity-ng-2.0.ebuild | 47 -- 3 files changed, 83 deletions(-) diff --git a/games-simulation/lincity-ng/Manifest b/games-simulation/lincity-ng/Manifest index b2974845809..4b146efcc55 100644 --- a/games-simulation/lincity-ng/Manifest +++ b/games-simulation/lincity-ng/Manifest @@ -1,2 +1 @@ -DIST lincity-ng-2.0.tar.bz2 39475719 BLAKE2B 39992e6a2ef78e53eea1b0e347c968f6828089b5267e6d62dac7405ea91b182335431b1718ef9892b649b1437751959deb9fa407dfd899fd1dfca55145d059f2 SHA512 d85cd398145d1591f8640458c076f2a0b55713c39ede28b67d99adc7b76d38f09b58cd2ec84d9acac11bbaa794f6d97f6200f54efcdd4286315e6b3133284c55 DIST lincity-ng-2.9_beta.tar.gz 115799513 BLAKE2B 038c69172af9a62b35199823ef56200e170a8eafef2849bc6d8797bbc20ffa01656d05b1ba0725d4d33e217602f6695d3bdf2774b90b85c6e257e13e019bebcb SHA512 194b7389d7172b7987eda14cbbf2dd91aa503af36db9cf3bdf07ab6ae5e0068ac00988fec6068d65da6bdf14dee623bba57a58192e2a9659e741a7c9036e6d65 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 ad2f2eeaff8..000 --- a/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Julian Ospald -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 5da88e889d4..000 --- 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 -}