commit: 19193c7a946c5e4ab5286c2585e2edcdb623e4b4 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Sun Jan 8 12:29:57 2023 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Sun Jan 8 12:29:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19193c7a
games-strategy/netherearth: treeclean Closes: https://bugs.gentoo.org/668090 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> games-strategy/netherearth/Manifest | 2 - games-strategy/netherearth/files/Makefile | 20 --- .../files/netherearth-0.52-freeglut.patch | 18 --- .../files/netherearth-0.52-gentoo-paths.patch | 139 --------------------- .../files/netherearth-0.52-glibc-212.patch | 23 ---- .../files/netherearth-0.52-ldflags.patch | 8 -- .../netherearth/files/netherearth-0.52-linux.patch | 47 ------- games-strategy/netherearth/metadata.xml | 14 --- .../netherearth/netherearth-0.52-r1.ebuild | 86 ------------- profiles/package.mask | 6 - 10 files changed, 363 deletions(-) diff --git a/games-strategy/netherearth/Manifest b/games-strategy/netherearth/Manifest deleted file mode 100644 index 0b9e536676bb..000000000000 --- a/games-strategy/netherearth/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST netherearth052.zip 872397 BLAKE2B 091a5f9e6773450e3796daebf0d40e1796ca97682aa8092dd669deb3dcf4161a9f6f408d5e43bcce847375ad61c7cb43a90acf382898a0ddd36b3da55917cbb1 SHA512 1f2cb3e896ac076c5ed3d346f19d8328b879546c4dc58609251bdbc8fd96b201cbc5dcb400df2a0dd4c717c7be002f83b92acf33f607890fa736b572c72a8cf5 -DIST sources.zip 75918 BLAKE2B 23142db81e0fca94948cfc6d6443daf1f7909c1dc2334b73897c1e07d1eb39c0c05cedb7cb0b1c8681990a0a0b6632e4666e67128379e14da23fbbe90b9ae641 SHA512 8daa9def65f4be8a541df15c69531da84344906e0f3eab2b7e84f8a94e2f3278d2033e37a9edd4b17fc19b1f7fbf3537286a2a2a9877950d19a51a1167487b75 diff --git a/games-strategy/netherearth/files/Makefile b/games-strategy/netherearth/files/Makefile deleted file mode 100644 index 07c671a10e31..000000000000 --- a/games-strategy/netherearth/files/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# ls *.cpp -# -#3dobject-ase.cpp construction.cpp maps.cpp netherdebug.cpp radar.cpp -#3dobject.cpp enemy_ai.cpp menu.cpp nethersave.cpp robot_ai.cpp -#bitmap.cpp glprintf.cpp myglutaux.cpp particles.cpp robots.cpp -#bullet.cpp main.cpp nether.cpp piece3dobject.cpp shadow3dobject.cpp -#cmc.cpp mainmenu.cpp nethercycle.cpp quaternion.cpp vector.cpp - - -SOURCES = 3dobject-ase.cpp 3dobject.cpp cmc.cpp nether.cpp piece3dobject.cpp vector.cpp bitmap.cpp bullet.cpp glprintf.cpp main.cpp mainmenu.cpp maps.cpp menu.cpp myglutaux.cpp nethercycle.cpp netherdebug.cpp nethersave.cpp particles.cpp construction.cpp quaternion.cpp radar.cpp enemy_ai.cpp robot_ai.cpp robots.cpp shadow3dobject.cpp -OBJECTS = $(SOURCES:.cpp=.o) -TARGET = nether_earth - -.cpp.o: - g++ ${CXXFLAGS} -c $< -o $@ - -all: $(TARGET) - -$(TARGET): $(OBJECTS) - g++ $(OBJECTS) -o $(TARGET) -lGL -lGLU -lglut -lSDL -lSDL_mixer -lpthread diff --git a/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch b/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch deleted file mode 100644 index b61e1f139b04..000000000000 --- a/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/main.cpp -+++ b/main.cpp -@@ -8,6 +8,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <GL/glut.h> - #include "SDL/SDL.h" - #include "SDL/SDL_mixer.h" - -@@ -144,6 +145,7 @@ - bool quit = false; - - load_configuration(); -+ glutInit(&argc, argv); - - screen_sfc = initialization((fullscreen ? SDL_FULLSCREEN : 0)); - if (screen_sfc==0) return 0; diff --git a/games-strategy/netherearth/files/netherearth-0.52-gentoo-paths.patch b/games-strategy/netherearth/files/netherearth-0.52-gentoo-paths.patch deleted file mode 100644 index 25f99be50fab..000000000000 --- a/games-strategy/netherearth/files/netherearth-0.52-gentoo-paths.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff -ud ../NetherEarth_v0.51-linsrc.orig/3dobject-ase.cpp ./3dobject-ase.cpp ---- ../NetherEarth_v0.51-linsrc.orig/3dobject-ase.cpp 2002-10-26 00:00:00.000000000 +0300 -+++ ./3dobject-ase.cpp 2004-04-16 21:42:55.000000000 +0300 -@@ -34,7 +34,7 @@ - char buffer[256]; - FILE *fp; - -- fp=fopen(file,"r+"); -+ fp=fopen(file,"r"); - if (fp==NULL) return false; - - /* Look for the materials: */ -diff -ud ../NetherEarth_v0.51-linsrc.orig/3dobject.cpp ./3dobject.cpp ---- ../NetherEarth_v0.51-linsrc.orig/3dobject.cpp 2004-01-06 20:49:00.000000000 +0200 -+++ ./3dobject.cpp 2004-04-16 21:43:44.000000000 +0300 -@@ -74,7 +74,7 @@ - - int *smooth; - -- fp=fopen(file,"r+"); -+ fp=fopen(file,"r"); - if (fp==NULL) return false; - - /* Importar un fichero .ASC de 3DStudio */ -diff -ud ../NetherEarth_v0.51-linsrc.orig/bitmap.cpp ./bitmap.cpp ---- ../NetherEarth_v0.51-linsrc.orig/bitmap.cpp 2004-01-06 20:49:00.000000000 +0200 -+++ ./bitmap.cpp 2004-04-16 21:45:13.000000000 +0300 -@@ -14,7 +14,7 @@ - g=0; - b=0; - -- fp=fopen(file,"rb+"); -+ fp=fopen(file,"rb"); - if (fp==NULL) return; - - /* Tag: */ -diff -ud ../NetherEarth_v0.51-linsrc.orig/mainmenu.cpp ./mainmenu.cpp ---- ../NetherEarth_v0.51-linsrc.orig/mainmenu.cpp 2004-01-06 20:50:00.000000000 +0200 -+++ ./mainmenu.cpp 2004-04-16 21:14:14.000000000 +0300 -@@ -6,6 +6,9 @@ - #include <dirent.h> - #endif - -+#include <stdlib.h> -+#include <fcntl.h> -+#include <unistd.h> - #include "string.h" - #include "stdio.h" - #include "math.h" -@@ -483,8 +486,10 @@ - { - int v; - FILE *fp; -+ char cfg_path[300]; - -- fp=fopen("nether.cfg","r"); -+ sprintf(cfg_path, "%s/.netherearth/nether.cfg", getenv("HOME")); -+ fp=fopen(cfg_path,"r"); - if (fp==0) return; - - if (2!=fscanf(fp,"%i %i",&SCREEN_X,&SCREEN_Y)) return; -@@ -510,8 +515,12 @@ - void save_configuration(void) - { - FILE *fp; -+ char cfg_path[300]; - -- fp=fopen("nether.cfg","w"); -+ sprintf(cfg_path, "%s/.netherearth", getenv("HOME")); -+ mkdir(cfg_path, 0755); -+ sprintf(cfg_path, "%s/.netherearth/nether.cfg", getenv("HOME")); -+ fp=fopen(cfg_path,"w"); - if (fp==0) return; - - fprintf(fp,"%i %i\n",SCREEN_X,SCREEN_Y); -diff -ud ../NetherEarth_v0.51-linsrc.orig/nether.cpp ./nether.cpp ---- ../NetherEarth_v0.51-linsrc.orig/nether.cpp 2004-01-06 21:03:00.000000000 +0200 -+++ ./nether.cpp 2004-04-16 20:54:54.000000000 +0300 -@@ -1203,7 +1203,7 @@ - if (option_menu==(i+1)) glColor3f(1.0,0.0,0.0); - else glColor3f(0.5,0.5,1.0); - glTranslatef(0,-2,0); -- sprintf(filename,"savedgame%i.txt",i); -+ sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), i); - fp=fopen(filename,"r"); - if (fp==0) { - scaledglprintf(0.01,0.01,"SLOT%i - EMPTY",i+1); -@@ -1232,7 +1232,7 @@ - if (option_menu==(i+1)) glColor3f(1.0,0.0,0.0); - else glColor3f(0.5,0.5,1.0); - glTranslatef(0,-2,0); -- sprintf(filename,"savedgame%i.txt",i); -+ sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), i); - fp=fopen(filename,"r"); - if (fp==0) { - scaledglprintf(0.01,0.01,"SLOT%i - EMPTY",i+1); -@@ -1291,7 +1291,7 @@ - case 4: - { - char filename[80]; -- sprintf(filename,"savedgame%i.txt",option_menu-1); -+ sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), option_menu-1); - save_game(filename); - //save_debug_report("debugreport.txt"); - game_state=STATE_PAUSE; -@@ -1326,7 +1326,7 @@ - case 4: - { - char filename[80]; -- sprintf(filename,"savedgame%i.txt",option_menu-1); -+ sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), option_menu-1); - killmenu(act_menu); - load_game(filename); - newmenu(act_menu); -diff -ud ../NetherEarth_v0.51-linsrc.orig/nethersave.cpp ./nethersave.cpp ---- ../NetherEarth_v0.51-linsrc.orig/nethersave.cpp 2003-09-17 00:00:00.000000000 +0300 -+++ ./nethersave.cpp 2004-04-16 21:23:04.000000000 +0300 -@@ -2,6 +2,10 @@ - #include "windows.h" - #endif - -+#include <stdlib.h> -+#include <sys/types.h> -+#include <fcntl.h> -+#include <unistd.h> - #include "string.h" - #include "stdio.h" - #include "math.h" -@@ -40,7 +44,10 @@ - ROBOT *r; - BULLET *bul; - EXPLOSION *e; -+ char tmp_path[300]; - -+ sprintf(tmp_path, "%s/.netherearth", getenv("HOME")); -+ mkdir(tmp_path, 0755); - fp=fopen(filename,"w"); - if (fp==0) return false; - diff --git a/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch b/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch deleted file mode 100644 index 813f963db4c8..000000000000 --- a/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch +++ /dev/null @@ -1,23 +0,0 @@ -http://bugs.gentoo.org/335137 - ---- sources/mainmenu.cpp -+++ sources/mainmenu.cpp -@@ -3,6 +3,7 @@ - #else - #include <stddef.h> - #include <sys/types.h> -+#include <sys/stat.h> - #include <dirent.h> - #endif - ---- sources/nethersave.cpp -+++ sources/nethersave.cpp -@@ -1,5 +1,8 @@ - #ifdef _WIN32 - #include "windows.h" -+#else -+#include <sys/types.h> -+#include <sys/stat.h> - #endif - - #include "string.h" diff --git a/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch b/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch deleted file mode 100644 index 7d81f912764f..000000000000 --- a/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/Makefile.old 2010-10-12 09:30:19.000000000 +0200 -+++ b/Makefile 2010-10-12 09:30:38.000000000 +0200 -@@ -17,4 +17,4 @@ - all: $(TARGET) - - $(TARGET): $(OBJECTS) -- g++ $(OBJECTS) -o $(TARGET) -lGL -lGLU -lglut -lSDL -lSDL_mixer -lpthread -+ g++ $(LDFLAGS) $(OBJECTS) -o $(TARGET) -lGL -lGLU -lglut -lSDL -lSDL_mixer -lpthread diff --git a/games-strategy/netherearth/files/netherearth-0.52-linux.patch b/games-strategy/netherearth/files/netherearth-0.52-linux.patch deleted file mode 100644 index 6c4c0d1e9733..000000000000 --- a/games-strategy/netherearth/files/netherearth-0.52-linux.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -burN sources/glprintf.cpp sources-linux/glprintf.cpp ---- sources/glprintf.cpp 2002-10-26 00:17:00.000000000 +0200 -+++ sources-linux/glprintf.cpp 2005-06-18 18:22:54.000000000 +0200 -@@ -3,6 +3,7 @@ - #endif - #include "GL/gl.h" - -+#include "string.h" - #include "stdio.h" - #include "stdarg.h" - #include "GL/gl.h" -diff -burN sources/list.h sources-linux/list.h ---- sources/list.h 2002-10-27 12:17:00.000000000 +0100 -+++ sources-linux/list.h 2005-06-18 18:21:34.000000000 +0200 -@@ -1,6 +1,9 @@ - #ifndef GENERIC_LIST - #define GENERIC_LIST - -+ -+#include "stdlib.h" -+ - /* - Funciones para LISTAS: - -diff -burN sources/maps.cpp sources-linux/maps.cpp ---- sources/maps.cpp 2005-05-05 23:42:00.000000000 +0200 -+++ sources-linux/maps.cpp 2005-06-18 18:23:05.000000000 +0200 -@@ -3,6 +3,7 @@ - #endif - - #include "stdio.h" -+#include "string.h" - - #include "GL/gl.h" - #include "GL/glu.h" -diff -burN sources/myglutaux.cpp sources-linux/myglutaux.cpp ---- sources/myglutaux.cpp 2002-10-26 00:17:00.000000000 +0200 -+++ sources-linux/myglutaux.cpp 2005-06-18 18:23:29.000000000 +0200 -@@ -5,6 +5,8 @@ - #include <GL/gl.h> - #include "GL/glut.h" - -+#include "string.h" -+#include "stdlib.h" - #include "stdio.h" - #include "math.h" - #include "vector.h" diff --git a/games-strategy/netherearth/metadata.xml b/games-strategy/netherearth/metadata.xml deleted file mode 100644 index b8124ddf943a..000000000000 --- a/games-strategy/netherearth/metadata.xml +++ /dev/null @@ -1,14 +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> - <longdescription lang="en"> - Nether Earth was the very first real time strategy game. It worked on a - SPECTRUM machine, and only needed 48KB of RAM to work!! It has all the - typical elements of strategy games: resources, factories, combat units, - etc. - </longdescription> -</pkgmetadata> diff --git a/games-strategy/netherearth/netherearth-0.52-r1.ebuild b/games-strategy/netherearth/netherearth-0.52-r1.ebuild deleted file mode 100644 index e1aa7cabaaac..000000000000 --- a/games-strategy/netherearth/netherearth-0.52-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop - -MY_PV="${PV/./}" -DESCRIPTION="A remake of the SPECTRUM game Nether Earth" -HOMEPAGE="http://www.braingames.getput.com/nether/"; -SRC_URI="http://www.braingames.getput.com/nether/sources.zip - http://www.braingames.getput.com/nether/${PN}${MY_PV}.zip"; - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="mirror bindist" - -RDEPEND=" - >=media-libs/libsdl-1.2.6-r3 - >=media-libs/sdl-mixer-1.2.5-r1 - media-libs/freeglut -" -DEPEND="${RDEPEND} - app-arch/unzip -" - -S="${WORKDIR}/sources" - -data="../nether earth v${PV}" - -src_unpack() { - unzip -LL "${DISTDIR}/${PN}${MY_PV}.zip" >/dev/null || die - unzip -LL "${DISTDIR}/sources.zip" >/dev/null || die -} - -src_prepare() { - default - - DATA_DIR=/usr/share/${PN} - - cp "${FILESDIR}/Makefile" . || die - - # Fix compilation errors/warnings - eapply "${FILESDIR}"/${P}-linux.patch - - eapply "${FILESDIR}"/${P}-freeglut.patch \ - "${FILESDIR}"/${P}-glibc-212.patch \ - "${FILESDIR}"/${P}-ldflags.patch - - # Modify dirs and some fopen() permissions - eapply "${FILESDIR}/${P}-gentoo-paths.patch" - sed -i \ - -e "s:models:${DATA_DIR}/models:" \ - -e "s:textures:${DATA_DIR}/textures:" \ - -e "s:maps/\*:${DATA_DIR}/maps/\*:" \ - -e "s:\./maps:${DATA_DIR}/maps:" \ - mainmenu.cpp || die - sed -i \ - -e "s:models:${DATA_DIR}/models:g" \ - -e "s:textures:${DATA_DIR}/textures:" \ - -e "s:sound/:${DATA_DIR}/sound/:" \ - nether.cpp || die - sed -i -e "s:maps:${DATA_DIR}/maps:" \ - main.cpp || die - sed -i -e "s:textures/:${DATA_DIR}/textures/:" \ - myglutaux.cpp || die - - cd "${data}" - rm textures/thumbs.db -} - -src_install() { - dobin nether_earth - - cd "${data}" - - # Install all game data - insinto "${DATA_DIR}" - doins -r maps models sound textures - - dodoc readme.txt - - newicon textures/nuclear.bmp ${PN}.bmp - make_desktop_entry nether_earth "Nether Earth" /usr/share/pixmaps/${PN}.bmp -} diff --git a/profiles/package.mask b/profiles/package.mask index c6cd1142a2db..21480b93e451 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -919,12 +919,6 @@ net-p2p/opendchub # mpc.h breaks compilation of reverse dependencies, reported upstream to ML =dev-libs/mpc-1.3.0 -# Michał Górny <[email protected]> (2022-12-09) -# Unfetchable as the upstream homepage is gone, and mirror-restricted. -# No package activity since 2018. -# Removal on 2023-01-08. Bug #668090. -games-strategy/netherearth - # Michał Górny <[email protected]> (2022-12-08) # Seems to break some logic in pkg_resources. Masked for the time being # to prevent breakage.
