Fix use invocation and a couple bugs involving use, particularly involving amd64 and ppc

5 files changed, 35 insertions, 39 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 4072a620f213..815b4d360257 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.101 2004/05/31 12:26:19 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.102 2004/06/02 20:34:00 agriffis Exp $
+
+  02 Jun 2004; Aron Griffis <agriffis@gentoo.org> postgresql-7.3.6-r1.ebuild,
+  postgresql-7.3.6.ebuild, postgresql-7.4.2-r1.ebuild,
+  postgresql-7.4.2-r2.ebuild:
+  Fix use invocation and a couple bugs involving use, particularly involving
+  amd64 and ppc
 
 *postgresql-7.3.6-r1 (31 May 2004)
 
diff --git a/dev-db/postgresql/postgresql-7.3.6-r1.ebuild b/dev-db/postgresql/postgresql-7.3.6-r1.ebuild
index 2d9900c1778a..5d477f7c8122 100644
--- a/dev-db/postgresql/postgresql-7.3.6-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.6-r1.ebuild,v 1.1 2004/05/31 12:26:19 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.6-r1.ebuild,v 1.2 2004/06/02 20:34:00 agriffis Exp $
 
 inherit flag-o-matic
 
@@ -59,7 +59,7 @@ pkg_setup() {
 
 check_java_config() {
 	JDKHOME="`java-config --jdk-home`"
-	if [ -z "${JDKHOME}" ] || [ ! -d "${JDKHOME}" ]; then
+	if [[ -z ${JDKHOME} || ! -d ${JDKHOME} ]]; then
 		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
 		eerror "${NOJDKERROR}"
 		die "${NOJDKERROR}"
@@ -74,7 +74,7 @@ src_unpack() {
 src_compile() {
 	filter-flags -ffast-math
 
-	if [ "`use java`" ]; then
+	if use java; then
 		check_java_config
 	fi
 
@@ -82,9 +82,7 @@ src_compile() {
 	use tcltk && myconf="--with-tcl"
 	use python && myconf="$myconf --with-python"
 	use perl && myconf="$myconf --with-perl"
-	if [ "`use java`" ]; then
-		myconf="$myconf --with-java"
-	fi
+	use java && myconf="$myconf --with-java"
 	use ssl && myconf="$myconf --with-openssl"
 	use nls && myconf="$myconf --enable-nls"
 	use libg++ && myconf="$myconf --with-CXX"
@@ -115,7 +113,7 @@ src_compile() {
 src_install() {
 	addwrite "/usr/share/man/man3/Pg.3pm"
 
-	if [ "`use perl`" ]
+	if use perl
 	then
 		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
 		sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \
@@ -133,7 +131,7 @@ src_install() {
 	dodoc COPYRIGHT HISTORY INSTALL README register.txt
 	dodoc contrib/adddepend/*
 
-	if [ "`use java`" ]; then
+	if use java; then
 		dojar ${D}/usr/share/postgresql/java/postgresql.jar
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
 	fi
@@ -143,7 +141,7 @@ src_install() {
 
 	cd ${S}/doc
 	dodoc FAQ* README.* TODO bug.template
-	if [ "`use doc`" ]; then
+	if use doc; then
 		cd ${S}/doc
 		docinto FAQ_html || die
 		dodoc src/FAQ/* || die
diff --git a/dev-db/postgresql/postgresql-7.3.6.ebuild b/dev-db/postgresql/postgresql-7.3.6.ebuild
index 6fd7bb1a976d..46cb52f3f051 100644
--- a/dev-db/postgresql/postgresql-7.3.6.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.6.ebuild,v 1.5 2004/05/01 04:16:50 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.6.ebuild,v 1.6 2004/06/02 20:34:00 agriffis Exp $
 
 inherit flag-o-matic
 
@@ -56,22 +56,13 @@ pkg_setup() {
 		fi
 	fi
 
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		if [ "`use amd64`" ]; then
-			ewarn "Ignore USE=\"java\" in amd64"
-		fi
-	fi
-
-	if [ "`use python`" ]; then
-		if [ "`use ppc`" ]; then
-			ewarn "Ignore USE=\"python\" in ppc"
-		fi
-	fi
+	use java && use amd64 && ewarn "Ignoring USE=\"java\" in amd64"
+	use python && use ppc && ewarn "Ignore USE=\"python\" in ppc"
 }
 
 check_java_config() {
 	JDKHOME="`java-config --jdk-home`"
-	if [ -z "${JDKHOME}" ] || [ ! -d "${JDKHOME}" ]; then
+	if [[ -z ${JDKHOME} || ! -d ${JDKHOME} ]]; then
 		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
 		eerror "${NOJDKERROR}"
 		die "${NOJDKERROR}"
@@ -86,15 +77,17 @@ src_unpack() {
 src_compile() {
 	filter-flags -ffast-math
 
-	if [ "`use java`" -a ! "`use amd64`" ]; then
+	if use java && ! use amd64; then
 		check_java_config
 	fi
 
 	local myconf
 	use tcltk && myconf="--with-tcl"
-	use python && use ppc || myconf="$myconf --with-python"
+	if use python && ! use ppc; then
+		myconf="$myconf --with-python"
+	fi
 	use perl && myconf="$myconf --with-perl"
-	if [ "`use java`" -a ! "`use amd64`" ]; then
+	if use java && ! use amd64; then
 		myconf="$myconf --with-java"
 	fi
 	use ssl && myconf="$myconf --with-openssl"
@@ -127,8 +120,7 @@ src_compile() {
 src_install() {
 	addwrite "/usr/share/man/man3/Pg.3pm"
 
-	if [ "`use perl`" ]
-	then
+	if use perl; then
 		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
 		sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \
 			${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile
@@ -145,7 +137,7 @@ src_install() {
 	dodoc COPYRIGHT HISTORY INSTALL README register.txt
 	dodoc contrib/adddepend/*
 
-	if [ "`use java`" -a ! "`use amd64`" ]; then
+	if use java && ! use amd64; then
 		dojar ${D}/usr/share/postgresql/java/postgresql.jar
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
 	fi
@@ -155,7 +147,7 @@ src_install() {
 
 	cd ${S}/doc
 	dodoc FAQ* README.* TODO bug.template
-	if [ "`use doc`" ]; then
+	if use doc; then
 		cd ${S}/doc
 		docinto FAQ_html || die
 		dodoc src/FAQ/* || die
diff --git a/dev-db/postgresql/postgresql-7.4.2-r1.ebuild b/dev-db/postgresql/postgresql-7.4.2-r1.ebuild
index 08c4a19298ea..e1d427f0972e 100644
--- a/dev-db/postgresql/postgresql-7.4.2-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2-r1.ebuild,v 1.4 2004/05/25 15:57:26 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2-r1.ebuild,v 1.5 2004/06/02 20:34:00 agriffis Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -64,7 +64,7 @@ pkg_setup() {
 
 check_java_config() {
 	JDKHOME="`java-config --jdk-home`"
-	if [ -z "${JDKHOME}" ] || [ ! -d "${JDKHOME}" ]; then
+	if [[ -z ${JDKHOME} || ! -d ${JDKHOME} ]]; then
 		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
 		eerror "${NOJDKERROR}"
 		die "${NOJDKERROR}"
@@ -90,7 +90,7 @@ src_unpack() {
 src_compile() {
 	filter-flags -ffast-math
 
-	if [ "`use java`" -a ! "`use amd64`" ]; then
+	if use java && ! use amd64; then
 		check_java_config
 	fi
 
@@ -98,7 +98,7 @@ src_compile() {
 	use tcltk && myconf="--with-tcl"
 	use python && use mips || myconf="$myconf --with-python"
 	use perl && myconf="$myconf --with-perl"
-	if [ "`use java`" -a ! "`use amd64`" ]; then
+	if use java && ! use amd64; then
 		myconf="$myconf --with-java"
 	fi
 	use ssl && myconf="$myconf --with-openssl"
@@ -155,7 +155,7 @@ src_install() {
 
 	exeinto /usr/bin
 
-	if [ "`use java`" -a ! "`use amd64`" ]; then
+	if use java && ! use amd64; then
 		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
 	fi
diff --git a/dev-db/postgresql/postgresql-7.4.2-r2.ebuild b/dev-db/postgresql/postgresql-7.4.2-r2.ebuild
index 0271177db498..be2a1a03c073 100644
--- a/dev-db/postgresql/postgresql-7.4.2-r2.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2-r2.ebuild,v 1.8 2004/06/02 19:19:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2-r2.ebuild,v 1.9 2004/06/02 20:34:00 agriffis Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -62,7 +62,7 @@ pkg_setup() {
 
 check_java_config() {
 	JDKHOME="`java-config --jdk-home`"
-	if [ -z "${JDKHOME}" ] || [ ! -d "${JDKHOME}" ]; then
+	if [[ -z ${JDKHOME} && ! -d ${JDKHOME} ]]; then
 		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
 		eerror "${NOJDKERROR}"
 		die "${NOJDKERROR}"
@@ -92,7 +92,7 @@ src_unpack() {
 src_compile() {
 	filter-flags -ffast-math
 
-	if [ "`use java`" ]; then
+	if use java; then
 		check_java_config
 	fi
 
@@ -155,7 +155,7 @@ src_install() {
 
 	exeinto /usr/bin
 
-	if [ "`use java`" ]; then
+	if use java; then
 		# we need to remove jar file after dojar; otherwise two same jar
 		# file are installed.
 		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die