[gentoo-commits] repo/gentoo:master commit in: games-fps/sauerbraten/files/, games-fps/sauerbraten/

2021-09-12 Thread Ionen Wolkens 
commit: a4d3875e8b6ffeb9694408b3788fb26616134d41
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Sep 12 20:58:43 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Sep 12 21:07:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d3875e

games-fps/sauerbraten: drop 2013.02.03-r2

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

 games-fps/sauerbraten/Manifest |   1 -
 .../files/sauerbraten-2013.02.03-QA.patch  |  50 
 .../files/sauerbraten-2013.02.03-system-enet.patch |  64 --
 .../sauerbraten/sauerbraten-2013.02.03-r2.ebuild   | 134 -
 4 files changed, 249 deletions(-)

diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest
index 758332c2c9b..71010ab94cf 100644
--- a/games-fps/sauerbraten/Manifest
+++ b/games-fps/sauerbraten/Manifest
@@ -1,2 +1 @@
-DIST sauerbraten_2013_02_03_collect_edition_linux.tar.bz2 589941180 BLAKE2B 
b8a1c929dcf7a32bc289262fffcbcd4e7bbab3a9030c12bce7d086d63aaddee0c573c5d38f9ac845b3080aeac38d1b548aa9d243b462c3c682b158a379fe8cc2
 SHA512 
7864e346cc2bc86d78973db1b341fd8256cc2e1953be51263ef91a5374f9ec00276ba2940850e6d5bba7a57c71190b670dc7ba97021be2935c31f8694fed4897
 DIST sauerbraten_2020_12_27_linux.tar.bz2 985815649 BLAKE2B 
4ec9caf705766aed76153a8631b1990c6432db8c816d579e891263b36adf0e7ed4831d2fee010b7692f6457989c0acea552f72c95e0924e97182d2a03dc947f2
 SHA512 
60487e0493478b9dd8940a9239834d8f3f6b6ca529f3c5b718f91caf5116073942ca6908d7fff26ab37b7ec590114ab07f24cdcea5c355288d3c2706d626ea28

diff --git a/games-fps/sauerbraten/files/sauerbraten-2013.02.03-QA.patch 
b/games-fps/sauerbraten/files/sauerbraten-2013.02.03-QA.patch
deleted file mode 100644
index 21f1b13c7a2..000
--- a/games-fps/sauerbraten/files/sauerbraten-2013.02.03-QA.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-applied on top of sauerbraten-2013.01.04-system-enet.patch
-
-respect LDFLAGS, CXXFLAGS and CPPFLAGS
 sauerbraten/src/Makefile
-+++ sauerbraten/src/Makefile
-@@ -1,4 +1,4 @@
--CXXFLAGS= -O3 -fomit-frame-pointer
-+CXXFLAGS ?= -O3 -fomit-frame-pointer
- override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
- 
- PLATFORM= $(shell uname -s)
-@@ -139,11 +139,11 @@
-   -$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) 
sauer_client sauer_server sauer_master
- 
- %.h.gch: %.h
--  $(CXX) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst 
.h.gch,.h,$@)
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst 
.h.gch,.h,$@)
-   $(MV) $(subst .h.gch,.tmp.h.gch,$@) $@
- 
- %-standalone.o: %.cpp
--  $(CXX) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@)
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@)
- 
- $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES)
- $(filter shared/%,$(CLIENT_OBJS)): $(filter shared/%,$(CLIENT_PCH))
-@@ -168,19 +168,19 @@
- install: all
- else
- client:   $(CLIENT_OBJS)
--  $(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_client 
$(CLIENT_OBJS) $(CLIENT_LIBS)
- 
- server:   $(SERVER_OBJS)
--  $(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_server 
$(SERVER_OBJS) $(SERVER_LIBS)  
-   
- master: $(MASTER_OBJS)
--  $(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_master 
$(MASTER_OBJS) $(MASTER_LIBS)  
- 
- shared/cube2font.o: shared/cube2font.c
--  $(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
- 
- cube2font: shared/cube2font.o
--  $(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config 
--libs` -lz
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cube2font 
shared/cube2font.o `freetype-config --libs` -lz
- 
- install: all
-   cp sauer_client ../bin_unix/$(PLATFORM_PREFIX)_client

diff --git 
a/games-fps/sauerbraten/files/sauerbraten-2013.02.03-system-enet.patch 
b/games-fps/sauerbraten/files/sauerbraten-2013.02.03-system-enet.patch
deleted file mode 100644
index e87b280ba0c..000
--- a/games-fps/sauerbraten/files/sauerbraten-2013.02.03-system-enet.patch
+++ /dev/null
@@ -1,64 +0,0 @@
 sauerbraten/src/Makefile
-+++ sauerbraten/src/Makefile
-@@ -4,7 +4,7 @@
- PLATFORM= $(shell uname -s)
- PLATFORM_PREFIX= native
- 
--INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
-+INCLUDES= -Ishared -Iengine -Ifpsgame
- 
- STRIP=
- ifeq (,$(findstring -g,$(CXXFLAGS)))
-@@ -36,8 +36,8 @@
- endif
- CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image 
-lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
- else  
--CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
--CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` 
-lSDL_image

[gentoo-commits] repo/gentoo:master commit in: games-fps/sauerbraten/

2021-04-22 Thread Sam James 
commit: 85cd9a92fa14d71b2bbbd6ab503086b0560df006
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 22 14:57:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 22 14:57:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85cd9a92

games-fps/sauerbraten: gnome2-utils -> xdg.eclass

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

 games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild 
b/games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild
index 46c1e22b18e..8b66fceccde 100644
--- a/games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic gnome2-utils toolchain-funcs wrapper
+inherit desktop flag-o-matic toolchain-funcs wrapper xdg
 
 DESCRIPTION="Sauerbraten is a FOSS game engine (Cube 2) with freeware game 
data (Sauerbraten)"
 HOMEPAGE="http://sauerbraten.org/;
@@ -129,17 +129,9 @@ src_install() {
dodoc -r README.html docs/*
 }
 
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
 pkg_postinst() {
-   gnome2_icon_cache_update
+   xdg_pkg_postinst
 
elog "If you plan to use map editor feature copy all map data from 
${DATADIR}"
elog "to corresponding folder in your HOME/.${PN}"
 }
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: games-fps/sauerbraten/, games-fps/sauerbraten/files/

2021-04-22 Thread Sam James 
commit: ab219ce2849803591f4ceb79c1e977071cef20f1
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 22 14:52:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 22 14:53:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab219ce2

games-fps/sauerbraten: add 2020.12.27

Closes: https://bugs.gentoo.org/738152
Closes: https://bugs.gentoo.org/706308
Closes: https://bugs.gentoo.org/781863
Closes: https://bugs.gentoo.org/759535
Signed-off-by: Sam James  gentoo.org>

 games-fps/sauerbraten/Manifest |   1 +
 ...0.12.27-respect-FLAGS-don-t-strip-symbols.patch | 146 +
 .../sauerbraten-2020.12.27-unbundle-enet.patch | 113 
 ...n-2020.12.27-use-pkg-config-for-freetype2.patch |  28 
 games-fps/sauerbraten/files/sauerbraten.conf   |   8 +-
 games-fps/sauerbraten/files/sauerbraten.init   |   8 +-
 .../sauerbraten/sauerbraten-2020.12.27.ebuild  | 145 
 7 files changed, 441 insertions(+), 8 deletions(-)

diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest
index 85124398a06..758332c2c9b 100644
--- a/games-fps/sauerbraten/Manifest
+++ b/games-fps/sauerbraten/Manifest
@@ -1 +1,2 @@
 DIST sauerbraten_2013_02_03_collect_edition_linux.tar.bz2 589941180 BLAKE2B 
b8a1c929dcf7a32bc289262fffcbcd4e7bbab3a9030c12bce7d086d63aaddee0c573c5d38f9ac845b3080aeac38d1b548aa9d243b462c3c682b158a379fe8cc2
 SHA512 
7864e346cc2bc86d78973db1b341fd8256cc2e1953be51263ef91a5374f9ec00276ba2940850e6d5bba7a57c71190b670dc7ba97021be2935c31f8694fed4897
+DIST sauerbraten_2020_12_27_linux.tar.bz2 985815649 BLAKE2B 
4ec9caf705766aed76153a8631b1990c6432db8c816d579e891263b36adf0e7ed4831d2fee010b7692f6457989c0acea552f72c95e0924e97182d2a03dc947f2
 SHA512 
60487e0493478b9dd8940a9239834d8f3f6b6ca529f3c5b718f91caf5116073942ca6908d7fff26ab37b7ec590114ab07f24cdcea5c355288d3c2706d626ea28

diff --git 
a/games-fps/sauerbraten/files/sauerbraten-2020.12.27-respect-FLAGS-don-t-strip-symbols.patch
 
b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-respect-FLAGS-don-t-strip-symbols.patch
new file mode 100644
index 000..6d0dc3b1f08
--- /dev/null
+++ 
b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-respect-FLAGS-don-t-strip-symbols.patch
@@ -0,0 +1,146 @@
+From: Sam James 
+Date: Thu, 22 Apr 2021 13:47:33 +
+Subject: Respect *FLAGS, don't strip symbols
+
+--- a/src/enet/Makefile
 b/src/enet/Makefile
+@@ -1,4 +1,3 @@
+-CFLAGS=-O3 -fomit-frame-pointer
+ override CFLAGS:= $(CFLAGS) -Iinclude $(shell ./check_cflags.sh $(CC) 
$(CFLAGS))
+ 
+ OBJS= \
+--- a/src/rpggame/Makefile
 b/src/rpggame/Makefile
+@@ -1,4 +1,3 @@
+-CXXFLAGS= -Os
+ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
+ 
+ PLATFORM= $(shell uname -s)
+@@ -7,11 +6,6 @@ PLATFORM_PREFIX= native
+ INCLUDES= -I../shared -I../engine -I../rpggame -I../enet/include
+ 
+ STRIP=
+-ifeq (,$(findstring -g,$(CXXFLAGS)))
+-ifeq (,$(findstring -pg,$(CXXFLAGS)))
+-  STRIP=strip
+-endif
+-endif
+ 
+ MV=mv
+ 
+@@ -118,7 +112,7 @@ clean:
+ $(filter-out shared/%,$(CLIENT_PCH)): $(filter shared/%,$(CLIENT_PCH))
+ 
+ %.h.gch: %.h
+-  $(CXX) $(CXXFLAGS) -x c++-header -o $@.tmp $<
++  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -x c++-header -o $@.tmp $<
+   $(MV) $@.tmp $@
+ 
+ $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES)
+@@ -129,13 +123,13 @@ $(filter ../rpggame/%,$(CLIENT_OBJS)): $(filter 
../rpggame/%,$(CLIENT_PCH))
+ ifneq (,$(findstring MINGW,$(PLATFORM)))
+ client: $(CLIENT_OBJS)
+   $(WINDRES) -I ../vcpp -i ../vcpp/mingw.rc -J rc -o ../vcpp/mingw.res -O 
coff 
+-  $(CXX) $(CXXFLAGS) -o ../$(WINBIN)/rpg.exe ../vcpp/mingw.res 
$(CLIENT_OBJS) $(CLIENT_LIBS)
++  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o ../$(WINBIN)/rpg.exe 
../vcpp/mingw.res $(CLIENT_OBJS) $(CLIENT_LIBS)
+ ifneq (,$(STRIP))
+   $(STRIP) ../../bin/rpg.exe
+ endif
+ else
+ client:   libenet $(CLIENT_OBJS)
+-  $(CXX) $(CXXFLAGS) -o rpg_client $(CLIENT_OBJS) $(CLIENT_LIBS)
++  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o rpg_client $(CLIENT_OBJS) 
$(CLIENT_LIBS)
+ endif
+ 
+ depend:
+--- a/src/Makefile
 b/src/Makefile
+@@ -1,4 +1,3 @@
+-CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math
+ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
+ 
+ PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]')
+@@ -7,12 +6,6 @@ PLATFORM_PREFIX= native
+ INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
+ 
+ STRIP=
+-ifeq (,$(findstring -g,$(CXXFLAGS)))
+-ifeq (,$(findstring -pg,$(CXXFLAGS)))
+-  STRIP=strip
+-endif
+-endif
+-
+ MV=mv
+ 
+ ifneq (,$(findstring MINGW,$(PLATFORM)))
+@@ -65,8 +58,8 @@ CLIENT_LIBS= -F../sauerbraten.app/Contents/Frameworks/ 
-framework SDL2 -framewor
+ CLIENT_LIBS+= -framework SDL2_mixer -framework CoreAudio -framework 
AudioToolbox
+ CLIENT_LIBS+= -framework AudioUnit -framework OpenGL -framework Cocoa -lz 
-Lenet -lenet
+ else
+-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include

[gentoo-commits] repo/gentoo:master commit in: games-fps/sauerbraten/

2021-04-09 Thread Sam James 
commit: f62e8f4769f0d6f9e66ccc1db71d49e6450cc8d2
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  9 20:02:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  9 20:02:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f62e8f47

games-fps/sauerbraten: add user/group RDEPEND

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

 ...2013.02.03-r1.ebuild => sauerbraten-2013.02.03-r2.ebuild} | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/games-fps/sauerbraten/sauerbraten-2013.02.03-r1.ebuild 
b/games-fps/sauerbraten/sauerbraten-2013.02.03-r2.ebuild
similarity index 96%
rename from games-fps/sauerbraten/sauerbraten-2013.02.03-r1.ebuild
rename to games-fps/sauerbraten/sauerbraten-2013.02.03-r2.ebuild
index 0db7d6e2ff9..c2efbc863d5 100644
--- a/games-fps/sauerbraten/sauerbraten-2013.02.03-r1.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2013.02.03-r2.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug dedicated server"
 
-RDEPEND="
+DEPEND="
sys-libs/zlib
>=net-libs/enet-1.3.6:1.3
!dedicated? (
@@ -25,8 +25,14 @@ RDEPEND="
media-libs/sdl-image[png,jpeg]
virtual/opengl
virtual/glu
-   x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
+   x11-libs/libX11
+   )
+"
+RDEPEND="
+   ${DEPEND}
+   acct-group/sauerbraten
+   dedicated? ( acct-user/sauerbraten )
+"
 
 PATCHES=(
# Patch makefile to use system enet instead of bundled

[gentoo-commits] repo/gentoo:master commit in: games-fps/sauerbraten/

2021-04-09 Thread Sam James 
commit: b52b1da637c1ec394643490302fb7c11403a2aff
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  9 19:05:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  9 19:31:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b52b1da6

games-fps/sauerbraten: port to EAPI 7, games.eclass--, respect CXX

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

 03.ebuild => sauerbraten-2013.02.03-r1.ebuild} | 49 --
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild 
b/games-fps/sauerbraten/sauerbraten-2013.02.03-r1.ebuild
similarity index 75%
rename from games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
rename to games-fps/sauerbraten/sauerbraten-2013.02.03-r1.ebuild
index 6671f8f3e87..0db7d6e2ff9 100644
--- a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2013.02.03-r1.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils games vcs-clean
+EAPI=7
+
+inherit desktop flag-o-matic gnome2-utils toolchain-funcs vcs-clean wrapper
 
 EDITION="collect_edition"
 DESCRIPTION="Sauerbraten is a FOSS game engine (Cube 2) with freeware game 
data (Sauerbraten)"
 HOMEPAGE="http://sauerbraten.org/;
 
SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten/2013_02_03/sauerbraten_${PV//./_}_${EDITION}_linux.tar.bz2"
+S="${WORKDIR}"/${PN}
 
 LICENSE="ZLIB freedist"
 SLOT="0"
@@ -26,29 +28,33 @@ RDEPEND="
x11-libs/libX11 )"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
+PATCHES=(
+   # Patch makefile to use system enet instead of bundled
+   # respect CXXFLAGS, LDFLAGS
+   "${FILESDIR}"/${P}-{system-enet,QA}.patch
+)
 
 src_prepare() {
ecvs_clean
-   rm -rf sauerbraten_unix bin_unix src/{include,lib,vcpp}
+   rm -rf sauerbraten_unix bin_unix src/{include,lib,vcpp} || die
 
-   # Patch makefile to use system enet instead of bundled
-   # respect CXXFLAGS, LDFLAGS
-   epatch "${FILESDIR}"/${P}-{system-enet,QA}.patch
+   default
 
# Fix links so they point to the correct directory
sed -i -e 's:docs/::' README.html || die
 }
 
 src_compile() {
+   tc-export CXX
+
use debug && append-cppflags -D_DEBUG
emake -C src master $(usex dedicated "server" "$(usex server "server 
client" "client")")
 }
 
 src_install() {
-   local LIBEXECDIR="${GAMES_PREFIX}/lib"
-   local DATADIR="${GAMES_DATADIR}/${PN}"
-   local STATEDIR="${GAMES_STATEDIR}/${PN}"
+   local LIBEXECDIR="/usr/lib"
+   local DATADIR="/usr/share/${PN}"
+   local STATEDIR="/var/lib/${PN}"
 
if ! use dedicated ; then
# Install the game data
@@ -60,7 +66,7 @@ src_install() {
doexe src/sauer_client
 
# Install the client wrapper
-   games_make_wrapper "${PN}-client" "${LIBEXECDIR}/sauer_client 
-q\$HOME/.${PN} -r" "${DATADIR}"
+   make_wrapper "${PN}-client" "${LIBEXECDIR}/sauer_client 
-q\$HOME/.${PN} -r" "${DATADIR}"
 
# Create menu entry
newicon -s 256 data/cube.png ${PN}.png
@@ -76,42 +82,41 @@ src_install() {
doexe src/sauer_master
use dedicated || use server && doexe src/sauer_server
 
-   games_make_wrapper "${PN}-server" \
+   make_wrapper "${PN}-server" \
"${LIBEXECDIR}/sauer_server -k${DATADIR} -q${STATEDIR}"
-   games_make_wrapper "${PN}-master" \
+   make_wrapper "${PN}-master" \
"${LIBEXECDIR}/sauer_master ${STATEDIR}"
 
# Install the server init script
-   keepdir "${GAMES_STATEDIR}/run/${PN}"
+   keepdir /var/run/${PN}
cp "${FILESDIR}"/${PN}.init "${T}" || die
sed -i \
-e "s:%SYSCONFDIR%:${STATEDIR}:g" \
-e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \
-   -e "s:%GAMES_STATEDIR%:${GAMES_STATEDIR}:g" \
+   -e "s:%/var/lib/%:/var/run:g" \
"${T}"/${PN}.init || die
+
newinitd "${T}"/${PN}.init ${PN}
cp "${FILESDIR}"/${PN}.conf "${T}" || die
sed -i \
-e "s:%SYSCONFDIR%:${STATEDIR}:g" \
-e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \
-   -e "s:%GAMES_USER_DED%:${GAMES_USER_DED}:g" \
-   -e "s:%GAMES_GROUP%:${GAMES_GROUP}:g" \
+   -e "s:%GAMES_USER_DED%:sauerbraten:g" \
+   -e "s:%GAMES_GROUP%:sauerbraten:g" \
"${T}"/${PN}.conf || die
newconfd "${T}"/${PN}.conf ${PN}
 
dodoc src/*.txt docs/dev/*.txt
-   dohtml -r README.html docs/*
 
-   prepgamesdirs
+   docinto html
+   dodoc -r README.html docs/*
 }
 
 pkg_preinst() {
-   games_pkg_preinst
gnome2_icon_savelist
 }
 
 pkg_postinst() {
-   games_pkg_postinst

[gentoo-commits] repo/gentoo:master commit in: games-fps/sauerbraten/

2020-02-12 Thread David Seifert 
commit: 7e39f169c0bf4a8d57d3df856b1f4b96228a0952
Author: David Seifert  gentoo  org>
AuthorDate: Wed Feb 12 18:02:41 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Feb 12 18:02:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e39f169

games-fps/sauerbraten: [QA] inherit vcs-clean.eclass directly

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild 
b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
index 4bb7c3603b5..6671f8f3e87 100644
--- a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils flag-o-matic gnome2-utils games
+inherit eutils flag-o-matic gnome2-utils games vcs-clean
 
 EDITION="collect_edition"
 DESCRIPTION="Sauerbraten is a FOSS game engine (Cube 2) with freeware game 
data (Sauerbraten)"

[gentoo-commits] repo/gentoo:master commit in: games-fps/sauerbraten/

2017-12-01 Thread David Seifert 
commit: 8139ea8ecd9b9301bca85a83cbcc5d140e2bbcd5
Author: David Seifert  gentoo  org>
AuthorDate: Fri Dec  1 18:56:45 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Dec  1 19:28:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8139ea8e

games-fps/sauerbraten: [QA] Fix DESCRIPTION.toolong

 games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild 
b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
index edfb69774e3..4bb7c3603b5 100644
--- a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit eutils flag-o-matic gnome2-utils games
 
 EDITION="collect_edition"
-DESCRIPTION="Cube 2: Sauerbraten is an open source game engine (Cube 2) with 
freeware game data (Sauerbraten)"
+DESCRIPTION="Sauerbraten is a FOSS game engine (Cube 2) with freeware game 
data (Sauerbraten)"
 HOMEPAGE="http://sauerbraten.org/;
 
SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten/2013_02_03/sauerbraten_${PV//./_}_${EDITION}_linux.tar.bz2"

[gentoo-commits] repo/gentoo:master commit in: games-fps/sauerbraten/files/, games-fps/sauerbraten/

2016-03-20 Thread Michael Sterrett 
commit: 84e670cbc4e2e88fb56dd880e614be989e98e19d
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sun Mar 20 20:49:45 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sun Mar 20 20:51:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e670cb

games-fps/sauerbraten: clean old

Package-Manager: portage-2.2.26

 games-fps/sauerbraten/Manifest |   1 -
 .../files/sauerbraten-2013.01.04-QA.patch  |  50 
 .../files/sauerbraten-2013.01.04-master.patch  | 323 -
 .../files/sauerbraten-2013.01.04-system-enet.patch |  64 
 games-fps/sauerbraten/files/sauerbraten_unix.patch |  19 --
 .../sauerbraten/sauerbraten-2013.01.04.ebuild  | 127 
 6 files changed, 584 deletions(-)

diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest
index b55ec84..9d42bde 100644
--- a/games-fps/sauerbraten/Manifest
+++ b/games-fps/sauerbraten/Manifest
@@ -1,2 +1 @@
-DIST sauerbraten_2013_01_04_collect_edition_linux.tar.bz2 589939261 SHA256 
3ecc27c318125883763130e45805eb7ba3a426234e5766ab0d00522f4a437bd1 SHA512 
f89c9e69bb69596829661f551e4b63b2f2af96a01f075cb94a80e2bfae4f8664b7dab8f4850b91499817240e0311b64b049ea985c761ff7bb6d39ed75e6198cd
 WHIRLPOOL 
d10e354942180064ab44a2f8c8b13819240fde3537825908768d1ddda24f600971641b8a9cee4abee9539ec912bf265cb1771c001ad81a33e287c99e0f6906b8
 DIST sauerbraten_2013_02_03_collect_edition_linux.tar.bz2 589941180 SHA256 
45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e SHA512 
7864e346cc2bc86d78973db1b341fd8256cc2e1953be51263ef91a5374f9ec00276ba2940850e6d5bba7a57c71190b670dc7ba97021be2935c31f8694fed4897
 WHIRLPOOL 
47a21e233dc90b5284027dbe47d13e891a434e0e550c6102a456e6300e6d5f9daba23c27fc100428161641ba276fa13faac12b935ac590a108c516b9b7987f4e

diff --git a/games-fps/sauerbraten/files/sauerbraten-2013.01.04-QA.patch 
b/games-fps/sauerbraten/files/sauerbraten-2013.01.04-QA.patch
deleted file mode 100644
index 21f1b13..000
--- a/games-fps/sauerbraten/files/sauerbraten-2013.01.04-QA.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-applied on top of sauerbraten-2013.01.04-system-enet.patch
-
-respect LDFLAGS, CXXFLAGS and CPPFLAGS
 sauerbraten/src/Makefile
-+++ sauerbraten/src/Makefile
-@@ -1,4 +1,4 @@
--CXXFLAGS= -O3 -fomit-frame-pointer
-+CXXFLAGS ?= -O3 -fomit-frame-pointer
- override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
- 
- PLATFORM= $(shell uname -s)
-@@ -139,11 +139,11 @@
-   -$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) 
sauer_client sauer_server sauer_master
- 
- %.h.gch: %.h
--  $(CXX) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst 
.h.gch,.h,$@)
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst 
.h.gch,.h,$@)
-   $(MV) $(subst .h.gch,.tmp.h.gch,$@) $@
- 
- %-standalone.o: %.cpp
--  $(CXX) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@)
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@)
- 
- $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES)
- $(filter shared/%,$(CLIENT_OBJS)): $(filter shared/%,$(CLIENT_PCH))
-@@ -168,19 +168,19 @@
- install: all
- else
- client:   $(CLIENT_OBJS)
--  $(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_client 
$(CLIENT_OBJS) $(CLIENT_LIBS)
- 
- server:   $(SERVER_OBJS)
--  $(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_server 
$(SERVER_OBJS) $(SERVER_LIBS)  
-   
- master: $(MASTER_OBJS)
--  $(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_master 
$(MASTER_OBJS) $(MASTER_LIBS)  
- 
- shared/cube2font.o: shared/cube2font.c
--  $(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
- 
- cube2font: shared/cube2font.o
--  $(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config 
--libs` -lz
-+  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cube2font 
shared/cube2font.o `freetype-config --libs` -lz
- 
- install: all
-   cp sauer_client ../bin_unix/$(PLATFORM_PREFIX)_client

diff --git a/games-fps/sauerbraten/files/sauerbraten-2013.01.04-master.patch 
b/games-fps/sauerbraten/files/sauerbraten-2013.01.04-master.patch
deleted file mode 100644
index 730a69a..000
--- a/games-fps/sauerbraten/files/sauerbraten-2013.01.04-master.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-http://sourceforge.net/p/sauerbraten/code/4699/
-
 a/src/shared/iengine.h
-+++ b/src/shared/iengine.h
-@@ -415,23 +415,6 @@
- extern int getservermtu();
- extern int getnumclients();
- extern uint getclientip(int n);
--extern void putint(ucharbuf , int n);
--extern void putint(packetbuf , int n);
--extern void putint(vector , int n);
--extern int getint(ucharbuf );
--extern void

[gentoo-commits] repo/gentoo:master commit in: games-fps/sauerbraten/

2016-03-06 Thread Agostino Sarubbo 
commit: f8c2bf9c7dde81bccd9b413f44b4b40618e4b8dd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Mar  6 12:57:08 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Mar  6 12:58:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c2bf9c

games-fps/sauerbraten: amd64 stable wrt bug #574834

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

 games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild 
b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
index bdde508..1e01cc2 100644
--- a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten/2013_02_03/sauerbraten_${P
 
 LICENSE="ZLIB freedist"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug dedicated server"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: games-fps/sauerbraten/files/, games-fps/sauerbraten/

2016-01-15 Thread Michael Sterrett 
commit: 488a1a1054d7868a155381da4143a5d909716e94
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sat Jan 16 04:31:38 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sat Jan 16 04:32:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=488a1a10

games-fps/sauerbraten: version bump

Package-Manager: portage-2.2.26

 games-fps/sauerbraten/Manifest |   1 +
 .../files/sauerbraten-2013.02.03-QA.patch  |  50 +
 .../files/sauerbraten-2013.02.03-system-enet.patch |  64 +++
 .../sauerbraten/sauerbraten-2013.02.03.ebuild  | 124 +
 4 files changed, 239 insertions(+)

diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest
index 743dd09..b55ec84 100644
--- a/games-fps/sauerbraten/Manifest
+++ b/games-fps/sauerbraten/Manifest
@@ -1 +1,2 @@
 DIST sauerbraten_2013_01_04_collect_edition_linux.tar.bz2 589939261 SHA256 
3ecc27c318125883763130e45805eb7ba3a426234e5766ab0d00522f4a437bd1 SHA512 
f89c9e69bb69596829661f551e4b63b2f2af96a01f075cb94a80e2bfae4f8664b7dab8f4850b91499817240e0311b64b049ea985c761ff7bb6d39ed75e6198cd
 WHIRLPOOL 
d10e354942180064ab44a2f8c8b13819240fde3537825908768d1ddda24f600971641b8a9cee4abee9539ec912bf265cb1771c001ad81a33e287c99e0f6906b8
+DIST sauerbraten_2013_02_03_collect_edition_linux.tar.bz2 589941180 SHA256 
45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e SHA512 
7864e346cc2bc86d78973db1b341fd8256cc2e1953be51263ef91a5374f9ec00276ba2940850e6d5bba7a57c71190b670dc7ba97021be2935c31f8694fed4897
 WHIRLPOOL 
47a21e233dc90b5284027dbe47d13e891a434e0e550c6102a456e6300e6d5f9daba23c27fc100428161641ba276fa13faac12b935ac590a108c516b9b7987f4e

diff --git a/games-fps/sauerbraten/files/sauerbraten-2013.02.03-QA.patch 
b/games-fps/sauerbraten/files/sauerbraten-2013.02.03-QA.patch
new file mode 100644
index 000..21f1b13
--- /dev/null
+++ b/games-fps/sauerbraten/files/sauerbraten-2013.02.03-QA.patch
@@ -0,0 +1,50 @@
+applied on top of sauerbraten-2013.01.04-system-enet.patch
+
+respect LDFLAGS, CXXFLAGS and CPPFLAGS
+--- sauerbraten/src/Makefile
 sauerbraten/src/Makefile
+@@ -1,4 +1,4 @@
+-CXXFLAGS= -O3 -fomit-frame-pointer
++CXXFLAGS ?= -O3 -fomit-frame-pointer
+ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
+ 
+ PLATFORM= $(shell uname -s)
+@@ -139,11 +139,11 @@
+   -$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) 
sauer_client sauer_server sauer_master
+ 
+ %.h.gch: %.h
+-  $(CXX) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst 
.h.gch,.h,$@)
++  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst 
.h.gch,.h,$@)
+   $(MV) $(subst .h.gch,.tmp.h.gch,$@) $@
+ 
+ %-standalone.o: %.cpp
+-  $(CXX) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@)
++  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@)
+ 
+ $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES)
+ $(filter shared/%,$(CLIENT_OBJS)): $(filter shared/%,$(CLIENT_PCH))
+@@ -168,19 +168,19 @@
+ install: all
+ else
+ client:   $(CLIENT_OBJS)
+-  $(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
++  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_client 
$(CLIENT_OBJS) $(CLIENT_LIBS)
+ 
+ server:   $(SERVER_OBJS)
+-  $(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
++  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_server 
$(SERVER_OBJS) $(SERVER_LIBS)  
+   
+ master: $(MASTER_OBJS)
+-  $(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
++  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_master 
$(MASTER_OBJS) $(MASTER_LIBS)  
+ 
+ shared/cube2font.o: shared/cube2font.c
+-  $(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
++  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
+ 
+ cube2font: shared/cube2font.o
+-  $(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config 
--libs` -lz
++  $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cube2font 
shared/cube2font.o `freetype-config --libs` -lz
+ 
+ install: all
+   cp sauer_client ../bin_unix/$(PLATFORM_PREFIX)_client

diff --git 
a/games-fps/sauerbraten/files/sauerbraten-2013.02.03-system-enet.patch 
b/games-fps/sauerbraten/files/sauerbraten-2013.02.03-system-enet.patch
new file mode 100644
index 000..e87b280
--- /dev/null
+++ b/games-fps/sauerbraten/files/sauerbraten-2013.02.03-system-enet.patch
@@ -0,0 +1,64 @@
+--- sauerbraten/src/Makefile
 sauerbraten/src/Makefile
+@@ -4,7 +4,7 @@
+ PLATFORM= $(shell uname -s)
+ PLATFORM_PREFIX= native
+ 
+-INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
++INCLUDES= -Ishared -Iengine -Ifpsgame
+ 
+ STRIP=
+ ifeq (,$(findstring -g,$(CXXFLAGS)))
+@@ -36,8 +36,8 @@
+ endif
+ CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image 
-lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
+ else  
+-CLIENT_INCLUDES= $(INCLUDES)

[gentoo-commits] repo/gentoo:master commit in: games-fps/sauerbraten/

2016-01-03 Thread Michael Sterrett 
commit: 33e30c2c6d360019912a398d3ce0b702cee2bfc3
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sun Jan  3 15:13:02 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sun Jan  3 15:13:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e30c2c

games-fps/sauerbraten: remove unneeded nonfatal (bug #551172)

Package-Manager: portage-2.2.24

 games-fps/sauerbraten/sauerbraten-2013.01.04.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-fps/sauerbraten/sauerbraten-2013.01.04.ebuild 
b/games-fps/sauerbraten/sauerbraten-2013.01.04.ebuild
index c15a4d5..053d913 100644
--- a/games-fps/sauerbraten/sauerbraten-2013.01.04.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2013.01.04.ebuild
@@ -103,8 +103,8 @@ src_install() {
"${T}"/${PN}.conf || die
newconfd "${T}"/${PN}.conf ${PN}
 
-   nonfatal dodoc src/*.txt docs/dev/*.txt
-   nonfatal dohtml -r README.html docs/*
+   dodoc src/*.txt docs/dev/*.txt
+   dohtml -r README.html docs/*
 
prepgamesdirs
 }