gentoo resync : 30.04.2018

5 files changed, 30 insertions, 23 deletions

diff --git a/games-emulation/gcube/Manifest b/games-emulation/gcube/Manifest
index d5fe4aba5096..9f1dd254f3bf 100644
--- a/games-emulation/gcube/Manifest
+++ b/games-emulation/gcube/Manifest
@@ -1,6 +1,6 @@
-AUX gcube-0.4-gcc47.patch 425 BLAKE2B fbcf0f7cb1b2669357c17b3000f679d7c0d6792bf06cd1c4a902c2d73f535add71f0123fa8cbda02a97acde4d246bc0cd2a6b3ebca74c0f0ab1b301f3244ef23 SHA512 efff9f47acb46cb406ef61f7125840200e6692fe94d26ed6f8c86cda9aa15fedae2d7cd673035849724bed1bee7d6116cf3467d66df94b322c746db33ac099ac
-AUX gcube-0.4-ldflags.patch 911 BLAKE2B 330ba6d03d8fd99c13e492a285f75f7d46ce0141e47f35c16e4153bdec2f110de973d3b791bf1d6188bc235a3247894cb71effe52a9f4fa76059755c2d21779f SHA512 c0ff07a641b1df088313406feac730dbbee74f4451dc1bf4c0c8e9c6e53206d3a93292bbfc09db70f3d791a654523b1ffdde51057f6d101c3b6e9c8e636c851d
-AUX gcube-0.4-underlink.patch 443 BLAKE2B 562bb007f0e6549794b7dec25dbc80848e2bd1c2e20a62620963a32d13b4f9a784b0333cfd93bf66a7fefbab1af62053115a2cbe320f4686aad14863176bad59 SHA512 c372ba4447fca9c4f28aab14da05d15780e45e98b061eace8bf1f5494185809f1466890fa0581e001a2886d6a9d34c2365e36ea94f3bc64fe1bdbecde94676e9
+AUX gcube-0.4-gcc47.patch 429 BLAKE2B 2da4477aa5fc8b33bae0404a5347e6a0bac493ed2c2ff54d743d1d1920a7055c89f2c3b4e9ebe29a42f88991cd45ad9702916070a91895bca2c465fb1c14d505 SHA512 e6cf8d03734d26b5051c50f9fbb3ae3d62f34ea2dc6a29177cac72426c9a5e5887acf88cff437c0b830eff5648ac30f477a9fea4e945cc53b9606788cff80889
+AUX gcube-0.4-ldflags.patch 915 BLAKE2B 7bc5425df1dd9a7afdc2844c7e4044f634c824c4b857c49162e73cad98f888049beda2963c353c7e9c412c680e5c49ebe91d57f94b4158338a322f542414f513 SHA512 62343ae3871a406e21c219a779e568b5a053cc474893b5ad690f8995b01c86cabecf5e1e9c55d91f0adab046f652f2f6d9b3c298edc92872d62976d6de2733f4
+AUX gcube-0.4-underlink.patch 447 BLAKE2B 05fea68713edaf3d38656fb5911a64d48b8ae7bda74c50153ddf63beabad8cdf36eb311dc40233728b5900d4797858f89d0b3ba0b3d57212603ae391b1dac4c3 SHA512 e916f3b3f901857f6c7af1bdbdf06ec9ae649d42ed9a166f146c4a319c67644312614550c17a7c4269dd116b6a5a03cf87a62acd5db8b29fc4fa4413b68ed36d
 DIST gcube-0.4-src.tar.bz2 803503 BLAKE2B a9f5db1b824d5319e89a5e865c1ca539a2f11458f4c542d34168c06b79f9f589ea928768ca26275f31aad51b01f51efe8453a1121ba947aaf067beb2f9dea13f SHA512 f73665386d547322f20ed5e358f4f394b07d74fd90bddbfe1158a7a5d896bff36dabc9833f2d820a7af7673b8c8af62490f7fa07b06a2bbca4df6356a1e3c91a
-EBUILD gcube-0.4-r1.ebuild 947 BLAKE2B bcb5296e20a69183576bc7ba35991283639dfd5ade14f36bed2c8e7c24fa92b035f13aa32a27d5b5b128d25b58b3d07b73b89bc4ec2038ed0cafd321f88dadd5 SHA512 2479d5d0ffa2278735fadacf0ba3b4ab693381fac62393b864f197ecd775fdb3d7037461112b7c2bc09c35bea522f1a83aa902838186692d30cc88b4b21e1f02
+EBUILD gcube-0.4-r2.ebuild 922 BLAKE2B fc74e6ce689ed888c61d254c1daa5102e0ed205a0609794ef5993914e7396e55bf88574817850daa8d9223cd3c17e8696044121054e80a603d5b4103e1de63d5 SHA512 e3515c29982ed53c204d7d8c09e081c3fd81adc085914249cf02b818055f8374a44d6884a5cf8335444ecb29875d9e0abf717337723013c903d69dfee34f3ccb
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/gcube/files/gcube-0.4-gcc47.patch b/games-emulation/gcube/files/gcube-0.4-gcc47.patch
index b459a4e24034..48ac167a1f0d 100644
--- a/games-emulation/gcube/files/gcube-0.4-gcc47.patch
+++ b/games-emulation/gcube/files/gcube-0.4-gcc47.patch
@@ -1,5 +1,5 @@
---- Makefile.rules.old	2012-10-23 14:06:54.417782365 +0200
-+++ Makefile.rules	2012-10-23 14:07:11.516377033 +0200
+--- a/Makefile.rules.old	2012-10-23 14:06:54.417782365 +0200
++++ b/Makefile.rules	2012-10-23 14:07:11.516377033 +0200
 @@ -1,6 +1,6 @@
  
  SDL_CONFIG=sdl-config
diff --git a/games-emulation/gcube/files/gcube-0.4-ldflags.patch b/games-emulation/gcube/files/gcube-0.4-ldflags.patch
index 169472ee1851..b4a64f16aede 100644
--- a/games-emulation/gcube/files/gcube-0.4-ldflags.patch
+++ b/games-emulation/gcube/files/gcube-0.4-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.rules.old	2010-10-01 07:16:16.000000000 +0200
-+++ Makefile.rules	2010-10-01 07:18:04.000000000 +0200
+--- a/Makefile.rules.old	2010-10-01 07:16:16.000000000 +0200
++++ b/Makefile.rules	2010-10-01 07:18:04.000000000 +0200
 @@ -88,22 +88,22 @@
  profiler:	default
  
diff --git a/games-emulation/gcube/files/gcube-0.4-underlink.patch b/games-emulation/gcube/files/gcube-0.4-underlink.patch
index f1cff91cb158..f4b3d5b6969d 100644
--- a/games-emulation/gcube/files/gcube-0.4-underlink.patch
+++ b/games-emulation/gcube/files/gcube-0.4-underlink.patch
@@ -1,5 +1,5 @@
---- Makefile.rules.old	2011-06-10 14:14:08.372105234 +0200
-+++ Makefile.rules	2011-06-10 14:14:18.504746649 +0200
+--- a/Makefile.rules.old	2011-06-10 14:14:08.372105234 +0200
++++ b/Makefile.rules	2011-06-10 14:14:18.504746649 +0200
 @@ -1,6 +1,6 @@
  
  SDL_CONFIG=sdl-config
diff --git a/games-emulation/gcube/gcube-0.4-r1.ebuild b/games-emulation/gcube/gcube-0.4-r2.ebuild
index e55675696db2..6194fc6a2103 100644
--- a/games-emulation/gcube/gcube-0.4-r1.ebuild
+++ b/games-emulation/gcube/gcube-0.4-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 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="Gamecube emulator"
 HOMEPAGE="http://gcube.exemu.net/"
@@ -13,31 +13,38 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	media-libs/libsdl[joystick,opengl,sound,video]
 	virtual/jpeg:0
-	sys-libs/ncurses:0
-	sys-libs/zlib"
-RDEPEND=${DEPEND}
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PV}
+S="${WORKDIR}/${PV}"
 
 src_prepare() {
+	default
+
 	sed -i -e '/^CFLAGS=-g/d' Makefile.rules || die
-	epatch "${FILESDIR}"/${P}-ldflags.patch \
+
+	eapply "${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-underlink.patch \
 		"${FILESDIR}"/${P}-gcc47.patch
+
 	sed -i -e '/^CC=/d' Makefile || die
+
 	append-cflags -std=gnu89 # build with gcc5 (bug #570504)
 }
 
 src_install() {
 	local x
 
-	dogamesbin gcmap gcube
+	dobin gcmap gcube
 	for x in bin2dol isopack thpview tplx ; do
-		newgamesbin ${x} ${PN}-${x}
+		newbin ${x} ${PN}-${x}
 	done
-	dodoc ChangeLog README
-	prepgamesdirs
+
+	einstalldocs
 }