gentoo resync : 30.04.2018

2 files changed, 33 insertions, 33 deletions

diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest
index 2032928d596c..52e3d74d5be6 100644
--- a/games-emulation/advancemame/Manifest
+++ b/games-emulation/advancemame/Manifest
@@ -1,5 +1,5 @@
 AUX advancemame-1.2-pic.patch 344 BLAKE2B 61e312fe33565171824e2e875a22187134bfc8905dfa2f6bc50b43427acd0f25502d1da1f7f591c1882e82f37d591c737af0aaaa98705c345637d786886e6c20 SHA512 5ae1a76a5e08e65efece7b295af7e177e8da7d65c7de9a03529d8a6909d38c6510d8c3e122bc4bc542760bc2cdf2e26a1edf56d27bcfa6b1fe25ea9c0f467360
 AUX advancemame-1.2-verboselog.patch 838 BLAKE2B 157d3797c5b92148d35f502fbc76aac9742c21b277d897308e4a074e1cba95b6fe1ea3e6b758be0a8d8b7e10fba5d33f5ac318d7c332f6bf622215627168646e SHA512 d34ff98ff2971a01dd46a66b322507afec4930f89afd2141e753233efeccdc582644dbf576eae08300c8e3be0336e09e56609983bcd602a69a47985ecd954e6e
-DIST advancemame-1.2.tar.gz 17508670 BLAKE2B 44b2d549e9ee6bb8d46815c083851b0b25fb6c7eda21a4ac28fe805306965ce5c07b2cfb679a43eebeb9aff4cc34ccfa12e554a008c2d2e70ee59bedc41d15d8 SHA512 6d9cf7ce0553ea6bc60c91bff7d55f282ebd671c5a48ebb25a8b0a41c575b3a8f0446f8f39ca0bccf93493ef28b331d4661987eb1f8adc5bd2c911674d1be583
-EBUILD advancemame-1.2.ebuild 1842 BLAKE2B 0453af02eec595d8032715d2ec362c9578a1a906eb801299a466aa48bf733ce9e6da7bcd779f4a8aa5492eadc0fcc7aff71307f29a487bf4e257aa7ee3b0e409 SHA512 44679f71b6ce157c8b9ed211d492049945a4e0f32b3e58877d00384a73907476761a0110d3d53cd0488126e2bbb128793977e089f9d6859bd4dc2425fa8f0473
+DIST advancemame-3.7.tar.gz 25616260 BLAKE2B 455004ff7ce3f7517c6b06767e9d1656bff6b93f822d363cbd42738e0f9ba988c243f600db5f20e24897c27faaf5c458072e2bc9c97cf92803f76299cf3010b8 SHA512 b5af59cdd3cf70dfae0769ed35eb6ce00a6f01d05eefcb687f322420faa2ee5aabf83394249c2ab7f7f1241d3fd09c2f0412666b2dbd27b91e7bc3622f925f74
+EBUILD advancemame-3.7.ebuild 1827 BLAKE2B 685e054241036197c4e387d16a0b89167a37f12f10e57c5965fb7e3ebdf369f985c4c35e07dee275574ae77c5128d3676b6e53a4df22346485f57995bda1c247 SHA512 99ea75cdcb038bfb36d1cdc625162767867b72031c0823ad09386664f00c9c283a25df2b2b65f1ec74e65e955a656de2c721af6b7a6984131fc8f9a32ae70e99
 MISC metadata.xml 1139 BLAKE2B 0722cccd2aa4d9e24eb990e460c91d8df503c1adffa680ac5e1f2b900bdfc93099feb06aab43b43ce27defc3183c6b75c594ce99e7f1396f5512babfc9de68d0 SHA512 a9a85b10cfbf6c7a75c317db8d242d29655d14d9891b897171161af613221fe93ad776ddb53fcddd14f08295d1e02c3c3fbccdce027e2a0d1c434fe60e49f349
diff --git a/games-emulation/advancemame/advancemame-1.2.ebuild b/games-emulation/advancemame/advancemame-3.7.ebuild
index 970717cff472..37773715f8e2 100644
--- a/games-emulation/advancemame/advancemame-1.2.ebuild
+++ b/games-emulation/advancemame/advancemame-3.7.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic games
+EAPI=6
+inherit flag-o-matic
 
 DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu"
-HOMEPAGE="http://advancemame.sourceforge.net/"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
+HOMEPAGE="http://www.advancemame.it/"
+SRC_URI="https://github.com/amadvance/advancemame/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 XMAME"
 SLOT="0"
@@ -14,30 +14,31 @@ KEYWORDS="~amd64 ~x86"
 IUSE="alsa fbcon oss truetype"
 
 # sdl is required (bug #158417)
-RDEPEND="app-arch/unzip
+RDEPEND="
+	app-arch/unzip
 	app-arch/zip
 	dev-libs/expat
-	media-libs/libsdl
+	media-libs/libsdl2
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
-	truetype? ( media-libs/freetype )"
+	truetype? ( media-libs/freetype:2 )
+"
 DEPEND="${RDEPEND}
 	virtual/os-headers
-	x86? ( >=dev-lang/nasm-0.98 )"
+	x86? ( >=dev-lang/nasm-0.98 )
+"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-pic.patch" \
-		"${FILESDIR}"/${P}-verboselog.patch
-
-	sed -i \
-		-e 's/"-s"//' \
-		configure || die "sed failed"
-
-	use x86 &&
-		ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
-	ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
-	use truetype &&
-		ln -s $(type -P freetype-config) "${T}/${CHOST}-freetype-config"
+	default
+
+	eapply "${FILESDIR}/${PN}-1.2-pic.patch" \
+		"${FILESDIR}"/${PN}-1.2-verboselog.patch
+
+	sed -i -e 's/"-s"//' configure || die
+
+	use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
+	ln -s $(type -P sdl2-config) "${T}/${CHOST}-sdl2-config"
+	use truetype && ln -s $(type -P freetype-config) "${T}/${CHOST}-freetype-config"
 }
 
 src_configure() {
@@ -47,9 +48,10 @@ src_configure() {
 	fi
 
 	PATH="${PATH}:${T}"
-	egamesconf \
+	econf \
 		--enable-expat \
-		--enable-sdl \
+		--enable-sdl2 \
+		--disable-sdl \
 		--enable-zlib \
 		--disable-slang \
 		--disable-svgalib \
@@ -58,8 +60,7 @@ src_configure() {
 		$(use_enable fbcon fb) \
 		$(use_enable oss) \
 		$(use_enable truetype freetype) \
-		$(use_enable x86 asm) \
-		--with-emu=${PN/advance}
+		$(use_enable x86 asm)
 }
 
 src_compile() {
@@ -71,21 +72,20 @@ src_install() {
 
 	for f in adv* ; do
 		if [[ -L "${f}" ]] ; then
-			dogamesbin "${f}"
+			dobin "${f}"
 		fi
 	done
 
-	insinto "${GAMES_DATADIR}/advance"
+	insinto "/usr/share/advance"
 	doins support/event.dat
-	keepdir "${GAMES_DATADIR}/advance/"{artwork,diff,image,rom,sample,snap}
+	keepdir "/usr/share/advance/"{artwork,diff,image,rom,sample,snap}
 
 	dodoc HISTORY README RELEASE
 	cd doc
 	dodoc *.txt
-	dohtml *.html
+	HTMLDOCS="*.html" einstalldocs
+
 	for f in *.1 ; do
 		newman ${f} ${f/1/6}
 	done
-
-	prepgamesdirs
 }