Remove old versions for bug #534676.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x6F48D3DA05C2DADB!)

5 files changed, 6 insertions, 377 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 1e0c5d9e4110..aae65edb80bb 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.181 2015/07/23 09:35:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.182 2015/07/25 04:26:35 mjo Exp $
+
+  25 Jul 2015; Michael Orlitzky <mjo@gentoo.org>
+  -nagios-plugins-1.4.16-r2.ebuild, -nagios-plugins-1.4.16-r3.ebuild,
+  -nagios-plugins-2.0.3.ebuild, metadata.xml:
+  Remove old versions for bug #534676.
 
   23 Jul 2015; Agostino Sarubbo <ago@gentoo.org> nagios-plugins-2.0.3-r2.ebuild:
   Stable for sparc, wrt bug #534676
diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml
index 3af6b6f78837..924971afa063 100644
--- a/net-analyzer/nagios-plugins/metadata.xml
+++ b/net-analyzer/nagios-plugins/metadata.xml
@@ -22,49 +22,18 @@
       Install <pkg>games-util/qstat</pkg> required for monitoring FPS
       servers. Disabling the flag does not remove any plugin file.
     </flag>
-    <flag name='nagios-ntp'>
-      Install <pkg>net-misc/ntp</pkg> required for monitoring NTP
-      servers and drifts. Disabling the flag does not remove any
-      plugin file.
-    </flag>
     <flag name='nagios-ping'>
       Install <pkg>net-analyzer/fping</pkg> required for fancy ping
       monitoring. Disabling the flag does not remove any plugin file.
     </flag>
-    <flag name='nagios-ssh'>
-      Install <pkg>net-misc/openssh</pkg> required for monitoring SSH
-      servers. Disabling the flag does not remove any plugin file.
-    </flag>
     <flag name='ssh'>
       Install <pkg>net-misc/openssh</pkg> required for monitoring SSH
       servers. Disabling the flag does not remove any plugin file.
     </flag>
-    <flag name='ups'>
-      Install <pkg>sys-power/nut</pkg> required for monitoring
-      compatible UPS units. Disabling the flag does not remove any
-      plugin file.
-    </flag>
     <flag name='snmp' restrict='&gt;=net-analyzer/nagios-plugins-1.4.16-r1'>
       Install <pkg>dev-perl/Net-SNMP</pkg> required for monitoring
       SNMP values. Disabling the flag does not remove any plugin file.
     </flag>
-    <flag name='suid'>
-      Give root privileges to the ICMP, DHCP and IDE S.M.A.R.T. check
-      binaries. This allows them to ignore the access controls that
-      would disallow the nagios user from running the check.
-    </flag>
-    <flag name='sudo'>
-      Install a file to allow the nagios user to execute some commands
-      via <pkg>app-admin/sudo</pkg>, so that the scripts can access
-      devices and features that wouldn't be otherwise allowed by
-      nagios.
-    </flag>
-    <flag name='smart'>
-      Install <pkg>sys-apps/smartmontools</pkg> required for
-      S.M.A.R.T. disk monitoring. Disabling the flag removes the
-      plugin file. This plugin also requires the sudo flag to be
-      enable.
-    </flag>
   </use>
 </pkgmetadata>
 
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild
deleted file mode 100644
index 430651ad52f2..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2015 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.16-r2.ebuild,v 1.14 2015/05/16 10:36:02 pacho Exp $
-
-EAPI=4
-
-PATCHSET=2
-
-inherit autotools eutils multilib user
-
-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
-	http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86"
-IUSE="+ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping nagios-ssh nagios-game ups ipv6 radius +suid xmpp gnutls sudo smart"
-
-DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	ssl? (
-		!gnutls? ( >=dev-libs/openssl-0.9.6g )
-		gnutls? ( net-libs/gnutls )
-	)
-	radius? ( >=net-dialup/radiusclient-0.3.2 )"
-
-# tests try to ssh into the box itself
-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 )
-	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 )
-	nagios-game? ( >=games-util/qstat-2.6 )
-	xmpp? ( >=dev-perl/Net-Jabber-2.0 )
-	sudo? ( >=app-admin/sudo-1.8.5 )
-	smart? ( sys-apps/smartmontools )"
-
-REQUIRED_USE="smart? ( sudo )"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/patches/*.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use ssl; then
-		myconf+="
-			$(use_with !gnutls openssl /usr)
-			$(use_with gnutls gnutls /usr)"
-	else
-		myconf+=" --without-openssl --without-gnutls"
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with radius) \
-		$(use_with postgres pgsql /usr) \
-		${myconf} \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--sysconfdir=/etc/nagios
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS BUGS CODING ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS )
-
-src_install() {
-	default
-
-	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
-
-	use suid && fperms 04710 ${nagiosplugindir}/check_{icmp,ide_smart,dhcp}
-
-	if use sudo; then
-		cat - > "${T}"/50${PN} <<EOF
-# we add /bin/false so that we don't risk causing syntax errors if all USE flags
-# are off as we'd end up with an empty set
-Cmnd_Alias NAGIOS_PLUGINS_CMDS = /bin/false $(use smart && echo ", /usr/sbin/smartctl")
-User_Alias NAGIOS_PLUGINS_USERS = nagios, icinga
-
-NAGIOS_PLUGINS_USERS ALL=(root) NOPASSWD: NAGIOS_PLUGINS_CMDS
-EOF
-
-		insinto /etc/sudoers.d
-		doins "${T}"/50${PN}
-	fi
-
-	cd contrib/
-	dodoc *README*
-
-	# remove stuff that is way too broken to fix, or for which the USE
-	# flag has been removed.
-	rm -r tarballs aix \
-		check_compaq_insight.pl *.c *README* \
-		$(usex !xmpp nagios_sendim.pl) \
-		$(usex !smart check_smart.pl)
-
-	# fix perl interpreter
-	sed -i -e '1s:/usr/local/bin/perl:/usr/bin/perl:' \
-		"${S}"/contrib/* || die
-
-	exeinto ${nagiosplugindir}/contrib
-	doexe *
-
-	dosym ../utils.sh ${nagiosplugindir}/contrib/utils.sh
-	dosym ../utils.pm ${nagiosplugindir}/contrib/utils.pm
-
-	# enforce permissions/owners (seem to trigger only in some case)
-	chown -R root:nagios "${D}${nagiosplugindir}" || die
-	chmod -R o-rwx "${D}${nagiosplugindir}" || die
-}
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags which determines what nagios is able to monitor."
-	elog "Depending on what you want to monitor with nagios, some or all of these USE"
-	elog "flags need to be set for nagios to function correctly."
-	elog "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib"
-}
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r3.ebuild
deleted file mode 100644
index e8b34d9ff24e..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2015 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.16-r3.ebuild,v 1.6 2015/05/16 10:36:02 pacho Exp $
-
-EAPI=4
-
-PATCHSET=2
-
-inherit autotools eutils multilib user
-
-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
-	http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping nagios-ssh nagios-game ups ipv6 radius +suid xmpp gnutls sudo smart"
-
-DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	ssl? (
-		!gnutls? ( >=dev-libs/openssl-0.9.6g )
-		gnutls? ( net-libs/gnutls )
-	)
-	radius? ( >=net-dialup/radiusclient-0.3.2 )"
-
-# tests try to ssh into the box itself
-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 )
-	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 )
-	nagios-game? ( >=games-util/qstat-2.6 )
-	xmpp? ( >=dev-perl/Net-Jabber-2.0 )
-	sudo? ( >=app-admin/sudo-1.8.5 )
-	smart? ( sys-apps/smartmontools )"
-
-REQUIRED_USE="smart? ( sudo )"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/patches/*.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use ssl; then
-		myconf+="
-			$(use_with !gnutls openssl /usr)
-			$(use_with gnutls gnutls /usr)"
-	else
-		myconf+=" --without-openssl --without-gnutls"
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with radius) \
-		$(use_with postgres pgsql /usr) \
-		${myconf} \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--sysconfdir=/etc/nagios
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS BUGS CODING ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS )
-
-src_install() {
-	default
-
-	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
-
-	if use sudo; then
-		cat - > "${T}"/50${PN} <<EOF
-# we add /bin/false so that we don't risk causing syntax errors if all USE flags
-# are off as we'd end up with an empty set
-Cmnd_Alias NAGIOS_PLUGINS_CMDS = /bin/false $(use smart && echo ", /usr/sbin/smartctl")
-User_Alias NAGIOS_PLUGINS_USERS = nagios, icinga
-
-NAGIOS_PLUGINS_USERS ALL=(root) NOPASSWD: NAGIOS_PLUGINS_CMDS
-EOF
-
-		insinto /etc/sudoers.d
-		doins "${T}"/50${PN}
-	fi
-
-	cd contrib/
-	dodoc *README*
-
-	# remove stuff that is way too broken to fix, or for which the USE
-	# flag has been removed.
-	rm -r tarballs aix \
-		check_compaq_insight.pl *.c *README* \
-		$(usex !xmpp nagios_sendim.pl) \
-		$(usex !smart check_smart.pl)
-
-	# fix perl interpreter
-	sed -i -e '1s:/usr/local/bin/perl:/usr/bin/perl:' \
-		"${S}"/contrib/* || die
-
-	exeinto ${nagiosplugindir}/contrib
-	doexe *
-
-	dosym ../utils.sh ${nagiosplugindir}/contrib/utils.sh
-	dosym ../utils.pm ${nagiosplugindir}/contrib/utils.pm
-
-	# enforce permissions/owners (seem to trigger only in some case)
-	chown -R root:nagios "${D}${nagiosplugindir}" || die
-	chmod -R o-rwx "${D}${nagiosplugindir}" || die
-
-	use suid && fperms 04710 ${nagiosplugindir}/check_{icmp,ide_smart,dhcp}
-}
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags which determines what nagios is able to monitor."
-	elog "Depending on what you want to monitor with nagios, some or all of these USE"
-	elog "flags need to be set for nagios to function correctly."
-	elog "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib"
-}
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.0.3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.0.3.ebuild
deleted file mode 100644
index 6163ad2d94de..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.0.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-2.0.3.ebuild,v 1.2 2014/12/29 02:32:31 patrick Exp $
-
-EAPI=5
-
-inherit eutils multilib user
-
-DESCRIPTION="Official set of plugins for Nagios"
-HOMEPAGE="http://nagios-plugins.org/"
-SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres samba snmp ssh +ssl"
-
-DEPEND="ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	ssl? ( dev-libs/openssl )"
-
-# tests try to ssh into the box itself
-RESTRICT="test"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	mysql? ( virtual/mysql )
-	nagios-dns? ( net-dns/bind-tools )
-	nagios-ping? ( net-analyzer/fping )
-	nagios-game? ( games-util/qstat )
-	samba? ( net-fs/samba )
-	snmp? ( dev-perl/Net-SNMP )
-	ssh? ( net-misc/openssh )"
-
-src_prepare() {
-	# Fix the path to our perl interpreter
-	sed -i -e '1s:/usr/local/bin/perl:/usr/bin/perl:' \
-		"${S}"/plugins-scripts/*.pl || die
-}
-
-src_configure() {
-	if use ssl; then
-		myconf+="$(use_with ssl openssl /usr)"
-	else
-		myconf+=" --without-openssl --without-gnutls"
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with postgres pgsql /usr) \
-		${myconf} \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--sysconfdir=/etc/nagios
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
-		NEWS README REQUIREMENTS SUPPORT THANKS )
-
-pkg_preinst() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags which determines what nagios"
-	elog "is able to monitor. Depending on what you want to monitor with"
-	elog "nagios, some or all of these USE flags need to be set for nagios"
-	elog "to function correctly. Plugins are installed into"
-	elog "/usr/$(get_libdir)/nagios/plugins"
-}