Gentoo Archives: gentoo-commits

From: Michael Sterrett <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/rott/files/, games-fps/rott/
Date: Tue, 29 Dec 2015 07:41:40
Message-Id: 1451374856.706909c05d32c53b96e07afa24de97a4135fad55.mr_bones_@gentoo
1 commit: 706909c05d32c53b96e07afa24de97a4135fad55
2 Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 29 05:19:30 2015 +0000
4 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 29 07:40:56 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706909c0
7
8 old
9
10 Package-Manager: portage-2.2.24
11
12 games-fps/rott/Manifest | 1 -
13 games-fps/rott/files/1.0-custom-datapath.patch | 49 ---------------------
14 games-fps/rott/files/rott-1.0-full-version.patch | 11 -----
15 games-fps/rott/files/rott-1.0-gcc41.patch | 22 ----------
16 games-fps/rott/rott-1.0.ebuild | 56 ------------------------
17 5 files changed, 139 deletions(-)
18
19 diff --git a/games-fps/rott/Manifest b/games-fps/rott/Manifest
20 index 6bf03ef..f44f459 100644
21 --- a/games-fps/rott/Manifest
22 +++ b/games-fps/rott/Manifest
23 @@ -1,3 +1,2 @@
24 -DIST rott-1.0.tar.gz 777281 SHA256 11f9cc331d0be87f0f172840e2bb6e03e27c3b8e9ecbb3eb8cffdc5b73afbd95 SHA512 f13183ed2b926e9352f9a1fe43ca87d949f642d77286e20c23c832de8c1c688c30ccab14aa09cb7589423b9c41ab16f41ae4b1d2526ae1bc75defc1395a0b899 WHIRLPOOL 67af2827f884a4057f223cd1f861be5929cdab9d4ab5b3b8f28c835ca0634696328b4b5c464da915efacdc805ad72dd05466be87037318f3a2cff111da948cda
25 DIST rott-1.1.2.tar.gz 749079 SHA256 102516e8c312f6b0bbf6c623e1f01cbfbbc314ace8adfe1f201d47b15bd927ff SHA512 809a9064fe31c63afccb9a6397ac2c9d4172cdd802b055697cf3b0090ee6a78c9e40b52a4a8df25196489d9a0259304c91e2f84f95413a293bc66192502cf200 WHIRLPOOL dc7808f0da85cfd1e240cbae20ddbbc1f564b5f294e42176a9c38795d3d34d2168476c5d415cce819afe67c3fa1da15812106969d463fc505bfc503c27b76580
26 DIST swdata.zip 2889672 SHA256 e226d4958ce1294886b32faf782d9db3d3e66f875d9addd62982e2c8d104fd6b SHA512 99373097356afa583021367b2e0ec6ec745941890e4f17f4e07206c66dd370dfa9e928bc0bd6ab9809d8c72646dcc609e3c19f688d2b89a886f215a153b6dd0d WHIRLPOOL 571d2a5c5f9c45def28f8950d6eaadf5110dbfb0b027951a6a56c1acefe799a7356bc2b436dbe7c9f47d868bdf6b03196fbc69591a66d11c2fb36ab1695125cd
27
28 diff --git a/games-fps/rott/files/1.0-custom-datapath.patch b/games-fps/rott/files/1.0-custom-datapath.patch
29 deleted file mode 100644
30 index 102801d..0000000
31 --- a/games-fps/rott/files/1.0-custom-datapath.patch
32 +++ /dev/null
33 @@ -1,49 +0,0 @@
34 ---- rt_main.c.orig 2003-06-19 23:03:34.000000000 -0400
35 -+++ rt_main.c 2003-06-19 23:04:49.000000000 -0400
36 -@@ -763,9 +763,9 @@
37 - // Normal ROTT wads
38 -
39 - #if (SHAREWARE)
40 -- newargs [argnum++] = "huntbgin.wad";
41 -+ newargs [argnum++] = DATADIR "huntbgin.wad";
42 - #else
43 -- newargs [argnum++] = "darkwar.wad";
44 -+ newargs [argnum++] = DATADIR "darkwar.wad";
45 - #endif
46 -
47 - // newargs [argnum++] = "credits.wad";
48 -@@ -785,7 +785,7 @@
49 - }
50 - else
51 - {
52 -- newargs [argnum++] = "remote1.rts";
53 -+ newargs [argnum++] = DATADIR "remote1.rts";
54 - }
55 -
56 - newargs [argnum++] = NULL;
57 ---- _rt_ted.h.orig 2003-06-19 23:15:26.000000000 -0400
58 -+++ _rt_ted.h 2003-06-19 23:15:54.000000000 -0400
59 -@@ -84,17 +84,17 @@
60 - #define MAXSILLYSTRINGS 32
61 -
62 - #if (SHAREWARE==0)
63 -- #define STANDARDGAMELEVELS ("DARKWAR.RTL")
64 -+ #define STANDARDGAMELEVELS (DATADIR "DARKWAR.RTL")
65 - #if (SUPERROTT==1)
66 -- #define STANDARDBATTLELEVELS ("ROTTCD.RTC")
67 -+ #define STANDARDBATTLELEVELS (DATADIR "ROTTCD.RTC")
68 - #elif (SITELICENSE==1)
69 -- #define STANDARDBATTLELEVELS ("ROTTSITE.RTC")
70 -+ #define STANDARDBATTLELEVELS (DATADIR "ROTTSITE.RTC")
71 - #else
72 -- #define STANDARDBATTLELEVELS ("DARKWAR.RTC")
73 -+ #define STANDARDBATTLELEVELS (DATADIR "DARKWAR.RTC")
74 - #endif
75 - #else
76 -- #define STANDARDGAMELEVELS ("HUNTBGIN.RTL")
77 -- #define STANDARDBATTLELEVELS ("HUNTBGIN.RTC")
78 -+ #define STANDARDGAMELEVELS (DATADIR "HUNTBGIN.RTL")
79 -+ #define STANDARDBATTLELEVELS (DATADIR "HUNTBGIN.RTC")
80 - #endif
81 -
82 -
83
84 diff --git a/games-fps/rott/files/rott-1.0-full-version.patch b/games-fps/rott/files/rott-1.0-full-version.patch
85 deleted file mode 100644
86 index e1615e7..0000000
87 --- a/games-fps/rott/files/rott-1.0-full-version.patch
88 +++ /dev/null
89 @@ -1,11 +0,0 @@
90 ---- develop.h.orig 2007-05-13 22:42:39.000000000 +0200
91 -+++ develop.h 2007-05-13 22:42:44.000000000 +0200
92 -@@ -40,7 +40,7 @@
93 - #define LOWCOST 0
94 -
95 - // Make sure only one of the following are on at one time
96 --#define SHAREWARE 1
97 -+#define SHAREWARE 0
98 - #define SUPERROTT 0
99 - #define SITELICENSE 0
100 -
101
102 diff --git a/games-fps/rott/files/rott-1.0-gcc41.patch b/games-fps/rott/files/rott-1.0-gcc41.patch
103 deleted file mode 100644
104 index c2f67b5..0000000
105 --- a/games-fps/rott/files/rott-1.0-gcc41.patch
106 +++ /dev/null
107 @@ -1,22 +0,0 @@
108 ---- rt_actor.h.old 2006-05-07 00:54:12.000000000 +0200
109 -+++ rt_actor.h 2006-05-07 00:54:23.000000000 +0200
110 -@@ -315,7 +315,6 @@
111 - extern void *actorat[MAPSIZE][MAPSIZE];
112 - extern int angletodir[ANGLES];
113 - extern _2Dpoint SNAKEPATH[512];
114 --extern int STOPSPEED;
115 - extern int FRICTION;
116 -
117 - extern int objcount;
118 ---- rt_in.h.old 2006-05-07 00:59:45.000000000 +0200
119 -+++ rt_in.h 2006-05-07 01:00:07.000000000 +0200
120 -@@ -147,9 +147,6 @@
121 -
122 - extern boolean Paused;
123 - extern volatile int LastScan;
124 --extern KeyboardDef KbdDefs;
125 --extern JoystickDef JoyDefs[];
126 --extern ControlType Controls[MAXPLAYERS];
127 -
128 - extern boolean SpaceBallPresent;
129 - extern boolean CybermanPresent;
130
131 diff --git a/games-fps/rott/rott-1.0.ebuild b/games-fps/rott/rott-1.0.ebuild
132 deleted file mode 100644
133 index fdfaf97..0000000
134 --- a/games-fps/rott/rott-1.0.ebuild
135 +++ /dev/null
136 @@ -1,56 +0,0 @@
137 -# Copyright 1999-2007 Gentoo Foundation
138 -# Distributed under the terms of the GNU General Public License v2
139 -# $Id$
140 -
141 -inherit eutils games
142 -
143 -DESCRIPTION="Rise of the Triad for Linux!"
144 -HOMEPAGE="http://www.icculus.org/rott/"
145 -SRC_URI="http://www.icculus.org/rott/releases/${P}.tar.gz
146 - demo? ( http://filesingularity.timedoctor.org/swdata.zip )"
147 -
148 -LICENSE="GPL-2"
149 -SLOT="0"
150 -KEYWORDS="~ppc x86"
151 -IUSE="demo"
152 -
153 -RDEPEND="media-libs/libsdl
154 - media-libs/sdl-mixer"
155 -DEPEND="${RDEPEND}
156 - app-arch/unzip"
157 -
158 -S=${WORKDIR}/${P}/rott
159 -
160 -src_unpack() {
161 - unpack ${A}
162 - cd "${S}"
163 - epatch \
164 - "${FILESDIR}"/${PV}-custom-datapath.patch \
165 - "${FILESDIR}"/${P}-gcc41.patch
166 - use demo || epatch "${FILESDIR}"/${P}-full-version.patch
167 -}
168 -
169 -src_compile() {
170 - emake clean || die
171 - emake -j1 EXTRACFLAGS="${CFLAGS} -DDATADIR=\\\"${GAMES_DATADIR}/${PN}/\\\"" \
172 - || die "emake failed"
173 -}
174 -
175 -src_install() {
176 - dogamesbin rott || die "dogamesbin failed"
177 - dodoc *.txt ../{README,readme.txt}
178 - if use demo ; then
179 - cd "${WORKDIR}"
180 - insinto "${GAMES_DATADIR}"/${PN}
181 - doins *.dmo huntbgin.* remote1.rts || die "doins failed"
182 - fi
183 - prepgamesdirs
184 -}
185 -
186 -pkg_postinst() {
187 - games_pkg_postinst
188 - if ! use demo ; then
189 - elog "To play the full version, just copy the"
190 - elog "data files to ${GAMES_DATADIR}/${PN}/"
191 - fi
192 -}