5 files changed, 13 insertions, 90 deletions
diff --git a/games-server/cyphesis/ChangeLog b/games-server/cyphesis/ChangeLog
index d03db362047d..44624a590a92 100644
--- a/games-server/cyphesis/ChangeLog
+++ b/games-server/cyphesis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-server/cyphesis
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/ChangeLog,v 1.7 2008/11/20 10:46:46 tupone Exp $
+# 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 $
+
+  02 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/cyphesis-0.5.15-gentoo.patch, -cyphesis-0.5.15.ebuild,
+  cyphesis-0.5.17.ebuild:
+  use slot dep for dev-libs/libsigc++; clean old
 
 *cyphesis-0.5.17 (20 Nov 2008)
 
diff --git a/games-server/cyphesis/Manifest b/games-server/cyphesis/Manifest
index 6405e76ab8c4..635ff0efa933 100644
--- a/games-server/cyphesis/Manifest
+++ b/games-server/cyphesis/Manifest
@@ -1,8 +1,5 @@
-AUX cyphesis-0.5.15-gentoo.patch 1519 RMD160 55b5e3b1e3bdeff64662a93215ea6ce6470b6026 SHA1 18ed34a8f0ef9f0de83b8c62189a7062d6c5d9b0 SHA256 2558f041f0e411182db51c9b810023620e1e6ea8d0f7844c15ebe20895965475
 AUX cyphesis-0.5.17-gentoo.patch 922 RMD160 e1e6f51f4a7dbcace8de300db742d7178e7fb851 SHA1 05c2523ef00b12943fc03e27e4c3eea655cd30e2 SHA256 649d9d4452a8662040c82015e9d2fc7d8cc8fafa040aaf2160492b0a193ae27e
-DIST cyphesis-0.5.15.tar.bz2 549050 RMD160 26680668ec2f0523560112fce0ff63cefca87a17 SHA1 82642393df609f20175dbdc412a5c64c4379fb11 SHA256 c1220e222d7588c27b1cd0a1ac6605a0c26d13fedaecc5469129d32448cc2767
 DIST cyphesis-0.5.17.tar.bz2 579797 RMD160 b6171b2bf6716a84ce8367ee975ac541a6dc168e SHA1 3169d75804a44c118339b7d5080401324ca0e5ce SHA256 5ac050f98da78ba4b4c5bb516843f37a490e4eac0a3fefdbadad465ecaecd598
-EBUILD cyphesis-0.5.15.ebuild 1101 RMD160 8fd042a503a593eeda9cd4d69b0e79bee3f18d6b SHA1 ffd4b55844fe47d8cd01b5cec3185e7b97e7306a SHA256 95bcdf5ae694218651e29b62319d43bead65deb38dcb1071fe75a0c02000a4ef
-EBUILD cyphesis-0.5.17.ebuild 1080 RMD160 395970d6847f046e00dbe7deaa48c04120b38730 SHA1 0a7a55ff40ceac5036f98452723e6318f1188edd SHA256 f0c4071e335a221b29043cecea9762c439c9f7d7cf72a4ecc9e7253b140cf7b7
-MISC ChangeLog 1365 RMD160 038a6e00966cd07f3f044dbaedd7679200e62a6d SHA1 094b30c8737063344ee06e0c36b23bea72474c96 SHA256 eec6debe13dd0ca0af8973b65c98d3bd1fadab344216a64f6ad9fc34e6664b0b
+EBUILD cyphesis-0.5.17.ebuild 1086 RMD160 94764abd347a35e284917cfcb88f19f65a2fe3ec SHA1 90466522c8ebf3cb363b191b54755cc06de510d1 SHA256 8665e2ee07394427e534397c48fe2af0b85cd688131421ad6a7e170d77ae59e7
+MISC ChangeLog 1563 RMD160 8b6d0463feb44299d4cfa52e2f39994fe76e8d5a SHA1 f193f60d77fc503990cf698a12ca02410366a7b6 SHA256 27e4db87966b3fefe9d6b0330d93613034eedeb4c8cd7b6077bebc99586d3e04
 MISC metadata.xml 658 RMD160 861bab297e9ffd8300f2be238803295eecf6bc88 SHA1 06123a6a79c71384cad174b66ba798dee92ac99f SHA256 7abce09650fe6062c27ee350f8ac2578ba482cdc2b1c4970dc4cd4f076e24028
diff --git a/games-server/cyphesis/cyphesis-0.5.15.ebuild b/games-server/cyphesis/cyphesis-0.5.15.ebuild
deleted file mode 100644
index 2481da26c201..000000000000
--- a/games-server/cyphesis/cyphesis-0.5.15.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/cyphesis-0.5.15.ebuild,v 1.2 2008/05/19 19:56:20 dev-zero Exp $
-
-inherit eutils autotools 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=""
-
-DEPEND=">=media-libs/skstream-0.3.6
-	sys-libs/readline
-	>=dev-games/wfmath-0.3
-	=dev-games/mercator-0.2*
-	dev-libs/libgcrypt
-	=dev-libs/libsigc++-2.0*
-	=media-libs/atlas-c++-0.6*
-	>=media-libs/varconf-0.6.4
-	virtual/postgresql-base"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Patching to disable howl and avahi discovery
-	# To be removed when upstream will provide a way to selectively
-	# enable/disable supoort for it
-	epatch "${FILESDIR}/${P}"-gentoo.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog FIXME NEWS README THANKS TODO
-	prepgamesdirs
-}
diff --git a/games-server/cyphesis/cyphesis-0.5.17.ebuild b/games-server/cyphesis/cyphesis-0.5.17.ebuild
index 27c904ba560d..d13dd7c48aee 100644
--- a/games-server/cyphesis/cyphesis-0.5.17.ebuild
+++ b/games-server/cyphesis/cyphesis-0.5.17.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.17.ebuild,v 1.1 2008/11/20 10:46:46 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/cyphesis-0.5.17.ebuild,v 1.2 2009/01/02 03:59:55 mr_bones_ Exp $
 
+EAPI=1
 inherit eutils autotools games
 
 DESCRIPTION="WorldForge server running small games"
@@ -17,7 +18,7 @@ DEPEND=">=media-libs/skstream-0.3.6
 	>=dev-games/wfmath-0.3
 	=dev-games/mercator-0.2*
 	dev-libs/libgcrypt
-	=dev-libs/libsigc++-2.0*
+	dev-libs/libsigc++:2
 	=media-libs/atlas-c++-0.6*
 	>=media-libs/varconf-0.6.4
 	virtual/postgresql-base"
diff --git a/games-server/cyphesis/files/cyphesis-0.5.15-gentoo.patch b/games-server/cyphesis/files/cyphesis-0.5.15-gentoo.patch
deleted file mode 100644
index b7b4fa543e60..000000000000
--- a/games-server/cyphesis/files/cyphesis-0.5.15-gentoo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- configure.ac.old	2007-01-31 23:22:11.000000000 +0100
-+++ configure.ac	2007-01-31 23:22:40.000000000 +0100
-@@ -258,26 +258,6 @@
-         AC_MSG_ERROR([Cannot find valid versions of required WorldForge maths library, wfmath. Please see http://worldforge.org/dev/eng/servers/cyphesis for details of the 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
---- rulesets/Makefile.am.old	2007-11-03 11:56:49.000000000 +0100
-+++ rulesets/Makefile.am	2007-11-03 11:57:10.000000000 +0100
-@@ -4,7 +4,7 @@
- 
- RULESETS = basic/mind mason
- 
--moduledir = $(DESTDIR)$(datadir)/cyphesis/scripts/cyphesis
-+moduledir = $(datadir)/cyphesis/scripts/cyphesis
- dist_module_DATA = basic/__init__.py \
-                    basic/world/objects/Thing.py \
-                    basic/world/probability.py \