4 files changed, 5 insertions, 104 deletions
diff --git a/games-server/cyphesis/ChangeLog b/games-server/cyphesis/ChangeLog
index 561fc90f49e5..4685ffac2a3b 100644
--- a/games-server/cyphesis/ChangeLog
+++ b/games-server/cyphesis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-server/cyphesis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/ChangeLog,v 1.35 2014/03/01 22:26:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/ChangeLog,v 1.36 2014/08/29 18:31:14 mr_bones_ Exp $
+
+  29 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org> -cyphesis-0.6.1.ebuild,
+  -files/cyphesis-0.6.1-gentoo.patch, -files/cyphesis-0.6.1-makefile.patch:
+  old
 
   01 Mar 2014; Michał Górny <mgorny@gentoo.org> cyphesis-0.6.0.ebuild,
   cyphesis-0.6.1.ebuild, cyphesis-0.6.2.ebuild:
diff --git a/games-server/cyphesis/cyphesis-0.6.1.ebuild b/games-server/cyphesis/cyphesis-0.6.1.ebuild
deleted file mode 100644
index 2f1fa9ce76ac..000000000000
--- a/games-server/cyphesis/cyphesis-0.6.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/cyphesis-0.6.1.ebuild,v 1.2 2014/03/01 22:26:58 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit toolchain-funcs autotools python-single-r1 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=""
-RESTRICT="test"
-
-RDEPEND=">=media-libs/skstream-0.3.9
-	>=dev-games/wfmath-1.0.1
-	>=dev-games/mercator-0.3.3
-	dev-libs/libgcrypt:0
-	dev-libs/libsigc++:2
-	sys-libs/ncurses
-	sys-libs/readline
-	>=media-libs/atlas-c++-0.6.3
-	>=media-libs/varconf-0.6.4
-	dev-db/postgresql-base"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.40
-	dev-libs/libxml2
-	virtual/pkgconfig"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-makefile.patch
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--localstatedir=/var
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" confbackupdir="/usr/share/doc/${PF}/conf" \
-		install
-	dodoc AUTHORS ChangeLog FIXME NEWS README THANKS TODO
-	prepgamesdirs
-}
diff --git a/games-server/cyphesis/files/cyphesis-0.6.1-gentoo.patch b/games-server/cyphesis/files/cyphesis-0.6.1-gentoo.patch
deleted file mode 100644
index 69aac409ba8d..000000000000
--- a/games-server/cyphesis/files/cyphesis-0.6.1-gentoo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru cyphesis-0.6.0.orig/Makefile.am cyphesis-0.6.0/Makefile.am
---- cyphesis-0.6.0.orig/Makefile.am	2012-10-02 06:23:10.000000000 -0400
-+++ cyphesis-0.6.0/Makefile.am	2012-11-12 16:54:19.306892135 -0500
-@@ -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 -ru cyphesis-0.6.0.orig/configure.ac cyphesis-0.6.0/configure.ac
---- cyphesis-0.6.0.orig/configure.ac	2012-11-09 16:39:13.000000000 -0500
-+++ cyphesis-0.6.0/configure.ac	2012-11-12 16:53:51.622839335 -0500
-@@ -381,17 +381,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])
--        AC_MSG_NOTICE([Ommiting DNS-SD functionality.])
--    ])
--
- AM_PATH_PSQL(7.1.0,
-     [
-         if test "$PG_CFLAGS" != "-I/usr/include"; then
diff --git a/games-server/cyphesis/files/cyphesis-0.6.1-makefile.patch b/games-server/cyphesis/files/cyphesis-0.6.1-makefile.patch
deleted file mode 100644
index 99ca3872c040..000000000000
--- a/games-server/cyphesis/files/cyphesis-0.6.1-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.old	2013-09-25 14:26:30.518751250 +0200
-+++ Makefile.am	2013-09-25 14:27:21.846257911 +0200
-@@ -13,8 +13,6 @@
- 
- # FIXME Remove the mkdir hack if it gets fixed in a future automake
- install-data-hook:
--	mkdir -p $(DESTDIR)$(socketdir)
--	chmod 1777 $(DESTDIR)$(socketdir)
- 	@echo 
- 	@echo "Cyphesis is not yet ready to run."
- 	@echo "Unless you have configured the server to run without a database, Cyphesis"