1 |
commit: b8f5a3c2770d2d3f96a27d846c73c3072d3abbc3 |
2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 29 05:15:03 2015 +0000 |
4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 29 07:40:54 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f5a3c2 |
7 |
|
8 |
old |
9 |
|
10 |
Package-Manager: portage-2.2.24 |
11 |
|
12 |
app-emulation/vice/Manifest | 1 - |
13 |
.../vice/files/vice-2.4.20-autotools.patch | 11 -- |
14 |
app-emulation/vice/files/vice-2.4.20-format.patch | 20 --- |
15 |
.../vice/files/vice-2.4.20-xf86extensions.patch | 15 -- |
16 |
app-emulation/vice/vice-2.4.20.ebuild | 173 --------------------- |
17 |
5 files changed, 220 deletions(-) |
18 |
|
19 |
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest |
20 |
index 4e11019..64ad041 100644 |
21 |
--- a/app-emulation/vice/Manifest |
22 |
+++ b/app-emulation/vice/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST vice-2.4.20.tar.gz 25156408 SHA256 e5d3d125940f0fafe409aabeec9de4e3ae8d9c19a731aa7ec6a57f6d2b897c5f SHA512 a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76 WHIRLPOOL 5f25bfa72ade54dbe09699b5932df2c37017c3993daba048eb09f723a4351300b6722cf06ceb264202459051780a775f45b787b6ea60db78560d5c65da684541 |
25 |
DIST vice-2.4.22.tar.gz 25180343 SHA256 767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975 WHIRLPOOL 580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81 |
26 |
|
27 |
diff --git a/app-emulation/vice/files/vice-2.4.20-autotools.patch b/app-emulation/vice/files/vice-2.4.20-autotools.patch |
28 |
deleted file mode 100644 |
29 |
index 7bebd28..0000000 |
30 |
--- a/app-emulation/vice/files/vice-2.4.20-autotools.patch |
31 |
+++ /dev/null |
32 |
@@ -1,11 +0,0 @@ |
33 |
---- vice-2.4.7.orig/configure.ac |
34 |
-+++ vice-2.4.7/configure.ac |
35 |
-@@ -124,7 +118,7 @@ |
36 |
- AC_SUBST(VICE_VERSION) |
37 |
- |
38 |
- AM_INIT_AUTOMAKE(vice, $VICE_VERSION) |
39 |
--AM_CONFIG_HEADER(src/config.h) |
40 |
-+AC_CONFIG_HEADERS(src/config.h) |
41 |
- |
42 |
- if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then |
43 |
- VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0" |
44 |
|
45 |
diff --git a/app-emulation/vice/files/vice-2.4.20-format.patch b/app-emulation/vice/files/vice-2.4.20-format.patch |
46 |
deleted file mode 100644 |
47 |
index 1c782fd..0000000 |
48 |
--- a/app-emulation/vice/files/vice-2.4.20-format.patch |
49 |
+++ /dev/null |
50 |
@@ -1,20 +0,0 @@ |
51 |
---- src/main.c.old 2015-10-19 17:25:07.549164652 +0200 |
52 |
-+++ src/main.c 2015-10-19 17:25:33.106694706 +0200 |
53 |
-@@ -227,7 +227,7 @@ |
54 |
- for (i = 0; core_team[i].name; i++) { |
55 |
- n += strlen(core_team[i].name); |
56 |
- if (n > 74) { |
57 |
-- log_message(LOG_DEFAULT, tmp); |
58 |
-+ log_message(LOG_DEFAULT, "%s", tmp); |
59 |
- n = 0; *tmp = 0; |
60 |
- } |
61 |
- strcat(tmp, core_team[i].name); |
62 |
-@@ -235,7 +235,7 @@ |
63 |
- strcat(tmp, ", "); |
64 |
- } else { |
65 |
- strcat(tmp, "."); |
66 |
-- log_message(LOG_DEFAULT, tmp); |
67 |
-+ log_message(LOG_DEFAULT, "%s", tmp); |
68 |
- } |
69 |
- } |
70 |
- lib_free(tmp); |
71 |
|
72 |
diff --git a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch b/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch |
73 |
deleted file mode 100644 |
74 |
index 357d686..0000000 |
75 |
--- a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch |
76 |
+++ /dev/null |
77 |
@@ -1,15 +0,0 @@ |
78 |
---- a/trunk/vice/src/arch/unix/x11/gnome/x11ui.c |
79 |
-+++ b/trunk/vice/src/arch/unix/x11/gnome/x11ui.c |
80 |
-@@ -102,9 +102,10 @@ |
81 |
- #include "ui-threads.h" |
82 |
- #endif |
83 |
- |
84 |
--#ifdef USE_XF86_EXTENSIONS |
85 |
-+#if defined(USE_XF86_EXTENSIONS) || !defined(HAVE_VTE) |
86 |
- #include <gdk/gdkx.h> |
87 |
- #endif |
88 |
-+ |
89 |
- #include "x11ui.h" |
90 |
- |
91 |
- #ifdef DEBUG_X11UI |
92 |
- |
93 |
|
94 |
diff --git a/app-emulation/vice/vice-2.4.20.ebuild b/app-emulation/vice/vice-2.4.20.ebuild |
95 |
deleted file mode 100644 |
96 |
index 1ee7dc6..0000000 |
97 |
--- a/app-emulation/vice/vice-2.4.20.ebuild |
98 |
+++ /dev/null |
99 |
@@ -1,173 +0,0 @@ |
100 |
-# Copyright 1999-2015 Gentoo Foundation |
101 |
-# Distributed under the terms of the GNU General Public License v2 |
102 |
-# $Id$ |
103 |
- |
104 |
-EAPI=5 |
105 |
-inherit autotools eutils toolchain-funcs flag-o-matic games |
106 |
- |
107 |
-DESCRIPTION="The Versatile Commodore 8-bit Emulator" |
108 |
-HOMEPAGE="http://vice-emu.sourceforge.net/" |
109 |
-SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz" |
110 |
- |
111 |
-LICENSE="GPL-2+" |
112 |
-SLOT="0" |
113 |
-KEYWORDS="amd64 ppc ~sparc x86" |
114 |
-IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk2 ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib" |
115 |
- |
116 |
-# upstream says gtk3 and sdl2 shouldn't be exposed yet. |
117 |
-#REQUIRED_USE="?? ( gtk2 gtk3 sdl )" |
118 |
-REQUIRED_USE="?? ( gtk2 sdl )" |
119 |
- |
120 |
-GTK_COMMON=" |
121 |
- x11-libs/pango |
122 |
- x11-libs/cairo" |
123 |
-# gtk3? ( |
124 |
-# x11-libs/gtk+:3 |
125 |
-# vte? ( x11-libs/vte:2.90 ) |
126 |
-# ${GTK_COMMON} |
127 |
-# ) |
128 |
-RDEPEND=" |
129 |
- virtual/jpeg:0 |
130 |
- virtual/opengl |
131 |
- media-libs/giflib |
132 |
- alsa? ( media-libs/alsa-lib ) |
133 |
- pulseaudio? ( media-sound/pulseaudio ) |
134 |
- sdlsound? ( media-libs/libsdl[sound] ) |
135 |
- ethernet? ( |
136 |
- >=net-libs/libpcap-0.9.8 |
137 |
- >=net-libs/libnet-1.1.2.1:1.1 |
138 |
- ) |
139 |
- ffmpeg? ( virtual/ffmpeg ) |
140 |
- lame? ( media-sound/lame ) |
141 |
- nls? ( virtual/libintl ) |
142 |
- png? ( media-libs/libpng:0 ) |
143 |
- zlib? ( sys-libs/zlib ) |
144 |
- sdl? ( |
145 |
- media-libs/libsdl[joystick,video] |
146 |
- ) |
147 |
- !sdl? ( |
148 |
- fullscreen? ( |
149 |
- x11-libs/libXrandr |
150 |
- x11-libs/libXxf86vm ) |
151 |
- x11-libs/libX11 |
152 |
- x11-libs/libXext |
153 |
- sys-libs/readline |
154 |
- ) |
155 |
- gtk2? ( |
156 |
- x11-libs/gtk+:2 |
157 |
- vte? ( x11-libs/vte:0 ) |
158 |
- x11-libs/gtkglext |
159 |
- ${GTK_COMMON} |
160 |
- ) |
161 |
- !sdl? ( !gtk2? ( |
162 |
- x11-libs/libXmu |
163 |
- x11-libs/libXpm |
164 |
- x11-libs/libXt |
165 |
- x11-libs/libXv |
166 |
- Xaw3d? ( x11-libs/libXaw3d ) |
167 |
- !Xaw3d? ( x11-libs/libXaw ) |
168 |
- ) ) |
169 |
- " |
170 |
-DEPEND="${RDEPEND} |
171 |
- virtual/pkgconfig |
172 |
- !sdl? ( |
173 |
- fullscreen? ( x11-proto/xf86vidmodeproto ) |
174 |
- !gtk2? ( |
175 |
- x11-libs/libICE |
176 |
- x11-libs/libSM |
177 |
- ) |
178 |
- ) |
179 |
- x11-apps/bdftopcf |
180 |
- x11-apps/mkfontdir |
181 |
- x11-proto/xproto |
182 |
- x11-proto/xextproto |
183 |
- media-libs/fontconfig |
184 |
- x11-proto/videoproto |
185 |
- nls? ( sys-devel/gettext )" |
186 |
- |
187 |
-src_prepare() { |
188 |
- epatch \ |
189 |
- "${FILESDIR}"/${P}-autotools.patch \ |
190 |
- "${FILESDIR}"/${P}-format.patch \ |
191 |
- "${FILESDIR}"/${P}-xf86extensions.patch |
192 |
- sed -i \ |
193 |
- -e 's/building//' \ |
194 |
- doc/Makefile.am || die |
195 |
- sed -i \ |
196 |
- -e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \ |
197 |
- doc/Makefile.am \ |
198 |
- doc/readmes/Makefile.am || die |
199 |
- sed -i \ |
200 |
- -e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \ |
201 |
- doc/html/Makefile.am || die |
202 |
- sed -i \ |
203 |
- -e "s:/usr/local/lib/VICE:$(games_get_libdir)/${PN}:" \ |
204 |
- man/vice.1 \ |
205 |
- $(grep -rl --exclude="*texi" /usr/local/lib doc) || die |
206 |
- sed -i \ |
207 |
- -e "/VICEDIR=/s:=.*:=\"$(games_get_libdir)/${PN}\";:" \ |
208 |
- configure.ac || die |
209 |
- sed -i \ |
210 |
- -e "s:\(#define LIBDIR \).*:\1\"$(games_get_libdir)/${PN}\":" \ |
211 |
- -e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \ |
212 |
- src/arch/unix/archdep.h \ |
213 |
- src/arch/sdl/archdep_unix.h || die |
214 |
- rm -rf src/lib/{libffmpeg,liblame} || die |
215 |
- sed -i \ |
216 |
- -e '/SUBDIRS/s/libffmpeg//;' \ |
217 |
- -e '/SUBDIRS/s/liblame//;' \ |
218 |
- src/lib/Makefile.am || die |
219 |
- AT_NO_RECURSIVE=1 eautoreconf |
220 |
-} |
221 |
- |
222 |
-src_configure() { |
223 |
- local gui_arg snd_arg |
224 |
- |
225 |
- snd_arg+=" $(use_with alsa)" |
226 |
- snd_arg+=" $(use_with oss)" |
227 |
- snd_arg+=" $(use_with pulseaudio pulse)" |
228 |
- snd_arg+=" $(use_with sdlsound)" |
229 |
- |
230 |
- gui_arg+=" $(use_enable sdl sdlui)" |
231 |
- # The gtk UI code has raw calls to XOpenDisplay and |
232 |
- # is missing -lX11 if vte doesn't pull it in. |
233 |
- #if use gtk2 || use gtk3 ; then |
234 |
- if use gtk2 ; then |
235 |
- use vte || append-libs -lX11 |
236 |
- fi |
237 |
- gui_arg+=" $(use_enable gtk2 gnomeui)" |
238 |
- #gui_arg+=" $(use_enable gtk3 gnomeui3)" |
239 |
- gui_arg+=" $(use_enable Xaw3d xaw3d)" |
240 |
- |
241 |
- # --with-readline is forced to avoid using the embedded copy |
242 |
- # don't try to actually run fc-cache (bug #280976) |
243 |
- FCCACHE=/bin/true \ |
244 |
- PKG_CONFIG=$(tc-getPKG_CONFIG) \ |
245 |
- egamesconf \ |
246 |
- --enable-parsid \ |
247 |
- --with-resid \ |
248 |
- --with-readline \ |
249 |
- --without-arts \ |
250 |
- --without-midas \ |
251 |
- $(use_enable ethernet) \ |
252 |
- $(use_enable ffmpeg) \ |
253 |
- $(use_enable ffmpeg external-ffmpeg) \ |
254 |
- $(use_enable fullscreen) \ |
255 |
- $(use_enable ipv6) \ |
256 |
- $(use_enable lame) \ |
257 |
- $(use_enable nls) \ |
258 |
- $(use_enable vte) \ |
259 |
- $(use_with png) \ |
260 |
- $(use_with threads uithreads) \ |
261 |
- $(use_with zlib) \ |
262 |
- ${gui_arg} \ |
263 |
- ${snd_arg} \ |
264 |
- --disable-option-checking |
265 |
- # --disable-option-checking has to be last |
266 |
-} |
267 |
- |
268 |
-src_install() { |
269 |
- DOCS="AUTHORS ChangeLog FEEDBACK README" \ |
270 |
- default |
271 |
- prepgamesdirs |
272 |
-} |