commit: a4d3875e8b6ffeb9694408b3788fb26616134d41 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sun Sep 12 20:58:43 2021 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sun Sep 12 21:07:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d3875e
games-fps/sauerbraten: drop 2013.02.03-r2 Signed-off-by: Ionen Wolkens <ionen <AT> 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..00000000000 --- 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..00000000000 --- 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/sauerbraten-2013.02.03-r2.ebuild b/games-fps/sauerbraten/sauerbraten-2013.02.03-r2.ebuild deleted file mode 100644 index c2efbc863d5..00000000000 --- 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 -}
