[gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/

2023-05-27 Thread Rahul Sandhu 
commit: fb01a317fb938cc0c076d08d8c5f20e11739114b
Author: Rahul Sandhu  sandhuservices  dev>
AuthorDate: Sat May 27 17:16:03 2023 +
Commit: Rahul Sandhu  sandhuservices  dev>
CommitDate: Sat May 27 17:16:03 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fb01a317

games-action/blackvoxel: update EAPI 7 -> 8

Signed-off-by: Rahul Sandhu  sandhuservices.dev>

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

diff --git a/games-action/blackvoxel/blackvoxel-.ebuild 
b/games-action/blackvoxel/blackvoxel-.ebuild
index f9dc33fc2..d36bc7da8 100644
--- a/games-action/blackvoxel/blackvoxel-.ebuild
+++ b/games-action/blackvoxel/blackvoxel-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit git-r3 toolchain-funcs

[gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/

2021-05-03 Thread Samuel Bauer 
commit: 6e07b70543852d33b276bea80cfb3d928d7c32ca
Author: Samuel Bauer  yahoo  fr>
AuthorDate: Mon May  3 20:29:54 2021 +
Commit: Samuel Bauer  yahoo  fr>
CommitDate: Mon May  3 20:29:54 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6e07b705

games-action/blackvoxel-: regex rework

Signed-off-by: Samuel Bauer  yahoo.fr>

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

diff --git a/games-action/blackvoxel/blackvoxel-.ebuild 
b/games-action/blackvoxel/blackvoxel-.ebuild
index 2cdbbd8db..f9dc33fc2 100644
--- a/games-action/blackvoxel/blackvoxel-.ebuild
+++ b/games-action/blackvoxel/blackvoxel-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ src_prepare() {
-e 's/CFLAGS/CXXFLAGS/g' -e 's/\$(CC)/$(CXX)/' \
-e 's/\$(LD)/$(CXX)/' \
Makefile || die
-   sed -i -e 's/\/$(CC)/' -e 's/\/$(CXX)/' \
+   sed -i -e 's/\/$(CC)/' -e 's/\/$(AR)/' src/sc_Squirrel3/squirrel/Makefile \
src/sc_Squirrel3/sqstdlib/Makefile \
src/sc_Squirrel3/sq/Makefile || die

[gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/

2021-05-03 Thread Samuel Bauer 
commit: a1cc0bbf78ace25982570994ef1eac6a0093c46e
Author: Samuel Bauer  yahoo  fr>
AuthorDate: Mon May  3 19:35:27 2021 +
Commit: Samuel Bauer  yahoo  fr>
CommitDate: Mon May  3 19:35:27 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a1cc0bbf

games-action/blackvoxel: integrate work from #787074 in live ebuild

Signed-off-by: Samuel Bauer  yahoo.fr>

 games-action/blackvoxel/blackvoxel-.ebuild | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/games-action/blackvoxel/blackvoxel-.ebuild 
b/games-action/blackvoxel/blackvoxel-.ebuild
index d20271cef..2cdbbd8db 100644
--- a/games-action/blackvoxel/blackvoxel-.ebuild
+++ b/games-action/blackvoxel/blackvoxel-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit git-r3
+inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Blackvoxel Video Game"
 HOMEPAGE="https://www.blackvoxel.com/;
@@ -30,11 +30,22 @@ src_prepare() {
sed -i -e 's/LDFLAGS=/LDFLAGS+= /' -e '/LDFLAGS/s/-s -zrelro //' \
-e '/(CPU_BITS)/ { s/; make //; s/cd/+make -C/}' \
-e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' \
+   -e '/^CC=/d' -e 's/^LD=/CXX?=/' \
+   -e 's/CFLAGS/CXXFLAGS/g' -e 's/\$(CC)/$(CXX)/' \
+   -e 's/\$(LD)/$(CXX)/' \
Makefile || die
+   sed -i -e 's/\/$(CC)/' -e 's/\/$(CXX)/' \
+   -e 's/\/$(AR)/' src/sc_Squirrel3/squirrel/Makefile \
+   src/sc_Squirrel3/sqstdlib/Makefile \
+   src/sc_Squirrel3/sq/Makefile || die
default
 }
 
 src_compile() {
+   export CXX="$(tc-getCXX)"
+   export CC="$(tc-getCC)"
+   export AR="$(tc-getAR)"
+
emake blackvoxeldatadir="/usr/share/${PN}" bindir="/usr/bin"
 }

[gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/files/

2021-05-03 Thread Ronny Gutbrod 
commit: 4b38ffa0071c0a2ac4ed4382e092c0eb8caa2a1f
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Mon May  3 20:35:17 2021 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Mon May  3 20:36:25 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4b38ffa0

games-action/blackvoxel: Re-add jobserver-tweak to patch.

Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 .../blackvoxel/files/blackvoxel-2.42-makefile.patch  | 20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch 
b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
index de29e1999..ba800e827 100644
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
@@ -1,4 +1,4 @@
-From 6f28e09bf6c8b48e0b1e7acc8b755e076e41fe40 Mon Sep 17 00:00:00 2001
+From 18ae2cca1ef8b9e04b463719d03b021245ecfeec Mon Sep 17 00:00:00 2001
 From: tastytea 
 Date: Mon, 3 May 2021 21:21:25 +0200
 Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with
@@ -6,14 +6,14 @@ Subject: [PATCH] Don't overwrite build-flags, replace 
hardcoded tools with
 
 Also remove -zrelro from LDFLAGS.
 ---
- Makefile   | 29 ++---
+ Makefile   | 31 +++---
  src/sc_Squirrel3/sq/Makefile   |  8 
- src/sc_Squirrel3/sqstdlib/Makefile | 16 
- src/sc_Squirrel3/squirrel/Makefile | 16 
- 4 files changed, 34 insertions(+), 35 deletions(-)
+ src/sc_Squirrel3/sqstdlib/Makefile | 16 +++
+ src/sc_Squirrel3/squirrel/Makefile | 16 +++
+ 4 files changed, 35 insertions(+), 36 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 3fac7f3..62c50cb 100644
+index 3fac7f3..d1104e7 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -8,10 +8,9 @@ ifndef bindir
@@ -40,7 +40,7 @@ index 3fac7f3..62c50cb 100644
  else
# Unix like operating systems
CPU_BITS= $(shell getconf LONG_BIT)
-@@ -28,31 +27,31 @@ else
+@@ -28,36 +27,36 @@ else
KERNELNAME =$(shell uname -s)
  
ifeq ($(KERNELNAME),Linux)
@@ -82,6 +82,12 @@ index 3fac7f3..62c50cb 100644
  
  
  
+ squirrel: 
+-  cd src/sc_Squirrel3 ; make sq$(CPU_BITS)
++  +make -C src/sc_Squirrel3 sq$(CPU_BITS)
+ 
+ clean:
+   @rm -rf obj
 diff --git a/src/sc_Squirrel3/sq/Makefile b/src/sc_Squirrel3/sq/Makefile
 index c2cfc7e..08fb2ef 100644
 --- a/src/sc_Squirrel3/sq/Makefile

[gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/files/

2021-05-03 Thread Ronny Gutbrod 
commit: 82c53fd72093f405e8efe0f3904f9a51a4663f94
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Mon May  3 19:28:13 2021 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Mon May  3 19:28:13 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=82c53fd7

games-action/blackvoxel: Remove -zrelro again.

I overlooked it when I extended the Makefile-patch before.

Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 .../blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch  | 12 ++--
 games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch |  9 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch 
b/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch
index 7be84fbbf..85f2b1290 100644
--- a/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch
@@ -1,6 +1,6 @@
-From b6baebbd17479d9b6f6083797fa4eb63741fa52b Mon Sep 17 00:00:00 2001
+From a68c7c2d10bed88a5148828b6f8f02175af696ca Mon Sep 17 00:00:00 2001
 From: tastytea 
-Date: Mon, 3 May 2021 03:05:19 +0200
+Date: Mon, 3 May 2021 21:25:36 +0200
 Subject: [PATCH] Don't strip files.
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH] Don't strip files.
  2 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index a85dd7e..51cb0fd 100644
+index 62c50cb..57f27d4 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -19,7 +19,7 @@ OBJ= $(SRC:src/%.cpp=obj/%.o)
@@ -25,13 +25,13 @@ index a85dd7e..51cb0fd 100644
  
ifeq ($(KERNELNAME),Linux)
  CXXFLAGS+= -O3 -c -fmessage-length=0
--LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL 
-lsquirrel -lsqstdlib
-+LDFLAGS+=-zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL 
-lsquirrel -lsqstdlib
+-LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
++LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
else ifeq ($(KERNELNAME), FreeBSD)
  # To be done...
  CXXFLAGS+= -O3 -c -fmessage-length=0
 -LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
-+LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
++LDFLAGS+= -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
else ifeq ($(KERNELNAME), Darwin)
  CXXFLAGS+= -O3 -c -fmessage-length=0
 -LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" 
-L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" 
-framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW -lsquirrel -lsqstdlib

diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch 
b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
index f6f857212..de29e1999 100644
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
@@ -1,9 +1,10 @@
-From a4fbc416e1c9884353f743f84ca98207f792b502 Mon Sep 17 00:00:00 2001
+From 6f28e09bf6c8b48e0b1e7acc8b755e076e41fe40 Mon Sep 17 00:00:00 2001
 From: tastytea 
-Date: Mon, 3 May 2021 02:26:12 +0200
+Date: Mon, 3 May 2021 21:21:25 +0200
 Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with
  variables.
 
+Also remove -zrelro from LDFLAGS.
 ---
  Makefile   | 29 ++---
  src/sc_Squirrel3/sq/Makefile   |  8 
@@ -12,7 +13,7 @@ Subject: [PATCH] Don't overwrite build-flags, replace 
hardcoded tools with
  4 files changed, 34 insertions(+), 35 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 3fac7f3..a85dd7e 100644
+index 3fac7f3..62c50cb 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -8,10 +8,9 @@ ifndef bindir
@@ -46,7 +47,7 @@ index 3fac7f3..a85dd7e 100644
 -CFLAGS+= -O3 -c -fmessage-length=0
 -LDFLAGS=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL 
-lsquirrel -lsqstdlib
 +CXXFLAGS+= -O3 -c -fmessage-length=0
-+LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL 
-lsquirrel -lsqstdlib
++LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
else ifeq ($(KERNELNAME), FreeBSD)
  # To be done...
 -CFLAGS+= -O3 -c -fmessage-length=0

[gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/files/, games-action/blackvoxel/

2021-05-02 Thread Ronny Gutbrod 
commit: e2ea6e4b2f789206d798e4f909b21dc6d8c6dfa1
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Mon May  3 00:19:00 2021 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Mon May  3 01:27:00 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e2ea6e4b

games-action/blackvoxel: Remove hardcoded tools, set CXX, CC and AR.

Changes proposed upstream:
.

Closes: https://bugs.gentoo.org/787074
Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 games-action/blackvoxel/blackvoxel-2.42.ebuild |   8 +-
 .../files/blackvoxel-2.42-makefile.patch   | 179 +++--
 2 files changed, 172 insertions(+), 15 deletions(-)

diff --git a/games-action/blackvoxel/blackvoxel-2.42.ebuild 
b/games-action/blackvoxel/blackvoxel-2.42.ebuild
index aac110c09..8c2a6db25 100644
--- a/games-action/blackvoxel/blackvoxel-2.42.ebuild
+++ b/games-action/blackvoxel/blackvoxel-2.42.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop xdg
+inherit desktop toolchain-funcs xdg
 
 DESCRIPTION="Blackvoxel Video Game"
 HOMEPAGE="https://www.blackvoxel.com/;
@@ -32,6 +32,10 @@ PATCHES=(
 )
 
 src_compile() {
+   export CXX="$(tc-getCXX)"
+   export CC="$(tc-getCC)"
+   export AR="$(tc-getAR)"
+
emake blackvoxeldatadir="/usr/share/${PN}" bindir="/usr/bin"
 }
 

diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch 
b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
index c8e826c68..f6f857212 100644
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
@@ -1,30 +1,183 @@
+From a4fbc416e1c9884353f743f84ca98207f792b502 Mon Sep 17 00:00:00 2001
+From: tastytea 
+Date: Mon, 3 May 2021 02:26:12 +0200
+Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with
+ variables.
+
+---
+ Makefile   | 29 ++---
+ src/sc_Squirrel3/sq/Makefile   |  8 
+ src/sc_Squirrel3/sqstdlib/Makefile | 16 
+ src/sc_Squirrel3/squirrel/Makefile | 16 
+ 4 files changed, 34 insertions(+), 35 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3fac7f3..a85dd7e 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -11,7 +11,7 @@
- CC=g++
- LD=g++
+@@ -8,10 +8,9 @@ ifndef bindir
+ endif
+ 
+ # Base options
+-CC=g++
+-LD=g++
++CXX?=g++
  PROGNAME=blackvoxel
 -CFLAGS=-I "src/sc_Squirrel3/include"  -DCOMPILEOPTION_DEMO=0 
-DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 
-DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\""
-+CFLAGS+=-I "src/sc_Squirrel3/include"  -DCOMPILEOPTION_DEMO=0 
-DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 
-DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\""
++CXXFLAGS+=-I "src/sc_Squirrel3/include"  -DCOMPILEOPTION_DEMO=0 
-DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 
-DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\""
  SRC= $(wildcard src/*.cpp) $(wildcard src/z/*.cpp)
  OBJ= $(SRC:src/%.cpp=obj/%.o)
  
-@@ -28,8 +28,7 @@
+@@ -19,8 +18,8 @@ OBJ= $(SRC:src/%.cpp=obj/%.o)
+ 
+ ifeq ($(OS),Windows_NT)
+   CPU_BITS=32
+-  CFLAGS+= -O3 -c -fmessage-length=0 -march=i686
+-  LDFLAGS= -s -Xlinker --large-address-aware -mwindows 
-L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 
-lopengl32 -llibglut -lsquirrel -lsqstdlib
++  CXXFLAGS+= -O3 -c -fmessage-length=0 -march=i686
++  LDFLAGS+= -s -Xlinker --large-address-aware -mwindows 
-L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 
-lopengl32 -llibglut -lsquirrel -lsqstdlib
+ else
+   # Unix like operating systems
+   CPU_BITS= $(shell getconf LONG_BIT)
+@@ -28,31 +27,31 @@ else
KERNELNAME =$(shell uname -s)
  
ifeq ($(KERNELNAME),Linux)
 -CFLAGS+= -O3 -c -fmessage-length=0
 -LDFLAGS=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL 
-lsquirrel -lsqstdlib
-+LDFLAGS+= -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
++CXXFLAGS+= -O3 -c -fmessage-length=0
++LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL 
-lsquirrel -lsqstdlib
else ifeq ($(KERNELNAME), FreeBSD)
  # To be done...
- CFLAGS+= -O3 -c -fmessage-length=0
-@@ -57,7 +56,7 @@
+-CFLAGS+= -O3 -c -fmessage-length=0
+-LDFLAGS=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
++CXXFLAGS+= -O3 -c -fmessage-length=0
++LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
+   else ifeq ($(KERNELNAME), Darwin)
+-CFLAGS+= -O3 -c -fmessage-length=0
+-LDFLAGS=-s -L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" 
-L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" 
-framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW

[gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/files/, games-action/blackvoxel/

2021-05-02 Thread Ronny Gutbrod 
commit: e3d04544b9a85ca5600f66387312bc49755999d2
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Mon May  3 00:53:01 2021 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Mon May  3 01:28:56 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e3d04544

games-action/blackvoxel: Don't strip files.

Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 games-action/blackvoxel/blackvoxel-2.42.ebuild |  1 +
 .../files/blackvoxel-2.42-dont-strip-files.patch   | 69 ++
 2 files changed, 70 insertions(+)

diff --git a/games-action/blackvoxel/blackvoxel-2.42.ebuild 
b/games-action/blackvoxel/blackvoxel-2.42.ebuild
index 8c2a6db25..4216d47ce 100644
--- a/games-action/blackvoxel/blackvoxel-2.42.ebuild
+++ b/games-action/blackvoxel/blackvoxel-2.42.ebuild
@@ -29,6 +29,7 @@ S="${WORKDIR}/${PN}_source_${PV//./_}"
 PATCHES=(
"${FILESDIR}"/${P}-makefile.patch
"${FILESDIR}"/${P}-savedir.patch
+   "${FILESDIR}"/${P}-dont-strip-files.patch
 )
 
 src_compile() {

diff --git 
a/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch 
b/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch
new file mode 100644
index 0..7be84fbbf
--- /dev/null
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch
@@ -0,0 +1,69 @@
+From b6baebbd17479d9b6f6083797fa4eb63741fa52b Mon Sep 17 00:00:00 2001
+From: tastytea 
+Date: Mon, 3 May 2021 03:05:19 +0200
+Subject: [PATCH] Don't strip files.
+
+---
+ Makefile | 10 +-
+ src/sc_Squirrel3/sq/Makefile |  4 ++--
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a85dd7e..51cb0fd 100644
+--- a/Makefile
 b/Makefile
+@@ -19,7 +19,7 @@ OBJ= $(SRC:src/%.cpp=obj/%.o)
+ ifeq ($(OS),Windows_NT)
+   CPU_BITS=32
+   CXXFLAGS+= -O3 -c -fmessage-length=0 -march=i686
+-  LDFLAGS+= -s -Xlinker --large-address-aware -mwindows 
-L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 
-lopengl32 -llibglut -lsquirrel -lsqstdlib
++  LDFLAGS+= -Xlinker --large-address-aware -mwindows -L"src/sc_Squirrel3/lib" 
-lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 -lopengl32 -llibglut -lsquirrel 
-lsqstdlib
+ else
+   # Unix like operating systems
+   CPU_BITS= $(shell getconf LONG_BIT)
+@@ -28,18 +28,18 @@ else
+ 
+   ifeq ($(KERNELNAME),Linux)
+ CXXFLAGS+= -O3 -c -fmessage-length=0
+-LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL 
-lsquirrel -lsqstdlib
++LDFLAGS+=-zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL 
-lsquirrel -lsqstdlib
+   else ifeq ($(KERNELNAME), FreeBSD)
+ # To be done...
+ CXXFLAGS+= -O3 -c -fmessage-length=0
+-LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
++LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
+   else ifeq ($(KERNELNAME), Darwin)
+ CXXFLAGS+= -O3 -c -fmessage-length=0
+-LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" 
-L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" 
-framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW -lsquirrel -lsqstdlib
++LDFLAGS+=-L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" 
-L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" 
-framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW -lsquirrel -lsqstdlib
+   else
+ # Unknow kernel... trying default flags
+ CXXFLAGS+= -O3 -c -fmessage-length=0
+-LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
++LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
+   endif
+ endif
+ 
+diff --git a/src/sc_Squirrel3/sq/Makefile b/src/sc_Squirrel3/sq/Makefile
+index 08fb2ef..8cc1cbc 100644
+--- a/src/sc_Squirrel3/sq/Makefile
 b/src/sc_Squirrel3/sq/Makefile
+@@ -12,13 +12,13 @@ SRCS= sq.c
+   
+   
+ sq32:
+-  $(CXX) -O2 -s -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) 
$(LIBZ) $(LIB)
++  $(CXX) -O2 -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) 
$(LIB)
+ 
+ sqprof:
+   $(CXX) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -o $(OUT) 
$(SRCS) $(INCZ) $(LIBZ) $(LIB)
+   
+ sq64:
+-  $(CXX) -O2 -s -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) 
$(INCZ) $(LIBZ) $(LIB)
++  $(CXX) -O2 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) 
$(INCZ) $(LIBZ) $(LIB)
+   
+ sq64d:
+   $(CXX) -O0 -g3 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) 
$(INCZ) $(LIBZ) $(LIB)
+-- 
+2.26.3
+

[gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/, games-action/blackvoxel/files/

2021-04-30 Thread Samuel Bauer 
commit: 82d2ff05ea04217bfcd504e9066c902f0ce3a6f6
Author: Samuel Bauer  yahoo  fr>
AuthorDate: Fri Apr 30 03:15:34 2021 +
Commit: Samuel Bauer  yahoo  fr>
CommitDate: Fri Apr 30 03:15:34 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=82d2ff05

games-action/blackvoxel: drop -zrelro ldflag

Signed-off-by: Samuel Bauer  yahoo.fr>

 games-action/blackvoxel/blackvoxel-.ebuild   | 5 +++--
 games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/games-action/blackvoxel/blackvoxel-.ebuild 
b/games-action/blackvoxel/blackvoxel-.ebuild
index b52f4b8b1..d20271cef 100644
--- a/games-action/blackvoxel/blackvoxel-.ebuild
+++ b/games-action/blackvoxel/blackvoxel-.ebuild
@@ -27,9 +27,10 @@ RDEPEND="${DEPEND}"
 src_prepare() {
sed -i -e 
'/COMPILEOPTION_SAVEFOLDERNAME/s:Blackvoxel:.local/share/blackvoxel:' \
src/ACompileSettings.h || die
-   sed -i -e 's/LDFLAGS=/LDFLAGS+= /' -e 's/LDFLAGS/s/-s //' \
+   sed -i -e 's/LDFLAGS=/LDFLAGS+= /' -e '/LDFLAGS/s/-s -zrelro //' \
-e '/(CPU_BITS)/ { s/; make //; s/cd/+make -C/}' \
-   -e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' Makefile || die
+   -e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' \
+   Makefile || die
default
 }
 

diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch 
b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
index 5ce5184b4..c8e826c68 100644
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
@@ -15,7 +15,7 @@
ifeq ($(KERNELNAME),Linux)
 -CFLAGS+= -O3 -c -fmessage-length=0
 -LDFLAGS=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL 
-lsquirrel -lsqstdlib
-+LDFLAGS+= -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL 
-lsquirrel -lsqstdlib
++LDFLAGS+= -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
else ifeq ($(KERNELNAME), FreeBSD)
  # To be done...
  CFLAGS+= -O3 -c -fmessage-length=0

[gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/

2021-04-29 Thread Samuel Bauer 
commit: 46ee80599cf0e0f4a069cbc332bc62a8e83ef64b
Author: Samuel Bauer  yahoo  fr>
AuthorDate: Thu Apr 29 22:27:24 2021 +
Commit: Samuel Bauer  yahoo  fr>
CommitDate: Thu Apr 29 22:27:24 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=46ee8059

games-action/blackvoxel: drop eutils

Signed-off-by: Samuel Bauer  yahoo.fr>

 games-action/blackvoxel/blackvoxel-2.42.ebuild | 2 +-
 games-action/blackvoxel/blackvoxel-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-action/blackvoxel/blackvoxel-2.42.ebuild 
b/games-action/blackvoxel/blackvoxel-2.42.ebuild
index 125773d8b..aac110c09 100644
--- a/games-action/blackvoxel/blackvoxel-2.42.ebuild
+++ b/games-action/blackvoxel/blackvoxel-2.42.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop eutils xdg
+inherit desktop xdg
 
 DESCRIPTION="Blackvoxel Video Game"
 HOMEPAGE="https://www.blackvoxel.com/;

diff --git a/games-action/blackvoxel/blackvoxel-.ebuild 
b/games-action/blackvoxel/blackvoxel-.ebuild
index 6e3d11256..b52f4b8b1 100644
--- a/games-action/blackvoxel/blackvoxel-.ebuild
+++ b/games-action/blackvoxel/blackvoxel-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils git-r3
+inherit git-r3
 
 DESCRIPTION="Blackvoxel Video Game"
 HOMEPAGE="https://www.blackvoxel.com/;

[gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/files/, games-action/blackvoxel/

2021-04-29 Thread Samuel Bauer 
commit: 3476a3262beada5fd1f938c649228e0a6fb09b07
Author: Samuel Bauer  yahoo  fr>
AuthorDate: Thu Apr 29 20:18:56 2021 +
Commit: Samuel Bauer  yahoo  fr>
CommitDate: Thu Apr 29 20:18:56 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3476a326

games-action/blackvoxel: new ebuild

Signed-off-by: Samuel Bauer  yahoo.fr>

 games-action/blackvoxel/Manifest   |  1 +
 games-action/blackvoxel/blackvoxel-2.42.ebuild | 48 ++
 games-action/blackvoxel/blackvoxel-.ebuild | 46 +
 .../files/blackvoxel-2.42-makefile.patch   | 30 ++
 .../blackvoxel/files/blackvoxel-2.42-savedir.patch | 18 
 games-action/blackvoxel/metadata.xml   |  8 
 6 files changed, 151 insertions(+)

diff --git a/games-action/blackvoxel/Manifest b/games-action/blackvoxel/Manifest
new file mode 100644
index 0..9493eb6ce
--- /dev/null
+++ b/games-action/blackvoxel/Manifest
@@ -0,0 +1 @@
+DIST blackvoxel-2.42.tar.bz2 18367949 BLAKE2B 
f45da57846370ae2109709cb28f3bb02fbd63ff208306705dd8da544737f84250542a4c58b3889e603f16ca898f9ee4458361c326fd28f68cb2a70f891de0f67
 SHA512 
275c7cb34c58bbd772bc1daf7beb26395c509d37341fe1c343f745bc3fa73223f9d36b275f0813a06908f258b39f94c1e4229f8e27fb822cf71881e66fccd3fb

diff --git a/games-action/blackvoxel/blackvoxel-2.42.ebuild 
b/games-action/blackvoxel/blackvoxel-2.42.ebuild
new file mode 100644
index 0..125773d8b
--- /dev/null
+++ b/games-action/blackvoxel/blackvoxel-2.42.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils xdg
+
+DESCRIPTION="Blackvoxel Video Game"
+HOMEPAGE="https://www.blackvoxel.com/;
+SRC_URI="https://www.blackvoxel.com/dm_download.php?file=163=1 -> 
${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+   dev-libs/expat
+   media-libs/alsa-lib
+   media-libs/glew:0
+   media-libs/libsdl
+   x11-libs/libX11
+   virtual/opengl
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}_source_${PV//./_}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-makefile.patch
+   "${FILESDIR}"/${P}-savedir.patch
+)
+
+src_compile() {
+   emake blackvoxeldatadir="/usr/share/${PN}" bindir="/usr/bin"
+}
+
+src_install() {
+   dodoc Contributors.txt
+   doman blackvoxel.6
+   newicon -s 16 Icons/blackvoxel-16x16.png blackvoxel.png
+   newicon -s 32 Icons/blackvoxel-32x32.png blackvoxel.png
+   newicon -s 128 Icons/blackvoxel_128x128.png blackvoxel.png
+
+   dobin blackvoxel
+   insinto "/usr/share/${PN}"
+   doins -r Misc Sound VoxelTypes gui randomnum.dat
+}

diff --git a/games-action/blackvoxel/blackvoxel-.ebuild 
b/games-action/blackvoxel/blackvoxel-.ebuild
new file mode 100644
index 0..6e3d11256
--- /dev/null
+++ b/games-action/blackvoxel/blackvoxel-.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils git-r3
+
+DESCRIPTION="Blackvoxel Video Game"
+HOMEPAGE="https://www.blackvoxel.com/;
+EGIT_REPO_URI="https://github.com/Blackvoxel/Blackvoxel;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+   dev-libs/expat
+   media-libs/alsa-lib
+   media-libs/glew:0
+   media-libs/libsdl
+   x11-libs/libX11
+   virtual/opengl
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   sed -i -e 
'/COMPILEOPTION_SAVEFOLDERNAME/s:Blackvoxel:.local/share/blackvoxel:' \
+   src/ACompileSettings.h || die
+   sed -i -e 's/LDFLAGS=/LDFLAGS+= /' -e 's/LDFLAGS/s/-s //' \
+   -e '/(CPU_BITS)/ { s/; make //; s/cd/+make -C/}' \
+   -e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' Makefile || die
+   default
+}
+
+src_compile() {
+   emake blackvoxeldatadir="/usr/share/${PN}" bindir="/usr/bin"
+}
+
+src_install() {
+   dodoc Contributors.txt README.md
+
+   dobin blackvoxel
+   insinto "/usr/share/${PN}"
+   doins -r Misc Sound VoxelTypes gui randomnum.dat
+}

diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch 
b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
new file mode 100644
index 0..5ce5184b4
--- /dev/null
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
@@ -0,0 +1,30 @@
+--- a/Makefile
 b/Makefile
+@@ -11,7 +11,7 @@
+ CC=g++
+ LD=g++
+ PROGNAME=blackvoxel
+-CFLAGS=-I "src/sc_Squirrel3/include"  -DCOMPILEOPTION_DEMO=0 
-DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 
-DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\""
++CFLAGS+=-I "src/sc_Squirrel3/include"  -DCOMPILEOPTION_DEMO=0 
-DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 
-DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\""
+ SRC= $(wildcard src/*.cpp) $(wildcard src/z/*.cpp)
+ OBJ= $(SRC:src/%.cpp=obj/%.o)
+ 
+@@ -28,8 +28,7 @@
+   KERNELNAME