gentoo resync : 24.06.2021

3 files changed, 73 insertions, 63 deletions

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 8387dc32ef3f..102fd5be30fa 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -2,5 +2,5 @@ AUX vice-pkg-config-3.4_p38553.patch 816 BLAKE2B 58fdde3647c520b12434b221197b91d
 DIST vice-3.5.tar.gz 22557578 BLAKE2B 5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e SHA512 02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
 DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f SHA512 c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86
 EBUILD vice-3.4_p38553.ebuild 4410 BLAKE2B ea6539484a88baac8d3d98bbff3c4f589c4bac49c76586496b8453e7b1cfa5c402ff5a1e7a029483da5cf07d78006bc35a3557a67a63230bc85a8b12f3f469d6 SHA512 dd7a3ad05ceb453a71667e0628d8d925b03c864d07c90857d283e5737e0105895222f6bf635c28f0274c005c1f03324dfffef57610b9f32c031b76e2782339eb
-EBUILD vice-3.5.ebuild 4015 BLAKE2B 9adc021bc264199396fc505786c00e9c2451b872098ed452fa9b6a820de6458ad70b0086f096d2047050ef0a3b327f9c8cc13af3a21e52b31f9cba812f3e99ea SHA512 9247e5c670cf9bc5686a8afaa9d3098d8549e5711d205adaa40b89b84f20414fb3738eeecaf7672f28e0e00828ba47daf6e0806ece2caff3c6a766bc20cffc98
-MISC metadata.xml 692 BLAKE2B d9f0e48aab3fb0ed8ccc7b044f561a96cd563eeeabfae63371cf4b3772a8068c2b4191c09d89465402a202496a2aac7234ffab8adbcc4c17be54ab0e0c9d307c SHA512 f7be3c1e6a6394452d3f7aac52b25ba0eeb098841ecac32bbcc92257a7f09430f9a18927234ba166014523eb7b930c66d803d9105025b79ac1dbebed781fec96
+EBUILD vice-3.5.ebuild 4094 BLAKE2B 466b405315ac250de41388a96b060f9b3a781dfbda835ee071dea7a1565b3b454dfb448cc5ccec5f7d7dba9570ea65c25d7700b1ffb2e486250bd8e2479d0b43 SHA512 b9fce3160d93891730afa5b87a267b9ead102b953ce241a61fd7c235e1894ec27f16c09b606c532dbf4e1e9608281a8f477fb7237c13cd239f88c2c3d184ba93
+MISC metadata.xml 784 BLAKE2B 928003d105108e670de7df0139ddf49acc5410f358c893518303eac0d3c4f2be1461210112aedf8915c6f876310c281e7ed76be9f517048c36c96b38860d9353 SHA512 e893b34f28c62154261681c6e4010c4cac64eddc8ab3ab71f13879e2777fc94381d92857ff86b53cffac3755aabbb0a6ea383191f2603cdb62490861e3cb724f
diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 2294b11c8d08..331360dc2169 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
+		<flag name="cpuhistory">Enable 65xx CPU history support (may decrease performance)</flag>
 		<flag name="ethernet">Enable ethernet emulation</flag>
 		<flag name="headless">Include the headless variant of the emulator</flag>
 		<flag name="mpg123">Enable mp3@64 cartridge support</flag>
diff --git a/app-emulation/vice/vice-3.5.ebuild b/app-emulation/vice/vice-3.5.ebuild
index a24aa9633576..4518b5ff92ff 100644
--- a/app-emulation/vice/vice-3.5.ebuild
+++ b/app-emulation/vice/vice-3.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multibuild xdg
+inherit multibuild toolchain-funcs xdg
 
 DESCRIPTION="The Versatile Commodore Emulator"
 HOMEPAGE="https://vice-emu.sourceforge.io/"
@@ -12,16 +12,21 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss parport pci png portaudio pulseaudio sdl zlib"
-REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
+IUSE="
+	alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless
+	ipv6 jpeg lame mpg123 ogg oss parport pci png portaudio pulseaudio
+	sdl zlib"
+REQUIRED_USE="
+	|| ( gtk headless sdl )
+	gtk? ( zlib )"
 
 RDEPEND="
 	sys-libs/readline:0=
 	virtual/libintl
 	alsa? ( media-libs/alsa-lib )
 	ethernet? (
-		>=net-libs/libpcap-0.9.8
 		>=net-libs/libnet-1.1.2.1:1.1
+		>=net-libs/libpcap-0.9.8
 	)
 	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac )
@@ -30,17 +35,17 @@ RDEPEND="
 		dev-libs/glib:2
 		media-libs/fontconfig:1.0
 		media-libs/glew:0=
+		virtual/opengl
 		x11-libs/cairo
 		x11-libs/gtk+:3
 		x11-libs/pango
-		virtual/opengl
 	)
 	jpeg? ( virtual/jpeg )
 	lame? ( media-sound/lame )
 	mpg123? ( media-sound/mpg123 )
 	ogg? (
-		 media-libs/libogg
-		 media-libs/libvorbis
+		media-libs/libogg
+		media-libs/libvorbis
 	)
 	parport? ( sys-libs/libieee1284 )
 	pci? ( sys-apps/pciutils )
@@ -51,14 +56,10 @@ RDEPEND="
 		media-libs/libsdl2[video]
 		media-libs/sdl2-image
 	)
-	zlib? ( sys-libs/zlib )
-"
-
+	zlib? ( sys-libs/zlib )"
 DEPEND="
 	${RDEPEND}
-	x11-base/xorg-proto
-"
-
+	x11-base/xorg-proto"
 BDEPEND="
 	app-arch/unzip
 	app-text/dos2unix
@@ -70,10 +71,7 @@ BDEPEND="
 	virtual/pkgconfig
 	virtual/yacc
 	doc? ( virtual/texi2dvi )
-	gtk? ( x11-misc/xdg-utils )
-"
-
-ECONF_SOURCE="${S}"
+	gtk? ( x11-misc/xdg-utils )"
 
 src_prepare() {
 	default
@@ -83,71 +81,80 @@ src_prepare() {
 
 	# Strip the predefined C(XX)FLAGS.
 	sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
-}
 
-src_configure() {
 	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_enable() {
-	if [[ ${MULTIBUILD_VARIANT} == $1 ]]; then
-		printf -- "--enable-%s\n" "$2"
+	if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then
+		echo --enable-${2}
 	else
-		printf -- "--disable-%s\n" "$2"
+		echo --disable-${2}
 	fi
 }
 
 multibuild_src_configure() {
-	# Some dependencies lack configure options so prevent them becoming
-	# automagic by using configure cache variables.
-	use pci || export ac_cv_header_pci_pci_h=no
-
-	# Ensure we use giflib, not ungif.
-	export ac_cv_lib_ungif_EGifPutLine=no
-
 	# Append ".variant" to x* programs if building multiple variants.
+	local xform
 	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
 		xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
-	else
-		unset xform
 	fi
 
-	econf \
-		--program-transform-name="${xform}" \
-		--disable-arch \
-		$(use_enable debug) \
-		$(use_enable debug debug-gtk3ui) \
-		$(use_enable ffmpeg external-ffmpeg) \
-		$(multibuild_enable headless headlessui) \
-		--enable-html-docs \
-		$(use_enable ethernet) \
-		$(use_enable ipv6) \
-		$(use_enable lame) \
-		$(use_enable parport libieee1284) \
-		$(multibuild_enable gtk native-gtk3ui) \
-		$(use_enable doc pdf-docs) \
-		$(use_enable portaudio) \
-		--disable-sdlui \
-		$(multibuild_enable sdl sdlui2) \
-		--disable-shared-ffmpeg \
-		--disable-static-ffmpeg \
-		$(multibuild_enable gtk desktop-files) \
-		$(use_with alsa) \
-		$(use_with gif) \
-		$(use_with jpeg) \
-		$(use_with oss) \
-		$(use_with png) \
-		$(use_with pulseaudio pulse) \
-		$(use_with zlib) \
-		$(use_with mpg123) \
-		$(use_with ogg vorbis) \
+	local econfargs=(
+		--program-transform-name="${xform}"
+		$(multibuild_enable gtk desktop-files)
+		$(multibuild_enable gtk native-gtk3ui)
+		$(multibuild_enable headless headlessui)
+		$(multibuild_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 ipv6)
+		$(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)
+		--disable-arch
+		--disable-sdlui
+		--disable-shared-ffmpeg
+		--disable-static-ffmpeg
+		--enable-html-docs
+
+		# Some dependencies lack configure options so prevent them becoming
+		# automagic by using configure cache variables.
+		$(usex pci '' ac_cv_header_pci_pci_h=no)
+
+		# Ensure we use giflib, not ungif.
+		ac_cv_lib_ungif_EGifPutLine=no
+	)
+
+	econf "${econfargs[@]}"
 }
 
 src_compile() {
@@ -157,13 +164,15 @@ src_compile() {
 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
+	rm -r "${ED}"/usr/share/doc/${PF}/html/fonts || die
 }