1 |
commit: 1e23b42b991bc0cd427dc4bf3f75be9b66fe21cd |
2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 17 18:46:51 2015 +0000 |
4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 18 00:39:07 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e23b42b |
7 |
|
8 |
clean old |
9 |
|
10 |
Package-Manager: portage-2.2.24 |
11 |
|
12 |
games-simulation/openttd/Manifest | 1 - |
13 |
.../openttd/files/openttd-1.5.2-cflags.patch | 42 ----- |
14 |
games-simulation/openttd/openttd-1.5.2.ebuild | 177 --------------------- |
15 |
3 files changed, 220 deletions(-) |
16 |
|
17 |
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest |
18 |
index f3a0a0d..9a12878 100644 |
19 |
--- a/games-simulation/openttd/Manifest |
20 |
+++ b/games-simulation/openttd/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
DIST openttd-1.5.0-source.tar.gz 10018865 SHA256 4c357205a63a475001a13e4ade59a73635e2f0c480ad097f4d7f03d2ae290ee0 SHA512 c2459165bd8f957d56d4171361237e6de42221f7b8c02f98503e2225a81fd496f10da9d9c60335edb981f86c4c4ce45fafc9edf43ea38a94b84f67136a17a165 WHIRLPOOL 88a15852d1ae01f7a03ea1bcc929bcdf450265a81462aa5316d2e16e86b79167d04503a83bc231eb411d159b70073c650db6e5604adbf07eccda43a193af3e20 |
23 |
-DIST openttd-1.5.2-source.tar.gz 10038384 SHA256 e86580be82bad88becb9cdff37d986c6a5eda99434f3d629d27fa6cebfdcd227 SHA512 6faa10491b75d987b5ef3ad6aa26a6857b8acc98228f27701883ea995633e1503ddfa83da7b68ba7d2b4d4d6eb81472db8d3dfb0ebf2949b40e8e0699219c4e7 WHIRLPOOL 109079d8445add4a18d6085c70699e8f2a6ba7fa712894e8cbdf3374e1c0e0a62ef35366003964791bf68b086c4d56f6a34f292794756990dcc19b1cc4214ed9 |
24 |
DIST openttd-1.5.3-source.tar.gz 10042384 SHA256 a5525de811ff83e89774d9a7344c7f63ec282b956c3f015af259fd79f54d18e5 SHA512 8185ea4b8e5ac9456c7067a5d662b4a2e1724e14fc0455705ec3b72943421cc5cb10cb67a4f483c47ff2fa6621a219cababd08e21086209a53241a74607b5466 WHIRLPOOL 839067c2c6f8f87ea74df376f3d3d5e2a126c5198f69efce1205603da67d97c1a1b0d5dc3b349aa92f916179ccc48581418b5aa1e9e7e250f636fae78bcbf7ac |
25 |
|
26 |
diff --git a/games-simulation/openttd/files/openttd-1.5.2-cflags.patch b/games-simulation/openttd/files/openttd-1.5.2-cflags.patch |
27 |
deleted file mode 100644 |
28 |
index bb7f768..0000000 |
29 |
--- a/games-simulation/openttd/files/openttd-1.5.2-cflags.patch |
30 |
+++ /dev/null |
31 |
@@ -1,42 +0,0 @@ |
32 |
---- openttd-1.4.4/config.lib |
33 |
-+++ openttd-1.4.4/config.lib |
34 |
-@@ -1450,12 +1450,6 @@ |
35 |
- CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS" |
36 |
- LDFLAGS="$LDFLAGS -noixemul" |
37 |
- fi |
38 |
-- |
39 |
-- if [ "$enable_profiling" = "0" ]; then |
40 |
-- # -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible) |
41 |
-- CFLAGS="-fomit-frame-pointer $CFLAGS" |
42 |
-- fi |
43 |
-- CFLAGS="-O2 $CFLAGS" |
44 |
- else |
45 |
- OBJS_SUBDIR="debug" |
46 |
- |
47 |
-@@ -1466,14 +1460,6 @@ |
48 |
- CFLAGS="$CFLAGS -G0" |
49 |
- fi |
50 |
- fi |
51 |
-- if [ $enable_debug -ge 2 ]; then |
52 |
-- CFLAGS="$CFLAGS -fno-inline" |
53 |
-- fi |
54 |
-- if [ $enable_debug -ge 3 ]; then |
55 |
-- CFLAGS="$CFLAGS -O0" |
56 |
-- else |
57 |
-- CFLAGS="$CFLAGS -O2" |
58 |
-- fi |
59 |
- fi |
60 |
- |
61 |
- if [ $enable_debug -le 2 ]; then |
62 |
-@@ -1498,11 +1484,6 @@ |
63 |
- CFLAGS="$CFLAGS -fno-expensive-optimizations" |
64 |
- fi |
65 |
- |
66 |
-- if [ "$enable_profiling" != "0" ]; then |
67 |
-- CFLAGS="$CFLAGS -pg" |
68 |
-- LDFLAGS="$LDFLAGS -pg" |
69 |
-- fi |
70 |
-- |
71 |
- if [ "$with_threads" = "0" ]; then |
72 |
- CFLAGS="$CFLAGS -DNO_THREADS" |
73 |
- fi |
74 |
|
75 |
diff --git a/games-simulation/openttd/openttd-1.5.2.ebuild b/games-simulation/openttd/openttd-1.5.2.ebuild |
76 |
deleted file mode 100644 |
77 |
index 9b70adb..0000000 |
78 |
--- a/games-simulation/openttd/openttd-1.5.2.ebuild |
79 |
+++ /dev/null |
80 |
@@ -1,177 +0,0 @@ |
81 |
-# Copyright 1999-2015 Gentoo Foundation |
82 |
-# Distributed under the terms of the GNU General Public License v2 |
83 |
-# $Id$ |
84 |
- |
85 |
-EAPI=5 |
86 |
-inherit eutils gnome2-utils games |
87 |
- |
88 |
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe" |
89 |
-HOMEPAGE="http://www.openttd.org/" |
90 |
-SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz" |
91 |
- |
92 |
-LICENSE="GPL-2" |
93 |
-SLOT="0" |
94 |
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
95 |
-IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" |
96 |
-RESTRICT="test" # needs a graphics set in order to test |
97 |
- |
98 |
-RDEPEND="!dedicated? ( |
99 |
- media-libs/libsdl[sound,X,video] |
100 |
- icu? ( dev-libs/icu:= ) |
101 |
- truetype? ( |
102 |
- media-libs/fontconfig |
103 |
- media-libs/freetype:2 |
104 |
- sys-libs/zlib |
105 |
- ) |
106 |
- ) |
107 |
- lzo? ( dev-libs/lzo:2 ) |
108 |
- iconv? ( virtual/libiconv ) |
109 |
- png? ( media-libs/libpng:0 ) |
110 |
- zlib? ( sys-libs/zlib )" |
111 |
-DEPEND="${RDEPEND} |
112 |
- virtual/pkgconfig" |
113 |
-PDEPEND=" |
114 |
- !dedicated? ( |
115 |
- openmedia? ( |
116 |
- games-misc/openmsx |
117 |
- games-misc/opensfx |
118 |
- ) |
119 |
- aplaymidi? ( media-sound/alsa-utils ) |
120 |
- !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) |
121 |
- ) |
122 |
- openmedia? ( >=games-misc/opengfx-0.4.7 )" |
123 |
- |
124 |
-src_prepare() { |
125 |
- epatch "${FILESDIR}"/${P}-cflags.patch |
126 |
- sed -i \ |
127 |
- -e '/Keywords/s/$/;/' \ |
128 |
- media/openttd.desktop.in || die |
129 |
-} |
130 |
- |
131 |
-src_configure() { |
132 |
- # there is an allegro interface available as well as sdl, but |
133 |
- # the configure for it looks broken so the sdl interface is |
134 |
- # always built instead. |
135 |
- local myopts=" --without-allegro" |
136 |
- |
137 |
- # libtimidity not needed except for some embedded platform |
138 |
- # nevertheless, it will be automagically linked if it is |
139 |
- # installed. Hence, we disable it. |
140 |
- myopts+=" --without-libtimidity" |
141 |
- |
142 |
- use debug && myopts+=" --enable-debug=3" |
143 |
- |
144 |
- if use dedicated ; then |
145 |
- myopts+=" --enable-dedicated" |
146 |
- else |
147 |
- use aplaymidi && myopts+=" --with-midi='/usr/bin/aplaymidi'" |
148 |
- myopts+=" |
149 |
- $(use_with truetype freetype) |
150 |
- $(use_with icu) |
151 |
- --with-sdl" |
152 |
- fi |
153 |
- if use png || { use !dedicated && use truetype; } || use zlib ; then |
154 |
- myopts+=" --with-zlib" |
155 |
- else |
156 |
- myopts+=" --without-zlib" |
157 |
- fi |
158 |
- |
159 |
- # configure is a hand-written bash-script, so econf will not work. |
160 |
- # It's all built as C++, upstream uses CFLAGS internally. |
161 |
- CFLAGS="" ./configure \ |
162 |
- --disable-strip \ |
163 |
- --prefix-dir="${EPREFIX}" \ |
164 |
- --binary-dir="${GAMES_BINDIR}" \ |
165 |
- --data-dir="${GAMES_DATADIR}/${PN}" \ |
166 |
- --install-dir="${D}" \ |
167 |
- --icon-dir=/usr/share/pixmaps \ |
168 |
- --menu-dir=/usr/share/applications \ |
169 |
- --icon-theme-dir=/usr/share/icons/hicolor \ |
170 |
- --man-dir=/usr/share/man/man6 \ |
171 |
- --doc-dir=/usr/share/doc/${PF} \ |
172 |
- --menu-group="Game;Simulation;" \ |
173 |
- ${myopts} \ |
174 |
- $(use_with iconv) \ |
175 |
- $(use_with png) \ |
176 |
- $(use_with cpu_flags_x86_sse sse) \ |
177 |
- $(use_with lzo liblzo2) \ |
178 |
- || die |
179 |
-} |
180 |
- |
181 |
-src_compile() { |
182 |
- emake VERBOSE=1 |
183 |
-} |
184 |
- |
185 |
-src_install() { |
186 |
- default |
187 |
- if use dedicated ; then |
188 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
189 |
- rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} |
190 |
- fi |
191 |
- rm -f "${ED}"/usr/share/doc/${PF}/COPYING |
192 |
- prepgamesdirs |
193 |
-} |
194 |
- |
195 |
-pkg_preinst() { |
196 |
- games_pkg_preinst |
197 |
- gnome2_icon_savelist |
198 |
-} |
199 |
- |
200 |
-pkg_postinst() { |
201 |
- gnome2_icon_cache_update |
202 |
- games_pkg_postinst |
203 |
- |
204 |
- if ! use lzo ; then |
205 |
- elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not" |
206 |
- elog "required, disabling it does mean that loading old savegames" |
207 |
- elog "or scenarios from ancient versions (~0.2) will fail." |
208 |
- elog |
209 |
- fi |
210 |
- |
211 |
- if use dedicated ; then |
212 |
- ewarn "Warning: The init script will kill all running openttd" |
213 |
- ewarn "processes when triggered, including any running client sessions!" |
214 |
- else |
215 |
- if use aplaymidi ; then |
216 |
- elog "You have emerged with 'aplaymidi' for playing MIDI." |
217 |
- elog "This option is for those with a hardware midi device," |
218 |
- elog "or who have set up ALSA to handle midi ports." |
219 |
- elog "You must set the environment variable ALSA_OUTPUT_PORTS." |
220 |
- elog "Available ports can be listed by using 'aplaymidi -l'." |
221 |
- else |
222 |
- if ! use timidity ; then |
223 |
- elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'" |
224 |
- elog "in USE. Music may or may not work in-game. If you happen" |
225 |
- elog "to have timidity++ installed, music will work so long" |
226 |
- elog "as it remains installed, but OpenTTD will not depend on it." |
227 |
- fi |
228 |
- fi |
229 |
- if ! use openmedia ; then |
230 |
- elog |
231 |
- elog "OpenTTD was compiled without the 'openmedia' USE flag." |
232 |
- elog |
233 |
- elog "In order to play, you must at least install:" |
234 |
- elog "games-misc/opengfx, and games-misc/opensfx, or copy the " |
235 |
- elog "following 6 files from a version of Transport Tycoon Deluxe" |
236 |
- elog "(windows or DOS) to ~/.openttd/data/ or" |
237 |
- elog "${GAMES_DATADIR}/${PN}/data/." |
238 |
- elog |
239 |
- elog "From the WINDOWS version you need: " |
240 |
- elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf" |
241 |
- elog "OR from the DOS version you need: " |
242 |
- elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF" |
243 |
- elog |
244 |
- elog "File names are case sensitive, but should work either with" |
245 |
- elog "all upper or all lower case names" |
246 |
- elog |
247 |
- elog "In addition, in-game music will be unavailable: for music," |
248 |
- elog "install games-misc/openmsx, or use the in-game download" |
249 |
- elog "functionality to get a music set" |
250 |
- elog |
251 |
- fi |
252 |
- fi |
253 |
-} |
254 |
- |
255 |
-pkg_postrm() { |
256 |
- gnome2_icon_cache_update |
257 |
-} |