Version bump to 0.6.1

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

5 files changed, 119 insertions, 6 deletions

diff --git a/games-server/cyphesis/ChangeLog b/games-server/cyphesis/ChangeLog
index 47d2a98d6a5a..1f02aae8bfb2 100644
--- a/games-server/cyphesis/ChangeLog
+++ b/games-server/cyphesis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-server/cyphesis
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/ChangeLog,v 1.32 2013/01/08 10:03:36 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/ChangeLog,v 1.33 2013/10/02 07:56:41 tupone Exp $
+
+*cyphesis-0.6.1 (02 Oct 2013)
+
+  02 Oct 2013; Alfredo Tupone <tupone@gentoo.org> +cyphesis-0.6.1.ebuild,
+  +files/cyphesis-0.6.1-gentoo.patch, +files/cyphesis-0.6.1-makefile.patch:
+  Version bump to 0.6.1
 
   08 Jan 2013; Tupone Alfredo <tupone@gentoo.org> -cyphesis-0.5.26.ebuild,
   -files/cyphesis-0.5.26-gentoo.patch:
diff --git a/games-server/cyphesis/Manifest b/games-server/cyphesis/Manifest
index 6cf79f846cf0..3b5c6ae5e633 100644
--- a/games-server/cyphesis/Manifest
+++ b/games-server/cyphesis/Manifest
@@ -3,14 +3,18 @@ Hash: SHA256
 
 AUX cyphesis-0.6.0-gentoo.patch 1099 SHA256 506d1e459150186f1efb4d3447a9e47263a21be34940f3b3aa93ee17996d22ea SHA512 9a4b30bb21b562a1242b519f95bd0b274de596d8263afa034037ea423c6d0ce5349029c718410bae0411525f2e8d72bff6f2c480f80c7df7bae7ba0d3b31c4fe WHIRLPOOL 7e2a2cfa9c7ba7df36f5ba10da0a8087bb4df72ebd77b68e19c0a175d111baea04f5e05694e6b0ee2b7fd96a684c85a313c8bf081c4148455a42f4cc0a00a682
 AUX cyphesis-0.6.0-makefile.patch 864 SHA256 4bd6acba4bedf65ed8daa618ea3871e76abbfded9760a3298bc4bf85f21805df SHA512 57a35a2116b33228c5e2024b6467b9f957ef350dd7e9e4949b6c41e3a6c562769be140f729141a0de50d9b4abf89d2347d5e8d05b2efaaa400144569e8e11cae WHIRLPOOL 3cd56b26ca3ca85a20958143ebc9668015b0878d44bf28ef23a0f6121262b54b461bb25a949e4907d21179fa90d0cdf3e24bd186621b2645a21601e5853da63d
+AUX cyphesis-0.6.1-gentoo.patch 1099 SHA256 506d1e459150186f1efb4d3447a9e47263a21be34940f3b3aa93ee17996d22ea SHA512 9a4b30bb21b562a1242b519f95bd0b274de596d8263afa034037ea423c6d0ce5349029c718410bae0411525f2e8d72bff6f2c480f80c7df7bae7ba0d3b31c4fe WHIRLPOOL 7e2a2cfa9c7ba7df36f5ba10da0a8087bb4df72ebd77b68e19c0a175d111baea04f5e05694e6b0ee2b7fd96a684c85a313c8bf081c4148455a42f4cc0a00a682
+AUX cyphesis-0.6.1-makefile.patch 424 SHA256 d3ad08794b099b1dbcc9a46e04bde0c7a763e8968a954796a2e13907826be741 SHA512 cb81c24f5b40f87a35170185e190f40140b92f80b31c70f6bbebfb9e537c9481228351f0e76e2405b2f062325830635a449a8eb920ef8c44ee39db2639ca9bb0 WHIRLPOOL f27e386cfc05e02f34da61886bf1f65524588fdeb84b93269046a27bb828319e82f4373e4293d24037e92a39080b42b5f3d375b671b5e9fbff2ab0b6dc994d10
 DIST cyphesis-0.6.0.tar.bz2 840777 SHA256 b6988e6dbdf7b601bf6d9fc7456fa7ad376f96ad350b3da3d9c4714fa43a52ad SHA512 5aae35ac7c15f0ebde4eb830523cd6bad22b5e5800e3b63fbbcecfa54970bfc4848787730a4437a5db2489fa69e14dde73ca0953a0b96805272fd5250f43d120 WHIRLPOOL 315e76c35a3ef2e79a9780cbff52b800506f7b99f76704b750041160fed86d470fe1fbd681b9d77f5f5b9383fdb7284d5871e4823245b382b2244bdbd3984592
+DIST cyphesis-0.6.1.tar.bz2 929498 SHA256 c8b97f14f8cf34bb108ec6855d2e51bc40c8e9c6faac4dad68309be5c55916d0 SHA512 f69b7e0ad6488514f8dd867cb6dff1fe1968e9bdd6dbb4b7e0ecdb2d4a9f41777abfcfe0d7dff10be3fb4a7448494efffbfe515bd3b5ff9e512f5054f426f962 WHIRLPOOL 4951157c3f7d5f6b7e9895791cf04063babff14a3a132b0ba0654fc858ade65225733dea10d28f19ed976a613a1f208496193a442bd395e9a6bf81f5769c1313
 EBUILD cyphesis-0.6.0.ebuild 1315 SHA256 428e8cecca1d400c86651d2b3e56c8bebafe29e86ebb2b296ea4543613426bdf SHA512 3107ae8e5f616c1e8e945158b74fe5055ad8f92e555575994268aeb29a78697150de279182b2c456928bf5bbd0ece388ad6acd78291375d95d7689ffcc175b8c WHIRLPOOL f20795b974c180db452edd354fea4ccc023edbc5e1d9dc2d7c2d4f8b3d86986fa10271a247df3d215448d2be91c5c089ba3d35a7bc4085c4d2ed36b1f6c51019
-MISC ChangeLog 5328 SHA256 8cc032621669bed6fef6b1b0494d77fc0ff1dbfe166afc82870eeae0fdbb7608 SHA512 1791ad42363cea866c2efc1ea552cbe0ba850cee74c075b453d9128a72bb10612ef7f015ad94226ff354c4f3e22d4b1422f1a27645d6a918acefe54b1525c44d WHIRLPOOL e33eb6ef81cb42c62d1d0f33bc67de52aaa7e0e4465622763ca33afbbd3e4a63eb4406f46c2e1c23d93e7da18ade2ef8e16fdc4d1461dc866c1a90892ccc2e01
+EBUILD cyphesis-0.6.1.ebuild 1346 SHA256 e39360d91b1cfa798ab728917236f7ebfb12b3d85f47441a3c1deef2c71f0400 SHA512 2a74c458066b9f2810f47a58acb33e33d1b1c5736a124213f56eb4cad9ca019f5255fa7e22b48b2745f72734b08954acf4f1d73cd731323105a5fddf310f8838 WHIRLPOOL 147604943504ed48919047e06e70d5cb7418733d9bdf53b640c68e0743d53da67387a189f774557eb66c2711389676a2623a6a08003486d747895021f36236d5
+MISC ChangeLog 5534 SHA256 d4b5096c4cf6fbdf0fbc13a77e02f31e9cdeb6cfc4d8aab9635d8ed024a88612 SHA512 872ffd1c8a46f86c359e8df039f29dd4a6581dff9fe90ea0a4bfe8b7cbf59f83224291d5a12dc8f524b2876a628c580004faf4e71e4ba9bcab4fa11ca4ea5a06 WHIRLPOOL b4ec9b75c80863c5503ed0f02d8fb703ad65a5dc83ef69818f86a415fda9e5683174cb2a7070bc99c527aaea299fa6c7ad30eb31ff3e97c14ebbe1f42f587eb6
 MISC metadata.xml 658 SHA256 7abce09650fe6062c27ee350f8ac2578ba482cdc2b1c4970dc4cd4f076e24028 SHA512 1c5b769585182a0655bcc2405dafffce688fa6cafc493b78e09c6a9f4bfe8d852ba0e339fccf46b80a37518000a08cbfa34da9e6af7d3e79dd10cf9aad6d8a46 WHIRLPOOL 39065684531aa8c7ba8aec9c9159b2ab282ec4c931da7f940b59b44beb48707df4f4260b3aa8408cc4eacf6f262c5584356ff9265a15fcc462c43567d2204837
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlDr7v4ACgkQIY77eQFFFC3ZbgCfbOHq1F6F+n2CFX5RBD2XT0XG
-1qEAniO9V/MocjEvRQAp4zlHiJnafT8C
-=AhNk
+iEYEAREIAAYFAlJL0b4ACgkQIY77eQFFFC1+oACfYu33bHxZMmpDuh/FeLtH73Az
+j+sAnRgpChyzRtW7xS21pOSz0NnM3sl9
+=WBU8
 -----END PGP SIGNATURE-----
diff --git a/games-server/cyphesis/cyphesis-0.6.1.ebuild b/games-server/cyphesis/cyphesis-0.6.1.ebuild
new file mode 100644
index 000000000000..7b183d84d22f
--- /dev/null
+++ b/games-server/cyphesis/cyphesis-0.6.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 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.1 2013/10/02 07:56:40 tupone 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
+	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
new file mode 100644
index 000000000000..69aac409ba8d
--- /dev/null
+++ b/games-server/cyphesis/files/cyphesis-0.6.1-gentoo.patch
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 000000000000..99ca3872c040
--- /dev/null
+++ b/games-server/cyphesis/files/cyphesis-0.6.1-makefile.patch
@@ -0,0 +1,11 @@
+--- 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"