Fix configure to find wxpython-2.6 install instead of highest version

available.
Package-Manager: portage-2.1.4_rc7

4 files changed, 55 insertions, 11 deletions

diff --git a/x11-libs/wxmozilla/ChangeLog b/x11-libs/wxmozilla/ChangeLog
index 1a31e37ab157..dc26a557d116 100644
--- a/x11-libs/wxmozilla/ChangeLog
+++ b/x11-libs/wxmozilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/wxmozilla
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxmozilla/ChangeLog,v 1.14 2007/09/16 05:07:13 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxmozilla/ChangeLog,v 1.15 2007/12/04 04:23:43 dirtyepic Exp $
+
+  04 Dec 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/wxmozilla-0.5.7-wxversion.patch,
+  wxmozilla-0.5.7_pre20070102.ebuild:
+  Fix configure to find wxpython-2.6 install instead of highest version
+  available.
 
   16 Sep 2007; Ryan Hill <dirtyepic@gentoo.org>
   +files/wxmozilla-0.5.7-python-2.5.patch,
diff --git a/x11-libs/wxmozilla/Manifest b/x11-libs/wxmozilla/Manifest
index 130b8da04c16..910b4eb7f4d6 100644
--- a/x11-libs/wxmozilla/Manifest
+++ b/x11-libs/wxmozilla/Manifest
@@ -1,16 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wxmozilla-0.5.7-python-2.5.patch 1329 RMD160 a658f662bfcfe417a1983a9b6ea9ee3b07ab32e4 SHA1 671cc86e7c9321f01908c8d007e450cf41914fe0 SHA256 45cef1d84f597bb59e3a8d948d7752bed8a817d8b4711b0f02d3b4b5b03ec4d7
 MD5 7d6a5135635515b609922d1ec2cc8b37 files/wxmozilla-0.5.7-python-2.5.patch 1329
 RMD160 a658f662bfcfe417a1983a9b6ea9ee3b07ab32e4 files/wxmozilla-0.5.7-python-2.5.patch 1329
 SHA256 45cef1d84f597bb59e3a8d948d7752bed8a817d8b4711b0f02d3b4b5b03ec4d7 files/wxmozilla-0.5.7-python-2.5.patch 1329
+AUX wxmozilla-0.5.7-wxversion.patch 999 RMD160 5a8909def2d67dcb661fea35c9fd7e86c9fc6ac2 SHA1 3210d4bc4528feb2efa6ffc828787573a7c9b499 SHA256 9ad42086fd4d4e37cda1a55a7921f1b3e73654f4927c45610e6b3a85cc5c52ec
+MD5 1d4f7bfdab43d9cacacb407ef2dd0ee3 files/wxmozilla-0.5.7-wxversion.patch 999
+RMD160 5a8909def2d67dcb661fea35c9fd7e86c9fc6ac2 files/wxmozilla-0.5.7-wxversion.patch 999
+SHA256 9ad42086fd4d4e37cda1a55a7921f1b3e73654f4927c45610e6b3a85cc5c52ec files/wxmozilla-0.5.7-wxversion.patch 999
 DIST wxmozilla-0.5.7_pre20070102.tar.gz 549104 RMD160 528c15ae76fa465c484b0da3af11c00e021187b3 SHA1 b040ead1b45d167b16b29751992f171b1d3fcc72 SHA256 c9c48c2b476d911703fef8ecfab354b98740350e94954b7240db3601403e19f4
-EBUILD wxmozilla-0.5.7_pre20070102.ebuild 1639 RMD160 f78880a90286fcefea0dbfa570ce52025c80b027 SHA1 078f50171ccc7f96c069d23819a38520b2e276de SHA256 dfe7e579f2d01bca571bd05c450fef3621d6ebd833e86c671eb273cad80b08d9
-MD5 468ddb1ae9f4c75eb9544d4ae67d4f09 wxmozilla-0.5.7_pre20070102.ebuild 1639
-RMD160 f78880a90286fcefea0dbfa570ce52025c80b027 wxmozilla-0.5.7_pre20070102.ebuild 1639
-SHA256 dfe7e579f2d01bca571bd05c450fef3621d6ebd833e86c671eb273cad80b08d9 wxmozilla-0.5.7_pre20070102.ebuild 1639
-MISC ChangeLog 2505 RMD160 ff906e5af462ca9f5d726764b619124ce7908985 SHA1 d4f271ca229a59e3b78968278da50368e4a500b6 SHA256 567382771e2a58ba1c7bbef33934d0f5b8693347601165c16b9d66f400d16a4e
-MD5 2697672d282a3f098972588be06a8516 ChangeLog 2505
-RMD160 ff906e5af462ca9f5d726764b619124ce7908985 ChangeLog 2505
-SHA256 567382771e2a58ba1c7bbef33934d0f5b8693347601165c16b9d66f400d16a4e ChangeLog 2505
+EBUILD wxmozilla-0.5.7_pre20070102.ebuild 1711 RMD160 f0109f03c82a39ab77c548b868e79ddffea91196 SHA1 cd63b2fa8050fd51bb7dd17c682559f9874d2eef SHA256 677496f68ecb71943c8d2bf15fa4752aab56bda2d2c7559a12135e9614c5ab52
+MD5 6102779e03b291f9d5ec9f3a2c5dd8cc wxmozilla-0.5.7_pre20070102.ebuild 1711
+RMD160 f0109f03c82a39ab77c548b868e79ddffea91196 wxmozilla-0.5.7_pre20070102.ebuild 1711
+SHA256 677496f68ecb71943c8d2bf15fa4752aab56bda2d2c7559a12135e9614c5ab52 wxmozilla-0.5.7_pre20070102.ebuild 1711
+MISC ChangeLog 2719 RMD160 b3ab851592809ea3c86c7e5b67f363180a52f971 SHA1 2e7ffcbd06418a8059c48cd551fc8ac5f9d06795 SHA256 cef0c2036dbb7f87618f7d97df185f5ec780004088b3baf543c408f81a40c2b2
+MD5 d0a0f5247fbe275ccfe6f9007497eb99 ChangeLog 2719
+RMD160 b3ab851592809ea3c86c7e5b67f363180a52f971 ChangeLog 2719
+SHA256 cef0c2036dbb7f87618f7d97df185f5ec780004088b3baf543c408f81a40c2b2 ChangeLog 2719
 MISC metadata.xml 230 RMD160 8900642143e34e5c6dd1df987c924ede96ae6bb0 SHA1 6c8fe85479c2fb5db137f9b9f85b56449bf21d79 SHA256 4bb9573931fffa78f631176d18a7aa5341ac7d832169f2ebc6df3d65f16b8e8b
 MD5 2f58f2c24eeea3b0135c9dfffba7fe67 metadata.xml 230
 RMD160 8900642143e34e5c6dd1df987c924ede96ae6bb0 metadata.xml 230
@@ -18,3 +25,10 @@ SHA256 4bb9573931fffa78f631176d18a7aa5341ac7d832169f2ebc6df3d65f16b8e8b metadata
 MD5 fad83886b9e0f07bfa19268095afa30d files/digest-wxmozilla-0.5.7_pre20070102 283
 RMD160 3dd195446f040bc02bdb5561ec05f4e8e8514a00 files/digest-wxmozilla-0.5.7_pre20070102 283
 SHA256 2a5c9f88238e835dd6eac7a13e32bc4b26999f37889169a014f5786bd4f197b6 files/digest-wxmozilla-0.5.7_pre20070102 283
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHVNZViqiDRvmkBmIRAur8AJwJQDa15CVg8hkj2Kii/JW4CRLSUwCfVzBj
+88mHfr4SCKP/6X0mu/PBf/A=
+=711M
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/wxmozilla/files/wxmozilla-0.5.7-wxversion.patch b/x11-libs/wxmozilla/files/wxmozilla-0.5.7-wxversion.patch
new file mode 100644
index 000000000000..e89c490be862
--- /dev/null
+++ b/x11-libs/wxmozilla/files/wxmozilla-0.5.7-wxversion.patch
@@ -0,0 +1,21 @@
+diff -Naur wxMozilla-orig/configure.in wxMozilla/configure.in
+--- wxMozilla-orig/configure.in	2006-11-15 08:19:06.000000000 -0600
++++ wxMozilla/configure.in	2007-12-03 22:03:09.000000000 -0600
+@@ -287,7 +287,7 @@
+     if test "$wxrelease" = 2.4 ; then
+         WXPYTHONDIR="$pythondir"
+     else
+-        wxpyvername=`$PYTHON -c "from wx.build.config import getExtraPath; print getExtraPath(addOpts=1)"`
++        wxpyvername=`$PYTHON -c "import wxversion; wxversion.select('2.6'); from wx.build.config import getExtraPath; print getExtraPath(addOpts=1)"`
+         WXPYTHONDIR="$pythondir/$wxpyvername"
+     fi
+     
+@@ -295,7 +295,7 @@
+     AC_MSG_RESULT([$WXPYTHONDIR])
+     
+     AC_MSG_CHECKING([whether wxPython is >= 2.6.3])
+-    wxpyverok=`$PYTHON -c "import wx; print wx.__version__ > '2.6.3'"`
++    wxpyverok=`$PYTHON -c "import wxversion; wxversion.select('2.6'); import wx; print wx.__version__ > '2.6.3'"`
+     if test "$wxpyverok" = "True" ; then
+         AC_MSG_RESULT([yes])
+     else
diff --git a/x11-libs/wxmozilla/wxmozilla-0.5.7_pre20070102.ebuild b/x11-libs/wxmozilla/wxmozilla-0.5.7_pre20070102.ebuild
index c2e1d000a173..ce7ddd3e59dc 100644
--- a/x11-libs/wxmozilla/wxmozilla-0.5.7_pre20070102.ebuild
+++ b/x11-libs/wxmozilla/wxmozilla-0.5.7_pre20070102.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxmozilla/wxmozilla-0.5.7_pre20070102.ebuild,v 1.4 2007/09/16 05:07:13 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxmozilla/wxmozilla-0.5.7_pre20070102.ebuild,v 1.5 2007/12/04 04:23:43 dirtyepic Exp $
 
-inherit eutils wxwidgets
+inherit eutils wxwidgets autotools
 
 # Currently force building against firefox.  Seamonkey is supported but
 # crashes.  Upstream will fix and release as 0.5.7. bug #130969
@@ -35,6 +35,9 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-0.5.7-python-2.5.patch
+	epatch "${FILESDIR}"/${PN}-0.5.7-wxversion.patch
+
+	eautoconf
 }
 
 src_compile() {