gentoo resync : 24.03.2019

4 files changed, 108 insertions, 42 deletions

diff --git a/app-emulation/e-uae/Manifest b/app-emulation/e-uae/Manifest
index 4f2f56847787..68cc0597acfa 100644
--- a/app-emulation/e-uae/Manifest
+++ b/app-emulation/e-uae/Manifest
@@ -1,4 +1,6 @@
 AUX e-uae-0.8.29_rc4-high-cpu-usage.patch 399 BLAKE2B 0b8d1126bafe49ecf1ca03c23efe51287a8b8b565084560caae054f2997d61c86f248e2bca3b511bf6e283fed8c47639d5ea266a147acc77cbb4b1cabc3b7f94 SHA512 a0d6dbe9dedbabb7700e2199d62814732a0d6f09be7758aa70565ba4d4cc1a86d848e3a9b5c743871a0052ee1b19b03615ee38a174634c7a339d218bab350b18
+AUX e-uae-0.8.29_rc4-no_schily.patch 708 BLAKE2B 8a67650e1b939149cc0e701538e15eb9e2ff85cce3c046a47210f82f5c3117b9d95e55b0ef2f0ab2ee0cc428b21d1b3b1afc4a3b6317eb9a88682bf7b571d422 SHA512 6f8bf99d031eb1f7363dd42a1cbea75689671dbde3782c76beb7e437c7f52b2daeea85cf39a819e586f4dd04c43df46d16a299409e99a8160e9750c7a336a3cd
+AUX e-uae-0.8.29_rc4-tinfo.patch 590 BLAKE2B f502517a50e3c61cafcfd2903b909e0fed7942877ff89e315f1ad0bb790fae6d293b242f5e1dc2897fea88e403e9a718bd01380b4c934287d2439979eb6cf95e SHA512 b5cad73be7a804f80ff5e73eba73c8d777ea5fb18ff829c3efe89ee4914bb08cfb87882b281b95d9a2a88967f2adf18971cc643a8442425c95d9f5d6cff35389
 DIST e-uae-0.8.29-WIP4.tar.bz2 1122718 BLAKE2B 4120e7d14e4ee1a8be04839680c30dc57286524a68eb8036a8f48a0724c3581884045c2ad11bb8409a88b2f43bd132b92083e1e1cc088c5b4768f3b6dfdef458 SHA512 63d5c60ca017ba7ffaba32c4d7edceba0410b773066cc58e226c8cc2c92152eb3689698b0affe478cc63c996c731fbbf56d9028dfd000394d904f193f860473f
-EBUILD e-uae-0.8.29_rc4-r3.ebuild 4150 BLAKE2B 4f58a33bff8d386a8e15c98484fea0360f415e549f1d1701fe94c00f9fa001b0a3a84fec8ddb81924a2b73ab8328f0893b5a79b49a08e4dfa6e451f4e5ca2beb SHA512 7e0c65952d5163d5f44412834f3f73c529c874c0d8e88ca25121f8eff5cbe4fb864a82ebc462dd5c06fedfeb85a4e7777683764c97b3765b3c8e997c384961ca
+EBUILD e-uae-0.8.29_rc4-r3.ebuild 4143 BLAKE2B e372b1609cbcab1854280f232f1d059d066bb6eedd818f14bb5556d34fc6c7fc18cc03ca5f080ec7e61904eba1eca551a089bf960403421afbdfd5531a17b442 SHA512 51fd795cb83a6a4ef4c57472e40fffd14e42630e395ed202e4024524723bd00721dd90238f4dcf0238bf7904b2ccb9c0a9fc3fffa847496a1109998601f0a255
 MISC metadata.xml 465 BLAKE2B ddab23755d4ac531a0963f024bd4aff9b727f94a3aed47184a32a7e6f6c0b6b9d441c74cccd29028e831c9f290c8539a263317cc0e0d23928932a2f68c576429 SHA512 d66cf721c85633855983c22d2fd18e75635afe1fdd987b12a35f23caf1acb241398815ae643682864d3cd5099983b9b9c7581828ccd4668aca9d5b56fe9a8a00
diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
index 63d99f142b49..27993eabc591 100644
--- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
+++ b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit flag-o-matic pax-utils
+inherit autotools flag-o-matic pax-utils
 
 DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE"
 HOMEPAGE="http://www.rcdrummond.net/uae/"
@@ -28,92 +28,114 @@ IUSE="X dga ncurses sdl alsa oss sdl-sound capslib"
 
 # Note: opposed to ./configure --help zlib support required! Check
 # src/Makefile.am that includes zfile.c unconditionaly.
-RDEPEND="X? ( x11-libs/libXt
-			 x11-libs/libxkbfile
-			 x11-libs/libXext
-			 x11-misc/xkeyboard-config
-			 dga? ( x11-libs/libXxf86dga
-				    x11-libs/libXxf86vm )
-			)
-		!X? ( sdl? ( media-libs/libsdl )
-			  !sdl? ( sys-libs/ncurses:0= ) )
-		alsa? ( media-libs/alsa-lib )
-		!alsa? ( sdl-sound? ( media-libs/sdl-sound ) )
-		capslib? ( >=games-emulation/caps-20060612 )
-		sys-libs/zlib
-		virtual/cdrtools"
+RDEPEND="
+	sys-libs/zlib
+	virtual/cdrtools
+	X? (
+		x11-libs/libXt
+		x11-libs/libxkbfile
+		x11-libs/libXext
+		x11-misc/xkeyboard-config
+		dga? (
+			x11-libs/libXxf86dga
+			x11-libs/libXxf86vm
+		)
+	)
+	!X? (
+		sdl? ( media-libs/libsdl )
+		!sdl? ( sys-libs/ncurses:0= )
+	)
+	alsa? ( media-libs/alsa-lib )
+	!alsa? ( sdl-sound? ( media-libs/sdl-sound ) )
+	capslib? ( >=games-emulation/caps-20060612 )
+"
 
 DEPEND="${RDEPEND}
-		X? ( dga? ( x11-base/xorg-proto ) )"
+	X? ( dga? ( x11-base/xorg-proto ) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tinfo.patch #527628
+	"${FILESDIR}"/${P}-no_schily.patch
+)
 
 src_prepare() {
 	default
 	# Fix for high cpu use when compiled with --disable-audio
-	use alsa || use sdl-sound || use oss || eapply "${FILESDIR}"/${P}-high-cpu-usage.patch
+	if ! use alsa && ! use sdl-sound && ! use oss ; then
+		eapply "${FILESDIR}"/${P}-high-cpu-usage.patch
+	fi
+	eautoreconf #527628
 }
 
 src_configure() {
 	strip-flags
 
-	local myconf
+	local myconf=()
 
 	# Sound setup.
 	if use alsa; then
 		elog "Choosing alsa as sound target to use."
-		myconf="--with-alsa --without-sdl-sound"
+		myconf=( --with-alsa --without-sdl-sound )
 	elif use sdl-sound ; then
 		if ! use sdl ; then
 			ewarn "sdl-sound is not enabled because sdl USE flag is disabled. Leaving"
 			ewarn "sound on oss autodetection."
-			myconf="--without-alsa --without-sdl-sound"
+			myconf=( --without-alsa --without-sdl-sound )
 		else
 			elog "Choosing sdl-sound as sound target to use."
 			ewarn "E-UAE with the SDL audio back-end doesn't work correctly in Linux."
 			ewarn "Better use alsa... You've been warned ;)"
-			myconf="--without-alsa --with-sdl-sound"
+			myconf=( --without-alsa --with-sdl-sound )
 		fi
 	elif use oss ; then
 		elog "Choosing oss as sound target to use."
 		ewarn "oss will be autodetected. See output of configure."
-		myconf="--without-alsa --without-sdl-sound"
+		myconf=( --without-alsa --without-sdl-sound )
 	else
 		ewarn "There is no alsa, sdl-sound or oss in USE. Sound target disabled!"
-		myconf="--disable-audio"
+		myconf=( --disable-audio )
 	fi
 
 	# VIDEO setup. X is autodetected (there is no --with-X option).
 	if use X ; then
 		elog "Using X11 for video output."
 		ewarn "Fullscreen mode is not working in X11 currently. Use sdl."
-		myconf="$myconf --without-curses --without-sdl-gfx"
+		myconf+=( --without-curses --without-sdl-gfx )
 		use dga && ewarn "To use dga you have to run e-uae as root."
-		use dga && myconf="$myconf --enable-dga --enable-vidmode"
+		use dga && myconf+=( --enable-dga --enable-vidmode )
 	elif use sdl ; then
 		elog "Using sdl for video output."
-		myconf="$myconf --with-sdl --with-sdl-gfx --without-curses"
+		myconf+=( --with-sdl --with-sdl-gfx --without-curses )
 	elif use ncurses; then
 		elog "Using ncurses for video output."
-		myconf="$myconf --with-curses --without-sdl-gfx"
+		myconf+=( --with-curses --without-sdl-gfx )
 	else
 		ewarn "There is no X or sdl or ncurses in USE!"
 		ewarn "Following upstream falling back on ncurses."
-		myconf="$myconf --with-curses --without-sdl-gfx"
+		myconf+=( --with-curses --without-sdl-gfx )
 	fi
 
 	# bug #415787
-	myconf="$myconf --disable-ui"
+	myconf+=(
+		--disable-ui
+		$(use_with capslib caps)
+		--with-zlib
 
-	myconf="$myconf $(use_with capslib caps)"
+		# And explicitly state defaults:
+		--enable-aga
 
-	myconf="$myconf --with-zlib"
+		--enable-autoconfig
+		--enable-scsi-device
+		--enable-cdtv
+		--enable-cd32
 
-	# And explicitly state defaults:
-	myconf="$myconf --enable-aga"
-	myconf="$myconf --enable-autoconfig --enable-scsi-device --enable-cdtv --enable-cd32"
-	myconf="$myconf --enable-bsdsock"
+		--enable-bsdsock
 
-	econf ${myconf} \
 		--with-libscg-includedir="${EPREFIX}"/usr/include/scsilib
+	)
+
+	econf ${myconf[@]}
 }
 
 src_compile() {
@@ -121,15 +143,15 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 
 	# The emulator needs to be able to create executable heap
 	# - doesn't need trampoline emulation though.
-	pax-mark me "${ED}/usr/bin/uae"
+	pax-mark me "${ED%/}/usr/bin/uae"
 
 	# Rename it to e-uae
-	mv "${ED}/usr/bin/uae" "${ED}/usr/bin/e-uae"
-	mv "${ED}/usr/bin/readdisk" "${ED}/usr/bin/e-readdisk"
+	mv "${ED%/}"/usr/bin/{,e-}uae || die
+	mv "${ED%/}"/usr/bin/{,e-}readdisk || die
 
 	dodoc docs/* README ChangeLog
 }
diff --git a/app-emulation/e-uae/files/e-uae-0.8.29_rc4-no_schily.patch b/app-emulation/e-uae/files/e-uae-0.8.29_rc4-no_schily.patch
new file mode 100644
index 000000000000..1a9ebcb408b4
--- /dev/null
+++ b/app-emulation/e-uae/files/e-uae-0.8.29_rc4-no_schily.patch
@@ -0,0 +1,20 @@
+configure.in:1134: error: required file 'src/libscg.a' not found
+configure.in:1134: error: required file 'src/libschily.a' not found
+
+--- e-uae-0.8.29-WIP4/configure.in
++++ e-uae-0.8.29-WIP4/configure.in
+@@ -1162,13 +1162,7 @@
+         SCSIOBJS="scsiemul.o blkdev.o blkdev-libscg.o"
+         UAE_DEFINES="$UAE_DEFINES -DSCSIEMU"
+         NEED_THREAD_SUPPORT=yes
+-        if [[ "$srcdir" != "." ]]; then
+-          AC_CONFIG_LINKS(src/libscg.a:src/libscg.a)
+-          AC_CONFIG_LINKS(src/libschily.a:src/libschily.a)
+-	  UAE_LIBS="$UAE_LIBS $LIBSCG_LIBS"
+-        else
+-          UAE_LIBS="$UAE_LIBS -L. $SCGLIBS"
+-        fi
++	UAE_LIBS="$UAE_LIBS $LIBSCG_LIBS"
+       ],
+       [
+         AC_MSG_RESULT(no)
diff --git a/app-emulation/e-uae/files/e-uae-0.8.29_rc4-tinfo.patch b/app-emulation/e-uae/files/e-uae-0.8.29_rc4-tinfo.patch
new file mode 100644
index 000000000000..7f94dd20d8db
--- /dev/null
+++ b/app-emulation/e-uae/files/e-uae-0.8.29_rc4-tinfo.patch
@@ -0,0 +1,22 @@
+--- e-uae-0.8.29-WIP4/configure.in
++++ e-uae-0.8.29-WIP4/configure.in
+@@ -624,6 +624,7 @@
+ AC_PATH_XTRA
+ 
+ dnl Check for ncurses
++AC_CHECK_LIB(tinfo, main, HAVE_TINFO_LIB=yes,  HAVE_TINFO_LIB=no)
+ AC_CHECK_LIB(ncurses, waddch, HAVE_NCURSES_LIB=yes, HAVE_NCURSES_LIB=no)
+ 
+ dnl Check for SDL
+@@ -793,7 +794,10 @@
+ 
+ if [[ "x$WANT_NCURSES" = "xyes" ]]; then
+  if [[ "x$HAVE_NCURSES_LIB" = "xyes" ]]; then
+-  GFX_LIBS="-lncurses"
++  if [[ "x$HAVE_TINFO_LIB" = "xyes" ]]; then
++   GFX_LIBS="-ltinfo"
++  fi
++  GFX_LIBS="$GFX_LIBS -lncurses"
+   GFX_CFLAGS=
+   GFX_CPPFLAGS=
+   GFX_DEP=gfx-curses