use slot dep for dev-libs/libsigc++; clean old

(Portage version: 2.1.6.4/cvs/Linux 2.6.27.8 i686)

4 files changed, 11 insertions, 85 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/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 \