gentoo resync : 23.09.2020

3 files changed, 38 insertions, 30 deletions

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 01a618bf17b5..ec5874d91de3 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,6 +1,6 @@
-AUX vice-pkg-config.patch 825 BLAKE2B 6f46115866805299ba9354b9d15c3a766508ad1fe8aa82ac427a00d48ee2d1af41096bedeb7d3b579e704511164c37d55eeb7f00a39586f60737eb3ea394f043 SHA512 fe1e6b6d13012a4550336d716232418f5e1bf90ede4d4a36ad73244c7f957f641a425ccda50c5802c2e313e54081288da583c516a8689a18021b6e376fe18424
+AUX vice-pkg-config-3.4_p38553.patch 816 BLAKE2B 58fdde3647c520b12434b221197b91d363a65640fc72df27e991f783c8fbea2b2bf962fca00384fe673a577cc354aa03861482dfadb9de6f6afa91b48b673022 SHA512 cd6b6068a4e3c521bfbcf60986ae770a379d373723e005816ad599a9a199af973f75ef9b8806f486223d2017fa118eb3a814f5efb0e3eea81c7eadeaedc54d90
 DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb SHA512 5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
-DIST vice-emu-code-r37605-trunk-vice.zip 26854864 BLAKE2B 771728b69cb38492d086d199fcb56d19f14738bc6b5c3f0b1c9c6ffb07db0d2c2a3d631ed9f32a2abf0159d4e3e0d144c04e6ba13c22ce619ea1090f89b7b5cc SHA512 975c342d5ee7f72cc775bee711fed77fb6ce00bc15eef13403b9f3a457ac589d0089bcdf452507605bbf11d8806fceec94729becf1ef3fe66f6074854684d998
+DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f SHA512 c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86
 EBUILD vice-3.4_p37498.ebuild 4112 BLAKE2B 3e30d925e86759e7d35a05617102975e95ee15cda966645c724b30e72df7ba9233e84fb104e42c527038ccbca03ea9a959aef186d4cec9c5c514fd87a737a88f SHA512 65f9367778d826d487d0f6fea6f6faa3b09e86d6e1e82f526b4fc77739944c64ff1343c4afaceade3ca0f242084dc6d071c872909b060511352dfe6576397001
-EBUILD vice-3.4_p37605.ebuild 4164 BLAKE2B 5755811059b2e9e28568fcc72124be4ee82c7209a346d884d8d1d7e381f7e7d9edebc0eee11491a4e1812f28d75c9833627522ede919e01c9a9af8d69edbc708 SHA512 8e723ca5a8e508aafba773d85dd546976193bc97f3c690a0f86073a7ceecf5ec80e32710942f4305843dedcc479fe2eb9ff6d901131e2551f3c53ffb46fce542
+EBUILD vice-3.4_p38553.ebuild 4383 BLAKE2B 1c9a80163086c51601a9bdbb9cee04dfdb3311b2f4bd9430a6ace4a9223bb74daca0aac0d8c08fbe9b782d5b88356142bfda877778010f3372c08f51315ab8da SHA512 3a493f086914381019789e035caa6698f9cf1cd47c86d481502dcbadc6c9bfa1fdca7e77dc0381ca8b1085cc6d390ee43b968b1f2c7b62dcf73aa1ca1db3236a
 MISC metadata.xml 692 BLAKE2B d9f0e48aab3fb0ed8ccc7b044f561a96cd563eeeabfae63371cf4b3772a8068c2b4191c09d89465402a202496a2aac7234ffab8adbcc4c17be54ab0e0c9d307c SHA512 f7be3c1e6a6394452d3f7aac52b25ba0eeb098841ecac32bbcc92257a7f09430f9a18927234ba166014523eb7b930c66d803d9105025b79ac1dbebed781fec96
diff --git a/app-emulation/vice/files/vice-pkg-config.patch b/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch
index d29eff252fb5..557c0a927318 100644
--- a/app-emulation/vice/files/vice-pkg-config.patch
+++ b/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch
@@ -1,9 +1,9 @@
 https://sourceforge.net/p/vice-emu/patches/218/
 
-Index: configure.proto
+Index: configure.ac
 ===================================================================
---- a/configure.proto	(revision 37525)
-+++ b/configure.proto	(working copy)
+--- a/configure.ac	(revision 38502)
++++ b/configure.ac	(working copy)
 @@ -1275,6 +1275,14 @@
    fi
  
diff --git a/app-emulation/vice/vice-3.4_p37605.ebuild b/app-emulation/vice/vice-3.4_p38553.ebuild
index 23c94697352c..0c04ce33e086 100644
--- a/app-emulation/vice/vice-3.4_p37605.ebuild
+++ b/app-emulation/vice/vice-3.4_p38553.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multibuild
+inherit autotools multibuild xdg
 
 MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
 
@@ -32,7 +32,9 @@ RDEPEND="
 	gtk? (
 		dev-libs/glib:2
 		media-libs/fontconfig:1.0
+		x11-libs/cairo
 		x11-libs/gtk+:3
+		x11-libs/pango
 		opengl? (
 			media-libs/glew:0=
 			virtual/opengl
@@ -61,6 +63,7 @@ DEPEND="
 
 BDEPEND="
 	app-arch/unzip
+	app-text/dos2unix
 	dev-embedded/xa
 	dev-lang/perl
 	sys-apps/texinfo
@@ -75,7 +78,7 @@ S="${WORKDIR}/${MY_P}"
 ECONF_SOURCE="${S}"
 
 PATCHES=(
-	"${FILESDIR}"/vice-pkg-config.patch
+	"${FILESDIR}"/vice-pkg-config-${PV}.patch
 )
 
 src_prepare() {
@@ -84,8 +87,6 @@ src_prepare() {
 	# Delete some bundled libraries.
 	rm -r src/lib/lib{ffmpeg,lame,x264} || die
 
-	sed "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" < configure.proto > configure.ac || die
-
 	local DIR
 	for DIR in src/resid src/resid-dtv .; do
 		pushd "${DIR}" || die
@@ -118,9 +119,6 @@ multibuild_enable() {
 multibuild_src_configure() {
 	# Some dependencies lack configure options so prevent them becoming
 	# automagic by using configure cache variables.
-	use flac || export ac_cv_header_FLAC_stream_decoder_h=no
-	use mpg123 || export ac_cv_header_mpg123_h=no
-	use ogg || export ac_cv_header_vorbis_vorbisfile_h=no
 	use pci || export ac_cv_header_pci_pci_h=no
 
 	# Ensure we use giflib, not ungif.
@@ -135,31 +133,35 @@ multibuild_src_configure() {
 
 	econf \
 		--program-transform-name="${xform}" \
-		--disable-sdlui \
-		$(multibuild_enable sdl sdlui2) \
-		$(multibuild_enable gtk native-gtk3ui) \
+		--disable-arch \
+		$(use_enable debug) \
 		$(use_enable debug debug-gtk3ui) \
-		$(multibuild_enable headless headlessui) \
-		$(use_enable opengl hwscale) \
-		--disable-shared-ffmpeg \
-		--disable-static-ffmpeg \
 		$(use_enable ffmpeg external-ffmpeg) \
+		$(multibuild_enable headless headlessui) \
+		--enable-html-docs \
 		$(use_enable ethernet) \
+		$(use_enable opengl hwscale) \
 		$(use_enable ipv6) \
-		$(use_enable parport libieee1284) \
-		$(use_enable portaudio) \
 		$(use_enable lame) \
-		$(use_enable debug) \
-		--disable-arch \
+		$(use_enable parport libieee1284) \
+		$(multibuild_enable gtk native-gtk3ui) \
 		$(use_enable doc pdf-docs) \
-		--enable-html-docs \
-		$(use_with pulseaudio pulse) \
+		$(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 oss) \
+		$(use_with gif) \
 		$(use_with jpeg) \
+		$(use_with oss) \
 		$(use_with png) \
-		$(use_with gif) \
-		$(use_with zlib)
+		$(use_with pulseaudio pulse) \
+		$(use_with zlib) \
+		$(use_with mpg123) \
+		$(use_with ogg vorbis) \
+		$(use_with flac)
 }
 
 src_compile() {
@@ -167,7 +169,13 @@ src_compile() {
 }
 
 src_install() {
-	multibuild_foreach_variant run_in_build_dir default
+	# 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
 	dodoc FEEDBACK
 
 	# Delete the bundled fonts. These could be packaged separately but