[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/

2024-03-18 Thread Sam James 
commit: 5053edb9aa32c02b6667f4644cb81cda9c9ca2e6
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Mar 18 05:47:31 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 18 07:20:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5053edb9

games-roguelike/scourge: update EAPI 7 -> 8

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../scourge/{scourge-0.21.1-r1.ebuild => scourge-0.21.1-r2.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild 
b/games-roguelike/scourge/scourge-0.21.1-r2.ebuild
similarity index 99%
rename from games-roguelike/scourge/scourge-0.21.1-r1.ebuild
rename to games-roguelike/scourge/scourge-0.21.1-r2.ebuild
index e9033cb3d9ff..9dc31e76a884 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools desktop flag-o-matic

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/

2024-03-18 Thread Sam James 
commit: bf8caa832024ebee54c4f30fb6c7ba38d459e4fe
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Mar 18 05:44:38 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 18 07:20:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf8caa83

games-roguelike/scourge: mark as LTO-unsafe, strict-aliasing unsafe

Closes: https://bugs.gentoo.org/859211
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 games-roguelike/scourge/scourge-0.21.1-r1.ebuild | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild 
b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
index a0ae342f3b0e..e9033cb3d9ff 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools desktop
+inherit autotools desktop flag-o-matic
 
 DESCRIPTION="A graphical rogue-like adventure game"
 HOMEPAGE="https://sourceforge.net/projects/scourge/;
@@ -57,6 +57,15 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=strict-aliasing
+   # https://bugs.gentoo.org/859211
+   # Upstream sourceforge last updated in 2015, and that appears to have
+   # been uploading existing files. svn last updated 2011. No bug filed. ;)
+   #
+   # Do not trust it for LTO either.
+   append-flags -fno-strict-aliasing
+   filter-lto
+
econf \
--disable-rpath \
--with-data-dir="${EPREFIX}"/usr/share/${PN}

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/files/, games-roguelike/scourge/

2021-05-03 Thread Sergei Trofimovich 
commit: 9dd2d8a9aefa61716da5cf16780d0a67c70449fa
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon May  3 09:00:41 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon May  3 09:06:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dd2d8a9

games-roguelike/scourge: tweak for gcc-11

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/787845
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../scourge/files/scourge-0.21.1-gcc-11.patch  | 62 ++
 games-roguelike/scourge/scourge-0.21.1-r1.ebuild   |  1 +
 2 files changed, 63 insertions(+)

diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc-11.patch 
b/games-roguelike/scourge/files/scourge-0.21.1-gcc-11.patch
new file mode 100644
index 000..7e5dc45199c
--- /dev/null
+++ b/games-roguelike/scourge/files/scourge-0.21.1-gcc-11.patch
@@ -0,0 +1,62 @@
+https://bugs.gentoo.org/787845
+--- a/src/common/constants.h
 b/src/common/constants.h
+@@ -970,7 +970,7 @@ struct t3DModel {
+ 
+ char *getAn( const char *name );
+ 
+-typedef unsigned char byte;
++typedef unsigned char scourge_byte;
+ 
+ extern void ComputeNormals( t3DModel *pModel );
+ extern void CreateTexture( GLuint textureArray[], char *strFileName, int 
textureID );
+--- a/src/render/Md2.h
 b/src/render/Md2.h
+@@ -52,8 +52,8 @@ struct tMd2Header {
+ 
+ /// This is used to store the vertices that are read in for the current frame.
+ struct tMd2AliasTriangle {
+-  byte vertex[3];
+-  byte lightNormalIndex;
++  scourge_byte vertex[3];
++  scourge_byte lightNormalIndex;
+ };
+ 
+ /// This stores the animation scale, translation and name information for a 
frame, plus verts.
+--- a/src/render/glshape.cpp
 b/src/render/glshape.cpp
+@@ -35,7 +35,7 @@ class Map;
+ // poor man's dynamic lightmaps: shaded sides
+ static GLuint lightmap_tex_num = 0;
+ static GLuint lightmap_tex_num2 = 0;
+-static unsigned char data[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3];
++static unsigned char data1[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3];
+ static unsigned char data2[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3];
+ 
+ GLShape::GLShape( Texture tex[], int width, int depth, int height, char 
const* name, int descriptionGroup,
+@@ -514,11 +514,11 @@ void GLShape::createDarkTexture( WallTheme *theme ) {
+   if ( !theme || !theme->getMultiTexSmooth( 0 ) ) d = 
Util::roll( 127.0f, 255.0f );
+ 
+   // purple
+-  data[i * LIGHTMAP_SIZE * 3 + j * 3 + 0] =
++  data1[i * LIGHTMAP_SIZE * 3 + j * 3 + 0] =
+ ( unsigned char )( d * tmp * ( theme ? 
theme->getMultiTexRed( 0 ) : 0.8f ) );
+-  data[i * LIGHTMAP_SIZE * 3 + j * 3 + 1] =
++  data1[i * LIGHTMAP_SIZE * 3 + j * 3 + 1] =
+ ( unsigned char )( d * tmp * ( theme ? 
theme->getMultiTexGreen( 0 ) : 0.4f ) );
+-  data[i * LIGHTMAP_SIZE * 3 + j * 3 + 2] =
++  data1[i * LIGHTMAP_SIZE * 3 + j * 3 + 2] =
+ ( unsigned char )( d * tmp * ( theme ? 
theme->getMultiTexBlue( 0 ) : 1.0f ) );
+ 
+   d = 255.0f;
+@@ -542,8 +542,8 @@ void GLShape::createDarkTexture( WallTheme *theme ) {
+   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, 
GL_LINEAR_MIPMAP_LINEAR );
+   glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
+-  glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, LIGHTMAP_SIZE, LIGHTMAP_SIZE, 
0, GL_RGB, GL_UNSIGNED_BYTE, data );
+-  gluBuild2DMipmaps( GL_TEXTURE_2D, GL_RGB, LIGHTMAP_SIZE, LIGHTMAP_SIZE, 
GL_RGB, GL_UNSIGNED_BYTE, data );
++  glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, LIGHTMAP_SIZE, LIGHTMAP_SIZE, 
0, GL_RGB, GL_UNSIGNED_BYTE, data1 );
++  gluBuild2DMipmaps( GL_TEXTURE_2D, GL_RGB, LIGHTMAP_SIZE, LIGHTMAP_SIZE, 
GL_RGB, GL_UNSIGNED_BYTE, data1 );
+ 
+   glBindTexture( GL_TEXTURE_2D, lightmap_tex_num2 );
+   glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );

diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild 
b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
index 9d4f7eec6a2..a0ae342f3b0 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
"${FILESDIR}"/${P}-freetype_pkgconfig.patch
"${FILESDIR}"/${P}-Wc++11-narrowing.patch
"${FILESDIR}"/${PN}-0.21.1-respect-AR.patch
+   "${FILESDIR}"/${P}-gcc-11.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/files/

2021-04-10 Thread Sam James 
commit: d9299e664d5510020546132ed9b5370c69300b86
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 10 09:10:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 10 09:10:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9299e66

games-roguelike/scourge: actually commit AR patch

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

 games-roguelike/scourge/files/scourge-0.21.1-respect-AR.patch | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/games-roguelike/scourge/files/scourge-0.21.1-respect-AR.patch 
b/games-roguelike/scourge/files/scourge-0.21.1-respect-AR.patch
new file mode 100644
index 000..e4fea442af2
--- /dev/null
+++ b/games-roguelike/scourge/files/scourge-0.21.1-respect-AR.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/780450
+--- a/configure.in
 b/configure.in
+@@ -28,6 +28,7 @@ if test "x${CXXFLAGS-notset}" = "xnotset" ; then
+ fi
+ AC_PROG_CXX
+ 
++AM_PROG_AR
+ dnl Check for ranlib
+ AC_PROG_RANLIB
+

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/files/, games-roguelike/scourge/

2021-04-10 Thread Sam James 
commit: 1189b6de0315cd2a9a3810b2e60bc45f5ce1be78
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 10 08:53:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 10 09:03:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1189b6de

games-roguelike/scourge: respect AR

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

 .../scourge/files/scourge-0.21.1-freetype_pkgconfig.patch   | 6 ++
 games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch| 4 ++--
 games-roguelike/scourge/scourge-0.21.1-r1.ebuild| 2 ++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch 
b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
index d41ee1a4443..6a5a28d1c7a 100644
--- a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
+++ b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
@@ -1,7 +1,5 @@
-Index: scourge/configure.in
-===
 scourge/configure.in   (revision 3411)
-+++ scourge/configure.in   (working copy)
+--- a/configure.in
 b/configure.in
 @@ -56,6 +56,7 @@
  # Set up binreloc (for a relocatable autopackage file)
  AM_BINRELOC

diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch 
b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
index 6f3f7b3e2a6..c018d24ee38 100644
--- a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
+++ b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
@@ -1,5 +1,5 @@
 a/src/squirrel/squtils.h   2012-08-30 18:06:43.474037926 +0200
-+++ b/src/squirrel/squtils.h   2012-08-30 18:14:13.300261523 +0200
+--- a/src/squirrel/squtils.h
 b/src/squirrel/squtils.h
 @@ -8,6 +8,9 @@
  #define SQ_FREE(__ptr,__size) sq_vm_free(__ptr,__size);
  #define SQ_REALLOC(__ptr,__oldsize,__size) 
sq_vm_realloc(__ptr,__oldsize,__size);

diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild 
b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
index 1a0a0a952bf..9d4f7eec6a2 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -37,6 +37,7 @@ PATCHES=(
"${FILESDIR}"/${P}-automake-1.13.patch
"${FILESDIR}"/${P}-freetype_pkgconfig.patch
"${FILESDIR}"/${P}-Wc++11-narrowing.patch
+   "${FILESDIR}"/${PN}-0.21.1-respect-AR.patch
 )
 
 src_prepare() {
@@ -49,6 +50,7 @@ src_prepare() {
sed -i \
-e '/snprintf/s/tmp, 256/tmp, sizeof(tmp)/' \
src/scourgehandler.cpp || die
+
mv configure.{in,ac} || die
eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/files/, games-roguelike/scourge/

2021-04-04 Thread David Seifert 
commit: f8ca5cec3197b86edcd3df72896f567844d74796
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr  4 22:28:44 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr  4 22:28:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8ca5cec

games-roguelike/scourge: Port to EAPI 7

* Fix building against Clang

Closes: https://bugs.gentoo.org/739330
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 .../files/scourge-0.21.1-Wc++11-narrowing.patch| 18 
 games-roguelike/scourge/scourge-0.21.1-r1.ebuild   | 32 --
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git 
a/games-roguelike/scourge/files/scourge-0.21.1-Wc++11-narrowing.patch 
b/games-roguelike/scourge/files/scourge-0.21.1-Wc++11-narrowing.patch
new file mode 100644
index 000..a852248c9fc
--- /dev/null
+++ b/games-roguelike/scourge/files/scourge-0.21.1-Wc++11-narrowing.patch
@@ -0,0 +1,18 @@
+Allow compiling with Clang
+https://bugs.gentoo.org/739330
+
+--- a/src/sdlhandler.cpp
 b/src/sdlhandler.cpp
+@@ -1034,10 +1034,10 @@
+ bool SDLHandler::intersects( int x, int y, int w, int h,
+  int x2, int y2, int w2, int h2 ) {
+   SDL_Rect ra = {
+-  x, y, w, h
++  static_cast(x), static_cast(y), 
static_cast(w), static_cast(h)
+   };
+   SDL_Rect rb = {
+-  x2, y2, w2, h2
++  static_cast(x2), static_cast(y2), 
static_cast(w2), static_cast(h2)
+   };
+   return intersects( ,  );
+ }

diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild 
b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
index 5eeec7c5231..1a0a0a952bf 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools desktop wxwidgets
+EAPI=7
+
+inherit autotools desktop
 
 DESCRIPTION="A graphical rogue-like adventure game"
 HOMEPAGE="https://sourceforge.net/projects/scourge/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz
+SRC_URI="
+   mirror://sourceforge/${PN}/${P}.src.tar.gz
mirror://sourceforge/${PN}/${P}.data.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
media-libs/freetype:2
@@ -24,17 +26,17 @@ RDEPEND="
virtual/libintl
virtual/opengl
virtual/glu"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-devel/gettext
virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}"
-
 PATCHES=(
"${FILESDIR}"/${P}-gcc47.patch
"${FILESDIR}"/${P}-gcc6.patch
"${FILESDIR}"/${P}-automake-1.13.patch
"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+   "${FILESDIR}"/${P}-Wc++11-narrowing.patch
 )
 
 src_prepare() {
@@ -52,17 +54,17 @@ src_prepare() {
 }
 
 src_configure() {
-   local myeconfargs=(
-   --with-data-dir=/usr/share/${PN}
-   --localedir=/usr/share/locale
-   )
-   econf "${myeconfargs[@]}"
+   econf \
+   --disable-rpath \
+   --with-data-dir="${EPREFIX}"/usr/share/${PN}
 }
 
 src_install() {
default
-   insinto /usr/share/${PN}
-   doins -r ../scourge_data/*
+
+   insinto /usr/share/scourge
+   doins -r ../scourge_data/.
+
doicon assets/scourge.png
make_desktop_entry scourge S.C.O.U.R.G.E.
 }

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/, games-roguelike/scourge/files/

2018-06-25 Thread Lars Wendler 
commit: 3ea81b205878724228f404290b70f6e21195025a
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jun 25 14:06:48 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jun 25 14:07:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea81b20

games-roguelike/scourge: Replaced freetype-config with pkg-config

Closes: https://bugs.gentoo.org/655374
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/scourge-0.21.1-freetype_pkgconfig.patch  | 34 ++
 games-roguelike/scourge/scourge-0.21.1-r1.ebuild   | 16 ++
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git 
a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch 
b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
new file mode 100644
index 000..d41ee1a4443
--- /dev/null
+++ b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
@@ -0,0 +1,34 @@
+Index: scourge/configure.in
+===
+--- scourge/configure.in   (revision 3411)
 scourge/configure.in   (working copy)
+@@ -56,6 +56,7 @@
+ # Set up binreloc (for a relocatable autopackage file)
+ AM_BINRELOC
+ 
++PKG_PROG_PKG_CONFIG
+ dnl --
+ dnl General options
+ dnl --
+@@ -413,19 +414,9 @@
+   FREETYPE_LIBS=`/sw/lib/freetype2/bin/freetype-config --libs`
+   have_FREETYPE=yes
+ else
+-AC_MSG_CHECKING([for freetype-config library])
+-
+-AC_PATH_PROG(FREETYPE, freetype-config, no)
+-
+-if test "$FREETYPE" = "no"; then
+-  AC_MSG_ERROR(Cannot find freetype2: Is freetype-config in path?)
+-  have_FREETYPE=no
+-else
+-  FREETYPE_CFLAGS=`freetype-config --cflags`
+-  FREETYPE_LIBS=`freetype-config --libs`
+-  have_FREETYPE=yes
++  PKG_CHECK_MODULES(FREETYPE, freetype2, have_FREETYPE=yes, 
++AC_MSG_ERROR(Cannot find freetype2))
+ fi
+-fi
+ 
+ LIBS="$saved_LIBS"
+ TR_LIBS="$TR_LIBS $FREETYPE_LIBS"

diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild 
b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
index 6f23afbb419..5eeec7c5231 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils wxwidgets
+inherit autotools desktop wxwidgets
 
 DESCRIPTION="A graphical rogue-like adventure game"
 HOMEPAGE="https://sourceforge.net/projects/scourge/;
@@ -25,14 +25,16 @@ RDEPEND="
virtual/opengl
virtual/glu"
 DEPEND="${RDEPEND}
-   sys-devel/gettext"
+   sys-devel/gettext
+   virtual/pkgconfig"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 PATCHES=(
"${FILESDIR}"/${P}-gcc47.patch
"${FILESDIR}"/${P}-gcc6.patch
"${FILESDIR}"/${P}-automake-1.13.patch
+   "${FILESDIR}"/${P}-freetype_pkgconfig.patch
 )
 
 src_prepare() {
@@ -50,9 +52,11 @@ src_prepare() {
 }
 
 src_configure() {
-   econf \
-   --with-data-dir=/usr/share/${PN} \
+   local myeconfargs=(
+   --with-data-dir=/usr/share/${PN}
--localedir=/usr/share/locale
+   )
+   econf "${myeconfargs[@]}"
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/

2017-10-05 Thread Michael Palimaka 
commit: 3867b64c74390e2b08c0a1f7ffd54fd3fcef5d4c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Oct  5 12:16:36 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Oct  5 12:16:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3867b64c

games-roguelike/scourge: stabilise 0.21.1-r1 for amd64/x86

Closes: https://bugs.gentoo.org/632525
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 games-roguelike/scourge/scourge-0.21.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild 
b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
index 6f23afbb419..b0b6aa2a678 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/

2017-10-05 Thread Michael Palimaka 
commit: 8969b234d7a656788d3e15fbaea5151a389c88bb
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Oct  5 12:16:48 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Oct  5 12:16:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8969b234

games-roguelike/scourge: remove 0.21.1

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 games-roguelike/scourge/scourge-0.21.1.ebuild | 58 ---
 1 file changed, 58 deletions(-)

diff --git a/games-roguelike/scourge/scourge-0.21.1.ebuild 
b/games-roguelike/scourge/scourge-0.21.1.ebuild
deleted file mode 100644
index 334de197824..000
--- a/games-roguelike/scourge/scourge-0.21.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils wxwidgets games
-
-DESCRIPTION="A graphical rogue-like adventure game"
-HOMEPAGE="https://sourceforge.net/projects/scourge/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz
-   mirror://sourceforge/${PN}/${P}.data.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/glu
-   virtual/opengl
-   media-libs/freetype:2
-   media-libs/libsdl[joystick,video]
-   media-libs/sdl-image[png]
-   media-libs/sdl-net
-   media-libs/sdl-mixer[vorbis]
-   media-libs/sdl-ttf
-   virtual/libintl"
-DEPEND="${RDEPEND}
-   sys-devel/gettext"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-   # bug #257601
-   sed -i \
-   -e '/AC_CHECK_HEADERS.*glext/ s:):, [#include ] ):' \
-   configure.in || die
-   sed -i \
-   -e '/snprintf/s/tmp, 256/tmp, sizeof(tmp)/' \
-   src/scourgehandler.cpp || die
-   epatch "${FILESDIR}"/${P}-gcc47.patch \
-   "${FILESDIR}"/${P}-automake-1.13.patch
-   mv configure.{in,ac} || die
-   eautoreconf
-}
-
-src_configure() {
-   egamesconf \
-   --with-data-dir="${GAMES_DATADIR}"/${PN} \
-   --localedir=/usr/share/locale
-}
-
-src_install() {
-   default
-   insinto "${GAMES_DATADIR}"/${PN}
-   doins -r ../scourge_data/*
-   doicon assets/scourge.png
-   make_desktop_entry scourge S.C.O.U.R.G.E.
-   prepgamesdirs
-}

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/, games-roguelike/scourge/files/

2017-07-23 Thread Michael Palimaka 
commit: 971bbd8c85e82b4538338f5a5919d6ee5f4776d1
Author: Peter Levine  gmail  com>
AuthorDate: Sun Jul 23 07:17:15 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul 23 12:32:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971bbd8c

games-roguelike/scourge: Fix building with GCC-6

Bug: https://bugs.gentoo.org/show_bug.cgi?id=610492
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../scourge/files/scourge-0.21.1-gcc6.patch| 34 ++
 games-roguelike/scourge/scourge-0.21.1-r1.ebuild   |  3 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch 
b/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch
new file mode 100644
index 000..fed15f45ed7
--- /dev/null
+++ b/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch
@@ -0,0 +1,34 @@
+Bug: https://bugs.gentoo.org/610492
+Upstream ticket: https://sourceforge.net/p/scourge/patches/3/
+
+--- a/src/equip.cpp
 b/src/equip.cpp
+@@ -595,7 +595,7 @@
+   }
+   }
+   if ( !found ) {
+-  specialSkill = false;
++  specialSkill = NULL;
+   canvas->setTooltip( "" );
+   }
+   glDisable( GL_BLEND );
+--- a/src/render/map.cpp
 b/src/render/map.cpp
+@@ -3154,7 +3154,7 @@
+   if ( shape )
+   return shape;
+   }
+-  return false;
++  return NULL;
+   }
+   if ( y1 == y2 ) {
+   if ( x1 > x2 ) SWAP( x1, x2 );
+@@ -3163,7 +3163,7 @@
+   if ( shape )
+   return shape;
+   }
+-  return false;
++  return NULL;
+   }
+ 
+ 

diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild 
b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
index db3edafb19a..6f23afbb419 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,6 +31,7 @@ S=${WORKDIR}/${PN}
 
 PATCHES=(
"${FILESDIR}"/${P}-gcc47.patch
+   "${FILESDIR}"/${P}-gcc6.patch
"${FILESDIR}"/${P}-automake-1.13.patch
 )

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/, games-roguelike/scourge/files/

2016-09-14 Thread Austin English 
commit: 3e8d4debb48c83d315329375597c87ff6f944a30
Author: Austin English  gentoo  org>
AuthorDate: Wed Sep 14 19:11:53 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Wed Sep 14 19:12:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e8d4deb

games-roguelike/scourge: remove deprecated games eclass

Also update to EAPI 6

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

Package-Manager: portage-2.3.0

 .../files/scourge-0.21.1-automake-1.13.patch   |  4 +-
 .../scourge/files/scourge-0.21.1-gcc47.patch   |  4 +-
 games-roguelike/scourge/scourge-0.21.1-r1.ebuild   | 64 ++
 3 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch 
b/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch
index 44b817e..5c2bc20 100644
--- a/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch
+++ b/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch
@@ -1,5 +1,5 @@
 scourge-0.21.1.src/scourge/configure.in
-+++ scourge-0.21.1.src/scourge/configure.in
+--- a/configure.in
 b/configure.in
 @@ -4,7 +4,7 @@
  dnl Process this file with autoconf to produce a configure script.
  AC_INIT(src/scourge.h)

diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch 
b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
index 50c5cac..6f3f7b3 100644
--- a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
+++ b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
@@ -1,5 +1,5 @@
 src/squirrel/squtils.h.old 2012-08-30 18:06:43.474037926 +0200
-+++ src/squirrel/squtils.h 2012-08-30 18:14:13.300261523 +0200
+--- a/src/squirrel/squtils.h   2012-08-30 18:06:43.474037926 +0200
 b/src/squirrel/squtils.h   2012-08-30 18:14:13.300261523 +0200
 @@ -8,6 +8,9 @@
  #define SQ_FREE(__ptr,__size) sq_vm_free(__ptr,__size);
  #define SQ_REALLOC(__ptr,__oldsize,__size) 
sq_vm_realloc(__ptr,__oldsize,__size);

diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild 
b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
new file mode 100644
index ..22ee6cf
--- /dev/null
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils wxwidgets
+
+DESCRIPTION="A graphical rogue-like adventure game"
+HOMEPAGE="https://sourceforge.net/projects/scourge/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz
+   mirror://sourceforge/${PN}/${P}.data.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+   media-libs/freetype:2
+   media-libs/libsdl[joystick,video]
+   media-libs/sdl-image[png]
+   media-libs/sdl-mixer[vorbis]
+   media-libs/sdl-net
+   media-libs/sdl-ttf
+   virtual/libintl
+   virtual/opengl
+   virtual/glu"
+DEPEND="${RDEPEND}
+   sys-devel/gettext"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+   "${FILESDIR}"/${P}-gcc47.patch
+   "${FILESDIR}"/${P}-automake-1.13.patch
+)
+
+src_prepare() {
+   default
+
+   # bug #257601
+   sed -i \
+   -e '/AC_CHECK_HEADERS.*glext/ s:):, [#include ] ):' \
+   configure.in || die
+   sed -i \
+   -e '/snprintf/s/tmp, 256/tmp, sizeof(tmp)/' \
+   src/scourgehandler.cpp || die
+   mv configure.{in,ac} || die
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --with-data-dir=/usr/share/${PN} \
+   --localedir=/usr/share/locale
+}
+
+src_install() {
+   default
+   insinto /usr/share/${PN}
+   doins -r ../scourge_data/*
+   doicon assets/scourge.png
+   make_desktop_entry scourge S.C.O.U.R.G.E.
+}

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/

2016-01-05 Thread Michael Sterrett 
commit: a8baabbd4b9bd5da2423d1a6d3a76c4211785ec7
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Jan  5 17:05:51 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Jan  5 22:38:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8baabbd

games-roguelike/scourge: update HOMEPAGE

Package-Manager: portage-2.2.26

 games-roguelike/scourge/scourge-0.21.1.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/games-roguelike/scourge/scourge-0.21.1.ebuild 
b/games-roguelike/scourge/scourge-0.21.1.ebuild
index 88523d8..0528ad3 100644
--- a/games-roguelike/scourge/scourge-0.21.1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit autotools eutils wxwidgets games
 
 DESCRIPTION="A graphical rogue-like adventure game"
-HOMEPAGE="http://scourgeweb.org/;
+HOMEPAGE="http://sourceforge.net/projects/scourge/;
 SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz
mirror://sourceforge/${PN}/${P}.data.tar.gz"
 
@@ -33,8 +33,7 @@ src_prepare() {
# bug #257601
sed -i \
-e '/AC_CHECK_HEADERS.*glext/ s:):, [#include ] ):' \
-   configure.in \
-   || die "sed failed"
+   configure.in || die
sed -i \
-e '/snprintf/s/tmp, 256/tmp, sizeof(tmp)/' \
src/scourgehandler.cpp || die