summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Loeser <halcy0n@gentoo.org>2006-04-14 19:19:15 +0000
committerMark Loeser <halcy0n@gentoo.org>2006-04-14 19:19:15 +0000
commit580c3b496864bd3574062c2bf6088e74317e29ac (patch)
tree7bf2b2e06be5c7a73ef9a160e8f73bcd7a586258 /dev-python
parentAdded GCC 4.1 patch supplied by Mark Loeser <halcy0n@gentoo.org>, closes bug ... (diff)
downloadgentoo-2-580c3b496864bd3574062c2bf6088e74317e29ac.tar.gz
gentoo-2-580c3b496864bd3574062c2bf6088e74317e29ac.tar.bz2
gentoo-2-580c3b496864bd3574062c2bf6088e74317e29ac.zip
Fix dependencies so that wxpython and wxGTK versions always match; bug #129937
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/wxpython/ChangeLog5
-rw-r--r--dev-python/wxpython/Manifest16
-rw-r--r--dev-python/wxpython/wxpython-2.6.3.2.ebuild4
3 files changed, 9 insertions, 16 deletions
diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 6d2fdfecdf9d..39195b42591b 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/wxpython
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.38 2006/04/13 18:50:12 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.39 2006/04/14 19:19:15 halcy0n Exp $
+
+ 14 Apr 2006; Mark Loeser <halcy0n@gentoo.org> wxpython-2.6.3.2.ebuild:
+ Fix dependencies so that wxpython and wxGTK versions always match; bug #129937
*wxpython-2.6.3.2 (13 Apr 2006)
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 3da6e6f77e44..af5e07c1e2bd 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 edaa32afe666feb2c16a613391636bf4 ChangeLog 11465
RMD160 0bf4ef398846cb5bb2ff5be6ce06849a5f2cb7bc ChangeLog 11465
SHA256 63ba3b56cb40e56bb645178be64893ecf2d95372287a1ef45d411315c712ba72 ChangeLog 11465
@@ -46,13 +43,6 @@ SHA256 dc0f56cf81568107b8d93b08049438e965803a3917f90a149b883dd71d16714f wxpython
MD5 b7e08422f599125874b8a8b9e77139ef wxpython-2.6.1.0.ebuild 3799
RMD160 21174a37b98de635cd51669362b1d072bf7e8fad wxpython-2.6.1.0.ebuild 3799
SHA256 f126cc324972aa9bd5ff7e359153b46ca10bd472e8a954565d449e1baeab0a49 wxpython-2.6.1.0.ebuild 3799
-MD5 8ec938719c6ca5ee984f9436a2a78c03 wxpython-2.6.3.2.ebuild 3085
-RMD160 ce75681f38f3149e99b3a23cd542a57e663ccf8c wxpython-2.6.3.2.ebuild 3085
-SHA256 3e84cf816a7c6947f4aa9fb7788518a598d928987c57912f9c4a055450166273 wxpython-2.6.3.2.ebuild 3085
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFEPp1wCRZPokWLroQRAnvKAJ0WEPL9pCX3pgtm7SjEo1RjVjCTsACg5lHH
-2Reu2LgdLYmTSCfyn+XG3tU=
-=OY6U
------END PGP SIGNATURE-----
+MD5 5cddd2e5d3e247b3452b6cbe06b10b31 wxpython-2.6.3.2.ebuild 3086
+RMD160 4fa2ebdcfc7fb6808506f798085607d87785b657 wxpython-2.6.3.2.ebuild 3086
+SHA256 15fc89068b39193a85022e65742b1ccac6f801810d53088e4b768cf144463fae wxpython-2.6.3.2.ebuild 3086
diff --git a/dev-python/wxpython/wxpython-2.6.3.2.ebuild b/dev-python/wxpython/wxpython-2.6.3.2.ebuild
index 1d7100c36fc6..fbb9c8a0c5f2 100644
--- a/dev-python/wxpython/wxpython-2.6.3.2.ebuild
+++ b/dev-python/wxpython/wxpython-2.6.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.3.2.ebuild,v 1.1 2006/04/13 18:50:12 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.3.2.ebuild,v 1.2 2006/04/14 19:19:15 halcy0n Exp $
inherit python wxwidgets eutils multilib
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="unicode opengl"
RDEPEND=">=dev-lang/python-2.1
- =x11-libs/wxGTK-2.6*
+ ~x11-libs/wxGTK-${PV}
>=x11-libs/gtk+-2.0
>=x11-libs/pango-1.2
>=dev-libs/glib-2.0