Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, games-arcade/snake3d/files/, games-arcade/snake3d/
Date: Sat, 28 Jul 2018 12:06:35
Message-Id: 1532779540.30e541dda461565f3d3f3f1af6b82f8a623015f8.mgorny@gentoo
1 commit: 30e541dda461565f3d3f3f1af6b82f8a623015f8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 28 12:05:40 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 28 12:05:40 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e541dd
7
8 games-arcade/snake3d: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/612322
11
12 games-arcade/snake3d/Manifest | 1 -
13 games-arcade/snake3d/files/snake3d-0.9-amd64.patch | 37 ---------------------
14 games-arcade/snake3d/files/snake3d-0.9-build.patch | 24 --------------
15 games-arcade/snake3d/metadata.xml | 16 ---------
16 games-arcade/snake3d/snake3d-0.9.ebuild | 38 ----------------------
17 profiles/package.mask | 4 ---
18 6 files changed, 120 deletions(-)
19
20 diff --git a/games-arcade/snake3d/Manifest b/games-arcade/snake3d/Manifest
21 deleted file mode 100644
22 index b00da01ea66..00000000000
23 --- a/games-arcade/snake3d/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST snake3d-0.9.tar.gz 62900 BLAKE2B 8520ddf52705cf086374c707f319fef5f3d9d964a05f367da8aab19c46f4f8e42947e104cdc4f3d7db20901308d995470f29a840af22500fd6c4c4d2ab7a301b SHA512 2bc2d3e68fd782d58c5f702727a8a72fb67096e7ff78e1e00f3a79767bad627fe3a2ceec05a621e8d5b4b3ba009a01814c93b7d21f180512b13411bf61ac1065
27
28 diff --git a/games-arcade/snake3d/files/snake3d-0.9-amd64.patch b/games-arcade/snake3d/files/snake3d-0.9-amd64.patch
29 deleted file mode 100644
30 index d2b5f2c79ac..00000000000
31 --- a/games-arcade/snake3d/files/snake3d-0.9-amd64.patch
32 +++ /dev/null
33 @@ -1,37 +0,0 @@
34 ---- src/functions.cpp.old 2007-03-31 11:04:10.000000000 +0200
35 -+++ src/functions.cpp 2007-03-31 11:11:52.000000000 +0200
36 -@@ -107,8 +107,8 @@
37 - pointer = end;
38 - }
39 -
40 -- memcpy(str, i, (int)pointer - (int)i);
41 -- str[(int)pointer - (int)i] = 0;
42 -+ memcpy(str, i, ssize_t(pointer - i));
43 -+ str[pointer - i] = 0;
44 -
45 - drawString(x, y, str);
46 -
47 -@@ -501,15 +501,21 @@
48 -
49 - Uint32 timer(Uint32 interval, void* value) {
50 -
51 -+ union {
52 -+ void *value;
53 -+ int p_mode;
54 -+ } p_modeConv;
55 -+ p_modeConv.value = value;
56 -+
57 - //if ((int)value != gameModeValue)
58 -- if ((int)value != p_mode)
59 -+ if (p_modeConv.p_mode != p_mode)
60 - return 0;
61 -
62 - SDL_Event event;
63 - SDL_UserEvent userevent;
64 -
65 - userevent.type = SDL_USEREVENT;
66 -- userevent.code = (int)value;
67 -+ userevent.code = p_modeConv.p_mode;
68 - userevent.data1 = NULL;
69 - userevent.data2 = NULL;
70 -
71
72 diff --git a/games-arcade/snake3d/files/snake3d-0.9-build.patch b/games-arcade/snake3d/files/snake3d-0.9-build.patch
73 deleted file mode 100644
74 index f7d8c4404df..00000000000
75 --- a/games-arcade/snake3d/files/snake3d-0.9-build.patch
76 +++ /dev/null
77 @@ -1,24 +0,0 @@
78 ---- src/Makefile
79 -+++ src/Makefile
80 -@@ -1,10 +1,10 @@
81 - OBJ = board.o snake.o game.o menu.o snake3d.o global.o consts.o cube.o functions.o preferences.o rooms2.o network.o userInput.o server.o packets.o client.o classic2d.o
82 --CXXFLAGS = -g -Wall -I/usr/X11R6/include/ `sdl-config --cflags`
83 -+CXXFLAGS += -Wall $(shell sdl-config --cflags)
84 - CXX = g++
85 - CC = g++
86 - #LDFLAGSMAC = -framework GLUT -framework OpenGL -framework Cocoa -bind_at_load -L/sw/lib/ -lSDL -lSDLmain
87 - LDFLAGSMAC = `sdl-config --libs` -framework GLUT -framework OpenGL -lSDL_net
88 --LDFLAGS = -L/usr/X11R6/lib/ -lGL -lglut -lGLU -lSDL -lSDL_net
89 -+LIBS = -lGL -lglut -lGLU $(shell sdl-config --libs) -lSDL_net
90 -
91 - all: snake3d
92 -
93 -@@ -18,7 +18,7 @@
94 - g++ $(LDFLAGSMAC) $(OBJ) -o ../snake3d
95 -
96 - snake3d.linux: $(OBJ)
97 -- g++ $(LDFLAGS) $(OBJ) -o ../snake3d
98 -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o ../snake3d
99 -
100 -
101 - clean:
102
103 diff --git a/games-arcade/snake3d/metadata.xml b/games-arcade/snake3d/metadata.xml
104 deleted file mode 100644
105 index 261d7fab00c..00000000000
106 --- a/games-arcade/snake3d/metadata.xml
107 +++ /dev/null
108 @@ -1,16 +0,0 @@
109 -<?xml version="1.0" encoding="UTF-8"?>
110 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
111 -<pkgmetadata>
112 - <maintainer type="project">
113 - <email>games@g.o</email>
114 - <name>Gentoo Games Project</name>
115 - </maintainer>
116 - <longdescription lang="en">
117 -snake3d is a variant of the snake game. You are a snake in a 3d world trying to
118 -eat as many icosahedrons as possible, which makes your tail longer. There are
119 -other snakes (network players) in the world which will try to fail you.
120 -</longdescription>
121 - <upstream>
122 - <remote-id type="sourceforge">worms3d</remote-id>
123 - </upstream>
124 -</pkgmetadata>
125
126 diff --git a/games-arcade/snake3d/snake3d-0.9.ebuild b/games-arcade/snake3d/snake3d-0.9.ebuild
127 deleted file mode 100644
128 index 57db6998ed0..00000000000
129 --- a/games-arcade/snake3d/snake3d-0.9.ebuild
130 +++ /dev/null
131 @@ -1,38 +0,0 @@
132 -# Copyright 1999-2017 Gentoo Foundation
133 -# Distributed under the terms of the GNU General Public License v2
134 -
135 -EAPI=5
136 -inherit eutils toolchain-funcs games
137 -
138 -DESCRIPTION="variant of the snake game"
139 -HOMEPAGE="https://sourceforge.net/projects/worms3d/"
140 -SRC_URI="mirror://sourceforge/worms3d/${P}.tar.gz"
141 -
142 -LICENSE="GPL-2"
143 -SLOT="0"
144 -KEYWORDS="~amd64 ~x86"
145 -IUSE=""
146 -
147 -DEPEND="media-libs/sdl-net
148 - virtual/opengl
149 - media-libs/freeglut
150 - virtual/glu
151 - media-libs/libsdl"
152 -RDEPEND="${DEPEND}"
153 -S=${WORKDIR}/${PN}
154 -
155 -src_prepare() {
156 - epatch \
157 - "${FILESDIR}"/${P}-amd64.patch \
158 - "${FILESDIR}"/${P}-build.patch
159 -}
160 -
161 -src_compile() {
162 - emake CXX=$(tc-getCXX) -C src snake3d.linux
163 -}
164 -
165 -src_install() {
166 - dogamesbin ${PN}
167 - dodoc ChangeLog README TODO
168 - prepgamesdirs
169 -}
170
171 diff --git a/profiles/package.mask b/profiles/package.mask
172 index 448ef39165c..a2a2687321c 100644
173 --- a/profiles/package.mask
174 +++ b/profiles/package.mask
175 @@ -231,10 +231,6 @@ dev-java/jdom-jaxen
176 # Upstream dead for a long time, bug #606194. Removal in a month.
177 dev-libs/DirectFB
178
179 -# Pacho Ramos <pacho@g.o> (17 Jun 2018)
180 -# Segfaults at start (#612322). Removal in a month.
181 -games-arcade/snake3d
182 -
183 # Pacho Ramos <pacho@g.o> (17 Jun 2018)
184 # Dead since 2013, not compatible with latest profiles (#642568). Removal in
185 # a month