Add patch to force wxpython 2.6 at runtime to prevent errors with multiple

version installs. (Bug #204347)
(Portage version: 2.1.4_rc14)

4 files changed, 73 insertions, 2 deletions

diff --git a/games-puzzle/londonlaw/ChangeLog b/games-puzzle/londonlaw/ChangeLog
index d7c4e9c43c44..0f0c6a6d6023 100644
--- a/games-puzzle/londonlaw/ChangeLog
+++ b/games-puzzle/londonlaw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-puzzle/londonlaw
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/londonlaw/ChangeLog,v 1.8 2007/10/02 03:47:11 dirtyepic Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/londonlaw/ChangeLog,v 1.9 2008/01/05 00:47:38 dirtyepic Exp $
+
+*londonlaw-0.2.1-r1 (05 Jan 2008)
+
+  05 Jan 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/londonlaw-0.2.1-wxversion.patch, +londonlaw-0.2.1-r1.ebuild:
+  Add patch to force wxpython 2.6 at runtime to prevent errors with multiple
+  version installs. (Bug #204347)
 
   02 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> londonlaw-0.2.1.ebuild:
   Lock wxpython to 2.6.
diff --git a/games-puzzle/londonlaw/files/digest-londonlaw-0.2.1-r1 b/games-puzzle/londonlaw/files/digest-londonlaw-0.2.1-r1
new file mode 100644
index 000000000000..8b788a0c232f
--- /dev/null
+++ b/games-puzzle/londonlaw/files/digest-londonlaw-0.2.1-r1
@@ -0,0 +1,3 @@
+MD5 8e7b630de309c75edd07974ca2574c41 londonlaw-0.2.1.tar.gz 3139208
+RMD160 20a32d4b527b220a0ae0e261c5f84dd5563db7b2 londonlaw-0.2.1.tar.gz 3139208
+SHA256 e7453f2e261315384d991ecde31de16e0024fc5f14bacd4642e1daf5d9a4eb87 londonlaw-0.2.1.tar.gz 3139208
diff --git a/games-puzzle/londonlaw/files/londonlaw-0.2.1-wxversion.patch b/games-puzzle/londonlaw/files/londonlaw-0.2.1-wxversion.patch
new file mode 100644
index 000000000000..b323639afcd0
--- /dev/null
+++ b/games-puzzle/londonlaw/files/londonlaw-0.2.1-wxversion.patch
@@ -0,0 +1,15 @@
+--- londonlaw-0.2.1/londonlaw/guiclient/__init__.py	2005-07-05 18:45:05.000000000 -0600
++++ /usr/lib/python2.5/site-packages/londonlaw/guiclient/__init__.py	2008-01-04 17:13:46.000000000 -0600
+@@ -23,6 +23,12 @@
+ 
+ from twisted.internet import protocol, reactor
+ from twisted.python import log
++try:
++    import wxversion
++    wxversion.select("2.6")
++except Exception, e:
++    print >> sys.stderr, "%s: wxPython 2.6 not installed." %e
++    sys.exit(1)
+ from wxPython.wx import *
+ from ConnectWindow import *
+ from GameListWindow import *
diff --git a/games-puzzle/londonlaw/londonlaw-0.2.1-r1.ebuild b/games-puzzle/londonlaw/londonlaw-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..38b7906f667a
--- /dev/null
+++ b/games-puzzle/londonlaw/londonlaw-0.2.1-r1.ebuild
@@ -0,0 +1,46 @@
+# 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-r1.ebuild,v 1.1 2008/01/05 00:47:38 dirtyepic Exp $
+
+inherit eutils python games
+
+DESCRIPTION="Clone of the famous Scotland Yard board game"
+HOMEPAGE="http://www.eecs.umich.edu/~pelzlpj/londonlaw/"
+SRC_URI="http://www.eecs.umich.edu/~pelzlpj/londonlaw/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.3
+	=dev-python/wxpython-2.6*
+	dev-python/twisted"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-setup.py.patch"
+	epatch "${FILESDIR}"/${P}-wxversion.patch
+}
+
+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
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	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
+}