gentoo resync : 30.04.2018

5 files changed, 36 insertions, 20 deletions

diff --git a/games-emulation/generator/Manifest b/games-emulation/generator/Manifest
index 015d5377d623..95dc701335c6 100644
--- a/games-emulation/generator/Manifest
+++ b/games-emulation/generator/Manifest
@@ -1,5 +1,6 @@
-AUX generator-0.35_p4-configure.patch 3630 BLAKE2B fa02f17cbb8b5ad891d447f529c7cdb338939e715894614b7af96b2a880becaea365af7cb7f39edd9d87c9121eb6ad1848aac7167cb70308e1398244949ad794 SHA512 ab863e180d8ffc3c57c40f1e99f7230c3894da7afa028205299550b9b8db01d1dc6bac9060e1488ecd48628843acb171260bc39d71a462f518b519139dff3cc5
-AUX generator-0.35_p4-underlink.patch 509 BLAKE2B 8b7133cac81ef107f4316c31e09520322b0bd3ef8015e0f8f882ef7d07c75591435e4eb438e324de3322fc94407b7e16145a275e6e0cab1748246c9a9988ee53 SHA512 075bd9e588aa9b230d446ece3661ae3236deee2175b0e0d25645c717846b0261341a30f4df239fe3b7092be0db612d26f504d7df6e2969e2889654cdc4decfd3
+AUX generator-0.35_p4-configure.patch 3634 BLAKE2B 726c133bb419bc8226d31043b851cceb6077e8a3dc7fd4a351d9117933b219012d812b25c6b96b0569e066191adc786e2ec02ed723b7eb14ca3e3e326188aa40 SHA512 bed25bc2d951d4c369265b4790754ba4e63d5beda803a655dc240ac76004b57ba1bc3823c4a35f6fa2ee5e5a9b22827c46e090f63536b4d6b959986cc016c1ed
+AUX generator-0.35_p4-inline.patch 465 BLAKE2B 8818f566ad1987e09fbc49eae5b216c5d620bfa989fdbed61e0c700862ee9fd6f20e6e0010284ee6854a8fc4299a685fde41937f2d5e32675298f3adf8615b4c SHA512 9776dbe2e8f725b8f542ae382fe8da193987c9e12d857c359de2c32402f4dee729c92837aa543efe4ba7c6c66d81e3e505496a783598621d20f724509d4358ba
+AUX generator-0.35_p4-underlink.patch 513 BLAKE2B 8424efa3326db4f627ffab9a8a6c8f55e0f5477f31a830fada195d6cfd3ded01734d70981ea27ca06341009385ea00cbe1ac3f7ffa23bdba5eb3f2c35f800820 SHA512 0947c6365ee33d15c136906385da761e0f6e4d92356b0e3eaf8c3cdcd82c87982d18e6bc35690ac448b9e9dab213358f5f55c0d3be2f3eaece7bdd776479319b
 DIST generator-0.35-cbiere-r4.tar.bz2 435289 BLAKE2B 962785fd5f87cfd03cba3238fb0d9d29b6ea42f2b44a5314c328c1c008f9fe005696556be79632e36e29948474612a8f3014dfecd47eca06014b1d7174787ed5 SHA512 73fd36d8004135c172025b3eb3385f731e294935413d7ac905672f1a88434ca332325821c5f15d5ae83fb1385fcde9f1e7f32242f8ac175bb96bd535b5d91620
-EBUILD generator-0.35_p4.ebuild 1075 BLAKE2B 95b93b363e25bddbf490eca2b9443879ad12e7c5c9a9e363d291784cabd958b7217176ed2038635c88d5213d1336dcfe9a5037db571ce85bf0b6a943a4e19ef9 SHA512 7199c212062e4eb29f4a1b17bed919cd26b6a22c0da48efd391ddfd3c956851c2bd0c8809baab44b243444f8e4b86e47afecc4cc718fe0cc24e733204c70a249
+EBUILD generator-0.35_p4-r1.ebuild 1092 BLAKE2B de4360b80c7109f3c8c0925a67f53a113bb2c48aa50ebdde7c3ade30363eff0ee2b007819936aab0ff8783c292158af9a699bc0cc70503365c7d040ef131240f SHA512 f54d48b13d10a30529a946a44f1a35ecb7dfcf032a578ceda75404affb15058def9ddadc3b2cf40b5b2f2a9922c926f978d108f63fbcc5cd34d410485ddb30e1
 MISC metadata.xml 326 BLAKE2B b5532fc7965a4b39312288491e98a48de5acdf76c1c5c92ddff370631484f6a57160eb2f983f6086d249b6cf9bba8b8dae47633c2bb38325e2d3faa175099253 SHA512 10d43e88d746f422d5751b87175a6ec76468d1f829d65aa554acced5075cfa39b6fd0d589a87d71a3127f70a718653e24444710f3e669dab3c0587a6b138ca67
diff --git a/games-emulation/generator/files/generator-0.35_p4-configure.patch b/games-emulation/generator/files/generator-0.35_p4-configure.patch
index 72ed087bd296..a918c4a97113 100644
--- a/games-emulation/generator/files/generator-0.35_p4-configure.patch
+++ b/games-emulation/generator/files/generator-0.35_p4-configure.patch
@@ -1,5 +1,5 @@
---- configure.ac.original	2008-03-17 13:07:48.000000000 -0400
-+++ configure.ac	2008-03-17 13:08:03.000000000 -0400
+--- a/configure.ac.original	2008-03-17 13:07:48.000000000 -0400
++++ b/configure.ac	2008-03-17 13:08:03.000000000 -0400
 @@ -28,15 +28,12 @@
    AC_ARG_WITH(tcltk,
                AS_HELP_STRING(--with-tcltk,Create tcltk version),
diff --git a/games-emulation/generator/files/generator-0.35_p4-inline.patch b/games-emulation/generator/files/generator-0.35_p4-inline.patch
new file mode 100644
index 000000000000..e7f09fa3689c
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35_p4-inline.patch
@@ -0,0 +1,12 @@
+diff -aur generator-0.35-cbiere-r4/ym2612/support.h generator-0.35-cbiere-r4-patched/ym2612/support.h
+--- generator-0.35-cbiere-r4/ym2612/support.h	2005-08-27 05:12:29.000000000 -0400
++++ generator-0.35-cbiere-r4-patched/ym2612/support.h	2018-03-26 11:49:36.000000000 -0400
+@@ -3,7 +3,7 @@
+ #include "config.h"
+ 
+ #define errorlog 0
+-#define INLINE inline
++#define INLINE
+ #define HAS_YM2612 1
+ #define YM2612UpdateRequest(x) 
+ #define AY8910_set_clock(chip,clock)
diff --git a/games-emulation/generator/files/generator-0.35_p4-underlink.patch b/games-emulation/generator/files/generator-0.35_p4-underlink.patch
index 964a6bea0883..b350e8b8a334 100644
--- a/games-emulation/generator/files/generator-0.35_p4-underlink.patch
+++ b/games-emulation/generator/files/generator-0.35_p4-underlink.patch
@@ -1,5 +1,5 @@
---- main/Makefile.am.old	2011-06-20 21:35:25.832460030 +0200
-+++ main/Makefile.am	2011-06-20 21:36:29.490503981 +0200
+--- a/main/Makefile.am.old	2011-06-20 21:35:25.832460030 +0200
++++ b/main/Makefile.am	2011-06-20 21:36:29.490503981 +0200
 @@ -7,7 +7,7 @@
  bin_PROGRAMS = @PROGRAM@
  EXTRA_PROGRAMS = generator-svgalib generator-tcltk generator-allegro \
diff --git a/games-emulation/generator/generator-0.35_p4.ebuild b/games-emulation/generator/generator-0.35_p4-r1.ebuild
index e77ec243163c..14ef210d58a8 100644
--- a/games-emulation/generator/generator-0.35_p4.ebuild
+++ b/games-emulation/generator/generator-0.35_p4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils toolchain-funcs games
+EAPI=6
+inherit autotools toolchain-funcs
 
-MY_P=${PN}-${PV/_p/-cbiere-r}
+MY_P="${PN}-${PV/_p/-cbiere-r}"
 DESCRIPTION="Sega Genesis / Mega Drive emulator"
 HOMEPAGE="http://www.squish.net/generator/"
 SRC_URI="http://www.squish.net/generator/cbiere/generator/${MY_P}.tar.bz2"
@@ -14,24 +14,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+sdlaudio"
 
-DEPEND="virtual/jpeg:0
+RDEPEND="
+	virtual/jpeg:0
 	media-libs/libsdl[joystick,video]
-	sdlaudio? ( media-libs/libsdl[sound] )"
-RDEPEND=${DEPEND}
+	sdlaudio? ( media-libs/libsdl[sound] )
+"
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-configure.patch \
-		"${FILESDIR}"/${P}-underlink.patch
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-inline.patch
 
 	sed -i -e 's/@GTK_CFLAGS@//g' main/Makefile.am || die
 	eautoreconf
 }
 
 src_configure() {
-	egamesconf \
+	econf \
 		--with-cmz80 \
 		--with-sdl \
 		--without-tcltk \
@@ -45,7 +49,6 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin main/generator-sdl
+	dobin main/generator-sdl
 	dodoc AUTHORS ChangeLog NEWS README TODO docs/*
-	prepgamesdirs
 }