Updated to use postgresql virtual in preparation for push to stable.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 16 insertions, 5 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index f9031dfa413b..e3acfa34ca4a 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.69 2009/08/02 18:50:17 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.70 2009/09/05 02:09:59 nerdboy Exp $
+
+  04 Sep 2009; Steve Arnold <nerdboy@gentoo.org> grass-6.3.0.ebuild:
+  Updated to use postgresql virtual and verified it bvilds correctly from 
+  libpq-8.0 all the way through postgres-8.3.7 (which means it can go 
+  stable now). Yee-haw!  Also tested importing a bunch of old vector data
+  using both postgres and sqlite with no issues (since it now defaults to
+  requiring a dull SQL backend).
 
   02 Aug 2009; Steve Arnold <nerdboy@gentoo.org> grass-6.3.0.ebuild:
   Updated desktop file and description (set terminal=false).
@@ -8,7 +15,7 @@
   08 Jun 2009; Steve Arnold <nerdboy@gentoo.org>
   +files/grass-6.3.0-gcc44.patch, grass-6.3.0.ebuild:
   Updated with additional C++ include for bug #270916 (thanks to   	 
-  Jiří Moravec <qjim@volny.cz> for the patch).  I still don't have
+  Jiri Moravec <qjim@volny.cz> for the patch).  I still don't have
   gcc 4.4 yet, but the benign nature of the patch and building with
   gcc 4.3.3 should suffice.
 
diff --git a/sci-geosciences/grass/grass-6.3.0.ebuild b/sci-geosciences/grass/grass-6.3.0.ebuild
index d35422366d83..40cde643a982 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-2009 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.8 2009/08/02 18:50:17 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.9 2009/09/05 02:09:59 nerdboy Exp $
 
 inherit eutils distutils fdo-mime versionator wxwidgets
 
@@ -39,7 +39,10 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	opengl? ( virtual/opengl )
 	motif? ( x11-libs/openmotif )
 	png? ( >=media-libs/libpng-1.2.2 )
-	postgres? ( >=dev-db/postgresql-base-8.3 )
+	postgres? ( || (
+		>=virtual/postgresql-base-8.0
+		>=virtual/postgresql-server-8.0 )
+	)
 	python? ( dev-lang/python )
 	readline? ( sys-libs/readline )
 	sqlite? ( dev-db/sqlite )
@@ -127,6 +130,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
+	addpredict /var/cache/fontconfig
 	# wxwindows needs python (see bug #237495)
 	use wxwindows && distutils_python_version
 
@@ -292,6 +296,6 @@ generate_files() {
 	Path=
 	Icon=grass_icon.png
 	Categories=Science;Education;
-	Terminal=true
+	Terminal=false
 	EOF
 }