Add -W 2.6 option to 0.6.1 launcher to be sure we're always using wxpython-2.6.

Package-Manager: portage-2.1.4_rc7

6 files changed, 55 insertions, 25 deletions

diff --git a/dev-util/boa-constructor/ChangeLog b/dev-util/boa-constructor/ChangeLog
index 28a23ad4def5..a56dfb78da0d 100644
--- a/dev-util/boa-constructor/ChangeLog
+++ b/dev-util/boa-constructor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/boa-constructor
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boa-constructor/ChangeLog,v 1.28 2007/09/29 01:22:35 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boa-constructor/ChangeLog,v 1.29 2007/12/04 03:50:05 dirtyepic Exp $
+
+  04 Dec 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/boa-constructor-0.4.0_alpha, +files/boa-constructor-0.6.1,
+  -files/boa-constructor, boa-constructor-0.4.0_alpha.ebuild,
+  boa-constructor-0.6.1.ebuild:
+  Add -W 2.6 option to 0.6.1 launcher to be sure we're always using wxpython-2.6.
 
 *boa-constructor-0.6.1 (29 Sep 2007)
 
diff --git a/dev-util/boa-constructor/Manifest b/dev-util/boa-constructor/Manifest
index fe8f55b8d8e2..a73ced2142ad 100644
--- a/dev-util/boa-constructor/Manifest
+++ b/dev-util/boa-constructor/Manifest
@@ -1,25 +1,32 @@
-AUX boa-constructor 386 RMD160 d7b8662daff00fcebf0a76879f464e56795a21e8 SHA1 53e7f2d49248850b79b94f06699a775f96cdfabc SHA256 75029bfd7361a1014a98dc3f3d0121875db6217bcfaf1f894ea89c5e58114ffc
-MD5 343cbbdca5ed6c641e11244a33a7d1bd files/boa-constructor 386
-RMD160 d7b8662daff00fcebf0a76879f464e56795a21e8 files/boa-constructor 386
-SHA256 75029bfd7361a1014a98dc3f3d0121875db6217bcfaf1f894ea89c5e58114ffc files/boa-constructor 386
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX boa-constructor-0.4.0_alpha 397 RMD160 9d4b3fa7b993188c9ea743ca6fb70b2884dfef2c SHA1 df18f9784b543a95bfae6c5efcdf82dad23259e0 SHA256 a6d1a51b377251615c3165cab5225c90eb544b67c1aca202178776e849d1d8c0
+MD5 143beca39087b3886405f36ca03f22aa files/boa-constructor-0.4.0_alpha 397
+RMD160 9d4b3fa7b993188c9ea743ca6fb70b2884dfef2c files/boa-constructor-0.4.0_alpha 397
+SHA256 a6d1a51b377251615c3165cab5225c90eb544b67c1aca202178776e849d1d8c0 files/boa-constructor-0.4.0_alpha 397
 AUX boa-constructor-0.4.0_alpha-wxversion.patch 398 RMD160 26487556eee3def109d69c6e7eb23ef9070bed5e SHA1 8a0a9d5387524545aa79ef428b09f6f6006399e6 SHA256 a6bd4a2126998119918a12f04f24b2fc2a727d07cc49838d00040ca668748751
 MD5 b53a3eba84bbccde612d3454f3211adc files/boa-constructor-0.4.0_alpha-wxversion.patch 398
 RMD160 26487556eee3def109d69c6e7eb23ef9070bed5e files/boa-constructor-0.4.0_alpha-wxversion.patch 398
 SHA256 a6bd4a2126998119918a12f04f24b2fc2a727d07cc49838d00040ca668748751 files/boa-constructor-0.4.0_alpha-wxversion.patch 398
+AUX boa-constructor-0.6.1 398 RMD160 906ab3c38e322948e01295f92978d65974208270 SHA1 35692b43249f770fdfcb97773b66cf4a0b616dbf SHA256 a36469d9e9f7d254a0b8bf00d00884fe66ad88dbc7107c4d8685949cc5cd1065
+MD5 5fb78a368553c22484a20eb18a5494fc files/boa-constructor-0.6.1 398
+RMD160 906ab3c38e322948e01295f92978d65974208270 files/boa-constructor-0.6.1 398
+SHA256 a36469d9e9f7d254a0b8bf00d00884fe66ad88dbc7107c4d8685949cc5cd1065 files/boa-constructor-0.6.1 398
 DIST boa-constructor-0.4.0.src.zip 3559429 RMD160 bc76396d5c2a83a3f113ff11276f0fa8a80c52d9 SHA1 f57c3ed46f6da7afbcaa3628ddfac9f672f67144 SHA256 fd1d817ed3882f3a75cc29fbc9cfb7f4e70f7644d7c571f058da41e928799e5e
 DIST boa-constructor-0.6.1.src.zip 13782538 RMD160 d40453f04a1449119ec22684f0882135d82222ba SHA1 20e3508e66c6cf2a6da647558f90f3b2ae0fab10 SHA256 7ba97ca73472ac24a1b220594003c198ff32c1750274cdc123bfe3b341f43b58
-EBUILD boa-constructor-0.4.0_alpha.ebuild 1270 RMD160 48d24edeb1bb9f5e14a9aae1e5e3cd008da1b8d7 SHA1 78cd8a65481c9fd7715022eb9d7c2f780a2748e4 SHA256 2c385386e9f94684c7a23fcb430dcfe748e025bc5bc2ce21871ac718e7fed378
-MD5 6fec712064e8f872b390cbbb8c99c05d boa-constructor-0.4.0_alpha.ebuild 1270
-RMD160 48d24edeb1bb9f5e14a9aae1e5e3cd008da1b8d7 boa-constructor-0.4.0_alpha.ebuild 1270
-SHA256 2c385386e9f94684c7a23fcb430dcfe748e025bc5bc2ce21871ac718e7fed378 boa-constructor-0.4.0_alpha.ebuild 1270
-EBUILD boa-constructor-0.6.1.ebuild 1198 RMD160 90d051e442517cbb748fe116be8737880f37cc2a SHA1 b1277bfaff89779ea2b1507b14fabb03eba60169 SHA256 f1681f2345af44c9e9514768c73424456fb4c8522c342efb7a8cd9c6e6b2d47b
-MD5 70d48ace46a0240461e01f4811314310 boa-constructor-0.6.1.ebuild 1198
-RMD160 90d051e442517cbb748fe116be8737880f37cc2a boa-constructor-0.6.1.ebuild 1198
-SHA256 f1681f2345af44c9e9514768c73424456fb4c8522c342efb7a8cd9c6e6b2d47b boa-constructor-0.6.1.ebuild 1198
-MISC ChangeLog 3682 RMD160 01a29f58b7e1677b7bd4cb3aec59408ab86f52a9 SHA1 052f3d79d2c484b831a0224d7084a4bcf21ad103 SHA256 af37d853474430e08516e9431224f81a285e11dd71d6c0bff8463cf2cae3d1a8
-MD5 d5a6999c8943858c8f5a0c0c5313ee9a ChangeLog 3682
-RMD160 01a29f58b7e1677b7bd4cb3aec59408ab86f52a9 ChangeLog 3682
-SHA256 af37d853474430e08516e9431224f81a285e11dd71d6c0bff8463cf2cae3d1a8 ChangeLog 3682
+EBUILD boa-constructor-0.4.0_alpha.ebuild 1252 RMD160 9a057bc20f6c792b4ffc6eb19bba169c55fc901f SHA1 4645909f77b0ff5b4fecd06e8b923361d2fbfd1c SHA256 30707236e397cec90e6bd4a27c01c7293a42d60e08d509d71592d710c3154a19
+MD5 656120a358920296698d22e68ea55a20 boa-constructor-0.4.0_alpha.ebuild 1252
+RMD160 9a057bc20f6c792b4ffc6eb19bba169c55fc901f boa-constructor-0.4.0_alpha.ebuild 1252
+SHA256 30707236e397cec90e6bd4a27c01c7293a42d60e08d509d71592d710c3154a19 boa-constructor-0.4.0_alpha.ebuild 1252
+EBUILD boa-constructor-0.6.1.ebuild 1204 RMD160 06df1265cc6017018321d2b24a5aca41c3aa960d SHA1 cdaea59a8301c77dce92fa4860a57b498859dd88 SHA256 8cef99255c778550fc30e16782b586a9f746bac39d4b197f921391fdf19e4865
+MD5 49e308c1f6642fd3ad52d25751372140 boa-constructor-0.6.1.ebuild 1204
+RMD160 06df1265cc6017018321d2b24a5aca41c3aa960d boa-constructor-0.6.1.ebuild 1204
+SHA256 8cef99255c778550fc30e16782b586a9f746bac39d4b197f921391fdf19e4865 boa-constructor-0.6.1.ebuild 1204
+MISC ChangeLog 3975 RMD160 a999c49972b41d789741cc37483b0366ddd9db0c SHA1 aef1a21539644b010ff56154499a0f0decab8121 SHA256 9696fc0d1f12595b78ef2d08838206deef7901e5bb27d2cba2b6232700b5f430
+MD5 a73f888b142422d880512d5e8d8d06a9 ChangeLog 3975
+RMD160 a999c49972b41d789741cc37483b0366ddd9db0c ChangeLog 3975
+SHA256 9696fc0d1f12595b78ef2d08838206deef7901e5bb27d2cba2b6232700b5f430 ChangeLog 3975
 MISC metadata.xml 270 RMD160 4c99e3e5fd912332fbb9f258342a041da76100b3 SHA1 bc88c79712329449317309220db2b69e81d168d8 SHA256 e0e3f95520e8f3ac114892eb4c6374a795840fa2c13713fe963a4456451057a7
 MD5 7e8237fba7a4dfcc01d7501289d125ed metadata.xml 270
 RMD160 4c99e3e5fd912332fbb9f258342a041da76100b3 metadata.xml 270
@@ -30,3 +37,10 @@ SHA256 64ff7bf3b78630e12720822a2a2bd1d36d3fd16c18c0adaee35b17c8d64aa766 files/di
 MD5 e76e286a64fd742016dfd82faf769ec3 files/digest-boa-constructor-0.6.1 274
 RMD160 15cec56b9adf4521833f0a0738a0db58111dcc21 files/digest-boa-constructor-0.6.1 274
 SHA256 674464f34123d4411be8a14a19f891a8adcb60a775ea482be5212e25ab4c89b2 files/digest-boa-constructor-0.6.1 274
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHVM5yiqiDRvmkBmIRAh68AJ9zsUpDUR4Xb/HosMDSaH0EKj2QzwCgutTW
+Wx6fLlBHlAHde4hlwm5Vz78=
+=dlKJ
+-----END PGP SIGNATURE-----
diff --git a/dev-util/boa-constructor/boa-constructor-0.4.0_alpha.ebuild b/dev-util/boa-constructor/boa-constructor-0.4.0_alpha.ebuild
index 506ff15a754b..1f7bc12f4882 100644
--- a/dev-util/boa-constructor/boa-constructor-0.4.0_alpha.ebuild
+++ b/dev-util/boa-constructor/boa-constructor-0.4.0_alpha.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boa-constructor/boa-constructor-0.4.0_alpha.ebuild,v 1.6 2006/12/29 18:40:13 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boa-constructor/boa-constructor-0.4.0_alpha.ebuild,v 1.7 2007/12/04 03:50:05 dirtyepic Exp $
 
 inherit eutils python
 
@@ -22,8 +22,8 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S} || die "Failed to cd ${S}"
-	epatch ${FILESDIR}/${P}-wxversion.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-wxversion.patch
 }
 
 src_compile() {
@@ -51,7 +51,7 @@ src_install () {
 	insinto "${boadir}/Plug-ins"
 	doins Plug-ins/*
 
-	dobin "${FILESDIR}/boa-constructor"
+	newbin "${FILESDIR}"/${P} boa-constructor
 
 	dodoc Bugs.txt Changes.txt Credits.txt README.txt
 }
diff --git a/dev-util/boa-constructor/boa-constructor-0.6.1.ebuild b/dev-util/boa-constructor/boa-constructor-0.6.1.ebuild
index dad16c495208..dc980ad937de 100644
--- a/dev-util/boa-constructor/boa-constructor-0.6.1.ebuild
+++ b/dev-util/boa-constructor/boa-constructor-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/boa-constructor/boa-constructor-0.6.1.ebuild,v 1.1 2007/09/29 01:22:35 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boa-constructor/boa-constructor-0.6.1.ebuild,v 1.2 2007/12/04 03:50:05 dirtyepic Exp $
 
 inherit eutils python
 
@@ -44,7 +44,7 @@ src_install() {
 	insinto "${boadir}/Plug-ins"
 	doins Plug-ins/*
 
-	dobin "${FILESDIR}/boa-constructor"
+	newbin "${FILESDIR}"/${P} boa-constructor
 
 	dodoc Bugs.txt Changes.txt Credits.txt README.txt
 }
diff --git a/dev-util/boa-constructor/files/boa-constructor b/dev-util/boa-constructor/files/boa-constructor-0.4.0_alpha
index 4315b612acd9..91d206dee7c9 100644
--- a/dev-util/boa-constructor/files/boa-constructor
+++ b/dev-util/boa-constructor/files/boa-constructor-0.4.0_alpha
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boa-constructor/files/boa-constructor,v 1.3 2005/05/22 05:29:47 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boa-constructor/files/boa-constructor-0.4.0_alpha,v 1.1 2007/12/04 03:50:06 dirtyepic Exp $
 
 # This is a bit of a kludge, but works.
 # If anyone can think of a better way to start Boa, feel free to
diff --git a/dev-util/boa-constructor/files/boa-constructor-0.6.1 b/dev-util/boa-constructor/files/boa-constructor-0.6.1
new file mode 100644
index 000000000000..e952920035e8
--- /dev/null
+++ b/dev-util/boa-constructor/files/boa-constructor-0.6.1
@@ -0,0 +1,10 @@
+#!/bin/sh
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boa-constructor/files/boa-constructor-0.6.1,v 1.1 2007/12/04 03:50:06 dirtyepic Exp $
+
+# This is a bit of a kludge, but works.
+# If anyone can think of a better way to start Boa, feel free to
+# modify.
+
+pv=`python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:'`
+cd /usr/lib/python"${pv}"/site-packages/boa
+exec /usr/bin/python Boa.py -W 2.6