gentoo resync : 02.05.2018

5 files changed, 20 insertions, 20 deletions

diff --git a/games-puzzle/tong/Manifest b/games-puzzle/tong/Manifest
index 8867de3739f6..d9fb526a8084 100644
--- a/games-puzzle/tong/Manifest
+++ b/games-puzzle/tong/Manifest
@@ -1,6 +1,6 @@
-AUX tong-1.2-datadir.patch 1105 BLAKE2B 7f35e44fa4fdc6096f709f898b45b705984f7d199d58edf7bd4de645983e833ef95e4d6a5334d699417c9db30209eb7f1b227f00fb8ff734ef21061a606ec3ef SHA512 68b59062fb9c5c12eb2af7a1f4cdc47cff0ef1a656323b8fe28175931984c4336e5a763b5f6df32120311d4f84bc084341e455a29f19941d6a27b076e1213c6d
-AUX tong-1.2-fps.patch 553 BLAKE2B 00fa67fad7349ca16cf7146daa1f3c5f25aecc4f4756461dcbca92be97194c9ca2e2850ea2fc8acb0609546828805fbebdb54885b0bf4829ddc39110311423bd SHA512 789be3f3742d12166e58717dec9890f9051a86ae6aca072046c6874397f6cbb0d604fc4127228ac258dceab2425777207777167e6ec3c28baa0b39324f931692
-AUX tong-1.2-makefile.patch 897 BLAKE2B 2c4312fd9dcc7fd5fbd9e36e97dfa93f4d8b46aa29f531eb438c78447bea8b6ee03b1e9f4c7f048bbe86fdb0f242aae7814f3af498a0cb51a74071a70b43f4b3 SHA512 c342f686a57def0f07dd51aa7c180108624463db5ef1defc4ac4636df74a9b754dccf5c39615f0cf2a30caf77fd20b07a8d89d337a8e19cf148ae47d44fb0731
+AUX tong-1.2-datadir.patch 1109 BLAKE2B dfc55c8bf75942e047440ec25fb6c9d51bbaa13f3a62329a6aac4ae82283cc14fe9f3f80ad11a13f563952bb0566a4f4d8aa47d72b3bdbd031b54d584ba89642 SHA512 8f35bc65273a77ed9190bdff9acaa932ae96030092023e5282bb3edd651e51fa29f52eedfbcdaf504540b5fbc67b76364b839be20e4a93dde01fee852a8dd80e
+AUX tong-1.2-fps.patch 557 BLAKE2B 5123aab67c2552c5e0b2ba4a2ad9082b24fa6276056c22c9fe97de6f1aa725c119a85cea79ea6d9e7ebb6c13e18610dd804c776000ddf3396d22e4a07af7c902 SHA512 a29b875ad777dc912c4080d339e5e00f8087322f4e0995631eb30180d2c409b9ede0d7ac6e6aab5a194fca0ca6e405685310e5b898fefd75d74e469129242c8b
+AUX tong-1.2-makefile.patch 901 BLAKE2B 7619c3b3155c1c56f239a2c529affbd3f1e1a8a5cf738a5235f1b928a065cc1aaacc5a09000a48b55f299e6130aad707e3399d2fe22937dd44de71efea1f9bab SHA512 1e15918cbb9fa98e174e2853be5c99ff369667035371cda95756b30ea246a640be22d308f86052a355f58596b676843dbb546caf8dd1aac9a66aad4cb1f7b34a
 DIST tong-1.2.tar.gz 88028070 BLAKE2B b82b5c012f5d12953a6e84dfe38921cff2f0e244c2a9ad9ef606b5ee41c2f455dbb288ddb477f4eb96471ed3dd4cb4de2a8cea9155942c51f850d263fb22ee71 SHA512 0544f489141bba37985f1ef3c316208e3e6dacdea8f8b79f37997a9489ff5c1710fd1426e02489f8adb33bf9a1511bb9a0250122fa2054ef4a6ef203c8881261
-EBUILD tong-1.2.ebuild 1043 BLAKE2B b99fab835c89f9acd5bd33c1d3be0d7baac0c6523d7397ca372bc463df703679be3f5abb161b6307a100eab4c2de03302f398c5848aadcba3644d923cc05557e SHA512 1498fd416fb64ebae386cfab8b558328009d34369e8728b5f2f27cfbadfbaab082eaff061c9c07bc7d74c9e72ce6f2e521298e36304de021b2dfcb5418b7d6a1
+EBUILD tong-1.2-r1.ebuild 1011 BLAKE2B e65ec73abd842e978831156ee44cd89fc74944f2ea2dbcc2aa0894856fbcbee2f0191544c8076fb02abb7b2daa5e7cd2f2da8e5674b6b301eb98e0a4db4e0e9b SHA512 002557b55e0e4e46feedba17eee0746300d7c0ce28b7de0c13a78f292cbf662ea7517df08e0418689d9ccf2339f1cb2d940719d1c65c123fbe6dcdea07c81c0f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tong/files/tong-1.2-datadir.patch b/games-puzzle/tong/files/tong-1.2-datadir.patch
index d0279ac3b874..92a8bb4c18a1 100644
--- a/games-puzzle/tong/files/tong-1.2-datadir.patch
+++ b/games-puzzle/tong/files/tong-1.2-datadir.patch
@@ -1,5 +1,5 @@
---- tong.cpp.orig
-+++ tong.cpp
+--- a/tong.cpp.orig
++++ b/tong.cpp
 @@ -202,7 +202,6 @@
  	Tetrad *tetrad, *nexttetrad;
  	Paddle *paddle;
diff --git a/games-puzzle/tong/files/tong-1.2-fps.patch b/games-puzzle/tong/files/tong-1.2-fps.patch
index 8ce66ebf1d31..86566646b8d6 100644
--- a/games-puzzle/tong/files/tong-1.2-fps.patch
+++ b/games-puzzle/tong/files/tong-1.2-fps.patch
@@ -1,5 +1,5 @@
---- tong.cpp.orig
-+++ tong.cpp
+--- a/tong.cpp.orig
++++ b/tong.cpp
 @@ -64,6 +64,8 @@
  
  #define DEMO_TIME           8000
diff --git a/games-puzzle/tong/files/tong-1.2-makefile.patch b/games-puzzle/tong/files/tong-1.2-makefile.patch
index 68b4547d9427..ad9b283f4785 100644
--- a/games-puzzle/tong/files/tong-1.2-makefile.patch
+++ b/games-puzzle/tong/files/tong-1.2-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig
-+++ Makefile
+--- a/Makefile.orig
++++ b/Makefile
 @@ -1,11 +1,10 @@
  # TONG! makefile, tweak as you see fit
  
diff --git a/games-puzzle/tong/tong-1.2.ebuild b/games-puzzle/tong/tong-1.2-r1.ebuild
index 9ca7ebcb55be..a16067fc57ba 100644
--- a/games-puzzle/tong/tong-1.2.ebuild
+++ b/games-puzzle/tong/tong-1.2-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
 
 DESCRIPTION="Tetris and Pong in the same place at the same time"
 HOMEPAGE="http://www.nongnu.org/tong/"
@@ -18,27 +18,27 @@ DEPEND="media-libs/libsdl[sound,joystick,video]
 	media-libs/sdl-mixer[vorbis]"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}/${P}-makefile.patch" \
 		"${FILESDIR}/${P}-fps.patch" \
 		"${FILESDIR}/${P}-datadir.patch"
 	sed -i \
-		-e "s:\"media/:\"${GAMES_DATADIR}/${PN}/media/:" \
+		-e "s:\"media/:\"/usr/share/${PN}/media/:" \
 		media.cpp option.cpp option.h pong.cpp tetris.cpp text.cpp \
 		|| die
 	cp media/icon.png "${T}/${PN}.png" || die
 }
 
 src_install() {
-	dogamesbin tong
-	dodir "${GAMES_DATADIR}/${PN}"
-	cp -r media/ "${D}/${GAMES_DATADIR}/${PN}" || die
+	dobin tong
+	dodir "/usr/share/${PN}"
+	cp -r media/ "${ED}/usr/share/${PN}" || die
 	dodoc CHANGELOG README making-of.txt CREDITS
 
 	make_desktop_entry tong TONG
 	doicon "${T}/${PN}.png"
-	prepgamesdirs
 }