gentoo Easter resync : 12.04.2020

4 files changed, 213 insertions, 2 deletions

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index cfd4babc832f..86c9c1ee70a8 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,7 +1,10 @@
 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 4168 BLAKE2B 90677d8d5d2514b3bf6b11645b073aafe9c5cddc4f49383c811110a3a7eea77b320a491735b7c81ef0c20ccb96f3b03e2eb7892c1ba7ae443b186c5971bf3236 SHA512 7038709746e7ea2f09fc2ac59f7d31fb1d4f341cde464c61397ef617e3bd8d5ae4c3daeed652abfb253559019d3be2fd235079f8114b96a865bc1bcfda039697
+EBUILD vice-3.4_p37498.ebuild 4167 BLAKE2B bd95c1a66547be7206be299f8a7f5c4b975d31825ae82fea5e3ad7032fb86a46cc8edd51670ae42bb952d6c44f097bacbdf01557cfaf34b465aaa429c7c48075 SHA512 00432a7c1d15b73cf902dcf19731ac0a2992c432b1ef001471b890b20fff3e78a4066a64f4c7d97e7220c5d9fef0283180e20d1a6df5effd0aaf59c40fc575a4
+EBUILD vice-3.4_p37605.ebuild 4218 BLAKE2B cf422c8347f23e492786b203912967ac1240e54ba1d5e79d9702ddb36c3d7c84227f0a978c3e9b32f6b877e2ef38f93b2ea86cfe7c8ca124dbd57a31d1face8b SHA512 dd7dd55f0552d406d6981d37fab577f2ecbf2d576a359d8a2cc3204a7669e96dc11501e9f8639c97d3bc61322c107a12b39ec5160b4d1246b98a86f4abeff1ae
 MISC metadata.xml 935 BLAKE2B 2be70fd66a8fad1d34e34e0c5c53cedae60d32ffdfe5fa9e715db1444994d1858af8f0fe5920a64b0088837b786a241842f9976d1385f8df6d8d6804e5c516cc SHA512 4911527e6659f4bb300931883552a2417e5e36555681a15fc97ac29a130ddff29b31e954922bf6b5f005d205141dfdc96e00030c2cb35258f5db2995136d01ad
diff --git a/app-emulation/vice/files/vice-pkg-config.patch b/app-emulation/vice/files/vice-pkg-config.patch
new file mode 100644
index 000000000000..d29eff252fb5
--- /dev/null
+++ b/app-emulation/vice/files/vice-pkg-config.patch
@@ -0,0 +1,29 @@
+https://sourceforge.net/p/vice-emu/patches/218/
+
+Index: configure.proto
+===================================================================
+--- a/configure.proto	(revision 37525)
++++ b/configure.proto	(working copy)
+@@ -1275,6 +1275,14 @@
+   fi
+ 
+   if test x"$found_sdl2" != "xyes"; then
++    PKG_CHECK_MODULES(SDL2, sdl2, [
++      use_sdl_prefix=no
++      use_sdl2_prefix=no
++      found_sdl2=yes
++      VICE_CFLAGS="$VICE_CFLAGS $SDL2_CFLAGS"
++      VICE_CXXFLAGS="$VICE_CXXFLAGS $SDL2_CFLAGS"
++      LIBS="$LIBS $SDL2_LIBS"
++    ], [
+     dnl Check for sdl2-config
+     if test x"$sdl2_config" != "xno"; then
+       user_CFLAGS="$CFLAGS"
+@@ -1311,6 +1319,7 @@
+       CFLAGS="$user_CFLAGS"
+       CXXFLAGS="$user_CXXFLAGS"
+     fi
++    ])
+   fi
+ 
+   dnl fail if SDL2 ui was requested, otherwise restore flags and continue
diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild b/app-emulation/vice/vice-3.4_p37498.ebuild
index e23e6deb107f..2971e5b5d0a4 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 )"
 
diff --git a/app-emulation/vice/vice-3.4_p37605.ebuild b/app-emulation/vice/vice-3.4_p37605.ebuild
new file mode 100644
index 000000000000..46da78904065
--- /dev/null
+++ b/app-emulation/vice/vice-3.4_p37605.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multibuild
+
+MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
+
+DESCRIPTION="The Versatile Commodore Emulator"
+HOMEPAGE="http://vice-emu.sourceforge.net/"
+#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+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 )"
+
+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
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:= )
+	)
+	flac? ( media-libs/flac )
+	gif? ( media-libs/giflib:= )
+	gtk? (
+		dev-libs/glib:2
+		media-libs/fontconfig:1.0
+		x11-libs/gtk+:3
+		opengl? (
+			media-libs/glew:0=
+			virtual/opengl
+		)
+	)
+	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:0= )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2[video] )
+	zlib? ( sys-libs/zlib )
+"
+
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+BDEPEND="
+	app-arch/unzip
+	dev-embedded/xa
+	dev-lang/perl
+	sys-apps/texinfo
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	virtual/yacc
+	doc? ( virtual/texi2dvi )
+"
+
+S="${WORKDIR}/${MY_P}"
+ECONF_SOURCE="${S}"
+
+PATCHES=(
+	"${FILESDIR}"/vice-pkg-config.patch
+)
+
+src_prepare() {
+	default
+
+	# 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
+		AT_NO_RECURSIVE=1 eautoreconf
+		popd || die
+	done
+
+	# 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)
+	)
+
+	multibuild_foreach_variant run_in_build_dir multibuild_src_configure
+}
+
+multibuild_enable() {
+	if [[ ${MULTIBUILD_VARIANT} == $1 ]]; then
+		printf -- "--enable-%s\n" "$2"
+	else
+		printf -- "--disable-%s\n" "$2"
+	fi
+}
+
+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.
+	export ac_cv_lib_ungif_EGifPutLine=no
+
+	# Append ".variant" to x* programs if building multiple variants.
+	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+		xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
+	else
+		unset xform
+	fi
+
+	econf \
+		--program-transform-name="${xform}" \
+		--disable-sdlui \
+		$(multibuild_enable sdl sdlui2) \
+		$(multibuild_enable gtk native-gtk3ui) \
+		$(use_enable debug debug-gtk3ui) \
+		$(multibuild_enable headless headlessui) \
+		$(use_enable opengl hwscale) \
+		--disable-shared-ffmpeg \
+		--disable-static-ffmpeg \
+		$(use_enable ffmpeg external-ffmpeg) \
+		$(use_enable ethernet) \
+		$(use_enable ipv6) \
+		$(use_enable parport libieee1284) \
+		$(use_enable portaudio) \
+		$(use_enable lame) \
+		$(use_enable debug) \
+		--disable-arch \
+		$(use_enable doc pdf-docs) \
+		--enable-html-docs \
+		$(use_with pulseaudio pulse) \
+		$(use_with alsa) \
+		$(use_with oss) \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with gif) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir emake
+}
+
+src_install() {
+	multibuild_foreach_variant run_in_build_dir default
+	dodoc FEEDBACK
+
+	# 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
+}