Version bump wrt #273547, thanks to Pacho Ramos for reporting.

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

6 files changed, 160 insertions, 2 deletions

diff --git a/games-server/cyphesis/ChangeLog b/games-server/cyphesis/ChangeLog
index 44624a590a92..11f3b9cac904 100644
--- a/games-server/cyphesis/ChangeLog
+++ b/games-server/cyphesis/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-server/cyphesis
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/ChangeLog,v 1.8 2009/01/02 03:59:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/ChangeLog,v 1.9 2009/08/15 17:24:08 ssuominen Exp $
+
+*cyphesis-0.5.20 (15 Aug 2009)
+
+  15 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +cyphesis-0.5.20.ebuild, +files/cyphesis-0.5.20-gcc44.patch,
+  +files/cyphesis-0.5.20-gentoo.patch,
+  +files/cyphesis-0.5.20-python26.patch:
+  Version bump wrt #273547, thanks to Pacho Ramos for reporting.
 
   02 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
   -files/cyphesis-0.5.15-gentoo.patch, -cyphesis-0.5.15.ebuild,
diff --git a/games-server/cyphesis/Manifest b/games-server/cyphesis/Manifest
index 635ff0efa933..e7bfdae0a822 100644
--- a/games-server/cyphesis/Manifest
+++ b/games-server/cyphesis/Manifest
@@ -1,5 +1,10 @@
 AUX cyphesis-0.5.17-gentoo.patch 922 RMD160 e1e6f51f4a7dbcace8de300db742d7178e7fb851 SHA1 05c2523ef00b12943fc03e27e4c3eea655cd30e2 SHA256 649d9d4452a8662040c82015e9d2fc7d8cc8fafa040aaf2160492b0a193ae27e
+AUX cyphesis-0.5.20-gcc44.patch 251 RMD160 88a7d032d01bb46506e937e84a5f88a287bf214b SHA1 d17f22cea5f1a85c556532c30c3e2a80a159d9ed SHA256 fc58097d755743c695333e8e654b4fe9147fcf0b260a72088828c72434dcdac5
+AUX cyphesis-0.5.20-gentoo.patch 1437 RMD160 f649904d186a2b224e46a50c78a6d29bb7bbdb57 SHA1 4843375ad98e69bd6436244a4438fb4561090e14 SHA256 95f508f9e58a7339107e1fc5c433345a6ffb00372d0b2c4ceaa7fb2f15b99598
+AUX cyphesis-0.5.20-python26.patch 1861 RMD160 4aa2df588afb65ae24bb5a627a74c643a8e5abb2 SHA1 25bd48e432a5412c73682d8af94deb7c00994730 SHA256 669aa87fd7da6f6581bfbd01fe523f7e2007b23d71a6263a6c9730515e590314
 DIST cyphesis-0.5.17.tar.bz2 579797 RMD160 b6171b2bf6716a84ce8367ee975ac541a6dc168e SHA1 3169d75804a44c118339b7d5080401324ca0e5ce SHA256 5ac050f98da78ba4b4c5bb516843f37a490e4eac0a3fefdbadad465ecaecd598
+DIST cyphesis-0.5.20.tar.bz2 594351 RMD160 ef1578590bdd38e51a00d7035f396d2ae2dac889 SHA1 c9529425cc23d460ddefa3a640112455cfe21edd SHA256 ed39eca9d93a34f250e91bd6bc71f26246ea7c0d2e45d7bc280659eb480d6d93
 EBUILD cyphesis-0.5.17.ebuild 1086 RMD160 94764abd347a35e284917cfcb88f19f65a2fe3ec SHA1 90466522c8ebf3cb363b191b54755cc06de510d1 SHA256 8665e2ee07394427e534397c48fe2af0b85cd688131421ad6a7e170d77ae59e7
-MISC ChangeLog 1563 RMD160 8b6d0463feb44299d4cfa52e2f39994fe76e8d5a SHA1 f193f60d77fc503990cf698a12ca02410366a7b6 SHA256 27e4db87966b3fefe9d6b0330d93613034eedeb4c8cd7b6077bebc99586d3e04
+EBUILD cyphesis-0.5.20.ebuild 1161 RMD160 dd09476a5800399571f3620f041063f01eff7760 SHA1 98bb812b757b06759e370a317ec0f7f0e6e05d47 SHA256 481e9655bff51a24979f63a8976963eb6a313f9ef1bd4104c7ee04b2fc3c98b3
+MISC ChangeLog 1858 RMD160 3000bd9f1e66a2b31e308523cbaa7677e4505d38 SHA1 2e216c309e3faffb1c37dcc2dc28afe9358c303e SHA256 149b0c43cddf11679331c7816065db001305286b57f42aa0519905e699d0e3fc
 MISC metadata.xml 658 RMD160 861bab297e9ffd8300f2be238803295eecf6bc88 SHA1 06123a6a79c71384cad174b66ba798dee92ac99f SHA256 7abce09650fe6062c27ee350f8ac2578ba482cdc2b1c4970dc4cd4f076e24028
diff --git a/games-server/cyphesis/cyphesis-0.5.20.ebuild b/games-server/cyphesis/cyphesis-0.5.20.ebuild
new file mode 100644
index 000000000000..b15e8f6d89ce
--- /dev/null
+++ b/games-server/cyphesis/cyphesis-0.5.20.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/cyphesis-0.5.20.ebuild,v 1.1 2009/08/15 17:24:08 ssuominen Exp $
+
+EAPI=2
+inherit autotools 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
+	=media-libs/atlas-c++-0.6*
+	>=media-libs/varconf-0.6.4
+	virtual/postgresql-base"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-python26.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.20-gcc44.patch b/games-server/cyphesis/files/cyphesis-0.5.20-gcc44.patch
new file mode 100644
index 000000000000..05925d1d8401
--- /dev/null
+++ b/games-server/cyphesis/files/cyphesis-0.5.20-gcc44.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/DateTimetest.cpp b/tests/DateTimetest.cpp
+index 0417349..2691c65 100644
+--- a/tests/DateTimetest.cpp
++++ b/tests/DateTimetest.cpp
+@@ -23,6 +23,8 @@
+ 
+ #include <cassert>
+ 
++#include <cstdio>
++
+ int main()
+ {
+     DateTime datum(0);
diff --git a/games-server/cyphesis/files/cyphesis-0.5.20-gentoo.patch b/games-server/cyphesis/files/cyphesis-0.5.20-gentoo.patch
new file mode 100644
index 000000000000..73e65966fe94
--- /dev/null
+++ b/games-server/cyphesis/files/cyphesis-0.5.20-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.20-python26.patch b/games-server/cyphesis/files/cyphesis-0.5.20-python26.patch
new file mode 100644
index 000000000000..373bbfe8c700
--- /dev/null
+++ b/games-server/cyphesis/files/cyphesis-0.5.20-python26.patch
@@ -0,0 +1,45 @@
+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:28:19.000000000 +0300
+@@ -161,28 +161,28 @@
+ dnl if found define HAVE_PYTHON_H
+ dnl
+ 
+-AC_CHECK_HEADER(python2.5/Python.h,
++AC_CHECK_HEADER(python2.6/Python.h,
+ [
+-    python_include_path=-I${python_prefix}/include/python2.5
+-    python_version=2.5
++    python_include_path=-I${python_prefix}/include/python2.6
++    python_version=2.6
+ ],[
+-    AC_CHECK_HEADER(python2.4/Python.h,
++    AC_CHECK_HEADER(python2.5/Python.h,
+     [
+-        python_include_path=-I${python_prefix}/include/python2.4
+-        python_version=2.4
++        python_include_path=-I${python_prefix}/include/python2.5
++        python_version=2.5
+     ],[
+-        AC_CHECK_HEADER(python2.3/Python.h,
++        AC_CHECK_HEADER(python2.4/Python.h,
+         [
+-            python_include_path=-I${python_prefix}/include/python2.3
+-            python_version=2.3
++            python_include_path=-I${python_prefix}/include/python2.4
++            python_version=2.4
+         ],[
+-            AC_CHECK_HEADER(python2.2/Python.h,
++            AC_CHECK_HEADER(python2.3/Python.h,
+             [
+-                python_include_path=-I${python_prefix}/include/python2.2
+-                python_version=2.2
++                python_include_path=-I${python_prefix}/include/python2.3
++                python_version=2.3
+             ],[
+                 AC_MSG_ERROR([
+-Cannot find python headers for Python 2.2 or later.
++Cannot find python headers for Python 2.3 or later.
+ Please see http://www.python.org/ for details of how to download and install
+ Python. If Python is installed somewhere other than in /usr the please use the
+ --with-python=DIR option to point to the prefix where Python is installed.])