old

(Portage version: 2.1.11.9/cvs/Linux x86_64)

5 files changed, 8 insertions, 198 deletions

diff --git a/games-arcade/criticalmass/ChangeLog b/games-arcade/criticalmass/ChangeLog
index bc2b92eb1efc..47f45964023d 100644
--- a/games-arcade/criticalmass/ChangeLog
+++ b/games-arcade/criticalmass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/criticalmass
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.25 2011/10/15 10:44:21 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.26 2012/09/05 07:16:39 mr_bones_ Exp $
+
+  05 Sep 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  -criticalmass-1.0.0-r1.ebuild, -files/criticalmass-1.0.0-gcc43.patch,
+  -files/criticalmass-1.0.0-libpng14.patch,
+  -files/criticalmass-1.0.0-system_curl.patch:
+  old
 
   15 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
   criticalmass-1.0.2.ebuild:
diff --git a/games-arcade/criticalmass/criticalmass-1.0.0-r1.ebuild b/games-arcade/criticalmass/criticalmass-1.0.0-r1.ebuild
deleted file mode 100644
index 01fec301ea84..000000000000
--- a/games-arcade/criticalmass/criticalmass-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/criticalmass-1.0.0-r1.ebuild,v 1.5 2011/09/13 18:59:27 mr_bones_ Exp $
-
-EAPI=2
-inherit autotools eutils games
-
-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 ppc x86"
-IUSE=""
-
-DEPEND="media-libs/sdl-mixer
-	media-libs/sdl-image[png]
-	media-libs/libpng
-	virtual/opengl
-	net-misc/curl"
-
-S=${WORKDIR}/CriticalMass-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-system_curl.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-	rm -rf curl
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -f "${D}${GAMES_BINDIR}/Packer"
-	dohtml Readme.html
-	dodoc TODO
-	newicon critter.png ${PN}.png
-	make_desktop_entry critter "Critical Mass"
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if ! has_version "media-libs/sdl-mixer[mikmod]" ; then
-		ewarn
-		ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer"
-		ewarn "with the \"mikmod\" USE flag turned on."
-		ewarn
-	fi
-}
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.0-gcc43.patch b/games-arcade/criticalmass/files/criticalmass-1.0.0-gcc43.patch
deleted file mode 100644
index e57c11f5af28..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.0-gcc43.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- 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.0-libpng14.patch b/games-arcade/criticalmass/files/criticalmass-1.0.0-libpng14.patch
deleted file mode 100644
index 882869b43a14..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.0-libpng14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in
-+++ 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.0-system_curl.patch b/games-arcade/criticalmass/files/criticalmass-1.0.0-system_curl.patch
deleted file mode 100644
index 02307ad7d8fc..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.0-system_curl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.in
-+++ 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:
---- game/Makefile.am
-+++ 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 \
---- Makefile.am
-+++ 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