gentoo (leap year) resync : 29.02.2020

3 files changed, 42 insertions, 26 deletions

diff --git a/games-arcade/gav/Manifest b/games-arcade/gav/Manifest
index 90b40a370394..1cb2bde0a8dc 100644
--- a/games-arcade/gav/Manifest
+++ b/games-arcade/gav/Manifest
@@ -1,5 +1,5 @@
 AUX gav-0.9.0-gcc43.patch 205 BLAKE2B c0f25a3f0eed1ca502a349f212bdc2609404721d500cada1b048459adda9fd4242a1e9fef5e8bb5b31feb944fb643aabbc442c31205e1a888a510d4a1e5fa5af SHA512 bce41254f527e007fb44d8616ab2cfce7f55236bb23cc9d456b8757e7521f38ad2926617a996c9b6677d91cbc3cfcd8eb1c4f43cdf53861d946cd53115761b2b
-AUX gav-0.9.0-ldflags.patch 750 BLAKE2B ef3184794f42513fbe582c48b1b82d0c33b71fb8f72d709ff187ee2f247a509eb332561de786e94c62b64ce0f2ca51a342870365db8eeda82ea04a99f902093d SHA512 95239c11a59311920d255449bb5ed40c962ab331bc705b1107a42d18b6581aa800c7c08562d0887f844bb231c87d639ec087b925f8ffc44a4e20dd63a3fd6a5a
+AUX gav-0.9.0-ldflags.patch 780 BLAKE2B a0774f9ce38dd7a926b13e22e16c8c88e66034f2d61c7da53445b4004adfd550aec1e4ebc47496f4dc474534a3fd4eb8cd70a51e4ae2ae4755c937c4cc875af2 SHA512 ef0c6ee7b6e8969b7a2e8140f3bc7ba8c4f7109676a0ef45963071c87d3c0424258d61dfa11af1b6138b3b3b488f32e68b67f1841a106c6ce496b8f05584d1b8
 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-r1.ebuild 1475 BLAKE2B 6d8e0f2f8c98fef7cff7e793cc882f62f31d0f3e459ec32bbb07f5a24906fc695f33f36d0af6dc543e05226e39c6852d498cf5477b0a5386c2c19b4d1579ce4b SHA512 0951998b6cf7b8bf5b363db565809ef6c281b2ee9a03276ec8df7350d32c33896e02929f0e972875cbc59985fe51722817f180e6e7e3f2090b4bcf20a81f3f3e
+EBUILD gav-0.9.0-r1.ebuild 1443 BLAKE2B 015bb71dcecd1ba0b546afa6b846025ab4b08e39807fc50226d5ba662b18421de4710d6f87282d37f51dfc3589d65fb32e2462a66ec60ab6a36e2a004c7c8640 SHA512 426ab815e6ecb4303cdfd6aecd17185f0ab67e89b551d64c49b6bdd48c50578c2e92d66f7e417e144356ac16d06699af9acc31c3af667d1eb46f1c8691faeced
 MISC metadata.xml 326 BLAKE2B 8975ed6ba9c69a5ca31562e37d19841bd3e8ed53604b2d2dee7d188d510f167d8c154ae1337bf7195cdc9aca9badc3e86bf210e4fdc89016cb8b134660977845 SHA512 be67de8c13d7163c370e9f884dc50665720cd899c4f7d76859734751bf494f561a93fe344f04753180e27c0f854c4020dec2d9611f44d547c7b613aad705d9d7
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 dd49e6161660..8579ce878e7c 100644
--- a/games-arcade/gav/files/gav-0.9.0-ldflags.patch
+++ b/games-arcade/gav/files/gav-0.9.0-ldflags.patch
@@ -1,6 +1,17 @@
---- 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 @@
+--- a/CommonHeader
++++ b/CommonHeader
+@@ -22,18 +22,18 @@
+ NET = true
+ 
+ LD = ld
+-CXX = g++
+ 
+-CXXFLAGS= `sdl-config --cflags` -g -Wall -DAUDIO
++CXXFLAGS+= `sdl-config --cflags` -Wall
++CPPFLAGS+= -DAUDIO
+ 
+ ifndef NET
+ CXXFLAGS+= -DNONET
  endif
  
  ifdef NET
@@ -12,8 +23,8 @@
  endif
  
  SRCS	= 	$(wildcard *.cpp)
---- a/Makefile.Linux.old	2010-10-12 14:36:47.000000000 +0200
-+++ b/Makefile.Linux	2010-10-12 14:37:02.000000000 +0200
+--- a/Makefile.Linux
++++ b/Makefile.Linux
 @@ -38,8 +38,7 @@
  	$(MAKE) -C $(@D:%_module.o=%)
  
diff --git a/games-arcade/gav/gav-0.9.0-r1.ebuild b/games-arcade/gav/gav-0.9.0-r1.ebuild
index 47e97a0e85ae..06d00b3ebba1 100644
--- a/games-arcade/gav/gav-0.9.0-r1.ebuild
+++ b/games-arcade/gav/gav-0.9.0-r1.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="GPL Arcade Volleyball"
 HOMEPAGE="http://gav.sourceforge.net/"
 # the themes are behind a lame php-counter script.
-SRC_URI="mirror://sourceforge/gav/${P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/gav/${P}.tar.gz
 	mirror://gentoo/fabeach.tgz
 	mirror://gentoo/florindo.tgz
 	mirror://gentoo/inverted.tgz
@@ -19,34 +21,35 @@ SRC_URI="mirror://sourceforge/gav/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/sdl-image[jpeg,png]
+RDEPEND="
+	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-net
 	media-libs/libsdl[joystick,video]"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+)
 
 src_prepare() {
 	default
 
 	local d
-
-	eapply "${FILESDIR}"/${P}-ldflags.patch
-
-	for d in . automa menu net ; do
+	for d in . automa menu net; do
 		cp ${d}/Makefile.Linux ${d}/Makefile || die "cp ${d}/Makefile failed"
 	done
 
-	eapply "${FILESDIR}"/${P}-gcc43.patch
-	sed -i \
-		-e "/^CXXFLAGS=/s: -g : ${CXXFLAGS} :" CommonHeader \
-		|| die "sed failed"
-
 	# Now, move the additional themes in the proper directory
-	mv ../{fabeach,florindo,inverted,naive,unnamed,yisus,yisus2} themes
+	mv ../{fabeach,florindo,inverted,naive,unnamed,yisus,yisus2} themes || die
 
-	# no reason to have executable files in the themes
-	find themes -type f -exec chmod a-x \{\} \;
+	# no reason to have executable bit set on themes
+	find themes -type f -exec chmod a-x '{}' \; || die
+}
+
+src_configure() {
+	tc-export CXX
 }
 
 src_compile() {
@@ -60,7 +63,9 @@ src_compile() {
 src_install() {
 	dodir /usr/bin
 	emake ROOT="${D}" install
+
 	insinto /usr/share/${PN}
 	doins -r sounds
+
 	einstalldocs
 }