gentoo resync : 25.04.2020

6 files changed, 3 insertions, 266 deletions

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 86c9c1ee70a8..e79872e319af 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,10 +1,6 @@
-AUX vice-2.4.27-autotools.patch 353 BLAKE2B 01b25d40ad4dd621e32896b0c7f30715fcf0ea7cce8bffdb742caf241ebb0ed7c7d0d40c2cea852640f8b0e4d84bac1d5a87653c9641a33acd8f177a39130c80 SHA512 10ba3f9f9c0e69f34ea3ab361b198826b7055586e2dade320a60c1a1e429797d2eaf1554b1e9fde63f8ddb23bd4a9b8fb24d3f9692433b6b6d043d09761924d3
-AUX vice-3.1-ffmpeg4.patch 1971 BLAKE2B 6fcf4f8ddb3cb26727075483f8e17f8b07a22c081440356abdd733a91a41908a4d4344ad4aa2839bf79fc123a8e342d026a93e9d37bbef550ea3a6ee6dcf6741 SHA512 3240ab6287131813a56ac2c64613b5ea93560f0b0ed572b042aeed47594e7bb7c6b03e36edaee4efdc5350533dbde8adb10451658406ef9998c3c5742e08233c
 AUX vice-pkg-config.patch 825 BLAKE2B 6f46115866805299ba9354b9d15c3a766508ad1fe8aa82ac427a00d48ee2d1af41096bedeb7d3b579e704511164c37d55eeb7f00a39586f60737eb3ea394f043 SHA512 fe1e6b6d13012a4550336d716232418f5e1bf90ede4d4a36ad73244c7f957f641a425ccda50c5802c2e313e54081288da583c516a8689a18021b6e376fe18424
-DIST vice-3.1.tar.gz 30714226 BLAKE2B 75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e SHA512 bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
 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
-EBUILD vice-3.1.ebuild 4061 BLAKE2B 043e0115b7e39e73da029034bf2cf5b851c4391850ecf7bdf17634629a1e6d65537775543457fc2b2e56e56ef0795c65791d8cf16af049cf58e8fe2153f0fbe8 SHA512 18571cc5a39baf5b1a224972adbfeb0ee8aec612c00eaf7c5cebfeabc606424ebdef21d75822a5f803b1c0ca353577596a3bcb3fa621570c7d97e1bbbb17a738
-EBUILD vice-3.4_p37498.ebuild 4167 BLAKE2B bd95c1a66547be7206be299f8a7f5c4b975d31825ae82fea5e3ad7032fb86a46cc8edd51670ae42bb952d6c44f097bacbdf01557cfaf34b465aaa429c7c48075 SHA512 00432a7c1d15b73cf902dcf19731ac0a2992c432b1ef001471b890b20fff3e78a4066a64f4c7d97e7220c5d9fef0283180e20d1a6df5effd0aaf59c40fc575a4
+EBUILD vice-3.4_p37498.ebuild 4166 BLAKE2B 8bb99120020c12260e811927071e425e4ec4be00fd0b6cd962d9b9404afc799723b3d52b04c771bba52fcf00e908905cd5318ff1a7f663c5ef01655885f3d3a9 SHA512 2989578734dcabe8700af3e1b19384e4b8e17df82ded0e0a6a9708299a3ba008b8f50d6b5e3309f47dc163f2ec4bf7c90aaf0d256e3bde6ef3258509d747b9a5
 EBUILD vice-3.4_p37605.ebuild 4218 BLAKE2B cf422c8347f23e492786b203912967ac1240e54ba1d5e79d9702ddb36c3d7c84227f0a978c3e9b32f6b877e2ef38f93b2ea86cfe7c8ca124dbd57a31d1face8b SHA512 dd7dd55f0552d406d6981d37fab577f2ecbf2d576a359d8a2cc3204a7669e96dc11501e9f8639c97d3bc61322c107a12b39ec5160b4d1246b98a86f4abeff1ae
-MISC metadata.xml 935 BLAKE2B 2be70fd66a8fad1d34e34e0c5c53cedae60d32ffdfe5fa9e715db1444994d1858af8f0fe5920a64b0088837b786a241842f9976d1385f8df6d8d6804e5c516cc SHA512 4911527e6659f4bb300931883552a2417e5e36555681a15fc97ac29a130ddff29b31e954922bf6b5f005d205141dfdc96e00030c2cb35258f5db2995136d01ad
+MISC metadata.xml 692 BLAKE2B d9f0e48aab3fb0ed8ccc7b044f561a96cd563eeeabfae63371cf4b3772a8068c2b4191c09d89465402a202496a2aac7234ffab8adbcc4c17be54ab0e0c9d307c SHA512 f7be3c1e6a6394452d3f7aac52b25ba0eeb098841ecac32bbcc92257a7f09430f9a18927234ba166014523eb7b930c66d803d9105025b79ac1dbebed781fec96
diff --git a/app-emulation/vice/files/vice-2.4.27-autotools.patch b/app-emulation/vice/files/vice-2.4.27-autotools.patch
deleted file mode 100644
index 7bebd2800ef6..000000000000
--- a/app-emulation/vice/files/vice-2.4.27-autotools.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vice-2.4.7.orig/configure.ac
-+++ vice-2.4.7/configure.ac
-@@ -124,7 +118,7 @@
- AC_SUBST(VICE_VERSION)
- 
- AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS(src/config.h)
- 
- if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
-   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"
diff --git a/app-emulation/vice/files/vice-3.1-ffmpeg4.patch b/app-emulation/vice/files/vice-3.1-ffmpeg4.patch
deleted file mode 100644
index d232ee22337e..000000000000
--- a/app-emulation/vice/files/vice-3.1-ffmpeg4.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/src/gfxoutputdrv/ffmpegdrv.c
-+++ b/src/gfxoutputdrv/ffmpegdrv.c
-@@ -46,6 +46,13 @@
- #include "util.h"
- #include "soundmovie.h"
- 
-+/** \brief  Helper macro to determine ffmpeg version
-+ */
-+#if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR >= 18)
-+# define HAVE_FFMPEG4
-+#endif
-+
-+
- static gfxoutputdrv_codec_t avi_audio_codeclist[] = {
-     { AV_CODEC_ID_MP2, "MP2" },
-     { AV_CODEC_ID_MP3, "MP3" },
-@@ -354,7 +361,11 @@
-     }
- 
-     audio_is_open = 1;
-+#ifdef HAVE_FFMPEG4
-+    if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
-+#else
-     if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
-+#endif
-         audio_inbuf_samples = 10000;
-     } else {
-         audio_inbuf_samples = c->frame_size;
-@@ -447,8 +458,13 @@
-     audio_st.samples_count = 0;
- 
-     /* Some formats want stream headers to be separate. */
--    if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER)
-+    if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
-+#ifdef HAVE_FFMPEG4
-+        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+#else
-         c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+#endif
-+    }
- 
-     /* create resampler context */
- #ifndef HAVE_FFMPEG_AVRESAMPLE
-@@ -781,7 +797,11 @@
- 
-     /* Some formats want stream headers to be separate. */
-     if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
-+#ifdef HAVE_FFMPEG4
-+        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+#else
-         c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+#endif
-     }
- 
-     if (audio_init_done) {
-@@ -961,6 +981,7 @@
- 
-     video_st.frame->pts = video_st.next_pts++;
- 
-+#ifdef AVFMT_RAWPICTURE
-     if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
-         AVPacket pkt;
-         VICE_P_AV_INIT_PACKET(&pkt);
-@@ -971,7 +992,9 @@
-         pkt.pts = pkt.dts = video_st.frame->pts;
- 
-         ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt);
--    } else {
-+    } else
-+#endif
-+    {
-         AVPacket pkt = { 0 };
-         int got_packet;
- 
diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 8ff137c8c207..2294b11c8d08 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -7,13 +7,10 @@
 	</maintainer>
 	<use>
 		<flag name="ethernet">Enable ethernet emulation</flag>
-		<flag name="fullscreen">Enable the ability to run fullscreen</flag>
 		<flag name="headless">Include the headless variant of the emulator</flag>
 		<flag name="mpg123">Enable mp3@64 cartridge support</flag>
 		<flag name="parport">Enable parallel port SID support</flag>
 		<flag name="pci">Enable PCI device discovery using <pkg>sys-apps/pciutils</pkg></flag>
-		<flag name="sdlsound">Use <pkg>media-libs/libsdl</pkg> for sound support</flag>
-		<flag name="vte">Enable support for <pkg>x11-libs/vte</pkg> in the GTK+ interface</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">vice-emu</remote-id>
diff --git a/app-emulation/vice/vice-3.1.ebuild b/app-emulation/vice/vice-3.1.ebuild
deleted file mode 100644
index 083344470e3c..000000000000
--- a/app-emulation/vice/vice-3.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Versatile Commodore 8-bit Emulator"
-HOMEPAGE="http://vice-emu.sourceforge.net/"
-SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa ethernet ffmpeg fullscreen +gtk ipv6 lame libav nls oss png pulseaudio sdl +sdlsound threads vte Xaw3d zlib"
-
-# upstream says gtk3 and sdl2 shouldn't be exposed yet.
-#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
-REQUIRED_USE="?? ( gtk sdl )"
-
-#	gtk3? (
-#		x11-libs/cairo
-#		x11-libs/gtk+:3
-#		x11-libs/pango
-#		vte? ( x11-libs/vte:2.90 )
-#	)
-RDEPEND="
-	media-libs/giflib
-	virtual/jpeg:0
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	ethernet? (
-	    >=net-libs/libpcap-0.9.8
-	    >=net-libs/libnet-1.1.2.1:1.1
-	)
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:= )
-	)
-	gtk? (
-		x11-libs/cairo
-		x11-libs/gtk+:2
-		x11-libs/gtkglext
-		x11-libs/pango
-		vte? ( x11-libs/vte:0 )
-	)
-	lame? ( media-sound/lame )
-	nls? ( virtual/libintl )
-	png? ( media-libs/libpng:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl[joystick,video] )
-	!sdl? (
-		sys-libs/readline:0=
-		x11-libs/libX11
-		x11-libs/libXext
-		fullscreen? (
-			x11-libs/libXrandr
-			x11-libs/libXxf86vm
-		)
-		!gtk? (
-			x11-libs/libXmu
-			x11-libs/libXpm
-			x11-libs/libXt
-			x11-libs/libXv
-			Xaw3d? ( x11-libs/libXaw3d )
-			!Xaw3d? ( x11-libs/libXaw )
-		)
-	)
-	sdlsound? ( media-libs/libsdl[sound] )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	media-libs/fontconfig
-	x11-apps/bdftopcf
-	>=x11-apps/mkfontscale-1.2.0
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	!gtk? ( !sdl? (
-			x11-libs/libICE
-			x11-libs/libSM
-	) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.27-autotools.patch
-	"${FILESDIR}"/${P}-ffmpeg4.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's/building//' \
-		doc/Makefile.am || die
-	sed -i \
-		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
-		doc/Makefile.am \
-		doc/readmes/Makefile.am || die
-	sed -i \
-		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
-		doc/html/Makefile.am || die
-	sed -i \
-		-e "s:/usr/local/lib/VICE:/usr/$(get_libdir)/${PN}:" \
-		man/vice.1 \
-		$(grep -rl --exclude="*texi" /usr/local/lib doc) || die
-	sed -i \
-		-e "/VICEDIR=/s:=.*:=\"/usr/$(get_libdir)/${PN}\";:" \
-		configure.ac || die
-	sed -i \
-		-e "s:\(#define LIBDIR \).*:\1\"/usr/$(get_libdir)/${PN}\":" \
-		-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
-		src/arch/unix/archdep.h \
-		src/arch/sdl/archdep_unix.h || die
-	rm -rf src/lib/{libffmpeg,liblame} || die
-	sed -i \
-		-e '/SUBDIRS/s/libffmpeg//;' \
-		-e '/SUBDIRS/s/liblame//;' \
-		src/lib/Makefile.am || die
-	AT_NO_RECURSIVE=1 eautoreconf
-}
-
-src_configure() {
-	local gui_arg=() snd_arg=()
-
-	snd_arg+=( $(use_with alsa) )
-	snd_arg+=( $(use_with oss) )
-	snd_arg+=( $(use_with pulseaudio pulse) )
-	snd_arg+=( $(use_with sdlsound) )
-
-	gui_arg+=( $(use_enable sdl sdlui) )
-	# The gtk UI code has raw calls to XOpenDisplay and
-	# is missing -lX11 if vte doesn't pull it in.
-	#if use gtk2 || use gtk3 ; then
-	if use gtk ; then
-		use vte || append-libs -lX11
-	fi
-	gui_arg+=( $(use_enable gtk gnomeui) )
-	#gui_arg+=" $(use_enable gtk3 gnomeui3)"
-	gui_arg+=( $(use_enable Xaw3d xaw3d) )
-
-	# --with-readline is forced to avoid using the embedded copy
-	# don't try to actually run fc-cache (bug #280976)
-	FCCACHE=/bin/true \
-	PKG_CONFIG=$(tc-getPKG_CONFIG) \
-	econf \
-		--enable-parsid \
-		--with-resid \
-		--with-readline \
-		--without-arts \
-		--without-midas \
-		$(use_enable ethernet) \
-		$(use_enable ffmpeg) \
-		$(use_enable ffmpeg external-ffmpeg) \
-		$(use_enable fullscreen) \
-		$(use_enable ipv6) \
-		$(use_enable lame) \
-		$(use_enable nls) \
-		$(use_enable vte) \
-		$(use_with png) \
-		$(use_with threads uithreads) \
-		$(use_with zlib) \
-		"${gui_arg[@]}" \
-		"${snd_arg[@]}" \
-		--disable-option-checking
-		# --disable-option-checking has to be last
-}
-
-src_install() {
-	default
-	dodoc FEEDBACK
-}
diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild b/app-emulation/vice/vice-3.4_p37498.ebuild
index 2971e5b5d0a4..9e9f6f6462e5 100644
--- a/app-emulation/vice/vice-3.4_p37498.ebuild
+++ b/app-emulation/vice/vice-3.4_p37498.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame libav mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"