Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/advancemenu/, games-emulation/advancemenu/files/
Date: Tue, 24 Jul 2018 23:13:44
Message-Id: 1532474014.2cd73c7da92ee402a4d2b6c564c15df5b21e0d18.zlogene@gentoo
1 commit: 2cd73c7da92ee402a4d2b6c564c15df5b21e0d18
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 24 23:12:34 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 24 23:13:34 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cd73c7d
7
8 games-emulation/advancemenu: remove last rited package
9
10 Closes: https://bugs.gentoo.org/654286
11
12 games-emulation/advancemenu/Manifest | 3 -
13 games-emulation/advancemenu/advancemenu-2.7.ebuild | 85 ----------------
14 games-emulation/advancemenu/advancemenu-2.9.ebuild | 89 ----------------
15 .../files/advancemenu-2.7-alsa-pkg-config.patch | 20 ----
16 .../advancemenu/files/advancemenu-2.7-pic.patch | 13 ---
17 .../files/advancemenu-2.9-destdir.patch | 112 ---------------------
18 games-emulation/advancemenu/metadata.xml | 11 --
19 7 files changed, 333 deletions(-)
20
21 diff --git a/games-emulation/advancemenu/Manifest b/games-emulation/advancemenu/Manifest
22 deleted file mode 100644
23 index 4473de8f089..00000000000
24 --- a/games-emulation/advancemenu/Manifest
25 +++ /dev/null
26 @@ -1,3 +0,0 @@
27 -DIST advancemenu-2.7.tar.gz 2371297 BLAKE2B 43b468f963ecc2ef99766cf9177d7da2edb4c7497f62d9344e80f6c54f2c082ddef294697b7f6438b2959eefc27ca2c05e5744019c55c9f88f59155507622582 SHA512 72aa75b189e4507ce0fe1c5203476833fd04ec9238102631061ed82c2894890044ae40c82154a76533b6ba0a255c42cdfe2ab5c0f497d595783fa13ea32c71bb
28 -DIST advancemenu-2.9-use_pkgconfig_for_freetype_and_sdl.patch 18514 BLAKE2B b20922280c72ec151c3611ab3247391bd85785ee3db92d4bbd88ed0f0e50a8351a2b0cc63c2bf10aabba8a2bf57bcc5392230af1ed0eaabbfb28f5e34bc4785c SHA512 f68c2b42b48a9e768ecda54b0319148ed5503670f19be5cd4b23f150c6df9a43a053a0e64c8906836f461b49986c650f7e9f3952a5cf1309db66a79ea061123c
29 -DIST advancemenu-2.9.tar.gz 2515021 BLAKE2B caccbd311b43699766f2928c78983e7c3c45149d8733ea0795212c4f204828a8f4f22d05becd891947d9adce90d009e4d9b01ebfb0b5698ee9411a09d51c26b7 SHA512 ad19970ac9682b03fcfac36ab71cac1ce43aa88b7323ab6ce3a13ae45a29161cd654ce516115e6a441987055b0e9a47d15abae8ca9875753b81f5d7799908386
30
31 diff --git a/games-emulation/advancemenu/advancemenu-2.7.ebuild b/games-emulation/advancemenu/advancemenu-2.7.ebuild
32 deleted file mode 100644
33 index 52e1f2e5ecd..00000000000
34 --- a/games-emulation/advancemenu/advancemenu-2.7.ebuild
35 +++ /dev/null
36 @@ -1,85 +0,0 @@
37 -# Copyright 1999-2015 Gentoo Foundation
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=5
41 -inherit autotools eutils games
42 -
43 -DESCRIPTION="Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator"
44 -HOMEPAGE="http://advancemame.sourceforge.net/menu-readme.html"
45 -SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
46 -
47 -LICENSE="GPL-2"
48 -SLOT="0"
49 -KEYWORDS="~amd64 ~x86"
50 -IUSE="alsa debug fbcon ncurses oss sdl slang truetype"
51 -
52 -RDEPEND="dev-libs/expat
53 - alsa? ( media-libs/alsa-lib )
54 - ncurses? ( sys-libs/ncurses:0 )
55 - sdl? ( media-libs/libsdl )
56 - slang? ( >=sys-libs/slang-1.4 )
57 - !sdl? ( ( !fbcon? ( media-libs/libsdl ) ) )
58 - truetype? ( >=media-libs/freetype-2 )"
59 -DEPEND="${RDEPEND}
60 - x86? ( >=dev-lang/nasm-0.98 )
61 - fbcon? ( virtual/os-headers )"
62 -
63 -src_prepare() {
64 - # pic patch - bug #142021
65 - epatch \
66 - "${FILESDIR}"/${P}-alsa-pkg-config.patch \
67 - "${FILESDIR}"/${P}-pic.patch
68 - sed -i -e 's/"-s"//' configure.ac || die
69 -
70 - use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
71 - use sdl && ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
72 - use !sdl && use !fbcon && ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
73 - use truetype && ln -s $(type -P freetype-config) "${T}/${CHOST}-freetype-config"
74 - eautoreconf
75 -}
76 -
77 -src_configure() {
78 - export PATH="${PATH}:${T}"
79 - egamesconf \
80 - --enable-expat \
81 - --enable-zlib \
82 - --disable-svgalib \
83 - --disable-static \
84 - $(use_enable alsa) \
85 - $(use_enable debug) \
86 - $(use_enable fbcon fb) \
87 - $(use_enable ncurses) \
88 - $(use_enable truetype freetype) \
89 - $(use_enable oss) \
90 - $(use_enable sdl) \
91 - $(use_enable slang) \
92 - $(use !sdl && use !fbcon && echo --enable-sdl) \
93 - $(use_enable x86 asm)
94 -}
95 -
96 -src_compile() {
97 - STRIPPROG=true emake
98 -}
99 -
100 -src_install() {
101 - dogamesbin advmenu
102 - dodoc HISTORY README RELEASE doc/*.txt
103 - doman doc/{advmenu,advdev}.1
104 - dohtml doc/*.html
105 - prepgamesdirs
106 -}
107 -
108 -pkg_postinst() {
109 - games_pkg_postinst
110 - echo
111 - elog "Execute:"
112 - elog " advmenu -default"
113 - elog "to generate a config file"
114 - elog
115 - elog "An example emulator config found in advmenu.rc:"
116 - elog " emulator \"snes9x\" generic \"${GAMES_BINDIR}/snes9x\" \"%f\""
117 - elog " emulator_roms \"snes9x\" \"/home/user/myroms\""
118 - elog " emulator_roms_filter \"snes9x\" \"*.smc;*.sfc\""
119 - elog
120 - elog "For more information, see the advmenu man page."
121 -}
122
123 diff --git a/games-emulation/advancemenu/advancemenu-2.9.ebuild b/games-emulation/advancemenu/advancemenu-2.9.ebuild
124 deleted file mode 100644
125 index 532a8cfeca8..00000000000
126 --- a/games-emulation/advancemenu/advancemenu-2.9.ebuild
127 +++ /dev/null
128 @@ -1,89 +0,0 @@
129 -# Copyright 1999-2018 Gentoo Foundation
130 -# Distributed under the terms of the GNU General Public License v2
131 -
132 -EAPI=6
133 -inherit autotools
134 -
135 -DESCRIPTION="Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator"
136 -HOMEPAGE="http://advancemame.sourceforge.net/menu-readme.html"
137 -SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
138 -
139 -# Too big to put into FILESDIR
140 -SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-2.9-use_pkgconfig_for_freetype_and_sdl.patch"
141 -
142 -LICENSE="GPL-2"
143 -SLOT="0"
144 -KEYWORDS="~amd64 ~x86"
145 -IUSE="alsa debug fbcon ncurses oss sdl slang truetype"
146 -
147 -RDEPEND="dev-libs/expat
148 - alsa? ( media-libs/alsa-lib )
149 - ncurses? ( sys-libs/ncurses:0 )
150 - sdl? ( media-libs/libsdl )
151 - slang? ( >=sys-libs/slang-1.4 )
152 - !sdl? ( ( !fbcon? ( media-libs/libsdl ) ) )
153 - truetype? ( >=media-libs/freetype-2 )"
154 -DEPEND="${RDEPEND}
155 - x86? ( >=dev-lang/nasm-0.98 )
156 - fbcon? ( virtual/os-headers )"
157 -
158 -PATCHES=(
159 - # pic patch - bug #142021
160 - "${FILESDIR}"/${PN}-2.7-pic.patch
161 - "${FILESDIR}/${PN}-2.9-destdir.patch"
162 - "${DISTDIR}/${PN}-2.9-use_pkgconfig_for_freetype_and_sdl.patch"
163 -)
164 -
165 -src_prepare() {
166 - default
167 - sed -i -e 's/"-s"//' configure.ac || die
168 -
169 - use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
170 - eautoreconf
171 -}
172 -
173 -src_configure() {
174 - export PATH="${PATH}:${T}"
175 - local myeconfargs=(
176 - --enable-expat
177 - --enable-zlib
178 - --disable-svgalib
179 - $(use_enable alsa)
180 - $(use_enable debug)
181 - $(use_enable fbcon fb)
182 - $(use_enable ncurses)
183 - $(use_enable truetype freetype)
184 - $(use_enable oss)
185 - $(use_enable sdl)
186 - $(use_enable slang)
187 - $(use !sdl && use !fbcon && echo --enable-sdl)
188 - $(use_enable x86 asm)
189 - )
190 - econf "${myeconfargs[@]}"
191 -}
192 -
193 -src_compile() {
194 - STRIPPROG=true emake
195 -}
196 -
197 -src_install() {
198 - emake DESTDIR="${D}" install
199 - dodoc HISTORY README RELEASE doc/*.txt
200 - doman doc/{advmenu,advdev}.1
201 - docinto html
202 - dodoc doc/*.html
203 -}
204 -
205 -pkg_postinst() {
206 - echo
207 - elog "Execute:"
208 - elog " advmenu -default"
209 - elog "to generate a config file"
210 - elog
211 - elog "An example emulator config found in advmenu.rc:"
212 - elog " emulator \"snes9x\" generic \"${GAMES_BINDIR}/snes9x\" \"%f\""
213 - elog " emulator_roms \"snes9x\" \"/home/user/myroms\""
214 - elog " emulator_roms_filter \"snes9x\" \"*.smc;*.sfc\""
215 - elog
216 - elog "For more information, see the advmenu man page."
217 -}
218
219 diff --git a/games-emulation/advancemenu/files/advancemenu-2.7-alsa-pkg-config.patch b/games-emulation/advancemenu/files/advancemenu-2.7-alsa-pkg-config.patch
220 deleted file mode 100644
221 index 1b0f8a8df9c..00000000000
222 --- a/games-emulation/advancemenu/files/advancemenu-2.7-alsa-pkg-config.patch
223 +++ /dev/null
224 @@ -1,20 +0,0 @@
225 ---- advancemenu-2.6.orig/configure.ac
226 -+++ advancemenu-2.6/configure.ac
227 -@@ -512,7 +512,7 @@
228 - [snd_pcm_open],
229 - [ac_lib_alsa=yes],
230 - [ac_lib_alsa=no],
231 -- [-lm]
232 -+ [`pkg-config alsa --libs`]
233 - )
234 - if test $ac_lib_alsa = yes; then
235 - AC_MSG_CHECKING([for ALSA])
236 -@@ -531,7 +531,7 @@
237 - [snd_pcm_open],
238 - [],
239 - [AC_MSG_ERROR([the ALSA library is missing])],
240 -- [-lm]
241 -+ [`pkg-config alsa --libs`]
242 - )
243 - AC_MSG_CHECKING([for ALSA version])
244 - AC_TRY_COMPILE([
245
246 diff --git a/games-emulation/advancemenu/files/advancemenu-2.7-pic.patch b/games-emulation/advancemenu/files/advancemenu-2.7-pic.patch
247 deleted file mode 100644
248 index 62f073bed83..00000000000
249 --- a/games-emulation/advancemenu/files/advancemenu-2.7-pic.patch
250 +++ /dev/null
251 @@ -1,13 +0,0 @@
252 ---- ./advance/blit/blit.c.orig
253 -+++ ./advance/blit/blit.c
254 -@@ -28,6 +28,10 @@
255 - * do so, delete this exception statement from your version.
256 - */
257 -
258 -+#if defined(USE_ASM_INLINE) && defined(__PIC__)
259 -+# undef USE_ASM_INLINE
260 -+#endif
261 -+
262 - #include "portable.h"
263 -
264 - #include "blit.h"
265
266 diff --git a/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch b/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch
267 deleted file mode 100644
268 index 9ebef883ae2..00000000000
269 --- a/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch
270 +++ /dev/null
271 @@ -1,112 +0,0 @@
272 ---- advancemenu-2.9/advance/advance.mak
273 -+++ advancemenu-2.9/advance/advance.mak
274 -@@ -284,45 +284,45 @@
275 - # Common install
276 -
277 - pkgdir = $(datadir)/advance
278 --pkgdocdir = $(docdir)/advance
279 -+pkgdocdir = $(docdir)
280 -
281 - install-dirs:
282 -- -$(INSTALL_PROGRAM_DIR) $(bindir)
283 -- -$(INSTALL_DATA_DIR) $(pkgdir)
284 -- -$(INSTALL_DATA_DIR) $(pkgdocdir)
285 -- -$(INSTALL_MAN_DIR) $(mandir)/man1
286 -+ -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
287 -+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)
288 -+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir)
289 -+ -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
290 - ifneq ($(wildcard $(EMUSRC)),)
291 -- -$(INSTALL_DATA_DIR) $(pkgdir)/rom
292 -- -$(INSTALL_DATA_DIR) $(pkgdir)/sample
293 -- -$(INSTALL_DATA_DIR) $(pkgdir)/artwork
294 -- -$(INSTALL_DATA_DIR) $(pkgdir)/image
295 -- -$(INSTALL_DATA_DIR) $(pkgdir)/crc
296 -- -$(INSTALL_DATA_DIR) $(pkgdir)/snap
297 -+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom
298 -+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample
299 -+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/artwork
300 -+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/image
301 -+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/crc
302 -+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap
303 - endif
304 -
305 - install-data: $(INSTALL_DATAFILES) $(INSTALL_ROMFILES) $(INSTALL_SAMPLEFILES) $(INSTALL_SNAPFILES)
306 - ifdef INSTALL_DATAFILES
307 - @for i in $(INSTALL_DATAFILES); do \
308 - echo "$(INSTALL_DATA) $$i $(pkgdir)"; \
309 -- $(INSTALL_DATA) $$i $(pkgdir); \
310 -+ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir); \
311 - done
312 - endif
313 - ifdef INSTALL_ROMFILES
314 - @for i in $(INSTALL_ROMFILES); do \
315 - echo "$(INSTALL_DATA) $$i $(pkgdir)/rom"; \
316 -- $(INSTALL_DATA) $$i $(pkgdir)/rom; \
317 -+ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom; \
318 - done
319 - endif
320 - ifdef INSTALL_SAMPLEFILES
321 - @for i in $(INSTALL_SAMPLEFILES); do \
322 - echo "$(INSTALL_DATA) $$i $(pkgdir)/sample"; \
323 -- $(INSTALL_DATA) $$i $(pkgdir)/sample; \
324 -+ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/sample; \
325 - done
326 - endif
327 - ifdef INSTALL_SNAPFILES
328 - @for i in $(INSTALL_SNAPFILES); do \
329 - echo "$(INSTALL_DATA) $$i $(pkgdir)/snap"; \
330 -- $(INSTALL_DATA) $$i $(pkgdir)/snap; \
331 -+ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap; \
332 - done
333 - endif
334 -
335 -@@ -351,7 +351,7 @@
336 - install-bin: $(INSTALL_BINFILES)
337 - @for i in $(INSTALL_BINFILES); do \
338 - echo "$(INSTALL_PROGRAM) $$i $(bindir)"; \
339 -- $(INSTALL_PROGRAM) $$i $(bindir); \
340 -+ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir); \
341 - done
342 -
343 - uninstall-bin:
344 -@@ -363,7 +363,7 @@
345 - ifdef INSTALL_DOCFILES
346 - @for i in $(INSTALL_DOCFILES); do \
347 - echo "$(INSTALL_DATA) $$i $(pkgdocdir)"; \
348 -- $(INSTALL_DATA) $$i $(pkgdocdir); \
349 -+ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \
350 - done
351 - endif
352 -
353 -@@ -378,7 +378,7 @@
354 - ifdef INSTALL_MANFILES
355 - @for i in $(INSTALL_MANFILES); do \
356 - echo "$(INSTALL_DATA) $$i $(mandir)/man1"; \
357 -- $(INSTALL_DATA) $$i $(mandir)/man1; \
358 -+ $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1; \
359 - done
360 - endif
361 -
362 -@@ -401,7 +401,7 @@
363 - -rmdir $(pkgdocdir)
364 - endif
365 -
366 --install: install-dirs install-bin install-data install-doc install-man
367 -+install: install-dirs install-bin install-data
368 -
369 - uninstall: uninstall-bin uninstall-data uninstall-doc uninstall-man uninstall-dirs
370 -
371 ---- advancemenu-2.9/configure.ac
372 -+++ advancemenu-2.9/configure.ac
373 -@@ -1158,8 +1158,8 @@
374 -
375 - dnl Final
376 - AC_SUBST([CONF_LIB_DIRECT],[$ac_lib_direct_flag])
377 --AC_SUBST([mandir],['${prefix}/man'])
378 --AC_SUBST([docdir],['${prefix}/doc'])
379 -+AC_SUBST([mandir],['${prefix}/share/man'])
380 -+AC_SUBST([docdir],['${prefix}/share/doc/${PF}'])
381 - AC_CONFIG_FILES([Makefile])
382 - AC_OUTPUT
383 -
384
385 diff --git a/games-emulation/advancemenu/metadata.xml b/games-emulation/advancemenu/metadata.xml
386 deleted file mode 100644
387 index 879ee3497ad..00000000000
388 --- a/games-emulation/advancemenu/metadata.xml
389 +++ /dev/null
390 @@ -1,11 +0,0 @@
391 -<?xml version="1.0" encoding="UTF-8"?>
392 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
393 -<pkgmetadata>
394 - <maintainer type="project">
395 - <email>games@g.o</email>
396 - <name>Gentoo Games Project</name>
397 - </maintainer>
398 - <upstream>
399 - <remote-id type="sourceforge">advancemame</remote-id>
400 - </upstream>
401 -</pkgmetadata>