gentoo resync : 14.07.2018

7 files changed, 219 insertions, 0 deletions

diff --git a/games-arcade/tuxpuck/Manifest b/games-arcade/tuxpuck/Manifest
new file mode 100644
index 000000000000..d570c5f86d67
--- /dev/null
+++ b/games-arcade/tuxpuck/Manifest
@@ -0,0 +1,7 @@
+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-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 1186 BLAKE2B 7d7ec8016949dbbce3137f8745d474b8cdb2e5e4c3b1d0b9366df7a8773a4a18e678e7a78abb590cd24993e5f899e403cc669d17e18891119969ae8306a4f973 SHA512 c07569fc3b6c69b38e9f7b42dcb4fea01b452a07687c6780f66f3744f814d13e6e69a0be0220a3f557dbffb65a553efe0376441c7e99344250a103842fe326de
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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
new file mode 100644
index 000000000000..410024e48dcd
--- /dev/null
+++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..b4abb60f0fd4
--- /dev/null
+++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..7d9b199f55cf
--- /dev/null
+++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
@@ -0,0 +1,58 @@
+--- 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/files/tuxpuck-0.8.2-png15.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch
new file mode 100644
index 000000000000..5860d2b1c171
--- /dev/null
+++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch
@@ -0,0 +1,63 @@
+--- a/png.c.old	2011-09-14 16:25:54.415338149 +0200
++++ b/png.c	2011-09-14 17:41:02.190803110 +0200
+@@ -38,6 +38,8 @@
+   png_color_16 *transv;
+   SDL_RWops *src = NULL;
+   Uint32 size;
++  int num_palette;
++  png_colorp png_palette;
+ 
+   memcpy(&size, data, sizeof(Uint32));
+   if (memcounter)
+@@ -74,7 +76,7 @@
+    * the normal method of doing things with libpng).  REQUIRED unless you
+    * set up your own error handlers in png_create_read_struct() earlier.
+    */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     SDL_SetError("Error reading the PNG file.");
+     goto done;
+   }
+@@ -142,9 +144,9 @@
+       Rmask = 0x000000FF;
+       Gmask = 0x0000FF00;
+       Bmask = 0x00FF0000;
+-      Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
++      Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
+     } else {
+-      int s = (info_ptr->channels == 4) ? 0 : 8;
++      int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
+       Rmask = 0xFF000000 >> s;
+       Gmask = 0x00FF0000 >> s;
+       Bmask = 0x0000FF00 >> s;
+@@ -152,7 +154,7 @@
+     }
+   }
+   surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
+-			     bit_depth * info_ptr->channels, Rmask, Gmask,
++			     bit_depth * png_get_channels(png_ptr, info_ptr), Rmask, Gmask,
+ 			     Bmask, Amask);
+   if (surface == NULL) {
+     SDL_SetError("Out of memory");
+@@ -197,12 +199,15 @@
+ 	palette->colors[i].g = i;
+ 	palette->colors[i].b = i;
+       }
+-    } else if (info_ptr->num_palette > 0) {
+-      palette->ncolors = info_ptr->num_palette;
+-      for (i = 0; i < info_ptr->num_palette; ++i) {
+-	palette->colors[i].b = info_ptr->palette[i].blue;
+-	palette->colors[i].g = info_ptr->palette[i].green;
+-	palette->colors[i].r = info_ptr->palette[i].red;
++    } else {
++      png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
++      if (num_palette > 0) {
++        palette->ncolors = num_palette;
++	for (i = 0; i < num_palette; ++i) {
++	  palette->colors[i].b = png_palette[i].blue;
++	  palette->colors[i].g = png_palette[i].green;
++	  palette->colors[i].r = png_palette[i].red;
++	}
+       }
+     }
+   }
diff --git a/games-arcade/tuxpuck/metadata.xml b/games-arcade/tuxpuck/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-arcade/tuxpuck/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
new file mode 100644
index 000000000000..092a49327277
--- /dev/null
+++ b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Hover hockey"
+HOMEPAGE="http://home.no.net/munsuun/tuxpuck/"
+SRC_URI="http://home.no.net/munsuun/tuxpuck/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl
+	media-libs/libpng:0=
+	virtual/jpeg:0
+	media-libs/libvorbis
+"
+DEPEND="${RDEPEND}
+	media-libs/freetype:2
+	virtual/pkgconfig
+"
+
+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_compile() {
+	emake -C utils
+	emake -C data
+	emake
+}
+
+src_install() {
+	dobin tuxpuck
+	doman man/tuxpuck.6
+	dodoc *.txt
+	doicon data/icons/${PN}.ico
+	make_desktop_entry ${PN} "TuxPuck" /usr/share/pixmaps/${PN}.ico
+	einstalldocs
+}