fix postgres dep (#214718 by Łukasz Mierzwa), remove old version

Package-Manager: portage-2.1.4.4

4 files changed, 10 insertions, 137 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 32272ca16578..048bb6b7e8a0 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.85 2008/03/14 11:56:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.86 2008/03/25 17:13:54 dertobi123 Exp $
+
+  25 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -nagios-plugins-1.4.10-r1.ebuild, nagios-plugins-1.4.11.ebuild:
+  fix postgres dep (#214718 by Łukasz Mierzwa), remove old version
 
   14 Mar 2008; Caleb Tennis <caleb@gentoo.org> nagios-plugins-1.4.11.ebuild:
   amd64 stable
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 27bdf63e90a0..0793a26c5ef0 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -2,9 +2,7 @@ AUX CVE-2007-5623.patch 1060 RMD160 c8704e0c39a4194ee153b444a7285f0a44363030 SHA
 AUX nagios-plugins-1.4.10-check_http.patch 549 RMD160 e3b85a38d04b32e68b97bf57595b5347be7ce1cc SHA1 d452e8e3bf09d85751219b5c6e8bd762548451ed SHA256 2fffe117269d1f9b56870169e38ea0836f47c0cc088bb8b3520a9ecfce90c79e
 AUX nagios-plugins-1.4.10-contrib.patch 1610 RMD160 928e2ce0a8071b5fd93ca28722512d8996eaa027 SHA1 ff7105763268fc3cc48dced7c17df9ff0bb84899 SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278
 AUX nagios-plugins-1.4.10-noradius.patch 1029 RMD160 e1e449d93966d822eca21782968e24fce4547a95 SHA1 e5e6758790cc85db9f028cde3fb3d6611356167e SHA256 bff601e67a413abd84c2b430bfcf10395f68a83f98a628a398ee50f7cb406229
-DIST nagios-plugins-1.4.10.tar.gz 1693979 RMD160 8f8167f07d6162165d7cb38c9c09ebff418151bd SHA1 8b41a69a90f9c656afb56b861f4505e5ad1aa5a4 SHA256 193ef480cd2b98d63de9183a83e277d6ef3b55032f44bd76616ef5e7a3d4a76e
 DIST nagios-plugins-1.4.11.tar.gz 1734230 RMD160 4f33e796f8eac2d8d13cbecbcc1191857e1b5f15 SHA1 bc91a57ad6f5468b17f24429ba25225cfff45d59 SHA256 2cc1534a7f41da6cdb72d595c8643e62491fbab1bb768ab113eff20581ac05e5
-EBUILD nagios-plugins-1.4.10-r1.ebuild 3745 RMD160 09673c79db4016b10c81de66ba70eb98e2dc52e6 SHA1 ad15f28283932ed20b5c815b393fc67d9b4d4768 SHA256 d707850b1edcd023701c0a14896092807d7fca00c61a16cff1f65d777e6a104b
-EBUILD nagios-plugins-1.4.11.ebuild 3633 RMD160 0f640003bee47597bd6dffa1bb082a2eddfbd255 SHA1 0c8bf21726506d5ba6262bfd1ccbd18036f2331d SHA256 43dbaa0f3f489a0ccf8310347be2262fcd1dde0ddbe5ec1e9f4c30bbf908de57
-MISC ChangeLog 14904 RMD160 f6626fdd03bc8024a8af280279c1ccf76778b9e6 SHA1 e08bc1a3816f3e6cdd522435e21150e70f0b75f2 SHA256 e2974e23c8c49d8eca3c5707111210d000c0125aef056c2ce76c69076b2f6d0e
+EBUILD nagios-plugins-1.4.11.ebuild 3623 RMD160 d67c1c6af88403870db20742c621996dbc79700d SHA1 e42ceaefabcb5b68a911edde06eea9c5fbb2c832 SHA256 f3572f8147d65132830245596052e23e07b6cb839a5e0eb01ad15bf177455b12
+MISC ChangeLog 15100 RMD160 be684c69e063b4022dbf00df440e536d3700802c SHA1 8c817ca4da019ee275a1194772cdea479d1a3123 SHA256 4621dcefe613a6ed3f81c9c0ed8877e8c9e81d8d93117b9bc7bccc593578b32b
 MISC metadata.xml 374 RMD160 c261e08c2be47cbf618ed122151d25f96a176aa9 SHA1 88da42b8cc7c08339067720081f61c110e00acb5 SHA256 4babbe654b066c416bb453a8decbd1e8bdaf450226d9ed6d4380bf17e5761f59
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.10-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.10-r1.ebuild
deleted file mode 100644
index d033f4b429b1..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.10-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.10-r1.ebuild,v 1.6 2007/11/08 00:49:17 wolf31o2 Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools
-
-DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
-IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
-nagios-ssh nagios-game ups ipv6 radius"
-
-DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	radius? ( >=net-dialup/radiusclient-0.3.2 )"
-
-RESTRICT="test"
-
-RDEPEND="${DEPEND}
-	>=dev-lang/perl-5.6.1-r7
-	samba? ( >=net-fs/samba-2.2.5-r1 )
-	snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1
-			>=net-analyzer/net-snmp-5.0.6
-			)
-	mysql? ( dev-perl/DBI
-			 dev-perl/DBD-mysql )
-	nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 )
-	nagios-ntp? ( >=net-misc/ntp-4.1.1a )
-	nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 )
-	nagios-ssh? ( >=net-misc/openssh-3.5_p1 )
-	ups? ( >=sys-power/nut-1.4 )
-	!sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use radius; then
-		EPATCH_OPTS="-p1 -d ${S}" epatch \
-		"${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch
-
-	## CVE-2007-5623
-	epatch "${FILESDIR}"/CVE-2007-5623.patch
-
-	epatch "${FILESDIR}"/${P}-check_http.patch
-
-	AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-src_compile() {
-
-	local conf
-	if use ssl; then
-		conf="${conf} --with-openssl=/usr"
-	else
-		conf="${conf} --without-openssl"
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with postgres) \
-		$(use_with ipv6) \
-		${conf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "econf failed"
-
-	# fix problem with additional -
-	sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg
-	chmod +x "${S}"/contrib/*.pl
-
-	sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed"
-	sed -i -e '30s/use lib utils.pm;/use utils;/' \
-		"${S}"/plugins-scripts/check_file_age.pl || die "sed failed"
-
-	dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING \
-		ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if use mysql || use postgres; then
-		dodir /usr/nagios/libexec
-		exeinto /usr/nagios/libexec
-		doexe "${S}"/contrib/check_nagios_db.pl
-	fi
-
-	dodir /usr/nagios/libexec/
-	mv "${S}"/contrib "${D}"/usr/nagios/libexec/contrib
-
-	chown root:nagios "${D}"/usr/nagios || die "Failed Chown of ${D}usr/nagios"
-	chown -R root:nagios "${D}"/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec"
-
-	chmod -R o-rwx "${D}"/usr/nagios/libexec || die "Failed Chmod of ${D}usr/nagios/libexec"
-
-	chmod 04710 "${D}"/usr/nagios/libexec/check_icmp || die "Failed Chmod of ${D}usr/nagios/libexec/check_icmp"
-}
-
-pkg_postinst() {
-	einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor."
-	einfo "Depending on what you want to monitor with nagios, some or all of these USE"
-	einfo "flags need to be set for nagios to function correctly."
-	echo
-	einfo "contrib plugins are installed into /usr/nagios/libexec/contrib"
-}
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.11.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.11.ebuild
index d5e709284248..23bc9b518ec7 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.11.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.11.ebuild,v 1.5 2008/03/14 11:56:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.11.ebuild,v 1.6 2008/03/25 17:13:54 dertobi123 Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -19,7 +19,7 @@ nagios-ssh nagios-game ups ipv6 radius"
 
 DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
 	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.2 )
+	postgres? ( >=dev-db/libpq-7.2 )
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	radius? ( >=net-dialup/radiusclient-0.3.2 )"
 
@@ -93,7 +93,7 @@ src_install() {
 	sed -i -e '30s/use lib utils.pm;/use utils;/' \
 		"${S}"/plugins-scripts/check_file_age.pl || die "sed failed"
 
-	dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING \
+	dodoc ACKNOWLEDGEMENTS AUTHORS BUGS CODING \
 		ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS
 
 	emake DESTDIR="${D}" install || die "make install failed"