gentoo (leap year) resync : 29.02.2020

19 files changed, 134 insertions, 107 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 4cf89e8dcbda..e166096b2a48 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/circuslinux/Manifest b/games-arcade/circuslinux/Manifest
index 89267782775d..ae3d9a5de4fe 100644
--- a/games-arcade/circuslinux/Manifest
+++ b/games-arcade/circuslinux/Manifest
@@ -1,3 +1,3 @@
 DIST circuslinux-1.0.3.tar.gz 1253839 BLAKE2B 1f0b57e417144b88688b2f900efebd95d35d7656a16a1b074197e0bd1fb33de3434582ac66e3bf996e7f1fbaafaefadc5091967696eecfcbbdf4a1c2316e0d17 SHA512 292bcaad39342ad69862f1add36b11505ca5f2601637a8db6fad438c5a4b32d7801bc7e6c08b903b0fb8bf68dcb3ec8d968fb913cde65941b9b9ac64b5a5266f
-EBUILD circuslinux-1.0.3-r1.ebuild 779 BLAKE2B a0fb16d476f708bdac79382cceced694b8fdc03abbb8417985d04523d1443c325640d89502709cd22bedb58f8ce6017495c4cb54b29516638d9d34ec812e9f0d SHA512 8b87bf86f8819e5965ba73716063dc435fdb69330c2b891132ab599e8fafaae6c0833fb5085680a8915db3b8d86566e87b96c5bf371e507df29c26149f18c5b1
+EBUILD circuslinux-1.0.3-r1.ebuild 775 BLAKE2B db816b156f1ee60a4ec1cd5ab0ab7e5801392222b70b3c2780e385b7ea2056f6d78a797130cd17fac1831f77d8900047c8b798acbe2e0ca3a4dd2afd99e6da6e SHA512 bca4aa9664d722f72cda03396583eccb04e27d9da5a5835a71a3628f1f02b798d6c6fa14ae522ea27190f9ca20a420e630febb7e68f930bdd9b6166cded65963
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild b/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild
index bc3c43f34833..1001c7c8aeba 100644
--- a/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild
+++ b/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,7 @@ src_prepare() {
 		|| die
 }
 
-src_install () {
+src_install() {
 	default
 	newicon data/images/${PN}-icon.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Circus Linux!"
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
 }
diff --git a/games-arcade/kobodeluxe/Manifest b/games-arcade/kobodeluxe/Manifest
index 4cd8de944a2c..85770fb2b965 100644
--- a/games-arcade/kobodeluxe/Manifest
+++ b/games-arcade/kobodeluxe/Manifest
@@ -1,5 +1,5 @@
 AUX kobodeluxe-0.5.1-glibc2.10.patch 219 BLAKE2B 78c45966711049c7715ae0efd18289be82b4ea3965d85338ab81c79f07785273a6d767cf471deace08722b3ab9b8581a45201e30343b9e6ad784d820256b7dd9 SHA512 77624a0e18958d76c938e9d1becb72803079364612056687fb955cc912bda9b4443c7e6245abb6a32cc3ff96b04c63993e3cd114f73115254efe7b50f749a45c
 AUX kobodeluxe-0.5.1-glibc29.patch 2408 BLAKE2B c3abfe3594b2c43428d4e49a34285680a1ae2ac40106aac255aa2da846a67ecbcfcf8f5d8af48ca0adbf627d188f6a8941d6b4f75df3bdad39fff4d869b324e1 SHA512 de2014b9a0607ddb5853c63eb4c14daf4f14d2158697348d952305db09b4a8f84a3a918cd730085f01120b7cbcfae076afd73c559c1ddd46f5a9777c89e76897
 DIST KoboDeluxe-0.5.1.tar.bz2 1781752 BLAKE2B d7f08ab9603b861f8992629bac9a65051a3c5fee6822f1951d57cbc5c31055a6cefeed098637dda84c0a1538645f47816848d767a4fa7916726b5784dfbc0414 SHA512 fc107e4367fd300574823aa40c68311d95de3a403d7c930963b8754aac14293f0624996fd77c4de0677921d11883047b68dd95df81eeb03078c37426ebd58afd
-EBUILD kobodeluxe-0.5.1-r1.ebuild 1240 BLAKE2B bf7875f2773598a895ff9749090ed2f8401ba16003899c72b24df371fe1098b2ad3014eea11b3039cf6bda82d9e4a4567cbeadec9ed1d94ce62f3ee4bc561ff9 SHA512 dbcd2e12238fe34d2dfd9cfdd89a67dbed625eeffba442088c556e66ec996a91f68b51c9e56aabb6e2fcbe5cc4c3481ad02c4b08ee3b95fa63577c1475c0dd98
+EBUILD kobodeluxe-0.5.1-r1.ebuild 1236 BLAKE2B b34a08fdd3c518443f53af54f67d3edc96e6350b918e132688c569a430914eed0f23b6474a9f9ec286590e0fe1958f795d1ef9a943cabcabb4870049b15fe89e SHA512 fe75c34de56bb558cdda8d30d33aa392e70ae6750daac99e53752045e9321c02396149be685a5de4a162172fb09d56e4c4f15f2e3f9a12c2ae83594d043939fe
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild
index 846176da162e..ed655d6c5b87 100644
--- a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild
+++ b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,7 +48,7 @@ src_configure() {
 	econf $(use_enable opengl)
 }
 
-src_install () {
+src_install() {
 	default
 	newicon icons/KDE/icons/32x32/kobodl.png ${PN}.png
 	make_desktop_entry kobodl "Kobo Deluxe"
diff --git a/games-arcade/late/Manifest b/games-arcade/late/Manifest
index fc68d23fff7f..d3a762548e00 100644
--- a/games-arcade/late/Manifest
+++ b/games-arcade/late/Manifest
@@ -1,5 +1,5 @@
 AUX late-0.1.0-gcc43.patch 190 BLAKE2B 4105d416951cb0c7cf15476dabd35695f2da4f491069f308b705316960c51702ba3407575b82d1a56eddb636cb69265c3ad980c90603f4944bd1bfdf5d7d8d43 SHA512 0c75110c749029b56838d0b67f6ccfb18a8861c5ddd7f4256ee4644b6a176ba9b53f3dea80035e9576904344ea6e867bfcd11087d9463898fe8b1b2458afb652
 AUX late-0.1.0-gcc46.patch 283 BLAKE2B 0e25d7738f81b3d2d626094bbe5c59426f5c859b9432ca5bdb2e4f50ebf1c06df9ec2170a76ffaa032a4c7f383d4c832930fe5369de9cb931c6d0e1763b96398 SHA512 4284066e07331e77dda457ecbb62d387eebda33cd98a1bc4095cbac11871ff5728d4a9ae9737882b0f411958d0318eadf54f661ad85884902bee8ff5ac6836b8
 DIST late-0.1.0.tar.bz2 1560232 BLAKE2B c8d80639fba66d605ea37dbd3ad1fb790b50854f7b2223b4bba0c4f6b94fed2471a725e3e9be66a74526ef4666464377e773b93b0de5dba0b3bcf6fd5ad33fac SHA512 6b3f4d27a723ae450bd8dda375c8663c1a3f457ffbe0a91f5eb96efdd797c2370ec68894df7a4d31e7124b28f3b41b3b952805901427c6ea3502b0d4d13cd72e
-EBUILD late-0.1.0-r1.ebuild 723 BLAKE2B b8c39431169cb32b5f5d1fe2aad1fbf46b8070df6aff4239aa05a403c374b306f1ef0ca2725c3f27673746a8fd8248e8aaa13e43f4ed0c61f6abef70010ca4b7 SHA512 ea9e650288fca7c34d765553f945dfef35826bdac51f67eac04b749661e4a2f8bfd627779cb81cd00b214ed927d64a0ddda42d3401d915313c5a873f84288e92
+EBUILD late-0.1.0-r1.ebuild 719 BLAKE2B a1aeb8074390b71d123ba7cd71b862ad00d8b91366a2c45d4c1be188333b9286480206901650b57b486c8b2fd2fabe97f0637ecad560bd4320e3d8f19204da27 SHA512 039b3de0bf2cdbdf02ea2a0ff3ef1c6c6e1d7c1db6d679f39428e23326f669e35e875b24436c091519c633125c58be482031c4978fd48b4f007557d445ce610f
 MISC metadata.xml 327 BLAKE2B 58b2f933988e0ce86eee474e029e339643df2c448488e33b8dce5a97f3e117d8b3197a7e2276c4f208d0de17a2abc7ee5b01c97ec813c1986f039dc2509a19d9 SHA512 8646246369ce084393463912bb6b8305f6f3336de50adc223faeb9c87f3d4d87750515d8f0fc9b03d2f2d10840357f559bbb9d8f302affe06aa4d6a68d80f3d9
diff --git a/games-arcade/late/late-0.1.0-r1.ebuild b/games-arcade/late/late-0.1.0-r1.ebuild
index dd837c5f6220..de1a4c7a13c5 100644
--- a/games-arcade/late/late-0.1.0-r1.ebuild
+++ b/games-arcade/late/late-0.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ src_prepare() {
 		|| die "sed failed"
 }
 
-src_install () {
+src_install() {
 	default
 	newicon graphics/latebg2.jpg ${PN}.jpg
 	make_desktop_entry late Late /usr/share/pixmaps/${PN}.jpg
diff --git a/games-arcade/trailblazer/Manifest b/games-arcade/trailblazer/Manifest
index 568ddd9e8ded..bb6bd45bee0e 100644
--- a/games-arcade/trailblazer/Manifest
+++ b/games-arcade/trailblazer/Manifest
@@ -1,5 +1,5 @@
-AUX trailblazer-0.9-ldflags.patch 317 BLAKE2B 49b4737c6527b209d12260314569224909ae9eba4a4b7643b426fdebf438ffc975f3a812380fa8bedfb7a4a3d1e36cc82cda0f2381a5cfcf42dee284c83b86ec SHA512 ba7885017a4e1d6a653119d591205a9e640d9c17c7a8b79226ce1c8f6b3ff3e1a6727a7b2d78cb7cfe21263c290288c8e140d6abcce751e1d9c79feeed5c2ff2
-AUX trailblazer-0.9-underlink.patch 320 BLAKE2B 06f88c4d95d5cafd818611d3f2c991cc82213a6e7f655f0ae8a2017d6404495568edb279e8cd509eaa2c437918dc33df83b160bc5950877ce974c0d582d789ac SHA512 c7f1f69b86e81e26257cffed457c921bbf4d8e991249913b5f6a3a04bd5b24974f46e34484c96ce7f2c2b261e69ce711e5b14cb86c2026cbdfacfda783e3c05d
+AUX trailblazer-0.9-gentoo-fhs.patch 572 BLAKE2B 91d31383be2844c2a01b0aa9ec6c9d4f4f8fee603c8ed4487f97178eccc5c4fe08524eb87c9bfaeb298ed8ca3a609667c1c86ce0fc45d3eb71a2033a57f20c5d SHA512 70db7854990985da3f91bc3eba9f09aa2eb53b2276ef8dd313baafccb145166c3b9beb8774189c4d05997f15ff673c4b2d228fadbc240b1132575cc2d600e8be
+AUX trailblazer-0.9-makefile.patch 472 BLAKE2B e7b65d40b283289d5f393dc04ab7dccdcd21f3870f2bc6339509bec8bffe31f64f4a0d46a1bba3c6c7836d0c41ef6c4d314756f98004c7fc4c3c05b1f598336c SHA512 2f423f71df5a57e596e65a8c88f3c272b0fc7f6d050c4cad975cda6d4e2880a95193c21678726bbfd7ae604941be5878a2990b5be54a2d70bfa6a432bfa66c79
 DIST trailblazer-0.9.tgz 20753 BLAKE2B f2cce7647ac9f5b9c2f048f6395f735a6c19432aafbbcea4e7210826a0773bf012a2772da1e44219d12d0ef1a96dc3f410404f0887bd0cbf8c1c5285ef708e22 SHA512 fddb379c2aee41e85042f4100bf08b2f1ca6393716fef1afa964c25dbcabfcd7df1d5c678c23b0f0f3ae1e1c757b01945e04934f67273434d0b51d441114f884
-EBUILD trailblazer-0.9.ebuild 1058 BLAKE2B cc4d733d196a6c1493e752a01d22b14735402df0a2b36a4e2342bf255b7d3f5a9c4d418fe50e953668700ab912e0ded5e9507eb58addc6dda829251c149a225c SHA512 a3171dd6af2f696774107781b618be2edd674281626b62a5c1104bb3a4a8b0955c9b9ec05a2efa4a60def2df20e7e49dc429ceac371b514aab94130d54f35912
+EBUILD trailblazer-0.9-r1.ebuild 747 BLAKE2B f59582f8370844e88fc53b2cee30db7e57edd3f87c10eb25841fb230658d036c416341a6f3bf5687a7246c61a78450a451896724223ac5d48e3f3375e89068d8 SHA512 df1c05ab7ff9ddedfdec9941d9bc9bdd7b708a503899a930f165e275d2ce2fb904645521b330953740af99455727f141e7cf790a2121508d80cb6a331e081fbf
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/trailblazer/files/trailblazer-0.9-gentoo-fhs.patch b/games-arcade/trailblazer/files/trailblazer-0.9-gentoo-fhs.patch
new file mode 100644
index 000000000000..d8f6650b61cc
--- /dev/null
+++ b/games-arcade/trailblazer/files/trailblazer-0.9-gentoo-fhs.patch
@@ -0,0 +1,20 @@
+--- a/map.c
++++ b/map.c
+@@ -63,7 +63,7 @@
+         }
+     }
+     fclose(f);                              // Close the file
+-    f = fopen("/usr/share/trailblazer/trail.time","r");
++    f = fopen("/var/trailblazer/trail.time","r");
+     if (f != NULL)
+     {
+         for (i = 0;i < MAPMAX;i++)
+@@ -87,7 +87,7 @@
+         if (Map[i].Data != NULL) free(Map[i].Data);
+         Map[i].Data = NULL;
+     }
+-    f = fopen("/usr/share/trailblazer/trail.time","w");
++    f = fopen("/var/trailblazer/trail.time","w");
+     if (f != NULL)
+     {
+         for (i = 0;i < MAPMAX;i++)
diff --git a/games-arcade/trailblazer/files/trailblazer-0.9-ldflags.patch b/games-arcade/trailblazer/files/trailblazer-0.9-ldflags.patch
deleted file mode 100644
index 034a74e75f9e..000000000000
--- a/games-arcade/trailblazer/files/trailblazer-0.9-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2010-09-30 23:56:21.000000000 +0200
-+++ Makefile	2010-09-30 23:56:35.000000000 +0200
-@@ -9,7 +9,7 @@
- bdir = /tmp/trailblazer-$(version)
- 
- all:
--	$(CC) $(sources) -o trailblazer $(cflags) $(libs) 
-+	$(CC) $(LDFLAGS) $(sources) -o trailblazer $(cflags) $(libs) 
- 
- install:
- 	cp trailblazer /usr/bin
diff --git a/games-arcade/trailblazer/files/trailblazer-0.9-makefile.patch b/games-arcade/trailblazer/files/trailblazer-0.9-makefile.patch
new file mode 100644
index 000000000000..70c7cdd90f26
--- /dev/null
+++ b/games-arcade/trailblazer/files/trailblazer-0.9-makefile.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,13 +3,13 @@
+ #
+ 
+ sources = game.c main.c road.c map.c gfx.c
+-libs = `sdl-config --libs`
+-cflags = -O2 -Wall `sdl-config --cflags`
++libs = `sdl-config --libs` -lm
++cflags = $(CFLAGS) $(CPPFLAGS) -Wall `sdl-config --cflags`
+ version = 0.9
+ bdir = /tmp/trailblazer-$(version)
+ 
+ all:
+-	$(CC) $(sources) -o trailblazer $(cflags) $(libs) 
++	$(CC) $(LDFLAGS) $(sources) -o trailblazer $(cflags) $(libs)
+ 
+ install:
+ 	cp trailblazer /usr/bin
diff --git a/games-arcade/trailblazer/files/trailblazer-0.9-underlink.patch b/games-arcade/trailblazer/files/trailblazer-0.9-underlink.patch
deleted file mode 100644
index 31e9a1000324..000000000000
--- a/games-arcade/trailblazer/files/trailblazer-0.9-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2011-06-20 20:49:09.928013768 +0200
-+++ Makefile	2011-06-20 20:49:18.725566328 +0200
-@@ -3,7 +3,7 @@
- #
- 
- sources = game.c main.c road.c map.c gfx.c
--libs = `sdl-config --libs`
-+libs = `sdl-config --libs` -lm
- cflags = -O2 -Wall `sdl-config --cflags`
- version = 0.9
- bdir = /tmp/trailblazer-$(version)
diff --git a/games-arcade/trailblazer/trailblazer-0.9-r1.ebuild b/games-arcade/trailblazer/trailblazer-0.9-r1.ebuild
new file mode 100644
index 000000000000..fac38295d73f
--- /dev/null
+++ b/games-arcade/trailblazer/trailblazer-0.9-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Guide a ball through a succession of levels while avoiding holes"
+HOMEPAGE="http://www.autismuk.freeserve.co.uk/"
+SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-libs/libsdl[video]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo-fhs.patch
+	"${FILESDIR}"/${P}-makefile.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin trailblazer
+	dodoc README
+
+	insinto /usr/share/${PN}
+	doins trail.dat
+
+	dodir /var/trailblazer
+	touch "${ED}"/var/trailblazer/trail.time
+	fperms 660 /var/trailblazer/trail.time
+}
diff --git a/games-arcade/trailblazer/trailblazer-0.9.ebuild b/games-arcade/trailblazer/trailblazer-0.9.ebuild
deleted file mode 100644
index 6e3182719373..000000000000
--- a/games-arcade/trailblazer/trailblazer-0.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Guide a ball through a succession of levels while avoiding holes"
-HOMEPAGE="http://www.autismuk.freeserve.co.uk/"
-SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.2.7[video]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-underlink.patch
-
-	sed -i \
-		-e "s:-O2:${CFLAGS}:" \
-		Makefile || die "sed Makefile failed"
-
-	sed -i \
-		-e "s:/usr/share/trailblazer/trail\.dat:${GAMES_DATADIR}/${PN}/trail.dat:" \
-		-e "s:/usr/share/trailblazer/trail\.time:${GAMES_STATEDIR}/trail.time:" \
-		map.c || die "sed map.c failed"
-}
-
-src_install() {
-	dogamesbin trailblazer
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins trail.dat
-	dodoc README
-
-	dodir "${GAMES_STATEDIR}" \
-		&& touch "${D}${GAMES_STATEDIR}/trail.time"
-
-	prepgamesdirs
-	fperms 660 "${GAMES_STATEDIR}/trail.time"
-}
diff --git a/games-arcade/xtux/Manifest b/games-arcade/xtux/Manifest
index 61a1f6012969..d43713bb9226 100644
--- a/games-arcade/xtux/Manifest
+++ b/games-arcade/xtux/Manifest
@@ -1,5 +1,5 @@
 AUX xtux-20030306-ldflags.patch 805 BLAKE2B 1d3cda6f7bfb2619507caad5fb5fb769dbfe89fd7e377c9e747e0ec4a515f03079d9c4d34c9ac204f21d504812662676322c643feae68f80ddb9eded0c10668b SHA512 089d03e2ef4072b0d134940771820f151e4e51d95c8f01230a78933e0160fa204dd277b4b0bbd7a4288dbb6fabf1ebe7a976f0ead2096b8eaa21daf82f6c97eb
 AUX xtux-20030306-particles.patch 1411 BLAKE2B 22db279e8bdca02029be6a115dc0329893dc69ffd39fcbf773fead770db1cac85c52086bf9bf7e5b23774981f94c86b6858653673f797f082aa3b205bf165443 SHA512 4288325e2e24cbbc2b0407c526d733b028d670d4ce182957392d16675b666c2a9ef44c23227f3acae526bcb439df1e73f13772612ee2c25ac5f373c7863927fd
 DIST xtux-src-20030306.tar.gz 1640928 BLAKE2B 0db135f741a978a943035df5b78773bbb3fbbeecc2fd740525614e4f942e7e23b67a6fa5640fa82c2c32d2aa2abe73badc9d341ab0ec06922513a8ed0783ce7a SHA512 edb137b4d6b0fe7d673e8eedffbd9c521800a8e51aff0a36e5aa02d46a157d42142326b334b9c7358cfb5debf4b78a2a9951f82121dd538cfe288cf292a269d4
-EBUILD xtux-20030306-r1.ebuild 1241 BLAKE2B dcc32bf27f2df307d4d940ac5d971164c31eb5a6a5fd866798c9a54adbd52f40e6452afa68bf76ee6b4450e7f4e86069546bb31a0fe707195f2231e4c6922dec SHA512 dcb83c916fc67c3fc01067473e31fd8d608183f3203701c1f46ca27025b04ef5aae5fa0f99718bc00c3ad1ce11c693e8f0ac6e2b0c57ee5f464f501b7efb163b
+EBUILD xtux-20030306-r1.ebuild 1237 BLAKE2B e16eb5e050ddfc154876f12ac5bfb353b85340eaeaa70da1d02a495ddfd4a4ff9a35438ca7c0380b8331f9dcfe752c3752e4934d5e2d194846783c295a0c173c SHA512 c13276f39c98a9c51542716164e4ebe271fb8081cae232cd935f96f5925fcdb094444196b985428bc7fe9ebb86de6ce62b28f787c144d134b4d0453620578ba3
 MISC metadata.xml 327 BLAKE2B c3a5163b1311672e516ad8cec744bc8813705ef58da277f566101f8699cf1db7bd519bf80d35b5410ee32185ba3a38ae3f4a04dacd49ed5cfda24dfa45ddea19 SHA512 cda1520a7e746d0b8e78cfe62b83466123b01bc02186b63d365f170bce8477be0f408a73d1436b916538c7c1906a77e73114f8d81fb799d48e7bdb4b0fd5c418
diff --git a/games-arcade/xtux/xtux-20030306-r1.ebuild b/games-arcade/xtux/xtux-20030306-r1.ebuild
index 35368df77f3f..929e81c88666 100644
--- a/games-arcade/xtux/xtux-20030306-r1.ebuild
+++ b/games-arcade/xtux/xtux-20030306-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,7 +45,7 @@ src_compile() {
 	emake DATADIR="/usr/share/xtux/data" client
 }
 
-src_install () {
+src_install() {
 	dobin xtux tux_serv
 	insinto "/usr/share/xtux"
 	doins -r data/