commit: 63f215b97d831e0547cd7c395403fb416629a214 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Tue Aug 20 17:50:59 2024 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Tue Aug 20 17:50:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f215b9
games-arcade/wop: treeclean Closes: https://bugs.gentoo.org/936299 (pkgremoved) Closes: https://bugs.gentoo.org/670614 (pkgremoved) Closes: https://bugs.gentoo.org/730816 (pkgremoved) Closes: https://bugs.gentoo.org/715480 (pkgremoved) Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> games-arcade/wop/Manifest | 2 - .../wop/files/wop-0.4.3-fix-build-system.patch | 100 --------------------- games-arcade/wop/files/wop-0.4.3-gcc43.patch | 32 ------- games-arcade/wop/files/wop-0.4.3-gcc6.patch | 17 ---- games-arcade/wop/metadata.xml | 8 -- games-arcade/wop/wop-0.4.3-r2.ebuild | 54 ----------- profiles/package.mask | 1 - 7 files changed, 214 deletions(-) diff --git a/games-arcade/wop/Manifest b/games-arcade/wop/Manifest deleted file mode 100644 index 39a35cabcaa0..000000000000 --- a/games-arcade/wop/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST wop-0.4.3-src.tar.bz2 280974 BLAKE2B 8a24aa604ba0eab141e9a59b595ea882a5b0fb22662bb10752d2fdac79e00be4bce4721cdfca479d8f55bcaee5f1f33e7af57573dbd4c7994c88124ac35fd551 SHA512 259f9f455e6fbfae2ffb6e169dcf1661f1353e28a5e51b6e907f2868a50c5f54982b4d383dcfcec201c9a2d0429fb468c44c974695364c5fd28d25328e10c6b8 -DIST wopdata-2005-12-21.tar.bz2 4217006 BLAKE2B 0ebe5dd4ee8ca2ea026313ec9ee6a283699ad144e39a7d1f6984c37720b0beafb98a8864a0695484427c3398969908f3ca16909ef07601046540accb3cfbe103 SHA512 6ebc264d1811091550d664a77aeae68184a058c666db486e4ae411e0849abbd02dd2037a3a1a9a31a73774e5f616c21840b0c1de58636dde0e59bd0e952cb505 diff --git a/games-arcade/wop/files/wop-0.4.3-fix-build-system.patch b/games-arcade/wop/files/wop-0.4.3-fix-build-system.patch deleted file mode 100644 index 5af16960a95a..000000000000 --- a/games-arcade/wop/files/wop-0.4.3-fix-build-system.patch +++ /dev/null @@ -1,100 +0,0 @@ -* Remove hardcoded user variables -* Respect LDFLAGS and CPPFLAGS -* Fix installation dir for arch-independent files - ---- a/Makefile -+++ b/Makefile -@@ -3,22 +3,22 @@ - sinclude Makefile.local - - all: -- +cd sdlwidgets; make -- +cd src; make -+ $(MAKE) -C sdlwidgets -+ $(MAKE) -C src - runc: -- +cd src; make runc -+ $(MAKE) -C src runc - runs: -- +cd src; make runs -+ $(MAKE) -C src runs - doc: -- cd src; make doc -+ $(MAKE) -C src doc - clean: -- cd sdlwidgets; make clean -- cd src; make clean -+ $(MAKE) -C sdlwidgets clean -+ $(MAKE) -C src clean - cd doc; rm -rf html - unison: -- cd src; make unison -+ $(MAKE) -C src unison - gunison: -- cd src; make gunison -+ $(MAKE) -C src gunison - snapshot-src: - ln -s . wop; \ - tar cjvf wop-`date +%F`.tar.bz2 \ ---- a/sdlwidgets/Makefile -+++ b/sdlwidgets/Makefile -@@ -9,16 +9,12 @@ - CXXFLAGS ?= -Wall -Wshadow -Wsign-compare -Wparentheses -Wconversion -g -O3 -ansi - CXXFLAGS += $(shell sdl-config --cflags) - --CXX = g++ --AR = ar cru --RANLIB = ranlib -- - sinclude ../src/Makefile.local - - all: $(TARGET) - - $(TARGET): $(OBJECT_FILES) Makefile -- $(AR) $(TARGET) $(OBJECT_FILES) -+ $(AR) cru $(TARGET) $(OBJECT_FILES) - $(RANLIB) $(TARGET) - - %.o: %.cpp Makefile ---- a/src/Makefile -+++ b/src/Makefile -@@ -18,14 +18,13 @@ - -DUSE_SDL -DNEW=new\(std::nothrow\) \ - -I../sdlwidgets \ - $(shell sdl-config --cflags) # -g --LDFLAGS = -L../sdlwidgets -lsdlwidgets -lz \ -+LIBS = -L../sdlwidgets -lsdlwidgets -lz \ - -lm -lSDL_net -lSDL_mixer -lSDL_ttf -lSDL_image \ - $(shell sdl-config --libs) # -g - - WOPFLAGS = data=../data - DOXYGENFLAGS = ../doc/doxygen.rc - --CXX = g++ - DOXYGEN = doxygen - UNISON_SOURCE = ssh://131.188.67.22//homes/staff/pohlt/wop/.unison_data - -@@ -56,10 +55,10 @@ - - $(TARGET): $(OBJECT_FILES) Makefile ../sdlwidgets/libsdlwidgets.a - -mkdir ../bin -- $(CXX) $(OBJECT_FILES) -o $(TARGET) $(LDFLAGS) -+ $(CXX) $(LDFLAGS) $(OBJECT_FILES) -o $(TARGET) $(LIBS) - - %.o: %.cpp Makefile -- $(CXX) $(CXXFLAGS) -c $< -o $@ -+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ - - clean: - -rm -f $(TARGET) *.o Makefile.depend* ---- a/woprc -+++ b/woprc -@@ -30,7 +30,7 @@ - - ## path of the data directory - ## - optional, default "./data" --data = ./data -+data = /usr/share/wop - - ## server name or IP address - ## - optional, default "localhost" diff --git a/games-arcade/wop/files/wop-0.4.3-gcc43.patch b/games-arcade/wop/files/wop-0.4.3-gcc43.patch deleted file mode 100644 index d4273f18ff6e..000000000000 --- a/games-arcade/wop/files/wop-0.4.3-gcc43.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/scusibot.cpp -+++ b/src/scusibot.cpp -@@ -5,6 +5,7 @@ - #include "stationarygun.hpp" - #include "global.hpp" - #include <vector> -+#include <algorithm> - - ScusiBot::ScusiBot() - : m_event( Event::EMPTY ), m_count( 0 ), m_state( IDLE ) { ---- a/src/gameinfowindow.cpp -+++ b/src/gameinfowindow.cpp -@@ -10,6 +10,8 @@ - #include "avatarworm.hpp" - #include "wopsprites.hpp" - #include "wopsprites.cpp" -+#include "spriteset.cpp" -+#include "spritesequence.cpp" - #include "scorekeeper.hpp" - #include "wopgui.hpp" - ---- a/src/map.cpp -+++ b/src/map.cpp -@@ -9,6 +9,8 @@ - #include "world.hpp" - #include "wopsettings.hpp" - #include "objectpaths.hpp" -+#include "spriteset.cpp" -+#include "spritesequence.cpp" - - /**********************************************************/ - diff --git a/games-arcade/wop/files/wop-0.4.3-gcc6.patch b/games-arcade/wop/files/wop-0.4.3-gcc6.patch deleted file mode 100644 index 14eea98c1a4e..000000000000 --- a/games-arcade/wop/files/wop-0.4.3-gcc6.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/global.cpp -+++ b/src/global.cpp -@@ -44,10 +44,10 @@ - #define GREEN(s) s - #define RED(s) s - #else --#define BLACK(s) "\033[0;1m"s"\033[0m" --#define BLINKINK_BLACK_ON_RED(s) "\033[05;1;41m"s"\033[0m" --#define GREEN(s) "\033[32m"s"\033[0m" --#define RED(s) "\033[31m"s"\033[0m" -+#define BLACK(s) "\033[0;1m" s "\033[0m" -+#define BLINKINK_BLACK_ON_RED(s) "\033[05;1;41m" s "\033[0m" -+#define GREEN(s) "\033[32m" s "\033[0m" -+#define RED(s) "\033[31m" s "\033[0m" - #endif - - /**********************************************************/ diff --git a/games-arcade/wop/metadata.xml b/games-arcade/wop/metadata.xml deleted file mode 100644 index 1c3ba213c494..000000000000 --- a/games-arcade/wop/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Games Project</name> -</maintainer> -</pkgmetadata> diff --git a/games-arcade/wop/wop-0.4.3-r2.ebuild b/games-arcade/wop/wop-0.4.3-r2.ebuild deleted file mode 100644 index a23f9dd06474..000000000000 --- a/games-arcade/wop/wop-0.4.3-r2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop toolchain-funcs - -MY_DATA_V="2005-12-21" -MY_DATA_P="${PN}data-${MY_DATA_V}" - -DESCRIPTION="Worms of Prey - A multi-player, real-time clone of Worms" -HOMEPAGE="http://wormsofprey.org/"; -SRC_URI=" - http://wormsofprey.org/download/${P}-src.tar.bz2 - http://wormsofprey.org/download/${MY_DATA_P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - media-libs/libsdl - media-libs/sdl-image - media-libs/sdl-mixer - media-libs/sdl-net - media-libs/sdl-ttf" -DEPEND="${RDEPEND} - x11-misc/makedepend" - -PATCHES=( - "${FILESDIR}"/${P}-fix-build-system.patch - "${FILESDIR}"/${P}-gcc43.patch - "${FILESDIR}"/${P}-gcc6.patch -) - -src_configure() { - tc-export AR CXX RANLIB -} - -src_install() { - dobin bin/${PN} - - insinto /usr/share/${PN} - doins -r "${WORKDIR}/${MY_DATA_P}"/. - - insinto /etc - doins woprc - - newicon "${WORKDIR}/${MY_DATA_P}"/images/misc/icons/wop16.png ${PN}.png - make_desktop_entry wop "Worms of Prey" - - dodoc AUTHORS ChangeLog README{,-Libraries.txt} REVIEWS -} diff --git a/profiles/package.mask b/profiles/package.mask index 5b40f415177a..b06a2bdb0422 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -196,7 +196,6 @@ dev-util/cucumber-html-formatter:20 # Removal on 2024-08-18. Bug #936299. games-arcade/sdl-sopwith games-arcade/syobon -games-arcade/wop # Leonardo Hernández Hernández <[email protected]> (2024-07-07) # New major ffmpeg version. Tracker bug #928905.
