subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: games\-arcade\/supertux\/"

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2022-12-10 Thread Pacho Ramos

commit: 6f5bed3ec8d0b10218ba7b8257c73fd30769faa5
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Dec 10 15:06:24 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Dec 10 15:09:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f5bed3e

games-arcade/supertux: drop 0.6.3

Bug: https://bugs.gentoo.org/843008
Signed-off-by: Pacho Ramos  gentoo.org>

 games-arcade/supertux/supertux-0.6.3.ebuild | 62 -
 1 file changed, 62 deletions(-)

diff --git a/games-arcade/supertux/supertux-0.6.3.ebuild 
b/games-arcade/supertux/supertux-0.6.3.ebuild
deleted file mode 100644
index 9a193c691105..
--- a/games-arcade/supertux/supertux-0.6.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-#: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-inherit cmake
-
-MY_PV="${PV/_rc/-rc.}"
-MY_P="SuperTux-v${MY_PV}-Source"
-
-DESCRIPTION="A game similar to Super Mario Bros"
-HOMEPAGE="https://www.supertux.org;
-SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire
-# content of ${HOME} to ${HOME}/.local/share/supertux2/
-# DO NOT REMOVE THIS BLOCKER!!! See bug #764959
-RDEPEND="
-   !=media-libs/libsdl2-2.0.14-r0
-   >=dev-games/physfs-3.0
-   dev-libs/boost:=[nls]
-   media-libs/freetype
-   media-libs/glew:=
-   media-libs/libpng:0=
-   >=media-libs/libsdl2-2.0.1[joystick,video]
-   media-libs/libvorbis
-   media-libs/openal
-   >=media-libs/sdl2-image-2.0.0[png,jpeg]
-   >=net-misc/curl-7.21.7
-   virtual/opengl
-"
-DEPEND="${RDEPEND}
-   media-libs/glm"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
-   "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
-   "${FILESDIR}"/${PN}-0.6.3-missing-include.patch
-)
-
-src_configure() {
-   local mycmakeargs=(
-   -DWERROR=OFF
-   -DINSTALL_SUBDIR_BIN=bin
-   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
-   -DINSTALL_SUBDIR_SHARE=share/${PN}2
-   -DENABLE_SQDBG="$(usex debug)"
-   -DUSE_SYSTEM_PHYSFS=ON
-   -DIS_SUPERTUX_RELEASE=ON
-   )
-   cmake_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2022-12-04 Thread Pacho Ramos

commit: 6975aded48ce0b855445ead7203905795daee608
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Dec  4 21:16:56 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Dec  4 21:23:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6975aded

games-arcade/supertux: Fix CVE-2021-41556

Bug: https://bugs.gentoo.org/843008
Signed-off-by: Pacho Ramos  gentoo.org>

 .../supertux-0.6.3-squirrel-CVE-2021-41556.patch   | 36 
 games-arcade/supertux/supertux-0.6.3-r2.ebuild | 64 ++
 2 files changed, 100 insertions(+)

diff --git 
a/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2021-41556.patch 
b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2021-41556.patch
new file mode 100644
index ..a63e7a6c4e69
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2021-41556.patch
@@ -0,0 +1,36 @@
+From 23a0620658714b996d20da3d4dd1a0dcf9b0bd98 Mon Sep 17 00:00:00 2001
+From: albertodemichelis 
+Date: Thu, 16 Sep 2021 22:36:53 +0800
+Subject: [PATCH] check max member count in class
+
+---
+ squirrel/sqclass.cpp | 3 +++
+ squirrel/sqclass.h   | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/squirrel/sqclass.cpp b/squirrel/sqclass.cpp
+index fc619616..53a29763 100644
+--- a/external/squirrel/squirrel/sqclass.cpp
 b/external/squirrel/squirrel/sqclass.cpp
+@@ -61,6 +61,9 @@ bool SQClass::NewSlot(SQSharedState *ss,const SQObjectPtr 
,const SQObjectPtr
+ _defaultvalues[_member_idx(temp)].val = val;
+ return true;
+ }
++  if (_members->CountUsed() >= MEMBER_MAX_COUNT) {
++  return false;
++  }
+ if(belongs_to_static_table) {
+ SQInteger mmidx;
+ if((sq_type(val) == OT_CLOSURE || sq_type(val) == OT_NATIVECLOSURE) &&
+diff --git a/squirrel/sqclass.h b/squirrel/sqclass.h
+index 7d402172..60d3d21b 100644
+--- a/external/squirrel/squirrel/sqclass.h
 b/external/squirrel/squirrel/sqclass.h
+@@ -17,6 +17,7 @@ typedef sqvector SQClassMemberVec;
+ 
+ #define MEMBER_TYPE_METHOD 0x0100
+ #define MEMBER_TYPE_FIELD 0x0200
++#define MEMBER_MAX_COUNT 0x00FF
+ 
+ #define _ismethod(o) (_integer(o)_TYPE_METHOD)
+ #define _isfield(o) (_integer(o)_TYPE_FIELD)

diff --git a/games-arcade/supertux/supertux-0.6.3-r2.ebuild 
b/games-arcade/supertux/supertux-0.6.3-r2.ebuild
new file mode 100644
index ..2126e741ddad
--- /dev/null
+++ b/games-arcade/supertux/supertux-0.6.3-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+inherit cmake
+
+MY_PV="${PV/_rc/-rc.}"
+MY_P="SuperTux-v${MY_PV}-Source"
+
+DESCRIPTION="A game similar to Super Mario Bros"
+HOMEPAGE="https://www.supertux.org;
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire
+# content of ${HOME} to ${HOME}/.local/share/supertux2/
+# DO NOT REMOVE THIS BLOCKER!!! See bug #764959
+RDEPEND="
+   !=media-libs/libsdl2-2.0.14-r0
+   >=dev-games/physfs-3.0
+   dev-libs/boost:=[nls]
+   media-libs/freetype
+   media-libs/glew:=
+   media-libs/libpng:0=
+   >=media-libs/libsdl2-2.0.1[joystick,video]
+   media-libs/libvorbis
+   media-libs/openal
+   >=media-libs/sdl2-image-2.0.0[png,jpeg]
+   >=net-misc/curl-7.21.7
+   virtual/opengl
+"
+DEPEND="${RDEPEND}
+   media-libs/glm"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
+   "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+   "${FILESDIR}"/${PN}-0.6.3-missing-include.patch
+   "${FILESDIR}"/${PN}-0.6.3-squirrel-CVE-2021-41556.patch
+   "${FILESDIR}"/${PN}-0.6.3-squirrel-CVE-2022-30292.patch
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DWERROR=OFF
+   -DINSTALL_SUBDIR_BIN=bin
+   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
+   -DINSTALL_SUBDIR_SHARE=share/${PN}2
+   -DENABLE_SQDBG="$(usex debug)"
+   -DUSE_SYSTEM_PHYSFS=ON
+   -DIS_SUPERTUX_RELEASE=ON
+   )
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2022-12-04 Thread Pacho Ramos

commit: 91ff52e9ffd1072ea75272ab5173e1fd6d259f4e
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Dec  4 21:17:23 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Dec  4 21:23:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ff52e9

games-arcade/supertux: drop 0.6.3-r1

Signed-off-by: Pacho Ramos  gentoo.org>

 games-arcade/supertux/supertux-0.6.3-r1.ebuild | 63 --
 1 file changed, 63 deletions(-)

diff --git a/games-arcade/supertux/supertux-0.6.3-r1.ebuild 
b/games-arcade/supertux/supertux-0.6.3-r1.ebuild
deleted file mode 100644
index e670bfd6f25a..
--- a/games-arcade/supertux/supertux-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-#: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-inherit cmake
-
-MY_PV="${PV/_rc/-rc.}"
-MY_P="SuperTux-v${MY_PV}-Source"
-
-DESCRIPTION="A game similar to Super Mario Bros"
-HOMEPAGE="https://www.supertux.org;
-SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire
-# content of ${HOME} to ${HOME}/.local/share/supertux2/
-# DO NOT REMOVE THIS BLOCKER!!! See bug #764959
-RDEPEND="
-   !=media-libs/libsdl2-2.0.14-r0
-   >=dev-games/physfs-3.0
-   dev-libs/boost:=[nls]
-   media-libs/freetype
-   media-libs/glew:=
-   media-libs/libpng:0=
-   >=media-libs/libsdl2-2.0.1[joystick,video]
-   media-libs/libvorbis
-   media-libs/openal
-   >=media-libs/sdl2-image-2.0.0[png,jpeg]
-   >=net-misc/curl-7.21.7
-   virtual/opengl
-"
-DEPEND="${RDEPEND}
-   media-libs/glm"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
-   "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
-   "${FILESDIR}"/${PN}-0.6.3-missing-include.patch
-   "${FILESDIR}"/${PN}-0.6.3-squirrel-CVE-2022-30292.patch
-)
-
-src_configure() {
-   local mycmakeargs=(
-   -DWERROR=OFF
-   -DINSTALL_SUBDIR_BIN=bin
-   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
-   -DINSTALL_SUBDIR_SHARE=share/${PN}2
-   -DENABLE_SQDBG="$(usex debug)"
-   -DUSE_SYSTEM_PHYSFS=ON
-   -DIS_SUPERTUX_RELEASE=ON
-   )
-   cmake_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2022-12-04 Thread Pacho Ramos

commit: 866ce00a7cae59ca2c77650addabc3128127ecb8
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Dec  4 14:47:55 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Dec  4 14:49:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=866ce00a

games-arcade/supertux: Fix CVE-2022-30292

For 0.6.3 we need to patch the bundled squirrel copy, in next upstream
versions it should be possible to finally build it against system copy.

Bug: https://bugs.gentoo.org/843008
Signed-off-by: Pacho Ramos  gentoo.org>

 .../supertux-0.6.3-squirrel-CVE-2022-30292.patch   | 21 
 games-arcade/supertux/supertux-0.6.3-r1.ebuild | 63 ++
 2 files changed, 84 insertions(+)

diff --git 
a/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2022-30292.patch 
b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2022-30292.patch
new file mode 100644
index ..0a605616d606
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2022-30292.patch
@@ -0,0 +1,21 @@
+From a6413aa690e0bdfef648c68693349a7b878fe60d Mon Sep 17 00:00:00 2001
+From: Alberto Demichelis 
+Date: Mon, 2 May 2022 12:04:58 +0200
+Subject: [PATCH] fix in thread.call
+
+---
+ squirrel/sqbaselib.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/external/squirrel/squirrel/sqbaselib.cpp 
b/external/squirrel/squirrel/sqbaselib.cpp
+index 8eff97c..5055f18 100644
+--- a/external/squirrel/squirrel/sqbaselib.cpp
 b/external/squirrel/squirrel/sqbaselib.cpp
+@@ -1149,6 +1149,7 @@ static SQInteger thread_call(HSQUIRRELVM v)
+ SQObjectPtr o = stack_get(v,1);
+ if(sq_type(o) == OT_THREAD) {
+ SQInteger nparams = sq_gettop(v);
++sq_reservestack(_thread(o), nparams + 3);
+ _thread(o)->Push(_thread(o)->_roottable);
+ for(SQInteger i = 2; i<(nparams+1); i++)
+ sq_move(_thread(o),v,i);

diff --git a/games-arcade/supertux/supertux-0.6.3-r1.ebuild 
b/games-arcade/supertux/supertux-0.6.3-r1.ebuild
new file mode 100644
index ..e670bfd6f25a
--- /dev/null
+++ b/games-arcade/supertux/supertux-0.6.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+inherit cmake
+
+MY_PV="${PV/_rc/-rc.}"
+MY_P="SuperTux-v${MY_PV}-Source"
+
+DESCRIPTION="A game similar to Super Mario Bros"
+HOMEPAGE="https://www.supertux.org;
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire
+# content of ${HOME} to ${HOME}/.local/share/supertux2/
+# DO NOT REMOVE THIS BLOCKER!!! See bug #764959
+RDEPEND="
+   !=media-libs/libsdl2-2.0.14-r0
+   >=dev-games/physfs-3.0
+   dev-libs/boost:=[nls]
+   media-libs/freetype
+   media-libs/glew:=
+   media-libs/libpng:0=
+   >=media-libs/libsdl2-2.0.1[joystick,video]
+   media-libs/libvorbis
+   media-libs/openal
+   >=media-libs/sdl2-image-2.0.0[png,jpeg]
+   >=net-misc/curl-7.21.7
+   virtual/opengl
+"
+DEPEND="${RDEPEND}
+   media-libs/glm"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
+   "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+   "${FILESDIR}"/${PN}-0.6.3-missing-include.patch
+   "${FILESDIR}"/${PN}-0.6.3-squirrel-CVE-2022-30292.patch
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DWERROR=OFF
+   -DINSTALL_SUBDIR_BIN=bin
+   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
+   -DINSTALL_SUBDIR_SHARE=share/${PN}2
+   -DENABLE_SQDBG="$(usex debug)"
+   -DUSE_SYSTEM_PHYSFS=ON
+   -DIS_SUPERTUX_RELEASE=ON
+   )
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2022-08-03 Thread James Le Cuirot

commit: 15c8981063166b34e635e4796fbf40912771d3d6
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Aug  3 18:01:16 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Aug  3 21:43:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c89810

games-arcade/supertux: update HOMEPAGE

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Signed-off-by: James Le Cuirot  gentoo.org>

 games-arcade/supertux/supertux-0.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-arcade/supertux/supertux-0.6.3.ebuild 
b/games-arcade/supertux/supertux-0.6.3.ebuild
index 173ea4e074c1..9a193c691105 100644
--- a/games-arcade/supertux/supertux-0.6.3.ebuild
+++ b/games-arcade/supertux/supertux-0.6.3.ebuild
@@ -10,7 +10,7 @@ MY_PV="${PV/_rc/-rc.}"
 MY_P="SuperTux-v${MY_PV}-Source"
 
 DESCRIPTION="A game similar to Super Mario Bros"
-HOMEPAGE="https://supertux.org/;
+HOMEPAGE="https://www.supertux.org;
 
SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2022-05-07 Thread David Seifert

commit: 35788251d79b5b511dab4ebd05c4da3377e92b33
Author: David Seifert  gentoo  org>
AuthorDate: Sat May  7 10:54:23 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat May  7 10:54:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35788251

games-arcade/supertux: fix GCC 12 build

Closes: https://bugs.gentoo.org/840269
Signed-off-by: David Seifert  gentoo.org>

 .../supertux/files/supertux-0.6.3-missing-include.patch| 10 ++
 games-arcade/supertux/supertux-0.6.3.ebuild| 10 --
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch 
b/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch
new file mode 100644
index ..4515c9a6003f
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/external/partio_zip/zip_manager.hpp
 b/external/partio_zip/zip_manager.hpp
+@@ -41,6 +41,7 @@
+ #ifndef __ZIP__
+ #define __ZIP__
+ 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/games-arcade/supertux/supertux-0.6.3.ebuild 
b/games-arcade/supertux/supertux-0.6.3.ebuild
index 0a9fb27d74ef..173ea4e074c1 100644
--- a/games-arcade/supertux/supertux-0.6.3.ebuild
+++ b/games-arcade/supertux/supertux-0.6.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 #: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-inherit cmake flag-o-matic
+inherit cmake
 
 MY_PV="${PV/_rc/-rc.}"
 MY_P="SuperTux-v${MY_PV}-Source"
@@ -12,6 +12,7 @@ MY_P="SuperTux-v${MY_PV}-Source"
 DESCRIPTION="A game similar to Super Mario Bros"
 HOMEPAGE="https://supertux.org/;
 
SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
 SLOT="0"
@@ -41,16 +42,13 @@ BDEPEND="
virtual/pkgconfig
 "
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
"${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
"${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+   "${FILESDIR}"/${PN}-0.6.3-missing-include.patch
 )
 
 src_configure() {
-   append-cxxflags -std=c++11
-
local mycmakeargs=(
-DWERROR=OFF
-DINSTALL_SUBDIR_BIN=bin

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2022-05-07 Thread David Seifert

commit: 864b9d0084966c7812a9376b45bc26ff6cbbf885
Author: David Seifert  gentoo  org>
AuthorDate: Sat May  7 10:54:25 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat May  7 10:54:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=864b9d00

games-arcade/supertux: drop 0.6.2-r2

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

 games-arcade/supertux/Manifest |  1 -
 games-arcade/supertux/supertux-0.6.2-r2.ebuild | 70 --
 2 files changed, 71 deletions(-)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 4fe1b6e31bdb..0af22cd61c13 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,2 +1 @@
-DIST SuperTux-v0.6.2-Source.tar.gz 174295862 BLAKE2B 
1179a5ecf92dfb2ac56b87afe4fed21a2bdc1d7f91641fea8aafc2994ccfe49745420411f41b2145f06fa9714c73d75ecbc85160e85edcbd71c472026cefe708
 SHA512 
5baa783ee589b42a9bbce3740659dbb7b617ebfcc00c0a038c03d31b56700e3923c8548700ccebe42b325ca03bd85186bc5edef9f6580d93dc48d8aca88cbf74
 DIST SuperTux-v0.6.3-Source.tar.gz 182065428 BLAKE2B 
c4acbe2c61306e6e462a375205b4e95af174c87dbc391f15211e1fac365ab51147d7a83d20a90e35f7d7a994c72b560631ddf1686fee2e1f937f97a711fb1003
 SHA512 
c6540bab1b3befbd975756031c4587e5569d9613d9539dc829c728b574d1a4da92816d6a7e68947b32963cc13d9b8b52312701c199138640e9f89e5885433798

diff --git a/games-arcade/supertux/supertux-0.6.2-r2.ebuild 
b/games-arcade/supertux/supertux-0.6.2-r2.ebuild
deleted file mode 100644
index 76a941ef3820..
--- a/games-arcade/supertux/supertux-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-inherit cmake flag-o-matic
-
-MY_PV="${PV/_rc/-rc.}"
-MY_P="SuperTux-v${MY_PV}-Source"
-
-DESCRIPTION="A game similar to Super Mario Bros"
-HOMEPAGE="https://supertux.org/;
-SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
-
-LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire
-# content of ${HOME} to ${HOME}/.local/share/supertux2/
-# DO NOT REMOVE THIS BLOCKER!!! See bug #764959
-RDEPEND="
-   !=media-libs/libsdl2-2.0.14-r0
-   >=dev-games/physfs-3.0
-   dev-libs/boost:=[nls]
-   media-libs/freetype
-   media-libs/glew:=
-   media-libs/libpng:0=
-   >=media-libs/libsdl2-2.0.1[joystick,video]
-   media-libs/libvorbis
-   media-libs/openal
-   >=media-libs/sdl2-image-2.0.0[png,jpeg]
-   >=net-misc/curl-7.21.7
-   virtual/opengl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
-   "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # This is not a developer release so switch the logo to the non-dev one.
-   sed -e 's@logo_dev@logo@' \
-   -i data/images/objects/logo/logo.sprite || die
-}
-
-src_configure() {
-   append-cxxflags -std=c++11
-
-   local mycmakeargs=(
-   -DWERROR=OFF
-   -DINSTALL_SUBDIR_BIN=bin
-   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
-   -DINSTALL_SUBDIR_SHARE=share/${PN}2
-   -DENABLE_SQDBG="$(usex debug)"
-   -DUSE_SYSTEM_PHYSFS=ON
-   )
-   cmake_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2021-12-31 Thread Lars Wendler

commit: b4d60321654a226f749fff4f5d1ceccdd34ac708
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec 31 10:44:49 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec 31 10:46:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4d60321

games-arcade/supertux: Added media-libs/glm to DEPEND

Closes: https://bugs.gentoo.org/830327
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/supertux-0.6.3.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-arcade/supertux/supertux-0.6.3.ebuild 
b/games-arcade/supertux/supertux-0.6.3.ebuild
index 93f09e6450c8..0a9fb27d74ef 100644
--- a/games-arcade/supertux/supertux-0.6.3.ebuild
+++ b/games-arcade/supertux/supertux-0.6.3.ebuild
@@ -35,7 +35,8 @@ RDEPEND="
>=net-misc/curl-7.21.7
virtual/opengl
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   media-libs/glm"
 BDEPEND="
virtual/pkgconfig
 "

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2021-12-30 Thread Lars Wendler

commit: 87bdf8afe75a1eac7a4182d7d645741b50ffe93f
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Dec 30 00:54:50 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Dec 30 20:38:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87bdf8af

games-arcade/supertux: Bump to version 0.6.3

Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest  |  1 +
 games-arcade/supertux/supertux-0.6.3.ebuild | 63 +
 2 files changed, 64 insertions(+)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 9ffef0fc9534..4fe1b6e31bdb 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1 +1,2 @@
 DIST SuperTux-v0.6.2-Source.tar.gz 174295862 BLAKE2B 
1179a5ecf92dfb2ac56b87afe4fed21a2bdc1d7f91641fea8aafc2994ccfe49745420411f41b2145f06fa9714c73d75ecbc85160e85edcbd71c472026cefe708
 SHA512 
5baa783ee589b42a9bbce3740659dbb7b617ebfcc00c0a038c03d31b56700e3923c8548700ccebe42b325ca03bd85186bc5edef9f6580d93dc48d8aca88cbf74
+DIST SuperTux-v0.6.3-Source.tar.gz 182065428 BLAKE2B 
c4acbe2c61306e6e462a375205b4e95af174c87dbc391f15211e1fac365ab51147d7a83d20a90e35f7d7a994c72b560631ddf1686fee2e1f937f97a711fb1003
 SHA512 
c6540bab1b3befbd975756031c4587e5569d9613d9539dc829c728b574d1a4da92816d6a7e68947b32963cc13d9b8b52312701c199138640e9f89e5885433798

diff --git a/games-arcade/supertux/supertux-0.6.3.ebuild 
b/games-arcade/supertux/supertux-0.6.3.ebuild
new file mode 100644
index ..93f09e6450c8
--- /dev/null
+++ b/games-arcade/supertux/supertux-0.6.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+inherit cmake flag-o-matic
+
+MY_PV="${PV/_rc/-rc.}"
+MY_P="SuperTux-v${MY_PV}-Source"
+
+DESCRIPTION="A game similar to Super Mario Bros"
+HOMEPAGE="https://supertux.org/;
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire
+# content of ${HOME} to ${HOME}/.local/share/supertux2/
+# DO NOT REMOVE THIS BLOCKER!!! See bug #764959
+RDEPEND="
+   !=media-libs/libsdl2-2.0.14-r0
+   >=dev-games/physfs-3.0
+   dev-libs/boost:=[nls]
+   media-libs/freetype
+   media-libs/glew:=
+   media-libs/libpng:0=
+   >=media-libs/libsdl2-2.0.1[joystick,video]
+   media-libs/libvorbis
+   media-libs/openal
+   >=media-libs/sdl2-image-2.0.0[png,jpeg]
+   >=net-misc/curl-7.21.7
+   virtual/opengl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
+   "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+)
+
+src_configure() {
+   append-cxxflags -std=c++11
+
+   local mycmakeargs=(
+   -DWERROR=OFF
+   -DINSTALL_SUBDIR_BIN=bin
+   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
+   -DINSTALL_SUBDIR_SHARE=share/${PN}2
+   -DENABLE_SQDBG="$(usex debug)"
+   -DUSE_SYSTEM_PHYSFS=ON
+   -DIS_SUPERTUX_RELEASE=ON
+   )
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2021-11-16 Thread Sam James

commit: 7ab8292efbf01f18e9fc5a2860b7694f3b8850b3
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov 17 02:19:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 17 02:19:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab8292e

games-arcade/supertux: Keyword 0.6.2-r2 arm64, #821952

Signed-off-by: Sam James  gentoo.org>

 games-arcade/supertux/supertux-0.6.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-arcade/supertux/supertux-0.6.2-r2.ebuild 
b/games-arcade/supertux/supertux-0.6.2-r2.ebuild
index 7682bb89378e..1967b4e4b40e 100644
--- a/games-arcade/supertux/supertux-0.6.2-r2.ebuild
+++ b/games-arcade/supertux/supertux-0.6.2-r2.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.t
 
 LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug"
 
 # =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2021-07-30 Thread Sam James

commit: 2a2d70f04720a424b08f19911c954a4daa44b7e4
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 31 01:46:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 31 01:46:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a2d70f0

games-arcade/supertux: fix Boost dependency to include NLS

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

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

diff --git a/games-arcade/supertux/supertux-0.6.2-r1.ebuild 
b/games-arcade/supertux/supertux-0.6.2-r2.ebuild
similarity index 98%
rename from games-arcade/supertux/supertux-0.6.2-r1.ebuild
rename to games-arcade/supertux/supertux-0.6.2-r2.ebuild
index 9dafa4b81e2..7682bb89378 100644
--- a/games-arcade/supertux/supertux-0.6.2-r1.ebuild
+++ b/games-arcade/supertux/supertux-0.6.2-r2.ebuild
@@ -24,7 +24,7 @@ IUSE="debug"
 RDEPEND="
!=media-libs/libsdl2-2.0.14-r0
>=dev-games/physfs-3.0
-   dev-libs/boost:=
+   dev-libs/boost:=[nls]
media-libs/freetype
media-libs/glew:=
media-libs/libpng:0=

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2021-01-11 Thread Lars Wendler

commit: 0be98dd1fc6d1e292bfd388d01036c5a7a5bf97d
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jan 11 15:42:24 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jan 11 15:59:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be98dd1

games-arcade/supertux: Removed old

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest|  1 -
 games-arcade/supertux/supertux-0.6.1.1.ebuild | 59 ---
 2 files changed, 60 deletions(-)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index eaa21f15255..9ffef0fc953 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,2 +1 @@
-DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 
313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866
 SHA512 
9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10
 DIST SuperTux-v0.6.2-Source.tar.gz 174295862 BLAKE2B 
1179a5ecf92dfb2ac56b87afe4fed21a2bdc1d7f91641fea8aafc2994ccfe49745420411f41b2145f06fa9714c73d75ecbc85160e85edcbd71c472026cefe708
 SHA512 
5baa783ee589b42a9bbce3740659dbb7b617ebfcc00c0a038c03d31b56700e3923c8548700ccebe42b325ca03bd85186bc5edef9f6580d93dc48d8aca88cbf74

diff --git a/games-arcade/supertux/supertux-0.6.1.1.ebuild 
b/games-arcade/supertux/supertux-0.6.1.1.ebuild
deleted file mode 100644
index 35562950c4e..000
--- a/games-arcade/supertux/supertux-0.6.1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-inherit cmake flag-o-matic
-
-MY_P="SuperTux-v${PV}-Source"
-
-DESCRIPTION="A game similar to Super Mario Bros."
-HOMEPAGE="https://supertux.org/;
-SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${MY_P}.tar.gz;
-
-LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-games/physfs-3.0
-   dev-libs/boost:=
-   media-libs/glew:=
-   virtual/opengl
-   media-libs/libvorbis
-   media-libs/openal
-   >=media-libs/libsdl2-2.0.1[joystick,video]
-   >=media-libs/sdl2-image-2.0.0[png,jpeg]
-   >=net-misc/curl-7.21.7"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
-   "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # This is not a developer release so switch the logo to the non-dev one.
-   sed -e 's@logo_dev@logo@' \
-   -i data/images/objects/logo/logo.sprite || die
-}
-
-src_configure() {
-   append-cxxflags -std=c++11
-
-   local mycmakeargs=(
-   -DWERROR=OFF
-   -DINSTALL_SUBDIR_BIN=bin
-   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
-   -DINSTALL_SUBDIR_SHARE=share/${PN}2
-   -DENABLE_SQDBG="$(usex debug)"
-   -DUSE_SYSTEM_PHYSFS=ON
-   )
-   cmake_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2021-01-11 Thread Lars Wendler

commit: d70fb9b34f2a8784218a7b3d06bb19882501f654
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jan 11 15:46:06 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jan 11 15:59:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d70fb9b3

games-arcade/supertux: Revbump to fix severe issue with libsdl2-2.0.14

Bug: https://bugs.gentoo.org/764959
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 .../supertux/{supertux-0.6.2.ebuild => supertux-0.6.2-r1.ebuild}  | 4 
 1 file changed, 4 insertions(+)

diff --git a/games-arcade/supertux/supertux-0.6.2.ebuild 
b/games-arcade/supertux/supertux-0.6.2-r1.ebuild
similarity index 87%
rename from games-arcade/supertux/supertux-0.6.2.ebuild
rename to games-arcade/supertux/supertux-0.6.2-r1.ebuild
index 9bf339a6725..9dafa4b81e2 100644
--- a/games-arcade/supertux/supertux-0.6.2.ebuild
+++ b/games-arcade/supertux/supertux-0.6.2-r1.ebuild
@@ -18,7 +18,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
+# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire
+# content of ${HOME} to ${HOME}/.local/share/supertux2/
+# DO NOT REMOVE THIS BLOCKER!!! See bug #764959
 RDEPEND="
+   !=media-libs/libsdl2-2.0.14-r0
>=dev-games/physfs-3.0
dev-libs/boost:=
media-libs/freetype

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2021-01-11 Thread Lars Wendler

commit: 7269097d1354600754e85714f81254d49f2b4ebe
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jan 11 14:18:29 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jan 11 14:18:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7269097d

games-arcade/supertux: Fixed dependencies

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/supertux-0.6.2.ebuild | 20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/games-arcade/supertux/supertux-0.6.2.ebuild 
b/games-arcade/supertux/supertux-0.6.2.ebuild
index a107f3e14c2..9bf339a6725 100644
--- a/games-arcade/supertux/supertux-0.6.2.ebuild
+++ b/games-arcade/supertux/supertux-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,17 +18,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND=">=dev-games/physfs-3.0
+RDEPEND="
+   >=dev-games/physfs-3.0
dev-libs/boost:=
+   media-libs/freetype
media-libs/glew:=
-   virtual/opengl
+   media-libs/libpng:0=
+   >=media-libs/libsdl2-2.0.1[joystick,video]
media-libs/libvorbis
media-libs/openal
-   >=media-libs/libsdl2-2.0.1[joystick,video]
>=media-libs/sdl2-image-2.0.0[png,jpeg]
-   >=net-misc/curl-7.21.7"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
+   >=net-misc/curl-7.21.7
+   virtual/opengl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+"
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2020-05-15 Thread Lars Wendler

commit: f3051f1c8d29f98f52b83d003e070efbf456e7d3
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri May 15 06:42:34 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri May 15 06:42:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3051f1c

games-arcade/supertux: Bump to version 0.6.2. Removed old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest |  2 +-
 .../files/supertux-0.6.2_rc1-boost-1.73.patch  | 25 --
 ...rtux-0.6.2_rc1.ebuild => supertux-0.6.2.ebuild} |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 7ecf8ae966a..eaa21f15255 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,2 +1,2 @@
 DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 
313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866
 SHA512 
9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10
-DIST SuperTux-v0.6.2-rc.1-Source.tar.gz 172372034 BLAKE2B 
cd0825ba957bb8d3114ffefa623b32fce55467aef6ae2455fc3b7bf78ceeb58797a8ff7b2e920376e9ee1b7412ff3b5f7a9f238e2da8a9d99d9bf659d51d2ec4
 SHA512 
cc33e6340bbe0a7cc8f9bf11ebcecdf50e08d224de73837f5a34d67b7b4b739b1e9d148553198208cb097651d923696a28351c4ea40eaca7166b51657bb45113
+DIST SuperTux-v0.6.2-Source.tar.gz 174295862 BLAKE2B 
1179a5ecf92dfb2ac56b87afe4fed21a2bdc1d7f91641fea8aafc2994ccfe49745420411f41b2145f06fa9714c73d75ecbc85160e85edcbd71c472026cefe708
 SHA512 
5baa783ee589b42a9bbce3740659dbb7b617ebfcc00c0a038c03d31b56700e3923c8548700ccebe42b325ca03bd85186bc5edef9f6580d93dc48d8aca88cbf74

diff --git a/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch 
b/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch
deleted file mode 100644
index 55fa95b70fb..000
--- a/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dec7fb943c532f855e5c0ae2eb39d2d82a46a506 Mon Sep 17 00:00:00 2001
-From: Lars Wendler 
-Date: Sat, 9 May 2020 03:04:02 +0200
-Subject: [PATCH] Fix build with boost-1.73
-

- src/editor/object_settings.hpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/editor/object_settings.hpp b/src/editor/object_settings.hpp
-index bc9049a94..15b77b1e4 100644
 a/src/editor/object_settings.hpp
-+++ b/src/editor/object_settings.hpp
-@@ -22,6 +22,8 @@
- 
- #include "editor/object_option.hpp"
- 
-+#include 
-+
- class Color;
- enum class Direction;
- enum class WalkMode;
--- 
-2.26.2
-

diff --git a/games-arcade/supertux/supertux-0.6.2_rc1.ebuild 
b/games-arcade/supertux/supertux-0.6.2.ebuild
similarity index 96%
rename from games-arcade/supertux/supertux-0.6.2_rc1.ebuild
rename to games-arcade/supertux/supertux-0.6.2.ebuild
index be67a6a7509..a107f3e14c2 100644
--- a/games-arcade/supertux/supertux-0.6.2_rc1.ebuild
+++ b/games-arcade/supertux/supertux-0.6.2.ebuild
@@ -35,7 +35,6 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
"${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
"${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
-   "${FILESDIR}"/${PN}-0.6.2_rc1-boost-1.73.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2020-05-08 Thread Lars Wendler

commit: 703cb390bc2c3788f1be67600330517265b7cd47
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat May  9 01:12:16 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat May  9 01:12:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=703cb390

games-arcade/supertux: Bump to version 0.6.2_rc1

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest |  1 +
 .../files/supertux-0.6.2_rc1-boost-1.73.patch  | 25 +
 games-arcade/supertux/supertux-0.6.2_rc1.ebuild| 61 ++
 3 files changed, 87 insertions(+)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 8f44c648f7e..b2865395711 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,2 +1,3 @@
 DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 
196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59
 SHA512 
7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b
 DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 
313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866
 SHA512 
9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10
+DIST SuperTux-v0.6.2-rc.1-Source.tar.gz 172372034 BLAKE2B 
cd0825ba957bb8d3114ffefa623b32fce55467aef6ae2455fc3b7bf78ceeb58797a8ff7b2e920376e9ee1b7412ff3b5f7a9f238e2da8a9d99d9bf659d51d2ec4
 SHA512 
cc33e6340bbe0a7cc8f9bf11ebcecdf50e08d224de73837f5a34d67b7b4b739b1e9d148553198208cb097651d923696a28351c4ea40eaca7166b51657bb45113

diff --git a/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch 
b/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch
new file mode 100644
index 000..55fa95b70fb
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch
@@ -0,0 +1,25 @@
+From dec7fb943c532f855e5c0ae2eb39d2d82a46a506 Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+Date: Sat, 9 May 2020 03:04:02 +0200
+Subject: [PATCH] Fix build with boost-1.73
+
+---
+ src/editor/object_settings.hpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/editor/object_settings.hpp b/src/editor/object_settings.hpp
+index bc9049a94..15b77b1e4 100644
+--- a/src/editor/object_settings.hpp
 b/src/editor/object_settings.hpp
+@@ -22,6 +22,8 @@
+ 
+ #include "editor/object_option.hpp"
+ 
++#include 
++
+ class Color;
+ enum class Direction;
+ enum class WalkMode;
+-- 
+2.26.2
+

diff --git a/games-arcade/supertux/supertux-0.6.2_rc1.ebuild 
b/games-arcade/supertux/supertux-0.6.2_rc1.ebuild
new file mode 100644
index 000..be67a6a7509
--- /dev/null
+++ b/games-arcade/supertux/supertux-0.6.2_rc1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+inherit cmake flag-o-matic
+
+MY_PV="${PV/_rc/-rc.}"
+MY_P="SuperTux-v${MY_PV}-Source"
+
+DESCRIPTION="A game similar to Super Mario Bros."
+HOMEPAGE="https://supertux.org/;
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-games/physfs-3.0
+   dev-libs/boost:=
+   media-libs/glew:=
+   virtual/opengl
+   media-libs/libvorbis
+   media-libs/openal
+   >=media-libs/libsdl2-2.0.1[joystick,video]
+   >=media-libs/sdl2-image-2.0.0[png,jpeg]
+   >=net-misc/curl-7.21.7"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
+   "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+   "${FILESDIR}"/${PN}-0.6.2_rc1-boost-1.73.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   # This is not a developer release so switch the logo to the non-dev one.
+   sed -e 's@logo_dev@logo@' \
+   -i data/images/objects/logo/logo.sprite || die
+}
+
+src_configure() {
+   append-cxxflags -std=c++11
+
+   local mycmakeargs=(
+   -DWERROR=OFF
+   -DINSTALL_SUBDIR_BIN=bin
+   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
+   -DINSTALL_SUBDIR_SHARE=share/${PN}2
+   -DENABLE_SQDBG="$(usex debug)"
+   -DUSE_SYSTEM_PHYSFS=ON
+   )
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2020-05-08 Thread Lars Wendler

commit: 3b0bd1e6a26343d2c3b897b31829cff76c99833b
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat May  9 01:12:42 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat May  9 01:12:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b0bd1e6

games-arcade/supertux: Removed old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest  |  1 -
 games-arcade/supertux/supertux-0.6.0.ebuild | 60 -
 2 files changed, 61 deletions(-)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index b2865395711..7ecf8ae966a 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,3 +1,2 @@
-DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 
196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59
 SHA512 
7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b
 DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 
313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866
 SHA512 
9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10
 DIST SuperTux-v0.6.2-rc.1-Source.tar.gz 172372034 BLAKE2B 
cd0825ba957bb8d3114ffefa623b32fce55467aef6ae2455fc3b7bf78ceeb58797a8ff7b2e920376e9ee1b7412ff3b5f7a9f238e2da8a9d99d9bf659d51d2ec4
 SHA512 
cc33e6340bbe0a7cc8f9bf11ebcecdf50e08d224de73837f5a34d67b7b4b739b1e9d148553198208cb097651d923696a28351c4ea40eaca7166b51657bb45113

diff --git a/games-arcade/supertux/supertux-0.6.0.ebuild 
b/games-arcade/supertux/supertux-0.6.0.ebuild
deleted file mode 100644
index 16d3cbb706a..000
--- a/games-arcade/supertux/supertux-0.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-inherit cmake flag-o-matic
-
-MY_P="SuperTux-v${PV}-Source"
-
-DESCRIPTION="A game similar to Super Mario Bros."
-HOMEPAGE="https://supertux.org/;
-SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${MY_P}.tar.gz;
-
-LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-games/physfs-3.0
-   dev-libs/boost:=
-   media-libs/glew:=
-   virtual/opengl
-   media-libs/libvorbis
-   media-libs/openal
-   >=media-libs/libsdl2-2.0.1[joystick,video]
-   >=media-libs/sdl2-image-2.0.0[png,jpeg]
-   >=net-misc/curl-7.21.7"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
-   "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # This is not a developer release so switch the logo to the non-dev one.
-   sed -e 's@logo_dev@logo@' \
-   -i data/images/objects/logo/logo.sprite || die
-}
-
-src_configure() {
-   append-cxxflags -std=c++11
-
-   local mycmakeargs=(
-   -DWERROR=OFF
-   -DINSTALL_SUBDIR_BIN=bin
-   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
-   -DINSTALL_SUBDIR_SHARE=share/${PN}2
-   -DENABLE_SQDBG="$(usex debug)"
-   -DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is 
still required.
-   -DUSE_SYSTEM_PHYSFS=ON
-   )
-   cmake_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2019-12-20 Thread Lars Wendler

commit: 9009949b00ce3be51b743ca6e52c6a1b4ace4869
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec 20 08:23:10 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec 20 08:23:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9009949b

games-arcade/supertux: Bump to version 0.6.1.1

(replacing 0.6.1)

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest  | 2 +-
 .../supertux/{supertux-0.6.1.ebuild => supertux-0.6.1.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 877a5c46c8e..42580820a30 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,3 +1,3 @@
 DIST SuperTux-v0.5.1-Source.tar.gz 90564367 BLAKE2B 
ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123
 SHA512 
1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
 DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 
196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59
 SHA512 
7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b
-DIST SuperTux-v0.6.1-Source.tar.gz 163293143 BLAKE2B 
193aeffe2f6d4e4437339c812200428581912caa6593d6b2c20245c6ac1fc6793afcdc44ee22b25b8b737fec4296f0a4665034567c83b667a4108388f59e327d
 SHA512 
38a1da2a0546aa7fb98ece307b35a7e03a154b018d4b732592d3a718fd6c8ba827f3f8d99f0df777b7f438c0294c1838185ea7e60cc08f8cdb6f9a46b440e860
+DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 
313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866
 SHA512 
9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10

diff --git a/games-arcade/supertux/supertux-0.6.1.ebuild 
b/games-arcade/supertux/supertux-0.6.1.1.ebuild
similarity index 100%
rename from games-arcade/supertux/supertux-0.6.1.ebuild
rename to games-arcade/supertux/supertux-0.6.1.1.ebuild

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/, games-arcade/supertux/files/

2019-12-20 Thread Lars Wendler

commit: de2fdc312e0d2c950a42a2ea16ff911c3f873188
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec 20 08:25:21 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec 20 08:25:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2fdc31

games-arcade/supertux: Removed old

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest |  1 -
 .../supertux/files/supertux-0.4.0-desktop.patch| 11 
 .../supertux/files/supertux-0.4.0-icon.patch   | 11 
 .../supertux/files/supertux-0.4.0-license.patch| 11 
 .../supertux/files/supertux-0.5.0-obstack.patch| 19 ---
 .../supertux/files/supertux-0.5.1-ninja.patch  | 30 ---
 games-arcade/supertux/supertux-0.5.1.ebuild| 61 --
 7 files changed, 144 deletions(-)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 42580820a30..8f44c648f7e 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,3 +1,2 @@
-DIST SuperTux-v0.5.1-Source.tar.gz 90564367 BLAKE2B 
ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123
 SHA512 
1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
 DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 
196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59
 SHA512 
7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b
 DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 
313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866
 SHA512 
9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10

diff --git a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch 
b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
deleted file mode 100644
index 74a08726336..000
--- a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/supertux2.desktop
-+++ b/supertux2.desktop
-@@ -35,7 +35,7 @@
- Comment[pt]=Joga este clássico de plataformas 2D
- Comment[pt_BR]=Encarne o pinguin Tux neste jogo inspirado em clássicos de 
Pular
- Comment[hu]=Egy klasszikus 2D-s oldalnézeti játék
--Icon=supertux.png
-+Icon=supertux
- Exec=supertux2
- Terminal=false
- StartupNotify=false

diff --git a/games-arcade/supertux/files/supertux-0.4.0-icon.patch 
b/games-arcade/supertux/files/supertux-0.4.0-icon.patch
deleted file mode 100644
index 66be0ebe493..000
--- a/games-arcade/supertux/files/supertux-0.4.0-icon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -571,7 +571,7 @@
- 
-   SET(APPS 
"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR_BIN}/supertux2")
- 
--  INSTALL(FILES 
${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png 
${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.xpm DESTINATION 
"share/pixmaps/")
-+  INSTALL(FILES 
${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION 
"share/pixmaps/")
- 
- ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND DISABLE_CPACK_BUNDLING)
- ENDIF(WIN32 AND NOT UNIX)

diff --git a/games-arcade/supertux/files/supertux-0.4.0-license.patch 
b/games-arcade/supertux/files/supertux-0.4.0-license.patch
deleted file mode 100644
index e35f85ce416..000
--- a/games-arcade/supertux/files/supertux-0.4.0-license.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -578,7 +578,7 @@
- 
- INSTALL(TARGETS supertux2_exe DESTINATION ${INSTALL_SUBDIR_BIN})
- 
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md 
${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt 
${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md 
${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md 
DESTINATION ${INSTALL_SUBDIR_DOC})
- 
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.txt DESTINATION 
${INSTALL_SUBDIR_SHARE})
- 

diff --git a/games-arcade/supertux/files/supertux-0.5.0-obstack.patch 
b/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
deleted file mode 100644
index 1b05369f67f..000
--- a/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 supertux-0.5.0/CMakeLists.txt
-+++ supertux-0.5.0/CMakeLists.txt
-@@ -382,7 +382,6 @@
- include_directories(${CMAKE_BINARY_DIR}/)
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
- include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2019-12-19 Thread Lars Wendler

commit: fbc5d7b32ed370279238af30bca5ebf00b6b8a0b
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Dec 19 15:37:05 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Dec 19 15:37:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbc5d7b3

games-arcade/supertux: Bump to version 0.6.1

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest  |  1 +
 games-arcade/supertux/supertux-0.6.1.ebuild | 59 +
 2 files changed, 60 insertions(+)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 02fccc57d69..877a5c46c8e 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,2 +1,3 @@
 DIST SuperTux-v0.5.1-Source.tar.gz 90564367 BLAKE2B 
ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123
 SHA512 
1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
 DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 
196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59
 SHA512 
7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b
+DIST SuperTux-v0.6.1-Source.tar.gz 163293143 BLAKE2B 
193aeffe2f6d4e4437339c812200428581912caa6593d6b2c20245c6ac1fc6793afcdc44ee22b25b8b737fec4296f0a4665034567c83b667a4108388f59e327d
 SHA512 
38a1da2a0546aa7fb98ece307b35a7e03a154b018d4b732592d3a718fd6c8ba827f3f8d99f0df777b7f438c0294c1838185ea7e60cc08f8cdb6f9a46b440e860

diff --git a/games-arcade/supertux/supertux-0.6.1.ebuild 
b/games-arcade/supertux/supertux-0.6.1.ebuild
new file mode 100644
index 000..dce1075f282
--- /dev/null
+++ b/games-arcade/supertux/supertux-0.6.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+inherit cmake-utils flag-o-matic
+
+MY_P="SuperTux-v${PV}-Source"
+
+DESCRIPTION="A game similar to Super Mario Bros."
+HOMEPAGE="https://supertux.org/;
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-games/physfs-3.0
+   dev-libs/boost:=
+   media-libs/glew:=
+   virtual/opengl
+   media-libs/libvorbis
+   media-libs/openal
+   >=media-libs/libsdl2-2.0.1[joystick,video]
+   >=media-libs/sdl2-image-2.0.0[png,jpeg]
+   >=net-misc/curl-7.21.7"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
+   "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+)
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   # This is not a developer release so switch the logo to the non-dev one.
+   sed -e 's@logo_dev@logo@' \
+   -i data/images/objects/logo/logo.sprite || die
+}
+
+src_configure() {
+   append-cxxflags -std=c++11
+
+   local mycmakeargs=(
+   -DWERROR=OFF
+   -DINSTALL_SUBDIR_BIN=bin
+   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
+   -DINSTALL_SUBDIR_SHARE=share/${PN}2
+   -DENABLE_SQDBG="$(usex debug)"
+   -DUSE_SYSTEM_PHYSFS=ON
+   )
+   cmake-utils_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2018-12-26 Thread Brian Evans

commit: 0bcac3b02375bad0cdf885cbc45ff346ccee0ab6
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Dec 26 13:38:26 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Dec 26 13:40:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bcac3b0

games-arcade/supertux: Fix build failure with minimum physfs version

When package started to use system dev-games/physfs, change author failed
to verify minimum version.  The stable 2.x version does not compile.
Raise it to 3.0 or greater

Closes: https://bugs.gentoo.org/659830
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Brian Evans  gentoo.org>

 games-arcade/supertux/supertux-0.5.1.ebuild | 4 ++--
 games-arcade/supertux/supertux-0.6.0.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-arcade/supertux/supertux-0.5.1.ebuild 
b/games-arcade/supertux/supertux-0.5.1.ebuild
index c1773f3228c..f61607c368e 100644
--- a/games-arcade/supertux/supertux-0.5.1.ebuild
+++ b/games-arcade/supertux/supertux-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND="dev-games/physfs
+RDEPEND=">=dev-games/physfs-3.0
dev-libs/boost:=
media-libs/glew:=
virtual/opengl

diff --git a/games-arcade/supertux/supertux-0.6.0.ebuild 
b/games-arcade/supertux/supertux-0.6.0.ebuild
index 2fc8444ed9d..c12492e71e3 100644
--- a/games-arcade/supertux/supertux-0.6.0.ebuild
+++ b/games-arcade/supertux/supertux-0.6.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND="dev-games/physfs
+RDEPEND=">=dev-games/physfs-3.0
dev-libs/boost:=
media-libs/glew:=
virtual/opengl

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2018-12-25 Thread Lars Wendler

commit: 835d16aaf608ed4bb5e2a008279d1ec903581c60
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Dec 25 14:53:18 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Dec 25 14:53:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835d16aa

games-arcade/supertux: Bump to version 0.6.0

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest |  1 +
 .../supertux/files/supertux-0.6.0-icon.patch   | 11 
 .../supertux/files/supertux-0.6.0-license.patch| 11 
 .../supertux/files/supertux-0.6.0-obstack.patch| 19 +++
 games-arcade/supertux/supertux-0.6.0.ebuild| 60 ++
 5 files changed, 102 insertions(+)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 3451c717190..02fccc57d69 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1 +1,2 @@
 DIST SuperTux-v0.5.1-Source.tar.gz 90564367 BLAKE2B 
ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123
 SHA512 
1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
+DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 
196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59
 SHA512 
7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b

diff --git a/games-arcade/supertux/files/supertux-0.6.0-icon.patch 
b/games-arcade/supertux/files/supertux-0.6.0-icon.patch
new file mode 100644
index 000..aac503c8cc9
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.0-icon.patch
@@ -0,0 +1,11 @@
+--- SuperTux-v0.6.0-Source/CMakeLists.txt
 SuperTux-v0.6.0-Source/CMakeLists.txt
+@@ -846,7 +846,7 @@
+ install(FILES ${DLLS} DESTINATION ${INSTALL_SUBDIR_BIN})
+   endif()
+ 
+-  install(FILES 
${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png 
${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.ico DESTINATION 
".")
++  install(FILES 
${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION 
".")
+ 
+   option(PACKAGE_VCREDIST "Package the VCREDIST libraries with the program" 
OFF)
+ 

diff --git a/games-arcade/supertux/files/supertux-0.6.0-license.patch 
b/games-arcade/supertux/files/supertux-0.6.0-license.patch
new file mode 100644
index 000..600a3fd0c96
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.0-license.patch
@@ -0,0 +1,11 @@
+--- SuperTux-v0.6.0-Source/CMakeLists.txt
 SuperTux-v0.6.0-Source/CMakeLists.txt
+@@ -895,7 +895,7 @@
+   install(FILES ${SQUIRREL_LIB_PATH} ${SQSTDLIB_LIB_PATH} ${PHYSFS_LIB_PATH} 
DESTINATION ${INSTALL_SUBDIR_BIN})
+ endif()
+ 
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md 
${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt 
${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md 
${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md 
DESTINATION ${INSTALL_SUBDIR_DOC})
+ 
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.stxt DESTINATION 
${INSTALL_SUBDIR_SHARE})
+ 

diff --git a/games-arcade/supertux/files/supertux-0.6.0-obstack.patch 
b/games-arcade/supertux/files/supertux-0.6.0-obstack.patch
new file mode 100644
index 000..a46ca3afd12
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.0-obstack.patch
@@ -0,0 +1,19 @@
+--- SuperTux-v0.6.0-Source/CMakeLists.txt
 SuperTux-v0.6.0-Source/CMakeLists.txt
+@@ -470,7 +470,6 @@
+ include_directories(${CMAKE_BINARY_DIR}/)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
+ include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
+-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
+ include_directories(SYSTEM 
${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
+ include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL_SavePNG/)
+ 
+@@ -481,7 +480,7 @@
+ 
+ ## Build list of sources for supertux binary
+ 
+-file(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
external/obstack/*.c external/findlocale/findlocale.c)
++file(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
external/findlocale/findlocale.c)
+ 
+ file(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp src/video/null/*.cpp)
+ file(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
"${PROJECT_BINARY_DIR}/tmp/*.rc")

diff --git a/games-arcade/supertux/supertux-0.6.0.ebuild 
b/games-arcade/supertux/supertux-0.6.0.ebuild
new file mode 100644
index 000..2fc8444ed9d
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/, games-arcade/supertux/files/

2018-07-01 Thread David Seifert

commit: 252a6dd9f24a9054f7d4e5b7996c531a640f1541
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jul  1 09:43:31 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jul  1 09:46:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=252a6dd9

games-arcade/supertux: Build using Ninja

* Use system PhysFS
* Fix CMake unused variable error

Closes: https://bugs.gentoo.org/638076
Closes: https://bugs.gentoo.org/649458
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 .../supertux/files/supertux-0.5.1-ninja.patch  | 30 ++
 games-arcade/supertux/supertux-0.5.1.ebuild| 19 +-
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/games-arcade/supertux/files/supertux-0.5.1-ninja.patch 
b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
new file mode 100644
index 000..d5181177fdc
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
@@ -0,0 +1,30 @@
+Allow building with ninja instead of CMake, see also:
+
+  https://bugs.gentoo.org/649458
+  https://cmake.org/pipermail/cmake/2015-April/060234.html
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -332,7 +332,10 @@
+   -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+   -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+   -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX}
+-  -DINSTALL_INC_DIR=include)
++  -DINSTALL_INC_DIR=include
++  BUILD_BYPRODUCTS
++  squirrel/lib/libsquirrel_static.a
++  squirrel/lib/libsqstdlib_static.a)
+ 
+ IF(WIN32)
+   ADD_LIBRARY(squirrel_lib SHARED IMPORTED)
+@@ -370,7 +373,9 @@
+   -DHAVE_SDL=ON
+   -DCMAKE_INSTALL_PREFIX=${TINYGETTEXT_PREFIX}
+   -DSDL2_INCLUDE_DIRS=${SDL2_INCLUDE_DIRS}
+-  -DLIB_SUFFIX=${LIB_SUFFIX})
++  -DLIB_SUFFIX=${LIB_SUFFIX}
++  BUILD_BYPRODUCTS
++  tinygettext/lib${LIB_SUFFIX}/libtinygettext.a)
+ 
+ ADD_LIBRARY(tinygettext_lib STATIC IMPORTED)
+ SET_TARGET_PROPERTIES(tinygettext_lib PROPERTIES IMPORTED_LOCATION 
"${TINYGETTEXT_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}tinygettext${CMAKE_STATIC_LIBRARY_SUFFIX}")

diff --git a/games-arcade/supertux/supertux-0.5.1.ebuild 
b/games-arcade/supertux/supertux-0.5.1.ebuild
index af91e8b026d..c1773f3228c 100644
--- a/games-arcade/supertux/supertux-0.5.1.ebuild
+++ b/games-arcade/supertux/supertux-0.5.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 inherit cmake-utils flag-o-matic
 
 MY_P="SuperTux-v${PV}-Source"
@@ -32,35 +34,28 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
"${FILESDIR}"/${PN}-0.4.0-{desktop,license,icon}.patch
"${FILESDIR}"/${PN}-0.5.0-{obstack,tinygettext}.patch
+   "${FILESDIR}"/${PN}-0.5.1-ninja.patch
 )
 
 src_prepare() {
cmake-utils_src_prepare
 
# This is not a developer release so switch the logo to the non-dev one.
-   sed 's@logo_dev@logo@' \
+   sed -e 's@logo_dev@logo@' \
-i data/images/objects/logo/logo.sprite || die
 }
 
 src_configure() {
append-cxxflags -std=c++11
+
local mycmakeargs=(
-DWERROR=OFF
-DINSTALL_SUBDIR_BIN=bin
-DINSTALL_SUBDIR_DOC=share/doc/${PF}
-DINSTALL_SUBDIR_SHARE=share/${PN}2
-DENABLE_SQDBG="$(usex debug)"
-   -DUSE_DEBUG="$(usex debug)"
-DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is 
still required.
+   -DUSE_SYSTEM_PHYSFS=ON
)
-
cmake-utils_src_configure
 }
-
-src_compile() {
-   cmake-utils_src_compile
-}
-
-src_install() {
-   cmake-utils_src_install
-}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/

2017-12-23 Thread David Seifert

commit: 42873fe722268b3a4cad3bd375c5adfdacfc16cd
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Dec 22 15:25:59 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Dec 23 13:10:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42873fe7

games-arcade/supertux: remove unused patches

 .../supertux/files/supertux-0.4.0-flags.patch  | 32 --
 .../supertux/files/supertux-0.4.0-obstack.patch| 19 
 .../supertux/files/supertux-0.4.0-squirrel.patch   | 20 -
 .../files/supertux-0.4.0-tinygettext.patch | 50 --
 4 files changed, 121 deletions(-)

diff --git a/games-arcade/supertux/files/supertux-0.4.0-flags.patch 
b/games-arcade/supertux/files/supertux-0.4.0-flags.patch
deleted file mode 100644
index a09176cedd1..000
--- a/games-arcade/supertux/files/supertux-0.4.0-flags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -329,7 +329,7 @@
- endif(COMPILER_SUPPORTS_CXX11)
- 
- 
--IF(CMAKE_COMPILER_IS_GNUCC)
-+IF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS)
-   SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Debug flags")
-   SET(CMAKE_C_FLAGS_DEBUG "-O0 -g" CACHE STRING "Debug flags")
-   SET(CMAKE_CXX_FLAGS_PROFILE "-pg" CACHE STRING "Profile flags")
-@@ -352,7 +352,7 @@
- #   -Wlogical-op -Wstrict-null-sentinel
- SET(SUPERTUX2_EXTRA_WARNING_FLAGS "-fdiagnostics-show-option -pedantic 
-Wno-long-long -Wcast-align -Wdisabled-optimization -Winit-self -Winvalid-pch 
-Wmissing-include-dirs -Wmissing-noreturn -Wpacked -Wredundant-decls 
-Wstack-protector -Wformat=2 -Weffc++ -Wctor-dtor-privacy  
-Wno-unused-parameter -Wshadow -Wnon-virtual-dtor -Wcast-qual")
-   ENDIF(WARNINGS)
--ENDIF(CMAKE_COMPILER_IS_GNUCC)
-+ENDIF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS)
- 
- ## If xgettext is available, generate messages.pot for sources
- 
-@@ -407,9 +407,9 @@
- ENDIF(GENERATE_MESSAGESPOT)
- 
- ## Some additional compiler switches
--IF(CMAKE_COMPILER_IS_GNUCC)
-+IF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS)
-   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
--ENDIF(CMAKE_COMPILER_IS_GNUCC)
-+ENDIF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS)
- 
- IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-   ADD_DEFINITIONS(-DMACOSX)

diff --git a/games-arcade/supertux/files/supertux-0.4.0-obstack.patch 
b/games-arcade/supertux/files/supertux-0.4.0-obstack.patch
deleted file mode 100644
index 609fe948609..000
--- a/games-arcade/supertux/files/supertux-0.4.0-obstack.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -251,7 +251,6 @@
- include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/include/)
- include_directories 
(${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/include/)
- include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
--include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
- 
- IF(WIN32)
-   ADD_DEFINITIONS(-D_USE_MATH_DEFINES -DNOMINMAX)
-@@ -260,7 +259,7 @@
- 
- ## Build list of sources for supertux binary
- 
--FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
external/obstack/*.c external/findlocale/findlocale.c)
-+FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
external/findlocale/findlocale.c)
- 
- FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp)
- FILE(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
"${PROJECT_BINARY_DIR}/tmp/*.rc")

diff --git a/games-arcade/supertux/files/supertux-0.4.0-squirrel.patch 
b/games-arcade/supertux/files/supertux-0.4.0-squirrel.patch
deleted file mode 100644
index 09824425ded..000
--- a/games-arcade/supertux/files/supertux-0.4.0-squirrel.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 supertux-0.4.0.orig/external/squirrel/CMakeLists.txt
-+++ supertux-0.4.0/external/squirrel/CMakeLists.txt
-@@ -65,8 +65,6 @@
- 
- # the squirrel sources are out of our control so don't be too pedantic about
- # them
--SET(CMAKE_CXX_FLAGS "")
--SET(CMAKE_C_FLAGS "")
- 
- ## define a target for building the library
- 
-@@ -82,8 +80,3 @@
- set(LIB_SUBDIR "lib${LIB_SUFFIX}"
-   CACHE STRING "Subdirectory of prefix into which libraries are installed 
(e.g., lib32, lib64)")
- 
--INSTALL(TARGETS squirrel
--RUNTIME DESTINATION bin
--  ARCHIVE DESTINATION ${LIB_SUBDIR}
--  LIBRARY DESTINATION ${LIB_SUBDIR}
--  COMPONENT squirrel)

diff --git a/games-arcade/supertux/files/supertux-0.4.0-tinygettext.patch 
b/games-arcade/supertux/files/supertux-0.4.0-tinygettext.patch
deleted file mode 100644
index 23e572d4419..000
--- a/games-arcade/supertux/files/supertux-0.4.0-tinygettext.patch
+++ /dev/null
@@ -1,50 +0,0 @@
 supertux-0.4.0.orig/external/tinygettext/CMakeLists.txt
-+++ supertux-0.4.0/external/tinygettext/CMakeLists.txt
-@@ -59,7 +59,7 @@
- )
- 
- ## Reveal library type choice to users

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2017-11-13 Thread James Le Cuirot

commit: 23a2b242ff3fd30d138e7310a6c969c69a9cd41a
Author: soredake  krutt  org>
AuthorDate: Fri Nov 10 09:09:51 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Nov 13 22:39:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a2b242

games-arcade/supertux: update HOMEPAGE

Closes: https://github.com/gentoo/gentoo/pull/6164

 games-arcade/supertux/supertux-0.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-arcade/supertux/supertux-0.5.1.ebuild 
b/games-arcade/supertux/supertux-0.5.1.ebuild
index 10893c16355..af91e8b026d 100644
--- a/games-arcade/supertux/supertux-0.5.1.ebuild
+++ b/games-arcade/supertux/supertux-0.5.1.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils flag-o-matic
 MY_P="SuperTux-v${PV}-Source"
 
 DESCRIPTION="A game similar to Super Mario Bros."
-HOMEPAGE="http://supertuxproject.org/;
+HOMEPAGE="https://supertux.org/;
 
SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${MY_P}.tar.gz;
 
 LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2017-10-15 Thread David Seifert

commit: 5353b71e6c6d980eb9bdfe739e380c5aa2c81bcd
Author: David Seifert  gentoo  org>
AuthorDate: Sun Oct 15 23:45:21 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Oct 16 00:07:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5353b71e

games-arcade/supertux: [QA] Add cmake-utils_src_prepare

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 games-arcade/supertux/supertux-0.4.0.ebuild | 6 +-
 games-arcade/supertux/supertux-0.5.0.ebuild | 4 ++--
 games-arcade/supertux/supertux-0.5.1.ebuild | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/games-arcade/supertux/supertux-0.4.0.ebuild 
b/games-arcade/supertux/supertux-0.4.0.ebuild
index a0a22e745f8..10bed6d6419 100644
--- a/games-arcade/supertux/supertux-0.4.0.ebuild
+++ b/games-arcade/supertux/supertux-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,6 +27,10 @@ DEPEND="${RDEPEND}
 
 PATCHES=( 
"${FILESDIR}"/${P}-{obstack,tinygettext,squirrel,desktop,flags,license,icon}.patch
 )
 
+src_prepare() {
+   cmake-utils_src_prepare
+}
+
 src_configure() {
local mycmakeargs=(
-DWERROR=OFF

diff --git a/games-arcade/supertux/supertux-0.5.0.ebuild 
b/games-arcade/supertux/supertux-0.5.0.ebuild
index e28f80941c6..123624a1dae 100644
--- a/games-arcade/supertux/supertux-0.5.0.ebuild
+++ b/games-arcade/supertux/supertux-0.5.0.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
@@ -35,7 +35,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   default
+   cmake-utils_src_prepare
 
# This is not a developer release so switch the logo to the non-dev one.
sed 's@logo_dev@logo@' \

diff --git a/games-arcade/supertux/supertux-0.5.1.ebuild 
b/games-arcade/supertux/supertux-0.5.1.ebuild
index c5627b655ca..10893c16355 100644
--- a/games-arcade/supertux/supertux-0.5.1.ebuild
+++ b/games-arcade/supertux/supertux-0.5.1.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
@@ -35,7 +35,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   default
+   cmake-utils_src_prepare
 
# This is not a developer release so switch the logo to the non-dev one.
sed 's@logo_dev@logo@' \

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2016-11-09 Thread Lars Wendler

commit: fb70b75b01e77e0d66d650d64e9f14999b97a7fb
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Nov  9 14:04:49 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Nov  9 14:05:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb70b75b

games-arcade/supertux: Bump to version 0.5.1

Package-Manager: portage-2.3.2

 games-arcade/supertux/Manifest  |  1 +
 games-arcade/supertux/supertux-0.5.1.ebuild | 67 +
 2 files changed, 68 insertions(+)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index d638673..9109dec 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,2 +1,3 @@
 DIST SuperTux-v0.5.0-Source.tar.gz 90564579 SHA256 
cfae0da40c41532fb414c3b17891c98396b59471fe583a8fc756b96aea61a73b SHA512 
dcd4d361eee34d8ab25e680cec328b0931a001f8ab97d0b40b03291e9214fdb64cc08fbccb81f524e5f6ba9921414bdf58dc29e27ff663a0160f678b6908b783
 WHIRLPOOL 
ffee5ad36bc305e9df5f9e4a31d3ea5bfb6684ee8c91ced44ed072e5262dd2c8e4fff676fd5abc2bdfa6ab942ec5d18b6864ebe0882eb3d0f78213e14fa51eb3
+DIST SuperTux-v0.5.1-Source.tar.gz 90564367 SHA256 
c9dc3b42991ce5c5d0d0cb94e44c4ec2373ad09029940f0e92331e7e9ada0ac5 SHA512 
1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
 WHIRLPOOL 
2be132c1265d119acb24dd900c49f40c2b12cac51646bfb9c970e0b97d030210ce885ac8932815c15a1d67e28cbba8e6a0301eee4becf78cf995668641f18830
 DIST supertux-0.4.0.tar.bz2 79713147 SHA256 
d18dde3c415e619b4bb035e694ffc384be16576250c9df16929d9ec38daff782 SHA512 
66ca63c982b6076847662c187069eb965211439e5dfc628300f2a9bd0d2b4c0f7b53f6e7c2aed263c098cc9b77fedf132e73b1f3b3eacaf5535cae8300262fb5
 WHIRLPOOL 
12551b655f0459a37d3b91b1eff058ec383df34c9f3c29c1e8a63c070c12b32ec798b772053cd08b11d32b612bab1188b69678e71585279e94ad380052076f64

diff --git a/games-arcade/supertux/supertux-0.5.1.ebuild 
b/games-arcade/supertux/supertux-0.5.1.ebuild
new file mode 100644
index ..d018794
--- /dev/null
+++ b/games-arcade/supertux/supertux-0.5.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils flag-o-matic
+
+MY_P="SuperTux-v${PV}-Source"
+
+DESCRIPTION="A game similar to Super Mario Bros."
+HOMEPAGE="http://supertuxproject.org/;
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="dev-games/physfs
+   dev-libs/boost:=
+   media-libs/glew:=
+   virtual/opengl
+   media-libs/libvorbis
+   media-libs/openal
+   >=media-libs/libsdl2-2.0.1[joystick,video]
+   >=media-libs/sdl2-image-2.0.0[png,jpeg]
+   >=net-misc/curl-7.21.7"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.4.0-{desktop,license,icon}.patch
+   "${FILESDIR}"/${PN}-0.5.0-{obstack,tinygettext}.patch
+)
+
+src_prepare() {
+   default
+
+   # This is not a developer release so switch the logo to the non-dev one.
+   sed 's@logo_dev@logo@' \
+   -i data/images/objects/logo/logo.sprite || die
+}
+
+src_configure() {
+   append-cxxflags -std=c++11
+   local mycmakeargs=(
+   -DWERROR=OFF
+   -DINSTALL_SUBDIR_BIN=bin
+   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
+   -DINSTALL_SUBDIR_SHARE=share/${PN}2
+   -DENABLE_SQDBG="$(usex debug)"
+   -DUSE_DEBUG="$(usex debug)"
+   -DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is 
still required.
+   )
+
+   cmake-utils_src_configure
+}
+
+src_compile() {
+   cmake-utils_src_compile
+}
+
+src_install() {
+   cmake-utils_src_install
+}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2016-09-27 Thread Lars Wendler

commit: fde5a5b1a939c074227d7e0830991566d7df316e
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Sep 27 10:47:34 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Sep 27 11:55:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde5a5b1

games-arcade/supertux: Bump to version 0.5.0

Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest |  1 +
 .../supertux/files/supertux-0.4.0-desktop.patch|  4 +-
 .../supertux/files/supertux-0.4.0-flags.patch  |  4 +-
 .../supertux/files/supertux-0.4.0-icon.patch   |  4 +-
 .../supertux/files/supertux-0.4.0-license.patch|  4 +-
 .../supertux/files/supertux-0.5.0-obstack.patch| 19 ++
 .../files/supertux-0.5.0-tinygettext.patch | 30 ++
 games-arcade/supertux/supertux-0.5.0.ebuild| 67 ++
 8 files changed, 125 insertions(+), 8 deletions(-)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 30519d3..d638673 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1 +1,2 @@
+DIST SuperTux-v0.5.0-Source.tar.gz 90564579 SHA256 
cfae0da40c41532fb414c3b17891c98396b59471fe583a8fc756b96aea61a73b SHA512 
dcd4d361eee34d8ab25e680cec328b0931a001f8ab97d0b40b03291e9214fdb64cc08fbccb81f524e5f6ba9921414bdf58dc29e27ff663a0160f678b6908b783
 WHIRLPOOL 
ffee5ad36bc305e9df5f9e4a31d3ea5bfb6684ee8c91ced44ed072e5262dd2c8e4fff676fd5abc2bdfa6ab942ec5d18b6864ebe0882eb3d0f78213e14fa51eb3
 DIST supertux-0.4.0.tar.bz2 79713147 SHA256 
d18dde3c415e619b4bb035e694ffc384be16576250c9df16929d9ec38daff782 SHA512 
66ca63c982b6076847662c187069eb965211439e5dfc628300f2a9bd0d2b4c0f7b53f6e7c2aed263c098cc9b77fedf132e73b1f3b3eacaf5535cae8300262fb5
 WHIRLPOOL 
12551b655f0459a37d3b91b1eff058ec383df34c9f3c29c1e8a63c070c12b32ec798b772053cd08b11d32b612bab1188b69678e71585279e94ad380052076f64

diff --git a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch 
b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
index b0e26e7..74a0872 100644
--- a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
+++ b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
@@ -1,5 +1,5 @@
 supertux2.desktop.orig
-+++ supertux2.desktop
+--- a/supertux2.desktop
 b/supertux2.desktop
 @@ -35,7 +35,7 @@
  Comment[pt]=Joga este clássico de plataformas 2D
  Comment[pt_BR]=Encarne o pinguin Tux neste jogo inspirado em clássicos de 
Pular

diff --git a/games-arcade/supertux/files/supertux-0.4.0-flags.patch 
b/games-arcade/supertux/files/supertux-0.4.0-flags.patch
index 97e3e74..a09176c 100644
--- a/games-arcade/supertux/files/supertux-0.4.0-flags.patch
+++ b/games-arcade/supertux/files/supertux-0.4.0-flags.patch
@@ -1,5 +1,5 @@
 CMakeLists.txt.orig
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
 b/CMakeLists.txt
 @@ -329,7 +329,7 @@
  endif(COMPILER_SUPPORTS_CXX11)
  

diff --git a/games-arcade/supertux/files/supertux-0.4.0-icon.patch 
b/games-arcade/supertux/files/supertux-0.4.0-icon.patch
index 14552f2..66be0eb 100644
--- a/games-arcade/supertux/files/supertux-0.4.0-icon.patch
+++ b/games-arcade/supertux/files/supertux-0.4.0-icon.patch
@@ -1,5 +1,5 @@
 CMakeLists.txt.orig
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
 b/CMakeLists.txt
 @@ -571,7 +571,7 @@
  
SET(APPS 
"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR_BIN}/supertux2")

diff --git a/games-arcade/supertux/files/supertux-0.4.0-license.patch 
b/games-arcade/supertux/files/supertux-0.4.0-license.patch
index 37558aa..e35f85c 100644
--- a/games-arcade/supertux/files/supertux-0.4.0-license.patch
+++ b/games-arcade/supertux/files/supertux-0.4.0-license.patch
@@ -1,5 +1,5 @@
 CMakeLists.txt.orig
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
 b/CMakeLists.txt
 @@ -578,7 +578,7 @@
  
  INSTALL(TARGETS supertux2_exe DESTINATION ${INSTALL_SUBDIR_BIN})

diff --git a/games-arcade/supertux/files/supertux-0.5.0-obstack.patch 
b/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
new file mode 100644
index ..1b05369
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
@@ -0,0 +1,19 @@
+--- supertux-0.5.0/CMakeLists.txt
 supertux-0.5.0/CMakeLists.txt
+@@ -382,7 +382,6 @@
+ include_directories(${CMAKE_BINARY_DIR}/)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
+ include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
+-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
+ include_directories(SYSTEM 
${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
+ 
+ IF(WIN32)
+@@ -392,7 +391,7 @@
+ 
+ ## Build list of sources for supertux binary
+ 
+-FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
external/obstack/*.c external/findlocale/findlocale.c)
++FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
external/findlocale/findlocale.c)
+ 
+ FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/, games-arcade/supertux/files/

2016-04-09 Thread Michael Sterrett

commit: 38066468c4fc0caf85dbc1e6e28e913367224007
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sun Apr 10 03:19:34 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sun Apr 10 03:19:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38066468

games-arcade/supertux: clean old; drops support for ppc and sparc

Package-Manager: portage-2.2.26

 games-arcade/supertux/Manifest |  1 -
 .../supertux/files/supertux-0.1.3-desktop.patch| 21 ---
 .../supertux/files/supertux-0.1.3-gcc41.patch  | 11 --
 .../supertux/files/supertux-0.1.3-ndebug.patch | 14 ---
 games-arcade/supertux/supertux-0.1.3.ebuild| 43 --
 5 files changed, 90 deletions(-)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index a24f26b..30519d3 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,2 +1 @@
-DIST supertux-0.1.3.tar.bz2 6715265 SHA256 
0092588351776626955339caaa62d12ce5954bb80c5f6952f60a122f53c2ad97 SHA512 
75848583f9f9b9d0f36fec77812501875420fde8befe1ff9ac4ea7613f4d9464b2eb460c2ed89b4dc31e697fbb449a5431c72675e2820d13f5c42653dc07ad98
 WHIRLPOOL 
bb8998845bee7f33a7aff94109d9767d000c89df6c670a1ccb85c4e9158a8ce6c4064f89587b9ea40d9ba1a854b9f5bba82ccc7dcac6dedcdb337cfaa1777898
 DIST supertux-0.4.0.tar.bz2 79713147 SHA256 
d18dde3c415e619b4bb035e694ffc384be16576250c9df16929d9ec38daff782 SHA512 
66ca63c982b6076847662c187069eb965211439e5dfc628300f2a9bd0d2b4c0f7b53f6e7c2aed263c098cc9b77fedf132e73b1f3b3eacaf5535cae8300262fb5
 WHIRLPOOL 
12551b655f0459a37d3b91b1eff058ec383df34c9f3c29c1e8a63c070c12b32ec798b772053cd08b11d32b612bab1188b69678e71585279e94ad380052076f64

diff --git a/games-arcade/supertux/files/supertux-0.1.3-desktop.patch 
b/games-arcade/supertux/files/supertux-0.1.3-desktop.patch
deleted file mode 100644
index 2fd7742..000
--- a/games-arcade/supertux/files/supertux-0.1.3-desktop.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 supertux.desktop.orig
-+++ supertux.desktop
-@@ -1,7 +1,6 @@
- [Desktop Entry]
- Type=Application
- Version=1.0
--Encoding=UTF-8
- Name=SuperTux
- Name[en]=SuperTux
- Name[de]=SuperTux
-@@ -14,8 +13,8 @@
- Comment[en]=A Super Mario inspired penguin platform game
- Comment[de]=Ein von Super Mario inspiriertes Pinguin Jump Spiel
- Comment[cs]=Plošinovka inspirovaná SuperMariem s tučňákem Tuxem v hlavní roli
--Icon=supertux.png
-+Icon=supertux
- Exec=supertux
- Terminal=false
- StartupNotify=false
--Categories=Application;Game;ArcadeGame
-+Categories=Game;ArcadeGame;

diff --git a/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch 
b/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch
deleted file mode 100644
index 449dc3b..000
--- a/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 supertux-0.1.3.orig/src/menu.h
-+++ supertux-0.1.3/src/menu.h
-@@ -207,7 +207,7 @@
- 
-   bool isToggled(int id);
- 
--  void Menu::get_controlfield_key_into_input(MenuItem *item);
-+  void get_controlfield_key_into_input(MenuItem *item);
- 
-   void draw   ();
-   void draw_item(int index, int menu_width, int menu_height);

diff --git a/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch 
b/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch
deleted file mode 100644
index 197a518..000
--- a/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
 supertux-0.1.3.orig/src/tile.cpp
-+++ supertux-0.1.3/src/tile.cpp
-@@ -99,7 +99,11 @@ void TileManager::load_tileset(std::stri
-   tile->anim_speed = 25;
- 
-   LispReader reader(lisp_cdr(element));
-+  #ifdef NDEBUG
-+  void(reader.read_int("id",  >id));
-+  #else
-   assert(reader.read_int("id",  >id));
-+  #endif
-   reader.read_bool("solid", >solid);
-   reader.read_bool("brick", >brick);
-   reader.read_bool("ice",   >ice);

diff --git a/games-arcade/supertux/supertux-0.1.3.ebuild 
b/games-arcade/supertux/supertux-0.1.3.ebuild
deleted file mode 100644
index 632c953..000
--- a/games-arcade/supertux/supertux-0.1.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A game similar to Super Mario Bros"
-HOMEPAGE="http://super-tux.sourceforge.net;
-SRC_URI="https://supertux.googlecode.com/files/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="opengl"
-
-DEPEND="media-libs/libsdl[joystick]
-   media-libs/sdl-image[png,jpeg]
-   media-libs/sdl-mixer[mod,vorbis]
-   x11-libs/libXt"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-   epatch \
-   "${FILESDIR}"/${P}-gcc41.patch \
-   "${FILESDIR}"/${P}-ndebug.patch \
-   "${FILESDIR}"/${P}-desktop.patch
-}
-

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

2016-01-23 Thread Agostino Sarubbo

commit: 6014a6f96587bb22ca4a817bb22c973d410096b5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jan 23 16:57:59 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jan 23 16:59:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6014a6f9

games-arcade/supertux: amd64 stable wrt bug #572622

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-arcade/supertux/supertux-0.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-arcade/supertux/supertux-0.4.0.ebuild 
b/games-arcade/supertux/supertux-0.4.0.ebuild
index 4358068..210b61b 100644
--- a/games-arcade/supertux/supertux-0.4.0.ebuild
+++ b/games-arcade/supertux/supertux-0.4.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="dev-games/physfs

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/, games-arcade/supertux/files/

2015-12-22 Thread Michael Sterrett

commit: a6f2ea090989ec0dd8703c6fdd6a6f88a45bf1a3
Author: Michael Sterrett  gentoo  org>
AuthorDate: Wed Dec 23 04:30:13 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Wed Dec 23 04:30:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6f2ea09

version bump (bug #564076)

Package-Manager: portage-2.2.24

 games-arcade/supertux/Manifest |  1 +
 .../supertux/files/supertux-0.1.3-desktop.patch|  4 +-
 .../supertux/files/supertux-0.1.3-gcc41.patch  |  5 +--
 .../supertux/files/supertux-0.1.3-ndebug.patch |  2 -
 .../supertux/files/supertux-0.4.0-desktop.patch| 11 +
 .../supertux/files/supertux-0.4.0-flags.patch  | 32 ++
 .../supertux/files/supertux-0.4.0-icon.patch   | 11 +
 .../supertux/files/supertux-0.4.0-license.patch| 11 +
 .../supertux/files/supertux-0.4.0-obstack.patch| 19 
 .../supertux/files/supertux-0.4.0-squirrel.patch   | 20 +
 .../files/supertux-0.4.0-tinygettext.patch | 50 ++
 games-arcade/supertux/supertux-0.4.0.ebuild| 50 ++
 12 files changed, 209 insertions(+), 7 deletions(-)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index f487be0..a24f26b 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1 +1,2 @@
 DIST supertux-0.1.3.tar.bz2 6715265 SHA256 
0092588351776626955339caaa62d12ce5954bb80c5f6952f60a122f53c2ad97 SHA512 
75848583f9f9b9d0f36fec77812501875420fde8befe1ff9ac4ea7613f4d9464b2eb460c2ed89b4dc31e697fbb449a5431c72675e2820d13f5c42653dc07ad98
 WHIRLPOOL 
bb8998845bee7f33a7aff94109d9767d000c89df6c670a1ccb85c4e9158a8ce6c4064f89587b9ea40d9ba1a854b9f5bba82ccc7dcac6dedcdb337cfaa1777898
+DIST supertux-0.4.0.tar.bz2 79713147 SHA256 
d18dde3c415e619b4bb035e694ffc384be16576250c9df16929d9ec38daff782 SHA512 
66ca63c982b6076847662c187069eb965211439e5dfc628300f2a9bd0d2b4c0f7b53f6e7c2aed263c098cc9b77fedf132e73b1f3b3eacaf5535cae8300262fb5
 WHIRLPOOL 
12551b655f0459a37d3b91b1eff058ec383df34c9f3c29c1e8a63c070c12b32ec798b772053cd08b11d32b612bab1188b69678e71585279e94ad380052076f64

diff --git a/games-arcade/supertux/files/supertux-0.1.3-desktop.patch 
b/games-arcade/supertux/files/supertux-0.1.3-desktop.patch
index 440881d..2fd7742 100644
--- a/games-arcade/supertux/files/supertux-0.1.3-desktop.patch
+++ b/games-arcade/supertux/files/supertux-0.1.3-desktop.patch
@@ -1,5 +1,5 @@
 supertux.desktop.orig  2010-11-07 23:29:26.058571005 -0500
-+++ supertux.desktop   2010-11-07 23:30:09.457350053 -0500
+--- supertux.desktop.orig
 supertux.desktop
 @@ -1,7 +1,6 @@
  [Desktop Entry]
  Type=Application

diff --git a/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch 
b/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch
index 5bcf537..449dc3b 100644
--- a/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch
+++ b/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch
@@ -1,6 +1,5 @@
-diff -uNr supertux-0.1.3.orig/src/menu.h supertux-0.1.3/src/menu.h
 supertux-0.1.3.orig/src/menu.h 2005-06-21 23:16:07.0 +0200
-+++ supertux-0.1.3/src/menu.h  2006-03-19 15:49:55.277266712 +0100
+--- supertux-0.1.3.orig/src/menu.h
 supertux-0.1.3/src/menu.h
 @@ -207,7 +207,7 @@
  
bool isToggled(int id);

diff --git a/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch 
b/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch
index 3a302d5..197a518 100644
--- a/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch
+++ b/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch
@@ -1,5 +1,3 @@
-Index: supertux-0.1.3/src/tile.cpp
-===
 --- supertux-0.1.3.orig/src/tile.cpp
 +++ supertux-0.1.3/src/tile.cpp
 @@ -99,7 +99,11 @@ void TileManager::load_tileset(std::stri

diff --git a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch 
b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
new file mode 100644
index 000..b0e26e7
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
@@ -0,0 +1,11 @@
+--- supertux2.desktop.orig
 supertux2.desktop
+@@ -35,7 +35,7 @@
+ Comment[pt]=Joga este clássico de plataformas 2D
+ Comment[pt_BR]=Encarne o pinguin Tux neste jogo inspirado em clássicos de 
Pular
+ Comment[hu]=Egy klasszikus 2D-s oldalnézeti játék
+-Icon=supertux.png
++Icon=supertux
+ Exec=supertux2
+ Terminal=false
+ StartupNotify=false

diff --git a/games-arcade/supertux/files/supertux-0.4.0-flags.patch 
b/games-arcade/supertux/files/supertux-0.4.0-flags.patch
new file mode 100644
index 000..97e3e74
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.4.0-flags.patch
@@ -0,0 +1,32 @@
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -329,7 +329,7 @@
+ endif(COMPILER_SUPPORTS_CXX11)
+ 
+ 
+-IF(CMAKE_COMPILER_IS_GNUCC)
++IF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS)
+   SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Debug

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/, games-arcade/supertux/files/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/, games-arcade/supertux/files/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/, games-arcade/supertux/files/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/, games-arcade/supertux/files/

31 matches

Site Navigation

Mail list logo

Footer information