version bump

Package-Manager: portage-2.1.8.3/cvs/Linux i686

6 files changed, 148 insertions, 2 deletions

diff --git a/games-server/cyphesis/ChangeLog b/games-server/cyphesis/ChangeLog
index 8fe032f2071f..529136736186 100644
--- a/games-server/cyphesis/ChangeLog
+++ b/games-server/cyphesis/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for games-server/cyphesis
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/ChangeLog,v 1.12 2010/06/17 18:33:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/ChangeLog,v 1.13 2010/08/31 06:45:38 mr_bones_ Exp $
+
+  31 Aug 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +cyphesis-0.5.24.ebuild, +files/cyphesis-0.5.24-gcc45.patch,
+  +files/cyphesis-0.5.24-gentoo.patch,
+  +files/cyphesis-0.5.24-python27.patch:
+  version bump
+
+*cyphesis-0.5.24 (31 Aug 2010)
+
+  31 Aug 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +cyphesis-0.5.24.ebuild, +files/cyphesis-0.5.24-gcc45.patch,
+  +files/cyphesis-0.5.24-gentoo.patch,
+  +files/cyphesis-0.5.24-python27.patch:
+  version bump
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> cyphesis-0.5.22.ebuild:
   Migrating away from deprecated postgres virtuals
diff --git a/games-server/cyphesis/Manifest b/games-server/cyphesis/Manifest
index 99a6fa08f8c8..a734a7a6b430 100644
--- a/games-server/cyphesis/Manifest
+++ b/games-server/cyphesis/Manifest
@@ -1,6 +1,11 @@
 AUX cyphesis-0.5.22-gcc45.patch 251 RMD160 1c423b83ad4ed28b2f56a5617a70805ad35282fd SHA1 5762cbb959812559ec7e6d44b2dcaf2feb744b6c SHA256 1c81d0642f92690e468832d7053b335bf4188ca397b66202a5ae167f39da174d
 AUX cyphesis-0.5.22-gentoo.patch 1437 RMD160 f649904d186a2b224e46a50c78a6d29bb7bbdb57 SHA1 4843375ad98e69bd6436244a4438fb4561090e14 SHA256 95f508f9e58a7339107e1fc5c433345a6ffb00372d0b2c4ceaa7fb2f15b99598
+AUX cyphesis-0.5.24-gcc45.patch 251 RMD160 1c423b83ad4ed28b2f56a5617a70805ad35282fd SHA1 5762cbb959812559ec7e6d44b2dcaf2feb744b6c SHA256 1c81d0642f92690e468832d7053b335bf4188ca397b66202a5ae167f39da174d
+AUX cyphesis-0.5.24-gentoo.patch 1437 RMD160 f649904d186a2b224e46a50c78a6d29bb7bbdb57 SHA1 4843375ad98e69bd6436244a4438fb4561090e14 SHA256 95f508f9e58a7339107e1fc5c433345a6ffb00372d0b2c4ceaa7fb2f15b99598
+AUX cyphesis-0.5.24-python27.patch 531 RMD160 f0bdd15f43851468a6d2b4e23a4c5d967cd9db81 SHA1 dd85392c5f316e3647cbc821efb1ccdffde9e29c SHA256 efb6e06183381bb0bb05fdca0ea9972605ef3d73a41283505077081ce6288d2f
 DIST cyphesis-0.5.22.tar.bz2 642305 RMD160 dec62eb6a8617fdbf629e67aefa0d374579a9173 SHA1 b7c42009fecc3048aadee4db6432c699b66c16f9 SHA256 6a31896b1c4ecc8b50c5546681c42b2c4804a5032917dbf2b520032925574a36
+DIST cyphesis-0.5.24.tar.bz2 724743 RMD160 d2517d53611ca8b5d92a36ad589288fd4573e97f SHA1 e2f72a7c42c5ab88448523ca282d68ede65240fd SHA256 8374f1ff4af5b2383c122feaaf8df742c04f0be58d4de249980f38abca6f317a
 EBUILD cyphesis-0.5.22.ebuild 1157 RMD160 8099bed54f35b55a6c0e098f7ac4f9b311ed05dc SHA1 29dd3a866080ac41b4a8f05151b265afd639f67c SHA256 65b78db62e69deaa7cd6e52926bba792ac342952f0fe273a809c7339622ab2d6
-MISC ChangeLog 2338 RMD160 9be49310d58451b30e51454b295137e56f953978 SHA1 417c881994fcff7819f753a0c3e7bdc1a6dac490 SHA256 6c92390d17e796372e14da7d97855b3dbf1b87d27e115789c73bc90cde07a92b
+EBUILD cyphesis-0.5.24.ebuild 1283 RMD160 852b4b5d63471c8f5b08172708ad47cc2c9dfe85 SHA1 c3d2e6e4c4e534fc4bed4ff02c64d5341921b279 SHA256 3b0e6df2bcb0326b37ac71647a51e8cbf511d0f5f559c5ca1cdef2dcf2e78918
+MISC ChangeLog 2800 RMD160 5b4f2091af2bcb3f5f9dad664a3f27d55afd91c0 SHA1 6dd49dcf8fdab5ab4e07b1a662086e2a8a25fd15 SHA256 48b06f3b47d44d02291556ad94d0e61abfbf9ebe170adab67c991ed5eba3bf12
 MISC metadata.xml 658 RMD160 861bab297e9ffd8300f2be238803295eecf6bc88 SHA1 06123a6a79c71384cad174b66ba798dee92ac99f SHA256 7abce09650fe6062c27ee350f8ac2578ba482cdc2b1c4970dc4cd4f076e24028
diff --git a/games-server/cyphesis/cyphesis-0.5.24.ebuild b/games-server/cyphesis/cyphesis-0.5.24.ebuild
new file mode 100644
index 000000000000..ceb83a0cd411
--- /dev/null
+++ b/games-server/cyphesis/cyphesis-0.5.24.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/cyphesis-0.5.24.ebuild,v 1.1 2010/08/31 06:45:38 mr_bones_ Exp $
+
+EAPI=2
+PYTHON_DEPEND=2
+inherit autotools python eutils games
+
+DESCRIPTION="WorldForge server running small games"
+HOMEPAGE="http://worldforge.org/dev/eng/servers/cyphesis"
+SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/skstream-0.3.6
+	>=dev-games/wfmath-0.3.9
+	=dev-games/mercator-0.2*
+	dev-libs/libgcrypt
+	dev-libs/libsigc++:2
+	sys-libs/ncurses
+	sys-libs/readline
+	=media-libs/atlas-c++-0.6*
+	>=media-libs/varconf-0.6.4
+	dev-db/postgresql-base"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	python_set_active_version 2
+	games_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-gcc45.patch \
+		"${FILESDIR}"/${P}-python27.patch
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--localstatedir=/var
+}
+
+src_install() {
+	emake DESTDIR="${D}" confbackupdir="/usr/share/doc/${PF}/conf" \
+		install || die "emake install failed"
+	dodoc AUTHORS ChangeLog FIXME NEWS README THANKS TODO
+	prepgamesdirs
+}
diff --git a/games-server/cyphesis/files/cyphesis-0.5.24-gcc45.patch b/games-server/cyphesis/files/cyphesis-0.5.24-gcc45.patch
new file mode 100644
index 000000000000..7e5c33da049c
--- /dev/null
+++ b/games-server/cyphesis/files/cyphesis-0.5.24-gcc45.patch
@@ -0,0 +1,10 @@
+--- physics/Collision.h.old	2010-05-19 14:31:30.000000000 +0200
++++ physics/Collision.h	2010-05-19 14:31:44.000000000 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include "physics/Vector3D.h"
+ 
++#include <wfmath/point.h>
+ #include <wfmath/axisbox.h>
+ 
+ #include <map>
diff --git a/games-server/cyphesis/files/cyphesis-0.5.24-gentoo.patch b/games-server/cyphesis/files/cyphesis-0.5.24-gentoo.patch
new file mode 100644
index 000000000000..73e65966fe94
--- /dev/null
+++ b/games-server/cyphesis/files/cyphesis-0.5.24-gentoo.patch
@@ -0,0 +1,41 @@
+diff -ur cyphesis-0.5.20.orig/configure.ac cyphesis-0.5.20/configure.ac
+--- cyphesis-0.5.20.orig/configure.ac	2009-05-11 15:23:20.000000000 +0300
++++ cyphesis-0.5.20/configure.ac	2009-08-15 12:33:01.000000000 +0300
+@@ -342,26 +342,6 @@
+ libraries required and where to obtain them.])
+     ])
+ 
+-PKG_CHECK_MODULES(AVAHI, avahi-client,
+-    [
+-        CPPFLAGS="$CPPFLAGS $AVAHI_CFLAGS"
+-        MDNS_LIBS="$MDNS_LIBS $AVAHI_LIBS"
+-        AC_DEFINE(HAVE_AVAHI, 1, [Define to 1 if you have avahi libs.])
+-    ],
+-    [
+-        AC_MSG_RESULT([no])
+-        PKG_CHECK_MODULES(HOWL, howl,
+-            [
+-                CPPFLAGS="$CPPFLAGS $HOWL_CFLAGS"
+-                MDNS_LIBS="$MDNS_LIBS $HOWL_LIBS"
+-                AC_DEFINE(HAVE_LIBHOWL, 1, [Define to 1 if you have howl libs.])
+-            ],
+-            [
+-                AC_MSG_RESULT([no])
+-                AC_MSG_NOTICE([Ommiting DNS-SD functionality.])
+-            ])
+-    ])
+-
+ AM_PATH_PSQL(7.1.0,
+     [
+         if test "$PG_CFLAGS" != "-I/usr/include"; then
+diff -ur cyphesis-0.5.20.orig/Makefile.am cyphesis-0.5.20/Makefile.am
+--- cyphesis-0.5.20.orig/Makefile.am	2009-05-11 15:23:20.000000000 +0300
++++ cyphesis-0.5.20/Makefile.am	2009-08-15 12:33:45.000000000 +0300
+@@ -3,7 +3,6 @@
+           tools tests man dox
+ 
+ docdir = $(datadir)/doc/cyphesis-$(VERSION)
+-dist_doc_DATA = README COPYING AUTHORS THANKS NEWS FIXME
+ 
+ rulesetdir = $(datadir)/cyphesis/rulesets
+ 
diff --git a/games-server/cyphesis/files/cyphesis-0.5.24-python27.patch b/games-server/cyphesis/files/cyphesis-0.5.24-python27.patch
new file mode 100644
index 000000000000..85ef14f9dda0
--- /dev/null
+++ b/games-server/cyphesis/files/cyphesis-0.5.24-python27.patch
@@ -0,0 +1,22 @@
+--- configure.ac.orig	2010-08-31 00:02:13.261828627 -0400
++++ configure.ac	2010-08-31 00:03:30.094023860 -0400
+@@ -162,6 +162,11 @@
+ dnl if found define HAVE_PYTHON_H
+ dnl
+ 
++AC_CHECK_HEADER(python2.7/Python.h,
++[
++    python_include_path=-I${python_prefix}/include/python2.7
++    python_version=2.7
++],[
+ AC_CHECK_HEADER(python2.6/Python.h,
+ [
+     python_include_path=-I${python_prefix}/include/python2.6
+@@ -197,6 +202,7 @@
+         ])
+     ])
+ ])
++])
+ 
+ PYTHON_VERSION=${python_version}
+ PYTHON_INCLUDES=${python_include_path}