gentoo resync : 14.07.2018

7 files changed, 120 insertions, 0 deletions

diff --git a/games-arcade/xbubble/Manifest b/games-arcade/xbubble/Manifest
new file mode 100644
index 000000000000..80b4c9ce7f7d
--- /dev/null
+++ b/games-arcade/xbubble/Manifest
@@ -0,0 +1,7 @@
+AUX xbubble-0.5.8-libpng14.patch 419 BLAKE2B 0111cee77be12e9eb12714aec7c79276c7b316bb47344104e6a171863dd60ef56c287fe460f89552ea448cb26498dffd46d4f4b0ba2b27a2416868390b58bcca SHA512 65e011385081d93ef4d633298726fd1783cc75505610bd54609fdadb7d390366a040856cfddca6444ecaaafb97b6cae69156e6ad96235eb01487680ffe34dd29
+AUX xbubble-0.5.8-locale.patch 252 BLAKE2B ed7312a3e4cd175dd45c3c1e7f8a0b8fc69a8bbd1d7889f722e024cddfa38e6ad82388160e5e03c064d3a60b3c77fcfb15f229c51a35d46b59056544d910e7be SHA512 0154b666cc21496304ed7fab382980e67bc7429ff74bbb5e92cdf2ed42db265b51e4fead878a6d96899eed58e4e5a35af0b2316178bb95ecbb2780fe01947014
+AUX xbubble-0.5.8-png15.patch 698 BLAKE2B 4481e2bf43876e043bc15dc6fff24a931f138628afa252db9e4eaf8a17899fbe2d8bcf8493780163f1c6ee9d1efb077e2240fb7ae4cc950ba40f6766eaa0ed77 SHA512 13f993dbd9e209de6fc13e6f2d656a95e285acec28058d3049f5b4019600a12848ac52e766781ee33273b60b57794897135d57298ae65bdc7348dbddc66a7440
+AUX xbubble-0.5.8-xpaths.patch 204 BLAKE2B 795352b16d86bf722041bba0fa047c12bf20108e175acd58bc30efc6a437387aa31ed97809ef7bf3d937aa205ae05b31776ec925e1025b348fba0af7c0625e4c SHA512 dd6854ef5ca24fa2bc89c3239d79fa0b122525776f4a3df8581566178ac139031abf4b46cea07cca8bbd1a0bbddf2227f20d6a2e4075dc68e7542018fcb69bfd
+DIST xbubble-0.5.8.tar.gz 5544359 BLAKE2B d52d5fd59c795087d6208656227e696b76424a34aa2dee8aced4a63f5105d7b9e95177a63ae71187c0ba07b6a58464c8ecb40b5252980971e9b3dc3799e0717a SHA512 132052d8e57218a2991ce0a0383f69f8818deafbf56046acaa3bc1c8ed7f31e5fb6b9b045df11eb3eaf77a8347b16ad663bb0f727823995e5df6d3adfcb75df2
+EBUILD xbubble-0.5.8-r1.ebuild 1095 BLAKE2B bad7066d4966047dabeff7c5bc49421def0b9e69486d3df928f8dadcaa3a9119f094465047a1e2bbaeef525acdcc19a76789e91c36f922f84331fb9fe4791a0d SHA512 bb6f43667345d1aa0c67146f7b959817315bb6e22d75790d2fbf558e6d3c5e8b8bd4be0ceda6a23c517806b7fdff1fb790fc0d7f08a95ccee7e15d47edbf5f63
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch b/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch
new file mode 100644
index 000000000000..4fe12672db65
--- /dev/null
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=308731
+
+--- a/src/loadpng.c
++++ b/src/loadpng.c
+@@ -55,7 +55,7 @@ unsigned char * load_png_file( const cha
+   }
+   /* ensure that we opened a PNG file */
+   fread( header, 1, 8, fd );
+-  if ( ! png_check_sig( header, 8 ) ) {
++  if ( png_sig_cmp( header, 0, 8 ) ) {
+     fclose(fd);
+     fprintf(stderr,_("File %s does not have a valid PNG signature.\n"), file);
+     return NULL;
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch b/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch
new file mode 100644
index 000000000000..99c03b0c82af
--- /dev/null
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch
@@ -0,0 +1,10 @@
+--- a/src/gettext.h.orig	2008-10-07 12:01:37.000000000 -0400
++++ b/src/gettext.h	2008-10-07 12:01:45.000000000 -0400
+@@ -24,6 +24,7 @@
+ 
+ /* Get declarations of GNU message catalog functions.  */
+ # include <libintl.h>
++# include <locale.h>
+ 
+ #else
+ 
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch b/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
new file mode 100644
index 000000000000..bbbae5c31076
--- /dev/null
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
@@ -0,0 +1,20 @@
+--- a/src/loadpng.c.old	2011-09-14 09:58:40.503566961 +0200
++++ b/src/loadpng.c	2011-09-14 10:03:39.708531447 +0200
+@@ -73,7 +73,7 @@
+     return NULL;
+   }
+   /* libpng does a longjmp here when it encounters an error */
+-  if ( setjmp( png_ptr->jmpbuf ) ) {
++  if ( setjmp( png_jmpbuf(png_ptr) ) ) {
+     png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
+     fclose(fd);
+     return NULL;
+@@ -95,7 +95,7 @@
+     png_set_gray_to_rgb(png_ptr);
+ 
+   /* detect alpha layer */
+-  if (( info_ptr->color_type & PNG_COLOR_MASK_ALPHA )||
++  if (( png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA )||
+       ( png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS )))
+     *has_alpha = 1;
+   else
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch b/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch
new file mode 100644
index 000000000000..4db0b8f10ccf
--- /dev/null
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch
@@ -0,0 +1,11 @@
+the x_libraries variable isnt always defined
+http://bugs.gentoo.org/92688
+
+--- a/configure
++++ b/configure
+@@ -4511,3 +4511,5 @@
+ fi
++if test x"$x_libraries" != x; then
+ LIBS="-L$x_libraries $LIBS"
++fi
+ 
diff --git a/games-arcade/xbubble/metadata.xml b/games-arcade/xbubble/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-arcade/xbubble/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/xbubble/xbubble-0.5.8-r1.ebuild b/games-arcade/xbubble/xbubble-0.5.8-r1.ebuild
new file mode 100644
index 000000000000..67c8f575299f
--- /dev/null
+++ b/games-arcade/xbubble/xbubble-0.5.8-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="A Puzzle Bobble clone similar to Frozen-Bubble"
+HOMEPAGE="http://www.nongnu.org/xbubble/"
+SRC_URI="http://www.ibiblio.org/pub/mirrors/gnu/ftp/savannah/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXt
+	media-libs/libpng:0=
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS NetworkProtocol README TODO )
+
+src_prepare() {
+	default
+	eapply \
+		"${FILESDIR}"/${P}-xpaths.patch \
+		"${FILESDIR}"/${P}-locale.patch \
+		"${FILESDIR}"/${P}-libpng14.patch \
+		"${FILESDIR}"/${P}-png15.patch
+	sed -i \
+		-e '/^AM_CFLAGS/d' \
+		src/Makefile.in || die
+	sed -i \
+		-e '/^localedir/s:=.*:=/usr/share/locale:' \
+		configure po/Makefile.in.in || die
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+	newicon data/themes/fancy/Bubble_black_DEAD_01.png ${PN}.png
+	make_desktop_entry ${PN} XBubble
+}