gentoo resync : 28.04.2018

7 files changed, 31 insertions, 29 deletions

diff --git a/games-arcade/spacerider/Manifest b/games-arcade/spacerider/Manifest
index e4ab799e7964..11d28caf20db 100644
--- a/games-arcade/spacerider/Manifest
+++ b/games-arcade/spacerider/Manifest
@@ -1,8 +1,8 @@
-AUX spacerider-0.13-font.patch 405 BLAKE2B d4fb88d529549efc8e1db2d6d762b9aebb78861553473c39b53da33f870a101b1047f9ab46ad19bd378d274a94d573da0e02a958618b21ae069d29e78a416479 SHA512 3d584b207b809e69cb4f6227690c840659e8a9e4e242ee70e2870a210470f1d1f22498cae52a33f0b8a06449cf5d74bf60c94add9ff1ee8f3be74f666aa61fc0
-AUX spacerider-0.13-gcc41.patch 464 BLAKE2B dfacb3b58e71de0093a6408adf210d3eb732fc958232b1bcf49d6144198aa815cbfc3edfe6b15c7004a0ed839f7497199aa46fd021a4b092bba6fafaab792bcb SHA512 5d8a7e98957197e3a5be814922cf175e96071b2ece6014d71d000489803a6850324919217d9519cecbbebb07327d44728aa710cbbd56a10b22e7094604cbe3fe
-AUX spacerider-0.13-gcc49.patch 767 BLAKE2B 5c1b71225f78fba5006e8e68264b12bdd7cb88d5d3adba341bc753caa3c8ae00685d20ab30c035a7c8ae82a688f0c5d5a170ca8d861d46fbcd838b69af88f051 SHA512 8960674333b379eac82c844c7e558edf00286df66e19fd1728837a47a3930c8d7ff3d98f1abd560041f58d4919ef7bd8472670ed92a60ed5ee74ba450bbccadf
-AUX spacerider-0.13-gentoo.patch 733 BLAKE2B 64b991821916babee46124fbb2e344582c43141195c85df098d7f5e99a76433a1dbb75e84263b535e36b0efbcd257e1b4baa73688fd0ec6bd9feb4e3fff06e43 SHA512 5303e0bf13dfde66b0a0b7d522cd317e742330ba7d77ec53daee3d3ae3f0ebd90ed545c57c0c9f601e5f69906a0d8c53be5641ba1564cdff583234fd6fcb22b8
-AUX spacerider-0.13-ovflfix.patch 343 BLAKE2B aeb30e5b74f38f534bf09322671f23b0921ab586749934ebcd32ee6692e82f06ca400c97dca342a6f593e62720dcf3294654df6d3d0db7e1f45620ef258346e9 SHA512 68ae2d0daf90de0c949f923605ce61275277391d80c3b4c965e6ebb2de92331c8481272e491f6cb81f18cc1818aa559f5a11f6916df8cc4c39045cd1f23e97bb
+AUX spacerider-0.13-font.patch 409 BLAKE2B e01077b6e2fafd317618218b54596036928c36812043976610f9109205aefb497f5b47ab814fe89e17ca0d1f191c2f78017d9c2c06518b78788d002a702d17ea SHA512 efbb6b47b19dcc653b380eaabfd817518887cc77aadb54e9dcfb7dc9c37e3a91c156eab7076eea90ffee698c1b9d1ac745a1638e023d35778eb35482d8f8dec5
+AUX spacerider-0.13-gcc41.patch 468 BLAKE2B 0c3b75a8a573ecacf808bb597429ca12ca59501b58bbf2aa73f64ce150a594659184ff32ff88770ea038eac232936491c750e75be81611ce8cd91910007a8922 SHA512 0cbd0c0003554bf90d8261af1c5db1617489bc5427b1e52caa0d56350df07939f007ba035cbdbb209176e3bbcec125c9171714631400ad5cad2323b8059f0765
+AUX spacerider-0.13-gcc49.patch 775 BLAKE2B 4b77bee14741fc4258d0fb3e8af69e9cceff2ac3886f97acab65c1e84dad27ccfc602aa0fb4d535b91d2c1947fc5adc1671cc725799e88ac60d78a01ebf791a5 SHA512 6ef7af29e88365fe3e34517ae6ee193a9b3765c77ecc883c8a34480c1944900388a9f89ca253031f673adae9552ff68eac5ec5af2203beff6835005a3f23bfb3
+AUX spacerider-0.13-gentoo.patch 737 BLAKE2B 7660dd666c6a838b7a8b64cd173f1a5dc7393163a42c2cdb919a8c719600e3cbb1b08ee2230f2d4675fa9702cf56ad556337eccee0fd66c3b82ef012aa641a47 SHA512 89bcf2565833ab462fdcdd16a97a5a339dcb82ad7e685754dfc3dca5c37093c10c787615338791c62b431222734953b2add3545fa41812ea0c6f63f7c02ce267
+AUX spacerider-0.13-ovflfix.patch 347 BLAKE2B 977a25efb7badce88c80f4ee5c68768910aa2139b94f3cd56ee996aac26053c749eea7d671f5bf02d055251060f3f9536493de513f79c617e96a1db4f8b90c91 SHA512 227d519c51555fa99a162e2abc939b53feb0abc817667c5b2edc502ff6e7265a0f86a750498dbed5f0741f7d5e6840b86c0421fc7770b10a7ac862cdaafb1af1
 DIST spacerider-0.13.tar.bz2 283861 BLAKE2B 89687ca24a663addb81af0c775201e1a57e6d524e9fb99766d4003a4401dc406e50c8d103600c57c7d4b30ee620b3ec60089f05aaa4e0ad9da72a6f5e64fd527 SHA512 4f8d506abfe242039247d5c4e43c012ded14f3b18de710aea0c9c6d933cb60fde3116008723d44acadd490b3666e107506fad6ee027d2b31c47d118185e0c03e
-EBUILD spacerider-0.13.ebuild 958 BLAKE2B 59d814133b1410382eff654b9bca1334887f7634cb06764a41db31b0777ce1fdf6b9529e4cbf0605311172c30b2b0171ac45b85f4a909aee71573d4b93acefc6 SHA512 95d6ffafc222bbfbd2d5806a5eac50596815d4768b651ddd2092cad85cf51cb86e500fecec02d689e09414235e75ede3f822a6b81428073d8b6a98ca8adfaa5b
+EBUILD spacerider-0.13-r1.ebuild 1049 BLAKE2B 0855a5400194c53dc8d5bd7984feaf491feecd192f64c64fe8357eca3bc00ae7108beff6c2d294498102b1145ee86b34be58aa31581095b5ddf688c6cafbed59 SHA512 916debef11bf13ee5eda029b5c067525a94baafd7b72308884ebd2c76259ff3ecf6dcd6725aad7c0dbaf9383aad0b1293d08bbddbfc06a0f5e556242b21e8fa6
 MISC metadata.xml 357 BLAKE2B 92788e73f724c0a4de633ee3b5a4f4b07c487b82de01a57ef7d2829b5f3f75617eda10727e8499f3d243360a7afcec28427e495f72d2ba48d6e32893865d3a33 SHA512 51a7291b12ee0c0f12cf55a0d24d8e2dd3cf44f9ef2023caa9c457b659dc677a9882512472525073c17717a7f56180c94a88a40d3db2d33bd843e31ca862739d
diff --git a/games-arcade/spacerider/files/spacerider-0.13-font.patch b/games-arcade/spacerider/files/spacerider-0.13-font.patch
index 914a0466c7fe..87732a106633 100644
--- a/games-arcade/spacerider/files/spacerider-0.13-font.patch
+++ b/games-arcade/spacerider/files/spacerider-0.13-font.patch
@@ -1,8 +1,8 @@
 Ugly brute-force method for avoiding a double-free segfault on exit.
 Better patch welcome.
 
---- spacerider.cpp.orig	2015-03-31 23:24:17.770966147 -0400
-+++ spacerider.cpp	2015-03-31 23:24:41.592174463 -0400
+--- a/spacerider.cpp.orig	2015-03-31 23:24:17.770966147 -0400
++++ b/spacerider.cpp	2015-03-31 23:24:41.592174463 -0400
 @@ -306,8 +306,6 @@
  		/* free screen */
  		SDL_FreeSurface(screen);
diff --git a/games-arcade/spacerider/files/spacerider-0.13-gcc41.patch b/games-arcade/spacerider/files/spacerider-0.13-gcc41.patch
index 1a08d715ac5b..e5524b6e6430 100644
--- a/games-arcade/spacerider/files/spacerider-0.13-gcc41.patch
+++ b/games-arcade/spacerider/files/spacerider-0.13-gcc41.patch
@@ -1,5 +1,5 @@
---- spacerider.cpp.old	2007-02-18 11:25:38.000000000 +0100
-+++ spacerider.cpp	2007-02-18 11:27:00.000000000 +0100
+--- a/spacerider.cpp.old	2007-02-18 11:25:38.000000000 +0100
++++ b/spacerider.cpp	2007-02-18 11:27:00.000000000 +0100
 @@ -17,6 +17,7 @@
  #include <unistd.h>
  }
diff --git a/games-arcade/spacerider/files/spacerider-0.13-gcc49.patch b/games-arcade/spacerider/files/spacerider-0.13-gcc49.patch
index d057e7bab730..b4d5ca6d5764 100644
--- a/games-arcade/spacerider/files/spacerider-0.13-gcc49.patch
+++ b/games-arcade/spacerider/files/spacerider-0.13-gcc49.patch
@@ -1,5 +1,5 @@
---- effect.cpp.orig	2015-03-31 22:36:53.336131373 -0400
-+++ effect.cpp	2015-03-31 22:37:04.359755281 -0400
+--- a/effect.cpp.orig	2015-03-31 22:36:53.336131373 -0400
++++ b/effect.cpp	2015-03-31 22:37:04.359755281 -0400
 @@ -18,7 +18,7 @@
  void Effect::add(const int x, const int y)
  {
@@ -9,8 +9,8 @@
  	{
  		return;
  	}
---- object.h.orig	2015-03-31 22:35:22.939214561 -0400
-+++ object.h	2015-03-31 22:37:19.654233441 -0400
+--- a/object.h.orig	2015-03-31 22:35:22.939214561 -0400
++++ b/object.h	2015-03-31 22:37:19.654233441 -0400
 @@ -172,7 +172,7 @@
  	return object->next;
  }
diff --git a/games-arcade/spacerider/files/spacerider-0.13-gentoo.patch b/games-arcade/spacerider/files/spacerider-0.13-gentoo.patch
index d692f87632b0..ecfdcc513cd0 100644
--- a/games-arcade/spacerider/files/spacerider-0.13-gentoo.patch
+++ b/games-arcade/spacerider/files/spacerider-0.13-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -3,12 +3,12 @@
  BINDIR=/usr/bin/
  MANDIR=/usr/share/man/man1/
diff --git a/games-arcade/spacerider/files/spacerider-0.13-ovflfix.patch b/games-arcade/spacerider/files/spacerider-0.13-ovflfix.patch
index 5ed73c348cf2..c590400f649f 100644
--- a/games-arcade/spacerider/files/spacerider-0.13-ovflfix.patch
+++ b/games-arcade/spacerider/files/spacerider-0.13-ovflfix.patch
@@ -1,5 +1,5 @@
---- spacerider.cpp.old	2010-10-29 10:12:19.000000000 +0200
-+++ spacerider.cpp	2010-10-29 10:13:47.000000000 +0200
+--- a/spacerider.cpp.old	2010-10-29 10:12:19.000000000 +0200
++++ b/spacerider.cpp	2010-10-29 10:13:47.000000000 +0200
 @@ -112,7 +112,7 @@
  				break;
  			case 'n':
diff --git a/games-arcade/spacerider/spacerider-0.13.ebuild b/games-arcade/spacerider/spacerider-0.13-r1.ebuild
index 6ac81d1fbcc1..8cf24d976f7d 100644
--- a/games-arcade/spacerider/spacerider-0.13.ebuild
+++ b/games-arcade/spacerider/spacerider-0.13-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 eutils games
+EAPI=6
+inherit desktop
 
-DESCRIPTION="space-shooter written in C++, using the SDL"
+DESCRIPTION="Space-shooter written in C++, using the SDL"
 HOMEPAGE="http://www.hackl.dhs.org/spacerider/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2" # stupid php script
 
@@ -19,24 +19,26 @@ DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-image[jpeg]
 	media-libs/sdl-net
 	media-libs/sdl-ttf"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}"-gentoo.patch \
+	default
+	eapply "${FILESDIR}/${P}"-gentoo.patch \
 		"${FILESDIR}/${P}"-gcc41.patch \
 		"${FILESDIR}"/${P}-ovflfix.patch \
 		"${FILESDIR}"/${P}-gcc49.patch \
 		"${FILESDIR}"/${P}-font.patch
 	sed -i \
-		-e "s:/usr/share/games/spacerider:${GAMES_DATADIR}/${PN}:" \
+		-e "s:/usr/share/games/spacerider:/usr/share/${PN}:" \
 		globals.cpp || die
 }
 
 src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}/${PN}"
+	dobin ${PN}
+	insinto "/usr/share/${PN}"
 	doins -r data
-	dodoc AUTHORS
+	einstalldocs
 	newman ${PN}.{1,6}
-	prepgamesdirs
+	newicon data/sprites/star_monster1/1.bmp ${PN}.bmp
+	make_desktop_entry ${PN} Spacerider /usr/share/pixmaps/${PN}.bmp
 }