gentoo resync : 14.07.2018

8 files changed, 284 insertions, 0 deletions

diff --git a/games-arcade/criticalmass/Manifest b/games-arcade/criticalmass/Manifest
new file mode 100644
index 000000000000..f9612b200faa
--- /dev/null
+++ b/games-arcade/criticalmass/Manifest
@@ -0,0 +1,8 @@
+AUX criticalmass-1.0.2-cflags.patch 868 BLAKE2B 5e4179592ab03bbc34e14e7649ebfca2268a8f22728f7afb92f4978aeb09461588b7daa6642fa07c8ce007597ee40296d28c44b9381bc734184c5c82f6eb2106 SHA512 545f822a3fb2709c52e4c9bbacc8ea56a7aee229acdaec1af3024928d67395de8f3f0014b5647bb48afa1a85478854945490c482c96486e908c5342eba2538e9
+AUX criticalmass-1.0.2-gcc43.patch 3150 BLAKE2B c039896207f59cc4e0c4c4e81ced2266ca91c4731cb853c6e4120b1962cef0b7ebce1094d0b38081fbec44c098d3e109fe3a2e2d294c483caf1008611c4a5209 SHA512 a3a23367de54d99b3e47951477c3c85fa861a6a48c3a2d81e2352e55d0a32d6c319f5fd37ff287c93a5b9b0dfa230c89a90a507219960bb72a567977058f3bd6
+AUX criticalmass-1.0.2-libpng14.patch 449 BLAKE2B e27405000136410be47bb241208c1321bbbf8540b8707244271e9368cfaaf7cd058172cc952ff0dd1d84a5e693f0373f2ec8ddd47db1b05b8768f242fa037488 SHA512 976cb237901945119fe54bf8b7e8856d70d7104ff7071b80cdeb7fdab64e783c3f69a6099bd1ee11aae2eb5bd94dcac681869328e44bb74c4808b3c67a23e975
+AUX criticalmass-1.0.2-libpng15.patch 686 BLAKE2B a96af03a21e1e12606acd4ea07631c9688d80b377d126b44e1ace016e5aa727446d2c8c18606983fa6b2288f83b19130488e96e4f3364dc1e2d42b543d1e3766 SHA512 c2a68f80f0f775e5b6acbb6ed3a565200f481c83f505320488073783a30265769ba32f545590f2756a1d4974b0cc65462f559f23237ce206cfb80be370195d97
+AUX criticalmass-1.0.2-system_curl.patch 976 BLAKE2B 8af3bae1f2653e882a8d2f0955ef7973af93058bcf646f2264ccacc7b804a622b6104c50cbfc5531775bd9da22660317d2fb00804566014f543ef8e5a1d231be SHA512 6ce040132b9b3a4d4cf7a14c48a3e33320cd95ae440512f8c1c78e78200e6936fe95140e1e16607a225ec0ed1421e03bc09ba065552bc5419cbb42ac74f44b47
+DIST CriticalMass-1.0.2.tar.bz2 5122126 BLAKE2B 91642309270aa9a76c1639b213b14f5b1feecce9a1bd9a516b84618e33d454542e31a34ffc974bb0e584b2ff5d5bad6b9112906a0c818662df7eb1ad0d812470 SHA512 af3200adc4b6ed9f24eaa89ef5b2f31e8d09e402d0c2eef8db604afcbb2d36bad48e76c3c11c1b2410d2d4e0ffd8554e2e9749a8c8cc4752b4636b8919a66037
+EBUILD criticalmass-1.0.2-r1.ebuild 1277 BLAKE2B 1d5b5a0b6941f8aab5ebcb29660e245d82a8db33046cf39b33efad6dbefb1d022413383540cb51f7948a8bbefea8057fafcd2afdc37c21e471e28a640e0c7064 SHA512 b0560a8d03dc9dc3b921d421949fcc3314055605d69af9ce20d354547a189819300fc36d01aaa919a8806f9ade279f5ef9660581b368be6405e01481eafc747f
+MISC metadata.xml 335 BLAKE2B 5b324731ab938d41661d143e1c10f44dcf05579341e642b07eb955252737e49eca38fffe4a95651f5d822de780ced0b9570bc0285d656e61c2f38f5ea594e214 SHA512 ef6dcb84323c49c9a21a59eea375bd3c1419ba2c7490f3e20e9daeab88942b4574d3d8668c465e2b2fc4221dff97695ba122d6790ebade3202f873f890fef9e4
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..5191beb0107f
--- /dev/null
+++ b/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop flag-o-matic
+
+DESCRIPTION="SDL/OpenGL space shoot'em up game"
+HOMEPAGE="http://criticalmass.sourceforge.net/"
+SRC_URI="mirror://sourceforge/criticalmass/CriticalMass-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/sdl-mixer
+	media-libs/sdl-image[png]
+	media-libs/libpng:0=
+	virtual/opengl
+	net-misc/curl
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/CriticalMass-${PV}"
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-system_curl.patch \
+		"${FILESDIR}"/${P}-libpng14.patch \
+		"${FILESDIR}"/${P}-cflags.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+
+	rm -rf curl
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=gnu++98 # Bug 612758
+	default
+}
+
+src_install() {
+	HTML_DOCS="Readme.html"
+	default
+	rm -f "${ED}/usr/bin/Packer"
+	newicon critter.png ${PN}.png
+	make_desktop_entry critter "Critical Mass"
+}
+
+pkg_postinst() {
+	if ! has_version "media-libs/sdl-mixer[mod]" ; then
+		ewarn
+		ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer"
+		ewarn "with the \"mod\" USE flag turned on."
+		ewarn
+	fi
+}
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
new file mode 100644
index 000000000000..0d9063c37538
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
@@ -0,0 +1,27 @@
+--- a/configure.in.orig	2011-07-20 11:23:19.849122541 -0400
++++ b/configure.in	2011-07-20 11:24:28.169713094 -0400
+@@ -35,9 +35,6 @@
+ AM_CONDITIONAL(APPLE,test "x$TARGET" = xAPPLE)
+ AM_CONDITIONAL(WIN32,test "x$TARGET" = xWIN32)
+ 
+-CFLAGS=""
+-CXXFLAGS=""
+-
+ if test "x$GCC" = xyes; then
+    CFLAGS="$CFLAGS -W -Wall"
+    CXXFLAGS="$CXXFLAGS -W -Wall -fno-exceptions"
+@@ -51,14 +48,6 @@
+         CXXFLAGS="$CXXFLAGS -g"
+ fi
+ 
+-AC_ARG_ENABLE(optimize,
+-[  --enable-optimize=level      Enable optimization [default=2]],
+-        enable_optmize=$enableval, enable_optimize=2)
+-if test "x$enable_optimize" != "xno" ; then
+-        CFLAGS="$CFLAGS -O$enable_optimize"
+-        CXXFLAGS="$CXXFLAGS -O$enable_optimize"
+-fi
+-
+ AC_ARG_ENABLE(dyngl,
+ [  --enable-dyngl               Load GL library dynamically [default=off]],
+         enable_dyngl=$enableval, enable_dyngl=off)
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch
new file mode 100644
index 000000000000..e57c11f5af28
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch
@@ -0,0 +1,101 @@
+--- CriticalMass-1.0.0.orig/tinyxml/tinyxml.cpp	2003-03-03 03:34:58.000000000 +0100
++++ CriticalMass-1.0.0/tinyxml/tinyxml.cpp	2008-04-18 19:40:35.000000000 +0200
+@@ -21,10 +21,12 @@
+ distribution.

+ */

+ 

+ #include "tinyxml.h"

+ 

++#include <cstring>
++
+ 

+ TiXmlNode::TiXmlNode( NodeType _type )

+ {

+ 	parent = 0;

+ 	type = _type;

+--- CriticalMass-1.0.0.orig/tinyxml/tinyxml.h	2003-03-03 03:34:58.000000000 +0100
++++ CriticalMass-1.0.0/tinyxml/tinyxml.h	2008-04-18 19:40:35.000000000 +0200
+@@ -28,10 +28,11 @@
+ #ifdef _MSC_VER

+ #pragma warning( disable : 4530 )

+ #pragma warning( disable : 4786 )

+ #endif

+ 

++#include <cstdlib>
+ #include <string>

+ #include <stdio.h>

+ #include <assert.h>

+ 

+ class TiXmlDocument;

+--- CriticalMass-1.0.0.orig/tinyxml/tinyxmlparser.cpp	2003-03-03 03:34:58.000000000 +0100
++++ CriticalMass-1.0.0/tinyxml/tinyxmlparser.cpp	2008-04-18 19:40:35.000000000 +0200
+@@ -23,10 +23,12 @@
+ 

+ 

+ #include "tinyxml.h"

+ #include <ctype.h>

+ 

++#include <cstring>
++
+ const char* TiXmlBase::SkipWhiteSpace( const char* p )

+ {

+ 	while ( p && *p && 

+ 	        ( isspace( *p ) || *p == '\n' || *p == '\r' ) )

+ 		p++;

+--- CriticalMass-1.0.0.orig/utils/ResourceManager.cpp	2005-01-02 03:59:29.000000000 +0100
++++ CriticalMass-1.0.0/utils/ResourceManager.cpp	2008-04-18 19:40:35.000000000 +0200
+@@ -20,10 +20,12 @@
+ #include <ResourceManager.hpp>
+ #include <FindHash.hpp>
+ #include <Endian.hpp>
+ #include <WalkDirectory.hpp>
+ 
++#include <cstring>
++
+ #ifdef WIN32
+ const char PATH_SEPERATOR = '\\';
+ #else
+ const char PATH_SEPERATOR = '/';
+ #endif
+--- CriticalMass-1.0.0.orig/utils/Value.hpp	2004-12-18 03:41:24.000000000 +0100
++++ CriticalMass-1.0.0/utils/Value.hpp	2008-04-18 19:40:35.000000000 +0200
+@@ -13,10 +13,11 @@
+ // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+ //
+ #ifndef _Value_hpp_
+ #define _Value_hpp_
+ 
++#include <cstdlib>
+ #include <stdio.h>
+ #include <string>
+ 
+ #include <Trace.hpp>
+ 
+--- CriticalMass-1.0.0.orig/utils/zStreamBufferImplZLib.cpp	2005-07-31 22:06:14.000000000 +0200
++++ CriticalMass-1.0.0/utils/zStreamBufferImplZLib.cpp	2008-04-18 19:40:35.000000000 +0200
+@@ -10,10 +10,11 @@
+ //
+ // This program is distributed in the hope that it will be useful,  but  WITHOUT
+ // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+ //
++#include <cstdlib>
+ #include <Trace.hpp>
+ #include <zStreamBufferImplZLib.hpp>
+ 
+ bool ziStreamBufferImplZLib::init( void)
+ {
+--- CriticalMass-1.0.0.orig/utils/zStream.cpp	2005-07-31 22:06:14.000000000 +0200
++++ CriticalMass-1.0.0/utils/zStream.cpp	2008-04-18 19:40:35.000000000 +0200
+@@ -10,10 +10,11 @@
+ //
+ // This program is distributed in the hope that it will be useful,  but  WITHOUT
+ // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+ //
++#include <cstdlib>
+ #include <Trace.hpp>
+ #include <Endian.hpp>
+ #include <zStream.hpp>
+ #include <zStreamBufferImplLZMA.hpp>
+ #include <zStreamBufferImplZLib.hpp>
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
new file mode 100644
index 000000000000..f8a0eec2ad57
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -99,7 +99,7 @@ if test "x$TARGET" = xWIN32; then
+ else
+     LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS"
+     CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
+-	AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed))
++	AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed))
+ 	AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed))
+ 	if test "x$TARGET" = xUNIX; then
+ 	    if test "x$enable_dyngl" = xoff; then
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
new file mode 100644
index 000000000000..dbdfc9f32275
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
@@ -0,0 +1,31 @@
+--- a/game/main.cpp
++++ b/game/main.cpp
+@@ -28,6 +28,8 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
++#include <zlib.h>
++
+ void migrateConfig( void)
+ {
+     //if onlineCheck is not set, default it to true
+--- a/utilssdl/PNG.cpp
++++ b/utilssdl/PNG.cpp
+@@ -45,7 +45,7 @@
+ {
+     png_size_t check;
+ 
+-    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
++    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
+     if( check != length)
+     {
+ 	png_error( png, "Write Error");
+@@ -72,7 +72,7 @@
+ 	return false;
+     }
+ 
+-    if( setjmp(_png->jmpbuf))
++    if( setjmp(png_jmpbuf(_png)))
+     {
+ 	fclose( fp);
+ 	png_destroy_write_struct(&_png, (png_infopp)NULL);
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
new file mode 100644
index 000000000000..1ab1a2d5ce52
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
@@ -0,0 +1,33 @@
+--- a/configure.in
++++ b/configure.in
+@@ -115,8 +115,6 @@ fi
+ AC_CHECK_LIB(m, sin,, 
+     AC_MSG_ERROR(libm is needed))
+ 
+-AC_CONFIG_SUBDIRS(curl)
+-
+ AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile)
+ 
+ echo "Configuration:
+--- a/game/Makefile.am
++++ b/game/Makefile.am
+@@ -41,7 +41,7 @@ critter_SOURCES = \
+         main.cpp
+ 
+ LDADD = \
+-	../curl/lib/libcurl.a \
++	-lcurl \
+ 	../utils/libutils.a \
+ 	../utilssdl/libutilssdl.a \
+ 	../utilsgl/libutilsgl.a \
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,7 +4,7 @@
+ AUTOMAKE_OPTIONS = 1.4
+ 
+ ## Any directories that you want built and installed should go here.
+-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
++SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
+ 
+ ## Any directories you want a part of the distribution should be listed
+ ## here, as well as have a Makefile generated at the end of configure.in
diff --git a/games-arcade/criticalmass/metadata.xml b/games-arcade/criticalmass/metadata.xml
new file mode 100644
index 000000000000..26c1c9ca5f2d
--- /dev/null
+++ b/games-arcade/criticalmass/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="sourceforge">criticalmass</remote-id>
+	</upstream>
+</pkgmetadata>