gentoo (leap year) resync : 29.02.2020

7 files changed, 80 insertions, 69 deletions

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"
-}