Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/higan/files/, games-emulation/higan/
Date: Sun, 29 Apr 2018 11:27:02
Message-Id: 1525001167.c3a082f24694b6204ef4377c282314c61a4975b3.pacho@gentoo
1 commit: c3a082f24694b6204ef4377c282314c61a4975b3
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 29 10:37:35 2018 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 29 11:26:07 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3a082f2
7
8 games-emulation/higan: Drop old
9
10 Package-Manager: Portage-2.3.31, Repoman-2.3.9
11
12 games-emulation/higan/Manifest | 1 -
13 games-emulation/higan/files/higan-099-QA.patch | 79 --------------
14 games-emulation/higan/higan-099.ebuild | 138 -------------------------
15 3 files changed, 218 deletions(-)
16
17 diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
18 index 70d8f65c8fa..21f340144cd 100644
19 --- a/games-emulation/higan/Manifest
20 +++ b/games-emulation/higan/Manifest
21 @@ -1,2 +1 @@
22 DIST higan-106_p1.tar.bz2 954533 BLAKE2B e7ea44f97f7e2c3ce86b57b853aa59c4372f37185846f8a928ba659b525965aed39f7859721394a776990e53e2f671fc0e7071d17f9397973343d9a7adcf70ac SHA512 f4d8dbfacaa20b948bd382fd0ef48e89cbb21a0569a70b6a4beca6c0a2ba404efc4c28d14bfd3df14d4fd76c763ca1537166bb24d765a8da33423bbea32df4c3
23 -DIST higan_v099-source.7z 1012348 BLAKE2B db3eb7b8819532786e6f2dd664225abddc49d12cf5c525862578523240c76ab3ac2680537e04b347130ae7e821d1d98e6c4bf25cf47449567afd90887989aa0e SHA512 567f0c9841fb3fed1c78f2afcd9865cbfe06d04b995d4dc468269e459249b758daed949b461b5b8645ebab40edc1f4f28a566de5795325dae4f604190ca9eae6
24
25 diff --git a/games-emulation/higan/files/higan-099-QA.patch b/games-emulation/higan/files/higan-099-QA.patch
26 deleted file mode 100644
27 index fd4eb13dd34..00000000000
28 --- a/games-emulation/higan/files/higan-099-QA.patch
29 +++ /dev/null
30 @@ -1,79 +0,0 @@
31 -diff -Naur a/higan/GNUmakefile b/higan/GNUmakefile
32 ---- a/higan/GNUmakefile 2016-06-17 18:56:06.414883957 +0200
33 -+++ b/higan/GNUmakefile 2016-06-17 18:56:19.075903050 +0200
34 -@@ -4,7 +4,7 @@
35 - # target := loki
36 - # console := true
37 -
38 --flags += -I. -I.. -O3
39 -+flags += -I. -I..
40 - objects := libco audio video resource
41 -
42 - # profile-guided optimization mode
43 -@@ -31,7 +31,7 @@
44 - else ifeq ($(platform),macosx)
45 - flags += -march=native
46 - else ifneq ($(filter $(platform),linux bsd),)
47 -- flags += -march=native -fopenmp
48 -+ flags += -fopenmp
49 - link += -fopenmp
50 - link += -Wl,-export-dynamic
51 - link += -lX11 -lXext
52 -@@ -42,9 +42,9 @@
53 - compile = \
54 - $(strip \
55 - $(if $(filter %.c,$<), \
56 -- $(compiler) $(cflags) $(flags) $1 -c $< -o $@, \
57 -+ $(compiler) $(cflags) $(flags) $(CFLAGS) $1 -c $< -o $@, \
58 - $(if $(filter %.cpp,$<), \
59 -- $(compiler) $(cppflags) $(flags) $1 -c $< -o $@ \
60 -+ $(compiler) $(cppflags) $(flags) $(CXXFLAGS) $1 -c $< -o $@ \
61 - ) \
62 - ) \
63 - )
64 -
65 ---- a/higan/target-tomoko/GNUmakefile 2016-06-17 19:10:27.729182818 +0200
66 -+++ b/higan/target-tomoko/GNUmakefile 2016-06-17 19:14:34.034554246 +0200
67 -@@ -45,10 +45,10 @@
68 - objects := $(patsubst %,obj/%.o,$(objects))
69 -
70 - obj/ruby.o: ../ruby/ruby.cpp $(call rwildcard,../ruby/)
71 -- $(compiler) $(rubyflags) -c $< -o $@
72 -+ $(compiler) $(rubyflags) $(CXXFLAGS) -c $< -o $@
73 -
74 - obj/hiro.o: ../hiro/hiro.cpp $(call rwildcard,../hiro/)
75 -- $(compiler) $(hiroflags) -c $< -o $@
76 -+ $(compiler) $(hiroflags) $(CXXFLAGS) -c $< -o $@
77 -
78 - obj/ui-tomoko.o: $(ui)/tomoko.cpp $(call rwildcard,$(ui)/)
79 - obj/ui-program.o: $(ui)/program/program.cpp $(call rwildcard,$(ui)/)
80 -@@ -64,7 +64,7 @@
81 -
82 - # targets
83 - build: $(objects)
84 -- $(strip $(compiler) -o out/$(name) $(objects) $(link))
85 -+ $(strip $(CXX) $(CXXFLAGS) -o out/$(name) $(objects) $(link))
86 - ifeq ($(platform),macosx)
87 - @if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
88 - mkdir -p out/$(name).app/Contents/MacOS/
89 -
90 ---- a/icarus/GNUmakefile 2016-07-05 16:42:09.198091772 +0200
91 -+++ b/icarus/GNUmakefile 2016-07-05 16:48:14.388351427 +0200
92 -@@ -2,7 +2,7 @@
93 - include ../hiro/GNUmakefile
94 -
95 - name := icarus
96 --flags += -I.. -O3
97 -+flags += -I.. $(CXXFLAGS)
98 - link +=
99 -
100 - ifeq ($(platform),windows)
101 -@@ -14,7 +14,7 @@
102 - objects += $(if $(call streq,$(platform),windows),obj/resource.o)
103 -
104 - all: $(objects)
105 -- $(call unique,$(compiler) -o out/$(name) $(objects) $(link) $(hirolink))
106 -+ $(call unique,$(compiler) -o out/$(name) $(objects) $(link) $(hirolink) $(LDFLAGS))
107 - ifeq ($(platform),macosx)
108 - @if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
109 - mkdir -p out/$(name).app/Contents/MacOS/
110
111 diff --git a/games-emulation/higan/higan-099.ebuild b/games-emulation/higan/higan-099.ebuild
112 deleted file mode 100644
113 index 7bea4f56b14..00000000000
114 --- a/games-emulation/higan/higan-099.ebuild
115 +++ /dev/null
116 @@ -1,138 +0,0 @@
117 -# Copyright 1999-2017 Gentoo Foundation
118 -# Distributed under the terms of the GNU General Public License v2
119 -
120 -EAPI=5
121 -
122 -inherit eutils gnome2-utils toolchain-funcs qmake-utils games
123 -
124 -MY_P=${PN}_v${PV}-source
125 -
126 -DESCRIPTION="A Nintendo multi-system emulator formerly known as bsnes"
127 -HOMEPAGE="http://byuu.org/higan/ https://code.google.com/p/higan/"
128 -SRC_URI="http://download.byuu.org/${MY_P}.7z"
129 -
130 -LICENSE="GPL-3"
131 -SLOT="0"
132 -KEYWORDS="~amd64 ~x86"
133 -IUSE="ao +alsa +icarus openal opengl oss pulseaudio +sdl udev xv"
134 -REQUIRED_USE="|| ( ao openal alsa pulseaudio oss )
135 - || ( xv opengl sdl )"
136 -
137 -RDEPEND="
138 - x11-libs/gtk+:2
139 - x11-libs/libX11
140 - x11-libs/libXext
141 - icarus? ( x11-libs/gtksourceview:2.0
142 - x11-libs/gtk+:2
143 - x11-libs/pango
144 - dev-libs/atk
145 - x11-libs/cairo
146 - x11-libs/gdk-pixbuf
147 - dev-libs/glib:2
148 - media-libs/fontconfig
149 - media-libs/freetype
150 - )
151 - ao? ( media-libs/libao )
152 - openal? ( media-libs/openal )
153 - alsa? ( media-libs/alsa-lib )
154 - pulseaudio? ( media-sound/pulseaudio )
155 - xv? ( x11-libs/libXv )
156 - opengl? ( virtual/opengl )
157 - sdl? ( media-libs/libsdl[X,joystick,video] )
158 - udev? ( virtual/udev )
159 -"
160 -DEPEND="${RDEPEND}
161 - app-arch/p7zip
162 - virtual/pkgconfig"
163 -
164 -S=${WORKDIR}/${MY_P}
165 -
166 -disable_module() {
167 - sed -i \
168 - -e "s|$1\b||" \
169 - "${S}"/higan/target-tomoko/GNUmakefile || die
170 -}
171 -
172 -src_prepare() {
173 - epatch "${FILESDIR}"/${P}-QA.patch
174 -
175 - sed -i \
176 - -e "/handle/s#/usr/local/lib#/usr/$(get_libdir)#" \
177 - nall/dl.hpp || die "fixing libdir failed!"
178 -
179 - # audio modules
180 - use ao || disable_module audio.ao
181 - use openal || disable_module audio.openal
182 - use pulseaudio || { disable_module audio.pulseaudio
183 - disable_module audio.pulseaudiosimple ;}
184 - use oss || disable_module audio.oss
185 - use alsa || disable_module audio.alsa
186 -
187 - # video modules
188 - use opengl || disable_module video.glx
189 - use xv || disable_module video.xv
190 - use sdl || disable_module video.sdl
191 -
192 - # input modules
193 - use sdl || disable_module input.sdl
194 - use udev || disable_module input.udev
195 -}
196 -
197 -src_compile() {
198 - local mytoolkit
199 -
200 - mytoolkit="gtk"
201 -
202 - if use icarus; then
203 - cd "${S}/icarus" || die
204 - emake \
205 - platform="linux" \
206 - compiler="$(tc-getCXX)"
207 - fi
208 -
209 - cd "${S}/higan" || die
210 - emake \
211 - platform="linux" \
212 - compiler="$(tc-getCXX)" \
213 - hiro="${mytoolkit}"
214 -
215 - sed \
216 - -e "s:%GAMES_DATADIR%:${GAMES_DATADIR}:" \
217 - < "${FILESDIR}"/${PN}-wrapper \
218 - > out/${PN}-wrapper || die "generating wrapper failed!"
219 -}
220 -
221 -src_install() {
222 - if use icarus; then
223 - newgamesbin "${S}"/icarus/out/icarus icarus
224 - fi
225 - newgamesbin "${S}"/higan/out/${PN} ${PN}.bin
226 - newgamesbin "${S}"/higan/out/${PN}-wrapper ${PN}
227 - make_desktop_entry "${PN}" "${PN}"
228 -
229 - # copy home directory stuff to a global location
230 - insinto "${GAMES_DATADIR}"/${PN}
231 - doins -r higan/data/cheats.bml higan/profile/*
232 -
233 - doicon -s 512 higan/data/${PN}.png
234 -
235 - prepgamesdirs
236 -}
237 -
238 -pkg_preinst() {
239 - games_pkg_preinst
240 - gnome2_icon_savelist
241 -}
242 -
243 -pkg_postinst() {
244 - #elog "optional dependencies:"
245 - #elog " dev-games/higan-ananke (extra rom load options)"
246 - #elog " games-util/higan-purify (Rom purifier)"
247 -
248 - games_pkg_postinst
249 - gnome2_icon_cache_update
250 -}
251 -
252 -pkg_postrm() {
253 - gnome2_icon_cache_update
254 -}