gentoo resync : 19.04.2018

4 files changed, 19 insertions, 22 deletions

diff --git a/games-arcade/gav/Manifest b/games-arcade/gav/Manifest
index 70fb1ff9a0f8..eb00599926d9 100644
--- a/games-arcade/gav/Manifest
+++ b/games-arcade/gav/Manifest
@@ -1,5 +1,5 @@
-AUX gav-0.9.0-gcc43.patch 201 BLAKE2B 7e5d928ea2cc742149a796b8a3903a7d3aba08fb64507f3d9af1d7c860b8056f2071d63b5550ac88990dcd7c19f7d0bbbcc6d1345c345131b8cecc6b8cf9a57f SHA512 bff9eab5a70eda4927983a073e726f59eb82c8c54cd04fd05f7db498cbb71fba75fbe37b69a6bec5b68ad11a1c32ecaa92b7e45fd0b224b2d51e3261e8c170b0
-AUX gav-0.9.0-ldflags.patch 742 BLAKE2B aafd990b8517ba2d4ef5bdcd43afb5c79a9b95c82894fe6865e5bed5683452e1d71380ddc69bf7589fd6405ecd3018b39746d02508668017499990d594334c1f SHA512 506b26e18cfa34c99759b79fabb3b75abd4ba520de04c2c769cecb65292645faac60b9cc52f96fa4ce90935ad0aacf5bebab4b9a3aa0085b41c4fb516f80aef1
+AUX gav-0.9.0-gcc43.patch 205 BLAKE2B c0f25a3f0eed1ca502a349f212bdc2609404721d500cada1b048459adda9fd4242a1e9fef5e8bb5b31feb944fb643aabbc442c31205e1a888a510d4a1e5fa5af SHA512 bce41254f527e007fb44d8616ab2cfce7f55236bb23cc9d456b8757e7521f38ad2926617a996c9b6677d91cbc3cfcd8eb1c4f43cdf53861d946cd53115761b2b
+AUX gav-0.9.0-ldflags.patch 750 BLAKE2B ef3184794f42513fbe582c48b1b82d0c33b71fb8f72d709ff187ee2f247a509eb332561de786e94c62b64ce0f2ca51a342870365db8eeda82ea04a99f902093d SHA512 95239c11a59311920d255449bb5ed40c962ab331bc705b1107a42d18b6581aa800c7c08562d0887f844bb231c87d639ec087b925f8ffc44a4e20dd63a3fd6a5a
 DIST fabeach.tgz 163750 BLAKE2B d5cf3ef38925515caae67d78bc1623bd1ee5669d1d25d122023bbfe1deb59ef7f12859d4bcac95bc43f3a3c4b88208742b91b3acb73a16945f0e8356059a8e6a SHA512 c0ce8e20a2bece7beeb66a036abcffa1394fcddc0aa255fe244e86548b2c0d7ec4a72a903f2108a44e84590d9986ee6729d67e5ec103b867bbde01772d524978
 DIST florindo.tgz 175052 BLAKE2B 5c03691265fec40b3a20903383f070ccfe8527e06cb18cf5e65f32fcf16d17e8e6e56890790802ffeb9262f9933291a0bb1ca22c38f54cbcd5a00e346b4304b7 SHA512 91a42c209d9370f42a7918ea0b6b63ed9c2dcacdbf3051dc2535293b2e2a9b1b53795a7db476fd5c7b3da9682b5ddaf8a2ceab50bc4bdeefde33416de82197dc
 DIST gav-0.9.0.tar.gz 137729 BLAKE2B 15b27ed4019dd9306e629721e59c075b2189c180cc5b4ec866ce1007578ca9e9f8a85bfcb1d22bb7fecd4a6b39b4c62c48ed7e9268e22475bced8c4c8c925a34 SHA512 e702269371dc8ed4ce4415a24a703ef6c3604af69f2e0c548a48f282d812b4f3f76f74cb36a6036889b9e3628b844d2fa41e2cfde5b0fe647bceadc64c087a9f
@@ -8,5 +8,5 @@ DIST naive.tgz 80169 BLAKE2B c2273b0056194d50ff7499c9440c0dd45175609bcb4ccab9095
 DIST unnamed.tgz 156406 BLAKE2B db88b9863ca309b9b3236dd5940642912cd4a7fd1584b842171b65033f8c47fcc6d0eb9185d3759059f4648442b446c47c0dac21c1cb37a07850703ca04f1996 SHA512 530084b5e49e40447cb68545fb4b01f837e74efa3bfb9a110f13037a7f6c135e23f9ed49837abe918a8b393226f90a2d206e5bfd2f4e60335ebf7bc4e8341673
 DIST yisus.tgz 131021 BLAKE2B b095277fdf33968b2b5d28b2e737a465a09f34b6c570d0bdb7e3be2a0c36d8d0ae4d62d14e427a139e035343faf6b1972677fa94c4aa4b787a3ce79ab3c0a137 SHA512 2494e10998bf73c369e6591edeca4c466dfdba1901ca69d96838e0310eb36c94690b9fd6df3c0aa91e0ac611ec414acf402f532145eb795a43e15406aed4c604
 DIST yisus2.tgz 117923 BLAKE2B 57770e7326cbe203aca03d37411c8f9267e9ebbd3a104d91e5e4519eb22439066bf8ef7a5eb46476103731faf0c9726eda74351c01a5ae50c6265db49409d2e6 SHA512 a063908230e9085536322481bf511cc3f3df3997d27dd83e9f976762670e2bdbebc634c2566549fe856ddc93302422cf8676147937d2cbbcf7262e722c999f4d
-EBUILD gav-0.9.0.ebuild 1604 BLAKE2B f62000760c20a051e009466c8183637969c0cb1d012b496539fff474e81d3f5529d1d2cccfa82cb81ee42cd1297ba0b0bda538edd73305453b316834be9b3764 SHA512 007de01f66132d0de4acc313f754c3e67704c5fb6973f7e6e403c6748f2f755ad00a3f986e2d354174faa59dd179fef6b10031422fb71db11c65728b8926475a
+EBUILD gav-0.9.0-r1.ebuild 1485 BLAKE2B 50430334e0d1ce99ad94ba96222e6a0aafcab743d3a2d95a764400e8074526fb612145d1521b13fb745de490851944df6b16af39675dfd30814dffe6548df5da SHA512 54da3dc7b644b905280dc9a01ad482a091e4a7dce42acc304a21a899bf624de0ccfcf2253e123a4b9c4cef7f6959fd93f87e1d4d184b45a640b354856ca7b734
 MISC metadata.xml 326 BLAKE2B 8975ed6ba9c69a5ca31562e37d19841bd3e8ed53604b2d2dee7d188d510f167d8c154ae1337bf7195cdc9aca9badc3e86bf210e4fdc89016cb8b134660977845 SHA512 be67de8c13d7163c370e9f884dc50665720cd899c4f7d76859734751bf494f561a93fe344f04753180e27c0f854c4020dec2d9611f44d547c7b613aad705d9d7
diff --git a/games-arcade/gav/files/gav-0.9.0-gcc43.patch b/games-arcade/gav/files/gav-0.9.0-gcc43.patch
index 06bc1a5d2542..c9b8a6e588bf 100644
--- a/games-arcade/gav/files/gav-0.9.0-gcc43.patch
+++ b/games-arcade/gav/files/gav-0.9.0-gcc43.patch
@@ -1,5 +1,5 @@
---- Configuration.cpp
-+++ Configuration.cpp
+--- a/Configuration.cpp
++++ b/Configuration.cpp
 @@ -25,6 +25,7 @@
  #include <stdlib.h>
  #include <string>
diff --git a/games-arcade/gav/files/gav-0.9.0-ldflags.patch b/games-arcade/gav/files/gav-0.9.0-ldflags.patch
index 04188320ac4b..dd49e6161660 100644
--- a/games-arcade/gav/files/gav-0.9.0-ldflags.patch
+++ b/games-arcade/gav/files/gav-0.9.0-ldflags.patch
@@ -1,5 +1,5 @@
---- CommonHeader.old	2010-10-12 13:08:23.000000000 +0200
-+++ CommonHeader	2010-10-12 13:08:48.000000000 +0200
+--- a/CommonHeader.old	2010-10-12 13:08:23.000000000 +0200
++++ b/CommonHeader	2010-10-12 13:08:48.000000000 +0200
 @@ -31,9 +31,9 @@
  endif
  
@@ -12,8 +12,8 @@
  endif
  
  SRCS	= 	$(wildcard *.cpp)
---- Makefile.Linux.old	2010-10-12 14:36:47.000000000 +0200
-+++ Makefile.Linux	2010-10-12 14:37:02.000000000 +0200
+--- a/Makefile.Linux.old	2010-10-12 14:36:47.000000000 +0200
++++ b/Makefile.Linux	2010-10-12 14:37:02.000000000 +0200
 @@ -38,8 +38,7 @@
  	$(MAKE) -C $(@D:%_module.o=%)
  
diff --git a/games-arcade/gav/gav-0.9.0.ebuild b/games-arcade/gav/gav-0.9.0-r1.ebuild
index 058dbaf64bc1..d039cac137a7 100644
--- a/games-arcade/gav/gav-0.9.0.ebuild
+++ b/games-arcade/gav/gav-0.9.0-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="GPL Arcade Volleyball"
 HOMEPAGE="http://gav.sourceforge.net/"
@@ -27,19 +27,17 @@ DEPEND="media-libs/sdl-image[jpeg,png]
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
+
 	local d
 
-	epatch "${FILESDIR}"/${P}-ldflags.patch
+	eapply "${FILESDIR}"/${P}-ldflags.patch
 
 	for d in . automa menu net ; do
 		cp ${d}/Makefile.Linux ${d}/Makefile || die "cp ${d}/Makefile failed"
 	done
 
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	sed -i \
-		-e "s:/usr/bin:${GAMES_BINDIR}:" \
-		Makefile \
-		|| die "sed failed"
+	eapply "${FILESDIR}"/${P}-gcc43.patch
 	sed -i \
 		-e "/^CXXFLAGS=/s: -g : ${CXXFLAGS} :" CommonHeader \
 		|| die "sed failed"
@@ -60,10 +58,9 @@ src_compile() {
 }
 
 src_install() {
-	dodir "${GAMES_BINDIR}"
+	dodir /usr/bin
 	emake ROOT="${D}" install
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	doins -r sounds
-	dodoc CHANGELOG README
-	prepgamesdirs
+	einstalldocs
 }