gentoo resync : 25.08.2020

6 files changed, 163 insertions, 108 deletions

diff --git a/games-arcade/tuxpuck/Manifest b/games-arcade/tuxpuck/Manifest
index c73f655b900b..c52db6dc2cf7 100644
--- a/games-arcade/tuxpuck/Manifest
+++ b/games-arcade/tuxpuck/Manifest
@@ -1,7 +1,5 @@
-AUX tuxpuck-0.8.2-freetype_pkgconfig.patch 377 BLAKE2B 73f974e8e93cb425e72745fa00a1943a30830dae4bfdee5eef75adc240ebf9885b4dd30f1bfb6291fb873a35a0f63595a11b0399e3b028263065b59a9193542b SHA512 b41eb1a0e64aac8a01ceeab8be43bdaa8da394f6e2fa09222eb78baec0d4b9f622340434111237f37afc8b58ea1d887a012c777afddae75a9394a4519b3925f4
-AUX tuxpuck-0.8.2-ldflags.patch 411 BLAKE2B 0b0a20abe1daf4f02e07f23f8cc0273b5b7cf229ea3b9de3cb13ea4611ba5b6b932ebf9286ebcdb19605de672b66300530a6fb3ca776bdfd1a05a377976d7746 SHA512 50e91cfb89be78e7fbf45c361d9bd2bc2ef84770d868978dbc200bb9954b51789478e611f8e1197e418775624ce57c62424a6a456cd62ffe45ccb93aaa58a88a
-AUX tuxpuck-0.8.2-parallel.patch 1705 BLAKE2B a9402f63386287c1d77f58d6998869c5e946016fda93932f851de73e3edae4b3ec3e08fea68f86c98e5e490d5a168c1bb809332d379470c00db0527fd462e972 SHA512 e489e76fe86f62962017615015f9bca7f15e3b001265d7212ae99a27e833152ab6b1a4caacffc32c4143a47e06ee4d010114d70f57548c7d91ccc8e61667b5e0
+AUX tuxpuck-0.8.2-Makefile.patch 4200 BLAKE2B 463243836f41043593ccd2f70ff3b54f82ae84a9048a26e42f0d46e7170835b9a080e80c58389bed479b48e3f266ddf09170f63dc6a84ac33b0611d991ede189 SHA512 a6133f57c97bcabc858b4466d9b13081d31e0a5c84ea59ad95301ab9f76fd32e894f2ccaa699ad6aaccf57f424e832594ed0e19d560d9905e6e304aff65bcb4e
 AUX tuxpuck-0.8.2-png15.patch 2128 BLAKE2B b9ebbeff8974dbfd0693dea225e9e73c044aaf5c0d8159458c2c8439fb3d1985c223c71a9e69d47d1c648abcf2784ed7a7d6f9a59a880d2e5b485d3498f0172e SHA512 d6d05b8e10736010a80af565d9dd6cc3aa076070796f348d86c0af8a7d008e1fbb9cffd4422d2193bbe880c0a2637f424879c6e9ce84427f01badbd2129c3b4a
 DIST tuxpuck-0.8.2.tar.gz 384009 BLAKE2B e60241c5e6825ae6570a0d3242178578ef1202d3fbb4276726fdfddb894883fe5e25218bb29f6fd8148d273ab91dd36f0624c814756d8375cea5b88f090fcde7 SHA512 875680f7fd9d4257884c58d8a5529082aac4dc10f1a9c9d08acd4e67ddb5e9c66dd84a4fbcc27e3673e329d845b0966ea683412ffe61f0a403d195eac0f32a46
-EBUILD tuxpuck-0.8.2-r2.ebuild 1176 BLAKE2B c37c434505009ae4af0dd32fbee53b190837463882203d88460d9fac4a7fe3089a193e860fe49e31b9016f8b6acfbd8e07f195acf66717d19412231d90d2c6f8 SHA512 985b7b907fe20e0806b458df3e381ce13068e6fa682bc9764515fdac7ca85ae2e15b98293caf49cf758ab87dd5b299e51298d17e0a34c7de5475d05891583e08
+EBUILD tuxpuck-0.8.2-r2.ebuild 1033 BLAKE2B a641f7c3bc542f1e1a8b221b4d7c314b47f9df9db7d6c7f7bf2c0ae12b40e8c405ab260d2f871f5825c5d54c2fb955d26e5984ad870a7523fb4b46a472bf3829 SHA512 8bafda0a19fb85dfc65a380205ca3f0b9621d09ce8c8ae7dfe73bc7a42db5e995d9b5482a7e0659e8d2c3cd5b750e8d11fb777827914dbe164ec7681c53fabc7
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-Makefile.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-Makefile.patch
new file mode 100644
index 000000000000..30b97283a2e2
--- /dev/null
+++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-Makefile.patch
@@ -0,0 +1,139 @@
+--- a/data/Makefile
++++ b/data/Makefile
+@@ -1,5 +1,4 @@
+ # Makefile for TuxPuck , Copyright Jacob Kroon 2001-2002
+-CC		= gcc
+ SOURCES		= pad_png.c puck_png.c tux_png.c glass_png.c scoreboard_png.c \
+ 		  arcana_png.c mousebar_png.c title_jpg.c board_jpg.c \
+ 		  logo_jpg.c crash_ogg.c nock_ogg.c tux_apps_ogg.c \
+@@ -9,27 +8,33 @@
+ 
+ OBJS=$(SOURCES:.c=.o)
+ 
+-%.o	: %.c
+-	$(CC) $(CFLAGS) -c -o $@ $<
+-
+ libdata.a : $(OBJS)
+-	ar r libdata.a $(OBJS)
+-	ranlib libdata.a
++	$(AR) r libdata.a $(OBJS)
++	$(RANLIB) libdata.a
+ 
+-$(SOURCES):
+-	cd ../utils/; $(MAKE)
++monos_fnt.c:
+ 	../utils/ttf2font ttfs/mono.ttf monos.fnt 30 30
+ 	../utils/data2c monos.fnt monos_fnt
++	rm monos.fnt
++monob_fnt.c:
+ 	../utils/ttf2font ttfs/mono.ttf monob.fnt 45 45
+ 	../utils/data2c monob.fnt monob_fnt
+-	rm *.fnt
++	rm monob.fnt
++title_jpg.c:
+ 	../utils/data2c jpgs/title.jpg title_jpg
++board_jpg.c:
+ 	../utils/data2c jpgs/board.jpg board_jpg
++logo_jpg.c:
+ 	../utils/data2c jpgs/logo.jpg logo_jpg
++pad_png.c: pngs/pad.png
+ 	../utils/data2c pngs/pad.png pad_png
++puck_png.c: pngs/puck.png
+ 	../utils/data2c pngs/puck.png puck_png
++scoreboard_png.c:
+ 	../utils/data2c pngs/scoreboard.png scoreboard_png
++mousebar_png.c:
+ 	../utils/data2c pngs/mousebar.png mousebar_png
++glass_png.c:
+ 	../utils/data2c pngs/glass.png glass_png
+ 	../utils/data2c pngs/piece1.png piece1_png
+ 	../utils/data2c pngs/piece2.png piece2_png
+@@ -38,15 +43,22 @@
+ 	../utils/data2c pngs/piece5.png piece5_png
+ 	mv glass_png.c temp; cat temp piece?_png.c > glass_png.c
+ 	rm piece?_png.c temp
++crash_ogg.c:
+ 	../utils/data2c sounds/crash.ogg crash_ogg
++nock_ogg.c:
+ 	../utils/data2c sounds/nock.ogg nock_ogg
++tux_eyes_spr.c:
+ 	# Tux
+ 	../utils/anim tux/eyes.ac tux_eyes.spr
+ 	../utils/data2c tux_eyes.spr tux_eyes_spr
+ 	rm tux_eyes.spr
++tux_png.c: tux/tux.png
+ 	../utils/data2c tux/tux.png tux_png
++tux_apps_ogg.c:
+ 	../utils/data2c tux/apps.ogg tux_apps_ogg
++tux_boos_ogg.c:
+ 	../utils/data2c tux/boos.ogg tux_boos_ogg
++arcana_png.c:
+ 	# Arcana
+ 	../utils/data2c arcana/arcana.png arcana_png
+ clean :
+--- a/Makefile
++++ b/Makefile
+@@ -1,13 +1,14 @@
+ # Makefile for TuxPuck , Copyright Jacob Kroon 2001-2002
+ NAME		= tuxpuck
+ VERSION		= 0.8.2
+-CC		= gcc
+-CFLAGS		+= -D_VERSION=\"$(VERSION)\" -g -Wall
++CPPFLAGS	+= -D_VERSION=\"$(VERSION)\"
++CFLAGS		+= -Wall
+ CSOURCES	= tuxpuck.c video.c audio.c menu.c sprite.c font.c timer.c \
+ 		  board.c entity.c glass.c scoreboard.c player.c zoom.c png.c \
+ 		  jpg.c intro.c tux.c arcana.c 
+ INCLUDES	= tuxpuck.h video.h audio.h font.h
+-	   	  
++SDL_CFLAGS = $(shell $$PKG_CONFIG --cflags sdl)
++SDL_LIBS = $(shell $$PKG_CONFIG --libs sdl)
+ 
+ #############################################################
+ 
+@@ -17,11 +18,11 @@
+ endif
+ 
+ %.o	: %.c
+-	$(CC) $(CFLAGS) `sdl-config --cflags` -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -c -o $@ $<
+ 
+ $(NAME) : $(OBJS)
+-	cd data; $(MAKE)
+-	$(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
++	cd data && $(MAKE)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a $(SDL_LIBS) -lm -lpng \
+ 	-ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
+ 
+ w32icon.o : data/icons/tuxpuck.ico
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -1,18 +1,23 @@
+ # Makefile for TuxPuck Utils , Copyright Jacob Kroon 2001-2002
+-CC		= gcc
+-CFLAGS		+= -g -Wall -Werror
++CFLAGS		+= -Wall
++
++FREETYPE_CFLAGS = $(shell $$PKG_CONFIG --cflags freetype2)
++FREETYPE_LIBS = $(shell $$PKG_CONFIG --libs freetype2)
++
++SDL_CFLAGS = $(shell $$PKG_CONFIG --cflags sdl)
++SDL_LIBS = $(shell $$PKG_CONFIG --libs sdl)
+ #############################################################
+ 
+ all : ttf2font data2c anim
+ 
+ ttf2font : ttf2font.c
+-	$(CC) $(CFLAGS) ttf2font.c `freetype-config --cflags --libs` -o ttf2font
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ttf2font.c -o ttf2font $(FREETYPE_CFLAGS) $(FREETYPE_LIBS)
+ 
+ data2c : data2c.c
+-	$(CC) $(CFLAGS) data2c.c `sdl-config --cflags --libs` -o data2c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) data2c.c -o data2c $(SDL_CFLAGS) $(SDL_LIBS)
+ 
+ anim : anim.c
+-	$(CC) $(CFLAGS) anim.c `sdl-config --cflags --libs` -o anim
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) anim.c -o anim $(SDL_CFLAGS) $(SDL_LIBS)
+ 
+ clean :
+ 	rm -f *~ data2c ttf2font anim
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
deleted file mode 100644
index 410024e48dcd..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tuxpuck-0.8.2/utils/Makefile
-+++ tuxpuck-0.8.2/utils/Makefile
-@@ -6,7 +6,7 @@
- all : ttf2font data2c anim
- 
- ttf2font : ttf2font.c
--	$(CC) $(CFLAGS) ttf2font.c `freetype-config --cflags --libs` -o ttf2font
-+	$(CC) $(CFLAGS) ttf2font.c `pkg-config --cflags --libs freetype2` -o ttf2font
- 
- data2c : data2c.c
- 	$(CC) $(CFLAGS) data2c.c `sdl-config --cflags --libs` -o data2c
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
deleted file mode 100644
index b4abb60f0fd4..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.old	2010-10-05 10:34:57.000000000 +0200
-+++ b/Makefile	2010-10-05 10:35:28.000000000 +0200
-@@ -20,7 +20,7 @@
- 
- $(NAME) : $(OBJS)
- 	cd data; $(MAKE)
--	$(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
- 	-ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
- 
- w32icon.o : data/icons/tuxpuck.ico
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
deleted file mode 100644
index 7d9b199f55cf..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/data/Makefile.old	2015-01-07 14:22:34.852150894 +0100
-+++ b/data/Makefile	2015-01-07 14:57:44.079822614 +0100
-@@ -15,20 +15,29 @@
- 	ar r libdata.a $(OBJS)
- 	ranlib libdata.a
- 
--$(SOURCES):
--	cd ../utils/; $(MAKE)
-+monos_fnt.c:
- 	../utils/ttf2font ttfs/mono.ttf monos.fnt 30 30
- 	../utils/data2c monos.fnt monos_fnt
-+	rm monos.fnt
-+monob_fnt.c:
- 	../utils/ttf2font ttfs/mono.ttf monob.fnt 45 45
- 	../utils/data2c monob.fnt monob_fnt
--	rm *.fnt
-+	rm monob.fnt
-+title_jpg.c:
- 	../utils/data2c jpgs/title.jpg title_jpg
-+board_jpg.c:
- 	../utils/data2c jpgs/board.jpg board_jpg
-+logo_jpg.c:
- 	../utils/data2c jpgs/logo.jpg logo_jpg
-+pad_png.c: pngs/pad.png
- 	../utils/data2c pngs/pad.png pad_png
-+puck_png.c: pngs/puck.png
- 	../utils/data2c pngs/puck.png puck_png
-+scoreboard_png.c:
- 	../utils/data2c pngs/scoreboard.png scoreboard_png
-+mousebar_png.c:
- 	../utils/data2c pngs/mousebar.png mousebar_png
-+glass_png.c:
- 	../utils/data2c pngs/glass.png glass_png
- 	../utils/data2c pngs/piece1.png piece1_png
- 	../utils/data2c pngs/piece2.png piece2_png
-@@ -37,15 +46,22 @@
- 	../utils/data2c pngs/piece5.png piece5_png
- 	mv glass_png.c temp; cat temp piece?_png.c > glass_png.c
- 	rm piece?_png.c temp
-+crash_ogg.c:
- 	../utils/data2c sounds/crash.ogg crash_ogg
-+nock_ogg.c:
- 	../utils/data2c sounds/nock.ogg nock_ogg
-+tux_eyes_spr.c:
- 	# Tux
- 	../utils/anim tux/eyes.ac tux_eyes.spr
- 	../utils/data2c tux_eyes.spr tux_eyes_spr
- 	rm tux_eyes.spr
-+tux_png.c: tux/tux.png
- 	../utils/data2c tux/tux.png tux_png
-+tux_apps_ogg.c:
- 	../utils/data2c tux/apps.ogg tux_apps_ogg
-+tux_boos_ogg.c:
- 	../utils/data2c tux/boos.ogg tux_boos_ogg
-+arcana_png.c:
- 	# Arcana
- 	../utils/data2c arcana/arcana.png arcana_png
- clean :
diff --git a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
index d853da6c5d16..d2fdb0c45bcc 100644
--- a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
+++ b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
@@ -1,8 +1,9 @@
-# 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="Hover hockey"
 HOMEPAGE="http://home.no.net/munsuun/tuxpuck/"
@@ -11,38 +12,32 @@ SRC_URI="http://home.no.net/munsuun/tuxpuck/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	media-libs/libsdl
 	media-libs/libpng:0=
-	virtual/jpeg:0
 	media-libs/libvorbis
-"
+	virtual/jpeg:0"
 DEPEND="${RDEPEND}
-	media-libs/freetype:2
-	virtual/pkgconfig
-"
+	media-libs/freetype:2"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-png15.patch
+)
 
 src_prepare() {
 	default
+
 	# Bug #376741 - Make unpack call compatible with both
 	# PMS and <sys-apps/portage-2.1.10.10.
 	cd man || die
 	unpack ./${PN}.6.gz
-	cd .. || die
-	sed -i \
-		-e 's/-Werror//' \
-		-e '/^CC/d' \
-		Makefile \
-		utils/Makefile \
-		data/Makefile \
-		|| die "sed failed"
-
-	eapply "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-png15.patch \
-		"${FILESDIR}"/${P}-parallel.patch \
-		"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG RANLIB
 }
 
 src_compile() {
@@ -53,9 +48,12 @@ src_compile() {
 
 src_install() {
 	dobin tuxpuck
-	doman man/tuxpuck.6
+
 	dodoc *.txt
+	einstalldocs
+
+	doman man/tuxpuck.6
+
 	doicon data/icons/${PN}.ico
 	make_desktop_entry ${PN} "TuxPuck" /usr/share/pixmaps/${PN}.ico
-	einstalldocs
 }