[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2024-03-18 Thread Sam James
commit: cc04e9b38ec9b7b714f6f5d33e3c6f262d38ddea
Author: Eli Schwartz  gmail  com>
AuthorDate: Tue Mar 19 05:54:38 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 19 06:05:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc04e9b3

games-action/supertuxkart: mark as LTO-unsafe, strict-aliasing unsafe

Includes bundled sci-physics/bullet which has its own bug...

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

 games-action/supertuxkart/supertuxkart-1.3.ebuild| 15 +--
 games-action/supertuxkart/supertuxkart-1.4-r1.ebuild | 15 +--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/games-action/supertuxkart/supertuxkart-1.3.ebuild 
b/games-action/supertuxkart/supertuxkart-1.3.ebuild
index 54504fdfec32..d3a6aa690718 100644
--- a/games-action/supertuxkart/supertuxkart-1.3.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake desktop xdg
+inherit cmake desktop flag-o-matic xdg
 
 MY_P="SuperTuxKart-${PV}-src"
 DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
@@ -63,6 +63,17 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=strict-aliasing
+   # https://bugs.gentoo.org/858521
+   # https://github.com/supertuxkart/stk-code/issues/5035
+   #
+   # The issue is bundled code from sci-physics/bullet which is unlikely to
+   # be debundled.
+   #
+   # Do not trust with LTO either.
+   append-flags -fno-strict-aliasing
+   filter-lto
+
local mycmakeargs=(
-DUSE_SQLITE3=$(usex sqlite)
-DUSE_SYSTEM_ANGELSCRIPT=ON

diff --git a/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild 
b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
index 7b2fcde8f196..85252331bd59 100644
--- a/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake desktop xdg
+inherit cmake desktop flag-o-matic xdg
 
 MY_P="SuperTuxKart-${PV}-src"
 DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
@@ -59,6 +59,17 @@ PATCHES=(
 )
 
 src_configure() {
+   # -Werror=strict-aliasing
+   # https://bugs.gentoo.org/858521
+   # https://github.com/supertuxkart/stk-code/issues/5035
+   #
+   # The issue is bundled code from sci-physics/bullet which is unlikely to
+   # be debundled.
+   #
+   # Do not trust with LTO either.
+   append-flags -fno-strict-aliasing
+   filter-lto
+
local mycmakeargs=(
-DUSE_SQLITE3=$(usex sqlite)
-DUSE_SYSTEM_ANGELSCRIPT=ON



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2023-10-13 Thread WANG Xuerui
commit: b4ee4d90099d3b4c748b157e303189f4c4e00872
Author: WANG Xuerui  gentoo  org>
AuthorDate: Fri Oct 13 10:45:20 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Fri Oct 13 10:45:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ee4d90

games-action/supertuxkart: keyword 1.4-r1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 games-action/supertuxkart/supertuxkart-1.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild 
b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
index 8cf641688c37..7b2fcde8f196 100644
--- a/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~loong ~ppc64 ~x86"
 IUSE="debug nettle recorder sqlite wiimote"
 
 # - Don't unbundle irrlicht and bullet



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2023-01-29 Thread James Le Cuirot
commit: e34919f8297fec84d7fa47269528feee2704dc5e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jan 29 10:50:54 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jan 29 10:50:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e34919f8

games-action/supertuxkart: Drop unused CMake options from 1.3

1.4 was already fixed.

Closes: https://bugs.gentoo.org/830619
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/supertuxkart/supertuxkart-1.3.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/games-action/supertuxkart/supertuxkart-1.3.ebuild 
b/games-action/supertuxkart/supertuxkart-1.3.ebuild
index e262058aa7d1..54504fdfec32 100644
--- a/games-action/supertuxkart/supertuxkart-1.3.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.3.ebuild
@@ -67,11 +67,9 @@ src_configure() {
-DUSE_SQLITE3=$(usex sqlite)
-DUSE_SYSTEM_ANGELSCRIPT=ON
-DUSE_SYSTEM_ENET=ON
-   -DUSE_SYSTEM_GLEW=ON
-DUSE_SYSTEM_SQUISH=OFF
-DUSE_SYSTEM_WIIUSE=OFF
-DUSE_IPV6=OFF # not supported by system enet
-   -DOpenGL_GL_PREFERENCE=GLVND
-DUSE_CRYPTO_OPENSSL=$(usex nettle no yes)
-DBUILD_RECORDER=$(usex recorder)
-DUSE_WIIUSE=$(usex wiimote)



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2023-01-27 Thread Sam James
commit: f7a47b020609f8fedaa6286396c94dcbe45ae966
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 28 04:03:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 28 05:10:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a47b02

games-action/supertuxkart: make vulkan unconditional for now

Fixed in next release upstream.

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

 games-action/supertuxkart/metadata.xml|  1 -
 .../{supertuxkart-1.4.ebuild => supertuxkart-1.4-r1.ebuild}   | 11 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/games-action/supertuxkart/metadata.xml 
b/games-action/supertuxkart/metadata.xml
index 2e74607fa408..28d5e6b38a19 100644
--- a/games-action/supertuxkart/metadata.xml
+++ b/games-action/supertuxkart/metadata.xml
@@ -9,7 +9,6 @@
Use dev-libs/nettle crypto 
backend
Enable recording with 
media-libs/libopenglrecorder
Record IP bans, statistics in server mode 
with dev-db/sqlite
-   Enable support for Vulkan
Support for wiimote input devices



diff --git a/games-action/supertuxkart/supertuxkart-1.4.ebuild 
b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
similarity index 89%
rename from games-action/supertuxkart/supertuxkart-1.4.ebuild
rename to games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
index 495e18a9ae69..8cf641688c37 100644
--- a/games-action/supertuxkart/supertuxkart-1.4.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
@@ -15,12 +15,14 @@ SRC_URI="
 
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="debug nettle recorder sqlite vulkan wiimote"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug nettle recorder sqlite wiimote"
 
-# Don't unbundle irrlicht and bullet
+# - Don't unbundle irrlicht and bullet
 # both are modified and system versions will break the game
 # https://sourceforge.net/p/irrlicht/feature-requests/138/
+# - For >1.4, restore USE=vulkan and make shaderc dep optional,
+# and pass -DNO_SHADERC to cmake.
 RDEPEND="
dev-cpp/libmcpp
dev-libs/angelscript:=
@@ -31,6 +33,7 @@ RDEPEND="
media-libs/libsdl2[opengl,video]
media-libs/libvorbis
media-libs/openal
+   media-libs/shaderc
net-libs/enet:1.3=
net-misc/curl
sys-libs/zlib
@@ -39,7 +42,6 @@ RDEPEND="
!nettle? ( >=dev-libs/openssl-1.0.1d:= )
recorder? ( media-libs/libopenglrecorder )
sqlite? ( dev-db/sqlite:3 )
-   vulkan? ( media-libs/shaderc )
wiimote? ( net-wireless/bluez )
 "
 DEPEND="${RDEPEND}"
@@ -67,7 +69,6 @@ src_configure() {
-DUSE_CRYPTO_OPENSSL=$(usex nettle no yes)
-DBUILD_RECORDER=$(usex recorder)
-DUSE_WIIUSE=$(usex wiimote)
-   -DNO_SHADERC=$(usex !vulkan)
-DSTK_INSTALL_BINARY_DIR=bin
-DSTK_INSTALL_DATA_DIR=share/${PN}
-DBUILD_SHARED_LIBS=OFF # build bundled libsquish as static 
library



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/, games-action/supertuxkart/

2022-08-11 Thread Ionen Wolkens
commit: b70f4edfd59c00ca8f5fec6eea004bee0657ae4c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 11 05:49:50 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 11 07:37:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b70f4edf

games-action/supertuxkart: drop 1.2

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

 games-action/supertuxkart/Manifest |   1 -
 .../supertuxkart-1.2-irrlicht-system-libs.patch|  67 -
 .../files/supertuxkart-1.2-new-sdl.patch   | 106 -
 games-action/supertuxkart/supertuxkart-1.2.ebuild  |  91 --
 4 files changed, 265 deletions(-)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index c6449222002c..df717f644ffd 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,3 +1,2 @@
-DIST SuperTuxKart-1.2-src.tar.xz 614569164 BLAKE2B 
5bdaa8dcac12ab6c399e6f0fc3121906070f4cd5c58dba6ccf04229d92b9b21d87a43662f39fc29ac1528ce429aebea87934fa8a180a0933385704f5a43cd6f7
 SHA512 
bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835
 DIST SuperTuxKart-1.3-src.tar.xz 627753500 BLAKE2B 
3ffc86edf80adb27cd17a6ba796fb14d0660a1c14ff21c7908e5f965609c6f6a6b40270a21690cd1318d1003e07d90b4180c292252b1731d4cd6292fe12e6086
 SHA512 
42664390c844ebca0be9b2f2aeb3c9197c0c79a7c604707b32e81ef41aec10fa36f5950f06e1540ea6f75f6c7f8a8f7f80aeda48de3d101d991420f5b20530ed
 DIST supertuxkart.png 4435 BLAKE2B 
b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80
 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda

diff --git 
a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch 
b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
deleted file mode 100644
index f9681733cfb1..
--- 
a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Subject: [PATCH] debian/use-system-libs
-
-Path to build irrlicht using the system libraries for png,zlib and
-jpeg as well as the glext family of header files.
-
-Signed-off-by: Christoph Egger 
- #ifdef _IRR_OPENGL_USE_EXTPOINTER_
- #define GLX_GLXEXT_PROTOTYPES
--#include "glxext.h"
-+#include 
- #endif
- #endif
- 
 a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
-+++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
-@@ -24,7 +24,7 @@
-   #define NO_SDL_GLEXT
-   #include 
-   #include 
--  #include "glext.h"
-+  #include 
- #elif defined(_IRR_WINDOWS_API_)
-   // include windows headers for HWND
-   #define WIN32_LEAN_AND_MEAN
-@@ -34,7 +34,7 @@
-   #endif
-   #include 
-   #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--  #include "glext.h"
-+  #include 
-   #endif
-   #include "wglext.h"
- 
-@@ -49,7 +49,7 @@
-   #endif
-   #include 
-   #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--  #include "glext.h"
-+  #include 
-   #endif
- #endif
- 
 a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
-+++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
-@@ -12,7 +12,7 @@
-   #define WIN32_LEAN_AND_MEAN
-   #include 
-   #include 
--  #include "glext.h"
-+  #include 
- #else
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-   #define GL_GLEXT_LEGACY 1
-@@ -26,7 +26,7 @@
-   #include 
- #endif
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--  #include "glext.h"
-+  #include 
- #endif
- #endif
- 

diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch 
b/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch
deleted file mode 100644
index 973c75d010fb..
--- a/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 61833c9c26da5520f2eaa02f2458971ba07f2aad Mon Sep 17 00:00:00 2001
-From: Benau 
-Date: Sun, 29 Nov 2020 12:42:11 +0800
-Subject: [PATCH] Fix compilation with latest SDL
-

- src/input/gamepad_config.cpp | 55 ++--
- 1 file changed, 27 insertions(+), 28 deletions(-)
-
-diff --git a/src/input/gamepad_config.cpp b/src/input/gamepad_config.cpp
-index 7c6f632099..c060e7a5a7 100644
 a/src/input/gamepad_config.cpp
-+++ b/src/input/gamepad_config.cpp
-@@ -32,8 +32,7 @@
- #include "input/sdl_controller.hpp"
- #include 
- 
--static_assert(SDL_CONTROLLER_BUTTON_MAX - 1 == 
SDL_CONTROLLER_BUTTON_DPAD_RIGHT, "non continous name");
--enum AxisWithDirection
-+enum AxisWithDirection : unsigned
- {
- SDL_CONTROLLER_AXIS_LEFTX_RIGHT = SDL_CONTROLLER_BUTTON_MAX,
- SDL_CONTROLLER_AXIS_LEFTX_LEFT,
-@@ -140,56 +139,56 @@ void GamepadConfig::setDefaultBind

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2022-07-23 Thread Sam James
commit: 22c3c74e5f6b325f1fa277f4f11e98e426730991
Author: matoro  users  noreply  github  com>
AuthorDate: Fri Jul 22 18:55:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 23 19:44:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c3c74e

games-action/supertuxkart: Keyword 1.3 arm64, #811420

Closes: https://github.com/gentoo/gentoo/pull/26524
Signed-off-by: Sam James  gentoo.org>

 games-action/supertuxkart/supertuxkart-1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/supertuxkart/supertuxkart-1.3.ebuild 
b/games-action/supertuxkart/supertuxkart-1.3.ebuild
index 38c265b6f264..e262058aa7d1 100644
--- a/games-action/supertuxkart/supertuxkart-1.3.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.3.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/${PN}/stk-code/releases/download/${PV}/${MY_P}.tar.x
 
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="debug nettle recorder sqlite wiimote"
 
 # don't unbundle irrlicht and bullet



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2022-06-08 Thread Jakov Smolić
commit: 2cbeac7caac95c514003916226952421df42576d
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Jun  8 07:56:30 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Jun  8 07:56:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cbeac7c

games-action/supertuxkart: Keyword 1.3 ppc64, #849506

Signed-off-by: Jakov Smolić  gentoo.org>

 games-action/supertuxkart/supertuxkart-1.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-action/supertuxkart/supertuxkart-1.3.ebuild 
b/games-action/supertuxkart/supertuxkart-1.3.ebuild
index 53f7fa23459d..38c265b6f264 100644
--- a/games-action/supertuxkart/supertuxkart-1.3.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/${PN}/stk-code/releases/download/${PV}/${MY_P}.tar.x
 
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 IUSE="debug nettle recorder sqlite wiimote"
 
 # don't unbundle irrlicht and bullet



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2022-04-10 Thread James Le Cuirot
commit: 7961a36c766ea4efa34e742fb5aea6b6c7b31d35
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Apr 10 10:57:59 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Apr 10 10:57:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7961a36c

games-action/supertuxkart: Depend on libsdl2[opengl,video] USE flags

Closes: https://bugs.gentoo.org/837185
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/supertuxkart/supertuxkart-1.2.ebuild | 2 +-
 games-action/supertuxkart/supertuxkart-1.3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-action/supertuxkart/supertuxkart-1.2.ebuild 
b/games-action/supertuxkart/supertuxkart-1.2.ebuild
index e553eaa31605..ef10342df4ea 100644
--- a/games-action/supertuxkart/supertuxkart-1.2.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.2.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
media-libs/glew:0=
media-libs/harfbuzz:=
media-libs/libpng:0=
-   media-libs/libsdl2
+   media-libs/libsdl2[opengl,video]
media-libs/libvorbis
media-libs/openal
net-libs/enet:1.3=

diff --git a/games-action/supertuxkart/supertuxkart-1.3.ebuild 
b/games-action/supertuxkart/supertuxkart-1.3.ebuild
index 59bc12a50831..53f7fa23459d 100644
--- a/games-action/supertuxkart/supertuxkart-1.3.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.3.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
media-libs/glew:0=
media-libs/harfbuzz:=
media-libs/libpng:0=
-   media-libs/libsdl2
+   media-libs/libsdl2[opengl,video]
media-libs/libvorbis
media-libs/openal
net-libs/enet:1.3=



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/

2021-11-01 Thread Conrad Kostecki
commit: b9eaec2d2c18dc7c9131963f9f2c19b766cb5e61
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Nov  1 16:26:50 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Nov  1 17:55:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9eaec2d

games-action/supertuxkart: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/22786
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/supertuxkart-1.1-fix-buildsystem.patch | 20 
 1 file changed, 20 deletions(-)

diff --git 
a/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch 
b/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch
deleted file mode 100644
index 394a1963199..000
--- a/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
-index 92a881c81..1371fdf11 100644
 a/lib/irrlicht/CMakeLists.txt
-+++ b/lib/irrlicht/CMakeLists.txt
-@@ -94,15 +94,6 @@
- if(WIN32)
- add_definitions(-D_IRR_STATIC_LIB_)
- add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
--else()
--set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fstrict-aliasing")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3 
-fstrict-aliasing")
--if(CMAKE_COMPILER_IS_GNUCC)
--set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
--endif()
--if(CMAKE_COMPILER_IS_GNUCXX)
--set(CMAKE_CXX_FLAGS   "${CMAKE_CXX_FLAGS} -fexpensive-optimizations")
--endif()
- endif()
-
- if(USE_GLES2)



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/

2021-10-29 Thread James Le Cuirot
commit: 3ee8ba23ed1b7768f1501a946bc9a18b9bbd7dc3
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Oct 29 22:40:32 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Oct 29 22:40:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee8ba23

games-action/supertuxkart: Drop old 1.1

Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/supertuxkart/Manifest |  1 -
 .../supertuxkart-0.9.3-irrlicht-system-libs.patch  | 56 -
 games-action/supertuxkart/supertuxkart-1.1.ebuild  | 91 --
 3 files changed, 148 deletions(-)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index cf24edce24e..c6449222002 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,4 +1,3 @@
 DIST SuperTuxKart-1.2-src.tar.xz 614569164 BLAKE2B 
5bdaa8dcac12ab6c399e6f0fc3121906070f4cd5c58dba6ccf04229d92b9b21d87a43662f39fc29ac1528ce429aebea87934fa8a180a0933385704f5a43cd6f7
 SHA512 
bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835
 DIST SuperTuxKart-1.3-src.tar.xz 627753500 BLAKE2B 
3ffc86edf80adb27cd17a6ba796fb14d0660a1c14ff21c7908e5f965609c6f6a6b40270a21690cd1318d1003e07d90b4180c292252b1731d4cd6292fe12e6086
 SHA512 
42664390c844ebca0be9b2f2aeb3c9197c0c79a7c604707b32e81ef41aec10fa36f5950f06e1540ea6f75f6c7f8a8f7f80aeda48de3d101d991420f5b20530ed
-DIST supertuxkart-1.1-src.tar.xz 616739152 BLAKE2B 
a4dd9ec0a8ee158306dc902d3de363b68e7a317800df1b36339843521019df91c0713b74bdef8dc06b40bee57285237408a17b539c7bd7298cd3ef3deaf99fda
 SHA512 
81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804
 DIST supertuxkart.png 4435 BLAKE2B 
b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80
 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda

diff --git 
a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch 
b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch
deleted file mode 100644
index ce7ce63fa66..000
--- 
a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Subject: [PATCH] debian/use-system-libs
-
-Path to build irrlicht using the system libraries for png,zlib and
-jpeg as well as the glext family of header files.
-
-Signed-off-by: Christoph Egger 
-   #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--  #include "glext.h"
-+  #include 
-   #endif
-   #include "wglext.h"
- 
-@@ -36,7 +36,7 @@
-   #endif
-   #include 
-   #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--  #include "glext.h"
-+  #include 
-   #endif
- #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && 
!defined(_IRR_COMPILE_WITH_X11_DEVICE_)
-   #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-@@ -50,7 +50,7 @@
-   #include 
-   #include 
- typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
--  #include "glext.h"
-+  #include 
- #else
-   #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-   #define GL_GLEXT_LEGACY 1
 a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
-+++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
-@@ -12,7 +12,7 @@
-   #define WIN32_LEAN_AND_MEAN
-   #include 
-   #include 
--  #include "glext.h"
-+  #include 
- #else
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-   #define GL_GLEXT_LEGACY 1
-@@ -25,7 +25,7 @@
-   #include 
- #endif
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--  #include "glext.h"
-+  #include 
- #endif
- #endif
- 

diff --git a/games-action/supertuxkart/supertuxkart-1.1.ebuild 
b/games-action/supertuxkart/supertuxkart-1.1.ebuild
deleted file mode 100644
index 1b75dbc88d8..000
--- a/games-action/supertuxkart/supertuxkart-1.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
-HOMEPAGE="https://supertuxkart.net/";
-SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz
-   mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nettle recorder wiimote"
-
-# don't unbundle irrlicht and bullet
-# both are modified and system versions will break the game
-# https://sourceforge.net/p/irrlicht/feature-requests/138/
-
-RDEPEND="
-   dev-libs/angelscript:=
-   dev-libs/fribidi
-   media-libs/freetype:2
-   media-libs/glew:0=
-   media-libs/h

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/

2021-10-29 Thread James Le Cuirot
commit: c23d173d94ad765832b91ee91c554ef2f57555f1
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Oct 29 22:39:58 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Oct 29 22:39:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23d173d

games-action/supertuxkart: Version bump to 1.3

Closes: https://bugs.gentoo.org/820683
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/supertuxkart/Manifest |  1 +
 .../supertuxkart-1.3-irrlicht-system-libs.patch| 54 +
 games-action/supertuxkart/supertuxkart-1.3.ebuild  | 90 ++
 3 files changed, 145 insertions(+)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index cb598d30c27..cf24edce24e 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,3 +1,4 @@
 DIST SuperTuxKart-1.2-src.tar.xz 614569164 BLAKE2B 
5bdaa8dcac12ab6c399e6f0fc3121906070f4cd5c58dba6ccf04229d92b9b21d87a43662f39fc29ac1528ce429aebea87934fa8a180a0933385704f5a43cd6f7
 SHA512 
bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835
+DIST SuperTuxKart-1.3-src.tar.xz 627753500 BLAKE2B 
3ffc86edf80adb27cd17a6ba796fb14d0660a1c14ff21c7908e5f965609c6f6a6b40270a21690cd1318d1003e07d90b4180c292252b1731d4cd6292fe12e6086
 SHA512 
42664390c844ebca0be9b2f2aeb3c9197c0c79a7c604707b32e81ef41aec10fa36f5950f06e1540ea6f75f6c7f8a8f7f80aeda48de3d101d991420f5b20530ed
 DIST supertuxkart-1.1-src.tar.xz 616739152 BLAKE2B 
a4dd9ec0a8ee158306dc902d3de363b68e7a317800df1b36339843521019df91c0713b74bdef8dc06b40bee57285237408a17b539c7bd7298cd3ef3deaf99fda
 SHA512 
81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804
 DIST supertuxkart.png 4435 BLAKE2B 
b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80
 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda

diff --git 
a/games-action/supertuxkart/files/supertuxkart-1.3-irrlicht-system-libs.patch 
b/games-action/supertuxkart/files/supertuxkart-1.3-irrlicht-system-libs.patch
new file mode 100644
index 000..7ff75743260
--- /dev/null
+++ 
b/games-action/supertuxkart/files/supertuxkart-1.3-irrlicht-system-libs.patch
@@ -0,0 +1,54 @@
+diff -ur a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp 
b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp 2021-09-28 
11:02:26.0 +0100
 b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp 2021-10-29 
23:30:44.714768031 +0100
+@@ -35,7 +35,7 @@
+ #include 
+ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
+ #define GLX_GLXEXT_PROTOTYPES
+-#include "glxext.h"
++#include 
+ #endif
+ #endif
+ 
+diff -ur a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h 
b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
+--- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h   2021-09-28 
11:02:26.0 +0100
 b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h   2021-10-29 
23:30:44.715768059 +0100
+@@ -30,7 +30,7 @@
+   #endif
+   #include 
+   #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-  #include "glext.h"
++  #include 
+   #endif
+   #include "wglext.h"
+ 
+@@ -45,7 +45,7 @@
+   #endif
+   #include 
+   #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-  #include "glext.h"
++  #include 
+   #endif
+ #endif
+ 
+diff -ur a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h 
b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
+--- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h 2021-09-28 
11:02:26.0 +0100
 b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h 2021-10-29 
23:30:44.715768059 +0100
+@@ -20,7 +20,7 @@
+   #define WIN32_LEAN_AND_MEAN
+   #include 
+   #include 
+-  #include "glext.h"
++  #include 
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+   #define GL_GLEXT_LEGACY 1
+@@ -34,7 +34,7 @@
+   #include 
+ #endif
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-  #include "glext.h"
++  #include 
+ #endif
+ #endif
+ 

diff --git a/games-action/supertuxkart/supertuxkart-1.3.ebuild 
b/games-action/supertuxkart/supertuxkart-1.3.ebuild
new file mode 100644
index 000..59bc12a5083
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-1.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+MY_P="SuperTuxKart-${PV}-src"
+DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
+HOMEPAGE="https://supertuxkart.net/";
+SRC_URI="https://github.com/${PN}/stk-code/releases/download

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2021-09-12 Thread Yixun Lan
commit: 08ee5d5c982a0fef1ff3bec6c29a225a89aa7365
Author: Yixun Lan  gentoo  org>
AuthorDate: Sun Sep 12 13:17:13 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Sep 12 14:23:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ee5d5c

games-action/supertuxkart: keyword ~riscv

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

 games-action/supertuxkart/supertuxkart-1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/supertuxkart/supertuxkart-1.2.ebuild 
b/games-action/supertuxkart/supertuxkart-1.2.ebuild
index 03866f018d3..e553eaa3160 100644
--- a/games-action/supertuxkart/supertuxkart-1.2.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/${PN}/stk-code/releases/download/${PV}/${MY_P}.tar.x
 
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="debug nettle recorder sqlite wiimote"
 
 # don't unbundle irrlicht and bullet



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2021-05-03 Thread Mikle Kolyada
commit: 9052fbddf657ae3b78786e3b49b1291a0afef86b
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May  3 06:54:21 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May  3 06:54:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9052fbdd

games-action/supertuxkart: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 games-action/supertuxkart/supertuxkart-1.1.ebuild | 7 +++
 games-action/supertuxkart/supertuxkart-1.2.ebuild | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/games-action/supertuxkart/supertuxkart-1.1.ebuild 
b/games-action/supertuxkart/supertuxkart-1.1.ebuild
index 329de4139a2..1b75dbc88d8 100644
--- a/games-action/supertuxkart/supertuxkart-1.1.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.1.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
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug libressl nettle recorder wiimote"
+IUSE="debug nettle recorder wiimote"
 
 # don't unbundle irrlicht and bullet
 # both are modified and system versions will break the game
@@ -39,8 +39,7 @@ RDEPEND="
x11-libs/libXxf86vm
nettle? ( dev-libs/nettle:= )
!nettle? (
-   libressl? ( dev-libs/libressl:= )
-   !libressl? ( >=dev-libs/openssl-1.0.1d:0= )
+   >=dev-libs/openssl-1.0.1d:0=
)
recorder? ( media-libs/libopenglrecorder )
wiimote? ( net-wireless/bluez )"

diff --git a/games-action/supertuxkart/supertuxkart-1.2.ebuild 
b/games-action/supertuxkart/supertuxkart-1.2.ebuild
index fc674824ebb..03866f018d3 100644
--- a/games-action/supertuxkart/supertuxkart-1.2.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/${PN}/stk-code/releases/download/${PV}/${MY_P}.tar.x
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug libressl nettle recorder sqlite wiimote"
+IUSE="debug nettle recorder sqlite wiimote"
 
 # don't unbundle irrlicht and bullet
 # both are modified and system versions will break the game
@@ -42,8 +42,7 @@ RDEPEND="
x11-libs/libXxf86vm
nettle? ( dev-libs/nettle:= )
!nettle? (
-   libressl? ( dev-libs/libressl:= )
-   !libressl? ( >=dev-libs/openssl-1.0.1d:0= )
+   >=dev-libs/openssl-1.0.1d:0=
)
recorder? ( media-libs/libopenglrecorder )
wiimote? ( net-wireless/bluez )"



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/

2021-01-02 Thread James Le Cuirot
commit: 288360dc7ce2f968a2f12099edeace3f3ed1a705
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan  2 20:59:21 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan  2 20:59:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288360dc

games-action/supertuxkart: Fix build with latest SDL2

Closes: https://bugs.gentoo.org/761814
Package-Manager: Portage-3.0.12, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 .../files/supertuxkart-1.2-new-sdl.patch   | 106 +
 games-action/supertuxkart/supertuxkart-1.2.ebuild  |   3 +-
 2 files changed, 108 insertions(+), 1 deletion(-)

diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch 
b/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch
new file mode 100644
index 000..973c75d010f
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch
@@ -0,0 +1,106 @@
+From 61833c9c26da5520f2eaa02f2458971ba07f2aad Mon Sep 17 00:00:00 2001
+From: Benau 
+Date: Sun, 29 Nov 2020 12:42:11 +0800
+Subject: [PATCH] Fix compilation with latest SDL
+
+---
+ src/input/gamepad_config.cpp | 55 ++--
+ 1 file changed, 27 insertions(+), 28 deletions(-)
+
+diff --git a/src/input/gamepad_config.cpp b/src/input/gamepad_config.cpp
+index 7c6f632099..c060e7a5a7 100644
+--- a/src/input/gamepad_config.cpp
 b/src/input/gamepad_config.cpp
+@@ -32,8 +32,7 @@
+ #include "input/sdl_controller.hpp"
+ #include 
+ 
+-static_assert(SDL_CONTROLLER_BUTTON_MAX - 1 == 
SDL_CONTROLLER_BUTTON_DPAD_RIGHT, "non continous name");
+-enum AxisWithDirection
++enum AxisWithDirection : unsigned
+ {
+ SDL_CONTROLLER_AXIS_LEFTX_RIGHT = SDL_CONTROLLER_BUTTON_MAX,
+ SDL_CONTROLLER_AXIS_LEFTX_LEFT,
+@@ -140,56 +139,56 @@ void GamepadConfig::setDefaultBinds ()
+ core::stringw GamepadConfig::getBindingAsString(const PlayerAction action) 
const
+ {
+ #ifndef SERVER_ONLY
+-std::array readable =
++std::map readable =
+ {{
+-"A", // SDL_CONTROLLER_BUTTON_A
+-"B", // SDL_CONTROLLER_BUTTON_B
+-"X", // SDL_CONTROLLER_BUTTON_X
+-"Y", // SDL_CONTROLLER_BUTTON_Y
++{ SDL_CONTROLLER_BUTTON_A, "A" },
++{ SDL_CONTROLLER_BUTTON_B, "B" },
++{ SDL_CONTROLLER_BUTTON_X, "X" },
++{ SDL_CONTROLLER_BUTTON_Y, "Y" },
+ // I18N: name of buttons on gamepads
+-_("Back"), // SDL_CONTROLLER_BUTTON_BACK
++{ SDL_CONTROLLER_BUTTON_BACK, _("Back") },
+ // I18N: name of buttons on gamepads
+-_("Guide"), // SDL_CONTROLLER_BUTTON_GUIDE
++{ SDL_CONTROLLER_BUTTON_GUIDE, _("Guide") },
+ // I18N: name of buttons on gamepads
+-_("Start"), // SDL_CONTROLLER_BUTTON_START
++{ SDL_CONTROLLER_BUTTON_START, _("Start") },
+ // I18N: name of buttons on gamepads
+-_("Left thumbstick press"), // SDL_CONTROLLER_BUTTON_LEFTSTICK
++{ SDL_CONTROLLER_BUTTON_LEFTSTICK, _("Left thumbstick press") },
+ // I18N: name of buttons on gamepads
+-_("Right thumbstick press"), // SDL_CONTROLLER_BUTTON_RIGHTSTICK
++{ SDL_CONTROLLER_BUTTON_RIGHTSTICK, _("Right thumbstick press") },
+ // I18N: name of buttons on gamepads
+-_("Left shoulder"), // SDL_CONTROLLER_BUTTON_LEFTSHOULDER
++{ SDL_CONTROLLER_BUTTON_LEFTSHOULDER, _("Left shoulder") },
+ // I18N: name of buttons on gamepads
+-_("Right shoulder"), // SDL_CONTROLLER_BUTTON_RIGHTSHOULDER
++{ SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, _("Right shoulder") },
+ // I18N: name of buttons on gamepads
+-_("DPad up"), // SDL_CONTROLLER_BUTTON_DPAD_UP
++{ SDL_CONTROLLER_BUTTON_DPAD_UP, _("DPad up") },
+ // I18N: name of buttons on gamepads
+-_("DPad down"), // SDL_CONTROLLER_BUTTON_DPAD_DOWN
++{ SDL_CONTROLLER_BUTTON_DPAD_DOWN, _("DPad down") },
+ // I18N: name of buttons on gamepads
+-_("DPad left"), // SDL_CONTROLLER_BUTTON_DPAD_LEFT
++{ SDL_CONTROLLER_BUTTON_DPAD_LEFT, _("DPad left") },
+ // I18N: name of buttons on gamepads
+-_("DPad right"), // SDL_CONTROLLER_BUTTON_DPAD_RIGHT
++{ SDL_CONTROLLER_BUTTON_DPAD_RIGHT, _("DPad right") },
+ 
+ // Below are extensions after SDL2 header SDL_CONTROLLER_BUTTON_MAX
+ // I18N: name of buttons on gamepads
+-_("Left thumbstick right"), // SDL_CONTROLLER_AXIS_LEFTX_RIGHT
++{ SDL_CONTROLLER_AXIS_LEFTX_RIGHT, _("Left thumbstick right") },
+ // I18N: name of buttons on gamepads
+-_("Left thumbstick left"), // SDL_CONTROLLER_AXIS_LEFTX_LEFT
++{ SDL_CONTROLLER_AXIS_LEFTX_LEFT, _("Left thumbstick left") },
+ // I18N: name of buttons on gamepads
+-_("Left thumbstick down"), // SDL_CONTROLLER_AXIS_LEFTY_DOWN
++{ SDL_CONTROLLER_AXIS_LEFTY_DOWN, _("Left thumbstick down") },
+ // I18N: name of buttons on ga

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/

2020-09-02 Thread Sam James
commit: 4a338c733fff32fc0f42fe5ce3a94613cb87522d
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep  2 13:00:36 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep  2 13:00:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a338c73

games-action/supertuxkart: fix patch line-endings

Unfortunately, I tested this *pre-commit* at which point
git used its autocrlf to adapt the line-endings.

Closes: https://bugs.gentoo.org/740030
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 .../supertuxkart-1.2-irrlicht-system-libs.patch| 50 +++---
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git 
a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch 
b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
index 2a23e51323d..f9681733cfb 100644
--- 
a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
+++ 
b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
@@ -1,5 +1,3 @@
-https://salsa.debian.org/games-team/supertuxkart/-/raw/master/debian/patches/irrlicht/use-system-libs.diff
-
 Subject: [PATCH] debian/use-system-libs
 
 Path to build irrlicht using the system libraries for png,zlib and
@@ -10,14 +8,14 @@ Signed-off-by: Christoph Egger 
- #ifdef _IRR_OPENGL_USE_EXTPOINTER_
- #define GLX_GLXEXT_PROTOTYPES
--#include "glxext.h"
-+#include 
- #endif
- #endif
- 
+ #include 
+ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
+ #define GLX_GLXEXT_PROTOTYPES
+-#include "glxext.h"
++#include 
+ #endif
+ #endif
+ 
 --- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
 +++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
 @@ -24,7 +24,7 @@
@@ -50,20 +48,20 @@ Signed-off-by: Christoph Egger 
-   #include 
--  #include "glext.h"
-+  #include 
- #else
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-   #define GL_GLEXT_LEGACY 1
+   #define WIN32_LEAN_AND_MEAN
+   #include 
+   #include 
+-  #include "glext.h"
++  #include 
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+   #define GL_GLEXT_LEGACY 1
 @@ -26,7 +26,7 @@
-   #include 
- #endif
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--  #include "glext.h"
-+  #include 
- #endif
- #endif
- 
+   #include 
+ #endif
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-  #include "glext.h"
++  #include 
+ #endif
+ #endif
+ 



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2020-09-01 Thread Sam James
commit: 8039ec465d7b5f02091d63743486a6f9fee57670
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep  2 00:09:41 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep  2 00:11:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8039ec46

games-action/supertuxkart: remove useless USE=fribidi

This USE flag had no effect anyway and the dep is gone in 1.2.

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 games-action/supertuxkart/metadata.xml| 1 -
 games-action/supertuxkart/supertuxkart-1.1.ebuild | 2 +-
 games-action/supertuxkart/supertuxkart-1.2.ebuild | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/games-action/supertuxkart/metadata.xml 
b/games-action/supertuxkart/metadata.xml
index 22a9fc08bd8..bb2a9028c68 100644
--- a/games-action/supertuxkart/metadata.xml
+++ b/games-action/supertuxkart/metadata.xml
@@ -6,7 +6,6 @@
Gentoo Games Project


-   Support for right-to-left languages
Use dev-libs/nettle crypto 
backend
Enable recording with 
media-libs/libopenglrecorder
Record IP bans, statistics in server mode 
with dev-db/sqlite

diff --git a/games-action/supertuxkart/supertuxkart-1.1.ebuild 
b/games-action/supertuxkart/supertuxkart-1.1.ebuild
index 77e990201cd..329de4139a2 100644
--- a/games-action/supertuxkart/supertuxkart-1.1.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug fribidi libressl nettle recorder wiimote"
+IUSE="debug libressl nettle recorder wiimote"
 
 # don't unbundle irrlicht and bullet
 # both are modified and system versions will break the game

diff --git a/games-action/supertuxkart/supertuxkart-1.2.ebuild 
b/games-action/supertuxkart/supertuxkart-1.2.ebuild
index c8377d9b440..5e9aa59fdef 100644
--- a/games-action/supertuxkart/supertuxkart-1.2.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/${PN}/stk-code/releases/download/${PV}/${MY_P}.tar.x
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug fribidi libressl nettle recorder sqlite wiimote"
+IUSE="debug libressl nettle recorder sqlite wiimote"
 
 # don't unbundle irrlicht and bullet
 # both are modified and system versions will break the game



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2020-09-01 Thread Sam James
commit: f5da15dbad4b637410a82dd170c584712713ed7b
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep  1 23:32:21 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep  1 23:32:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5da15db

games-action/supertuxkart: drop fribidi dependency

Upstream are now using sheenbidi which is not yet packaged (seems new).

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 games-action/supertuxkart/supertuxkart-1.2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-action/supertuxkart/supertuxkart-1.2.ebuild 
b/games-action/supertuxkart/supertuxkart-1.2.ebuild
index d78f9737b39..c8377d9b440 100644
--- a/games-action/supertuxkart/supertuxkart-1.2.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.2.ebuild
@@ -24,7 +24,6 @@ RDEPEND="
dev-cpp/libmcpp
sqlite? ( dev-db/sqlite:3 )
dev-libs/angelscript:=
-   dev-libs/fribidi
media-libs/freetype:2
media-libs/glew:0=
media-libs/harfbuzz:=



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/

2020-09-01 Thread Sam James
commit: 05e8951e0fa0ad2c41db7ad94e242aef6bcad871
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep  1 23:24:34 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep  1 23:24:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05e8951e

games-action/supertuxkart: bump to 1.2

Closes: https://bugs.gentoo.org/739480
Closes: https://bugs.gentoo.org/737250
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 games-action/supertuxkart/Manifest |  1 +
 .../supertuxkart-1.2-irrlicht-system-libs.patch| 69 
 games-action/supertuxkart/metadata.xml |  2 +
 games-action/supertuxkart/supertuxkart-1.2.ebuild  | 92 ++
 4 files changed, 164 insertions(+)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index 4fd966710bc..cb598d30c27 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,2 +1,3 @@
+DIST SuperTuxKart-1.2-src.tar.xz 614569164 BLAKE2B 
5bdaa8dcac12ab6c399e6f0fc3121906070f4cd5c58dba6ccf04229d92b9b21d87a43662f39fc29ac1528ce429aebea87934fa8a180a0933385704f5a43cd6f7
 SHA512 
bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835
 DIST supertuxkart-1.1-src.tar.xz 616739152 BLAKE2B 
a4dd9ec0a8ee158306dc902d3de363b68e7a317800df1b36339843521019df91c0713b74bdef8dc06b40bee57285237408a17b539c7bd7298cd3ef3deaf99fda
 SHA512 
81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804
 DIST supertuxkart.png 4435 BLAKE2B 
b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80
 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda

diff --git 
a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch 
b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
new file mode 100644
index 000..2a23e51323d
--- /dev/null
+++ 
b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
@@ -0,0 +1,69 @@
+https://salsa.debian.org/games-team/supertuxkart/-/raw/master/debian/patches/irrlicht/use-system-libs.diff
+
+Subject: [PATCH] debian/use-system-libs
+
+Path to build irrlicht using the system libraries for png,zlib and
+jpeg as well as the glext family of header files.
+
+Signed-off-by: Christoph Egger 
+ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
+ #define GLX_GLXEXT_PROTOTYPES
+-#include "glxext.h"
++#include 
+ #endif
+ #endif
+ 
+--- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
 b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
+@@ -24,7 +24,7 @@
+   #define NO_SDL_GLEXT
+   #include 
+   #include 
+-  #include "glext.h"
++  #include 
+ #elif defined(_IRR_WINDOWS_API_)
+   // include windows headers for HWND
+   #define WIN32_LEAN_AND_MEAN
+@@ -34,7 +34,7 @@
+   #endif
+   #include 
+   #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-  #include "glext.h"
++  #include 
+   #endif
+   #include "wglext.h"
+ 
+@@ -49,7 +49,7 @@
+   #endif
+   #include 
+   #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-  #include "glext.h"
++  #include 
+   #endif
+ #endif
+ 
+--- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
 b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
+@@ -12,7 +12,7 @@
+   #define WIN32_LEAN_AND_MEAN
+   #include 
+   #include 
+-  #include "glext.h"
++  #include 
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+   #define GL_GLEXT_LEGACY 1
+@@ -26,7 +26,7 @@
+   #include 
+ #endif
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-  #include "glext.h"
++  #include 
+ #endif
+ #endif
+ 

diff --git a/games-action/supertuxkart/metadata.xml 
b/games-action/supertuxkart/metadata.xml
index ced8e3e6ee9..22a9fc08bd8 100644
--- a/games-action/supertuxkart/metadata.xml
+++ b/games-action/supertuxkart/metadata.xml
@@ -9,9 +9,11 @@
Support for right-to-left languages
Use dev-libs/nettle crypto 
backend
Enable recording with 
media-libs/libopenglrecorder
+   Record IP bans, statistics in server mode 
with dev-db/sqlite
Support for wiimote input devices


+   supertuxkart/stk-code
supertuxkart

 

diff --git a/games-action/supertuxkart/supertuxkart-1.2.ebuild 
b/games-action/supertuxkart/supertuxkart-1.2.ebuild
new file mode 100644
index 000..d78f9737b39
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-1.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License 

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2020-04-14 Thread James Le Cuirot
commit: ef98e200d05ba812b3016ae762ab89ec755935fe
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Apr 14 21:38:14 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Apr 14 21:38:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef98e200

games-action/supertuxkart: Add missing harfbuzz dependency

Closes: https://bugs.gentoo.org/717460
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/supertuxkart/supertuxkart-1.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-action/supertuxkart/supertuxkart-1.1.ebuild 
b/games-action/supertuxkart/supertuxkart-1.1.ebuild
index 5701c73bab7..77e990201cd 100644
--- a/games-action/supertuxkart/supertuxkart-1.1.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
dev-libs/fribidi
media-libs/freetype:2
media-libs/glew:0=
+   media-libs/harfbuzz:=
media-libs/libpng:0=
media-libs/libvorbis
media-libs/openal



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/, games-action/supertuxkart/

2020-03-28 Thread James Le Cuirot
commit: c7ada27ef73e5e8b7fc46762ad8ff903a207409e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Mar 28 20:32:11 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar 28 20:37:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7ada27e

games-action/supertuxkart: Version bump to 1.1

Many thanks to Kevin O'Shea for the patches.

Closes: https://bugs.gentoo.org/706088
Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/supertuxkart/Manifest |  1 +
 .../files/supertuxkart-1.1-fix-buildsystem.patch   | 20 +
 .../supertuxkart-1.1-irrlicht-arch-support.patch   | 47 +++
 games-action/supertuxkart/supertuxkart-1.1.ebuild  | 91 ++
 4 files changed, 159 insertions(+)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index 5a0e070b25a..fd603cfb6c9 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,2 +1,3 @@
 DIST supertuxkart-1.0-src.tar.xz 597012504 BLAKE2B 
ed1b851bad8696b4593c54f215b115528afc29bde237f67627e2918c4a9fab09eddc204d0c879fa85c6b10b5544dba5fa5fc1b437cb83e6d884ac717e3369c28
 SHA512 
182754610abd09545630fa1f7fda858ba1731bbacb078bc71597e143f9cb2a1cfcedd3038720760d0471a89b79cc3bb1eb292d38fcd53be05aad7cb17c474ca9
+DIST supertuxkart-1.1-src.tar.xz 616739152 BLAKE2B 
a4dd9ec0a8ee158306dc902d3de363b68e7a317800df1b36339843521019df91c0713b74bdef8dc06b40bee57285237408a17b539c7bd7298cd3ef3deaf99fda
 SHA512 
81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804
 DIST supertuxkart.png 4435 BLAKE2B 
b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80
 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda

diff --git 
a/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch 
b/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch
new file mode 100644
index 000..394a1963199
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch
@@ -0,0 +1,20 @@
+diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
+index 92a881c81..1371fdf11 100644
+--- a/lib/irrlicht/CMakeLists.txt
 b/lib/irrlicht/CMakeLists.txt
+@@ -94,15 +94,6 @@
+ if(WIN32)
+ add_definitions(-D_IRR_STATIC_LIB_)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
+-else()
+-set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fstrict-aliasing")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3 
-fstrict-aliasing")
+-if(CMAKE_COMPILER_IS_GNUCC)
+-set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
+-endif()
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-set(CMAKE_CXX_FLAGS   "${CMAKE_CXX_FLAGS} -fexpensive-optimizations")
+-endif()
+ endif()
+
+ if(USE_GLES2)

diff --git 
a/games-action/supertuxkart/files/supertuxkart-1.1-irrlicht-arch-support.patch 
b/games-action/supertuxkart/files/supertuxkart-1.1-irrlicht-arch-support.patch
new file mode 100644
index 000..ad9638ff3dc
--- /dev/null
+++ 
b/games-action/supertuxkart/files/supertuxkart-1.1-irrlicht-arch-support.patch
@@ -0,0 +1,47 @@
+From: Christoph Egger 
+Subject: [PATCH] debian/arch-support
+
+Building on non-linux architectures currently fails with unpatched
+irrlicht because irrlicht tries to create Joystick support using
+linux-specific headers. However there's infrastructure to disable
+Joystick support, we just need to activate that on non-linux
+architectures.
+
+Additionally if built on a sparc machine irrlicht assumes wrongly it's
+a solaris system. We fix this wrong assumption as our sparc builds are
+all on linux.
+
+Finally irrlicht exceeds the size constraights for -fpic requiering to
+build with -fPIC. As upstream doesn't do that we need to fix this for
+sparc and s390 builds (powerPC?).
+
+Signed-off-by: Christoph Egger 
+
+---
+ lib/irrlicht/include/IrrCompileConfig.h |   10 +-
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/lib/irrlicht/include/IrrCompileConfig.h
 b/lib/irrlicht/include/IrrCompileConfig.h
+@@ -110,4 +110,8 @@
+ #ifndef _IRR_SOLARIS_PLATFORM_
+ #define _IRR_LINUX_PLATFORM_
++#include 
++ #if __BYTE_ORDER == __BIG_ENDIAN
++  #define __BIG_ENDIAN__
++ #endif
+ #endif
+ #define _IRR_POSIX_API_
+@@ -465,11 +465,7 @@
+ #undef _IRR_WCHAR_FILESYSTEM
+ #endif
+ 
+-#if defined(__sparc__) || defined(__sun__)
+-#define __BIG_ENDIAN__
+-#endif
+-
+-#if defined(_IRR_SOLARIS_PLATFORM_)
++#if defined(_IRR_SOLARIS_PLATFORM_) || defined(__FreeBSD_kernel__) || 
defined(__gnu_hurd__)
+ #undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+ #endif
+ 

diff --git a/games-action/supertuxkart/supertuxkart-1.1.ebuild 
b/games-actio

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/, games-action/supertuxkart/

2020-03-28 Thread James Le Cuirot
commit: 6ce37119f6937bc62019af613d6ce6bad6d87b67
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Mar 28 20:33:32 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar 28 20:37:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ce37119

games-action/supertuxkart: Drop old 1.0

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

 games-action/supertuxkart/Manifest |  1 -
 .../supertuxkart-0.9.3-irrlicht-arch-support.patch | 47 ---
 .../files/supertuxkart-1.0-fix-buildsystem.patch   | 20 -
 .../files/supertuxkart-1.0-system-squish.patch | 43 --
 games-action/supertuxkart/supertuxkart-1.0.ebuild  | 97 --
 5 files changed, 208 deletions(-)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index fd603cfb6c9..4fd966710bc 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,3 +1,2 @@
-DIST supertuxkart-1.0-src.tar.xz 597012504 BLAKE2B 
ed1b851bad8696b4593c54f215b115528afc29bde237f67627e2918c4a9fab09eddc204d0c879fa85c6b10b5544dba5fa5fc1b437cb83e6d884ac717e3369c28
 SHA512 
182754610abd09545630fa1f7fda858ba1731bbacb078bc71597e143f9cb2a1cfcedd3038720760d0471a89b79cc3bb1eb292d38fcd53be05aad7cb17c474ca9
 DIST supertuxkart-1.1-src.tar.xz 616739152 BLAKE2B 
a4dd9ec0a8ee158306dc902d3de363b68e7a317800df1b36339843521019df91c0713b74bdef8dc06b40bee57285237408a17b539c7bd7298cd3ef3deaf99fda
 SHA512 
81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804
 DIST supertuxkart.png 4435 BLAKE2B 
b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80
 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda

diff --git 
a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch
 
b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch
deleted file mode 100644
index 66191861a96..000
--- 
a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Christoph Egger 
-Subject: [PATCH] debian/arch-support
-
-Building on non-linux architectures currently fails with unpatched
-irrlicht because irrlicht tries to create Joystick support using
-linux-specific headers. However there's infrastructure to disable
-Joystick support, we just need to activate that on non-linux
-architectures.
-
-Additionally if built on a sparc machine irrlicht assumes wrongly it's
-a solaris system. We fix this wrong assumption as our sparc builds are
-all on linux.
-
-Finally irrlicht exceeds the size constraights for -fpic requiering to
-build with -fPIC. As upstream doesn't do that we need to fix this for
-sparc and s390 builds (powerPC?).
-
-Signed-off-by: Christoph Egger 
-

- lib/irrlicht/include/IrrCompileConfig.h |   10 +-
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
 a/lib/irrlicht/include/IrrCompileConfig.h
-+++ b/lib/irrlicht/include/IrrCompileConfig.h
-@@ -110,4 +110,8 @@
- #ifndef _IRR_SOLARIS_PLATFORM_
- #define _IRR_LINUX_PLATFORM_
-+#include 
-+ #if __BYTE_ORDER == __BIG_ENDIAN
-+  #define __BIG_ENDIAN__
-+ #endif
- #endif
- #define _IRR_POSIX_API_
-@@ -460,11 +464,7 @@
-   #undef _IRR_WCHAR_FILESYSTEM
- #endif
- 
--#if defined(__sparc__) || defined(__sun__)
--#define __BIG_ENDIAN__
--#endif
--
--#if defined(_IRR_SOLARIS_PLATFORM_)
-+#if defined(_IRR_SOLARIS_PLATFORM_) || defined(__FreeBSD_kernel__) || 
defined(__gnu_hurd__)
-   #undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
- #endif
- 

diff --git 
a/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch 
b/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch
deleted file mode 100644
index 23e8280a18f..000
--- a/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
-index 92a881c81..1371fdf11 100644
 a/lib/irrlicht/CMakeLists.txt
-+++ b/lib/irrlicht/CMakeLists.txt
-@@ -96,15 +96,6 @@ endif()
- if(WIN32)
- add_definitions(-D_IRR_STATIC_LIB_)
- add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
--else()
--set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  
-fstrict-aliasing")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3  -fno-exceptions  
-fstrict-aliasing")
--if(CMAKE_COMPILER_IS_GNUCC)
--set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
--endif()
--if(CMAKE_COMPILER_IS_GNUCXX)
--set(CMAKE_CXX_FLAGS   "${CMAKE_CXX_FLAGS} -fexpensive-optimizations")
--endif()
- endif()
- 
- if(USE_GLES2)

diff --git 
a/games-action/supertuxka

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/

2019-05-13 Thread James Le Cuirot
commit: fa2997a88ebb4ae65f728f35a0fb1a847d552969
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon May 13 22:05:28 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon May 13 22:05:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa2997a8

games-action/supertuxkart: Fix automagic dependency on libsquish

Closes: https://bugs.gentoo.org/685808
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 .../files/supertuxkart-1.0-system-squish.patch | 43 ++
 games-action/supertuxkart/supertuxkart-1.0.ebuild  |  2 +
 2 files changed, 45 insertions(+)

diff --git 
a/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch 
b/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch
new file mode 100644
index 000..8158c4bb9e5
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch
@@ -0,0 +1,43 @@
+From e1601b1ae07e3c1ac05cffe05b82e0c60998bc72 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot 
+Date: Mon, 13 May 2019 22:51:21 +0100
+Subject: [PATCH] CMake: Add option to use system Squish library
+
+The system version was preferred before but it wasn't possible to
+explicitly disable it, making its use automagic, which is bad for
+packaging.
+
+Closes: https://github.com/supertuxkart/stk-code/pull/3916
+---
+ CMakeLists.txt | 8 ++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8a7f03264..40e7790fe 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -31,6 +31,8 @@ CMAKE_DEPENDENT_OPTION(BUILD_RECORDER "Build opengl 
recorder" ON
+ "NOT SERVER_ONLY;NOT APPLE" OFF)
+ CMAKE_DEPENDENT_OPTION(USE_FRIBIDI "Support for right-to-left languages" ON
+ "NOT SERVER_ONLY" OFF)
++CMAKE_DEPENDENT_OPTION(USE_SYSTEM_SQUISH "Use system Squish library instead 
of the built-in version, when available." ON
++"NOT SERVER_ONLY" OFF)
+ CMAKE_DEPENDENT_OPTION(USE_WIIUSE "Support for wiimote input devices" ON
+ "NOT SERVER_ONLY;NOT MINGW;NOT CYGWIN" OFF)
+ 
+@@ -247,8 +249,10 @@ if(NOT SERVER_ONLY)
+ endif()
+ 
+ if(NOT SERVER_ONLY)
+-find_library(SQUISH_LIBRARY NAMES squish libsquish)
+-find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS)
++if(USE_SYSTEM_SQUISH)
++find_library(SQUISH_LIBRARY NAMES squish libsquish)
++find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS)
++endif()
+ if (NOT SQUISH_LIBRARY OR NOT SQUISH_INCLUDEDIR)
+ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libsquish")
+ include_directories("${PROJECT_SOURCE_DIR}/lib/libsquish")
+-- 
+2.20.1
+

diff --git a/games-action/supertuxkart/supertuxkart-1.0.ebuild 
b/games-action/supertuxkart/supertuxkart-1.0.ebuild
index 0069c7d8553..96746c833f7 100644
--- a/games-action/supertuxkart/supertuxkart-1.0.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.0.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.9.3-irrlicht-arch-support.patch
"${FILESDIR}"/${PN}-0.9.3-irrlicht-system-libs.patch
"${FILESDIR}"/${PN}-1.0-fix-buildsystem.patch
+   "${FILESDIR}"/${PN}-1.0-system-squish.patch
 )
 
 src_prepare() {
@@ -66,6 +67,7 @@ src_configure() {
-DUSE_SYSTEM_ANGELSCRIPT=ON
-DUSE_SYSTEM_ENET=ON
-DUSE_SYSTEM_GLEW=ON
+   -DUSE_SYSTEM_SQUISH=OFF
-DUSE_SYSTEM_WIIUSE=OFF
-DUSE_CRYPTO_OPENSSL=$(usex nettle no yes)
-DENABLE_WAYLAND_DEVICE=OFF



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2019-05-10 Thread James Le Cuirot
commit: c54b137b51007e99c897c74b75c14803f504a59b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri May 10 21:33:40 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri May 10 21:34:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c54b137b

games-action/supertuxkart: Update licenses

Closes: https://bugs.gentoo.org/598493
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/supertuxkart/supertuxkart-1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/supertuxkart/supertuxkart-1.0.ebuild 
b/games-action/supertuxkart/supertuxkart-1.0.ebuild
index 9377d978a14..0069c7d8553 100644
--- a/games-action/supertuxkart/supertuxkart-1.0.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://supertuxkart.net/";
 SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz
mirror://gentoo/${PN}.png"
 
-LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
+LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug fribidi libressl nettle recorder wiimote"



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2019-05-10 Thread James Le Cuirot
commit: 48270939520a8893c92961562f9ff47020b3ef5a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri May 10 21:22:13 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri May 10 21:22:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48270939

games-action/supertuxkart: Add missing media-libs/freetype dependency

Closes: https://bugs.gentoo.org/667730
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/supertuxkart/supertuxkart-1.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-action/supertuxkart/supertuxkart-1.0.ebuild 
b/games-action/supertuxkart/supertuxkart-1.0.ebuild
index 08bfa673f95..9377d978a14 100644
--- a/games-action/supertuxkart/supertuxkart-1.0.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.0.ebuild
@@ -21,6 +21,7 @@ IUSE="debug fribidi libressl nettle recorder wiimote"
 
 RDEPEND="
dev-libs/angelscript:=
+   media-libs/freetype:2
media-libs/glew:0=
media-libs/libpng:0=
media-libs/libvorbis



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/, games-action/supertuxkart/

2019-05-10 Thread James Le Cuirot
commit: 489d69eb9937af74bd248ef1574c37849de75453
Author: François-Xavier Carton  gmail  com>
AuthorDate: Mon Apr 29 23:06:16 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri May 10 21:16:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=489d69eb

games-action/supertuxkart: bump to 1.0

- Unbundle angelscript
- New deps nettle || openssl

Package-Manager: Portage-2.3.62, Repoman-2.3.11
Closes: https://bugs.gentoo.org/683930
Signed-off-by: François-Xavier Carton  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11865
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/supertuxkart/Manifest |  1 +
 .../files/supertuxkart-1.0-fix-buildsystem.patch   | 20 +
 games-action/supertuxkart/metadata.xml |  1 +
 games-action/supertuxkart/supertuxkart-1.0.ebuild  | 96 ++
 4 files changed, 118 insertions(+)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index cd3817a2848..d64bb151b7d 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,2 +1,3 @@
 DIST supertuxkart-0.9.3-src.tar.xz 544517772 BLAKE2B 
84ab64371a59bf302905181ad98dd12542a9ffda18b9081ecfa6fcbb61d89c6b1f76f3598184459bbb40a42a1c968767837e76bbd0c9b2ade6b4c18831bc61fb
 SHA512 
29eb1d8fb8e336453e590273089af09eac9a563f82c0bc797d43d5e21d5c9d1274a84ea7ee46487b3d127c47e55e3d233ad7e0e8c502c15dbafc1cc0f5c861c9
+DIST supertuxkart-1.0-src.tar.xz 597012504 BLAKE2B 
ed1b851bad8696b4593c54f215b115528afc29bde237f67627e2918c4a9fab09eddc204d0c879fa85c6b10b5544dba5fa5fc1b437cb83e6d884ac717e3369c28
 SHA512 
182754610abd09545630fa1f7fda858ba1731bbacb078bc71597e143f9cb2a1cfcedd3038720760d0471a89b79cc3bb1eb292d38fcd53be05aad7cb17c474ca9
 DIST supertuxkart.png 4435 BLAKE2B 
b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80
 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda

diff --git 
a/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch 
b/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch
new file mode 100644
index 000..23e8280a18f
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch
@@ -0,0 +1,20 @@
+diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
+index 92a881c81..1371fdf11 100644
+--- a/lib/irrlicht/CMakeLists.txt
 b/lib/irrlicht/CMakeLists.txt
+@@ -96,15 +96,6 @@ endif()
+ if(WIN32)
+ add_definitions(-D_IRR_STATIC_LIB_)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
+-else()
+-set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  
-fstrict-aliasing")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3  -fno-exceptions  
-fstrict-aliasing")
+-if(CMAKE_COMPILER_IS_GNUCC)
+-set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
+-endif()
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-set(CMAKE_CXX_FLAGS   "${CMAKE_CXX_FLAGS} -fexpensive-optimizations")
+-endif()
+ endif()
+ 
+ if(USE_GLES2)

diff --git a/games-action/supertuxkart/metadata.xml 
b/games-action/supertuxkart/metadata.xml
index a5ee3731025..ced8e3e6ee9 100644
--- a/games-action/supertuxkart/metadata.xml
+++ b/games-action/supertuxkart/metadata.xml
@@ -7,6 +7,7 @@


Support for right-to-left languages
+   Use dev-libs/nettle crypto 
backend
Enable recording with 
media-libs/libopenglrecorder
Support for wiimote input devices


diff --git a/games-action/supertuxkart/supertuxkart-1.0.ebuild 
b/games-action/supertuxkart/supertuxkart-1.0.ebuild
new file mode 100644
index 000..f6d84df9613
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-1.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop gnome2-utils
+
+DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
+HOMEPAGE="https://supertuxkart.net/";
+SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz
+   mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug fribidi libressl nettle recorder wiimote"
+
+# don't unbundle irrlicht and bullet
+# both are modified and system versions will break the game
+# https://sourceforge.net/p/irrlicht/feature-requests/138/
+
+RDEPEND="
+   dev-libs/angelscript:=
+   media-libs/glew:0=
+   media-libs/libpng:0=
+   media-libs/libvorbis
+   media-libs/openal
+   net-libs/enet:1.3=
+   net-misc/curl
+   sys-libs/zlib
+   virtual/glu
+   virtual/jpeg:0
+   virtual/libintl
+   vir

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2019-05-10 Thread James Le Cuirot
commit: 8bf0fc2b213fcc178b62ff0405fa563464bfe434
Author: François-Xavier Carton  gmail  com>
AuthorDate: Tue Apr 30 23:14:09 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri May 10 21:16:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf0fc2b

games-action/supertuxkart: EAPI 7

Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: François-Xavier Carton  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/supertuxkart/supertuxkart-1.0.ebuild | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/games-action/supertuxkart/supertuxkart-1.0.ebuild 
b/games-action/supertuxkart/supertuxkart-1.0.ebuild
index f6d84df9613..08bfa673f95 100644
--- a/games-action/supertuxkart/supertuxkart-1.0.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils desktop gnome2-utils
+inherit cmake-utils desktop xdg-utils
 
 DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
 HOMEPAGE="https://supertuxkart.net/";
@@ -42,7 +42,8 @@ RDEPEND="
)
recorder? ( media-libs/libopenglrecorder )
wiimote? ( net-wireless/bluez )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-devel/gettext
virtual/pkgconfig"
 
@@ -72,6 +73,7 @@ src_configure() {
-DUSE_WIIUSE=$(usex wiimote)
-DSTK_INSTALL_BINARY_DIR=bin
-DSTK_INSTALL_DATA_DIR=share/${PN}
+   -DBUILD_SHARED_LIBS=OFF # build bundled libsquish as static 
library
)
cmake-utils_src_configure
 }
@@ -83,14 +85,10 @@ src_install() {
doicon -s 64 "${DISTDIR}"/${PN}.png
 }
 
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
 pkg_postinst() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }
 
 pkg_postrm() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/, games-action/supertuxkart/

2019-05-10 Thread James Le Cuirot
commit: ff98ec6d084ecd9f5f6186c69c01fd09b6042e2e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri May 10 21:15:44 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri May 10 21:16:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff98ec6d

games-action/supertuxkart: Drop old 0.9.3

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

 games-action/supertuxkart/Manifest |   1 -
 .../files/supertuxkart-0.9.3-fix-buildsystem.patch | 103 -
 .../files/supertuxkart-0.9.3-intrin.patch  |  56 ---
 .../supertuxkart-0.9.3-irrlicht-bundled-libs.patch |  33 ---
 .../files/supertuxkart-0.9.3-unbundle-enet.patch   |  57 
 .../files/supertuxkart-0.9.3-unbundle-libs.patch   |  19 
 .../supertuxkart/supertuxkart-0.9.3.ebuild |  91 --
 7 files changed, 360 deletions(-)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index d64bb151b7d..5a0e070b25a 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,3 +1,2 @@
-DIST supertuxkart-0.9.3-src.tar.xz 544517772 BLAKE2B 
84ab64371a59bf302905181ad98dd12542a9ffda18b9081ecfa6fcbb61d89c6b1f76f3598184459bbb40a42a1c968767837e76bbd0c9b2ade6b4c18831bc61fb
 SHA512 
29eb1d8fb8e336453e590273089af09eac9a563f82c0bc797d43d5e21d5c9d1274a84ea7ee46487b3d127c47e55e3d233ad7e0e8c502c15dbafc1cc0f5c861c9
 DIST supertuxkart-1.0-src.tar.xz 597012504 BLAKE2B 
ed1b851bad8696b4593c54f215b115528afc29bde237f67627e2918c4a9fab09eddc204d0c879fa85c6b10b5544dba5fa5fc1b437cb83e6d884ac717e3369c28
 SHA512 
182754610abd09545630fa1f7fda858ba1731bbacb078bc71597e143f9cb2a1cfcedd3038720760d0471a89b79cc3bb1eb292d38fcd53be05aad7cb17c474ca9
 DIST supertuxkart.png 4435 BLAKE2B 
b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80
 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda

diff --git 
a/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch 
b/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch
deleted file mode 100644
index def5c80340b..000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-* Unbundle remaining libraries: GLEW, zlib, png, jpeg
-* Add -DAS_DEPRECATED for Angelscript
-* Remove definition of debug macros
-* Build bundled Irrlicht with user flags
-
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,43 +110,11 @@
- include_directories(${ENET_INCLUDE_DIR})
- 
- # Build glew library
- if(NOT USE_GLES2 AND NOT SERVER_ONLY)
-+find_package(GLEW REQUIRED)
-+include_directories(${GLEW_INCLUDE_DIRS})
- add_definitions(-DGLEW_NO_GLU)
--add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
--include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
- endif()
-
--if(MSVC OR APPLE)
--if (NOT APPLE)
--# Build zlib library
--add_subdirectory("${PROJECT_SOURCE_DIR}/lib/zlib")
--include_directories("${PROJECT_SOURCE_DIR}/lib/zlib")
--
--set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/zlib" 
"${PROJECT_BINARY_DIR}/lib/zlib/")
--set(ZLIB_LIBRARY zlibstatic)
--endif()
--
--# Build png library
--set(SKIP_INSTALL_ALL TRUE)
--set(PNG_STATIC TRUE CACHE BOOL "Build static lib")
--set(PNG_TESTS FALSE CACHE BOOL "Build libpng tests")
--set(PNG_SHARED FALSE CACHE BOOL "Build shared lib")
--add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
--include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
--
--set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
--set(PNG_LIBRARY png_static)
--endif()
--
--# Add jpeg library
--if (APPLE)
--add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
--include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
--set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
--set(JPEG_LIBRARY jpeglib)
--else()
--find_package(JPEG REQUIRED)
--include_directories(${JPEG_INCLUDE_DIR})
--endif()
- 
- if (BUILD_RECORDER)
-@@ -206,6 +174,7 @@
- find_package(Angelscript)
- if(ANGELSCRIPT_FOUND)
- include_directories(${Angelscript_INCLUDE_DIRS})
-+add_definitions(-DAS_DEPRECATED)
- else()
- message(FATAL_ERROR "Angelscript not found. "
- "Either install angelscript or use built-in version using "
-@@ -307,14 +276,6 @@
- # VS will automatically add NDEBUG for release mode, but only _DEBUG in 
debug mode.
- # Since STK uses DEBUG, this is added for debug compilation only:
- set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG)
--else()
--# All non VS generators used create only a single compile mode, so
--# compile flags can be simplye be added
--if(CMAKE_BUILD_TYPE MATCHES Debug)

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2018-08-15 Thread Michał Górny
commit: 2509f831150f2f1fd6107730a70d98ede448e81c
Author: Marty E. Plummer  startmail  com>
AuthorDate: Thu Aug  2 23:16:49 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug 15 10:33:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2509f831

games-action/supertuxkart: eutils->desktop

Only has eutils for the implicit desktop inheritance for doicon.

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 games-action/supertuxkart/supertuxkart-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild 
b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
index cfda52536ec..1e666dfcdc1 100644
--- a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils eutils gnome2-utils
+inherit cmake-utils desktop gnome2-utils
 
 DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
 HOMEPAGE="https://supertuxkart.net/";



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/, games-action/supertuxkart/

2018-01-18 Thread James Le Cuirot
commit: 49441c0caade1866d7270e166025c06b1f71acbd
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Jan 18 15:21:18 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jan 18 15:24:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49441c0c

games-action/supertuxkart: Add upstream patch to fix CPU intrinsics

Closes: https://bugs.gentoo.org/644190
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/supertuxkart-0.9.3-intrin.patch  | 56 ++
 .../supertuxkart/supertuxkart-0.9.3.ebuild |  3 +-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch 
b/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch
new file mode 100644
index 000..75830b8ba8f
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch
@@ -0,0 +1,56 @@
+From 813b08bc73e4e93714b972ee56c64b4771735e01 Mon Sep 17 00:00:00 2001
+From: Benau 
+Date: Sun, 14 Jan 2018 10:19:37 +0800
+Subject: [PATCH] Fix #3091
+
+---
+ lib/graphics_utils/mipmap/cpusimd.h | 14 +++---
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/lib/graphics_utils/mipmap/cpusimd.h 
b/lib/graphics_utils/mipmap/cpusimd.h
+index 1dc2c730b2..5e2cf30e5f 100644
+--- a/lib/graphics_utils/mipmap/cpusimd.h
 b/lib/graphics_utils/mipmap/cpusimd.h
+@@ -38,11 +38,11 @@
+  #include 
+  #define CPU_MMX_SUPPORT (1)
+ #endif
+-#if __SSE__ || _M_X64 || _M_IX86_FP >= 1  || CPU_ENABLE_SSE
++#if __SSE__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 1 
) ) || CPU_ENABLE_SSE
+  #include 
+  #define CPU_SSE_SUPPORT (1)
+ #endif
+-#if __SSE2__ || _M_X64 || _M_IX86_FP >= 2  || CPU_ENABLE_SSE2
++#if __SSE2__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 2 
) ) || CPU_ENABLE_SSE2
+  #include 
+  #define CPU_SSE2_SUPPORT (1)
+ #endif
+@@ -95,23 +95,23 @@
+  #define CPU_POPCNT_SUPPORT (1)
+ #endif
+ #if __LZCNT__ || CPU_ENABLE_LZCNT
+- #include 
++ #include 
+  #define CPU_LZCNT_SUPPORT (1)
+ #endif
+ #if __F16C__ || CPU_ENABLE_F16C
+- #include 
++ #include 
+  #define CPU_F16C_SUPPORT (1)
+ #endif
+ #if __BMI__ || CPU_ENABLE_BMI
+- #include 
++ #include 
+  #define CPU_BMI_SUPPORT (1)
+ #endif
+ #if __BMI2__ || CPU_ENABLE_BMI2
+- #include 
++ #include 
+  #define CPU_BMI2_SUPPORT (1)
+ #endif
+ #if __TBM__ || CPU_ENABLE_TBM
+- #include 
++ #include 
+  #define CPU_TBM_SUPPORT (1)
+ #endif
+ 

diff --git a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild 
b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
index 04fa2e6dba1..cfda52536ec 100644
--- a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
 
 PATCHES=(
+   "${FILESDIR}"/${PN}-0.9.3-intrin.patch
"${FILESDIR}"/${PN}-0.9.3-unbundle-enet.patch
"${FILESDIR}"/${PN}-0.9.3-unbundle-libs.patch
"${FILESDIR}"/${PN}-0.9.3-irrlicht-arch-support.patch



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/, games-action/supertuxkart/

2018-01-18 Thread James Le Cuirot
commit: 1d91d44035891bd167061058ceea4ed52dd27ca3
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Jan 18 15:23:06 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jan 18 15:24:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d91d440

games-action/supertuxkart: Drop old 0.9.2

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 games-action/supertuxkart/Manifest |   1 -
 .../files/supertuxkart-0.9.2-fix-angelscript.patch |  27 --
 .../files/supertuxkart-0.9.2-fix-buildsystem.patch |  97 ---
 .../supertuxkart-0.9.2-irrlicht-arch-support.patch |  49 --
 .../supertuxkart-0.9.2-irrlicht-as-needed.patch|  24 -
 .../supertuxkart-0.9.2-irrlicht-bundled-libs.patch |  35 ---
 .../supertuxkart-0.9.2-irrlicht-system-libs.patch  | 105 -
 .../files/supertuxkart-0.9.2-unbundle-enet.patch   |  58 
 .../files/supertuxkart-0.9.2-unbundle-libs.patch   |  19 
 .../supertuxkart/supertuxkart-0.9.2.ebuild |  90 --
 10 files changed, 505 deletions(-)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index dcfa47b571f..cd3817a2848 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,3 +1,2 @@
-DIST supertuxkart-0.9.2-src.tar.xz 501606188 BLAKE2B 
cc77900ef49b31bfa26cd7be244279a64422757fce6bd020b262bfb8159d486d454a0bcfe49b6c958b8951b60accdbf7a41061cd69b1e2c74e9dfd7ac736919e
 SHA512 
57f11d518736f88044d1cb73e1dfcc92f5667f3b1147ab7e54435f6bc560fe856c3650410410da5fa048bf23d0b64fc8a9887c830001e1435b0359c9163e71b0
 DIST supertuxkart-0.9.3-src.tar.xz 544517772 BLAKE2B 
84ab64371a59bf302905181ad98dd12542a9ffda18b9081ecfa6fcbb61d89c6b1f76f3598184459bbb40a42a1c968767837e76bbd0c9b2ade6b4c18831bc61fb
 SHA512 
29eb1d8fb8e336453e590273089af09eac9a563f82c0bc797d43d5e21d5c9d1274a84ea7ee46487b3d127c47e55e3d233ad7e0e8c502c15dbafc1cc0f5c861c9
 DIST supertuxkart.png 4435 BLAKE2B 
b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80
 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda

diff --git 
a/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-angelscript.patch 
b/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-angelscript.patch
deleted file mode 100644
index a2f4fb1829e..000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-angelscript.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix FTBFS on arm64, mips/mips64/mipsel, ppc64el, s390x
-Origin: upstream, 
https://github.com/supertuxkart/stk-code/commit/5e05f1178ce6bc5f3a653b55ab3dc6d016196341
-Bug: https://github.com/supertuxkart/stk-code/issues/2569
-Bug-Debian: https://bugs.debian.org/830748
-Last-Update: 2016-12-03
-
 a/lib/angelscript/projects/cmake/CMakeLists.txt
-+++ b/lib/angelscript/projects/cmake/CMakeLists.txt
-@@ -68,6 +68,7 @@ set(ANGELSCRIPT_SOURCE
- ../../source/as_bytecode.cpp
- ../../source/as_callfunc.cpp
- ../../source/as_callfunc_x86.cpp
-+../../source/as_callfunc_mips.cpp
- ../../source/as_callfunc_x64_gcc.cpp
- ../../source/as_callfunc_x64_msvc.cpp
- ../../source/as_callfunc_x64_mingw.cpp
 a/lib/angelscript/source/as_config.h
-+++ b/lib/angelscript/source/as_config.h
-@@ -844,7 +844,7 @@
-   #define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-   #define AS_X86
-   #undef AS_NO_THISCALL_FUNCTOR_METHOD
--  #elif defined(__LP64__) && !defined(__arm64__)
-+  #elif defined(__x86_64__)
-   #define AS_X64_GCC
-   #undef AS_NO_THISCALL_FUNCTOR_METHOD
-   #define HAS_128_BIT_PRIMITIVES

diff --git 
a/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-buildsystem.patch 
b/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-buildsystem.patch
deleted file mode 100644
index 6f1c39b3693..000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-buildsystem.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-* Unbundle remaining libraries: GLEW, zlib, png, jpeg
-* Add -DAS_DEPRECATED for Angelscript
-* Remove definition of debug macros
-* Build bundled Irrlicht with user flags
-
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -68,37 +68,10 @@
- include_directories(${ENET_INCLUDE_DIR})
- 
- # Build glew library
-+find_package(GLEW REQUIRED)
-+include_directories(${GLEW_INCLUDE_DIRS})
- add_definitions(-DGLEW_NO_GLU)
--add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
--include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
- 
--if((WIN32 AND NOT MINGW) OR APPLE)
--if (NOT APPLE)
--# Build zlib library
--add_subdirectory("${PROJECT_SOURCE_DIR}/lib/zlib")
--include_directories("${PROJECT_SOURCE_DIR}/lib/zlib")
--
--set(ZLIB_INCLUDE_DIR "$

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/

2017-12-26 Thread James Le Cuirot
commit: e6532de05dd104f6427e27a6445b58e4ba062da5
Author: François-Xavier Carton  gmail  com>
AuthorDate: Tue Dec 26 04:01:24 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Dec 26 12:01:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6532de0

games-action/supertuxkart: add version 0.9.3

Closes: https://bugs.gentoo.org/show_bug.cgi?id=640574

 games-action/supertuxkart/Manifest |   1 +
 .../files/supertuxkart-0.9.3-fix-buildsystem.patch | 103 +
 .../supertuxkart-0.9.3-irrlicht-arch-support.patch |  47 ++
 .../supertuxkart-0.9.3-irrlicht-bundled-libs.patch |  33 +++
 .../supertuxkart-0.9.3-irrlicht-system-libs.patch  |  56 +++
 .../files/supertuxkart-0.9.3-unbundle-enet.patch   |  57 
 .../files/supertuxkart-0.9.3-unbundle-libs.patch   |  19 
 .../supertuxkart/supertuxkart-0.9.3.ebuild |  90 ++
 8 files changed, 406 insertions(+)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index 784666bf9dd..dcfa47b571f 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,2 +1,3 @@
 DIST supertuxkart-0.9.2-src.tar.xz 501606188 BLAKE2B 
cc77900ef49b31bfa26cd7be244279a64422757fce6bd020b262bfb8159d486d454a0bcfe49b6c958b8951b60accdbf7a41061cd69b1e2c74e9dfd7ac736919e
 SHA512 
57f11d518736f88044d1cb73e1dfcc92f5667f3b1147ab7e54435f6bc560fe856c3650410410da5fa048bf23d0b64fc8a9887c830001e1435b0359c9163e71b0
+DIST supertuxkart-0.9.3-src.tar.xz 544517772 BLAKE2B 
84ab64371a59bf302905181ad98dd12542a9ffda18b9081ecfa6fcbb61d89c6b1f76f3598184459bbb40a42a1c968767837e76bbd0c9b2ade6b4c18831bc61fb
 SHA512 
29eb1d8fb8e336453e590273089af09eac9a563f82c0bc797d43d5e21d5c9d1274a84ea7ee46487b3d127c47e55e3d233ad7e0e8c502c15dbafc1cc0f5c861c9
 DIST supertuxkart.png 4435 BLAKE2B 
b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80
 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda

diff --git 
a/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch 
b/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch
new file mode 100644
index 000..def5c80340b
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch
@@ -0,0 +1,103 @@
+* Unbundle remaining libraries: GLEW, zlib, png, jpeg
+* Add -DAS_DEPRECATED for Angelscript
+* Remove definition of debug macros
+* Build bundled Irrlicht with user flags
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -110,43 +110,11 @@
+ include_directories(${ENET_INCLUDE_DIR})
+ 
+ # Build glew library
+ if(NOT USE_GLES2 AND NOT SERVER_ONLY)
++find_package(GLEW REQUIRED)
++include_directories(${GLEW_INCLUDE_DIRS})
+ add_definitions(-DGLEW_NO_GLU)
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
+ endif()
+
+-if(MSVC OR APPLE)
+-if (NOT APPLE)
+-# Build zlib library
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/zlib")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/zlib")
+-
+-set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/zlib" 
"${PROJECT_BINARY_DIR}/lib/zlib/")
+-set(ZLIB_LIBRARY zlibstatic)
+-endif()
+-
+-# Build png library
+-set(SKIP_INSTALL_ALL TRUE)
+-set(PNG_STATIC TRUE CACHE BOOL "Build static lib")
+-set(PNG_TESTS FALSE CACHE BOOL "Build libpng tests")
+-set(PNG_SHARED FALSE CACHE BOOL "Build shared lib")
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
+-
+-set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
+-set(PNG_LIBRARY png_static)
+-endif()
+-
+-# Add jpeg library
+-if (APPLE)
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+-set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
+-set(JPEG_LIBRARY jpeglib)
+-else()
+-find_package(JPEG REQUIRED)
+-include_directories(${JPEG_INCLUDE_DIR})
+-endif()
+ 
+ if (BUILD_RECORDER)
+@@ -206,6 +174,7 @@
+ find_package(Angelscript)
+ if(ANGELSCRIPT_FOUND)
+ include_directories(${Angelscript_INCLUDE_DIRS})
++add_definitions(-DAS_DEPRECATED)
+ else()
+ message(FATAL_ERROR "Angelscript not found. "
+ "Either install angelscript or use built-in version using "
+@@ -307,14 +276,6 @@
+ # VS will automatically add NDEBUG for release mode, but only _DEBUG in 
debug mode.
+ # Since STK uses DEBUG, this is added for debug compilation only:
+ set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG)
+-else()
+-# All non VS generators used create only a single compile mode, so
+-# compile flags can be simplye be added

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2017-12-26 Thread James Le Cuirot
commit: e93809a9db6ae7ed4c9ee500230b6531f6014334
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Dec 26 11:59:16 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Dec 26 12:01:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93809a9

games-action/supertuxkart: Rename openglrecorder flag to recorder

Better to name it after what the flag does. There is also another
package with a recorder flag.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 games-action/supertuxkart/metadata.xml  | 1 +
 games-action/supertuxkart/supertuxkart-0.9.3.ebuild | 8 
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/games-action/supertuxkart/metadata.xml 
b/games-action/supertuxkart/metadata.xml
index 62c1f65db33..a5ee3731025 100644
--- a/games-action/supertuxkart/metadata.xml
+++ b/games-action/supertuxkart/metadata.xml
@@ -7,6 +7,7 @@


Support for right-to-left languages
+   Enable recording with 
media-libs/libopenglrecorder
Support for wiimote input devices



diff --git a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild 
b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
index 48522586a24..04fa2e6dba1 100644
--- a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug fribidi wiimote openglrecorder"
+IUSE="debug fribidi recorder wiimote"
 
 # don't unbundle irrlicht and bullet
 # both are modified and system versions will break the game
@@ -34,8 +34,8 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXxf86vm
fribidi? ( dev-libs/fribidi )
-   wiimote? ( net-wireless/bluez )
-   openglrecorder? ( media-libs/libopenglrecorder )"
+   recorder? ( media-libs/libopenglrecorder )
+   wiimote? ( net-wireless/bluez )"
 DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig"
@@ -62,8 +62,8 @@ src_configure() {
# to failed assert segfaults
-DUSE_SYSTEM_ANGELSCRIPT=OFF
-DUSE_FRIBIDI=$(usex fribidi)
+   -DBUILD_RECORDER=$(usex recorder)
-DUSE_WIIUSE=$(usex wiimote)
-   -DBUILD_RECORDER=$(usex openglrecorder)
-DSTK_INSTALL_BINARY_DIR=bin
-DSTK_INSTALL_DATA_DIR=share/${PN}
)



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2017-09-29 Thread Michael Palimaka
commit: 47829b7503089c63296235633ae3a56d2ed3b52f
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Sep 30 05:23:34 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Sep 30 05:32:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47829b75

games-action/supertuxkart: remove 0.9.1

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 games-action/supertuxkart/Manifest |  1 -
 .../supertuxkart/supertuxkart-0.9.1.ebuild | 82 --
 2 files changed, 83 deletions(-)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index 93f2de11f33..2fafd85e8eb 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,3 +1,2 @@
-DIST supertuxkart-0.9.1-src.tar.xz 425822808 SHA256 
c50f00a71df165fb613d20e86bea2d9d5e51ed3e27e1d436fbac3b07cf2ea149 SHA512 
11ea064210ea6bc36258f08e57c6aac46739133017ad3ba97ca0edd84c818c2f72dae60bbe7cd79135be9785fb0e15c9904b151c894e1c21b881598113344cf4
 WHIRLPOOL 
8acd59e878b44f8e504d57687ea1bbece05d5f14b29e0c62a22183729129fb115fccb9a1a89d5e0a86881ac6487c36ea520aab835ba5efaaa3c71471fda9b15f
 DIST supertuxkart-0.9.2-src.tar.xz 501606188 SHA256 
0b080bb098a26adb552d6fd48905bcb6b1e873ef1567457d7268d7d3aaa48282 SHA512 
57f11d518736f88044d1cb73e1dfcc92f5667f3b1147ab7e54435f6bc560fe856c3650410410da5fa048bf23d0b64fc8a9887c830001e1435b0359c9163e71b0
 WHIRLPOOL 
c534854127981821412437632fdf9ff239988199d60f8d582b59bd624dff87f5e37a5cb54020b679e9fb6d440187a5bd0e0c2eb00311e2ae8de6ba58fb1d1d82
 DIST supertuxkart.png 4435 SHA256 
99bc1801cb0514946cb0171d6d5a84484b6dc881edfa7f096b6eb5fea2f28828 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
 WHIRLPOOL 
eef651802a927b451226fc06a682d7dea68b65b05195130ccfc7544165f26f65bda4fc9565e09d6487d02be3cf57880b0c6c257f26587c6bc6d30afc6aa5d3c2

diff --git a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild 
b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
deleted file mode 100644
index 76bf1314a81..000
--- a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2-utils cmake-utils eutils games
-
-DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
-HOMEPAGE="https://supertuxkart.net/";
-SRC_URI="mirror://sourceforge/supertuxkart/SuperTuxKart/${PV}/${P}-src.tar.xz
-   mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug fribidi wiimote"
-
-# don't unbundle irrlicht and bullet
-# both are modified and system versions will break the game
-# https://sourceforge.net/p/irrlicht/feature-requests/138/
-
-RDEPEND="media-libs/libpng:0
-   media-libs/libvorbis
-   media-libs/openal
-   net-misc/curl
-   sys-libs/zlib
-   virtual/glu
-   virtual/jpeg:0
-   virtual/libintl
-   virtual/opengl
-   x11-libs/libX11
-   x11-libs/libXxf86vm
-   fribidi? ( dev-libs/fribidi )
-   wiimote? ( net-wireless/bluez )"
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig"
-
-src_prepare() {
-   # inconsistent handling of debug definition
-   # avoid using Debug build type
-   if use debug ; then
-   sed -i \
-   -e 
's/add_definitions(-DNDEBUG)/add_definitions(-DDEBUG)/' \
-   CMakeLists.txt || die
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_use fribidi FRIBIDI)
-   $(cmake-utils_use_use wiimote WIIUSE)
-   -DSTK_INSTALL_BINARY_DIR="${GAMES_BINDIR}"
-   -DSTK_INSTALL_DATA_DIR="${GAMES_DATADIR}"/${PN}
-   )
-
-   cmake-utils_src_configure
-}
-
-src_compile() {
-   cmake-utils_src_compile
-}
-
-src_install() {
-   DOCS="AUTHORS CHANGELOG.md README.md TODO.md" \
-   cmake-utils_src_install
-   doicon -s 64 "${DISTDIR}"/${PN}.png
-   prepgamesdirs
-}
-
-pkg_preinst() {
-   games_pkg_preinst
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   games_pkg_postinst
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-}



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2017-09-29 Thread Michael Palimaka
commit: 8af899b4febe14d7fdd0f064eacc087008ca1380
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Sep 30 05:22:36 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Sep 30 05:32:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af899b4

games-action/supertuxkart: stabilise 0.9.2 for amd64/x86

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

 games-action/supertuxkart/supertuxkart-0.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/supertuxkart/supertuxkart-0.9.2.ebuild 
b/games-action/supertuxkart/supertuxkart-0.9.2.ebuild
index 3a6bb3ccb47..05ff5a68fc1 100644
--- a/games-action/supertuxkart/supertuxkart-0.9.2.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.9.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz
 
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug fribidi wiimote"
 
 # don't unbundle irrlicht and bullet



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2017-09-19 Thread James Le Cuirot
commit: 9bcced08d6bffbf63b020247268ddebb9e00022d
Author: Francesco Turco  fastmail  fm>
AuthorDate: Mon Sep 18 21:17:32 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Sep 19 10:49:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bcced08

games-action/supertuxkart: update HOMEPAGE

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

 games-action/supertuxkart/supertuxkart-0.9.1.ebuild | 6 +++---
 games-action/supertuxkart/supertuxkart-0.9.2.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild 
b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
index 6b6f06c3cac..76bf1314a81 100644
--- a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit gnome2-utils cmake-utils eutils games
 
 DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
-HOMEPAGE="http://supertuxkart.sourceforge.net/";
+HOMEPAGE="https://supertuxkart.net/";
 SRC_URI="mirror://sourceforge/supertuxkart/SuperTuxKart/${PV}/${P}-src.tar.xz
mirror://gentoo/${PN}.png"
 
@@ -16,7 +16,7 @@ IUSE="debug fribidi wiimote"
 
 # don't unbundle irrlicht and bullet
 # both are modified and system versions will break the game
-# 
https://sourceforge.net/tracker/?func=detail&aid=3454889&group_id=74339&atid=540679
+# https://sourceforge.net/p/irrlicht/feature-requests/138/
 
 RDEPEND="media-libs/libpng:0
media-libs/libvorbis

diff --git a/games-action/supertuxkart/supertuxkart-0.9.2.ebuild 
b/games-action/supertuxkart/supertuxkart-0.9.2.ebuild
index 5acaf5d9f8b..3a6bb3ccb47 100644
--- a/games-action/supertuxkart/supertuxkart-0.9.2.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.9.2.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils eutils gnome2-utils
 
 DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
-HOMEPAGE="http://supertuxkart.sourceforge.net/";
+HOMEPAGE="https://supertuxkart.net/";
 SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz
mirror://gentoo/${PN}.png"
 
@@ -17,7 +17,7 @@ IUSE="debug fribidi wiimote"
 
 # don't unbundle irrlicht and bullet
 # both are modified and system versions will break the game
-# 
https://sourceforge.net/tracker/?func=detail&aid=3454889&group_id=74339&atid=540679
+# https://sourceforge.net/p/irrlicht/feature-requests/138/
 
 RDEPEND="
media-libs/glew:0=



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/

2016-12-30 Thread David Seifert
commit: 1209a07b7421a4e01fdab912bffea3b5ea29f486
Author: David Seifert  gentoo  org>
AuthorDate: Fri Dec 30 10:00:20 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Dec 30 14:37:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1209a07b

games-action/supertuxkart: Version bump to 0.9.2

Gentoo-bug: 594396, 598491, 598493
* EAPI=6
* Remove games.eclass
* Add Debian patches for unbundling
* Add GPL-2 license

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-action/supertuxkart/Manifest |   1 +
 .../files/supertuxkart-0.9.2-fix-angelscript.patch |  27 ++
 .../files/supertuxkart-0.9.2-fix-buildsystem.patch |  97 +++
 .../supertuxkart-0.9.2-irrlicht-arch-support.patch |  49 ++
 .../supertuxkart-0.9.2-irrlicht-as-needed.patch|  24 +
 .../supertuxkart-0.9.2-irrlicht-bundled-libs.patch |  35 +++
 .../supertuxkart-0.9.2-irrlicht-system-libs.patch  | 105 +
 .../files/supertuxkart-0.9.2-unbundle-enet.patch   |  58 
 .../files/supertuxkart-0.9.2-unbundle-libs.patch   |  19 
 .../supertuxkart/supertuxkart-0.9.2.ebuild |  91 ++
 10 files changed, 506 insertions(+)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index 99cc093..93f2de1 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,2 +1,3 @@
 DIST supertuxkart-0.9.1-src.tar.xz 425822808 SHA256 
c50f00a71df165fb613d20e86bea2d9d5e51ed3e27e1d436fbac3b07cf2ea149 SHA512 
11ea064210ea6bc36258f08e57c6aac46739133017ad3ba97ca0edd84c818c2f72dae60bbe7cd79135be9785fb0e15c9904b151c894e1c21b881598113344cf4
 WHIRLPOOL 
8acd59e878b44f8e504d57687ea1bbece05d5f14b29e0c62a22183729129fb115fccb9a1a89d5e0a86881ac6487c36ea520aab835ba5efaaa3c71471fda9b15f
+DIST supertuxkart-0.9.2-src.tar.xz 501606188 SHA256 
0b080bb098a26adb552d6fd48905bcb6b1e873ef1567457d7268d7d3aaa48282 SHA512 
57f11d518736f88044d1cb73e1dfcc92f5667f3b1147ab7e54435f6bc560fe856c3650410410da5fa048bf23d0b64fc8a9887c830001e1435b0359c9163e71b0
 WHIRLPOOL 
c534854127981821412437632fdf9ff239988199d60f8d582b59bd624dff87f5e37a5cb54020b679e9fb6d440187a5bd0e0c2eb00311e2ae8de6ba58fb1d1d82
 DIST supertuxkart.png 4435 SHA256 
99bc1801cb0514946cb0171d6d5a84484b6dc881edfa7f096b6eb5fea2f28828 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
 WHIRLPOOL 
eef651802a927b451226fc06a682d7dea68b65b05195130ccfc7544165f26f65bda4fc9565e09d6487d02be3cf57880b0c6c257f26587c6bc6d30afc6aa5d3c2

diff --git 
a/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-angelscript.patch 
b/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-angelscript.patch
new file mode 100644
index ..a2f4fb1
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-angelscript.patch
@@ -0,0 +1,27 @@
+Description: Fix FTBFS on arm64, mips/mips64/mipsel, ppc64el, s390x
+Origin: upstream, 
https://github.com/supertuxkart/stk-code/commit/5e05f1178ce6bc5f3a653b55ab3dc6d016196341
+Bug: https://github.com/supertuxkart/stk-code/issues/2569
+Bug-Debian: https://bugs.debian.org/830748
+Last-Update: 2016-12-03
+
+--- a/lib/angelscript/projects/cmake/CMakeLists.txt
 b/lib/angelscript/projects/cmake/CMakeLists.txt
+@@ -68,6 +68,7 @@ set(ANGELSCRIPT_SOURCE
+ ../../source/as_bytecode.cpp
+ ../../source/as_callfunc.cpp
+ ../../source/as_callfunc_x86.cpp
++../../source/as_callfunc_mips.cpp
+ ../../source/as_callfunc_x64_gcc.cpp
+ ../../source/as_callfunc_x64_msvc.cpp
+ ../../source/as_callfunc_x64_mingw.cpp
+--- a/lib/angelscript/source/as_config.h
 b/lib/angelscript/source/as_config.h
+@@ -844,7 +844,7 @@
+   #define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+   #define AS_X86
+   #undef AS_NO_THISCALL_FUNCTOR_METHOD
+-  #elif defined(__LP64__) && !defined(__arm64__)
++  #elif defined(__x86_64__)
+   #define AS_X64_GCC
+   #undef AS_NO_THISCALL_FUNCTOR_METHOD
+   #define HAS_128_BIT_PRIMITIVES

diff --git 
a/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-buildsystem.patch 
b/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-buildsystem.patch
new file mode 100644
index ..6f1c39b
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-buildsystem.patch
@@ -0,0 +1,97 @@
+* Unbundle remaining libraries: GLEW, zlib, png, jpeg
+* Add -DAS_DEPRECATED for Angelscript
+* Remove definition of debug macros
+* Build bundled Irrlicht with user flags
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -68,37 +68,10 @@
+ include_directories(${ENET_INCLUDE_DIR})
+ 
+ # Build glew library
++find_package(GLEW REQUIRED)
++include_directories(${GLEW_INCLUDE_DIRS})
+ add_definitions(-DGLEW_NO_GLU)
+-add_subdirectory("${PROJECT_SOU

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/, games-action/supertuxkart/

2015-12-28 Thread Michael Sterrett
commit: 38eb1039ea4457656b4a3c39266c490810814634
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Dec 29 04:05:46 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Dec 29 07:40:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38eb1039

old

Package-Manager: portage-2.2.24

 games-action/supertuxkart/Manifest |  1 -
 .../files/supertuxkart-0.8.1-cmake.patch   | 20 -
 .../files/supertuxkart-0.8.1-desktopfile.patch | 24 --
 .../files/supertuxkart-0.8.1-gentoo.patch  | 47 ---
 .../files/supertuxkart-0.8.1-icon-dest.patch   | 19 -
 .../files/supertuxkart-0.8.1-irrlicht.patch| 69 
 .../files/supertuxkart-0.8.1-jpeg9.patch   | 11 ---
 .../files/supertuxkart-0.8.1-mesa-10.x.patch   | 38 -
 .../supertuxkart/supertuxkart-0.8.1.ebuild | 92 --
 9 files changed, 321 deletions(-)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index 4250de8..99cc093 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,3 +1,2 @@
-DIST supertuxkart-0.8.1-src.tar.bz2 229944480 SHA256 
335301ae61b0c177be68d5593c65e5b197dc807421f08a8a35740a254cacf8d6 SHA512 
1d72230a2cfa6196c6ea6c5464f01d1a0064994c9dafbf5d47c04b5db87e82590fde57a88d5316f2cf6094dcebae5e115b81e5ecc964a29bd669bc83d527d13a
 WHIRLPOOL 
5cf87e57cd5b5d12e4549bf49efb0596e4a1fafa7cba58e366c843e2ebf61c02e5c3471d1591f1231194021cbcb6082829e026616403680fc7ad05bd235b155e
 DIST supertuxkart-0.9.1-src.tar.xz 425822808 SHA256 
c50f00a71df165fb613d20e86bea2d9d5e51ed3e27e1d436fbac3b07cf2ea149 SHA512 
11ea064210ea6bc36258f08e57c6aac46739133017ad3ba97ca0edd84c818c2f72dae60bbe7cd79135be9785fb0e15c9904b151c894e1c21b881598113344cf4
 WHIRLPOOL 
8acd59e878b44f8e504d57687ea1bbece05d5f14b29e0c62a22183729129fb115fccb9a1a89d5e0a86881ac6487c36ea520aab835ba5efaaa3c71471fda9b15f
 DIST supertuxkart.png 4435 SHA256 
99bc1801cb0514946cb0171d6d5a84484b6dc881edfa7f096b6eb5fea2f28828 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
 WHIRLPOOL 
eef651802a927b451226fc06a682d7dea68b65b05195130ccfc7544165f26f65bda4fc9565e09d6487d02be3cf57880b0c6c257f26587c6bc6d30afc6aa5d3c2

diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-cmake.patch 
b/games-action/supertuxkart/files/supertuxkart-0.8.1-cmake.patch
deleted file mode 100644
index 17a7236..000
--- a/games-action/supertuxkart/files/supertuxkart-0.8.1-cmake.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 CMakeLists.txt.orig2015-06-13 01:47:50.493401323 -0400
-+++ CMakeLists.txt 2015-06-13 01:48:53.691255054 -0400
-@@ -128,6 +128,9 @@
- find_package(OpenGL REQUIRED)
- include_directories(${OPENGL_INCLUDE_DIR})
- 
-+find_package(X11 REQUIRED)
-+include_directories(${X11_INCLUDE_DIR})
-+
- if(UNIX AND NOT APPLE)
- find_library(IRRLICHT_XF86VM_LIBRARY Xxf86vm)
- mark_as_advanced(IRRLICHT_XF86VM_LIBRARY)
-@@ -239,6 +242,7 @@
- ${IRRLICHT_XF86VM_LIBRARY}
- ${OPENAL_LIBRARY}
- ${OPENGL_LIBRARIES}
-+${X11_LIBRARIES}
- png
- jpeg
- bz2

diff --git 
a/games-action/supertuxkart/files/supertuxkart-0.8.1-desktopfile.patch 
b/games-action/supertuxkart/files/supertuxkart-0.8.1-desktopfile.patch
deleted file mode 100644
index 0766456..000
--- a/games-action/supertuxkart/files/supertuxkart-0.8.1-desktopfile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Julian Ospald 
-Date: Thu Dec 13 18:45:18 UTC 2012
-Subject: fix desktop file
-
 data/supertuxkart_desktop.template
-+++ data/supertuxkart_desktop.template
-@@ -1,14 +1,14 @@
- [Desktop Entry]
- Name=SuperTuxKart
--Icon=@PREFIX@/share/pixmaps/supertuxkart_128.png
-+Icon=supertuxkart
- GenericName=A kart racing game
- GenericName[de_DE]=Ein Kart-Rennspiel
- GenericName[fr_FR]=Un jeu de karting
- GenericName[gl]=Xogo de carreiras con karts
- GenericName[ro_RO]=Un joc de curse cu carturi
--Exec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart --no-console
-+Exec=@STK_INSTALL_BINARY_DIR@/supertuxkart --no-console
- Terminal=false
- StartupNotify=false
- Type=Application
--TryExec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart
-+TryExec=@STK_INSTALL_BINARY_DIR@/supertuxkart
- Categories=Game;ArcadeGame;

diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch 
b/games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch
deleted file mode 100644
index 647c522..000
--- a/games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-gentoo specific hacks because we unbundle the
-deps of irrlicht
-
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,7 +45,6 @@ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
- include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
- 
- # Build the irrlicht library
--add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
-

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2015-12-25 Thread Agostino Sarubbo
commit: 3662909b18e41a17cd6c48f998f7a9b118715026
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Dec 25 15:11:26 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Dec 25 15:11:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3662909b

games-action/supertuxkart: amd64 stable wrt bug #568944

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

 games-action/supertuxkart/supertuxkart-0.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild 
b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
index 14341da..bc45598 100644
--- a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="mirror://sourceforge/supertuxkart/SuperTuxKart/${PV}/${P}-src.tar.xz
 
 LICENSE="GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="debug fribidi wiimote"
 
 # don't unbundle irrlicht and bullet



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2015-12-12 Thread Michael Sterrett
commit: 1eb472328d7970eedca2ce9c8b0cda988b6ce20b
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sat Dec 12 16:51:36 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sat Dec 12 16:51:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb47232

clean old

Package-Manager: portage-2.2.24

 games-action/supertuxkart/Manifest|  1 -
 games-action/supertuxkart/supertuxkart-0.9.ebuild | 83 ---
 2 files changed, 84 deletions(-)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index a1bb6cd..4250de8 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,4 +1,3 @@
 DIST supertuxkart-0.8.1-src.tar.bz2 229944480 SHA256 
335301ae61b0c177be68d5593c65e5b197dc807421f08a8a35740a254cacf8d6 SHA512 
1d72230a2cfa6196c6ea6c5464f01d1a0064994c9dafbf5d47c04b5db87e82590fde57a88d5316f2cf6094dcebae5e115b81e5ecc964a29bd669bc83d527d13a
 WHIRLPOOL 
5cf87e57cd5b5d12e4549bf49efb0596e4a1fafa7cba58e366c843e2ebf61c02e5c3471d1591f1231194021cbcb6082829e026616403680fc7ad05bd235b155e
-DIST supertuxkart-0.9-src.tar.xz 385780604 SHA256 
c0eb24eb49e23ed6d03f4864feb43573e14971c8420bf60c3c654d4e05ff9aa6 SHA512 
0876ad8bda49b3a26be82ee60742704608f4aca3e16fc038a06d9aa8dce9389b15fa69b547eca4b4a3c073cea495e7872924732a2e66802987c905348ff25ebb
 WHIRLPOOL 
780c664d418de612fdfa2905dc86f0eddced5b2c0eef60b67931203afd34b418eb254d0270113846a1c51e149acd6a64157263895163fb1016a9a840384eeb51
 DIST supertuxkart-0.9.1-src.tar.xz 425822808 SHA256 
c50f00a71df165fb613d20e86bea2d9d5e51ed3e27e1d436fbac3b07cf2ea149 SHA512 
11ea064210ea6bc36258f08e57c6aac46739133017ad3ba97ca0edd84c818c2f72dae60bbe7cd79135be9785fb0e15c9904b151c894e1c21b881598113344cf4
 WHIRLPOOL 
8acd59e878b44f8e504d57687ea1bbece05d5f14b29e0c62a22183729129fb115fccb9a1a89d5e0a86881ac6487c36ea520aab835ba5efaaa3c71471fda9b15f
 DIST supertuxkart.png 4435 SHA256 
99bc1801cb0514946cb0171d6d5a84484b6dc881edfa7f096b6eb5fea2f28828 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
 WHIRLPOOL 
eef651802a927b451226fc06a682d7dea68b65b05195130ccfc7544165f26f65bda4fc9565e09d6487d02be3cf57880b0c6c257f26587c6bc6d30afc6aa5d3c2

diff --git a/games-action/supertuxkart/supertuxkart-0.9.ebuild 
b/games-action/supertuxkart/supertuxkart-0.9.ebuild
deleted file mode 100644
index b070ae7..000
--- a/games-action/supertuxkart/supertuxkart-0.9.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit gnome2-utils cmake-utils eutils games
-
-DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
-HOMEPAGE="http://supertuxkart.sourceforge.net/";
-SRC_URI="mirror://sourceforge/supertuxkart/SuperTuxKart/${PV}/${P}-src.tar.xz
-   mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug fribidi wiimote"
-
-# don't unbundle irrlicht and bullet
-# both are modified and system versions will break the game
-# 
http://sourceforge.net/tracker/?func=detail&aid=3454889&group_id=74339&atid=540679
-
-RDEPEND="media-libs/libpng:0
-   media-libs/libvorbis
-   media-libs/openal
-   net-misc/curl
-   sys-libs/zlib
-   virtual/glu
-   virtual/jpeg:62
-   virtual/libintl
-   virtual/opengl
-   x11-libs/libX11
-   x11-libs/libXxf86vm
-   fribidi? ( dev-libs/fribidi )
-   wiimote? ( net-wireless/bluez )"
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig"
-
-src_prepare() {
-   # inconsistent handling of debug definition
-   # avoid using Debug build type
-   if use debug ; then
-   sed -i \
-   -e 
's/add_definitions(-DNDEBUG)/add_definitions(-DDEBUG)/' \
-   CMakeLists.txt || die
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_use fribidi FRIBIDI)
-   $(cmake-utils_use_use wiimote WIIUSE)
-   -DSTK_INSTALL_BINARY_DIR="${GAMES_BINDIR}"
-   -DSTK_INSTALL_DATA_DIR="${GAMES_DATADIR}"/${PN}
-   )
-
-   cmake-utils_src_configure
-}
-
-src_compile() {
-   cmake-utils_src_compile
-}
-
-src_install() {
-   cmake-utils_src_install
-   doicon -s 64 "${DISTDIR}"/${PN}.png
-   dodoc AUTHORS CHANGELOG.md README.md TODO.md
-   prepgamesdirs
-}
-
-pkg_preinst() {
-   games_pkg_preinst
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   games_pkg_postinst
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-}



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2015-12-12 Thread Michael Sterrett
commit: 55961a2b6e1ee86302285556377ad0f5adbe84ff
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sat Dec 12 16:51:06 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sat Dec 12 16:51:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55961a2b

tidy; fix slot on virtual/jpeg

Package-Manager: portage-2.2.24

 games-action/supertuxkart/supertuxkart-0.9.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild 
b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
index b070ae7..14341da 100644
--- a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="media-libs/libpng:0
net-misc/curl
sys-libs/zlib
virtual/glu
-   virtual/jpeg:62
+   virtual/jpeg:0
virtual/libintl
virtual/opengl
x11-libs/libX11
@@ -62,9 +62,9 @@ src_compile() {
 }
 
 src_install() {
-   cmake-utils_src_install
+   DOCS="AUTHORS CHANGELOG.md README.md TODO.md" \
+   cmake-utils_src_install
doicon -s 64 "${DISTDIR}"/${PN}.png
-   dodoc AUTHORS CHANGELOG.md README.md TODO.md
prepgamesdirs
 }
 



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2015-11-09 Thread Michael Sterrett
commit: d1dd49b298eb55c4640dc419d3dc0833c234bc6b
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sun Nov  8 09:17:00 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Mon Nov  9 19:24:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1dd49b2

version bump

Package-Manager: portage-2.2.20.1

 games-action/supertuxkart/Manifest |  1 +
 .../supertuxkart/supertuxkart-0.9.1.ebuild | 83 ++
 2 files changed, 84 insertions(+)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index dab06ac..a1bb6cd 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,3 +1,4 @@
 DIST supertuxkart-0.8.1-src.tar.bz2 229944480 SHA256 
335301ae61b0c177be68d5593c65e5b197dc807421f08a8a35740a254cacf8d6 SHA512 
1d72230a2cfa6196c6ea6c5464f01d1a0064994c9dafbf5d47c04b5db87e82590fde57a88d5316f2cf6094dcebae5e115b81e5ecc964a29bd669bc83d527d13a
 WHIRLPOOL 
5cf87e57cd5b5d12e4549bf49efb0596e4a1fafa7cba58e366c843e2ebf61c02e5c3471d1591f1231194021cbcb6082829e026616403680fc7ad05bd235b155e
 DIST supertuxkart-0.9-src.tar.xz 385780604 SHA256 
c0eb24eb49e23ed6d03f4864feb43573e14971c8420bf60c3c654d4e05ff9aa6 SHA512 
0876ad8bda49b3a26be82ee60742704608f4aca3e16fc038a06d9aa8dce9389b15fa69b547eca4b4a3c073cea495e7872924732a2e66802987c905348ff25ebb
 WHIRLPOOL 
780c664d418de612fdfa2905dc86f0eddced5b2c0eef60b67931203afd34b418eb254d0270113846a1c51e149acd6a64157263895163fb1016a9a840384eeb51
+DIST supertuxkart-0.9.1-src.tar.xz 425822808 SHA256 
c50f00a71df165fb613d20e86bea2d9d5e51ed3e27e1d436fbac3b07cf2ea149 SHA512 
11ea064210ea6bc36258f08e57c6aac46739133017ad3ba97ca0edd84c818c2f72dae60bbe7cd79135be9785fb0e15c9904b151c894e1c21b881598113344cf4
 WHIRLPOOL 
8acd59e878b44f8e504d57687ea1bbece05d5f14b29e0c62a22183729129fb115fccb9a1a89d5e0a86881ac6487c36ea520aab835ba5efaaa3c71471fda9b15f
 DIST supertuxkart.png 4435 SHA256 
99bc1801cb0514946cb0171d6d5a84484b6dc881edfa7f096b6eb5fea2f28828 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
 WHIRLPOOL 
eef651802a927b451226fc06a682d7dea68b65b05195130ccfc7544165f26f65bda4fc9565e09d6487d02be3cf57880b0c6c257f26587c6bc6d30afc6aa5d3c2

diff --git a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild 
b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
new file mode 100644
index 000..b070ae7
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils cmake-utils eutils games
+
+DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
+HOMEPAGE="http://supertuxkart.sourceforge.net/";
+SRC_URI="mirror://sourceforge/supertuxkart/SuperTuxKart/${PV}/${P}-src.tar.xz
+   mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug fribidi wiimote"
+
+# don't unbundle irrlicht and bullet
+# both are modified and system versions will break the game
+# 
http://sourceforge.net/tracker/?func=detail&aid=3454889&group_id=74339&atid=540679
+
+RDEPEND="media-libs/libpng:0
+   media-libs/libvorbis
+   media-libs/openal
+   net-misc/curl
+   sys-libs/zlib
+   virtual/glu
+   virtual/jpeg:62
+   virtual/libintl
+   virtual/opengl
+   x11-libs/libX11
+   x11-libs/libXxf86vm
+   fribidi? ( dev-libs/fribidi )
+   wiimote? ( net-wireless/bluez )"
+DEPEND="${RDEPEND}
+   sys-devel/gettext
+   virtual/pkgconfig"
+
+src_prepare() {
+   # inconsistent handling of debug definition
+   # avoid using Debug build type
+   if use debug ; then
+   sed -i \
+   -e 
's/add_definitions(-DNDEBUG)/add_definitions(-DDEBUG)/' \
+   CMakeLists.txt || die
+   fi
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_use fribidi FRIBIDI)
+   $(cmake-utils_use_use wiimote WIIUSE)
+   -DSTK_INSTALL_BINARY_DIR="${GAMES_BINDIR}"
+   -DSTK_INSTALL_DATA_DIR="${GAMES_DATADIR}"/${PN}
+   )
+
+   cmake-utils_src_configure
+}
+
+src_compile() {
+   cmake-utils_src_compile
+}
+
+src_install() {
+   cmake-utils_src_install
+   doicon -s 64 "${DISTDIR}"/${PN}.png
+   dodoc AUTHORS CHANGELOG.md README.md TODO.md
+   prepgamesdirs
+}
+
+pkg_preinst() {
+   games_pkg_preinst
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   games_pkg_postinst
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}



[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/

2015-10-07 Thread Michael Sterrett
commit: 007f1c6b43d99a99a2b7620256915094de2afb79
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Oct  8 05:52:41 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Oct  8 05:52:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=007f1c6b

version bump (bug #547624)

Package-Manager: portage-2.2.20.1

 games-action/supertuxkart/Manifest|  1 +
 games-action/supertuxkart/supertuxkart-0.9.ebuild | 83 +++
 2 files changed, 84 insertions(+)

diff --git a/games-action/supertuxkart/Manifest 
b/games-action/supertuxkart/Manifest
index ebd2f36..dab06ac 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,2 +1,3 @@
 DIST supertuxkart-0.8.1-src.tar.bz2 229944480 SHA256 
335301ae61b0c177be68d5593c65e5b197dc807421f08a8a35740a254cacf8d6 SHA512 
1d72230a2cfa6196c6ea6c5464f01d1a0064994c9dafbf5d47c04b5db87e82590fde57a88d5316f2cf6094dcebae5e115b81e5ecc964a29bd669bc83d527d13a
 WHIRLPOOL 
5cf87e57cd5b5d12e4549bf49efb0596e4a1fafa7cba58e366c843e2ebf61c02e5c3471d1591f1231194021cbcb6082829e026616403680fc7ad05bd235b155e
+DIST supertuxkart-0.9-src.tar.xz 385780604 SHA256 
c0eb24eb49e23ed6d03f4864feb43573e14971c8420bf60c3c654d4e05ff9aa6 SHA512 
0876ad8bda49b3a26be82ee60742704608f4aca3e16fc038a06d9aa8dce9389b15fa69b547eca4b4a3c073cea495e7872924732a2e66802987c905348ff25ebb
 WHIRLPOOL 
780c664d418de612fdfa2905dc86f0eddced5b2c0eef60b67931203afd34b418eb254d0270113846a1c51e149acd6a64157263895163fb1016a9a840384eeb51
 DIST supertuxkart.png 4435 SHA256 
99bc1801cb0514946cb0171d6d5a84484b6dc881edfa7f096b6eb5fea2f28828 SHA512 
a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
 WHIRLPOOL 
eef651802a927b451226fc06a682d7dea68b65b05195130ccfc7544165f26f65bda4fc9565e09d6487d02be3cf57880b0c6c257f26587c6bc6d30afc6aa5d3c2

diff --git a/games-action/supertuxkart/supertuxkart-0.9.ebuild 
b/games-action/supertuxkart/supertuxkart-0.9.ebuild
new file mode 100644
index 000..b070ae7
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-0.9.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils cmake-utils eutils games
+
+DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
+HOMEPAGE="http://supertuxkart.sourceforge.net/";
+SRC_URI="mirror://sourceforge/supertuxkart/SuperTuxKart/${PV}/${P}-src.tar.xz
+   mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug fribidi wiimote"
+
+# don't unbundle irrlicht and bullet
+# both are modified and system versions will break the game
+# 
http://sourceforge.net/tracker/?func=detail&aid=3454889&group_id=74339&atid=540679
+
+RDEPEND="media-libs/libpng:0
+   media-libs/libvorbis
+   media-libs/openal
+   net-misc/curl
+   sys-libs/zlib
+   virtual/glu
+   virtual/jpeg:62
+   virtual/libintl
+   virtual/opengl
+   x11-libs/libX11
+   x11-libs/libXxf86vm
+   fribidi? ( dev-libs/fribidi )
+   wiimote? ( net-wireless/bluez )"
+DEPEND="${RDEPEND}
+   sys-devel/gettext
+   virtual/pkgconfig"
+
+src_prepare() {
+   # inconsistent handling of debug definition
+   # avoid using Debug build type
+   if use debug ; then
+   sed -i \
+   -e 
's/add_definitions(-DNDEBUG)/add_definitions(-DDEBUG)/' \
+   CMakeLists.txt || die
+   fi
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_use fribidi FRIBIDI)
+   $(cmake-utils_use_use wiimote WIIUSE)
+   -DSTK_INSTALL_BINARY_DIR="${GAMES_BINDIR}"
+   -DSTK_INSTALL_DATA_DIR="${GAMES_DATADIR}"/${PN}
+   )
+
+   cmake-utils_src_configure
+}
+
+src_compile() {
+   cmake-utils_src_compile
+}
+
+src_install() {
+   cmake-utils_src_install
+   doicon -s 64 "${DISTDIR}"/${PN}.png
+   dodoc AUTHORS CHANGELOG.md README.md TODO.md
+   prepgamesdirs
+}
+
+pkg_preinst() {
+   games_pkg_preinst
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   games_pkg_postinst
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}