gentoo resync : 20.03.2022

4 files changed, 4 insertions, 376 deletions

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index ac314b79fb2e..4c16007e5a0a 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,7 +1,3 @@
-DIST vice-3.5.tar.gz 22557578 BLAKE2B 5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e SHA512 02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
 DIST vice-3.6.1.tar.gz 11454300 BLAKE2B 129171380f3bd23d579dc29a96419446169cf9a98d2fec82951fa192914846053d213a19b395c9ca30596859cce35bcfea0de0c0a7461c45cb38511a546ca4b2 SHA512 9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
-DIST vice-3.6.tar.gz 11389599 BLAKE2B 6ebf0a235f059cd4b4a6408e32657babfb1d8bd15c101764ea05224830caf1f53807434b7556ea2aa494e7fcc8f8f19b44e9202572679e76f0a147f52941575a SHA512 4e17ccf6b57a26cb439549fe0e9097045aaf78b3a291df8b47e16bf54c585194d38961a7d17d0c1c9e76e6e2aea7aa6e513cfcdbe9802363f2d885e9fb50bee9
-EBUILD vice-3.5-r1.ebuild 4077 BLAKE2B cf446708e7d2b3b84db74d7e59557a9cd078ea28cc3e3f3ec2024a14865f0ed5b8157a968bf9a53cb08c1c88c7ca1bb4937ec4b3c568fe70e9107619a5dd4942 SHA512 e207be81ee7ecd8f4049e69befd6171bcae1758538a34704e538d7903141c28b7a179c9ab2b3afddfeaabb3d410f31261f1cd525113a612d90e736c8f8f027ae
-EBUILD vice-3.6.1.ebuild 4596 BLAKE2B 85b4ab455a964b7e92be8e34f53133d7f99e20f5784ef9a417a76fc18bfa39f6dda11c5f7e35f23015b31bb3dfcde80264a1efdf3dee2618f92838142c2256fb SHA512 31a0cc37291452d66f141b7cef1f6628571857f199f54b075d6078254caf5bf9dcd3928e021c8dbd990ae4ece46a12bbf4071fd322634c814e293fffbd4aca97
-EBUILD vice-3.6.ebuild 4616 BLAKE2B a86fa3ebe80cbc1d1302a2135a26220f2778bae1171a9938161024cbe59cdaadd9730db517c8ec2cba44d11c78b47e70afee7458989390d0305fc699808ceb81 SHA512 ee6094534c36135415bc67cbb9de92b14ce8a179826ed875e813d3ae4256f082e1a6aca87cb216ac8aaecc979784a5a61b6bee3a6d2385e37fc7feca748c350d
+EBUILD vice-3.6.1.ebuild 4642 BLAKE2B 84978887e416ca87ca73f2fe4b432c4054554170795fb3e06e86e2a0f46c592418d87ce21453e64d145b7f471a0998d525b9b58ca30754c29c37c632116bf520 SHA512 8c74d08bdc60e9c805f9a96319af220ba27faa0df4f324e276b8ee112cf795555289cfa26164d5522a98a1fe2b07821fd8ad2f84e8301d21e5b82ad69d87ddb2
 MISC metadata.xml 785 BLAKE2B 1dc59c7b40fda968680e97b1ad83e741faf223143bbc1ab2d523e37312badd3a3aaedc3bbffbd158531c74ae73dab1bb1ee03666a081eb17d819dc9e0b783ee2 SHA512 b483d325702723d1395bca771d215709fc68b6ca8309c4297c6a668d5940502c9c8d5d4149e1f52b8fd6d5062cf04b2e3d7046ecfc0555d2703b064e329af283
diff --git a/app-emulation/vice/vice-3.5-r1.ebuild b/app-emulation/vice/vice-3.5-r1.ebuild
deleted file mode 100644
index feb7dc528716..000000000000
--- a/app-emulation/vice/vice-3.5-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multibuild toolchain-funcs xdg
-
-DESCRIPTION="The Versatile Commodore Emulator"
-HOMEPAGE="https://vice-emu.sourceforge.io/"
-SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="
-	alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
-	lame mpg123 ogg oss parport pci png portaudio pulseaudio sdl zlib"
-REQUIRED_USE="
-	|| ( gtk headless sdl )
-	gtk? ( zlib )"
-
-RDEPEND="
-	sys-libs/readline:=
-	virtual/libintl
-	alsa? ( media-libs/alsa-lib )
-	ethernet? (
-		net-libs/libnet:1.1
-		net-libs/libpcap
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
-	gif? ( media-libs/giflib:= )
-	gtk? (
-		dev-libs/atk
-		dev-libs/glib:2
-		media-libs/fontconfig:1.0
-		media-libs/glew:0=
-		virtual/opengl
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/pango
-	)
-	jpeg? ( virtual/jpeg )
-	lame? ( media-sound/lame )
-	mpg123? ( media-sound/mpg123 )
-	ogg? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	parport? ( sys-libs/libieee1284 )
-	pci? ( sys-apps/pciutils )
-	png? ( media-libs/libpng:= )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/sdl2-image
-	)
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="
-	app-arch/unzip
-	app-text/dos2unix
-	dev-embedded/xa
-	dev-lang/perl
-	sys-apps/texinfo
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	virtual/yacc
-	doc? ( virtual/texi2dvi )
-	gtk? ( x11-misc/xdg-utils )"
-
-src_prepare() {
-	default
-
-	# Delete some bundled libraries.
-	rm -r src/lib/lib{ffmpeg,lame,x264} || die
-
-	# Strip the predefined C(XX)FLAGS.
-	sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
-
-	MULTIBUILD_VARIANTS=(
-		$(usev gtk)
-		$(usev headless)
-		$(usev sdl)
-	)
-
-	# Debug build currently broken without copy sources.
-	multibuild_copy_sources
-}
-
-src_configure() {
-	tc-export AR
-
-	multibuild_foreach_variant run_in_build_dir multibuild_src_configure
-}
-
-multibuild_src_configure() {
-	# Append ".variant" to x* programs if building multiple variants.
-	local xform
-	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-		xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
-	fi
-
-	vice-multi_enable() {
-		if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then
-			echo --enable-${2}
-		else
-			echo --disable-${2}
-		fi
-	}
-
-	local econfargs=(
-		--program-transform-name="${xform}"
-		$(vice-multi_enable gtk desktop-files)
-		$(vice-multi_enable gtk native-gtk3ui)
-		$(vice-multi_enable headless headlessui)
-		$(vice-multi_enable sdl sdlui2)
-		$(use_enable cpuhistory)
-		$(use_enable debug debug-gtk3ui)
-		$(use_enable debug)
-		$(use_enable doc pdf-docs)
-		$(use_enable ethernet)
-		$(use_enable ffmpeg external-ffmpeg)
-		$(use_enable lame)
-		$(use_enable parport libieee1284)
-		$(use_enable portaudio)
-		$(use_with alsa)
-		$(use_with flac)
-		$(use_with gif)
-		$(use_with jpeg)
-		$(use_with mpg123)
-		$(use_with ogg vorbis)
-		$(use_with oss)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with zlib)
-		$(usex alsa --enable-midi $(use_enable oss midi))
-		$(usex pci '' ac_cv_header_pci_pci_h=no)
-		--disable-arch
-		--disable-sdlui
-		--disable-shared-ffmpeg
-		--disable-static-ffmpeg
-		--disable-static-lame
-		--enable-html-docs
-		--enable-ipv6
-		ac_cv_lib_ungif_EGifPutLine=no # ensure use giflib, not ungif
-	)
-
-	econf "${econfargs[@]}"
-}
-
-src_compile() {
-	multibuild_foreach_variant run_in_build_dir emake
-}
-
-src_install() {
-	# Get xdg-desktop-menu to play nicely while doing the install.
-	dodir /etc/xdg/menus /usr/share/{applications,desktop-directories}
-
-	XDG_UTILS_INSTALL_MODE=system \
-	XDG_DATA_DIRS="${ED}"/usr/share \
-	XDG_CONFIG_DIRS="${ED}"/etc/xdg \
-		multibuild_foreach_variant run_in_build_dir default
-
-	rm -f "${ED}"/usr/share/applications/*.cache || die
-
-	# Delete the bundled fonts. These could be packaged separately but
-	# they're only for the HTML documentation.
-	rm -r "${ED}"/usr/share/doc/${PF}/html/fonts || die
-}
diff --git a/app-emulation/vice/vice-3.6.1.ebuild b/app-emulation/vice/vice-3.6.1.ebuild
index f5a55faac561..dcefe70a8de1 100644
--- a/app-emulation/vice/vice-3.6.1.ebuild
+++ b/app-emulation/vice/vice-3.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 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 +22,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
 	alsa? ( media-libs/alsa-lib )
@@ -29,7 +30,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? (
diff --git a/app-emulation/vice/vice-3.6.ebuild b/app-emulation/vice/vice-3.6.ebuild
deleted file mode 100644
index bd83effcd4fd..000000000000
--- a/app-emulation/vice/vice-3.6.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# 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
-
-inherit multibuild toolchain-funcs xdg
-
-DESCRIPTION="The Versatile Commodore Emulator"
-HOMEPAGE="https://vice-emu.sourceforge.io/"
-SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-S="${WORKDIR}/${P}.0"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 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"
-REQUIRED_USE="
-	|| ( gtk headless sdl )
-	gtk? ( zlib )"
-
-# ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers
-RDEPEND="
-	virtual/libintl
-	alsa? ( media-libs/alsa-lib )
-	ethernet? (
-		net-libs/libpcap
-		sys-libs/libcap
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
-	gif? ( media-libs/giflib:= )
-	gtk? (
-		dev-libs/atk
-		dev-libs/glib:2
-		media-libs/fontconfig:1.0
-		media-libs/glew:0=
-		sys-libs/readline:=
-		virtual/opengl
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/pango
-	)
-	jpeg? ( virtual/jpeg )
-	lame? ( media-sound/lame )
-	mpg123? ( media-sound/mpg123 )
-	ogg? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	parport? ( sys-libs/libieee1284 )
-	pci? ( sys-apps/pciutils )
-	png? ( media-libs/libpng:= )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/sdl2-image
-		sys-libs/readline:=
-	)
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="
-	app-arch/unzip
-	app-text/dos2unix
-	dev-embedded/xa
-	dev-lang/perl
-	sys-apps/texinfo
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	virtual/yacc
-	doc? ( virtual/texi2dvi )
-	gtk? ( x11-misc/xdg-utils )"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	# Strip the predefined C(XX)FLAGS.
-	sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
-
-	MULTIBUILD_VARIANTS=(
-		$(usev gtk)
-		$(usev headless)
-		$(usev sdl)
-	)
-
-	# Debug build currently broken without copy sources.
-	multibuild_copy_sources
-}
-
-src_configure() {
-	tc-export AR
-
-	multibuild_foreach_variant run_in_build_dir multibuild_src_configure
-}
-
-multibuild_src_configure() {
-	# Append ".variant" to x* programs if building multiple variants.
-	local xform
-	(( ${#MULTIBUILD_VARIANTS[@]} > 1 )) &&
-		xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
-
-	vice-multi_enable() {
-		if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then
-			echo --enable-${2}
-		else
-			echo --disable-${2}
-		fi
-	}
-
-	local econfargs=(
-		--program-transform-name="${xform}"
-		$(vice-multi_enable gtk desktop-files)
-		$(vice-multi_enable gtk native-gtk3ui)
-		$(vice-multi_enable headless headlessui)
-		$(vice-multi_enable sdl sdlui2)
-		$(usex debug $(vice-multi_enable gtk debug-gtk3ui) --disable-debug-gtk3ui)
-		$(use_enable cpuhistory)
-		$(use_enable debug)
-		$(use_enable doc pdf-docs)
-		$(use_enable ethernet)
-		$(use_enable ffmpeg external-ffmpeg)
-		$(use_enable lame)
-		$(use_enable openmp)
-		$(use_enable parport libieee1284)
-		$(use_enable portaudio)
-		$(use_with alsa)
-		$(use_with flac)
-		$(use_with gif)
-		$(use_with jpeg)
-		$(use_with mpg123)
-		$(use_with ogg vorbis)
-		$(use_with oss)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with zlib)
-		$(usex alsa --enable-midi $(use_enable oss midi))
-		$(usex pci '' ac_cv_header_pci_pci_h=no)
-		--disable-arch
-		--disable-sdlui
-		ac_cv_lib_ungif_EGifPutLine=no # ensure use giflib, not ungif
-
-		# $(use_with curl libcurl) # new in 3.6 but is a unused placeholder
-		# --enable-io-simulation # likewise
-	)
-
-	econf "${econfargs[@]}"
-}
-
-src_compile() {
-	multibuild_foreach_variant run_in_build_dir emake
-}
-
-src_install() {
-	# Get xdg-desktop-menu to play nicely while doing the install.
-	dodir /etc/xdg/menus /usr/share/{applications,desktop-directories}
-
-	XDG_UTILS_INSTALL_MODE=system \
-	XDG_DATA_DIRS="${ED}"/usr/share \
-	XDG_CONFIG_DIRS="${ED}"/etc/xdg \
-		multibuild_foreach_variant run_in_build_dir default
-
-	rm -f "${ED}"/usr/share/applications/*.cache || die
-
-	vice-install_extras() {
-		docinto html
-		dodoc doc/html/*.{html,css}
-		dodoc -r doc/html/images
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins doc/vim/ftdetect/*.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins doc/vim/syntax/*.vim
-	}
-	multibuild_for_best_variant run_in_build_dir vice-install_extras
-}