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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 18 insertions, 7 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/Manifest b/sci-geosciences/grass/Manifest
index 4682ec1f13ab..ff710e847cfb 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -16,6 +16,6 @@ DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2
 EBUILD grass-5.4.0.ebuild 3097 RMD160 885b7eabdad5fa912b7120b8a571d5b59c9f3971 SHA1 72b35ffc88f218afb14055e94eb8573713d67bb9 SHA256 d93cbad8dea7f99c74979abfc5a86292dffa76e8e3477c5cbc8a7cdf7cf33d21
 EBUILD grass-6.0.1.ebuild 3185 RMD160 9861427db9a4a846941eacd6d8f35cb057460d1b SHA1 79ef31f94dcb9bf8d7a3a89563867b291509173b SHA256 8ce6c6abd8359c2d736d491998d2d93720c89834a7e5f935c954b26af31781be
 EBUILD grass-6.2.1.ebuild 5898 RMD160 55aa97b65c844a9e436f403ea2f8e49aa16620c7 SHA1 57a97027573fb96ebafca2d820b8693b56aedc62 SHA256 fb54121425315410f9cc174b67819ba3d7eb84cc3e9d68ee1d52a2b703879ca1
-EBUILD grass-6.3.0.ebuild 8506 RMD160 e2e3ee88771dfe8446cd2d21e7baab2c24c7e9d5 SHA1 96ac85f6ba02de274cd490123037318bb1ce9a75 SHA256 258f965fca88d7ecbe0fe62905d22f30cc319edb679ede9aeb07e66a0b4d2943
-MISC ChangeLog 14562 RMD160 dddf57dc0c95dbedef9677cc05e82dcd44b25aeb SHA1 5f0e6627f251c59b78e0938cb1550534b0341e48 SHA256 074ef1ea8c88a39086b91951ad031e71f76721183ec31c822042be8788c3abbb
+EBUILD grass-6.3.0.ebuild 8586 RMD160 5eb3c1d85abe115c93bb2e1ff553ee2c084b5315 SHA1 70f1c9ee835b1006a93c36bf5f376478505fd042 SHA256 001756b4ae513b59e3e47304e76bd861a8ab7745619ae089f2e2f23f19f53524
+MISC ChangeLog 14957 RMD160 1084feab04f6131d20c9ccc960906821f1ae70d8 SHA1 da2b7700c9a00f60fbcc9d0ea27825443655d0a8 SHA256 2b38d1e9306ca40cce29a8d3375701a4a88408299f99bab9258d1cf82f789700
 MISC metadata.xml 783 RMD160 1b1fa970a119a29ee5502815e2dd8103be600526 SHA1 75c6aef32f661f74e29c550e84af8b637d70e98d SHA256 2cb454a8c266d344c7830cee33fffde971164a0d3456b6ff0c1f28a76f0034cd
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
 }