gentoo resync : 28.04.2018

5 files changed, 25 insertions, 20 deletions

diff --git a/games-arcade/tuxpuck/Manifest b/games-arcade/tuxpuck/Manifest
index e0983b0fd86b..b29589ff2c76 100644
--- a/games-arcade/tuxpuck/Manifest
+++ b/games-arcade/tuxpuck/Manifest
@@ -1,6 +1,6 @@
-AUX tuxpuck-0.8.2-ldflags.patch 407 BLAKE2B 68e328087e5cd4481643bd3842f59b6df49d668d83449d6a907777435964e5bbb64c067bff1c3e848a3ef84e25cce29824ca59a162b21f464a2c9bc18738de1b SHA512 b586dcf8c14dfc591a746023075eb3fb64981f92aaf79c582884950195e25b5b5bada9b5e313c97cbd5efce200c06dee3718e782f94b6a28cbd0796a8b749c05
-AUX tuxpuck-0.8.2-parallel.patch 1701 BLAKE2B 1b4b89f16f4d33781b87f55e087bb8b737e43d967b40ef692a2658de05a7be4cd3cc01aa5baf431140766cf95eee8e5de8f76d3778dda76ca50380095181da93 SHA512 960e999273a847a103892103a13c07445442371e4a727d39ae65047ff1b19124db8f63102c8e06f4417499c4ace27cf43bd887376921e4e097406d141784a075
-AUX tuxpuck-0.8.2-png15.patch 2124 BLAKE2B 096103eda12a443618a6060420dfe8b1267a918576fbb026c0f586e1d724deadb739eea40b26dfde953928cd73628d699ffaa725431e1b10d4da44da43eb3c2c SHA512 b95ad05eaf5790fed9de66b7f6952fe6039b38e5204dda617b9c8bbf69ea613720bdc8111ed58881ddcc2438cb292bc4ddb34b47d2bd25801223ee66fb32ebcf
+AUX tuxpuck-0.8.2-ldflags.patch 411 BLAKE2B 0b0a20abe1daf4f02e07f23f8cc0273b5b7cf229ea3b9de3cb13ea4611ba5b6b932ebf9286ebcdb19605de672b66300530a6fb3ca776bdfd1a05a377976d7746 SHA512 50e91cfb89be78e7fbf45c361d9bd2bc2ef84770d868978dbc200bb9954b51789478e611f8e1197e418775624ce57c62424a6a456cd62ffe45ccb93aaa58a88a
+AUX tuxpuck-0.8.2-parallel.patch 1705 BLAKE2B a9402f63386287c1d77f58d6998869c5e946016fda93932f851de73e3edae4b3ec3e08fea68f86c98e5e490d5a168c1bb809332d379470c00db0527fd462e972 SHA512 e489e76fe86f62962017615015f9bca7f15e3b001265d7212ae99a27e833152ab6b1a4caacffc32c4143a47e06ee4d010114d70f57548c7d91ccc8e61667b5e0
+AUX tuxpuck-0.8.2-png15.patch 2128 BLAKE2B b9ebbeff8974dbfd0693dea225e9e73c044aaf5c0d8159458c2c8439fb3d1985c223c71a9e69d47d1c648abcf2784ed7a7d6f9a59a880d2e5b485d3498f0172e SHA512 d6d05b8e10736010a80af565d9dd6cc3aa076070796f348d86c0af8a7d008e1fbb9cffd4422d2193bbe880c0a2637f424879c6e9ce84427f01badbd2129c3b4a
 DIST tuxpuck-0.8.2.tar.gz 384009 BLAKE2B e60241c5e6825ae6570a0d3242178578ef1202d3fbb4276726fdfddb894883fe5e25218bb29f6fd8148d273ab91dd36f0624c814756d8375cea5b88f090fcde7 SHA512 875680f7fd9d4257884c58d8a5529082aac4dc10f1a9c9d08acd4e67ddb5e9c66dd84a4fbcc27e3673e329d845b0966ea683412ffe61f0a403d195eac0f32a46
-EBUILD tuxpuck-0.8.2-r1.ebuild 1115 BLAKE2B a605347d357f0043cc5b0b0f638247b70cceae66a94f6daa293df8e85d62ae88e96c718a6ddd5e92c779ca04c4bbf05e4da3f3f9d35a491d2d504ac2f90eef27 SHA512 246e03e94f24f6d7c6f119211b17d2f6b37a2cc3048c2189e32d5d33eadb823d56a6c326b12a4f3e47277e967e1ca0291ec4313c90a90e92e34045aed6f16f43
+EBUILD tuxpuck-0.8.2-r2.ebuild 1119 BLAKE2B 6a3fa12c250fa91ec24ee6468e4b8afc5985db2c582954aa3798f1654a150e569bb8908eadada5376d8d5dc9efc9b42979648eb511835a4e5e4591461a62b6c5 SHA512 461a2977b7d555a5ea7b55b2ddc0d7fa57a6ec75d99d022259edf82d5b820ec96d6e0cef2b3292313b9b4f3125e935f852a7961ca121fdc45b0f1a641e3836bf
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
index 28fcef48a7ec..b4abb60f0fd4 100644
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
+++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2010-10-05 10:34:57.000000000 +0200
-+++ Makefile	2010-10-05 10:35:28.000000000 +0200
+--- a/Makefile.old	2010-10-05 10:34:57.000000000 +0200
++++ b/Makefile	2010-10-05 10:35:28.000000000 +0200
 @@ -20,7 +20,7 @@
  
  $(NAME) : $(OBJS)
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
index cdcdecc42c32..7d9b199f55cf 100644
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
+++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
@@ -1,5 +1,5 @@
---- data/Makefile.old	2015-01-07 14:22:34.852150894 +0100
-+++ data/Makefile	2015-01-07 14:57:44.079822614 +0100
+--- a/data/Makefile.old	2015-01-07 14:22:34.852150894 +0100
++++ b/data/Makefile	2015-01-07 14:57:44.079822614 +0100
 @@ -15,20 +15,29 @@
  	ar r libdata.a $(OBJS)
  	ranlib libdata.a
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch
index ca9539f39e51..5860d2b1c171 100644
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch
+++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch
@@ -1,5 +1,5 @@
---- png.c.old	2011-09-14 16:25:54.415338149 +0200
-+++ png.c	2011-09-14 17:41:02.190803110 +0200
+--- a/png.c.old	2011-09-14 16:25:54.415338149 +0200
++++ b/png.c	2011-09-14 17:41:02.190803110 +0200
 @@ -38,6 +38,8 @@
    png_color_16 *transv;
    SDL_RWops *src = NULL;
diff --git a/games-arcade/tuxpuck/tuxpuck-0.8.2-r1.ebuild b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
index db5f2d7e5e27..b1df215d59d0 100644
--- a/games-arcade/tuxpuck/tuxpuck-0.8.2-r1.ebuild
+++ b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.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
 
 DESCRIPTION="Hover hockey"
 HOMEPAGE="http://home.no.net/munsuun/tuxpuck/"
@@ -13,14 +13,18 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="media-libs/libsdl
-	media-libs/libpng:0
+RDEPEND="
+	media-libs/libsdl
+	media-libs/libpng:0=
 	virtual/jpeg:0
-	media-libs/libvorbis"
+	media-libs/libvorbis
+"
 DEPEND="${RDEPEND}
-	media-libs/freetype:2"
+	media-libs/freetype:2
+"
 
 src_prepare() {
+	default
 	# Bug #376741 - Make unpack call compatible with both
 	# PMS and <sys-apps/portage-2.1.10.10.
 	cd man || die
@@ -33,7 +37,8 @@ src_prepare() {
 		utils/Makefile \
 		data/Makefile \
 		|| die "sed failed"
-	epatch "${FILESDIR}"/${P}-ldflags.patch \
+
+	eapply "${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-png15.patch \
 		"${FILESDIR}"/${P}-parallel.patch
 }
@@ -45,10 +50,10 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin tuxpuck
+	dobin tuxpuck
 	doman man/tuxpuck.6
 	dodoc *.txt
 	doicon data/icons/${PN}.ico
 	make_desktop_entry ${PN} "TuxPuck" /usr/share/pixmaps/${PN}.ico
-	prepgamesdirs
+	einstalldocs
 }