[patch] fix logic of php-common-r1.eclass

php-common-r1-logic-fix.patch (text/plain), 1.91 KB, created by Christian Hoffmann (RETIRED) on 2008-05-27 10:15:10 UTC

Index: php-common-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v
retrieving revision 1.14
diff -u -r1.14 php-common-r1.eclass
--- php-common-r1.eclass	25 May 2008 09:27:48 -0000	1.14
+++ php-common-r1.eclass	27 May 2008 10:11:43 -0000
@@ -209,23 +209,24 @@
 # ========================================================================
 
 php_check_pgsql() {
-	if use "postgres" \
-		&& use "apache2" && use "threads" ; then
-		if has_version ">=dev-db/libpq-8.1.3-r1" \
-			&& ! built_with_use ">=dev-db/libpq-8.1.3-r1" "threads" ; then
-			eerror
-			eerror "You must build dev-db/libpq with USE=threads"
-			eerror "if you want to build PHP with threads support!"
-			eerror
-			die "Rebuild dev-db/libpq with USE=threads"
-		fi
-		local pgsql_ver=$(eselect postgresql show)
-		if ! built_with_use "=dev-db/postgresql-base-${pgsql_ver}*" threads ; then
-			eerror
-			eerror "You must build =dev-db/postgresql-base-${pgsql_ver} with USE=threads"
-			eerror "if you want to build PHP with threads support!"
-			eerror
-			die "Rebuild =dev-db/postgresql-base-${pgsql_ver} with USE=threads"
+	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
+				eerror
+				eerror "You must build dev-db/libpq with USE=threads"
+				eerror "if you want to build PHP with threads support!"
+				eerror
+				die "Rebuild dev-db/libpq with USE=threads"
+			fi
+		else
+			local pgsql_ver=$(eselect postgresql show)
+			if ! built_with_use "=dev-db/postgresql-base-${pgsql_ver}*" threads ; then
+				eerror
+				eerror "You must build =dev-db/postgresql-base-${pgsql_ver} with USE=threads"
+				eerror "if you want to build PHP with threads support!"
+				eerror
+				die "Rebuild =dev-db/postgresql-base-${pgsql_ver} with USE=threads"
+			fi
 		fi
 	fi
 }