Mark ppc, bug 367721. Remove older versions

Package-Manager: portage-2.1.10.4/cvs/Linux i686

5 files changed, 9 insertions, 294 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 4adb66eca19a..f433e986017b 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/munin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.54 2011/06/19 16:55:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.55 2011/07/18 21:31:03 darkside Exp $
+
+  18 Jul 2011; Jeremy Olexa <darkside@gentoo.org> -munin-1.4.5.ebuild,
+  -munin-1.4.5-r1.ebuild, munin-1.4.5-r3.ebuild:
+  Mark ppc, bug 367721. Remove older versions
 
   19 Jun 2011; Raúl Porcel <armin76@gentoo.org> munin-1.4.5-r3.ebuild:
   sparc stable wrt #367721
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 5ed14d111401..46bd6346f9fb 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX logrotate.d-munin 386 RMD160 527eb49f80c70dfb6f3207df449147000f4e8a0f SHA1 84d5b125973f68076b361b92576453dc064ac7ea SHA256 42bcc50a21e72d9b68df4fad2f1016587f7b033301de754cf956a4d5789ffbea
 AUX munin-1.3.2-plugins.conf 1623 RMD160 05aa9ba00e714c26d62bc06f6008714cb837f026 SHA1 979d416741dd0c6d79f00746570c67572d4390b5 SHA256 4fbd0d0f6ef37b055283dbd25f7e400a06dc0be6ede1bfd4f3f5c9b2f57b98a1
 AUX munin-1.3.3-crontab 994 RMD160 ab7cc5acaeaf478413e1eb6d1dafe561d79448b0 SHA1 7a372182c407be60895a4817f9bb74f3a63fda49 SHA256 a5d9a160fc15d152a9cbdbf817a44c9c3450c60d61eeead647bf167fbe55fb89
@@ -10,15 +7,6 @@ AUX munin-node_conf.d_1.4.5-r3 398 RMD160 d2ec21e963a0cb8618866e282bfb1f3bfaab22
 AUX munin-node_init.d_1.3.3-r1 651 RMD160 80bb9d847eb14425fa5bd6092dfec0328f2f2626 SHA1 77dcab26eaf48e515e2f187b1a5324b507d19eae SHA256 04f1bfa5d97a451bb9aa3bb81caceb269411c55151c78dffeae1b8696fea937d
 AUX munin-node_init.d_1.4.5-r3 773 RMD160 464252b8483cc897f2d5151214c2b77a7b5408d4 SHA1 3157812d01894a4fbfe47dd4d71d6682d827c128 SHA256 2352ad981f1356bffe8d8b7a578a621e66493f3d727e7e534aa52ee59bf40b8b
 DIST munin-1.4.5.tar.gz 1231622 RMD160 883aa4baacfa5be1ec6a83737d5d241c40ad6912 SHA1 bd1e8ad1fe1cfade1de9c28f3ad69bf35ca495ca SHA256 4f8632713c5267e282b091cf7ef5163c5de321536e76dbaab2204aa23c957138
-EBUILD munin-1.4.5-r1.ebuild 4439 RMD160 62f51338492be27a556b5a65d5e9c7b87116e96a SHA1 cecffb0a236b2717bbb7713403616905d04c4264 SHA256 97ea6969ddade37f7ab3b4508d469ceee39438516619c466ca7f97e714723925
-EBUILD munin-1.4.5-r3.ebuild 4629 RMD160 f269bd65f06d19041658f411340b6407e61bc421 SHA1 992d9c8f0cfa091bc963b95aa5a647be6e90fe65 SHA256 bc598541ba6ad0ef2b6154893dadee2d87ae4f9eff181aa488a2012259523544
-EBUILD munin-1.4.5.ebuild 4276 RMD160 8ffb2a5872118d351c277e509472a0c4c677566f SHA1 ae523154b0284f948c9de02e72e8d4a085aaa0e8 SHA256 b43146bf44c3288ee10b67b9bf2e2012fd67ac97fb8c077368b1e21ad65271ae
-MISC ChangeLog 10372 RMD160 681df154be94064cd2b5f7899c14b52df1197401 SHA1 a77cb9266518d55a1dd843177543798695859d69 SHA256 af484347da98886e3939440cd8bdd728fe6b3803be510e2b90bf369ad0fe9878
+EBUILD munin-1.4.5-r3.ebuild 4629 RMD160 1a65cd42f60a281a314a3d48b029e093c44804f0 SHA1 39c9e7b4f49d1df3bd6c58ca10e0897e9673074a SHA256 6f6198d9b815da6a1c587d65c1205eaa56d30c38fe8db508277ce190b3e469fc
+MISC ChangeLog 10540 RMD160 e58b1bca2782c12bfa640b458fb3480002547cdb SHA1 cabd40df5ec570343e885d370e5ccc9d2a0ab2fe SHA256 8680d88336992772996764c2999b6372200f2231ac2a6ea7d50fba4e8c34d872
 MISC metadata.xml 1059 RMD160 6742332701cfc8cc749b07a5e1aa691c0d25a206 SHA1 7d3c7c25085c83c3948c8b1a4c1c9eddc7460884 SHA256 1133fa77ad1d63df183790f76cfe19d5b4248b964ee07cc4e50a4bd11faa2c69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk3+KiMACgkQuQc30/atMkAS+wCeKDB5YNqL2YHPBkHfqYNuD+Gh
-9+0AniwntfnZpZuVn8R8jMdkjtKGKNIB
-=bCHb
------END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/munin-1.4.5-r1.ebuild b/net-analyzer/munin/munin-1.4.5-r1.ebuild
deleted file mode 100644
index dc2709ffe999..000000000000
--- a/net-analyzer/munin/munin-1.4.5-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.5-r1.ebuild,v 1.1 2010/10/05 13:58:06 darkside Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin.projects.linpro.no/"
-SRC_URI="mirror://sourceforge/munin/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-IUSE="doc irc java minimal mysql postgres ssl"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# The mysql plugins use mysqladmin directly.
-DEPEND_COM="dev-lang/perl
-			sys-process/procps
-			irc? ( dev-perl/Net-IRC )
-			java? ( >=virtual/jdk-1.5 )
-			mysql? ( virtual/mysql dev-perl/Cache-Cache )
-			ssl? ( dev-perl/Net-SSLeay )
-			postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
-			dev-perl/DateManip
-			dev-perl/Net-CIDR
-			dev-perl/Net-Netmask
-			dev-perl/Net-SNMP
-			dev-perl/libwww-perl
-			dev-perl/net-server
-			dev-perl/DBI
-			virtual/perl-Digest-MD5
-			virtual/perl-Getopt-Long
-			virtual/perl-MIME-Base64
-			virtual/perl-Storable
-			virtual/perl-Text-Balanced
-			virtual/perl-Time-HiRes
-			!minimal? ( dev-perl/HTML-Template
-						net-analyzer/rrdtool[perl]
-						dev-perl/Log-Log4perl )"
-			# Sybase isn't supported in Gentoo
-			#munin-sybase? (	 dev-perl/DBD-Sybase )
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	virtual/perl-Module-Build"
-RDEPEND="${DEPEND_COM}
-		!minimal? ( virtual/cron )"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-}
-
-src_prepare() {
-	# upstream needs a lot of DESTDIR loving
-	# and Gentoo location support
-	epatch "${FILESDIR}"/${PN}-1.4.4-Makefile.patch
-
-	# Don't build java plugins if not requested via USE.
-	if ! use java; then
-		# sed is needed so the java plugins aren't automagically built.
-		sed -i -e 's: build-plugins-java : :' \
-			-e 's: install-plugins-java : :' Makefile || die
-	fi
-}
-
-src_compile() {
-	emake -j 1 build build-man || die "build/build-man failed"
-	if use doc; then
-		emake -j 1 build-doc || die "build-doc failed"
-	fi
-
-	#Ensure TLS is disabled if built without SSL
-	if ! use ssl; then
-		echo "tls disabled" >> ${S}/build/node/munin-node.conf \
-			|| die "Fixing munin-node.conf Failed!"
-		echo "tls disabled" >> ${S}/build/master/munin.conf \
-			|| die "Fixing munin.conf Failed!"
-	fi
-
-}
-
-src_install() {
-	local dirs
-	dirs="/var/log/munin/ /var/lib/munin/"
-	dirs="${dirs} /var/lib/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/spool/"
-	dirs="${dirs} /etc/munin/plugin-conf.d/"
-	dirs="${dirs} /etc/munin/munin-conf.d/"
-	dirs="${dirs} /etc/munin/plugins/"
-	keepdir ${dirs}
-
-	if use minimal; then
-		emake -j 1 DESTDIR="${D}" install-common-prime install-node-prime \
-			install-plugins-prime || die "install failed"
-	else
-		emake -j 1 DESTDIR="${D}" install || die "install failed"
-	fi
-	fowners munin:munin ${dirs} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node || die
-
-	# make sure we've got everything in the correct directory
-	insinto /var/lib/munin
-	newins "${FILESDIR}"/${PN}-1.3.3-crontab crontab || die
-	newinitd "${FILESDIR}"/munin-node_init.d_1.3.3-r1 munin-node || die
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.3.3-r1 munin-node || die
-	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache* \
-		|| die
-
-	# bug 254968
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/logrotate.d-munin munin || die
-}
-
-pkg_config() {
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /var/lib/munin/crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-	# dcron is very fussy about syntax
-	# the following is the only form that works in BOTH dcron and vixie-cron
-	crontab - -u munin </var/lib/munin/crontab
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
-	elog "To have munin's cronjob automatically configured for you if this is"
-	elog "your munin master installation, please:"
-	elog "emerge --config net-analyzer/munin"
-	elog ""
-	elog "Please note that the crontab has undergone some modifications"
-	elog "since 1.3.2, and you should update to it!"
-}
diff --git a/net-analyzer/munin/munin-1.4.5-r3.ebuild b/net-analyzer/munin/munin-1.4.5-r3.ebuild
index 8d8a3a4561d9..f6fd9e53983a 100644
--- a/net-analyzer/munin/munin-1.4.5-r3.ebuild
+++ b/net-analyzer/munin/munin-1.4.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.5-r3.ebuild,v 1.5 2011/06/19 16:55:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.5-r3.ebuild,v 1.6 2011/07/18 21:31:03 darkside Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/munin/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc sparc x86"
+KEYWORDS="amd64 ~mips ppc sparc x86"
 IUSE="doc irc java memcached minimal mysql postgres ssl"
 
 # Upstream's listing of required modules is NOT correct!
diff --git a/net-analyzer/munin/munin-1.4.5.ebuild b/net-analyzer/munin/munin-1.4.5.ebuild
deleted file mode 100644
index 9e77603c37a4..000000000000
--- a/net-analyzer/munin/munin-1.4.5.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.5.ebuild,v 1.6 2010/10/12 15:48:43 armin76 Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin.projects.linpro.no/"
-SRC_URI="mirror://sourceforge/munin/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc sparc x86"
-IUSE="doc irc java minimal mysql postgres ssl"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# The mysql plugins use mysqladmin directly.
-DEPEND_COM="dev-lang/perl
-			sys-process/procps
-			irc? ( dev-perl/Net-IRC )
-			java? ( >=virtual/jdk-1.5 )
-			mysql? ( virtual/mysql dev-perl/Cache-Cache )
-			ssl? ( dev-perl/Net-SSLeay )
-			postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
-			dev-perl/DateManip
-			dev-perl/Log-Log4perl
-			dev-perl/Net-CIDR
-			dev-perl/Net-Netmask
-			dev-perl/Net-SNMP
-			dev-perl/libwww-perl
-			dev-perl/net-server
-			dev-perl/DBI
-			virtual/perl-Digest-MD5
-			virtual/perl-Getopt-Long
-			virtual/perl-MIME-Base64
-			virtual/perl-Storable
-			virtual/perl-Text-Balanced
-			virtual/perl-Time-HiRes
-			!minimal? ( dev-perl/HTML-Template
-						net-analyzer/rrdtool[perl] )"
-			# Sybase isn't supported in Gentoo
-			#munin-sybase? (	 dev-perl/DBD-Sybase )
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	virtual/perl-Module-Build"
-RDEPEND="${DEPEND_COM}
-		!minimal? ( virtual/cron )"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-}
-
-src_prepare() {
-	# upstream needs a lot of DESTDIR loving
-	# and Gentoo location support
-	epatch "${FILESDIR}"/${PN}-1.4.4-Makefile.patch
-
-	# Don't build java plugins if not requested via USE.
-	if ! use java; then
-		# sed is needed so the java plugins aren't automagically built.
-		sed -i -e 's: build-plugins-java : :' \
-			-e 's: install-plugins-java : :' Makefile || die
-	fi
-}
-
-src_compile() {
-	emake -j 1 build build-man || die "build/build-man failed"
-	if use doc; then
-		emake -j 1 build-doc || die "build-doc failed"
-	fi
-
-	#Ensure TLS is disabled if built without SSL
-	if ! use ssl; then
-		echo "tls disabled" >> ${S}/build/node/munin-node.conf \
-			|| die "Fixing munin-node.conf Failed!"
-		echo "tls disabled" >> ${S}/build/master/munin.conf \
-			|| die "Fixing munin.conf Failed!"
-	fi
-
-}
-
-src_install() {
-	local dirs
-	dirs="/var/log/munin/ /var/lib/munin/"
-	dirs="${dirs} /var/lib/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/spool/"
-	dirs="${dirs} /etc/munin/plugin-conf.d/"
-	dirs="${dirs} /etc/munin/munin-conf.d/"
-	dirs="${dirs} /etc/munin/plugins/"
-	keepdir ${dirs}
-
-	emake -j 1 DESTDIR="${D}" install || die "install failed"
-	fowners munin:munin ${dirs} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node || die
-
-	# make sure we've got everything in the correct directory
-	insinto /var/lib/munin
-	newins "${FILESDIR}"/${PN}-1.3.3-crontab crontab || die
-	newinitd "${FILESDIR}"/munin-node_init.d_1.3.3-r1 munin-node || die
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.3.3-r1 munin-node || die
-	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache* \
-		|| die
-
-	# bug 254968
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/logrotate.d-munin munin || die
-}
-
-pkg_config() {
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /var/lib/munin/crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-	# dcron is very fussy about syntax
-	# the following is the only form that works in BOTH dcron and vixie-cron
-	crontab - -u munin </var/lib/munin/crontab
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
-	elog "To have munin's cronjob automatically configured for you if this is"
-	elog "your munin master installation, please:"
-	elog "emerge --config net-analyzer/munin"
-	elog ""
-	elog "Please note that the crontab has undergone some modifications"
-	elog "since 1.3.2, and you should update to it!"
-}