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

Package-Manager: portage-2.1.2

3 files changed, 36 insertions, 35 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/Manifest b/net-analyzer/zabbix-server/Manifest
index e4f073d6a0a8..e90480687f59 100644
--- a/net-analyzer/zabbix-server/Manifest
+++ b/net-analyzer/zabbix-server/Manifest
@@ -70,10 +70,10 @@ EBUILD zabbix-server-1.0.ebuild 3101 RMD160 bf1495f65400a85fdeab52e557655459dd35
 MD5 553fde062c1a3d773d62f16adb812cb2 zabbix-server-1.0.ebuild 3101
 RMD160 bf1495f65400a85fdeab52e557655459dd35903e zabbix-server-1.0.ebuild 3101
 SHA256 658f8c88a5b1876fe6eda135fc68670614dfd610692f09fb36d535524d8831c5 zabbix-server-1.0.ebuild 3101
-EBUILD zabbix-server-1.1.6.ebuild 5219 RMD160 90c06cc42be72085eef904f1161241081e2e9a0e SHA1 641cc4f71283d1c394a00c101e7563893fc1a03a SHA256 ceaa8aa7232ad18d67ec8ef71c6ca6000ff6e91febc2b1ef8fa7c1dd3937f27b
-MD5 7826653907989e824d7b543b8e0bdad8 zabbix-server-1.1.6.ebuild 5219
-RMD160 90c06cc42be72085eef904f1161241081e2e9a0e zabbix-server-1.1.6.ebuild 5219
-SHA256 ceaa8aa7232ad18d67ec8ef71c6ca6000ff6e91febc2b1ef8fa7c1dd3937f27b zabbix-server-1.1.6.ebuild 5219
+EBUILD zabbix-server-1.1.6.ebuild 5183 RMD160 149fa9fde379adf0e759b846e62838aaf68e961a SHA1 58e916b08a6bc09ea8cc3790b7a49ae707fa3762 SHA256 b1654164ca54906d350c4cde1bdd367fb3ecb03bb0dc39f5a50ee9a83f884f01
+MD5 0aeff6237cf5470e3cc87be32f2544f6 zabbix-server-1.1.6.ebuild 5183
+RMD160 149fa9fde379adf0e759b846e62838aaf68e961a zabbix-server-1.1.6.ebuild 5183
+SHA256 b1654164ca54906d350c4cde1bdd367fb3ecb03bb0dc39f5a50ee9a83f884f01 zabbix-server-1.1.6.ebuild 5183
 EBUILD zabbix-server-1.1.ebuild 4499 RMD160 31839444d5d6786bf0fa0752cf81d03de091a05e SHA1 b8311cfe429043879439bf34d46775f8c6981bb9 SHA256 cbd584bec998673259a49e69949bf7dd4f9c11f1951a066a7218192255af27e0
 MD5 9d40eb55431a65d836c3db2aea3e2618 zabbix-server-1.1.ebuild 4499
 RMD160 31839444d5d6786bf0fa0752cf81d03de091a05e zabbix-server-1.1.ebuild 4499
@@ -82,10 +82,10 @@ EBUILD zabbix-server-1.1_alpha7.ebuild 2922 RMD160 743cccb3d05540c6d2d7620b7fbde
 MD5 bf4b03ca87fddbd33e7d244948040483 zabbix-server-1.1_alpha7.ebuild 2922
 RMD160 743cccb3d05540c6d2d7620b7fbde6aaf37678cc zabbix-server-1.1_alpha7.ebuild 2922
 SHA256 6557acf7a2d9c46279568fb300b6007b3380bcfafca88cf857a1b797755148f2 zabbix-server-1.1_alpha7.ebuild 2922
-MISC ChangeLog 4032 RMD160 9885803ecb5cfc5ed998a189a10f838f6f04ddc2 SHA1 2ae003b0f8927c3fdfffff550ff42487e94fa6be SHA256 2f66230ba8b6937b15d29c127b2a075e2f73253da75bc2340e5f64d83c37f3b8
-MD5 a75d844ab666aa94988658b67ae6f87e ChangeLog 4032
-RMD160 9885803ecb5cfc5ed998a189a10f838f6f04ddc2 ChangeLog 4032
-SHA256 2f66230ba8b6937b15d29c127b2a075e2f73253da75bc2340e5f64d83c37f3b8 ChangeLog 4032
+MISC ChangeLog 4236 RMD160 b07e443aee20b16e85b2e7fcf80a7ab85b6b0bab SHA1 323b2825c262a2b2bea09262c82f549eb3d8a8e5 SHA256 8e40f28a27e5018f4051258acc431649f1fb69fac906764adfb2f57d9b85ffbd
+MD5 692c37d4cf26ab81b688655ac46ead33 ChangeLog 4236
+RMD160 b07e443aee20b16e85b2e7fcf80a7ab85b6b0bab ChangeLog 4236
+SHA256 8e40f28a27e5018f4051258acc431649f1fb69fac906764adfb2f57d9b85ffbd ChangeLog 4236
 MISC metadata.xml 630 RMD160 0ceb5472b6bc0efd1fa4a09f52d3ef953b0cb13c SHA1 88bffe8fc9f05440edecef1fdc65f4c6dbb6f735 SHA256 770d0897320974215ae8d520cc2f56761e9b53dfa85e9e3081bff1427d8aa03c
 MD5 d86acab58212886771ef2bf837a2e8b9 metadata.xml 630
 RMD160 0ceb5472b6bc0efd1fa4a09f52d3ef953b0cb13c metadata.xml 630
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 \