move database checks from src_unpack() to pkg_setup(), depend on libpq instead of postgresql for PostgreSQL support

(Portage version: 2.1.2)

2 files changed, 28 insertions, 27 deletions

diff --git a/net-analyzer/zabbix-server/ChangeLog b/net-analyzer/zabbix-server/ChangeLog
index 99fc52716f07..6cdfdfa6a75c 100644
--- a/net-analyzer/zabbix-server/ChangeLog
+++ b/net-analyzer/zabbix-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/zabbix-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/ChangeLog,v 1.12 2007/02/12 00:22:07 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/ChangeLog,v 1.13 2007/02/13 22:04:03 wschlich Exp $
+
+  13 Feb 2007; Wolfram Schlich <wschlich@gentoo.org>
+  zabbix-server-1.1.6.ebuild:
+  move database checks from src_unpack() to pkg_setup(), depend on libpq
+  instead of postgresql for PostgreSQL support
 
   12 Feb 2007; Wolfram Schlich <wschlich@gentoo.org>
   zabbix-server-1.1.6.ebuild:
diff --git a/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild b/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild
index 8e5b647d6dbf..2214b61c6e49 100644
--- a/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild
+++ b/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild
@@ -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/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild,v 1.4 2007/02/12 00:22:07 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild,v 1.5 2007/02/13 22:04:03 wschlich Exp $
 
 inherit eutils
 
@@ -17,15 +17,29 @@ DEPEND="virtual/libc
 	snmp? ( net-analyzer/net-snmp )
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )"
+	postgres? ( dev-db/libpq )"
 RDEPEND="${RDEPEND} net-analyzer/fping"
 
 S=${WORKDIR}/${MY_P}-${MY_PV}
 
 pkg_setup() {
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
+	local dbnum dbtypes="mysql postgres oracle" dbtype
+	declare -i dbnum=0
+	for dbtype in ${dbtypes}; do
+		useq ${dbtype} && let dbnum++
+	done
+	if [ ${dbnum} -gt 1 ]; then
+		eerror
+		eerror "You can't use more than one database type in Zabbix."
+		eerror "Select exactly one database type out of these: ${dbtypes}"
+		eerror
+		die "Multiple database types selected."
+	elif [ ${dbnum} -lt 1 ]; then
+		eerror
+		eerror "Select exactly one database type out of these: ${dbtypes}"
+		eerror
+		die "No database type selected."
+	fi
 	if useq oracle; then
 		if [ -z "${ORACLE_HOME}" ]; then
 			eerror
@@ -42,6 +56,9 @@ pkg_setup() {
 			ewarn
 		fi
 	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
 }
 
 pkg_postinst() {
@@ -115,27 +132,6 @@ pkg_postinst() {
 	esac
 }
 
-src_unpack() {
-	local dbnum dbtypes="mysql postgres oracle" dbtype
-	declare -i dbnum=0
-	for dbtype in ${dbtypes}; do
-		useq ${dbtype} && let dbnum++
-	done
-	if [ ${dbnum} -gt 1 ]; then
-		eerror
-		eerror "You can't use more than one database type in Zabbix."
-		eerror "Select exactly one database type out of these: ${dbtypes}"
-		eerror
-		die "Multiple database types selected."
-	elif [ ${dbnum} -lt 1 ]; then
-		eerror
-		eerror "Select exactly one database type out of these: ${dbtypes}"
-		eerror
-		die "No database type selected."
-	fi
-	unpack ${A}
-}
-
 src_compile() {
 	econf \
 		--enable-server \