gentoo resync : 16.09.2021

5 files changed, 2 insertions, 254 deletions

diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest
index 1a5be4b7d301..00328854fb07 100644
--- a/games-fps/sauerbraten/Manifest
+++ b/games-fps/sauerbraten/Manifest
@@ -1,12 +1,8 @@
-AUX sauerbraten-2013.02.03-QA.patch 2037 BLAKE2B e9311a8bb64dcd67355767f57261fd5ef11955ce899dedfcb97cf863f7a9b35617169c24286d5ce3074c233a453364efb56477c6de48009bb8106a73c7e50daf SHA512 1725945f0373f03e5ae81b8e9eee4e2a9260d9362ad424e4198bb71af2e69055439268197f784d2acbd9e17ff977e8b1a7f5193d378a036488ff758d0ead4b5a
-AUX sauerbraten-2013.02.03-system-enet.patch 1880 BLAKE2B 57c35e0d15344fdb226f829460d1c15cb163a103911b4d63d544c786f8cb4fe10a0624749e0d3b6fce5a643d2c8285001a8a63f3c700441971a9597f11deb776 SHA512 b53e7db4e6b7ce012ee292a24cbf6e84e1c6bce01cde1a41985d0b471a68c1d2978f8272bc359a81beb317b5ab2ff88a13a1e73aaeb7f5c643e778ffe9861c7a
 AUX sauerbraten-2020.12.27-respect-FLAGS-don-t-strip-symbols.patch 5648 BLAKE2B 0515107fdeb0a441cc772c747f98068f4819b8ac4999ffd67a68bef96a59b754c3d6e9602a378dfb51984283867b82f1a855c5fdb8d9dacc392d67b57ba9dfdc SHA512 658325bc184792b776eb1a698eb28efdd451aed2f37c1e2182e7ca4703e5ea38eb0e5a5b4742738c94281f829f14eb394972449c43818805b7fb21f259b2c473
 AUX sauerbraten-2020.12.27-unbundle-enet.patch 3893 BLAKE2B ee866466fc13977c62750ee63c669f4815c4a5c42c14ab34b19fb4b6b356201042eddbab48c768ef173e26bfc883b47fc7f92d82f4b7660ec25efede0ea82679 SHA512 65206ebfed702fc165eef57a922fd85d2bf0251a8e3f6a7b7fa3b7b3ceee207466c8ac846b1303a1de4e9857b5bff61a01688700e6d3a0286c60c567071f2633
 AUX sauerbraten-2020.12.27-use-pkg-config-for-freetype2.patch 1028 BLAKE2B b628050655e112e7002f2aa2680d55b7d56dc2034bcf445802c594ac7386aa1ebb8301493df4a981b5595b8e6bdc29bd6851be53733a77ebde1058c0eb48d590 SHA512 85d26c201ac55b746a77755a82e9a055ac3ff8cb374a398e98cf50f373388e9b5183f1b316d5b73af91bba5c9815bfa391f43d1621febd9bd7b8afb3c25ba209
 AUX sauerbraten.conf 614 BLAKE2B 7fcd75fbc0be5ab445ddc5c5f5256529ab52d8f036687f2835b6e2996f0d832d42ecad75b857a4dc5b88db7ea2ff5bd0be30c60bd0462a20b8995b793adef348 SHA512 6731950c3f5309f7155ca71804f01d88562dcc82a7089499c076941b0283f42b0a7a4293859079d20a40b41e57f22f80c8e25f7670b17a64313055e9d1051000
 AUX sauerbraten.init 1903 BLAKE2B a7917ba65edf17c2ed3b0a3026a7f305978e34a15ea28dcf78f9de3ff55b3391a8fb3550f615ea4890c186d2348957ce0cda6354fdaf5b02e811383243efe04f SHA512 d4d95e1917d8324589b682112957f95de4033711e67a0303753978de57cb030ad28d59f350373014c791755f4225f5ec2b914a2fe73ca68e5f94fdb3d6998ae9
-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
-EBUILD sauerbraten-2013.02.03-r2.ebuild 3212 BLAKE2B f7dc4702e3b6a3fc0bdb6595168cc607d6fc0443e987b5e443baddb3f20e29eb592fee63e678cfd319dee1069a0330a146cafd3f8454df835ab56cd2c8fd7dde SHA512 7c5523d5d0d029099c2e3fb2223dbb26cf91a0424345153124d02a89ff8beb2c3756fe2c4b2e729acd192ff4842657e0ac31c1fb899d5a92ed9bdb88afadaa05
 EBUILD sauerbraten-2020.12.27.ebuild 3279 BLAKE2B a0166d1afe9237b3104be63276f76f9c0bdfb9c4accff9b92feab6e5850e72854c939840591898c501e85eb2a2bb250f120738833f747cf931fe27088a9e30bf SHA512 975a52d27b6c593d0c3c989522fec621edef9a5bb13c31766aebc808f244ff1075ddcbf8c8e28fcbe39600a46927fb423d78a264cbcd8dd5ceba736ecb7afb42
-MISC metadata.xml 401 BLAKE2B 0447e0bdea4cbb8ea99d24ac4f854ff4aefd0e62c4fb1e349485a5ec8429239c95299f5f26736e5458525787d6ef54bda400441ac5b6de920a2ddf949d2cab20 SHA512 1087c8ed886c5066a8bd600cbc9878e6bf21c41f163939daf22c503ce1e9095aff13b8986959aadaaaaf04cd2f314bb664042829deb30196b88a8c2608ce8266
+MISC metadata.xml 402 BLAKE2B cf98604dae54752acae657864f2a168e284e484ddd903fbbb22dc2a3a25241a323233b49abcab62711398cf200e3617fae17d48a948a8dcf702c8435b83216b1 SHA512 60b18a5cd29a8a2ca8e32109ea6e1ed5721e95bdecc138d76767a10e143dc2532fafadded6e2f4b6ecb4769f4ab0a87927ade4db5e16a67ed8398b410f0577ee
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 21f1b13c7a2a..000000000000
--- 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 e87b280ba0c1..000000000000
--- 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 -lSDL_mixer -lz -lGL
-+CLIENT_INCLUDES= $(INCLUDES) `sdl-config --cflags`
-+CLIENT_LIBS= -lenet -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
- endif
- ifeq ($(PLATFORM),Linux)
- CLIENT_LIBS+= -lrt
-@@ -106,7 +106,7 @@
- MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
- else
- SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
--SERVER_LIBS= -Lenet/.libs -lenet -lz
-+SERVER_LIBS= -lenet -lz
- MASTER_LIBS= $(SERVER_LIBS)
- endif
- SERVER_OBJS= \
-@@ -135,15 +135,6 @@
- 
- all: client server
- 
--enet/Makefile:
--	cd enet; ./configure --enable-shared=no --enable-static=yes
--	
--libenet: enet/Makefile
--	$(MAKE)	-C enet/ all
--
--clean-enet: enet/Makefile
--	$(MAKE) -C enet/ clean
--
- clean:
- 	-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master
- 
-@@ -176,13 +167,13 @@
- 
- install: all
- else
--client:	libenet $(CLIENT_OBJS)
-+client:	$(CLIENT_OBJS)
- 	$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
- 
--server:	libenet $(SERVER_OBJS)
-+server:	$(SERVER_OBJS)
- 	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
- 	
--master: libenet $(MASTER_OBJS)
-+master: $(MASTER_OBJS)
- 	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
- 
- shared/cube2font.o: shared/cube2font.c
diff --git a/games-fps/sauerbraten/metadata.xml b/games-fps/sauerbraten/metadata.xml
index ee6f39587e0e..438f4f0f9813 100644
--- a/games-fps/sauerbraten/metadata.xml
+++ b/games-fps/sauerbraten/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
diff --git a/games-fps/sauerbraten/sauerbraten-2013.02.03-r2.ebuild b/games-fps/sauerbraten/sauerbraten-2013.02.03-r2.ebuild
deleted file mode 100644
index c2efbc863d58..000000000000
--- a/games-fps/sauerbraten/sauerbraten-2013.02.03-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug dedicated server"
-
-DEPEND="
-	sys-libs/zlib
-	>=net-libs/enet-1.3.6:1.3
-	!dedicated? (
-		media-libs/libsdl[X,opengl]
-		media-libs/sdl-mixer[vorbis]
-		media-libs/sdl-image[png,jpeg]
-		virtual/opengl
-		virtual/glu
-		x11-libs/libX11
-	)
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/sauerbraten
-	dedicated? ( acct-user/sauerbraten )
-"
-
-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} || die
-
-	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="/usr/lib"
-	local DATADIR="/usr/share/${PN}"
-	local STATEDIR="/var/lib/${PN}"
-
-	if ! use dedicated ; then
-		# Install the game data
-		insinto "${DATADIR}"
-		doins -r data packages
-
-		# Install the client executable
-		exeinto "${LIBEXECDIR}"
-		doexe src/sauer_client
-
-		# Install the client wrapper
-		make_wrapper "${PN}-client" "${LIBEXECDIR}/sauer_client -q\$HOME/.${PN} -r" "${DATADIR}"
-
-		# Create menu entry
-		newicon -s 256 data/cube.png ${PN}.png
-		make_desktop_entry "${PN}-client" "Cube 2: Sauerbraten"
-	fi
-
-	# Install the server config files
-	insinto "${STATEDIR}"
-	doins "server-init.cfg"
-
-	# Install the server executables
-	exeinto "${LIBEXECDIR}"
-	doexe src/sauer_master
-	use dedicated || use server && doexe src/sauer_server
-
-	make_wrapper "${PN}-server" \
-		"${LIBEXECDIR}/sauer_server -k${DATADIR} -q${STATEDIR}"
-	make_wrapper "${PN}-master" \
-		"${LIBEXECDIR}/sauer_master ${STATEDIR}"
-
-	# Install the server init script
-	keepdir /var/run/${PN}
-	cp "${FILESDIR}"/${PN}.init "${T}" || die
-	sed -i \
-		-e "s:%SYSCONFDIR%:${STATEDIR}:g" \
-		-e "s:%LIBEXECDIR%:${LIBEXECDIR}: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%:sauerbraten:g" \
-		-e "s:%GAMES_GROUP%:sauerbraten:g" \
-		"${T}"/${PN}.conf || die
-	newconfd "${T}"/${PN}.conf ${PN}
-
-	dodoc src/*.txt docs/dev/*.txt
-
-	docinto html
-	dodoc -r README.html docs/*
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	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
-}