Use wxversion to force wxpython-2.6 when multiple slots are available. Bug

201317.
Package-Manager: portage-2.1.4_rc7

4 files changed, 52 insertions, 11 deletions

diff --git a/games-util/mattricks/ChangeLog b/games-util/mattricks/ChangeLog
index 9131a738b45a..8ebccf9dd1ff 100644
--- a/games-util/mattricks/ChangeLog
+++ b/games-util/mattricks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-util/mattricks
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/mattricks/ChangeLog,v 1.8 2007/02/24 19:24:13 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/mattricks/ChangeLog,v 1.9 2007/12/07 00:04:32 dirtyepic Exp $
+
+  07 Dec 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/mattricks-0.7-wxversion.patch, mattricks-0.7.ebuild:
+  Use wxversion to force wxpython-2.6 when multiple slots are available. Bug
+  201317.
 
   24 Feb 2007; Tiziano Müller <dev-zero@gentoo.org> mattricks-0.7.ebuild:
   Works with wxpython-2.6 as well
diff --git a/games-util/mattricks/Manifest b/games-util/mattricks/Manifest
index 5d6eed65469f..69283a570696 100644
--- a/games-util/mattricks/Manifest
+++ b/games-util/mattricks/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mattricks-0.7-wxversion.patch 618 RMD160 06082e35cab70937dc6fd8d06e65702373cb3847 SHA1 f1e9463dc5ed3b7513d8a096010cc29f9ef7fbd3 SHA256 c15df5da177704f4c42418321148bcdc4c962e217122863fc7e11eab7b0bc127
+MD5 9bf5295afb81cd0b5f565e3db3778341 files/mattricks-0.7-wxversion.patch 618
+RMD160 06082e35cab70937dc6fd8d06e65702373cb3847 files/mattricks-0.7-wxversion.patch 618
+SHA256 c15df5da177704f4c42418321148bcdc4c962e217122863fc7e11eab7b0bc127 files/mattricks-0.7-wxversion.patch 618
 DIST Mattricks-0.7.tar.gz 709495 RMD160 aeb8747a598b9731fb55f34bb0893e04460bd6db SHA1 f67608e8823b2baa27a8a342e4e32a88e1d341a4 SHA256 53643feeeabd681bfa3e42631f7ff7bce906cbec7cd683799e584d0d1da71e15
-EBUILD mattricks-0.7.ebuild 550 RMD160 c855e884082ac19431f256c7acd1fcb5fb302637 SHA1 ed79c7e6d3d8a5c6fbfd89b2e2392e1b73c61c8b SHA256 ff00297a04fd291b0b16210ef99f58b0531c493c60ad55e568a082980992ea1c
-MD5 f0150bbf76f5cad6ae32dd97894cf5ff mattricks-0.7.ebuild 550
-RMD160 c855e884082ac19431f256c7acd1fcb5fb302637 mattricks-0.7.ebuild 550
-SHA256 ff00297a04fd291b0b16210ef99f58b0531c493c60ad55e568a082980992ea1c mattricks-0.7.ebuild 550
-MISC ChangeLog 1199 RMD160 cb5e7e8e0d3d939ae9d247ecce50b5ef5a7bbab6 SHA1 d9298f5782749ab0b7eda6c52254c9ae6ffb7fea SHA256 ae56f215a1579ab46eacf4e6e500c602d45d381fa3dfba708d2ae7f9a0d039ea
-MD5 f8dde211f4865d79f94566b85cf164a7 ChangeLog 1199
-RMD160 cb5e7e8e0d3d939ae9d247ecce50b5ef5a7bbab6 ChangeLog 1199
-SHA256 ae56f215a1579ab46eacf4e6e500c602d45d381fa3dfba708d2ae7f9a0d039ea ChangeLog 1199
+EBUILD mattricks-0.7.ebuild 641 RMD160 534d2155cb22452af73edde38f3c4ebba01c27e2 SHA1 c8e9fc04063501387352348ba3a51cd91161a8d5 SHA256 97d5e50fbece10f9bd11ca652d1158b61d109c2c24def83e126198ad5ce8d0d8
+MD5 fb3fdf17fcb8127ff92f696f496f6dd5 mattricks-0.7.ebuild 641
+RMD160 534d2155cb22452af73edde38f3c4ebba01c27e2 mattricks-0.7.ebuild 641
+SHA256 97d5e50fbece10f9bd11ca652d1158b61d109c2c24def83e126198ad5ce8d0d8 mattricks-0.7.ebuild 641
+MISC ChangeLog 1398 RMD160 de679cb450808e7388d1465b9e8c036edfa3ce66 SHA1 76bc00dcd00b48588359038e9ce0706a11370bad SHA256 b6a0342f9b640c7815b1e1ff924759ec2998c2c23046a59bfda4bdf2470692f1
+MD5 6304e0f2416ae44e4ff225a4a2159c2c ChangeLog 1398
+RMD160 de679cb450808e7388d1465b9e8c036edfa3ce66 ChangeLog 1398
+SHA256 b6a0342f9b640c7815b1e1ff924759ec2998c2c23046a59bfda4bdf2470692f1 ChangeLog 1398
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -14,3 +21,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 7303e49c231956f9382d662be9e7814b files/digest-mattricks-0.7 241
 RMD160 796998f2ab3bb8501279a5fb853aa4721298caf5 files/digest-mattricks-0.7 241
 SHA256 4adf631eadfa680ae20084c932384de920d61e73a89a915246f871c98802c9d5 files/digest-mattricks-0.7 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHWI4aiqiDRvmkBmIRAg7LAJwMtg4TMsp4e5Vq7rhwJAX7TzOuhQCg5lVC
+D3++Wv1s8zmMsfZrCSgh3fA=
+=J2Lx
+-----END PGP SIGNATURE-----
diff --git a/games-util/mattricks/files/mattricks-0.7-wxversion.patch b/games-util/mattricks/files/mattricks-0.7-wxversion.patch
new file mode 100644
index 000000000000..b3076355686b
--- /dev/null
+++ b/games-util/mattricks/files/mattricks-0.7-wxversion.patch
@@ -0,0 +1,17 @@
+diff -Naur Mattricks-0.7-orig/Mattricks/Commonwx.py Mattricks-0.7/Mattricks/Commonwx.py
+--- Mattricks-0.7-orig/Mattricks/Commonwx.py	2004-04-15 06:20:07.000000000 -0600
++++ Mattricks-0.7/Mattricks/Commonwx.py	2007-12-04 21:05:15.000000000 -0600
+@@ -17,6 +17,13 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
++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 Common import *
+ 
diff --git a/games-util/mattricks/mattricks-0.7.ebuild b/games-util/mattricks/mattricks-0.7.ebuild
index c97c5ad9c674..4356bc5a1cf6 100644
--- a/games-util/mattricks/mattricks-0.7.ebuild
+++ b/games-util/mattricks/mattricks-0.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/mattricks/mattricks-0.7.ebuild,v 1.4 2007/02/24 19:24:13 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/mattricks/mattricks-0.7.ebuild,v 1.5 2007/12/07 00:04:32 dirtyepic Exp $
 
-inherit distutils
+inherit distutils eutils
 
 MY_P=${P/m/M}
 DESCRIPTION="Hattrick Manager"
@@ -18,3 +18,8 @@ DEPEND="<dev-python/wxpython-2.8
 		dev-python/pyxml"
 
 S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	distutils_src_unpack
+	epatch "${FILESDIR}"/${P}-wxversion.patch
+}