[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/

2024-03-04 Thread Sam James 
commit: 51793926e4cf5e6d039073a1cbbfec928e71ee29
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar  5 06:55:31 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  5 06:55:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51793926

games-simulation/lincity: filter LTO

lto-type-mismatch errors and dead upstream.

Closes: https://bugs.gentoo.org/859220
Signed-off-by: Sam James  gentoo.org>

 games-simulation/lincity/lincity-1.13.1-r4.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/games-simulation/lincity/lincity-1.13.1-r4.ebuild 
b/games-simulation/lincity/lincity-1.13.1-r4.ebuild
index acf64ed8f340..2220f3e9ca30 100644
--- a/games-simulation/lincity/lincity-1.13.1-r4.ebuild
+++ b/games-simulation/lincity/lincity-1.13.1-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools desktop
+inherit autotools flag-o-matic desktop
 
 DESCRIPTION="City simulation game for X"
 HOMEPAGE="https://lincity.sourceforge.net/;
@@ -38,6 +38,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # bug #859220
+   filter-lto
+
local econfargs=(
--with-gzip
--with-x

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/

2023-03-04 Thread Sam James 
commit: 80d25f0b73c2a1a6615400d295933eaf86166893
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  5 02:32:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  5 02:59:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d25f0b

games-simulation/lincity: fix configure w/ clang 16

Closes: https://bugs.gentoo.org/899020
Signed-off-by: Sam James  gentoo.org>

 .../{lincity-1.13.1-r3.ebuild => lincity-1.13.1-r4.ebuild}| 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/games-simulation/lincity/lincity-1.13.1-r3.ebuild 
b/games-simulation/lincity/lincity-1.13.1-r4.ebuild
similarity index 88%
rename from games-simulation/lincity/lincity-1.13.1-r3.ebuild
rename to games-simulation/lincity/lincity-1.13.1-r4.ebuild
index c80cf4adcb21..29d3d9a64773 100644
--- a/games-simulation/lincity/lincity-1.13.1-r3.ebuild
+++ b/games-simulation/lincity/lincity-1.13.1-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit desktop
+inherit autotools desktop
 
 DESCRIPTION="City simulation game for X"
 HOMEPAGE="http://lincity.sourceforge.net/;
@@ -30,6 +30,13 @@ PATCHES=(

"${FILESDIR}"/${P}-Fix-prototypes-and-implicit-function-declarations.patch
 )
 
+src_prepare() {
+   default
+
+   # Clang 16, bug #899020
+   eautoreconf
+}
+
 src_configure() {
local econfargs=(
--with-gzip

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/, games-simulation/lincity/files/

2022-10-23 Thread Sam James 
commit: 235cd3184b4b6acdff7f06b47cbc91e56131c2bc
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 23 12:58:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 23 14:27:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235cd318

games-simulation/lincity: fix build w/ Clang 16

Closes: https://bugs.gentoo.org/874723
Signed-off-by: Sam James  gentoo.org>

 ...otypes-and-implicit-function-declarations.patch | 270 +
 ...y-1.13.1-r2.ebuild => lincity-1.13.1-r3.ebuild} |   3 +-
 2 files changed, 272 insertions(+), 1 deletion(-)

diff --git 
a/games-simulation/lincity/files/lincity-1.13.1-Fix-prototypes-and-implicit-function-declarations.patch
 
b/games-simulation/lincity/files/lincity-1.13.1-Fix-prototypes-and-implicit-function-declarations.patch
new file mode 100644
index ..98d8d8750fcb
--- /dev/null
+++ 
b/games-simulation/lincity/files/lincity-1.13.1-Fix-prototypes-and-implicit-function-declarations.patch
@@ -0,0 +1,270 @@
+From 91953cf63f9e0a20ea37d7fc4780ee3c5d9fd917 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sun, 23 Oct 2022 13:47:33 +0100
+Subject: [PATCH] Fix prototypes and implicit function declarations
+
+Bug: https://bugs.gentoo.org/874723
+---
+ dialbox.h| 2 +-
+ engine.c | 2 +-
+ fileutil.c   | 1 +
+ ldsvgui.c| 2 +-
+ module_buttons.c | 2 +-
+ mouse.c  | 6 --
+ mouse.h  | 2 +-
+ mps.c| 2 +-
+ mps.h| 2 +-
+ pbar.c   | 4 ++--
+ pixmap.c | 2 +-
+ power.c  | 4 ++--
+ power.h  | 2 +-
+ screen.c | 8 
+ 14 files changed, 22 insertions(+), 19 deletions(-)
+
+diff --git a/dialbox.h b/dialbox.h
+index 1e4f21b..0d3fa76 100644
+--- a/dialbox.h
 b/dialbox.h
+@@ -22,7 +22,7 @@ typedef struct dialog_box_struct Dialog_Box;
+ 
+ /* Public functions */
+ int dialog_box(int colour, int argc, ...); 
+-void dialog_refresh();
++void dialog_refresh(void);
+ void dialog_close(int return_value);
+ 
+ #define MAX_DBOX_ENTRIES 64 /* Huge, but necessary for current use */
+diff --git a/engine.c b/engine.c
+index 7c088f3..03b3998 100644
+--- a/engine.c
 b/engine.c
+@@ -470,7 +470,7 @@ sell_steel (int xt, int yt)
+ }
+ 
+ void
+-do_pollution ()
++do_pollution (void)
+ {
+   int x, p;
+   int* pol = [0][0];
+diff --git a/fileutil.c b/fileutil.c
+index 2fd6f3d..b4bf244 100644
+--- a/fileutil.c
 b/fileutil.c
+@@ -9,6 +9,7 @@
+ #include  /* XXX: GCS FIX: What does configure need to know? */
+ #include "lcintl.h"
+ #include "lcstring.h"
++#include "lcsvga.h"
+ #include "ldsvgui.h"
+ 
+ /* XXX: Where are SVGA specific includes? */
+diff --git a/ldsvgui.c b/ldsvgui.c
+index a9c8126..f783e60 100644
+--- a/ldsvgui.c
 b/ldsvgui.c
+@@ -277,7 +277,7 @@ do_network_screen (void)
+ #endif
+ 
+ void
+-do_save_city ()
++do_save_city (void)
+ {
+ Rect* mw = _win;
+ char s[200], c;
+diff --git a/module_buttons.c b/module_buttons.c
+index 1bf77cd..51c746d 100644
+--- a/module_buttons.c
 b/module_buttons.c
+@@ -465,7 +465,7 @@ unhighlight_module_button (int module)
+ /* draw_selected_module_cost: write info about the module to the status area 
*/
+ 
+ void
+-draw_selected_module_cost ()
++draw_selected_module_cost (void)
+ {
+ Rect* b = _message;
+ char s[100];
+diff --git a/mouse.c b/mouse.c
+index aaba144..85ca571 100644
+--- a/mouse.c
 b/mouse.c
+@@ -46,6 +46,8 @@ static Mouse_Handle * mhandle_first;
+ static Mouse_Handle * mhandle_last;
+ static Mouse_Handle * mhandle_current;
+ 
++int mode(int x, int y);
++
+ /* -- *
+  * cs_mouse_handler
+  * --
+@@ -1152,7 +1154,7 @@ mt_perm(int x, int y)
+ }
+ 
+ int
+-do_mt_draw (int x1, int x2, int y1, int y2, int (*mode)())
++do_mt_draw (int x1, int x2, int y1, int y2, int (*mode)(int x, int y))
+ {
+ int dir = 1;
+ int horiz = 1;
+@@ -1321,7 +1323,7 @@ cmp(int n1, int n2)
+ }
+ 
+ void
+-init_mouse_registry()
++init_mouse_registry(void)
+ {
+ mhandle_first = NULL;
+ mhandle_last = NULL;
+diff --git a/mouse.h b/mouse.h
+index b31721b..0d87072 100644
+--- a/mouse.h
 b/mouse.h
+@@ -48,7 +48,7 @@ struct mouse_button_struct {
+ /* Public functions */
+ 
+ void mouse_setup (void);
+-void init_mouse_registry();
++void init_mouse_registry(void);
+ int mouse_handle_click(int x, int y, int button); 
+ 
+ Mouse_Handle * mouse_register(Rect * r, void (*handler)(int, int, int));
+diff --git a/mps.c b/mps.c
+index 3b82f1e..79f787b 100644
+--- a/mps.c
 b/mps.c
+@@ -61,7 +61,7 @@ mps_handler(int x, int y, int button)
+ /* mps_init(): Initialize mps vars and mouse handles */
+ 
+ void
+-mps_init() 
++mps_init(void)
+ {
+ mps_style = MPS_GLOBAL;
+ mps_global_style = MPS_GLOBAL_FINANCE;
+diff --git a/mps.h b/mps.h
+index 49991be..98c37c1 100644
+--- a/mps.h
 b/mps.h
+@@ -27,7 +27,7 @@ void mappoint_stats (int, int, int);
+ 
+ #define MPS_INFO_CHARS (MAPPOINT_STATS_W /

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity-ng/, games-simulation/lincity-ng/files/

2021-08-03 Thread Ionen Wolkens 
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/

2021-08-03 Thread Ionen Wolkens 
commit: bbc0b38dcfccd5c083cb2d85a0353ed79b972927
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Aug  3 18:29:03 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Aug  4 02:11:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc0b38d

games-simulation/lincity-ng: add github remote-id

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-simulation/lincity-ng/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-simulation/lincity-ng/metadata.xml 
b/games-simulation/lincity-ng/metadata.xml
index 7dd75a46b63..af89c7a1eb3 100644
--- a/games-simulation/lincity-ng/metadata.xml
+++ b/games-simulation/lincity-ng/metadata.xml
@@ -6,6 +6,7 @@
Gentoo Games Project


+   lincity-ng/lincity-ng
lincity-ng.berlios

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/files/, games-simulation/lincity/

2021-08-02 Thread David Seifert 
commit: 016a96e218b9c5a0749ea3240ef1172af4b6036d
Author: David Seifert  gentoo  org>
AuthorDate: Mon Aug  2 09:29:44 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Aug  2 09:29:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016a96e2

games-simulation/lincity: remove `append-cflags -std=gnu89`

Signed-off-by: David Seifert  gentoo.org>

 .../lincity/files/lincity-1.13.1-gcc-10.patch  | 37 +-
 games-simulation/lincity/lincity-1.13.1-r2.ebuild  |  4 +--
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch 
b/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch
index 77f3a41dcf6..a1d6ea0f2e7 100644
--- a/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch
+++ b/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch
@@ -1,7 +1,8 @@
+https://bugs.gentoo.org/570574
 https://bugs.gentoo.org/706394
 
 lincity-1.13.1/fileutil.c  2004-07-03 08:26:33.0 -
-+++ lincity-1.13.1/fileutil.c  2020-02-26 09:16:31.406614385 -
+--- a/fileutil.c
 b/fileutil.c
 @@ -105,7 +105,7 @@
   * -- */
  char LIBDIR[LC_PATH_MAX];
@@ -11,8 +12,8 @@ https://bugs.gentoo.org/706394
  int lc_save_dir_len;
  static char *lc_temp_filename;
  
 lincity-1.13.1/ldsvguts.c  2003-10-10 04:11:29.0 -
-+++ lincity-1.13.1/ldsvguts.c  2020-02-26 09:17:22.410992011 -
+--- a/ldsvguts.c
 b/ldsvguts.c
 @@ -91,8 +91,6 @@
   * Private Global Variables
   * -- */
@@ -22,8 +23,8 @@ https://bugs.gentoo.org/706394
  /* -- *
   * Public functions
   * -- */
 lincity-1.13.1/main.c  2004-07-03 07:59:05.0 -
-+++ lincity-1.13.1/main.c  2020-02-26 09:17:04.222857373 -
+--- a/main.c
 b/main.c
 @@ -96,9 +96,8 @@
  #endif
  #endif
@@ -35,8 +36,28 @@ https://bugs.gentoo.org/706394
  
  #ifdef CS_PROFILE
  int prof_countdown = PROFILE_COUNTDOWN;
 lincity-1.13.1/screen.h2004-06-22 13:24:19.0 -
-+++ lincity-1.13.1/screen.h2020-02-26 09:14:31.473725606 -
+--- a/mouse.c
 b/mouse.c
+@@ -1094,7 +1094,7 @@
+ return 0;
+ }
+ 
+-inline int
++static inline int
+ mt_temp(int x, int y)
+ {
+ if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
+@@ -1128,7 +1128,7 @@
+ return 0;
+ }
+ 
+-inline int
++static inline int
+ mt_perm(int x, int y)
+ {
+ /* By now, it has already been mt_erase()'d */
+--- a/screen.h
 b/screen.h
 @@ -20,7 +20,7 @@
  extern unsigned char start_font2[4096];
  extern unsigned char start_font3[4096];

diff --git a/games-simulation/lincity/lincity-1.13.1-r2.ebuild 
b/games-simulation/lincity/lincity-1.13.1-r2.ebuild
index f1cec025ba8..c67386702de 100644
--- a/games-simulation/lincity/lincity-1.13.1-r2.ebuild
+++ b/games-simulation/lincity/lincity-1.13.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop flag-o-matic
+inherit desktop
 
 DESCRIPTION="City simulation game for X"
 HOMEPAGE="http://lincity.sourceforge.net/;
@@ -30,8 +30,6 @@ PATCHES=(
 )
 
 src_configure() {
-   append-cflags -std=gnu89 # build with gcc5 (bug #570574)
-
local econfargs=(
--with-gzip
--with-x

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/, games-simulation/lincity/files/

2021-08-02 Thread Ionen Wolkens 
commit: f34e54ba63130f9366ea71a71e9a8101fd81a5d1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug  2 05:57:37 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug  2 09:16:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34e54ba

games-simulation/lincity: EAPI6->8, fix prefix, add icon

* Strip part of the patch that was formerly intended for
  games.eclass but now only broke prefix
* Update DESCRIPTION to reflect svgalib isn't supported
* Remove not-really-used libSM dependency
* Use xlincity.6 man page name to match installed binary

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-simulation/lincity/Manifest  |  1 +
 .../lincity/files/lincity-1.13.1-build.patch   | 38 +++--
 games-simulation/lincity/lincity-1.13.1-r1.ebuild  | 53 --
 games-simulation/lincity/lincity-1.13.1-r2.ebuild  | 62 ++
 4 files changed, 71 insertions(+), 83 deletions(-)

diff --git a/games-simulation/lincity/Manifest 
b/games-simulation/lincity/Manifest
index fa6ff8bbf78..af8bf31433f 100644
--- a/games-simulation/lincity/Manifest
+++ b/games-simulation/lincity/Manifest
@@ -1 +1,2 @@
 DIST lincity-1.13.1.tar.gz 1064236 BLAKE2B 
1172ced3255048f3132f85cd9ae994c7e0558170f7e7a24909af1856669c4ad90d57acd76f330fb556656ed74843dda159005350760fc059c6b184cedf1e9393
 SHA512 
bc4ee7a1642b1efa25f9edaabd3aeb52d1ca1d016735c5094586f52fda3ec4e9080ff35fe518c1ccbfad9fd54babb370f4b9b6a158b4d2f43b7182155084eefc
+DIST lincity.png 5377 BLAKE2B 
2238140719a8c1b094fbe6d7b52b9224245f2c36f970e04aa3fcaf6090409145f17dad2c2a83f6528e695fd9d26d9c053c45978502b7e44f73cf25719d7ed3aa
 SHA512 
40a8955fdc8397662ef0d084163e7dcad59e278429792bd7096e193a0d04791c2355a0dbd2c1f72a032bbfc71bc4e27e37a3d0d4e82de8e7170bb70205d983a3

diff --git a/games-simulation/lincity/files/lincity-1.13.1-build.patch 
b/games-simulation/lincity/files/lincity-1.13.1-build.patch
index f7f41f954ba..a5244b5387f 100644
--- a/games-simulation/lincity/files/lincity-1.13.1-build.patch
+++ b/games-simulation/lincity/files/lincity-1.13.1-build.patch
@@ -1,16 +1,5 @@
 lincity-1.13.1.orig/intl/Makefile.in
-+++ lincity-1.13.1/intl/Makefile.in
-@@ -32,7 +32,7 @@
- libdir = @libdir@
- includedir = @includedir@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = /usr/share/locale
- gettextsrcdir = $(datadir)/gettext/intl
- aliaspath = $(localedir)
- subdir = intl
 lincity-1.13.1.orig/mouse.c
-+++ lincity-1.13.1/mouse.c
+--- a/mouse.c
 b/mouse.c
 @@ -1057,7 +1057,7 @@
 and set to 1 if the existing transport if the more expensive sort
 (e.g. GROUP_RAIL when overwriting GROUP_ROAD).
@@ -20,8 +9,8 @@
  mt_erase(int x, int y)
  {
  if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
 lincity-1.13.1.orig/pixmap.c
-+++ lincity-1.13.1/pixmap.c
+--- a/pixmap.c
 b/pixmap.c
 @@ -390,7 +390,7 @@
  likes it in the file.  Still need to fix this in autoconf,
but for now this will do. */
@@ -31,8 +20,8 @@
  pixmap_index (int x, int y)
  {
  return y*pixmap_width + x;
 lincity-1.13.1.orig/pixmap.h
-+++ lincity-1.13.1/pixmap.h
+--- a/pixmap.h
 b/pixmap.h
 @@ -19,7 +19,7 @@
  void initialize_pixmap (void);
  void resize_pixmap (int new_width, int new_height);
@@ -51,19 +40,8 @@
  pixmap_index (int x, int y) {
  return y*pixmap_width + x;
  }
 lincity-1.13.1.orig/po/Makefile.in.in
-+++ lincity-1.13.1/po/Makefile.in.in
-@@ -21,7 +21,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = /usr/share/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
 lincity-1.13.1.orig/readpng.c
-+++ lincity-1.13.1/readpng.c
+--- a/readpng.c
 b/readpng.c
 @@ -3,6 +3,7 @@
   * This file is part of lincity (see COPYRIGHT for copyright information).
   * -- */

diff --git a/games-simulation/lincity/lincity-1.13.1-r1.ebuild 
b/games-simulation/lincity/lincity-1.13.1-r1.ebuild
deleted file mode 100644
index 6479c984045..000
--- a/games-simulation/lincity/lincity-1.13.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="city/country simulation game for X and Linux SVGALib"
-HOMEPAGE="http://lincity.sourceforge.net/;
-SRC_URI="mirror://sourceforge/lincity/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-# dep fix (bug #82318)
-RDEPEND="media-libs/libpng:0
-   x11-libs/libSM
-   x11-libs/libXext
-   nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-   nls? ( sys-devel/gettext )"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-build.patch
-   "${FILESDIR}"/${P}-gcc-10.patch
-)
-
-src_prepare() {
-   default
-
-   append-cflags -std=gnu89 # build

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/, games-simulation/lincity/files/

2020-02-26 Thread Sergei Trofimovich 
commit: 8edf247202490c028bce701f26b52e39f996c287
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Feb 26 09:21:56 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Feb 26 09:22:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edf2472

games-simulation/lincity: tweak for gcc-10, bug #706394

Closes: https://bugs.gentoo.org/706394
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../lincity/files/lincity-1.13.1-gcc-10.patch  | 48 ++
 games-simulation/lincity/lincity-1.13.1-r1.ebuild  |  3 +-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch 
b/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch
new file mode 100644
index 000..77f3a41dcf6
--- /dev/null
+++ b/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/706394
+
+--- lincity-1.13.1/fileutil.c  2004-07-03 08:26:33.0 -
 lincity-1.13.1/fileutil.c  2020-02-26 09:16:31.406614385 -
+@@ -105,7 +105,7 @@
+  * -- */
+ char LIBDIR[LC_PATH_MAX];
+ 
+-char *lc_save_dir;
++extern char *lc_save_dir;
+ int lc_save_dir_len;
+ static char *lc_temp_filename;
+ 
+--- lincity-1.13.1/ldsvguts.c  2003-10-10 04:11:29.0 -
 lincity-1.13.1/ldsvguts.c  2020-02-26 09:17:22.410992011 -
+@@ -91,8 +91,6 @@
+  * Private Global Variables
+  * -- */
+ 
+-char save_names[10][42];
+-
+ /* -- *
+  * Public functions
+  * -- */
+--- lincity-1.13.1/main.c  2004-07-03 07:59:05.0 -
 lincity-1.13.1/main.c  2020-02-26 09:17:04.222857373 -
+@@ -96,9 +96,8 @@
+ #endif
+ #endif
+ 
+-char *lc_save_dir;
++extern char *lc_save_dir;
+ char *lc_temp_file;
+-char save_names[10][42];
+ 
+ #ifdef CS_PROFILE
+ int prof_countdown = PROFILE_COUNTDOWN;
+--- lincity-1.13.1/screen.h2004-06-22 13:24:19.0 -
 lincity-1.13.1/screen.h2020-02-26 09:14:31.473725606 -
+@@ -20,7 +20,7 @@
+ extern unsigned char start_font2[4096];
+ extern unsigned char start_font3[4096];
+ 
+-int monthgraph_style;
++extern int monthgraph_style;
+ 
+ /* This is on in screen_full_refresh, used in *_refresh() */
+ extern char screen_refreshing;

diff --git a/games-simulation/lincity/lincity-1.13.1-r1.ebuild 
b/games-simulation/lincity/lincity-1.13.1-r1.ebuild
index 02968c06f2e..6479c984045 100644
--- a/games-simulation/lincity/lincity-1.13.1-r1.ebuild
+++ b/games-simulation/lincity/lincity-1.13.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${P}-build.patch
+   "${FILESDIR}"/${P}-gcc-10.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity-ng/

2019-03-06 Thread James Le Cuirot 
commit: bed5ab3bc1fc1c4de95067bf365c861a52e24c61
Author: Stefan Strogin  gmail  com>
AuthorDate: Sun Mar  3 15:45:35 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Mar  6 22:34:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bed5ab3b

games-simulation/lincity-ng: bump version to 2.9_beta; EAPI=7

Drop games eclass; update homepage, SRC_URI and licenses; fix prefixed
install; some minor and stylistic changes.

Closes: https://bugs.gentoo.org/604618
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11235
Signed-off-by: James Le Cuirot  gentoo.org>

 games-simulation/lincity-ng/Manifest   |  1 +
 .../lincity-ng/lincity-ng-2.9_beta.ebuild  | 50 ++
 2 files changed, 51 insertions(+)

diff --git a/games-simulation/lincity-ng/Manifest 
b/games-simulation/lincity-ng/Manifest
index 7460532650e..b2974845809 100644
--- a/games-simulation/lincity-ng/Manifest
+++ b/games-simulation/lincity-ng/Manifest
@@ -1 +1,2 @@
 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/lincity-ng-2.9_beta.ebuild 
b/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
new file mode 100644
index 000..c71738c6f41
--- /dev/null
+++ b/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing
+
+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
+   sed -i "/COPYING COPYING-data.txt COPYING-fonts.txt CREDITS /d" \
+   Jamfile || die
+   ./autogen.sh || die
+}
+
+src_compile() {
+   jam -q -dx -j $(makeopts_jobs) || 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"
+}

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity-ng/, games-simulation/lincity-ng/files/

2019-03-06 Thread James Le Cuirot 
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
-}

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity-ng/

2019-03-06 Thread James Le Cuirot 
commit: db38fe2980f7649e206ae887c509664a5ad6
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Mar  5 23:05:04 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Mar  6 22:35:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db38fe29

games-simulation/lincity-ng: Use autotools eclass around autogen.sh

This deals with dependencies and we should also run elibtoolize.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 c71738c6f41..45efc920930 100644
--- a/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
+++ b/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multiprocessing
+inherit autotools libtool multiprocessing
 
 DESCRIPTION="City simulation game"
 HOMEPAGE="https://github.com/lincity-ng/lincity-ng;
@@ -33,7 +33,10 @@ src_prepare() {
default
sed -i "/COPYING COPYING-data.txt COPYING-fonts.txt CREDITS /d" \
Jamfile || die
-   ./autogen.sh || die
+
+   # Can't use eautoreconf as it does weird jam stuff.
+   autotools_run_tool ./autogen.sh
+   elibtoolize
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity-ng/

2019-03-06 Thread James Le Cuirot 
commit: ca160ab03625cc7fe4993c0fe908fd1e5e355588
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Mar  5 23:06:29 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Mar  6 22:35:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca160ab0

games-simulation/lincity-ng: Install at least some documentation

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 45efc920930..264541ba5b1 100644
--- a/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
+++ b/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
@@ -31,8 +31,9 @@ S="${WORKDIR}/${PN}-${P/_/-}"
 
 src_prepare() {
default
-   sed -i "/COPYING COPYING-data.txt COPYING-fonts.txt CREDITS /d" \
-   Jamfile || die
+
+   # 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

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity-ng/

2019-03-06 Thread James Le Cuirot 
commit: 3e50c90f89b1b86be508b058ed3b9f1c9a84029e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Mar  6 22:13:27 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=3e50c90f

games-simulation/lincity-ng: Respect AR and RANLIB

Unlike CXX and friends, these are not passed from configure to jam.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 264541ba5b1..c49cae5849f 100644
--- a/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
+++ b/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools libtool multiprocessing
+inherit autotools libtool multiprocessing toolchain-funcs
 
 DESCRIPTION="City simulation game"
 HOMEPAGE="https://github.com/lincity-ng/lincity-ng;
@@ -41,7 +41,11 @@ src_prepare() {
 }
 
 src_compile() {
-   jam -q -dx -j $(makeopts_jobs) || die "jam failed"
+   jam -q -dx \
+   -j$(makeopts_jobs) \
+   -sAR="$(tc-getAR) ru" \
+   -sRANLIB="$(tc-getRANLIB)" \
+   || die "jam failed"
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/

2016-09-16 Thread Austin English 
commit: 3c4de332cc84fafffc38193132a163628439d1b1
Author: Austin English  gentoo  org>
AuthorDate: Fri Sep 16 19:32:34 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Fri Sep 16 19:37:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4de332

games-simulation/lincity: remove deprecated games eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: portage-2.3.0

 games-simulation/lincity/lincity-1.13.1-r1.ebuild | 53 +++
 1 file changed, 53 insertions(+)

diff --git a/games-simulation/lincity/lincity-1.13.1-r1.ebuild 
b/games-simulation/lincity/lincity-1.13.1-r1.ebuild
new file mode 100644
index ..bdcd256
--- /dev/null
+++ b/games-simulation/lincity/lincity-1.13.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils flag-o-matic
+
+DESCRIPTION="city/country simulation game for X and Linux SVGALib"
+HOMEPAGE="http://lincity.sourceforge.net/;
+SRC_URI="mirror://sourceforge/lincity/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nls"
+
+# dep fix (bug #82318)
+RDEPEND="media-libs/libpng:0
+   x11-libs/libSM
+   x11-libs/libXext
+   nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+   nls? ( sys-devel/gettext )"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-build.patch
+)
+
+src_prepare() {
+   default
+
+   append-cflags -std=gnu89 # build with gcc5 (bug #570574)
+}
+
+src_configure() {
+   econf \
+   $(use_enable nls) \
+   --with-gzip \
+   --with-x
+}
+
+src_compile() {
+   # build system logic is severely broken
+   emake
+   emake X_PROGS
+}
+
+src_install() {
+   default
+   dodoc Acknowledgements CHANGES README* TODO
+   make_desktop_entry xlincity Lincity
+   dobin xlincity
+}

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/

2016-03-31 Thread Michael Sterrett 
commit: 9e877958a6a356f3cd6a418f12c0d7571d7bc715
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Mar 31 16:34:14 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Mar 31 16:34:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e877958

games-simulation/lincity: build with gcc5 (bug #570574)

Package-Manager: portage-2.2.26

 games-simulation/lincity/lincity-1.13.1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-simulation/lincity/lincity-1.13.1.ebuild 
b/games-simulation/lincity/lincity-1.13.1.ebuild
index cbbe57f..6d94ee4 100644
--- a/games-simulation/lincity/lincity-1.13.1.ebuild
+++ b/games-simulation/lincity/lincity-1.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-inherit eutils games
+inherit eutils flag-o-matic games
 
 DESCRIPTION="city/country simulation game for X and Linux SVGALib"
 HOMEPAGE="http://lincity.sourceforge.net/;
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
epatch "${FILESDIR}"/${P}-build.patch
+   append-cflags -std=gnu89 # build with gcc5 (bug #570574)
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: games-simulation/lincity/, games-simulation/lincity/files/

2015-12-16 Thread Michael Sterrett 
commit: e36cc21373627399a512717a80b9f4b6296acce3
Author: Michael Sterrett  gentoo  org>
AuthorDate: Wed Dec 16 18:39:16 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Wed Dec 16 18:39:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e36cc213

fix building with gcc5 (bug #568406)

Package-Manager: portage-2.2.24

 .../lincity/files/lincity-1.13.1-build.patch   | 74 ++
 games-simulation/lincity/lincity-1.13.1.ebuild | 10 +--
 2 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/games-simulation/lincity/files/lincity-1.13.1-build.patch 
b/games-simulation/lincity/files/lincity-1.13.1-build.patch
new file mode 100644
index 000..f7f41f9
--- /dev/null
+++ b/games-simulation/lincity/files/lincity-1.13.1-build.patch
@@ -0,0 +1,74 @@
+--- lincity-1.13.1.orig/intl/Makefile.in
 lincity-1.13.1/intl/Makefile.in
+@@ -32,7 +32,7 @@
+ libdir = @libdir@
+ includedir = @includedir@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = /usr/share/locale
+ gettextsrcdir = $(datadir)/gettext/intl
+ aliaspath = $(localedir)
+ subdir = intl
+--- lincity-1.13.1.orig/mouse.c
 lincity-1.13.1/mouse.c
+@@ -1057,7 +1057,7 @@
+and set to 1 if the existing transport if the more expensive sort
+(e.g. GROUP_RAIL when overwriting GROUP_ROAD).
+ */
+-inline int
++int
+ mt_erase(int x, int y)
+ {
+ if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
+--- lincity-1.13.1.orig/pixmap.c
 lincity-1.13.1/pixmap.c
+@@ -390,7 +390,7 @@
+ likes it in the file.  Still need to fix this in autoconf,
+   but for now this will do. */
+ #if !defined (WIN32)
+-inline int 
++int 
+ pixmap_index (int x, int y)
+ {
+ return y*pixmap_width + x;
+--- lincity-1.13.1.orig/pixmap.h
 lincity-1.13.1/pixmap.h
+@@ -19,7 +19,7 @@
+ void initialize_pixmap (void);
+ void resize_pixmap (int new_width, int new_height);
+ int pixmap_getpixel (int x, int y);
+-inline int pixmap_index (int x, int y);
++int pixmap_index (int x, int y);
+ int pixmap_getpixel (int x, int y);
+ void pixmap_setpixel (int x, int y, int col);
+ void pixmap_hline (int x1, int y1, int x2, int col);
+@@ -33,7 +33,7 @@
+  * Public Inline Functions
+  * -- */
+ #if defined (WIN32)
+-inline int 
++int 
+ pixmap_index (int x, int y) {
+ return y*pixmap_width + x;
+ }
+--- lincity-1.13.1.orig/po/Makefile.in.in
 lincity-1.13.1/po/Makefile.in.in
+@@ -21,7 +21,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = /usr/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
+--- lincity-1.13.1.orig/readpng.c
 lincity-1.13.1/readpng.c
+@@ -3,6 +3,7 @@
+  * This file is part of lincity (see COPYRIGHT for copyright information).
+  * -- */
+ #include 
++#include 
+ #include "png.h"
+ #include "malloc.h"
+ #include "lin-city.h"

diff --git a/games-simulation/lincity/lincity-1.13.1.ebuild 
b/games-simulation/lincity/lincity-1.13.1.ebuild
index 81e0bf2..cbbe57f 100644
--- a/games-simulation/lincity/lincity-1.13.1.ebuild
+++ b/games-simulation/lincity/lincity-1.13.1.ebuild
@@ -23,17 +23,13 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
 
 src_prepare() {
-   sed -i \
-   -e '/^localedir/s:$(datadir):/usr/share:' \
-   po/Makefile.in.in \
-   intl/Makefile.in \
-   || die 'sed failed'
+   epatch "${FILESDIR}"/${P}-build.patch
 }
 
 src_configure() {
egamesconf \
-   --with-gzip \
$(use_enable nls) \
+   --with-gzip \
--with-x
 }
 
@@ -44,7 +40,7 @@ src_compile() {
 }
 
 src_install() {
-   emake DESTDIR="${D}" install
+   default
dodoc Acknowledgements CHANGES README* TODO
make_desktop_entry xlincity Lincity
dogamesbin xlincity