Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/
Date: Sat, 30 Oct 2021 13:10:21
Message-Id: 1635592311.467c3fb39b6c659d40f3b39a3e024310ea96aaed.ionen@gentoo
1 commit: 467c3fb39b6c659d40f3b39a3e024310ea96aaed
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 30 10:59:51 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 30 11:11:51 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467c3fb3
7
8 app-emulation/vice: drop 3.4_p38553
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 app-emulation/vice/Manifest | 1 -
13 .../vice/files/vice-pkg-config-3.4_p38553.patch | 29 ----
14 app-emulation/vice/vice-3.4_p38553.ebuild | 185 ---------------------
15 3 files changed, 215 deletions(-)
16
17 diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
18 index 6d59125ff4d..a40919df8c4 100644
19 --- a/app-emulation/vice/Manifest
20 +++ b/app-emulation/vice/Manifest
21 @@ -1,2 +1 @@
22 DIST vice-3.5.tar.gz 22557578 BLAKE2B 5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e SHA512 02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
23 -DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f SHA512 c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86
24
25 diff --git a/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch b/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch
26 deleted file mode 100644
27 index 557c0a92731..00000000000
28 --- a/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch
29 +++ /dev/null
30 @@ -1,29 +0,0 @@
31 -https://sourceforge.net/p/vice-emu/patches/218/
32 -
33 -Index: configure.ac
34 -===================================================================
35 ---- a/configure.ac (revision 38502)
36 -+++ b/configure.ac (working copy)
37 -@@ -1275,6 +1275,14 @@
38 - fi
39 -
40 - if test x"$found_sdl2" != "xyes"; then
41 -+ PKG_CHECK_MODULES(SDL2, sdl2, [
42 -+ use_sdl_prefix=no
43 -+ use_sdl2_prefix=no
44 -+ found_sdl2=yes
45 -+ VICE_CFLAGS="$VICE_CFLAGS $SDL2_CFLAGS"
46 -+ VICE_CXXFLAGS="$VICE_CXXFLAGS $SDL2_CFLAGS"
47 -+ LIBS="$LIBS $SDL2_LIBS"
48 -+ ], [
49 - dnl Check for sdl2-config
50 - if test x"$sdl2_config" != "xno"; then
51 - user_CFLAGS="$CFLAGS"
52 -@@ -1311,6 +1319,7 @@
53 - CFLAGS="$user_CFLAGS"
54 - CXXFLAGS="$user_CXXFLAGS"
55 - fi
56 -+ ])
57 - fi
58 -
59 - dnl fail if SDL2 ui was requested, otherwise restore flags and continue
60
61 diff --git a/app-emulation/vice/vice-3.4_p38553.ebuild b/app-emulation/vice/vice-3.4_p38553.ebuild
62 deleted file mode 100644
63 index 17bb3310b2a..00000000000
64 --- a/app-emulation/vice/vice-3.4_p38553.ebuild
65 +++ /dev/null
66 @@ -1,185 +0,0 @@
67 -# Copyright 1999-2021 Gentoo Authors
68 -# Distributed under the terms of the GNU General Public License v2
69 -
70 -EAPI=7
71 -
72 -inherit autotools multibuild xdg
73 -
74 -MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
75 -
76 -DESCRIPTION="The Versatile Commodore Emulator"
77 -HOMEPAGE="https://vice-emu.sourceforge.io/"
78 -#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
79 -SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip"
80 -
81 -LICENSE="GPL-2+"
82 -SLOT="0"
83 -KEYWORDS="amd64 x86"
84 -IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
85 -REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
86 -
87 -RDEPEND="
88 - sys-libs/readline:0=
89 - virtual/libintl
90 - alsa? ( media-libs/alsa-lib )
91 - ethernet? (
92 - >=net-libs/libpcap-0.9.8
93 - >=net-libs/libnet-1.1.2.1:1.1
94 - )
95 - ffmpeg? ( media-video/ffmpeg:= )
96 - flac? ( media-libs/flac )
97 - gif? ( media-libs/giflib:= )
98 - gtk? (
99 - dev-libs/glib:2
100 - media-libs/fontconfig:1.0
101 - x11-libs/cairo
102 - x11-libs/gtk+:3
103 - x11-libs/pango
104 - opengl? (
105 - media-libs/glew:0=
106 - virtual/opengl
107 - )
108 - )
109 - jpeg? ( virtual/jpeg )
110 - lame? ( media-sound/lame )
111 - mpg123? ( media-sound/mpg123 )
112 - ogg? (
113 - media-libs/libogg
114 - media-libs/libvorbis
115 - )
116 - parport? ( sys-libs/libieee1284 )
117 - pci? ( sys-apps/pciutils )
118 - png? ( media-libs/libpng:0= )
119 - portaudio? ( media-libs/portaudio )
120 - pulseaudio? ( media-sound/pulseaudio )
121 - sdl? ( media-libs/libsdl2[video] )
122 - zlib? ( sys-libs/zlib )
123 -"
124 -
125 -DEPEND="
126 - ${RDEPEND}
127 - x11-base/xorg-proto
128 -"
129 -
130 -BDEPEND="
131 - app-arch/unzip
132 - app-text/dos2unix
133 - dev-embedded/xa
134 - dev-lang/perl
135 - sys-apps/texinfo
136 - sys-devel/flex
137 - sys-devel/gettext
138 - virtual/pkgconfig
139 - virtual/yacc
140 - doc? ( virtual/texi2dvi )
141 - gtk? ( x11-misc/xdg-utils )
142 -"
143 -
144 -S="${WORKDIR}/${MY_P}"
145 -ECONF_SOURCE="${S}"
146 -
147 -PATCHES=(
148 - "${FILESDIR}"/vice-pkg-config-${PV}.patch
149 -)
150 -
151 -src_prepare() {
152 - default
153 -
154 - # Delete some bundled libraries.
155 - rm -r src/lib/lib{ffmpeg,lame,x264} || die
156 -
157 - local DIR
158 - for DIR in src/resid src/resid-dtv .; do
159 - pushd "${DIR}" || die
160 - AT_NO_RECURSIVE=1 eautoreconf
161 - popd || die
162 - done
163 -
164 - # Strip the predefined C(XX)FLAGS.
165 - sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
166 -}
167 -
168 -src_configure() {
169 - MULTIBUILD_VARIANTS=(
170 - $(usev gtk)
171 - $(usev headless)
172 - $(usev sdl)
173 - )
174 -
175 - multibuild_foreach_variant run_in_build_dir multibuild_src_configure
176 -}
177 -
178 -multibuild_enable() {
179 - if [[ ${MULTIBUILD_VARIANT} == $1 ]]; then
180 - printf -- "--enable-%s\n" "$2"
181 - else
182 - printf -- "--disable-%s\n" "$2"
183 - fi
184 -}
185 -
186 -multibuild_src_configure() {
187 - # Some dependencies lack configure options so prevent them becoming
188 - # automagic by using configure cache variables.
189 - use pci || export ac_cv_header_pci_pci_h=no
190 -
191 - # Ensure we use giflib, not ungif.
192 - export ac_cv_lib_ungif_EGifPutLine=no
193 -
194 - # Append ".variant" to x* programs if building multiple variants.
195 - if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
196 - xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
197 - else
198 - unset xform
199 - fi
200 -
201 - econf \
202 - --program-transform-name="${xform}" \
203 - --disable-arch \
204 - $(use_enable debug) \
205 - $(use_enable debug debug-gtk3ui) \
206 - $(use_enable ffmpeg external-ffmpeg) \
207 - $(multibuild_enable headless headlessui) \
208 - --enable-html-docs \
209 - $(use_enable ethernet) \
210 - $(use_enable opengl hwscale) \
211 - $(use_enable ipv6) \
212 - $(use_enable lame) \
213 - $(use_enable parport libieee1284) \
214 - $(multibuild_enable gtk native-gtk3ui) \
215 - $(use_enable doc pdf-docs) \
216 - $(use_enable portaudio) \
217 - --disable-sdlui \
218 - $(multibuild_enable sdl sdlui2) \
219 - --disable-shared-ffmpeg \
220 - --disable-static-ffmpeg \
221 - $(multibuild_enable gtk desktop-files) \
222 - $(use_with alsa) \
223 - $(use_with gif) \
224 - $(use_with jpeg) \
225 - $(use_with oss) \
226 - $(use_with png) \
227 - $(use_with pulseaudio pulse) \
228 - $(use_with zlib) \
229 - $(use_with mpg123) \
230 - $(use_with ogg vorbis) \
231 - $(use_with flac)
232 -}
233 -
234 -src_compile() {
235 - multibuild_foreach_variant run_in_build_dir emake
236 -}
237 -
238 -src_install() {
239 - # Get xdg-desktop-menu to play nicely while doing the install.
240 - dodir /etc/xdg/menus /usr/share/{applications,desktop-directories}
241 - XDG_UTILS_INSTALL_MODE=system \
242 - XDG_DATA_DIRS="${ED}"/usr/share \
243 - XDG_CONFIG_DIRS="${ED}"/etc/xdg \
244 - multibuild_foreach_variant run_in_build_dir default
245 - rm -f "${ED}"/usr/share/applications/*.cache || die
246 - dodoc FEEDBACK
247 -
248 - # Delete the bundled fonts. These could be packaged separately but
249 - # they're only for the HTML documentation.
250 - rm -r "${ED}"/usr/share/doc/${PF}/html/fonts/ || die
251 -}