Lock to wxpython-2.6 at runtime.

Package-Manager: portage-2.1.4_rc7

5 files changed, 54 insertions, 18 deletions

diff --git a/dev-util/wxglade/ChangeLog b/dev-util/wxglade/ChangeLog
index 5b19c42ce829..8d10506c8e87 100644
--- a/dev-util/wxglade/ChangeLog
+++ b/dev-util/wxglade/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/wxglade
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/ChangeLog,v 1.43 2007/12/04 04:27:31 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/ChangeLog,v 1.44 2007/12/04 15:42:07 dirtyepic Exp $
+
+  04 Dec 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/wxglade-0.6.1-wxversion.patch, wxglade-0.6.ebuild,
+  wxglade-0.6.1.ebuild:
+  Lock to wxpython-2.6 at runtime.
 
   04 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> -wxglade-0.4.1.ebuild:
   Remove old.
diff --git a/dev-util/wxglade/Manifest b/dev-util/wxglade/Manifest
index ab3029d5c508..22f0f1c1e920 100644
--- a/dev-util/wxglade/Manifest
+++ b/dev-util/wxglade/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX wxglade-0.6.1-wxversion.patch 362 RMD160 72fb56b5e88c1eaea4dccbad71720f5d51ccd3e8 SHA1 24024def4df3ad05cf87cbd293ecd2b638f6b9db SHA256 d94ab14bdc70c6dc667bc62307923b2db4cca5ef14a55577330cbfb720dfefd6
+MD5 7113aa181f0800525433445c6326b8e3 files/wxglade-0.6.1-wxversion.patch 362
+RMD160 72fb56b5e88c1eaea4dccbad71720f5d51ccd3e8 files/wxglade-0.6.1-wxversion.patch 362
+SHA256 d94ab14bdc70c6dc667bc62307923b2db4cca5ef14a55577330cbfb720dfefd6 files/wxglade-0.6.1-wxversion.patch 362
 DIST wxGlade-0.6.1.tar.gz 582089 RMD160 3ac92508766c7975e2d34ed5e5b400568b37afe6 SHA1 59b1afb803ccfadd1d27caeaefca7e030eb107ab SHA256 06c163a98bf1bac449a4281d0082c1766ea860ff2fe68d63492412b001a76c8a
 DIST wxGlade-0.6.tar.gz 562519 RMD160 0c338ad258776a3482aff48a8be15d69cedd783c SHA1 12475c998cb0da162a94b2a6e24cfa346c20fbd6 SHA256 35dfad6f21894115811d9e7a4f08e1bcebb2fbef7c1dbb46cf22b40c472c7923
-EBUILD wxglade-0.6.1.ebuild 1518 RMD160 d8c1d6a594405711bcef3359862874bda7e20085 SHA1 7aa06b5664bb5f8621b1098e56ec20f64476be0a SHA256 76e8f97a41e665e8ca99f5cacd5b1fe1d410d977df75a8ec3e63777216d8a75c
-MD5 b8e2e96b0c86b74e23dec6ad42fc5fa2 wxglade-0.6.1.ebuild 1518
-RMD160 d8c1d6a594405711bcef3359862874bda7e20085 wxglade-0.6.1.ebuild 1518
-SHA256 76e8f97a41e665e8ca99f5cacd5b1fe1d410d977df75a8ec3e63777216d8a75c wxglade-0.6.1.ebuild 1518
-EBUILD wxglade-0.6.ebuild 1510 RMD160 20fa092a35284e8d25827eb40f4918e4e70f2cdc SHA1 3f648982813d490f2bb901d107768bb6371ef2c5 SHA256 837cdad06cfa5f1a37aa4eb69992b623f5dfb96dcbf5145cb99ff48487ee065c
-MD5 6b2c69825b102a47e6c979dc0dc173ec wxglade-0.6.ebuild 1510
-RMD160 20fa092a35284e8d25827eb40f4918e4e70f2cdc wxglade-0.6.ebuild 1510
-SHA256 837cdad06cfa5f1a37aa4eb69992b623f5dfb96dcbf5145cb99ff48487ee065c wxglade-0.6.ebuild 1510
-MISC ChangeLog 5583 RMD160 8a8d5d599ff43c45d10cfcf23bc40439cd92625e SHA1 bb4c3ab329036346f331d31d2434edcb8f588ef3 SHA256 1a05e4b6ab3e956473c88d27e8eb543f09e0f04ab16f313034889883891877af
-MD5 ad31e35f550ef0343d70ed6d688a151b ChangeLog 5583
-RMD160 8a8d5d599ff43c45d10cfcf23bc40439cd92625e ChangeLog 5583
-SHA256 1a05e4b6ab3e956473c88d27e8eb543f09e0f04ab16f313034889883891877af ChangeLog 5583
+EBUILD wxglade-0.6.1.ebuild 1604 RMD160 8e6e89bf3855a3da9cd4fb7ae731c30c2f0e8102 SHA1 50f1d6387e56187b43fa63f8f4dbb485a8082ff2 SHA256 f58ac84f8f55461fdb79a58bb2cd888d612007ab8e368319ae86aaf7e8f1743d
+MD5 ee383bd298cb16739a77fe930e1fc011 wxglade-0.6.1.ebuild 1604
+RMD160 8e6e89bf3855a3da9cd4fb7ae731c30c2f0e8102 wxglade-0.6.1.ebuild 1604
+SHA256 f58ac84f8f55461fdb79a58bb2cd888d612007ab8e368319ae86aaf7e8f1743d wxglade-0.6.1.ebuild 1604
+EBUILD wxglade-0.6.ebuild 1606 RMD160 c5776c8d3ab4c2f4fe5b97731d04b3b3c2434197 SHA1 fa7a8e3f06afa9dd33b5db03b4cfa49c652db09f SHA256 24716fce19053a27f15b8572aa273233cbe97b8b0e97b3b30ae70e69eda745a3
+MD5 a5f49451da10e8ba157f839d24f41648 wxglade-0.6.ebuild 1606
+RMD160 c5776c8d3ab4c2f4fe5b97731d04b3b3c2434197 wxglade-0.6.ebuild 1606
+SHA256 24716fce19053a27f15b8572aa273233cbe97b8b0e97b3b30ae70e69eda745a3 wxglade-0.6.ebuild 1606
+MISC ChangeLog 5751 RMD160 589ee2e2ddd302d926127c4317e12eaad5963c66 SHA1 2448054de31506462356dd3879bdd661d36026a1 SHA256 42a73ae1e129a9df0ce63c863d079f3138128f36e150974f8abdb98737133c31
+MD5 70cbdb2ac1b7c1d86cd5b52a0dda1054 ChangeLog 5751
+RMD160 589ee2e2ddd302d926127c4317e12eaad5963c66 ChangeLog 5751
+SHA256 42a73ae1e129a9df0ce63c863d079f3138128f36e150974f8abdb98737133c31 ChangeLog 5751
 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
@@ -28,7 +32,7 @@ SHA256 ae1860402b2e94f8e5eb0886ba5b8e466a20025d7ddbbaf67b2ee7e3faacc4e5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHVNc4iqiDRvmkBmIRAkGCAKDyHu/hfsCFd6FeZvTaD3AW0zunGgCgqOK4
-SEmHvswwfonvoWXLgnpGjgU=
-=LWeE
+iD8DBQFHVXVYiqiDRvmkBmIRAv1vAKCqH37SLyLm1oQ8k8FPchNCZV2KTwCeIoVR
+GC4AwgMMQl2FU2IYF/Vqp8w=
+=HvQY
 -----END PGP SIGNATURE-----
diff --git a/dev-util/wxglade/files/wxglade-0.6.1-wxversion.patch b/dev-util/wxglade/files/wxglade-0.6.1-wxversion.patch
new file mode 100644
index 000000000000..f793266b3b9c
--- /dev/null
+++ b/dev-util/wxglade/files/wxglade-0.6.1-wxversion.patch
@@ -0,0 +1,12 @@
+diff -Naur wxGlade-0.6.1-orig/main.py wxGlade-0.6.1/main.py
+--- wxGlade-0.6.1-orig/main.py	2007-10-25 01:03:22.000000000 -0600
++++ wxGlade-0.6.1/main.py	2007-12-04 09:36:20.000000000 -0600
+@@ -7,7 +7,7 @@
+ # THIS PROGRAM COMES WITH NO WARRANTY
+ 
+ import wxversion
+-wxversion.ensureMinimal("2.6")
++wxversion.select("2.6")
+ 
+ #from wxPython.wx import *
+ import wx
diff --git a/dev-util/wxglade/wxglade-0.6.1.ebuild b/dev-util/wxglade/wxglade-0.6.1.ebuild
index 3010781f11d4..244641119877 100644
--- a/dev-util/wxglade/wxglade-0.6.1.ebuild
+++ b/dev-util/wxglade/wxglade-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/wxglade-0.6.1.ebuild,v 1.1 2007/10/29 02:44:18 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/wxglade-0.6.1.ebuild,v 1.2 2007/12/04 15:42:07 dirtyepic Exp $
 
 inherit python multilib eutils
 
@@ -16,6 +16,13 @@ S="${WORKDIR}/${MY_P}"
 DEPEND=">=dev-lang/python-2.3
 	=dev-python/wxpython-2.6*"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-wxversion.patch
+}
+
 src_install() {
 	python_version
 	dodir /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
diff --git a/dev-util/wxglade/wxglade-0.6.ebuild b/dev-util/wxglade/wxglade-0.6.ebuild
index b0b3fc898001..e75364dad9a2 100644
--- a/dev-util/wxglade/wxglade-0.6.ebuild
+++ b/dev-util/wxglade/wxglade-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/wxglade-0.6.ebuild,v 1.6 2007/11/04 14:11:31 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/wxglade-0.6.ebuild,v 1.7 2007/12/04 15:42:07 dirtyepic Exp $
 
 inherit python multilib eutils
 
@@ -16,6 +16,14 @@ S="${WORKDIR}/${MY_P}"
 DEPEND=">=dev-lang/python-2.3
 	=dev-python/wxpython-2.6*"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-0.6.1-wxversion.patch
+}
+
+
 src_install() {
 	python_version
 	dodir /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}