eselect wxwidgets affects build behaviour, not runtime, and only outside of

portage so it has no use here. Use 'unicode' wx libs since 'base' means non-X
only. Don't use \ inside of quotes.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

3 files changed, 14 insertions, 24 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index e28559bc3913..713ab159df74 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.95 2011/03/10 19:14:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.96 2011/03/24 20:54:40 dirtyepic Exp $
+
+  24 Mar 2011; Ryan Hill <dirtyepic@gentoo.org> grass-6.4.0.ebuild:
+  eselect wxwidgets affects build behaviour, not runtime, and only outside of
+  portage so it has no use here. Use 'unicode' wx libs since 'base' means non-X
+  only. Don't use \ inside of quotes.
 
   10 Mar 2011; Justin Lecher <jlec@gentoo.org> grass-6.3.0.ebuild,
   grass-6.4.0.ebuild, metadata.xml:
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 8653d4f875df..2e4f7b13c990 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -10,13 +10,13 @@ AUX grass_icon.png 4470 RMD160 b4a6deeb6ce859a57c6aba3c4095e2dd718f36e9 SHA1 683
 DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2 SHA1 c4b0b1407655f8ed1e16e911df191323fe00eb9e SHA256 a84658a7065a3ece09d3d18a3b601515484d1e5dbb3a92b8fbac3c37e368acf4
 DIST grass-6.4.0.tar.gz 22569021 RMD160 b0bd2d2ce048a5f10f345786bc81fa4bd22df019 SHA1 c91e8501c7a756a94d2be47729f640d33b2a7468 SHA256 1db0422de4bb6146322721760b3c2b310850069ee320e03b6a625e4472f477a7
 EBUILD grass-6.3.0.ebuild 8432 RMD160 94af7d9ae466f8997f342ac839d0324bf3ba9301 SHA1 79372cb66b73a3c643b3a8b222cbddde93b2ab12 SHA256 296dd2e6fa966f1c0fe93832a0bb10faf89e2889e34274aed88291cac618655b
-EBUILD grass-6.4.0.ebuild 8276 RMD160 2fd692215c812bd7245e6dc1f7998b8501f1e254 SHA1 17ccb533398a2f8c23f7349c7a3c0bc34a89e556 SHA256 30ea010e658f452bd97031c208d1cf19bd3fbbf272de37d9960cd08501dff15b
-MISC ChangeLog 18946 RMD160 f1b29a9ffaecaa675ae7f5788b14ac55e650ad3f SHA1 6099fe7f22cec58e3b07c54b0a5a2d45398245c7 SHA256 7df18cf381a9550168f2790ef57456268d4e65f7ed4744e45a53dbc62a15cc63
+EBUILD grass-6.4.0.ebuild 7880 RMD160 2157269f5e1d0256d0dff2dbe3538f6e7a5bd158 SHA1 729c24c50cbc9ba3353a92112c09e90a4fda9e89 SHA256 276e870ccbfcc549d1062bc3c415535e208c3ba228c7b45f34f2aa1c233eadbe
+MISC ChangeLog 19216 RMD160 89fc43e88e038b72b40edd1542d6410897aba8d4 SHA1 df2e10570bd0850856c3ce35607009f71a0f110a SHA256 5072abbf0693ba055313d3c546853aa7804b45f6b86541f8fff26533f2da7b6b
 MISC metadata.xml 623 RMD160 f3ab7360eb95e18d25fa0f35bd8817e8628e3246 SHA1 497c577a971010147239a61515ab66a678881569 SHA256 d6200460324878b71cae01dc1193c77749b88b7c2e723041d9f426487c50c85f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk15IwEACgkQgAnW8HDreRZiBACgziQ3e51FN64Hpk5guxDCV8LJ
-zMYAoJzWAjOj7N2ioE23dz0P91d/INQs
-=fMxN
+iEYEARECAAYFAk2LsRAACgkQiqiDRvmkBmIKUwCeNRxCo67hP+otoN+UMvBcQR10
+tnIAoMgdR3wh86JiFJf8VeNadoLa8DJ0
+=coAg
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/grass/grass-6.4.0.ebuild b/sci-geosciences/grass/grass-6.4.0.ebuild
index b89437444a33..b7d3b834e660 100644
--- a/sci-geosciences/grass/grass-6.4.0.ebuild
+++ b/sci-geosciences/grass/grass-6.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0.ebuild,v 1.6 2011/03/10 19:14:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0.ebuild,v 1.7 2011/03/24 20:54:40 dirtyepic Exp $
 
 EAPI="3"
 
@@ -124,18 +124,6 @@ pkg_setup() {
 		# only py2 is supported
 		python_set_active_version 2
 	fi
-
-	if use wxwidgets; then
-		# only 2.8 is supported or the wx-gui barfs at runtime...
-		local success=0
-		ewarn "Attempting to select a compatible wxwidgets"
-		eselect wxwidgets set gtk2-unicode-release-2.8
-		success=1
-	fi
-	if [ $success != 1 ]; then
-		 eerror "Unable to select a compatible wxwidgets!"
-		 die "Please set wxwidgets to at least 2.8 (see \`eselect wxwidgets --help\`)."
-	fi
 }
 
 src_prepare() {
@@ -161,7 +149,7 @@ src_configure() {
 		if use python && use wxwidgets; then
 			WX_BUILD=yes
 			WX_GTK_VER=2.8
-			need-wxwidgets base
+			need-wxwidgets unicode
 			myconf+="
 				--without-tcltk
 				--with-wxwidgets=${WX_CONFIG}
@@ -201,10 +189,7 @@ src_configure() {
 		$(use_with cxx) \
 		$(use_with fftw) \
 		$(use_with ffmpeg) \
-		--with-ffmpeg-includes="/usr/include/libavcodec \
-			/usr/include/libavdevice /usr/include/libavfilter \
-			/usr/include/libavformat /usr/include/libavutil \
-			/usr/include/libpostproc /usr/include/libswscale" \
+		--with-ffmpeg-includes="/usr/include/libavcodec /usr/include/libavdevice /usr/include/libavfilter /usr/include/libavformat /usr/include/libavutil /usr/include/libpostproc /usr/include/libswscale" \
 		$(use_with gmath blas) \
 		$(use_with gmath lapack) \
 		$(use_with jpeg) \