dedicated support and sed patch from mattenklicker@gmx.net via bug #235326

Package-Manager: portage-2.1.4.4

5 files changed, 118 insertions, 2 deletions

diff --git a/games-puzzle/londonlaw/ChangeLog b/games-puzzle/londonlaw/ChangeLog
index b5f030217bba..eeedad846f74 100644
--- a/games-puzzle/londonlaw/ChangeLog
+++ b/games-puzzle/londonlaw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-puzzle/londonlaw
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/londonlaw/ChangeLog,v 1.13 2008/06/25 19:42:01 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/londonlaw/ChangeLog,v 1.14 2008/08/24 06:36:05 mr_bones_ Exp $
+
+*londonlaw-0.2.1-r2 (24 Aug 2008)
+
+  24 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/londonlaw.confd, +files/londonlaw.rc, +londonlaw-0.2.1-r2.ebuild:
+  dedicated support and sed patch from mattenklicker@gmx.net via bug #235326
 
   25 Jun 2008; nixnut <nixnut@gentoo.org> londonlaw-0.2.1-r1.ebuild:
   Stable on ppc wrt bug 229307
diff --git a/games-puzzle/londonlaw/Manifest b/games-puzzle/londonlaw/Manifest
index b1a030e10a6d..49ed81c92422 100644
--- a/games-puzzle/londonlaw/Manifest
+++ b/games-puzzle/londonlaw/Manifest
@@ -1,6 +1,9 @@
 AUX londonlaw-0.2.1-setup.py.patch 1528 RMD160 4d59b71a4414d34aa7b16a75b34528ad2754e173 SHA1 60beee67b982007c9ada3df857db7325f51fb7ef SHA256 a1db2a03caaeee25a7df02ed95a93de722cdde3550179fae0e1c68bcab3256b1
 AUX londonlaw-0.2.1-wxversion.patch 639 RMD160 7b2ea38340b1ac527b1bbaac06e2bf7a543b2f7f SHA1 0cc60a78121b250b10ee2763bef90858ea6510a0 SHA256 f5e9b1f8be713443e506b678a262f8dab1044e85a90a66e4ce4f0a092ffbcc10
+AUX londonlaw.confd 60 RMD160 6d230b5a42f264c17f5190aff9ab59a9f25899c6 SHA1 a39653106438fb3794313d9a3cf3def226f9828d SHA256 c849dc072ada1f84619754111401ddeaf391aee9c891d531bcc02fc9fcf201c7
+AUX londonlaw.rc 504 RMD160 949a1a462bcf1295179df7360b591ddc751e65fd SHA1 c418294bf0fd6a0b447e32ba86a09f56a3cce724 SHA256 c15c1c87eb76c66cf55e65f22863a646d23d355002c240932bfb7513a744d1ae
 DIST londonlaw-0.2.1.tar.gz 3139208 RMD160 20a32d4b527b220a0ae0e261c5f84dd5563db7b2 SHA1 e38b536d6966c460edd7211c09601a63ee64c1c7 SHA256 e7453f2e261315384d991ecde31de16e0024fc5f14bacd4642e1daf5d9a4eb87
 EBUILD londonlaw-0.2.1-r1.ebuild 1191 RMD160 e9657e8de51dbab42443396788cab523545f93f8 SHA1 2a2bee41b8aeab0231594dee190645d0f077efc6 SHA256 a769f104c883b10ab1c225212f99bda5586b6ab5772180bebbe43f31e30649af
-MISC ChangeLog 1951 RMD160 518c2f3cf77187883516c38e81cdc84eb5c815f7 SHA1 57573749f900c5cff942ca362db491291d783088 SHA256 7230c9be295c9e3fc9a14f5a6cc9e00a1943c397cff7af0745f142c7f9773908
+EBUILD londonlaw-0.2.1-r2.ebuild 2214 RMD160 a0246e718a4e3bdff076d0831a1eaeb8a11c0435 SHA1 f8b8696073e3b042f18a54f6812d006163893493 SHA256 04284b0a61fc7b3138b1ffa5ec427e269e0caf14bfe8512214269624eb467f99
+MISC ChangeLog 2197 RMD160 efe50f52793b578b5aa79b27ad1c7ee1a28c2ce7 SHA1 ba7f28cfd79d8d294452540cb60d7aa564a387e6 SHA256 cd98c9df9eb2ab306897b7a52929e02e7c86fa1d668d465f8dc6ea737c36d655
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/londonlaw/files/londonlaw.confd b/games-puzzle/londonlaw/files/londonlaw.confd
new file mode 100644
index 000000000000..083798b3252b
--- /dev/null
+++ b/games-puzzle/londonlaw/files/londonlaw.confd
@@ -0,0 +1,2 @@
+#run londonlaw on port 7921 (default)
+LONDONLAW_PORT="7921"
diff --git a/games-puzzle/londonlaw/files/londonlaw.rc b/games-puzzle/londonlaw/files/londonlaw.rc
new file mode 100644
index 000000000000..9626a3d61a7d
--- /dev/null
+++ b/games-puzzle/londonlaw/files/londonlaw.rc
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting londonlaw server"
+	start-stop-daemon --start --pidfile /var/run/london-server.pid \
+		--user GAMES_USER_DED --background --stdout /var/log/londonlaw.log \
+		--stderr /var/log/londonlaw.log --make-pidfile \
+		--exec GAMES_BINDIR/london-server -- -p $LONDONLAW_PORT
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping londonlaw server"
+	start-stop-daemon --stop --pidfile /var/run/london-server.pid \
+		--exec GAMES_BINDIR/london-server
+	eend $?
+}
diff --git a/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild b/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild
new file mode 100644
index 000000000000..698826c9eded
--- /dev/null
+++ b/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild,v 1.1 2008/08/24 06:36:05 mr_bones_ Exp $
+
+EAPI=1
+inherit eutils python games
+
+DESCRIPTION="Clone of the famous Scotland Yard board game"
+HOMEPAGE="http://pessimization.com/software/londonlaw/"
+SRC_URI="http://pessimization.com/software/londonlaw/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dedicated"
+
+DEPEND=">=dev-lang/python-2.3
+	!dedicated? ( dev-python/wxpython:2.6 )
+	dev-python/twisted"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${P}-setup.py.patch \
+		"${FILESDIR}"/${P}-wxversion.patch
+	if has_version '>=dev-python/twisted-2.3' ; then
+		sed -i \
+			-e 's:import log:import log\nfrom zope import interface\n:' \
+			-e 's:class IGameListener(components.Interface):class IGameListener(interface.Interface):' \
+			londonlaw/server/Game.py \
+			|| die "sed failed"
+	fi
+
+	if use dedicated ; then
+		local f
+		rm -r londonlaw/{london-client,london-client.py,guiclient/}
+		sed -i \
+			-e "s:'londonlaw.guiclient'::" \
+			-e "s:'londonlaw/london-client'::" \
+			setup.py \
+			|| die "sed failed"
+		for f in londonlaw.rc londonlaw.confd
+		do
+			sed \
+				-e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
+				-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
+				"${FILESDIR}/${f}" > "${T}/${f}" \
+				|| die "sed failed"
+		done
+	fi
+}
+
+src_install() {
+	python_version
+	python setup.py install \
+		--root="${D}" \
+		--prefix="${GAMES_PREFIX}" \
+		--install-lib=/usr/lib/python${PYVER}/site-packages \
+		--install-data="${GAMES_DATADIR}" \
+		|| die "install failed"
+	dodoc ChangeLog README
+
+	if use dedicated ; then
+		newinitd "${T}/londonlaw.rc" londonlaw
+		newconfd "${T}/londonlaw.confd" londonlaw
+		insinto /var/log
+		newins /dev/null londonlaw.log
+		fowners ${GAMES_USER_DED}:${GAMES_GROUP} /var/log/londonlaw.log
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	if ! use dedicated ; then
+		echo
+		elog "To play, first start the server (london-server), then connect"
+		elog "with the client (london-client).  At least two players are"
+		elog "needed to play."
+		echo
+	fi
+}