diff --git a/app-emulation/e-uae/Manifest b/app-emulation/e-uae/Manifest
index 4a1174f..83e9f52 100644
--- a/app-emulation/e-uae/Manifest
+++ b/app-emulation/e-uae/Manifest
@@ -1,5 +1,5 @@
-AUX e-uae-0.8.29_rc4-high-cpu-usage.patch 395 SHA256 4edff4299b93b98659249958bd656c460b985419a471cb18527007c956520379 SHA512 6034cbce66889a63dfd4be8e5d53fc98cafac3efbc8fba28a831213fe55792e64a99295a866cd2efe634a68b9617491f44bacbf187fdaee3499ac8475cd7b9de WHIRLPOOL b68e3a40d216d628bdc46c2a7023a6e71aba49fb56ad2588cf1a5b833e74ff63d33fc0862345d9bd9dd9d463886a95593594378953e7c5900d875ae1617943c5
-DIST e-uae-0.8.29-WIP4.tar.bz2 1122718 SHA256 9828cb0fca783160bcb33900d0254f4bdaade1c9a41256e5f298e973d0c07456 SHA512 63d5c60ca017ba7ffaba32c4d7edceba0410b773066cc58e226c8cc2c92152eb3689698b0affe478cc63c996c731fbbf56d9028dfd000394d904f193f860473f WHIRLPOOL 4d0bab2b8492cfe6a6b2e38fab7b2eb9ad4b33b38b191d9949cb946f6e5a4365b00ccec118acb8b4d537b70b73b8d9deb0c8235b5966f1488d9a03e3a245dfeb
-EBUILD e-uae-0.8.29_rc4-r99.ebuild 4429 SHA256 df21f0fd00dba0d58a34f2a0111251c8d111362fbfba0665c750dbe4f51c3f7c SHA512 4105b34c5a11dac2f858c7a24f7477f68edd58f4ba00a1ac4890db9a05e3331a3864ba66c9c753115959203a8bb693aea8d68ad57b383d0225bb566c5c438c07 WHIRLPOOL 763d5e7647fd6aba1e41ffa1e9d53085d4caf14e66efdc35fddcca8b74d0dde4759e4718eed20b520f20a5ff008f8b9aaebb355fc0a88adcb26f09465a9d4873
-MISC ChangeLog 7302 SHA256 76c93ab7cb7b87b4b45afcff1de7d3c9ecb441d1244f617b5ecb152f0bb644c4 SHA512 13ed5c20007c0b62a3b329093ec72e9cfea4addc1464bd9b4c0bab3085fa9977500e7389c34fed6c61418708e3798c8cf640e152ca68032c0c0e6adf06f1f4ce WHIRLPOOL a5b10005ab6785deb8e26b8b8b2cd98bfdefc112e095162cb40cfc849326ee9bea3370c87273c02ab0c21c5c11067c7d2e6341b91890cabef605045a6ddbda53
-MISC metadata.xml 526 SHA256 d062b667a71d8cc5e127491a767bc20cc7f5bd7670cfe215ff0d04bb6ff0ed9b SHA512 94fcb0df899366ae3c79d9c8d0548b6d258e2cf4eb0da8c016b1ec566cf27297f524d49a15268d4c977c511430d2399e22eb0c64034c1017dc41995b794312bb WHIRLPOOL c9b142c1c0799fc79a9173e21f200f5f8e6ca71e9a554ec25103461c98c9c7796ece3390e6f4e455f5dc82ff23ac7e0c5805abf68dbc12292def27d5b5f55cf2
+AUX e-uae-0.8.29_rc4-high-cpu-usage.patch 395 BLAKE2B dd2b03f4abae604498948df8802b8f3a637883a5b880d3b234274a8703d639d4befea4071bddad751149d70bc0fbb6ec77ffcb7d1428f95437a65f506820e951 SHA512 6034cbce66889a63dfd4be8e5d53fc98cafac3efbc8fba28a831213fe55792e64a99295a866cd2efe634a68b9617491f44bacbf187fdaee3499ac8475cd7b9de
+DIST e-uae-0.8.29-WIP4.tar.bz2 1122718 BLAKE2B 4120e7d14e4ee1a8be04839680c30dc57286524a68eb8036a8f48a0724c3581884045c2ad11bb8409a88b2f43bd132b92083e1e1cc088c5b4768f3b6dfdef458 SHA512 63d5c60ca017ba7ffaba32c4d7edceba0410b773066cc58e226c8cc2c92152eb3689698b0affe478cc63c996c731fbbf56d9028dfd000394d904f193f860473f
+EBUILD e-uae-0.8.29_rc4-r99.ebuild 4143 BLAKE2B e372b1609cbcab1854280f232f1d059d066bb6eedd818f14bb5556d34fc6c7fc18cc03ca5f080ec7e61904eba1eca551a089bf960403421afbdfd5531a17b442 SHA512 51fd795cb83a6a4ef4c57472e40fffd14e42630e395ed202e4024524723bd00721dd90238f4dcf0238bf7904b2ccb9c0a9fc3fffa847496a1109998601f0a255
+MISC ChangeLog 7302 BLAKE2B fce08905efbebf55887d40fcbce3fbf54d74fc642300da0c1de06e015ae5b5371744e0ed839e54ca25faef97f773ca5f07718809f1a24d5d48b6a0ba86a02123 SHA512 13ed5c20007c0b62a3b329093ec72e9cfea4addc1464bd9b4c0bab3085fa9977500e7389c34fed6c61418708e3798c8cf640e152ca68032c0c0e6adf06f1f4ce
+MISC metadata.xml 526 BLAKE2B ab8de3c65ec69fccb43f89954ccfedfd0fbb3bda5c907c822013045d4331abe439b31d8e2647bd0fa04e4d259ec3e632da815b8b3f09924998003e78d560c59d SHA512 94fcb0df899366ae3c79d9c8d0548b6d258e2cf4eb0da8c016b1ec566cf27297f524d49a15268d4c977c511430d2399e22eb0c64034c1017dc41995b794312bb
diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r99.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r99.ebuild
index d4b6456..27993ea 100644
--- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r99.ebuild
+++ b/app-emulation/e-uae/e-uae-0.8.29_rc4-r99.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.29_rc4-r1.ebuild,v 1.3 2011/03/27 10:22:51 nirbheek Exp $
 
-EAPI="1"
+EAPI=6
 
-inherit eutils 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/"
@@ -24,118 +23,135 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X dga ncurses sdl gtk alsa oss sdl-sound capslib"
+KEYWORDS="amd64 ppc x86"
+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
-			 dga? ( x11-libs/libXxf86dga
-				    x11-libs/libXxf86vm )
-			)
-		!X? ( sdl? ( media-libs/libsdl )
-			  !sdl? ( sys-libs/ncurses ) )
-		alsa? ( media-libs/alsa-lib )
-		!alsa? ( sdl-sound? ( media-libs/sdl-sound ) )
-		gtk? ( x11-libs/gtk+:2 )
-		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-proto/xf86vidmodeproto
-					x11-proto/xf86dgaproto ) )"
+DEPEND="${RDEPEND}
+	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
+	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=()
 
-pkg_setup() {
 	# 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"
-			ebeep
+			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 ;)"
-			ebeep
-			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"
-		ebeep
+		myconf+=( --with-curses --without-sdl-gfx )
 	fi
 
-	use gtk && myconf="$myconf --enable-ui --enable-threads"
-	use gtk || myconf="$myconf --disable-ui"
+	# bug #415787
+	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
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+		--with-libscg-includedir="${EPREFIX}"/usr/include/scsilib
+	)
 
-	# Fix for high cpu use when compiled with --disable-audio
-	use alsa || use sdl-sound || use oss || epatch "${FILESDIR}"/${P}-high-cpu-usage.patch
+	econf ${myconf[@]}
 }
 
 src_compile() {
-	strip-flags
-
-	econf ${myconf} \
-		--with-libscg-includedir=/usr/include/scsilib \
-		|| die "./configure failed"
-
-	emake -j1 || die "emake failed"
+	emake -j1
 }
 
 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 "${D}/usr/bin/uae"
+	pax-mark me "${ED%/}/usr/bin/uae"
 
 	# Rename it to e-uae
-	mv "${D}/usr/bin/uae" "${D}/usr/bin/${PN}"
-	mv "${D}/usr/bin/readdisk" "${D}/usr/bin/e-readdisk"
+	mv "${ED%/}"/usr/bin/{,e-}uae || die
+	mv "${ED%/}"/usr/bin/{,e-}readdisk || die
 
 	dodoc docs/* README ChangeLog
 }