1 |
commit: 6d920a09834adbfa949416dd859dfbe65666b714 |
2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 3 06:14:24 2016 +0000 |
4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 3 06:15:18 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d920a09 |
7 |
|
8 |
games-fps/quake3: EAPI=5; tidy; add V=1 for verbose build (bug #430578) |
9 |
|
10 |
Package-Manager: portage-2.2.24 |
11 |
|
12 |
games-fps/quake3/quake3-1.36-r1.ebuild | 47 ++++++++++------------------------ |
13 |
games-fps/quake3/quake3-9999.ebuild | 28 ++++++++++---------- |
14 |
2 files changed, 26 insertions(+), 49 deletions(-) |
15 |
|
16 |
diff --git a/games-fps/quake3/quake3-1.36-r1.ebuild b/games-fps/quake3/quake3-1.36-r1.ebuild |
17 |
index 119a5e9..f7360a6 100644 |
18 |
--- a/games-fps/quake3/quake3-1.36-r1.ebuild |
19 |
+++ b/games-fps/quake3/quake3-1.36-r1.ebuild |
20 |
@@ -2,14 +2,8 @@ |
21 |
# Distributed under the terms of the GNU General Public License v2 |
22 |
# $Id$ |
23 |
|
24 |
-# quake3-9999 -> latest svn |
25 |
-# quake3-9999.REV -> use svn REV |
26 |
-# quake3-VER_alphaREV -> svn snapshot REV for version VER |
27 |
-# quake3-VER -> normal quake release |
28 |
- |
29 |
-EAPI=2 |
30 |
-inherit eutils flag-o-matic games toolchain-funcs |
31 |
-[[ "${PV}" == 9999* ]] && inherit subversion |
32 |
+EAPI=5 |
33 |
+inherit eutils flag-o-matic toolchain-funcs games |
34 |
|
35 |
MY_PN="ioquake3" |
36 |
MY_PV="${PV}" |
37 |
@@ -17,8 +11,7 @@ MY_P="${MY_PN}-${MY_PV}" |
38 |
|
39 |
DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter" |
40 |
HOMEPAGE="http://ioquake3.org/" |
41 |
-[[ "${PV}" != 9999* ]] && SRC_URI="http://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2" |
42 |
-ESVN_REPO_URI="svn://svn.icculus.org/quake3/trunk" |
43 |
+SRC_URI="http://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2" |
44 |
|
45 |
LICENSE="GPL-2" |
46 |
SLOT="0" |
47 |
@@ -44,11 +37,7 @@ RDEPEND="${DEPEND} |
48 |
games-fps/quake3-data |
49 |
teamarena? ( games-fps/quake3-teamarena )" |
50 |
|
51 |
-if [[ "${PV}" == 9999* ]] ; then |
52 |
- S="${WORKDIR}/trunk" |
53 |
-else |
54 |
- S="${WORKDIR}/${MY_P}" |
55 |
-fi |
56 |
+S="${WORKDIR}/${MY_P}" |
57 |
|
58 |
my_arch() { |
59 |
case "${ARCH}" in |
60 |
@@ -63,18 +52,9 @@ my_platform() { |
61 |
} |
62 |
|
63 |
src_prepare() { |
64 |
- if [[ "${PV}" == 9999* ]] ; then |
65 |
- # Workaround for the version string |
66 |
- ln -s "${ESVN_WC_PATH}/.svn" .svn || die "ln ${ESVN_WC_PATH}/.svn" |
67 |
- else |
68 |
- epatch "${FILESDIR}"/${P}-bots.patch |
69 |
- fi |
70 |
- |
71 |
+ epatch "${FILESDIR}"/${P}-bots.patch |
72 |
einfo "Fixing libspeex linking..." |
73 |
- sed -i -e 's/\(-lspeex\)/\1 -lspeexdsp/' Makefile || die "sed failed" |
74 |
- |
75 |
- # Use system jpeg library |
76 |
-# epatch "${FILESDIR}"/${P}-remove-bundled-jpeg.patch |
77 |
+ sed -i -e 's/\(-lspeex\)/\1 -lspeexdsp/' Makefile || die |
78 |
} |
79 |
|
80 |
src_compile() { |
81 |
@@ -90,6 +70,7 @@ src_compile() { |
82 |
# TODO: BUILD_CLIENT_SMP=$(buildit smp) |
83 |
emake \ |
84 |
ARCH="$(my_arch)" \ |
85 |
+ V=1 \ |
86 |
BUILD_CLIENT=$(( $(buildit opengl) | $(buildit !dedicated) )) \ |
87 |
BUILD_GAME_QVM=0 \ |
88 |
BUILD_GAME_SO=0 \ |
89 |
@@ -107,20 +88,18 @@ src_compile() { |
90 |
USE_MUMBLE=$(buildit mumble) \ |
91 |
USE_OPENAL=$(buildit openal) \ |
92 |
USE_OPENAL_DLOPEN=0 \ |
93 |
- USE_VOIP=$(buildit voice) \ |
94 |
- || die "emake failed" |
95 |
+ USE_VOIP=$(buildit voice) |
96 |
} |
97 |
|
98 |
src_install() { |
99 |
- dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README TODO || die |
100 |
+ dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README TODO |
101 |
if use voice ; then |
102 |
- dodoc voip-readme.txt || die |
103 |
+ dodoc voip-readme.txt |
104 |
fi |
105 |
|
106 |
if use opengl || ! use dedicated ; then |
107 |
- doicon misc/quake3.svg || die |
108 |
+ doicon misc/quake3.svg |
109 |
make_desktop_entry quake3 "Quake III Arena" |
110 |
- #use smp && make_desktop_entry quake3-smp "Quake III Arena (SMP)" |
111 |
fi |
112 |
|
113 |
cd build/release-$(my_platform)-$(my_arch) || die |
114 |
@@ -128,8 +107,8 @@ src_install() { |
115 |
for exe in {ioquake3,ioquake3-smp,ioq3ded}.$(my_arch) ; do |
116 |
if [[ -x ${exe} ]] ; then |
117 |
target=${exe%.*} |
118 |
- newgamesbin ${exe} ${target} || die "newgamesbin ${target}" |
119 |
- dosym ${target} "${GAMES_BINDIR}/${target/io}" || die "dosym ${target}" |
120 |
+ newgamesbin ${exe} ${target} |
121 |
+ dosym ${target} "${GAMES_BINDIR}/${target/io}" |
122 |
fi |
123 |
done |
124 |
|
125 |
|
126 |
diff --git a/games-fps/quake3/quake3-9999.ebuild b/games-fps/quake3/quake3-9999.ebuild |
127 |
index 5a58d6c..1d49a54 100644 |
128 |
--- a/games-fps/quake3/quake3-9999.ebuild |
129 |
+++ b/games-fps/quake3/quake3-9999.ebuild |
130 |
@@ -7,9 +7,9 @@ |
131 |
# quake3-VER_alphaREV -> git snapshot REV for version VER |
132 |
# quake3-VER -> normal quake release |
133 |
|
134 |
-EAPI=2 |
135 |
-inherit eutils flag-o-matic games toolchain-funcs |
136 |
-[[ "${PV}" == 9999* ]] && inherit git-2 |
137 |
+EAPI=5 |
138 |
+inherit eutils flag-o-matic toolchain-funcs games |
139 |
+[[ "${PV}" == 9999* ]] && inherit git-r3 |
140 |
|
141 |
MY_PN="ioquake3" |
142 |
MY_PV="${PV}" |
143 |
@@ -28,7 +28,7 @@ IUSE="dedicated opengl teamarena +openal curl vorbis voice mumble" |
144 |
|
145 |
UIDEPEND="virtual/opengl |
146 |
media-libs/libsdl[sound,video,joystick,X,opengl] |
147 |
- virtual/jpeg |
148 |
+ virtual/jpeg:0 |
149 |
openal? ( media-libs/openal ) |
150 |
vorbis? ( |
151 |
media-libs/libogg |
152 |
@@ -45,9 +45,7 @@ RDEPEND="${DEPEND} |
153 |
games-fps/quake3-data |
154 |
teamarena? ( games-fps/quake3-teamarena )" |
155 |
|
156 |
-if [[ "${PV}" == 9999* ]] ; then |
157 |
- S="${WORKDIR}/trunk" |
158 |
-else |
159 |
+if [[ "${PV}" != 9999* ]] ; then |
160 |
S="${WORKDIR}/${MY_P}" |
161 |
fi |
162 |
|
163 |
@@ -79,6 +77,7 @@ src_compile() { |
164 |
# TODO: BUILD_CLIENT_SMP=$(buildit smp) |
165 |
emake \ |
166 |
ARCH="$(my_arch)" \ |
167 |
+ V=1 \ |
168 |
BUILD_CLIENT=$(( $(buildit opengl) | $(buildit !dedicated) )) \ |
169 |
BUILD_GAME_QVM=0 \ |
170 |
BUILD_GAME_SO=0 \ |
171 |
@@ -98,18 +97,17 @@ src_compile() { |
172 |
USE_MUMBLE=$(buildit mumble) \ |
173 |
USE_OPENAL=$(buildit openal) \ |
174 |
USE_OPENAL_DLOPEN=0 \ |
175 |
- USE_VOIP=$(buildit voice) \ |
176 |
- || die "emake failed" |
177 |
+ USE_VOIP=$(buildit voice) |
178 |
} |
179 |
|
180 |
src_install() { |
181 |
- dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README.md opengl2-readme.txt TODO voip-readme.txt || die |
182 |
+ dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README.md TODO voip-readme.txt |
183 |
if use voice ; then |
184 |
- dodoc voip-readme.txt || die |
185 |
+ dodoc voip-readme.txt |
186 |
fi |
187 |
|
188 |
if use opengl || ! use dedicated ; then |
189 |
- doicon misc/quake3.svg || die |
190 |
+ doicon misc/quake3.svg |
191 |
make_desktop_entry quake3 "Quake III Arena" |
192 |
#use smp && make_desktop_entry quake3-smp "Quake III Arena (SMP)" |
193 |
fi |
194 |
@@ -118,8 +116,8 @@ src_install() { |
195 |
local exe |
196 |
for exe in ioquake3 ioquake3-smp ioq3ded ; do |
197 |
if [[ -x ${exe} ]] ; then |
198 |
- dogamesbin ${exe} || die "dogamesbin ${exe}" |
199 |
- dosym ${exe} "${GAMES_BINDIR}/${exe/io}" || die "dosym ${exe}" |
200 |
+ dogamesbin ${exe} |
201 |
+ dosym ${exe} "${GAMES_BINDIR}/${exe/io}" |
202 |
fi |
203 |
done |
204 |
|
205 |
@@ -127,7 +125,7 @@ src_install() { |
206 |
# this should be done through 'dogameslib', but |
207 |
# for this some files need to be patched |
208 |
exeinto "${GAMES_DATADIR}/${PN}" |
209 |
- doexe renderer*.so || die 'install renderers failed' |
210 |
+ doexe renderer*.so |
211 |
|
212 |
prepgamesdirs |
213 |
} |