Fixed bug #229297, and checked for any wxpython use flag issues.

Package-Manager: portage-2.1.5.5

3 files changed, 16 insertions, 8 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 8edfbd84d1b6..b9dd09d8ba7b 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.58 2008/06/24 07:45:51 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.59 2008/06/25 04:28:50 nerdboy Exp $
+
+  25 Jun 2008; Steve Arnold <nerdboy@gentoo.org> grass-6.3.0.ebuild:
+  Fixed oversight (bug #229297) and checked for any wxpython use flag issues;
+  Tested on both amd64 and x86.
 
 *grass-6.3.0 (24 Jun 2008)
 
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 46109f5bc1f0..2efbf6d0e0b1 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -19,6 +19,6 @@ EBUILD grass-6.0.1.ebuild 3185 RMD160 9861427db9a4a846941eacd6d8f35cb057460d1b S
 EBUILD grass-6.2.0-r1.ebuild 5419 RMD160 7a9792d9d38a52d78b3bab5ff4211d8bb210eee1 SHA1 e986e71631714428b3fd612dd1d5e70d5a0d9099 SHA256 5f78e8e6d19c4799b164d042c2ece9b526cfbd3f5625634cf712b91a0865e7d1
 EBUILD grass-6.2.1.ebuild 6420 RMD160 0fbcae5f446155b505e930ac4758a2add499612e SHA1 b18c248cac64dfbce9989dbb96f0213b89c54bd8 SHA256 9c83ac4e7547017357eb1847bc84bc5fcd4878c58a1d53093c3c3ace3de8806c
 EBUILD grass-6.2.3.ebuild 7038 RMD160 eebcb453c8a431301cdf38c5d66d6c6a7404aec4 SHA1 013334b4273588de4f5a48bee14de9ca402ce49e SHA256 355fc4e430fd528ae22a13323d476e76733ead35b353ed398f1b67de99cbde7b
-EBUILD grass-6.3.0.ebuild 8297 RMD160 5c3da2c6aa5b5dacbcc3cd091c70958c1ef6bcd5 SHA1 55017a394f9e1d8db6b08bf64b0c97cb394a1716 SHA256 5266b57fa706ec527de0d9049e087fcdee5b62768d65640d29bb9cacdab93d08
-MISC ChangeLog 12254 RMD160 07ce3467fb4b167bec695d9d13649f81ed3c98f5 SHA1 810fba504196debe306af31fb6f2a47791900ce0 SHA256 8270411ed61e544d7fde6548fff5c4ca049dc2a3c7485260422c23c6502b800b
+EBUILD grass-6.3.0.ebuild 8486 RMD160 2cd60d2d60a7e7247b4de7d1d38cf6950154fbed SHA1 9a56aefead51d37fa26b5d0061cebef94e6a35c4 SHA256 9ee4e5f59b94481d491c9bba9810c621810e425617c8fcf3e85f7d988e9751db
+MISC ChangeLog 12434 RMD160 fa17f3fe167f17567383b3033d80ee88256a4ec7 SHA1 317a8835e721e30c7dba518526e3f1c67959ee1e SHA256 f4404a562f08eb4dce3eb1924053a0317f6d9eb5dc79adb3a821485797c6efc3
 MISC metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b SHA1 bd8657499f8b6cb3b232684afd63c3b5d915ba5e SHA256 976d5771ed6fbabbeba026b0394186b7735135deb79c86aa9388fc5134467e8e
diff --git a/sci-geosciences/grass/grass-6.3.0.ebuild b/sci-geosciences/grass/grass-6.3.0.ebuild
index d073cb9fd910..8130e5d1d012 100644
--- a/sci-geosciences/grass/grass-6.3.0.ebuild
+++ b/sci-geosciences/grass/grass-6.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.1 2008/06/24 07:45:51 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.2 2008/06/25 04:28:50 nerdboy Exp $
 
 inherit eutils distutils fdo-mime versionator wxwidgets
 
@@ -78,7 +78,8 @@ pkg_setup() {
 	elog ""
 	elog "This version enables the experimental wxpython interface, which"
 	elog "you may want to try, since the legacy GUI seems a little wonky"
-	elog "in this version; just enable the wxwindows USE flag and build."
+	elog "in this version; just enable the wxwindows USE flag and rebuild"
+	elog "grass to use it."
 	elog ""
 	if use gmath; then
 		for d in $(eselect lapack show); do myblas=${d}; done
@@ -152,8 +153,11 @@ src_compile() {
 		--with-tcltk-libs=${TCL_LIBDIR}"
 	    if use wxwindows; then
 		WX_GTK_VER=2.8
-		need-wxwidgets gtk2
-		LIBGDI="/usr/$(get_libdir)/python${PYVER}/site-packages/wx-2.8-gtk2-unicode/wx/_gdi_.so"
+		need-wxwidgets unicode
+		# The following lib should be there, based on the above and the
+		# wxpython dependency (in theory).  I still need a good way to
+		# query for the location...
+		LIBGDI="/usr/$(get_libdir)/python${PYVER}/site-packages/wx-${WX_GTK_VER}-gtk2-unicode/wx/_gdi_.so"
 		myconf="${myconf} --with-python --with-wxwidgets=${WX_CONFIG}"
 	    fi
 	else
@@ -222,7 +226,7 @@ src_compile() {
 
 	if use wxwindows; then
 	    emake -j1
-	    ln -sf "${LIBGDI}" dist.x86_64-pc-linux-gnu/lib/libgdi.so \
+	    ln -sf "${LIBGDI}" dist.${CHOST}/lib/libgdi.so \
 		|| die "making libgdi link failed"
 	    cd gui/wxpython/vdigit
 	    make default -j1 || die "make vdigit failed!"