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

(Portage version: 2.1.4_rc7)

5 files changed, 25 insertions, 9 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/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