Bump

app-emulation/vice/Manifest

@@ -1,5 +1,4 @@
-AUX vice-2.3-notexi.patch 395 BLAKE2B 83bafa978b9984731c44f5da620a38452a3b4bfbf5bb1e1671eb7dc0319277b99dcfe2dc9497429cc50d9a0895b867aaf2dd39d4176afaf7e8b694b19c830a11 SHA512 3e48ab7e34653d5b16faedfb982c647e83ca4312981df68085c482369618ae36057702fead219b46c796efc396e87bbb15d24508c52b0a83488dad6babf5f0dc
 DIST vice-3.6.1.tar.gz 11454300 BLAKE2B 129171380f3bd23d579dc29a96419446169cf9a98d2fec82951fa192914846053d213a19b395c9ca30596859cce35bcfea0de0c0a7461c45cb38511a546ca4b2 SHA512 9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
-EBUILD vice-3.6.1.ebuild 4641 BLAKE2B c75f9106b43cd990b62de500b210b7a10ff073da05077b5ff79886c828a7b6827f061ce7dc145b2eb3e172877984a9e2879a96e37a7876aae84a180ae72a2b02 SHA512 ecdc10cc82d9e27cdd1e60151c3ef68db660c4567117be8e6bfaec2ab1b050e537cd5e13446b14926985b14a27817b8381c1034f4c64bdb3a38b0d69ef919f32
+EBUILD vice-3.6.1-r1.ebuild 4650 BLAKE2B ebe4a136c78e95ca8e743e0e6c7beb6e726e6997d83784a80bab6625fd8d908a3e0732023078183ef49f15b7b707b2d22e077a68f6ff37b0b08f0dd848e93808 SHA512 8db6c83d9bb7cac021db9b64c50c22fa2489057fc72f3412ed63d60711fd39345902d748f355f3037efbafdf774fc72291252870fa2b1d5d89cf3179d5f2a3a8
 MISC ChangeLog 10438 BLAKE2B b9f985be8ff4e4c97fd9ba479ec2093b1c4dfd62cd9211e2744587b82d6772916b9eceed91df53dfa9e2439ce1c88e3ecd32a606690b34e1e095d0f9b62168c8 SHA512 fe80b5fd85f40aadf64ded6089e961d9cc08d2721484889fc1b02d985bc873c9cdbd55815331fb76436c73d1a07a56a16d790f8969a456ebe4e472b897810960
 MISC metadata.xml 785 BLAKE2B 1dc59c7b40fda968680e97b1ad83e741faf223143bbc1ab2d523e37312badd3a3aaedc3bbffbd158531c74ae73dab1bb1ee03666a081eb17d819dc9e0b783ee2 SHA512 b483d325702723d1395bca771d215709fc68b6ca8309c4297c6a668d5940502c9c8d5d4149e1f52b8fd6d5062cf04b2e3d7046ecfc0555d2703b064e329af283

app-emulation/vice/files/vice-2.3-notexi.patch

@@ -1,17 +0,0 @@
---- doc/Makefile.am.orig
-+++ doc/Makefile.am
-@@ -48,14 +48,7 @@
- $(srcdir)/vice.txt:	vice.texi
- 	$(MAKEINFO) -o $(srcdir)/vice.txt --no-headers $(srcdir)/vice.texi
- 
--if BUILD_PDF
--$(srcdir)/vice.pdf:	vice.texi
--	$(TEXI2DVI) -q --clean --pdf -o $(srcdir)/vice.pdf $(srcdir)/vice.texi
--
--PDF_DEPS=$(srcdir)/vice.pdf
--else
- PDF_DEPS=
--endif
- 
- if BUILD_AMIGAGUIDE
- $(srcdir)/vice.guide:	vice.texi

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
 
@@ -13,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="
 	alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
 	lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl zlib"
@@ -22,6 +20,7 @@ REQUIRED_USE="
 	gtk? ( zlib )"
 
 # ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers
+# see bug #834359 for the ffmpeg upper bound
 RDEPEND="
 	virtual/libintl
 	app-emulation/opencbm
@@ -30,7 +29,7 @@ RDEPEND="
 		net-libs/libpcap
 		sys-libs/libcap
 	)
-	ffmpeg? ( media-video/ffmpeg:= )
+	ffmpeg? ( <media-video/ffmpeg-5:= )
 	flac? ( media-libs/flac )
 	gif? ( media-libs/giflib:= )
 	gtk? (
@@ -46,7 +45,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 +56,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 +79,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 +152,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
 		--enable-realdevice