gentoo resync : 30.04.2018

2 files changed, 27 insertions, 29 deletions

diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index 48a77a5a6d95..5ebd2c1ca923 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -2,5 +2,5 @@ AUX atari800-3.1.0-tgetent-detection.patch 690 BLAKE2B 49016e922f66214dadd0da179
 AUX atari800.cfg 467 BLAKE2B 76caa8d4f73d292adb36ce66186bf657a25f4ef5404f0dedc0456fa933bc672bc5a89819b92555d88033bc47bdff4cd5b376571de01339a1b60a82a3210dcd11 SHA512 17f43f9f1b8dcf1513eefc8b89e94ecdaeb3f4e324a669e09c1f8b180e3c545b474164f73bc4c319dde27dda8effa1f2786957854ade81d161221e081c87d358
 DIST atari800-3.1.0.tar.gz 1492289 BLAKE2B cad7a3111bf714321d01aff1f8b30408efc1eca0876d9b795395d62d18eabdf78b71d3b2af887e8ba03e33e3824fcd5b45070e39cddd0e5ad0bda2d853f724b1 SHA512 c8f035c9be000c67dd854a14a236d165e6e2d30b5138f8772c6ea5c5290b0410525570e3ed9dcb2f9bcb129f97a36e6eef5993f0a5ad3cc993c6b59b127bcabe
 DIST xf25.zip 188942 BLAKE2B c10b9108eebc571ac334ea6fca76d227e3d2fcde1595e8823a3d178dc31d9efa9b209572ee03875461289093615470192cf5c9a06cf0b4363d097a9eac201db4 SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
-EBUILD atari800-3.1.0.ebuild 2057 BLAKE2B f36f88eb4a86814a1b1da2910a5aa9aeb7e4f55ee75664dbdd539a490d3f50e1e223bb51d022d31311390c3024172316a4dba4a657bfd9fcf4b959007d8aead7 SHA512 5b49044c8010149ca720dcbdda01fa4101d6f421f36f4dc9a821c038146e75d82433d86e94ec8bc018d5c00828ea536135343c58306e20653b75b697d5ae0e39
+EBUILD atari800-3.1.0-r1.ebuild 1860 BLAKE2B c286b79674f42d3a421be8e5e5c8ac02387c81ee5994fc7e9657e0732c46d1a38ee93ba240530f5072baaad88b648c28ed533114a9aa986a8b51a3f4e18ffede SHA512 ad3fc9d642d739fd8024c81db883d5b5bffa46e6e5b9967aa5dcbb1d45373eafb7cb399118e01354fbdb878b7ea49d5d76b38189d1bd643503a78ed2ed3ed0e4
 MISC metadata.xml 961 BLAKE2B 5f5e394a1ea4099f9d33f1e4f542b98ea31038e2855d839a86ea55fca18f02b9d99f2b0b554e0816142d80ca84adcbe2e1af1c664d773fb8df2794600fe21b48 SHA512 f31b0309a14446c07f11c72be8bb0cda851e5e0f424211f7a26eb5030935119a31eccfc1d81d80987cf6a6ef22d56e74edd258eba13d2635cccd584fadaaf123
diff --git a/games-emulation/atari800/atari800-3.1.0.ebuild b/games-emulation/atari800/atari800-3.1.0-r1.ebuild
index 662b234ea305..31aa318cdebb 100644
--- a/games-emulation/atari800/atari800-3.1.0.ebuild
+++ b/games-emulation/atari800/atari800-3.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games autotools eutils
+EAPI=6
+inherit desktop autotools
 
 DESCRIPTION="Atari 800 emulator"
 HOMEPAGE="http://atari800.sourceforge.net/"
@@ -15,37 +15,38 @@ KEYWORDS="~amd64 ~x86"
 IUSE="ncurses oss opengl readline +sdl +sound"
 
 NOTSDL_DEPS="
-	sys-libs/ncurses:0
+	sys-libs/ncurses:0=
 	sound? (
 		!oss? ( media-libs/libsdl[sound] )
-	)"
-RDEPEND="sdl? ( >=media-libs/libsdl-1.2.0[opengl?,sound?,video] )
+	)
+"
+RDEPEND="
+	sdl? ( >=media-libs/libsdl-1.2.0[opengl?,sound?,video] )
 	ncurses? ( ${NOTSDL_DEPS} )
 	!sdl? ( !ncurses? ( ${NOTSDL_DEPS} ) )
-	readline? ( sys-libs/readline:0
-		sys-libs/ncurses:0 )
-	media-libs/libpng:0
-	sys-libs/zlib"
+	readline? (
+		sys-libs/readline:0=
+		sys-libs/ncurses:0= )
+	media-libs/libpng:0=
+	sys-libs/zlib
+"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	app-arch/unzip
+"
 
 src_prepare() {
+	default
+
 	# remove some not-so-interesting ones
 	rm -f DOC/{INSTALL.*,*.in,CHANGES.OLD} || die
 	sed -i \
 		-e '1s/ 1 / 6 /' \
 		src/atari800.man || die
-	sed -i \
-		-e "/SYSTEM_WIDE_CFG_FILE/s:/etc:${GAMES_SYSCONFDIR}:" \
-		src/cfg.c || die
-	sed -i \
-		-e "/share/s:/usr/share:${GAMES_DATADIR}:" \
-		src/atari.c || die
-	sed "s:/usr/share/games:${GAMES_DATADIR}:" \
+	sed "s:/usr/share/games:/usr/share:" \
 		"${FILESDIR}"/atari800.cfg > "${T}"/atari800.cfg || die
 
 	# Bug 544608
-	epatch "${FILESDIR}/${P}-tgetent-detection.patch"
+	eapply "${FILESDIR}/${P}-tgetent-detection.patch"
 	pushd src > /dev/null && eautoreconf
 	popd > /dev/null
 }
@@ -67,12 +68,8 @@ src_configure() {
 		fi
 	fi
 
-	echo
-	elog "Building ${PN} with ${video} video and ${sound} sound"
-	echo
-
 	cd src && \
-		egamesconf \
+		econf \
 			$(use_with readline) \
 			--with-video=${video} \
 			--with-sound=${sound}
@@ -83,12 +80,13 @@ src_compile() {
 }
 
 src_install () {
-	dogamesbin src/atari800
+	dobin src/atari800
 	newman src/atari800.man atari800.6
 	dodoc README.1ST DOC/*
-	insinto "${GAMES_DATADIR}/${PN}"
+	insinto "/usr/share/${PN}"
 	doins "${WORKDIR}/"*.ROM
-	insinto "${GAMES_SYSCONFDIR}"
+	insinto /etc
 	doins "${T}"/atari800.cfg
-	prepgamesdirs
+	newicon data/atari2.svg ${PN}.svg
+	make_desktop_entry ${PN} "Atari 800 emulator"
 }