Restrict Jython ABIs.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

6 files changed, 28 insertions, 18 deletions

diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 98024bf10221..74905ac1be1d 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -23,17 +23,27 @@ DIST wxPython-src-2.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab26
 DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a872037c44a7694a SHA1 18982edc236a1d87e4eef018928358c925aa5b17 SHA256 210c568bdec811b10fbf8274e9659c8e52823d31fdda9010dbba725194f66661
 DIST wxPython-src-2.8.12.0.tar.bz2 31156191 RMD160 6420a8e6e59386b344ac058435a4ae6693c2c04b SHA1 f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4 SHA256 6d5e82772b87981c2a0d78d7a08b3a4498529127be2f05016892e8866e98babd
 DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c357231d6fd5c SHA1 886196021bb7712ddf0f2a368137fde26e6e7823 SHA256 613ecb71dbb65b5938ea323bd5cd896b26853e46c4aa45fbf4837fc7e041583a
-EBUILD wxpython-2.6.4.0-r2.ebuild 3565 RMD160 0bbb2fe384430c616cc6e26cabe773285427b3e6 SHA1 285d54ade48a830dfd6c187ee21394dbdba34be2 SHA256 269d1b02d4f89cec9a9d4f51bbf885459dc3f38f63d43782814de8cf21ea4313
-EBUILD wxpython-2.8.10.1.ebuild 5382 RMD160 f50c45cbc14b4844b82279349afe0fac825a09ac SHA1 bc7e32325b366af8a4347870ba7fefd46952b3b8 SHA256 f1f229485921adcc8e99287a9cfeecb5697c474f03a4f3f2725e6e1506d6b3ac
-EBUILD wxpython-2.8.11.0.ebuild 5398 RMD160 92e2093f8cb7cc68b15c85645478371422c11a27 SHA1 4b96930844a4c7973fbca1922f07a6ba5e5c1fdf SHA256 3f3ef3b2921ac2fe714e26aca9114d054f3f51ab707a4c9c731ad9d3bd3708ab
-EBUILD wxpython-2.8.12.0.ebuild 5391 RMD160 0074b89d0f594c9ad410720ec873b0fe51d8b4a2 SHA1 b119b4acfd7129b179073a12705983282ec5be1c SHA256 eed17634955a0444dfa437d4dfc9b7cdfac996548e143c0e3af40b07ab432b3c
-EBUILD wxpython-2.9.1.1.ebuild 4935 RMD160 f9c7024beb44a01146a1a0c0c9536b65ecbc65e0 SHA1 a747498eb4f5dea5bb0fee65bc55ece4e66bcaab SHA256 df9678242cabafdcf5d35507e5429a0874c4d910f6b6b2193a809d8357c812c2
+EBUILD wxpython-2.6.4.0-r2.ebuild 3575 RMD160 e98b4ed5d66c10061ac28fac635d8d0f1d5c761d SHA1 6e54f848057fd4edbcfd41565b7345633b0d521b SHA256 b670af6696125128c1d98b3bb4085652a82ff0e776d7c8bcfc9b8a0bd3e51a76
+EBUILD wxpython-2.8.10.1.ebuild 5392 RMD160 b57c9d3fedc1520011182b32cd7df9a51f821fd2 SHA1 0a9a5d1060f27de8dce94a98519e1995de728763 SHA256 04ec3086543c4e75b114126b64f3428cc1916392afda6904e484175c1523d864
+EBUILD wxpython-2.8.11.0.ebuild 5406 RMD160 0c7dc99b637ce318c19e264041ede137700478f4 SHA1 811d5b924c4a3d68038b2c5a6a36ebb2cb7dde39 SHA256 01c7270a5e58ed8c242382adc93b04432eccb43248ae2ee86705ce213ef65a65
+EBUILD wxpython-2.8.12.0.ebuild 5399 RMD160 60d25584dc422f9f68c2fe3ebcf27600a7eb515b SHA1 0db847c671516eeb18efbd72644ebd6fb4942a7e SHA256 855f03e7b784719a48bbaa0da164ace4fed3fa0fbbc97ad8665b5b7bc4d1f0aa
+EBUILD wxpython-2.9.1.1.ebuild 4943 RMD160 547558442c83bbc874ec088c581393fef22c2c73 SHA1 62db1bc37fb8e0a65129270d54801a8ef2ab4440 SHA256 4350e3a00af3fee267764b6077ec373e7f6f8997ab2baeeca6c4325f9e7ab5f2
 MISC ChangeLog 26485 RMD160 e8eb0a366d62bcbc3d261fd5baddc9d9daf6e9b7 SHA1 fe7fe8b114941945f5f6a964cfaf1d3d4e078f9c SHA256 764e02a0e690286dd1a7cd57deccc262a99b845fe6942558d2033ce7be1f2587
 MISC metadata.xml 366 RMD160 3241adb1423f2ce702bc75172a071d7c24c335e3 SHA1 363953bc2e7c364bdc92278ce391df6820c8b063 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2ukJcACgkQiqiDRvmkBmLPsgCgrgw/NovHm285GjHeimX20+9M
-dYgAoNcODZW7c2BDpJH+OqbPDSKtOMWI
-=lU5g
+iQIcBAEBAgAGBQJNr4ZWAAoJENgZr6v6gHY0zR0P/2yc+/w9UlvCXHoCrrkf7OCR
+gryHTAH6IdD+IboBtcvLCA+xl3iIuE3NlWNrRZ1FeIyl2tkAXiWw6oKkpTsBb1si
+NPvaaWuPwNsDt3yo2vvgOoghhBvQZPlZi9VBcMcIas8BTSG2JIaMq19i6DXshqYC
+dDbd9Wu2LGfWu5qaQzN1VaAY1imktLV3/MauIFSlAgG3EPETRZCQaONG2gL0kg6i
+HWZsMFlkra7NaEHdAWk5mJYE5HcBIL4x/T7b7dkKtrcG2cwlKPeSsWWCEbAZcYpb
+5JPOgfsge+7Y+LlBrY0aFtuxWSikjY7csTzV3M2iKHMNMdoLKfz0GpytFTFM5i9+
+BWZOyJ78Ue7pGJXMgx5b2YJ9TpmOyM2E5es3IEW5qW9fkzZ4zMgqfVT9R1AGg7aj
+0D7lPihh2FIF/scFlcOZSClchQukbPEHpVAzuJfZ+6l6cyyLVhvQzMBw5W87Nd9J
+wV9rmCiS2/iOyktFrm9nC10FLoV4eTPvFlvphr+RWOPtbTeRBApKKrorUTAwTIEa
+cRCFlfzIoiPXyN5usFus7rdAnnpk4rCNuKfktrh0wP/WmhYvJaj8WYvXqGMAkqmj
+cIvxT0Nrc8ADjJ0O+W/WBOVUNjSnQX7EMXxdPLG+7wLogFraOvOk5kcFbHW+XfG9
+gWcC/aQRP0iSMHTYBg0d
+=kFM1
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild b/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild
index 17c5e7fc160f..d881b0587e6a 100644
--- a/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild
+++ b/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild,v 1.16 2011/03/29 08:04:23 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild,v 1.17 2011/04/21 01:20:09 arfrever Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -34,7 +34,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 S="${WORKDIR}/${MY_P}/wxPython"
 
diff --git a/dev-python/wxpython/wxpython-2.8.10.1.ebuild b/dev-python/wxpython/wxpython-2.8.10.1.ebuild
index 0ab901b5eee9..a11c4d80d563 100644
--- a/dev-python/wxpython/wxpython-2.8.10.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v 1.19 2011/03/29 08:04:23 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v 1.20 2011/04/21 01:20:09 arfrever Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -38,7 +38,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 S="${WORKDIR}/${MY_P}/wxPython"
 DOC_S="${WORKDIR}/wxPython-${PV}"
diff --git a/dev-python/wxpython/wxpython-2.8.11.0.ebuild b/dev-python/wxpython/wxpython-2.8.11.0.ebuild
index 63bef6a21eaa..ba3dba46c8b7 100644
--- a/dev-python/wxpython/wxpython-2.8.11.0.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.11.0.ebuild,v 1.4 2011/02/27 14:40:52 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.11.0.ebuild,v 1.5 2011/04/21 01:20:09 arfrever Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -38,7 +38,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 S="${WORKDIR}/${MY_P}/wxPython"
 DOC_S="${WORKDIR}/wxPython-${PV}"
diff --git a/dev-python/wxpython/wxpython-2.8.12.0.ebuild b/dev-python/wxpython/wxpython-2.8.12.0.ebuild
index 2f38f81b636e..05dceba482af 100644
--- a/dev-python/wxpython/wxpython-2.8.12.0.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.0.ebuild,v 1.1 2011/04/20 07:45:23 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.0.ebuild,v 1.2 2011/04/21 01:20:09 arfrever Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -38,7 +38,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 S="${WORKDIR}/${MY_P}/wxPython"
 DOC_S="${WORKDIR}/wxPython-${PV}"
diff --git a/dev-python/wxpython/wxpython-2.9.1.1.ebuild b/dev-python/wxpython/wxpython-2.9.1.1.ebuild
index aed201bd459c..5cb866a5482a 100644
--- a/dev-python/wxpython/wxpython-2.9.1.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.9.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.1.1.ebuild,v 1.2 2011/02/27 14:40:52 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.1.1.ebuild,v 1.3 2011/04/21 01:20:09 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -36,7 +36,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 S="${WORKDIR}/${MY_P}/wxPython"
 DOC_S="${WORKDIR}/wxPython-${PV}"