Use system libcurl and fix building with libpng14 by Locke Shinseiko (Wizzleby).

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

5 files changed, 99 insertions, 3 deletions

diff --git a/games-arcade/criticalmass/ChangeLog b/games-arcade/criticalmass/ChangeLog
index ca474abe30da..193d55ff921c 100644
--- a/games-arcade/criticalmass/ChangeLog
+++ b/games-arcade/criticalmass/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-arcade/criticalmass
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.15 2009/01/06 01:38:39 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.16 2010/03/09 18:05:33 ssuominen Exp $
+
+*criticalmass-1.0.0-r1 (09 Mar 2010)
+
+  09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +criticalmass-1.0.0-r1.ebuild, +files/criticalmass-1.0.0-libpng14.patch,
+  +files/criticalmass-1.0.0-system_curl.patch:
+  Use system libcurl and fix building with libpng14 by Locke Shinseiko
+  (Wizzleby).
 
   06 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
   criticalmass-1.0.0.ebuild:
diff --git a/games-arcade/criticalmass/Manifest b/games-arcade/criticalmass/Manifest
index 31c559777c0e..b93e2afee5dd 100644
--- a/games-arcade/criticalmass/Manifest
+++ b/games-arcade/criticalmass/Manifest
@@ -1,5 +1,8 @@
 AUX criticalmass-1.0.0-gcc43.patch 3150 RMD160 b7071775f419ceecd2b138d8a1009697c819a090 SHA1 9ad1a20872759453a2fdf6bd3c7ce80df5121f72 SHA256 a7f74c031aa03fa2a4dd522b4c289f7b992e045b498e71700aed88aea397459c
+AUX criticalmass-1.0.0-libpng14.patch 445 RMD160 a50541521001c8f14f8ccdab54b53baba3f8c5b2 SHA1 5ec3fe2e2e575f51b4576c502da3a3658d7099c9 SHA256 7f20895eceb0caafb3bd7315b99080731647677c7b938e512625b3b9885dfaf3
+AUX criticalmass-1.0.0-system_curl.patch 964 RMD160 31f28f327e78142404ff9d1daee845af1bf5f6fa SHA1 cbaa1ea3a8c98e65c99f05e5a973a938c48f21c2 SHA256 0fc918bea78df003ba37370a83fc349bfec6d191959c0d443c1e33df96be409d
 DIST CriticalMass-1.0.0.tar.bz2 5092549 RMD160 33c7b60f1cb3cf6e887fe4bbc99928b17f97c047 SHA1 ce0de4fa9259f0586f8dfa7ee96978da21e57335 SHA256 94cedac39f9279faa63f6ce4098f2a778a8c8f9013ba8dd7d5b85766739e0858
+EBUILD criticalmass-1.0.0-r1.ebuild 1049 RMD160 d38b001893a05b4ab03d5a09b03820fdf1390444 SHA1 a22ed5cb511c95791749f9ddbcf13fd88a06e26f SHA256 f575e86da736a403f7899f37c2ef9093e64fdc3e227511c92468fb3d44a08487
 EBUILD criticalmass-1.0.0.ebuild 900 RMD160 48dae68b50ffa392a9c7cbfec011a60c09554d17 SHA1 eb620809f314b367564b1051fd20200fee6adf93 SHA256 c6cea18e89514e2e15ff1a3a799e8458da71b53c5f921694c774743896faf485
-MISC ChangeLog 3132 RMD160 a780215d571161644acbafaa8988bbbe96950d82 SHA1 6a1f7f105694e7364f59b345852adb91d65865cb SHA256 4fa52bf69202896de4f3ab6dc0eea497f6d9ca12519452a66a2f5c467fb19379
+MISC ChangeLog 3432 RMD160 cce32429621568c4fd86c411d8f12fb93fb783eb SHA1 ea20453b0d5e1b1b0d4f6b7514cf9325477f1d08 SHA256 627dacaa7ef52c8159a75f4e59f03bd7c6fc0e196ef2e91d89c29c9006722692
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/criticalmass/criticalmass-1.0.0-r1.ebuild b/games-arcade/criticalmass/criticalmass-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..18ad80b27750
--- /dev/null
+++ b/games-arcade/criticalmass/criticalmass-1.0.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 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.1 2010/03/09 18:05:33 ssuominen 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
+}
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.0-libpng14.patch b/games-arcade/criticalmass/files/criticalmass-1.0.0-libpng14.patch
new file mode 100644
index 000000000000..882869b43a14
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.0-libpng14.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..02307ad7d8fc
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.0-system_curl.patch
@@ -0,0 +1,33 @@
+--- 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