Remove old versions for bug #534676.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x6F48D3DA05C2DADB!

6 files changed, 24 insertions, 398 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/Manifest b/net-analyzer/nagios-plugins/Manifest
index 481b53323125..d25de47ee5e2 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,29 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST nagios-plugins-1.4.16-patches-2.tar.xz 8972 SHA256 e553c6a13aa56d826e113008ab87b6eee2d676fb2a09aa5433211ebfea6cd7c9 SHA512 48352873396274b4063bf8e58530df7c8cf6cfefe5e581ad31bd44a54b295bac634688d33de98e4f90723b0e1652192762cfcb6664fc0ce5bee797d6716584f8 WHIRLPOOL 3e397e8a2e1cd98ac646d4b419a38b0eadb7b6ea42a593de86fc8300ff802a9ad560b4ad0c73fed914c326afc48da178884470495e23eacc3521e0a4dd9b6214
-DIST nagios-plugins-1.4.16.tar.gz 2087089 SHA256 b0caf07e0084e9b7f10fdd71cbd3ebabcd85ad78df64da360b51233b0e73b2bd SHA512 7a1401964b881c3db3e1e3f2a49dcf517ff7214724cc05c3ad629651b7e3eeb823b02abe0c6379d29996ac1e8a1208d918fd12e36cca46c7d36d9b1ebacdb2b3 WHIRLPOOL 3cb3b5d5f7f18e7eb5babde6f7bdd82ba167de4b875825c195d3abf7a14926102940616278769a8127a5c3269d475325145799c1414e6cc22eb208319fd2e879
 DIST nagios-plugins-2.0.3.tar.gz 2659772 SHA256 8f0021442dce0138f0285ca22960b870662e28ae8973d49d439463588aada04a SHA512 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36 WHIRLPOOL 4b0e4024833373df3f0db44657345a1f4495c4022e56bf6b369cc2846f9127e565520f6b7cdf1b94384592e78327d584da7d939a3ac0586e0ae67fd1258c138b
-EBUILD nagios-plugins-1.4.16-r2.ebuild 3925 SHA256 677c14725f3d3377dbd725a8e43f68a48f8175fc914546d48d3123c20ec348f6 SHA512 556f9633368f3f8252e719f0e24b50f3157627e82c8484c110c4c7f6b31fd19681635de7b29e2057f0233a69b8fec84f21628622c905af167284d134502dfc14 WHIRLPOOL 062d648309bef0d7cbeffb9088db0c92991fafb3655c5d9a5b8ee0956d2326ff1d075043480553f8ed3f3ee0518588d2c2468e8caff325708abb27785b7241d5
-EBUILD nagios-plugins-1.4.16-r3.ebuild 3932 SHA256 193d41c02a4fa8a55f0ee20714b3067c29cf1fda0db46c0e062b7d0566bfaad7 SHA512 9d6143f29015a059b44c68c7653a73182dc746de22aea8b00028fcb09fa5c54108e3c8f23f2102d5cf4a708fe8b30f074806970267da73e0a7e65ea0ad1d0de9 WHIRLPOOL 185abaa667d59619f8d433f1bd5dd9c28d802fb09e7f75ad5a54a01449a2d27544917b82f03bf388b176f3ae433159743fd43ff47a8dc3ef4a358ffefb03c77c
 EBUILD nagios-plugins-2.0.3-r2.ebuild 2958 SHA256 0ad80f8cf3088b89eca6376a28f567a362baa11520f8bfce043aa26520f54b8a SHA512 0c6010324f7d0f6608c9f51b18b09d6b3dcb41d9e5ed811c3ece7eb1094d69e7226e4937efb5397d9ad8c4c05847cc74ac02bdef766eff136aa0039c611c8d4c WHIRLPOOL 9cfbc908eb3555cd72d2eebb847f5297624b61688fbf92454cde65a84a54c6b87c9f1f9bc9d66972ef12dd3fc269a45cb1aaa2ff2d49daa52b8632298f10bc0b
-EBUILD nagios-plugins-2.0.3.ebuild 2050 SHA256 ffbd24a8749f3fd6db1f8095b885ede0c5a15804e478775fe87a4571c7c20517 SHA512 7a6bb1d31f5831c4d032746659bd0aeefc0eeddb9c40124b90994346a86761d7a6a05a5482c9a9df578bbd65d7bb2babcb036a3b1b64eb7fffb4bdbce3c0b2e2 WHIRLPOOL 0760e5f4bfdb2998eb4abd8bb83920b4a9395d1077f28f81b78e39997f500754e71f4397859039b8e9df81a67d7b559a12bc064f9425c6c4c1646119dcec5636
-MISC ChangeLog 15827 SHA256 ad728678b53fa4dccab8c6248c7f6bd8c87baf93c35bb35be272f27ef15d38f5 SHA512 49fefa008b243f3a03dd07e6cd7ee2678d69aa83962113cb8cc2db657084b13ad88aacf5e1b47ce9480ca5e994452e0a258ae52bbc318a5e341549ecfd7d724c WHIRLPOOL fae5e1248e893b8fb33107086b6487d0622283786988ae384918b4fe2e52658d38ea92293d5baae7683f5886f966b3bc6c2949fc022a40f0fa0634a2efaf6800
-MISC metadata.xml 2775 SHA256 6ef708a9b09b512e8024a9d1b6185b34feffbe9f909675ecd43789c9b241966a SHA512 863bfc34c3da419ffe3c41c8db125ff16305c5906ec12627659ddce2ab05f2413fe72d989edfad8bce4ebb158360df1dc9d8cb17f73886e648248366e99ca2a1 WHIRLPOOL 8d71f4f437f6c7efdebcf1b50b07e476a1abff30fed3fc120a388d9a939233390444daa18e2b74cd8ebfe06bd654cfae9994df259428e1b48562914604249001
+MISC ChangeLog 16032 SHA256 0fcc0dcd50ab5fd579c2fe7d87c33deb815f396f4c70a31909f1da00a47b7a74 SHA512 2ac4eb36d06e72159faa28f62cafa23f8e3b5db0f030209717cf65775f1ff3bd3f95511fd5c17f95866689e77624ab76835876dc00c1598bae45d6f6e4ed9fe5 WHIRLPOOL 2eb21e54a88026a1adfbd242b1ed2892b4c28b8fb418f6dee36f2077571d9b9f25f6c82f9b3774847e62aa6e5261b695d4bdfc3d31cf06ced31aa493a6a47496
+MISC metadata.xml 1495 SHA256 dfafba458f1ca94c63a4f560ecf252a97d50d4e507dbe947d816b5f098afedca SHA512 eca233f7d953163ee1bceca56c0a885aac683db63b348f22ad2cdc4aeb591e7aab05f45b7fb8256b60aa1cf3414523c8523cd127d1be85ce2a1b43988d422905 WHIRLPOOL 70083f5478303e0f1c6f5957a0f517672311b8ad7963bed1d84ca31596385100eb14ad5d1578afbd27f487f69ad6cbebcd99a7e7b65f1d04212c166122a8e042
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVsLVxAAoJELp701BxlEWfjxgQAJGBNBajjERQOV+btZFuy0Ch
-FBPcGdDhwAcXY6NPi7TeJ/FNmcl0qz3DyP57op9jGoCJ9pCahFjicUEkJ9rr/GAV
-Ki+LYPquO9YZSKzAUBEgKkcKGTlzfBaACGjXA90ZrdgmvcEcA16R+Xj/a8XCaIIR
-w8Ca61j2X4n6djGu7GhuWPVI1SzVNHPHVqJtCoquOfsledxdMf2soJ9GAXL9CU+g
-b2sfN2uR9bxSRlLEcUaNk1TJNsPs2PwrBb2jeMlA4uXwmQnPo5fyW3xG9HMTY27K
-cBzSYPFcXXbSV2cnqoog4EemO30hInjfByIbrWWvAAVR5PLIg2TO3G+SoPgTQNjP
-FOyCCd84JEso9NkS4EuB1eDGGjbekIMi8TdtaHuZsa1xp4Tl+lhuX5Fj6atodq8T
-9DNMbxidSXvk1AWLhkA4s1kPgEadoavEmtdwCIFORAqztR7atZzV7gCu/IFJnYq3
-VL0aCmt2x9g+qZmcUt4X8/By4N+nGFnJXqNUcA2h9evwYPiOQqnhx7XdyPyMS2lL
-UZ9erXba/2aTkBSBoKsEMYypWJhV+GkgN3No7wWQKMiKS7Lt3As3XP4ns5/z5WgQ
-RL2+Qdgg4//5Jrswmiuy6rcbXUqzzEqkwyuCPSVpXZM7TdTOPlSg9UOf9tSTwh5Z
-o4z1XOv/hB9LabUpZtK/
-=ZUwq
+iQJ8BAEBCABmBQJVsxACXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
+RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbt+MQAIYOfkt5jjHaRNV6GT4eE3bf
+1kgvLcGlYjyhHQZCup48PtQgfZjaZIdcwixMSKoXcXrVER5HvjFsnlsT22a6GT1t
+vLSq3N4fwzIIlRs0lJ952q0VrNobIWQ1FIDOHORRoX+N/JAV1VQTpZ3DgtmtWaZ0
+Tw9BqbfaKnwEP7EcKLL8x77CGLyaDMNwwzO9ob4vo9FGgxpbo/B1Puk6MYPlq6X5
+/YVAkm+lAR1JuNldT6vexfwwBDaOxjGb24AwQvNibcyXBJCtwVMPF5wqccQm8jl9
+b60o4yVyXtK9EH7v+uyUEi3puw/h9Hi46a1rCZGbBt2kQ/qCt90td53mnXA/QZEx
+BXQII5uLJspq25Mzdw0GCUq2YPaNKXCX9/fcChx89vICl+9p/zHJvQINq5Fogsud
+7Q1lRVbOt/Tr6yxa91vPK3Lp+/HtZ/QlkLRwL84vIhLFZuaX7v4weVBRxdXgS+GK
+3NfYS/PmvSHjScIENFnKmCN4cLX5o/PnLH4zrtmNmvtrZ5TwPeadFqEUArrdGOtL
+/0H0qFiZDOsQ1DWCWbob87KWZ7T7naFKVClQDF/heuN/+sKGCof1w2gqalNCuhaz
+1eHjB45o8ZEV0AVeww5LisWjMpqh8YGXTaXH0yK/iGM2zAlUal1KccYxuzk8Ipu1
+ZAlhS/QbGSRblrdOdMwH
+=GRMf
 -----END PGP SIGNATURE-----
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"
-}