gentoo auto-resync : 08:02:2024 - 21:59:09

3 files changed, 3 insertions, 193 deletions

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index dbed8d4dc10b..3a3e0e3322a4 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,5 +1,3 @@
-DIST vice-3.7.1.tar.gz 13444946 BLAKE2B 64ac82c118cd1e515d7677d3f60d3b19dbf19319d8505321c46c2adb92414193784a036e2f6fa0ce5f55f1e4f425f45026ce152ee866b72ad6557531faaf5797 SHA512 80f81dd4d163cc5030eee2908b274bce4f3f21a3adb6d01559f4695d58b27ebc7b7570d8896718dfe74b2f2e4983ed3f9c4919b6e81934063d344b543b081f30
 DIST vice-3.8.tar.gz 13564021 BLAKE2B 709fd6eda874de542e5770a328b0c0308d04f755e3bf1fceba5147156eb894a95ce6f14e9f8848ca6992d4f958082f83a198d2176c1fe54e87027c7dfac8849c SHA512 fe644667736c32386b62af53314a95bf510c75d476eaab14b4c37693f2f57d6815126ab3db2f0cb11300c1a4a07c29b3f25210800ce97a673a0460ab59d0ebba
-EBUILD vice-3.7.1.ebuild 4482 BLAKE2B 305dba926df0d49ea52f82be249f376be7e81af07af96708338a5888e6329182e5c7786f3d546d3f51b77e827992805edfd1a226dcb2ba2a3f61a1ca53e16efe SHA512 04ef3a6c9f02344c9d211303422b3ceb71e41aa25a7e5f3f932a26fc7f842854adcbafc348ac35f3839d697df6e56186967e4d1308aefb53bd1785ecc11de8b9
-EBUILD vice-3.8-r1.ebuild 4310 BLAKE2B 52c13ff23db57e8e1fce487098a4d7341fcf3a88cda72d8eb0fa52156e3bfc02f06637597fe3f2f70ba7dca04c18331ac6d95f39b684c3a837d5f2016ef071fd SHA512 42103b03fccef4fd5c10fd599664fc995b0ddc8cce7d427fafeca60354b6b3c37d45e6d5eb81f250c252ef0c1236a72981ec27d78229a046311161cf9d4c048e
+EBUILD vice-3.8-r1.ebuild 4351 BLAKE2B 601573752e9f265ff093d8d510f2569c06e784d5b899951b0ef4c26e37f04493f57f393d09e79d76b5252d1460e2de4e0a281942cb5cc020e4df88e23118145c SHA512 0061c4f38df855de7e14cd73e8bda2d3996b25bb8be2f145c86801b4061cdbeb61e903d1b9a654916c93f969dbfb7e92beafd0f5b608453d786f8491a64d9589
 MISC metadata.xml 693 BLAKE2B 5b5c1b4ad182846cacfca3b347fe8601a993c1b78dc73b7e221353eba6591748075e92015d9dcc105e991b4268c453fed3aa699059bfe9e626e95c553cc3a78d SHA512 817ecc54419d93fb2bdcaac1c41a363937c495d8092a34ff4edb3f4db22522b5ec9757710d2f1447b4edd69343a226b1454e6cddd785a21b29151da0ef73b8bc
diff --git a/app-emulation/vice/vice-3.7.1.ebuild b/app-emulation/vice/vice-3.7.1.ebuild
deleted file mode 100644
index efd63d0a541a..000000000000
--- a/app-emulation/vice/vice-3.7.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multibuild toolchain-funcs xdg
-
-DESCRIPTION="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 ~arm ~arm64 x86"
-IUSE="
-	alsa debug doc ethernet ffmpeg flac gif +gtk headless 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
-# (see bug #834359 for the ffmpeg upper bound)
-RDEPEND="
-	virtual/libintl
-	alsa? ( media-libs/alsa-lib )
-	ethernet? (
-		net-libs/libpcap
-		sys-libs/libcap
-	)
-	ffmpeg? ( <media-video/ffmpeg-5:= )
-	flac? ( media-libs/flac:= )
-	gif? ( media-libs/giflib:= )
-	gtk? (
-		>=app-accessibility/at-spi2-core-2.46:2
-		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
-	)
-	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-libs/libpulse )
-	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
-	app-alternatives/lex
-	sys-devel/gettext
-	virtual/pkgconfig
-	app-alternatives/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 gtk3ui)
-		$(vice-multi_enable headless headlessui)
-		$(vice-multi_enable sdl sdl2ui)
-		$(usex debug $(vice-multi_enable gtk debug-gtk3ui) --disable-debug-gtk3ui)
-		$(use_enable debug)
-		$(use_enable doc pdf-docs)
-		$(use_enable ethernet)
-		$(use_enable ffmpeg)
-		$(use_enable lame)
-		$(use_enable openmp)
-		$(use_enable parport libieee1284)
-		$(use_enable parport parsid)
-		$(use_enable portaudio)
-		$(use_with alsa)
-		$(use_with flac)
-		$(use_with gif)
-		$(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))
-		$(usev !pci ac_cv_header_pci_pci_h=no)
-		--disable-arch
-		--disable-sdl1ui
-		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
-}
diff --git a/app-emulation/vice/vice-3.8-r1.ebuild b/app-emulation/vice/vice-3.8-r1.ebuild
index 36f76ca6a6e3..3a39bda48be4 100644
--- a/app-emulation/vice/vice-3.8-r1.ebuild
+++ b/app-emulation/vice/vice-3.8-r1.ebuild
@@ -157,7 +157,8 @@ multibuild_src_configure() {
 }
 
 src_compile() {
-	multibuild_foreach_variant run_in_build_dir emake
+	# bug #924116 wrt SHELL
+	multibuild_foreach_variant run_in_build_dir emake SHELL="${BASH}"
 }
 
 src_install() {