summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2022-07-25 21:09:38 -0400
committerIonen Wolkens <ionen@gentoo.org>2022-07-25 21:38:54 -0400
commit03617de53c60d511577d5f5a63043fc0f405f897 (patch)
tree843d4fc7723d2bc84c2e07f63bce2b91f7893caf /app-emulation/vice
parentapp-text/docbook-sgml-utils: Stabilize 0.6.14-r5 sparc, #860939 (diff)
downloadgentoo-03617de53c60d511577d5f5a63043fc0f405f897.tar.gz
gentoo-03617de53c60d511577d5f5a63043fc0f405f897.tar.bz2
gentoo-03617de53c60d511577d5f5a63043fc0f405f897.zip
app-emulation/vice: EAPI7->8
Been meaning to clean this up after realizing could use QA_ for --disable-static. Also update jpeg/pulseaudio deps while revbumping. Trivial so straight-to-stable'ing. Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'app-emulation/vice')
-rw-r--r--app-emulation/vice/vice-3.6.1-r1.ebuild (renamed from app-emulation/vice/vice-3.6.1.ebuild)12
1 files changed, 6 insertions, 6 deletions
diff --git a/app-emulation/vice/vice-3.6.1.ebuild b/app-emulation/vice/vice-3.6.1-r1.ebuild
index dcefe70a8de1..3c1ee81f612c 100644
--- a/app-emulation/vice/vice-3.6.1.ebuild
+++ b/app-emulation/vice/vice-3.6.1-r1.ebuild
@@ -1,9 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# --enable-static-lame triggers bug #814380 with EAPI-8, could work
-# around but staying EAPI-7 for now unless there's some urgency
-EAPI=7
+EAPI=8
inherit multibuild toolchain-funcs xdg
@@ -46,7 +44,7 @@ RDEPEND="
x11-libs/libX11
x11-libs/pango
)
- jpeg? ( virtual/jpeg )
+ jpeg? ( media-libs/libjpeg-turbo:= )
lame? ( media-sound/lame )
mpg123? ( media-sound/mpg123 )
ogg? (
@@ -57,7 +55,7 @@ RDEPEND="
pci? ( sys-apps/pciutils )
png? ( media-libs/libpng:= )
portaudio? ( media-libs/portaudio )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( || ( media-libs/libpulse media-sound/pulseaudio ) )
sdl? (
media-libs/libsdl2[video]
media-libs/sdl2-image
@@ -80,6 +78,8 @@ BDEPEND="
doc? ( virtual/texi2dvi )
gtk? ( x11-misc/xdg-utils )"
+QA_CONFIGURE_OPTIONS="--disable-static" #814380
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
@@ -151,7 +151,7 @@ multibuild_src_configure() {
$(use_with pulseaudio pulse)
$(use_with zlib)
$(usex alsa --enable-midi $(use_enable oss midi))
- $(usex pci '' ac_cv_header_pci_pci_h=no)
+ $(usev !pci ac_cv_header_pci_pci_h=no)
--disable-arch
--disable-sdlui
ac_cv_lib_ungif_EGifPutLine=no # ensure use giflib, not ungif