gentoo resync : 02.05.2018

6 files changed, 31 insertions, 28 deletions

diff --git a/games-simulation/cannonsmash/Manifest b/games-simulation/cannonsmash/Manifest
index 12c61c36e282..c7b4c1f1960b 100644
--- a/games-simulation/cannonsmash/Manifest
+++ b/games-simulation/cannonsmash/Manifest
@@ -1,8 +1,8 @@
-AUX cannonsmash-0.6.6-flags.patch 520 BLAKE2B 55c35dbed022adf39a84e183af14085f63cd14cfdd99ee785e0b2183545690b5c168ac939e7ddc6be010846a879e1a2303ffb23ae7a004e9fb33984831742ae2 SHA512 017f3117755e907438b923813e7df9864f8f6c8f5c917afde9f67ca87262402ca6b643551541374e8389f133993d51d4819fec2bd3d70a11cc4a2c0b2301b5a6
-AUX cannonsmash-0.6.6-gcc41.patch 586 BLAKE2B ac95cbab05c0f816b03fbb57bdfedbdc2e432a90f691e2d2e563bb06acc6bec05d75a24da813afde4c16c4ac910545749577929d1e01e369cf2be6e9ef48ca5e SHA512 b93042c728ce93a515fd43e0b1fb9306ca83da697fde932da7c1c0536bc560fd8bcb17d7a306f51ef20a058690354b2bd19cfc62ca413398e318e0a39f6c26b9
-AUX cannonsmash-0.6.6-sizeof-cast.patch 358 BLAKE2B 9360c0c29bd36901e17e6e940fdd41badf3d6ba5a5f66deddc69deecb2a4607afe0ae55b804eac5d52e097abaeb26eaff2635797c584fb3aa11e7cf98edaa84d SHA512 23d8764c900e78a6c3205b4fa444bd94a4a50990edfb45ef2dc764871b1d9f2359a8ee38da25ba8c392ef0000fd2da1340ce41093b4e4b8bdb818a1363941b90
-AUX cannonsmash-0.6.6-x-inc.patch 305 BLAKE2B 8f73369154cee67966c3186d44823dc0f6ceac7a93a683879a9707381cf403485d3198f0027b5df9dd1b94d5c185ecb10e0e540fe89c547090f1f850135fff40 SHA512 b7dcd8415a7f5ad773141a7b9fe048121e4f93862d8354bfde9637137858948d6791a87a3f44d53f69246fb3d539a9f5f6bd3fb667b48be8c147dcccb810d692
+AUX cannonsmash-0.6.6-flags.patch 524 BLAKE2B 5a85b73b59c1dcbc097df325e2b94701cef5629bd929c3c22f43fe65d259c22cdf5949b82a14e2e87f190952ce554947b465403e058aa3564a27f6ef1c5bff38 SHA512 38f6edfc9f6c434496ae9b5f45fa7f42df8c8156bd7507efce7d9d5c0f6950b3178200d863b6d75552caf1a0206fd75b61328ce4ca96eb59d84b7006f5b44fb6
+AUX cannonsmash-0.6.6-gcc41.patch 594 BLAKE2B 392ceebbba587580c9ddc8511c7139aa68d0c881f372c362ef0c068119060f593462b999514340d81075bbecc1d0a11c617c0ab4ec8ac2180350bd9cfd046a1e SHA512 a9bbadb4d6ff279eb368be17ff6326b2ddcdcd3231ace4fe2a4368bd82ece6cd11cbcf6c2464ad9e79d41ad099e66b8c4ab5efea4995bdd7beabfefb5b92c3ca
+AUX cannonsmash-0.6.6-sizeof-cast.patch 362 BLAKE2B 1a7dbf4c921497c2209c078e9453f6ff1106f4a3baca52e57f1778022763a7f8f79259f443f88d74c0b412aef223fd948c93e0c79158df25bea2cf6cbcc0209e SHA512 9e38b5ef20529587dbcf86ecd4712e9e4b751ec4fd2d735f3924a03afbcd56345f738b65e37525e90e1717117160dd175e0bacdb2cf39dfa8b2d5d09690ffdc4
+AUX cannonsmash-0.6.6-x-inc.patch 309 BLAKE2B efcd58b83b9433065efbde3aa4356b48b8fb0bba4462fb2e92c28368e3610c995060ffc0dd7a76d5ef994341e154716c1d5b3b09869396314002e04029479767 SHA512 d6f6139014782eee11965595e0ea61e53a773be3be5edcaba2ebc602983b9dd2f0178298c34507ebf722a868c0f43535adae519cbebdd2a7e3da730e4f54c0ab
 DIST csmash-0.6.6.tar.gz 1989943 BLAKE2B 723b7accd9a899f6d80df07573f8583684606c6b5bf8f11753902f4db196a9a2738cd11899e0a3b4e5637b04553173d75701edbed6e2d800b7b18edb82b2a10f SHA512 e8406eb17adf6c6cc4454b7d0a432ad1b071e1f72d9867fd46e458ade2d1dc1e927a7f2a336c80988b97051b9d188c3027dd8207f89f7e1fa60e1d0a6a5e8916
 DIST danslatristesse2-48.ogg 1070787 BLAKE2B 91bb5b552a45349d6b34d459f2d5071498b6def76c9b7e7ce1538c29af762698708d4ad6fe780e087f14b6ca42dad258c8ed2a7cd368027a5080aab52d02575a SHA512 5cbc457d511bdc736f3b359a8ddd3a514bd0d14418f2dbd68409394baadfcd9fd7630b228e4e9654b14b513e158e9a46b67bc58c5c04bfe382ee6e624dd16834
-EBUILD cannonsmash-0.6.6.ebuild 1424 BLAKE2B ec5aef627949f5a2bf314c905107cd5e891938d4389c96de7ad3f6cf1698be4e5cc774fd6df5b289b15e6b71960d59b932e8395132274e1bb88b95da5aeb07ed SHA512 e51e3cc5bd157db97747db912ee678931f32c288714c9af47736e6da6bd82b216dce67b9d1951e62d651f9d164bddfba4f8144993372f4f0719eb8347b264ac7
+EBUILD cannonsmash-0.6.6-r1.ebuild 1401 BLAKE2B dd927348ecc38a65865bb53769886b571c5c8543b4fc9f8f1e7ee5c2e8048c38a4ba0e12b7bb643abe9948c278781ee4f04356cd81f4fa690f4ef74322dc5e1d SHA512 d73328460d50c06230d130e8a18cabae84335f748cfe2116257eac522852e6254072eaff232aa4d7b00328a8d57b3731052c9fd903ff718b3a52db302424a638
 MISC metadata.xml 334 BLAKE2B 7143d65b7fa8567c3598adc245e6a6f8148074d8775f23c06eff18b0e94cb3e570c3c483a1c44df49f148c6150271172150dcf870873e4fb796be0d08c718663 SHA512 feb36e586e7e460e47a342dccf7cc812319860809033b31a8597c8df12f7c09e725af4e5536933a50341e22e921009557600801bcf64d9bf13e88b24d4b53e34
diff --git a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild b/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild
index 35d4eb916f4f..8da30598da0c 100644
--- a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
+++ b/games-simulation/cannonsmash/cannonsmash-0.6.6-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 eutils games
+EAPI=6
+inherit desktop
 
 MY_OGG=danslatristesse2-48.ogg
 DESCRIPTION="3D tabletennis game"
@@ -15,40 +15,44 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="vorbis nls"
 
-RDEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	virtual/glu
 	media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer[vorbis?]
 	media-libs/sdl-image[jpeg,png]
 	x11-libs/gtk+:2
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
-S=${WORKDIR}/csmash-${PV}
+S="${WORKDIR}/csmash-${PV}"
 
 src_unpack() {
 	unpack csmash-${PV}.tar.gz
 }
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-x-inc.patch \
 		"${FILESDIR}"/${P}-sizeof-cast.patch \
 		"${FILESDIR}"/${P}-gcc41.patch \
 		"${FILESDIR}"/${P}-flags.patch
 	if use vorbis ; then
 		sed -i \
-			-e "s:${MY_OGG}:${GAMES_DATADIR}/csmash/${MY_OGG}:" ttinc.h \
+			-e "s:${MY_OGG}:/usr/share/csmash/games/${MY_OGG}:" ttinc.h \
 			|| die "sed failed"
 	fi
 }
 
 src_configure() {
-	egamesconf \
+	econf \
 		$(use_enable nls) \
-		--datadir="${GAMES_DATADIR_BASE}"
+		--datadir="/usr/share"
 }
 
 src_compile() {
@@ -59,10 +63,9 @@ src_compile() {
 src_install() {
 	default
 	if use vorbis ; then
-		insinto "${GAMES_DATADIR}"/csmash
+		insinto /usr/share/games/csmash
 		doins "${DISTDIR}"/${MY_OGG}
 	fi
 	newicon win32/orange.ico ${PN}.ico
 	make_desktop_entry csmash "Cannon Smash" /usr/share/pixmaps/${PN}.ico
-	prepgamesdirs
 }
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
index 85612b929c59..c7b3b561d2d1 100644
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
@@ -1,5 +1,5 @@
---- configure.old	2010-10-18 15:05:02.000000000 +0200
-+++ configure	2010-10-18 15:05:31.000000000 +0200
+--- a/configure.old	2010-10-18 15:05:02.000000000 +0200
++++ b/configure	2010-10-18 15:05:31.000000000 +0200
 @@ -5516,12 +5516,12 @@
  
  
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch
index 0f3e511f09cc..6602c2f09304 100644
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch
@@ -1,5 +1,5 @@
---- BallView.h.old	2006-04-11 00:10:37.000000000 +0200
-+++ BallView.h	2006-04-11 00:10:53.000000000 +0200
+--- a/BallView.h.old	2006-04-11 00:10:37.000000000 +0200
++++ b/BallView.h	2006-04-11 00:10:53.000000000 +0200
 @@ -32,7 +32,7 @@
  
    static GLuint m_number[10];
@@ -9,8 +9,8 @@
    GLUquadricObj *m_quad;
  
    void DrawBall();
---- matrix.old	2006-04-11 00:13:18.000000000 +0200
-+++ matrix	2006-04-11 00:19:34.000000000 +0200
+--- a/matrix.old	2006-04-11 00:13:18.000000000 +0200
++++ b/matrix	2006-04-11 00:19:34.000000000 +0200
 @@ -42,7 +42,7 @@
  
  /* __BEGIN__BEGIN__ */
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch
index 9237f95978ef..ead10c90400b 100644
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch
@@ -2,8 +2,8 @@ Don't typecast otherwise C++ will fail to match on some arches.
 
 http://bugs.gentoo.org/84187
 
---- loadparts.cpp
-+++ loadparts.cpp
+--- a/loadparts.cpp
++++ b/loadparts.cpp
 @@ -247,3 +247,3 @@
              // concat next line(s)
 -	    int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch
index 99c1e2f944fa..e56b51e0b92a 100644
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch
@@ -1,8 +1,8 @@
 Patch by Jason Bucata.
 http://bugs.gentoo.org/84187
 
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -5515,7 +5515,11 @@
  fi