version bump (bug #410219)

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 49 insertions, 23 deletions

diff --git a/games-server/crossfire-server/ChangeLog b/games-server/crossfire-server/ChangeLog
index d3d1f2af4e23..70a610154dbd 100644
--- a/games-server/crossfire-server/ChangeLog
+++ b/games-server/crossfire-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-server/crossfire-server
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.26 2012/05/30 23:20:48 mr_bones_ Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.27 2013/01/10 05:37:03 mr_bones_ Exp $
+
+*crossfire-server-1.70.0 (10 Jan 2013)
+
+  10 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +crossfire-server-1.70.0.ebuild, -files/crossfire-server-1.11.0-curl.patch,
+  -files/crossfire-server-1.11.0-libpng15.patch:
+  version bump (bug #410219)
 
   30 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
   -crossfire-server-1.11.0.ebuild:
diff --git a/games-server/crossfire-server/crossfire-server-1.70.0.ebuild b/games-server/crossfire-server/crossfire-server-1.70.0.ebuild
new file mode 100644
index 000000000000..a36e6fa4179b
--- /dev/null
+++ b/games-server/crossfire-server/crossfire-server-1.70.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.70.0.ebuild,v 1.1 2013/01/10 05:37:03 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils games
+
+MY_P="${P/-server/}"
+DESCRIPTION="server for the crossfire clients"
+HOMEPAGE="http://crossfire.real-time.com/"
+SRC_URI="mirror://sourceforge/crossfire/${MY_P}.tar.gz
+	mirror://sourceforge/crossfire/crossfire-${PV}.maps.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+RESTRICT="test"
+
+DEPEND="net-misc/curl
+	X? (
+		x11-libs/libXaw
+		media-libs/libpng:0
+	)"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm -f "${WORKDIR}"/maps/Info/combine.pl # bug #236205
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir "${GAMES_STATEDIR}"/crossfire/{datafiles,maps,players,template-maps,unique-items}
+	dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO
+	insinto "${GAMES_DATADIR}/crossfire"
+	doins -r "${WORKDIR}/maps"
+	prepgamesdirs
+}
diff --git a/games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch b/games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch
deleted file mode 100644
index 86365d2ee85b..000000000000
--- a/games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- socket/metaserver.c.old	2011-10-10 16:23:40.513409319 +0200
-+++ socket/metaserver.c	2011-10-10 16:23:46.617408594 +0200
-@@ -48,7 +48,6 @@
- 
- #ifdef HAVE_CURL_CURL_H
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
- 
diff --git a/games-server/crossfire-server/files/crossfire-server-1.11.0-libpng15.patch b/games-server/crossfire-server/files/crossfire-server-1.11.0-libpng15.patch
deleted file mode 100644
index 93841e518db5..000000000000
--- a/games-server/crossfire-server/files/crossfire-server-1.11.0-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- crossedit/png.c.old	2011-02-21 14:50:43.000000000 +0100
-+++ crossedit/png.c	2011-02-21 14:51:20.000000000 +0100
-@@ -269,7 +269,7 @@
- 	png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
- 	return PNGX_OUTOFMEM;
-     }
--    if (setjmp (png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
- 	return PNGX_DATA;
-     }