1 |
commit: 28b5997a8ad0e134c8231f2a42cd92df2a6b5785 |
2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 31 10:51:05 2016 +0000 |
4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 31 20:01:32 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28b5997a |
7 |
|
8 |
games-puzzle/sgt-puzzles: Version bump to 20160315 |
9 |
|
10 |
Adds support for GTK3. Adds flag to use icons packaged by NP-Hardass |
11 |
instead of bundled to bypass buggy colors in bundled icons. These |
12 |
repackaged icons are used regardless for the live ebuild as it does |
13 |
not ship with icons. |
14 |
|
15 |
Package-Manager: portage-2.2.26 |
16 |
|
17 |
games-puzzle/sgt-puzzles/Manifest | 2 + |
18 |
games-puzzle/sgt-puzzles/metadata.xml | 17 +++- |
19 |
.../sgt-puzzles/sgt-puzzles-20160315.ebuild | 107 +++++++++++++++++++++ |
20 |
.../sgt-puzzles/sgt-puzzles-99999999.ebuild | 77 +++++++++------ |
21 |
4 files changed, 167 insertions(+), 36 deletions(-) |
22 |
|
23 |
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest |
24 |
index 46566bc..7754d2c 100644 |
25 |
--- a/games-puzzle/sgt-puzzles/Manifest |
26 |
+++ b/games-puzzle/sgt-puzzles/Manifest |
27 |
@@ -1 +1,3 @@ |
28 |
+DIST puzzles-20160315.c0bc13c.tar.gz 2838135 SHA256 fc557d3a1021a1e56ae63589d08788a8ccdfa1772e4c74cbbade5fefcf4e691f SHA512 9317ab26605982d5a97cec57596bd3e75cb1cb93b2bc14f6f295cf3950a759b21c5262e3eb04a3c3cda1d3d1cf4ff9477ee7fac9d310558567714e8e1cfc3496 WHIRLPOOL 7cc52ecabbfda7f71c64c02cc4ca434a20e637e25754d00b3f397318d0dd120aaf7ea19faafbb7eee259b7c2ca91e8e396d7667e4b1fa7fc6a153f15a69fb52f |
29 |
DIST puzzles-r9861.tar.gz 3255388 SHA256 cc08ffd96c20dfe249d6db0e97f32608e8c52da9ca00a0e8d7d67fd4a474c3a2 SHA512 fc8abf5912e7ecdf5c5166c6b8f354e5f6dc8c42d646ffeae812c3cea21496f9ff03671268453a32c3246d1c94dfaba83628bf65ebeb645b3deb208ee3045ba1 WHIRLPOOL 1f91bc25d5c8dbf531d71eb3783169477834c232810f529cf682d69a121688584af7dc51b00c380e85dfee3119f9644d2f741f4c9f9dfc2054bc72fa5dd88de5 |
30 |
+DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57 WHIRLPOOL 17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac |
31 |
|
32 |
diff --git a/games-puzzle/sgt-puzzles/metadata.xml b/games-puzzle/sgt-puzzles/metadata.xml |
33 |
index 78274e0..b5380df 100644 |
34 |
--- a/games-puzzle/sgt-puzzles/metadata.xml |
35 |
+++ b/games-puzzle/sgt-puzzles/metadata.xml |
36 |
@@ -1,8 +1,17 @@ |
37 |
<?xml version="1.0" encoding="UTF-8"?> |
38 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
39 |
<pkgmetadata> |
40 |
-<maintainer type="project"> |
41 |
- <email>games@g.o</email> |
42 |
- <name>Gentoo Games Project</name> |
43 |
-</maintainer> |
44 |
+ <maintainer type="project"> |
45 |
+ <email>games@g.o</email> |
46 |
+ <name>Gentoo Games Project</name> |
47 |
+ </maintainer> |
48 |
+ <maintainer type="person"> |
49 |
+ <email>NP-Hardass@g.o</email> |
50 |
+ <name>NP-Hardass</name> |
51 |
+ <description>Co-maintainer; CC on all bugs</description> |
52 |
+ </maintainer> |
53 |
+ <use> |
54 |
+ <flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag> |
55 |
+ <flag name="icons">Use Gentoo packaged icons instead of bundled icons</flag> |
56 |
+ </use> |
57 |
</pkgmetadata> |
58 |
|
59 |
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild |
60 |
new file mode 100644 |
61 |
index 0000000..6f1a68d |
62 |
--- /dev/null |
63 |
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild |
64 |
@@ -0,0 +1,107 @@ |
65 |
+# Copyright 1999-2016 Gentoo Foundation |
66 |
+# Distributed under the terms of the GNU General Public License v2 |
67 |
+# $Id$ |
68 |
+ |
69 |
+EAPI=5 |
70 |
+ |
71 |
+inherit eutils gnome2-utils toolchain-funcs games autotools |
72 |
+ |
73 |
+if [[ ${PV} == "99999999" ]] ; then |
74 |
+ EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git" |
75 |
+ inherit git-r3 |
76 |
+ SRC_URI="" |
77 |
+ KEYWORDS="" |
78 |
+else |
79 |
+ MAGIC=c0bc13c |
80 |
+ SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz" |
81 |
+ S=${WORKDIR}/puzzles-${PV}.${MAGIC} |
82 |
+ KEYWORDS="~amd64 ~x86" |
83 |
+fi |
84 |
+ |
85 |
+GENTOO_ICONS="20160315" |
86 |
+SRC_URI="${SRC_URI} |
87 |
+ https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz |
88 |
+" |
89 |
+ |
90 |
+DESCRIPTION="Simon Tatham's Portable Puzzle Collection" |
91 |
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" |
92 |
+ |
93 |
+LICENSE="MIT" |
94 |
+SLOT="0" |
95 |
+IUSE="doc gtk3 icons" |
96 |
+ |
97 |
+RDEPEND=" |
98 |
+ !gtk3? ( x11-libs/gtk+:2 ) |
99 |
+ gtk3? ( x11-libs/gtk+:3 ) |
100 |
+" |
101 |
+DEPEND="${RDEPEND} |
102 |
+ dev-lang/perl |
103 |
+ virtual/pkgconfig |
104 |
+ doc? ( >=app-doc/halibut-1.0 )" |
105 |
+ |
106 |
+src_unpack() { |
107 |
+ [[ ${PV} == "99999999" ]] && git-r3_src_unpack |
108 |
+ unpack ${A} |
109 |
+} |
110 |
+ |
111 |
+src_prepare() { |
112 |
+ sed -i \ |
113 |
+ -e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \ |
114 |
+ -e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \ |
115 |
+ mkfiles.pl || die |
116 |
+ ./mkfiles.pl || die |
117 |
+ eautoreconf |
118 |
+ |
119 |
+ # Import icons from latest Gentoo tarball |
120 |
+ if [[ ${PV} == "99999999" ]] || use icons; then |
121 |
+ cp -R ../${PN}-icons/icons . || die |
122 |
+ fi |
123 |
+} |
124 |
+ |
125 |
+src_configure() { |
126 |
+ econf --with-gtk=$(usex gtk3 3 2) |
127 |
+} |
128 |
+ |
129 |
+src_compile() { |
130 |
+ emake CC="$(tc-getCC)" |
131 |
+ if use doc ; then |
132 |
+ halibut --text --html --info --pdf --ps puzzles.but || die |
133 |
+ fi |
134 |
+} |
135 |
+ |
136 |
+src_install() { |
137 |
+ dodir "${GAMES_BINDIR}" |
138 |
+ emake DESTDIR="${D}" bindir="${GAMES_BINDIR}" install |
139 |
+ dodoc README |
140 |
+ |
141 |
+ local file name |
142 |
+ for file in *.R ; do |
143 |
+ [[ ${file} == "nullgame.R" ]] && continue |
144 |
+ name=$(awk -F: '/exe:/ { print $3 }' "${file}") |
145 |
+ file=${file%.R} |
146 |
+ newicon -s 48 icons/${file}-48d24.png ${PN}-${file}.png |
147 |
+ make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}" |
148 |
+ done |
149 |
+ |
150 |
+ if use doc ; then |
151 |
+ dohtml *.html |
152 |
+ doinfo puzzles.info{,-1,-2,-3} |
153 |
+ dodoc puzzles.pdf puzzles.ps puzzles.txt |
154 |
+ fi |
155 |
+ |
156 |
+ prepgamesdirs |
157 |
+} |
158 |
+ |
159 |
+pkg_preinst() { |
160 |
+ games_pkg_preinst |
161 |
+ gnome2_icon_savelist |
162 |
+} |
163 |
+ |
164 |
+pkg_postinst() { |
165 |
+ games_pkg_postinst |
166 |
+ gnome2_icon_cache_update |
167 |
+} |
168 |
+ |
169 |
+pkg_postrm() { |
170 |
+ gnome2_icon_cache_update |
171 |
+} |
172 |
|
173 |
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild |
174 |
index 8012c5d..6f1a68d 100644 |
175 |
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild |
176 |
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild |
177 |
@@ -1,49 +1,67 @@ |
178 |
-# Copyright 1999-2015 Gentoo Foundation |
179 |
+# Copyright 1999-2016 Gentoo Foundation |
180 |
# Distributed under the terms of the GNU General Public License v2 |
181 |
# $Id$ |
182 |
|
183 |
EAPI=5 |
184 |
-inherit eutils gnome2-utils toolchain-funcs games |
185 |
+ |
186 |
+inherit eutils gnome2-utils toolchain-funcs games autotools |
187 |
+ |
188 |
if [[ ${PV} == "99999999" ]] ; then |
189 |
EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git" |
190 |
- inherit autotools git-r3 |
191 |
+ inherit git-r3 |
192 |
SRC_URI="" |
193 |
KEYWORDS="" |
194 |
else |
195 |
- SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-r${PV}.tar.gz" |
196 |
- S=${WORKDIR}/puzzles-r${PV} |
197 |
+ MAGIC=c0bc13c |
198 |
+ SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz" |
199 |
+ S=${WORKDIR}/puzzles-${PV}.${MAGIC} |
200 |
KEYWORDS="~amd64 ~x86" |
201 |
fi |
202 |
|
203 |
+GENTOO_ICONS="20160315" |
204 |
+SRC_URI="${SRC_URI} |
205 |
+ https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz |
206 |
+" |
207 |
+ |
208 |
DESCRIPTION="Simon Tatham's Portable Puzzle Collection" |
209 |
HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" |
210 |
|
211 |
LICENSE="MIT" |
212 |
SLOT="0" |
213 |
-IUSE="doc" |
214 |
+IUSE="doc gtk3 icons" |
215 |
|
216 |
-RDEPEND="x11-libs/gtk+:2" |
217 |
+RDEPEND=" |
218 |
+ !gtk3? ( x11-libs/gtk+:2 ) |
219 |
+ gtk3? ( x11-libs/gtk+:3 ) |
220 |
+" |
221 |
DEPEND="${RDEPEND} |
222 |
dev-lang/perl |
223 |
virtual/pkgconfig |
224 |
doc? ( >=app-doc/halibut-1.0 )" |
225 |
|
226 |
+src_unpack() { |
227 |
+ [[ ${PV} == "99999999" ]] && git-r3_src_unpack |
228 |
+ unpack ${A} |
229 |
+} |
230 |
+ |
231 |
src_prepare() { |
232 |
- if [[ ${PV} == "99999999" ]] ; then |
233 |
- sed -i \ |
234 |
- -e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \ |
235 |
- -e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \ |
236 |
- mkfiles.pl || die |
237 |
- ./mkfiles.pl || die |
238 |
- eautoreconf |
239 |
- else |
240 |
- sed -i \ |
241 |
- -e 's:= -O2 -Wall -Werror -ansi -pedantic -g:= $(CPPFLAGS):' \ |
242 |
- -e '/LDFLAGS/s:=:=$(LDFLAGS) :' \ |
243 |
- Makefile || die |
244 |
+ sed -i \ |
245 |
+ -e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \ |
246 |
+ -e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \ |
247 |
+ mkfiles.pl || die |
248 |
+ ./mkfiles.pl || die |
249 |
+ eautoreconf |
250 |
+ |
251 |
+ # Import icons from latest Gentoo tarball |
252 |
+ if [[ ${PV} == "99999999" ]] || use icons; then |
253 |
+ cp -R ../${PN}-icons/icons . || die |
254 |
fi |
255 |
} |
256 |
|
257 |
+src_configure() { |
258 |
+ econf --with-gtk=$(usex gtk3 3 2) |
259 |
+} |
260 |
+ |
261 |
src_compile() { |
262 |
emake CC="$(tc-getCC)" |
263 |
if use doc ; then |
264 |
@@ -53,7 +71,7 @@ src_compile() { |
265 |
|
266 |
src_install() { |
267 |
dodir "${GAMES_BINDIR}" |
268 |
- emake DESTDIR="${D}" gamesdir="${GAMES_BINDIR}" install |
269 |
+ emake DESTDIR="${D}" bindir="${GAMES_BINDIR}" install |
270 |
dodoc README |
271 |
|
272 |
local file name |
273 |
@@ -61,19 +79,14 @@ src_install() { |
274 |
[[ ${file} == "nullgame.R" ]] && continue |
275 |
name=$(awk -F: '/exe:/ { print $3 }' "${file}") |
276 |
file=${file%.R} |
277 |
- if [[ ${PV} -lt 99999999 ]] ; then |
278 |
- newicon -s 48 icons/${file}-48d24.png ${PN}-${file}.png |
279 |
- make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}" |
280 |
- else |
281 |
- # No icons with the live version |
282 |
- make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" |
283 |
- fi |
284 |
+ newicon -s 48 icons/${file}-48d24.png ${PN}-${file}.png |
285 |
+ make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}" |
286 |
done |
287 |
|
288 |
if use doc ; then |
289 |
dohtml *.html |
290 |
- doinfo puzzles.info |
291 |
- dodoc puzzles.pdf puzzles.ps puzzles.txt puzzles.chm |
292 |
+ doinfo puzzles.info{,-1,-2,-3} |
293 |
+ dodoc puzzles.pdf puzzles.ps puzzles.txt |
294 |
fi |
295 |
|
296 |
prepgamesdirs |
297 |
@@ -81,14 +94,14 @@ src_install() { |
298 |
|
299 |
pkg_preinst() { |
300 |
games_pkg_preinst |
301 |
- [[ ${PV} -lt 99999999 ]] && gnome2_icon_savelist |
302 |
+ gnome2_icon_savelist |
303 |
} |
304 |
|
305 |
pkg_postinst() { |
306 |
games_pkg_postinst |
307 |
- [[ ${PV} -lt 99999999 ]] && gnome2_icon_cache_update |
308 |
+ gnome2_icon_cache_update |
309 |
} |
310 |
|
311 |
pkg_postrm() { |
312 |
- [[ ${PV} -lt 99999999 ]] && gnome2_icon_cache_update |
313 |
+ gnome2_icon_cache_update |
314 |
} |