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

version installs. (Bug #204347)
Package-Manager: portage-2.1.4_rc14

5 files changed, 98 insertions, 6 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/Manifest b/games-puzzle/londonlaw/Manifest
index 384a43fd5036..775a32ebdda2 100644
--- a/games-puzzle/londonlaw/Manifest
+++ b/games-puzzle/londonlaw/Manifest
@@ -1,16 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX londonlaw-0.2.1-setup.py.patch 1528 RMD160 4d59b71a4414d34aa7b16a75b34528ad2754e173 SHA1 60beee67b982007c9ada3df857db7325f51fb7ef SHA256 a1db2a03caaeee25a7df02ed95a93de722cdde3550179fae0e1c68bcab3256b1
 MD5 5f414ab1da49789f7e521e0af4ac1c73 files/londonlaw-0.2.1-setup.py.patch 1528
 RMD160 4d59b71a4414d34aa7b16a75b34528ad2754e173 files/londonlaw-0.2.1-setup.py.patch 1528
 SHA256 a1db2a03caaeee25a7df02ed95a93de722cdde3550179fae0e1c68bcab3256b1 files/londonlaw-0.2.1-setup.py.patch 1528
+AUX londonlaw-0.2.1-wxversion.patch 539 RMD160 2b9432b167fe95f2185a9432bb879eb981abe1be SHA1 5a7652e44b3a3a80a049853be1fd8da2da291aaa SHA256 f9d6fe9780a341b597ba5f69c07564df44696722fe2438f0af545dbd7d087b69
+MD5 cdb7c86c03fb2c6177dfaf7218f9db9c files/londonlaw-0.2.1-wxversion.patch 539
+RMD160 2b9432b167fe95f2185a9432bb879eb981abe1be files/londonlaw-0.2.1-wxversion.patch 539
+SHA256 f9d6fe9780a341b597ba5f69c07564df44696722fe2438f0af545dbd7d087b69 files/londonlaw-0.2.1-wxversion.patch 539
 DIST londonlaw-0.2.1.tar.gz 3139208 RMD160 20a32d4b527b220a0ae0e261c5f84dd5563db7b2 SHA1 e38b536d6966c460edd7211c09601a63ee64c1c7 SHA256 e7453f2e261315384d991ecde31de16e0024fc5f14bacd4642e1daf5d9a4eb87
+EBUILD londonlaw-0.2.1-r1.ebuild 1197 RMD160 8b13c27ead5f1e2609700a02bbd1064c6084ed7f SHA1 d35521ac04c1964a0b96dd961ba725c1fe326680 SHA256 83bb67e537811bcc52a17ebe88421d37352e8be417134b3af1040c81d07841b8
+MD5 65dbb4bf53908a1d4ba73204260d51e3 londonlaw-0.2.1-r1.ebuild 1197
+RMD160 8b13c27ead5f1e2609700a02bbd1064c6084ed7f londonlaw-0.2.1-r1.ebuild 1197
+SHA256 83bb67e537811bcc52a17ebe88421d37352e8be417134b3af1040c81d07841b8 londonlaw-0.2.1-r1.ebuild 1197
 EBUILD londonlaw-0.2.1.ebuild 1150 RMD160 aafb6b51d82ca9ca5e8888865152b6034b5ab334 SHA1 14d15f04712767f8157a3c63e3ca76ded1f6aaea SHA256 c36848d74801b9f9409b5ebcc9c6d2deef354abec643c480aaa8c43f725d406f
 MD5 45d43507eacaac5ef56b3336c7e5c3e0 londonlaw-0.2.1.ebuild 1150
 RMD160 aafb6b51d82ca9ca5e8888865152b6034b5ab334 londonlaw-0.2.1.ebuild 1150
 SHA256 c36848d74801b9f9409b5ebcc9c6d2deef354abec643c480aaa8c43f725d406f londonlaw-0.2.1.ebuild 1150
-MISC ChangeLog 1217 RMD160 d4ec4ffee23fc417a090324a9f4d8c1ace2813ae SHA1 cb5a12977ba973b844dc9c6150606952919fcbb4 SHA256 87b1c31d2d1cb922687533bc875d434e8dbe975caa76fdc01c9889e08bc75322
-MD5 a7877eac55586503133970b18a3f9e16 ChangeLog 1217
-RMD160 d4ec4ffee23fc417a090324a9f4d8c1ace2813ae ChangeLog 1217
-SHA256 87b1c31d2d1cb922687533bc875d434e8dbe975caa76fdc01c9889e08bc75322 ChangeLog 1217
+MISC ChangeLog 1482 RMD160 5ad43dd04c1caa70db4410b5c51d21c8c90485df SHA1 62525b6e8c5096cbb0bca250ffbb9b58c2044972 SHA256 4f307c9ed982654875c393610660a0839615d0aac9bda8d1e58d91e157f03ca0
+MD5 bb7218d61fb9e54dde3a786cdb0be031 ChangeLog 1482
+RMD160 5ad43dd04c1caa70db4410b5c51d21c8c90485df ChangeLog 1482
+SHA256 4f307c9ed982654875c393610660a0839615d0aac9bda8d1e58d91e157f03ca0 ChangeLog 1482
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -18,3 +29,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 d964eb68baba150320fe8920d92397ba files/digest-londonlaw-0.2.1 250
 RMD160 1a9e3a50fd083390627412b4b06a06d7b4ed0d49 files/digest-londonlaw-0.2.1 250
 SHA256 829ffde21f69f5d6025062f0f9536ae67a0bdfd7c23251a90822367543b5e2b6 files/digest-londonlaw-0.2.1 250
+MD5 d964eb68baba150320fe8920d92397ba files/digest-londonlaw-0.2.1-r1 250
+RMD160 1a9e3a50fd083390627412b4b06a06d7b4ed0d49 files/digest-londonlaw-0.2.1-r1 250
+SHA256 829ffde21f69f5d6025062f0f9536ae67a0bdfd7c23251a90822367543b5e2b6 files/digest-londonlaw-0.2.1-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkd+07AACgkQiqiDRvmkBmLzEACg8f4lYNnRO6DnZh15ZtNvjAdh
+E9oAoOSCqbteIa38CXaOQJOlNgaUl9qM
+=5+5A
+-----END PGP SIGNATURE-----
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
+}