[gentoo-commits] gentoo-x86 commit in eclass: php-common-r1.eclass

[Christian Hoffmann (hoffie)]

hoffie      08/05/29 14:45:38

  Modified:             php-common-r1.eclass
  Log:
  hopefully last shot at fixing php-common-r1.eclass for postgresql usage, thanks to zlin and dev-zero (again ;)), bug 223797, bug 222933

Revision  Changes    Path
1.16                 eclass/php-common-r1.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?r1=1.15&r2=1.16

Index: php-common-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- php-common-r1.eclass	27 May 2008 10:14:34 -0000	1.15
+++ php-common-r1.eclass	29 May 2008 14:45:38 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.15 2008/05/27 10:14:34 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.16 2008/05/29 14:45:38 hoffie Exp $
 
 # Based on robbat2's work on the php4 sapi eclass
 # Based on stuart's work on the php5 sapi eclass
@@ -210,8 +210,9 @@
 
 php_check_pgsql() {
 	if use "postgres" && use "apache2" && use "threads" ; then
-		if has_version ">=dev-db/libpq-8.1.3-r1" ; then
-			if ! built_with_use ">=dev-db/libpq-8.1.3-r1" "threads" ; then
+		if has_version dev-db/libpq ; then
+			if has_version ">=dev-db/libpq-8" && \
+				! built_with_use ">=dev-db/libpq-8" "threads" ; then
 				eerror
 				eerror "You must build dev-db/libpq with USE=threads"
 				eerror "if you want to build PHP with threads support!"



-- 
gentoo-commits@l.g.o mailing list