[gentoo-commits] gentoo-x86 commit in sci-geosciences/grass: ChangeLog grass-6.4.1.ebuild grass-6.4.0.ebuild

[gentoo-commits] gentoo-x86 commit in sci-geosciences/grass: ChangeLog grass-6.4.1.ebuild grass-6.4.0.ebuild

[Tomas Chvatal (scarabeus)]

scarabeus    11/06/11 14:13:15

  Modified:             ChangeLog grass-6.4.1.ebuild
  Removed:              grass-6.4.0.ebuild
  Log:
  Grass is quite happy to use any tiff version that gdal suplies.
  
  (Portage version: 2.2.0_alpha39/cvs/Linux x86_64)

Revision  Changes    Path
1.102                sci-geosciences/grass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/grass/ChangeLog?r1=1.101&r2=1.102

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- ChangeLog	19 Apr 2011 17:22:25 -0000	1.101
+++ ChangeLog	11 Jun 2011 14:13:15 -0000	1.102
@@ -1,6 +1,10 @@
 # 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.101 2011/04/19 17:22:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.102 2011/06/11 14:13:15 scarabeus Exp $
+
+  11 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -grass-6.4.0.ebuild,
+  grass-6.4.1.ebuild:
+  Grass is quite happy to use any tiff version that gdal suplies.
 
   19 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> grass-6.4.1.ebuild:
   Fix patch name. Per bug #364049. This is the reason why conditional patches



1.3                  sci-geosciences/grass/grass-6.4.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/grass/grass-6.4.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/grass/grass-6.4.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/grass/grass-6.4.1.ebuild?r1=1.2&r2=1.3

Index: grass-6.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grass-6.4.1.ebuild	19 Apr 2011 17:22:25 -0000	1.2
+++ grass-6.4.1.ebuild	11 Jun 2011 14:13:15 -0000	1.3
@@ -1,8 +1,8 @@
 # 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.1.ebuild,v 1.2 2011/04/19 17:22:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.1.ebuild,v 1.3 2011/06/11 14:13:15 scarabeus Exp $
 
-EAPI="3"
+EAPI=3
 
 PYTHON_DEPEND="python? 2"
 
@@ -43,15 +43,10 @@
 	mysql? ( virtual/mysql )
 	odbc? ( dev-db/unixODBC )
 	png? ( media-libs/libpng )
-	postgres? (
-		|| (
-			>=dev-db/postgresql-base-8.4
-			>=dev-db/postgresql-server-8.4
-		)
-	)
+	postgres? ( >=dev-db/postgresql-base-8.4 )
 	readline? ( sys-libs/readline )
 	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( >=media-libs/tiff-4 )
+	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2 )
 	X? (
 		x11-libs/libICE
@@ -127,10 +122,7 @@
 }
 
 src_prepare() {
-	if ! use opengl; then
-		epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
-	fi
-
+	use opengl || epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
 	base_src_prepare
 }
 
@@ -318,5 +310,5 @@
 	Icon=${PN}-48x48.png
 	Categories=Science;Education;
 	Terminal=false
-	EOF
+EOF
 }