Remove obsolete versions
authorJustin Bronder <jsbronder@gentoo.org>
Sat, 3 Jul 2010 02:45:37 +0000 (02:45 +0000)
committerJustin Bronder <jsbronder@gentoo.org>
Sat, 3 Jul 2010 02:45:37 +0000 (02:45 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

sys-cluster/ganglia/ChangeLog
sys-cluster/ganglia/Manifest
sys-cluster/ganglia/ganglia-3.1.2-r1.ebuild [deleted file]
sys-cluster/ganglia/ganglia-3.1.7.ebuild [deleted file]

index dbeb0afa8bfa3212c1d651079c84c1eeb8dfc35d..9c92e3cee58f333236009cc2d3fb563b2a42b60e 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/ganglia
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.36 2010/07/03 02:44:24 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.37 2010/07/03 02:45:36 jsbronder Exp $
+
+  03 Jul 2010; Justin Bronder <jsbronder@gentoo.org>
+  -ganglia-3.1.2-r1.ebuild, -ganglia-3.1.7.ebuild:
+  Remove obsolete versions
 
 *ganglia-3.1.7-r1 (03 Jul 2010)
 
index 6e1f67196fad8778d68b56a373a3f1a29039cc7c..6f78e5f8a0611e665b068fa38d1d26f7c4f1f855 100644 (file)
@@ -8,16 +8,14 @@ AUX gmetad.rc 351 RMD160 e6de86388717e8b8ee5072e45accb8b3cbf98632 SHA1 1cca25319
 AUX gmond.rc 345 RMD160 076613bff272ddb1e8e192805edad009e00f2af4 SHA1 bc57ed84f0e0fc92fe46f71e0179a2b5bb028aa4 SHA256 c58568992ddad460a79278aae59d0246b74ae167b70d05885775c51118a8c965
 DIST ganglia-3.1.2.tar.gz 1213196 RMD160 1f78cf1019759e12c3c65901fd74ac65dfddf4e3 SHA1 be5db246eb755d8c450140d1c80afef4f1179fe1 SHA256 278f6fcf2299ceb8cacff999e54f96987e8d09064b1d43469108985bdeba6f12
 DIST ganglia-3.1.7.tar.gz 1278023 RMD160 918d678ad234d477fc98427d96485a8111c64f06 SHA1 e234d64814af1c9f55f1cd039a5840039d175f85 SHA256 bb1a4953d72e7dace76010a30d6d332e4ac0991d1371dbbcbcc7b048e0a7e4bf
-EBUILD ganglia-3.1.2-r1.ebuild 5373 RMD160 f372eb02bfb205e97db07be75fb56d7dcc45dd95 SHA1 afa437af31e38a9c49a6c3be4bcdd49220860627 SHA256 97818bed111541ee568eeb79423ddbca991fd43937843335a3346df6186ee431
 EBUILD ganglia-3.1.2.ebuild 5443 RMD160 7d197d8e757da5f59f407f308cb6c913436a6684 SHA1 9e79e653bbc172900a5ba82e002308fb4bedd5ca SHA256 25ddc5a87a7908cde9448db3f391877c8eec074ca552127d550fc5f071025d92
 EBUILD ganglia-3.1.7-r1.ebuild 2784 RMD160 0f0393fde31da3aca0b35e0e6538771ccc027781 SHA1 2e6d5e53bfe5cb4a00ab2f0d4c0f8148937ab132 SHA256 b30672c2c669fbe02b118ba7a8a9104fb1e7e17d803b3a1157d2bf7d5eb312cc
-EBUILD ganglia-3.1.7.ebuild 4947 RMD160 285b502c6c4d59404b5778fd7519b728be107b92 SHA1 747565b227cd857ae902d690d867c0cdc7ccf92f SHA256 e927878b153242889c96da9b1c427b2290f7a359596fb4566826101fd9e49bc5
-MISC ChangeLog 7929 RMD160 6cbd49d9ef41b2a1c3149695dce3c1a5a0b580f2 SHA1 58395e8f46600e551392004bff04dcc1b5b65312 SHA256 abc129171ad2a976bd0d1e8c5e21a6c16a0e73cc7ea9bcda4c94d2fddc4e13d7
+MISC ChangeLog 8061 RMD160 ab5690859412ee9eca07d270a92ae4bfbf4f5fc5 SHA1 fcab1804714b49c60e7bbc43c020e7480b1e7a77 SHA256 f6fcc2ecb36c1a58f2531dbe31bca6c65a59a29e4ba36cbb6e70d93802072995
 MISC metadata.xml 231 RMD160 37dd476ccaceaa37796cf29fd01af8fcfa2b4c61 SHA1 87cab1ccad4db7724c4292e4f32dd19accdcf2fa SHA256 b5305a12d2e3e9f9fdf645e98b0108c1bd8f5b5da32589a25bf7b0f0d74f1213
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkwupA0ACgkQ4MrvBE1wQ8kLIgCfbod4Og70cTm2GIcqR0Knpofy
-848AnjuyR6o+WjXns7ka4e4wDwi7ZsGD
-=WtVX
+iEYEARECAAYFAkwupFYACgkQ4MrvBE1wQ8mujwCeMBkiApLNWNt+w+GjhwFZFgHG
+/MgAnijgVyT3hPz8PiDF6DgpCtYdK3iJ
+=QGor
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ganglia/ganglia-3.1.2-r1.ebuild b/sys-cluster/ganglia/ganglia-3.1.2-r1.ebuild
deleted file mode 100644 (file)
index 7d2b15a..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.2-r1.ebuild,v 1.1 2010/01/09 18:37:03 jsbronder Exp $
-
-EAPI="2"
-WEBAPP_OPTIONAL="yes"
-inherit eutils multilib webapp python
-
-DESCRIPTION="A scalable distributed monitoring system for clusters and grids"
-HOMEPAGE="http://ganglia.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ganglia/${P}.tar.gz"
-LICENSE="BSD"
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="minimal vhosts python"
-
-DEPEND="
-       dev-libs/confuse
-       dev-libs/expat
-       >=dev-libs/apr-1.0
-       python? ( >=dev-lang/python-2.3 )
-       !dev-db/firebird"
-
-RDEPEND="
-       ${DEPEND}
-       !minimal? ( net-analyzer/rrdtool
-               ${WEBAPP_DEPEND}
-               dev-lang/php[gd,xml,ctype,pcre,cgi]
-               media-fonts/dejavu
-       )"
-
-pkg_setup() {
-       use minimal || webapp_pkg_setup
-}
-
-src_prepare() {
-       # TODO:  Submitted upstream, may not be necessary in the future.
-       epatch "${FILESDIR}"/${PN}-3.1.1-ctype-c99.patch
-       # This patch just gives a group to the disk statistics.
-       # I.E. it's just cosmetics
-       epatch "${FILESDIR}"/${PN}-3.1.1-multidisk-group.patch
-}
-
-src_configure() {
-       econf \
-               --enable-gexec \
-               $(use_enable python) \
-               $(use_with !minimal gmetad) || die "econf failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       newinitd "${FILESDIR}"/gmond.rc gmond
-       doman mans/{gmetric.1,gmond.1,gstat.1}
-       doman gmond/gmond.conf.5
-       dodoc AUTHORS ChangeLog INSTALL NEWS README
-       dodir /etc/ganglia/conf.d
-       gmond/gmond -t > "${D}"/etc/ganglia/gmond.conf
-
-       # Sadly, there is no install target for any of this.
-       if use python; then
-               # We install the multidisk module, but not the configuration
-               # as this needs to be generated later.  See pkg_config
-               local gmond_py="disk/multidisk network/tcpconn"
-               local gmond_py_conf="tcpconn"
-               newdoc gmond/modules/python/README README.python_modules
-               insinto /etc/ganglia/conf.d
-               doins gmond/modules/conf.d/modpython.conf
-               for i in ${gmond_py_conf}; do
-                       doins gmond/python_modules/conf.d/${i}.pyconf
-               done
-               dodir /usr/$(get_libdir)/ganglia/python_modules
-               insinto /usr/$(get_libdir)/ganglia/python_modules
-               for i in ${gmond_py}; do
-                       doins gmond/python_modules/${i}.py
-               done
-       fi
-
-       if ! use minimal; then
-               webapp_src_preinst
-               insinto "${MY_HTDOCSDIR}"
-               doins -r web/*
-               webapp_configfile "${MY_HTDOCSDIR}"/conf.php
-               webapp_src_install
-
-               # webapp_src_install stomps on permissions, so do that
-               # stuff first.
-               insinto /etc/ganglia
-               doins gmetad/gmetad.conf
-               doman mans/gmetad.1
-
-               newinitd "${FILESDIR}"/gmetad.rc gmetad
-               keepdir /var/lib/ganglia/rrds
-               fowners nobody:nobody /var/lib/ganglia/rrds
-       fi
-}
-
-pkg_preinst() {
-       if has_version '<sys-cluster/ganglia-3.1.0'; then
-               elog "Previous ganglia installation detected."
-               elog "Copying gmetad configuration to /etc/ganglia"
-               elog "You may have to remove /etc/gmond.conf yourself."
-               mkdir -p "${D}"/etc/ganglia
-               [ -f "${ROOT}"etc/gmetad.conf ] \
-                       && cp "${ROOT}"etc/gmetad.conf "${D}"/etc/ganglia
-       fi
-}
-
-pkg_postinst() {
-       elog "A default configuration file for gmond has been generated"
-       elog "for you as a template by running:"
-       elog "    /usr/sbin/gmond -t > /etc/ganglia/gmond.conf"
-       elog "customize it from there or provide your own but be aware"
-       elog "the format has changed since 3.0 and so you won't be able"
-       elog "to use your current configuration (if you generated any)"
-       elog "in /etc/gmond.conf directly"
-       elog
-       elog "If you require disk {usage,total} statistics, please run"
-       elog "    emerge --config ${PN}"
-       elog "then check ${ROOT}etc/ganglia/conf.d/diskusage.pyconf"
-       elog "for correctness."
-
-       use minimal || webapp_pkg_postinst
-
-       use python && \
-               python_mod_optimize /usr/$(get_libdir)/ganglia/python_modules/
-}
-
-pkg_prerm() {
-       use minimal || webapp_pkg_prerm
-}
-
-pkg_postrm() {
-       use python && \
-               python_mod_cleanup /usr/$(get_libdir)/ganglia/python_modules/
-       [ -d "${ROOT}"/usr/$(get_libdir)/ganglia ] && \
-               rmdir "${ROOT}"/usr/$(get_libdir)/ganglia 2>/dev/null
-}
-
-pkg_config() {
-       local disk_used_metrics disk_total_metrics i
-       local disk_pyconf="${ROOT}"etc/ganglia/conf.d/diskusage.pyconf
-
-       if ! use python; then
-               einfo "No configuration necessary :)"
-               exit 0
-       fi
-
-       if [ ! -w ${disk_pyconf} ]; then
-               eerror "Cannot write to ${disk_pyconf}"
-               exit 1
-       fi
-
-       ebegin "Generating disk used/total metric configuration to ${disk_pyconf}"
-       disk_used_metrics=$(${ROOT}/usr/sbin/gmond -m | awk '/-disk_used/{print $1}')
-       disk_total_metrics=$(${ROOT}/usr/sbin/gmond -m | awk '/-disk_total/{print $1}')
-       cat > ${disk_pyconf} <<-EOF
-               #/* Disk usage collection groups for
-               #    multidisk python module */
-               #
-               # Autogenerated by pkg_config in the Gentoo ganglia ebuild.
-
-               modules {
-                 module {
-                   name = "multidisk"
-                   language = "python"
-                 }
-               }
-
-               collection_group {
-                 collect_every = 10
-                 time_threshold = 50
-       EOF
-       for i in ${disk_used_metrics}; do
-               printf \
-                       "\n  metric {\n    name = \"%s\"\n    value_threshold = 1.0\n  }" \
-                       ${i} >> ${disk_pyconf}
-       done
-       printf "\n}\n\n" >> ${disk_pyconf}
-
-       # Get the disk total metrics.
-       cat >> ${disk_pyconf} <<-EOF
-               collection_group {
-                 collect_once = yes
-                 time_threshold = 20
-       EOF
-       for i in ${disk_total_metrics}; do
-               printf \
-                       "\n  metric {\n    name = \"%s\"\n  }" \
-                       ${i} >> ${disk_pyconf}
-       done
-       printf "\n}\n" >> ${disk_pyconf}
-}
diff --git a/sys-cluster/ganglia/ganglia-3.1.7.ebuild b/sys-cluster/ganglia/ganglia-3.1.7.ebuild
deleted file mode 100644 (file)
index 0e507fa..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7.ebuild,v 1.1 2010/04/23 03:50:43 jsbronder Exp $
-
-EAPI="3"
-WEBAPP_OPTIONAL="yes"
-inherit eutils multilib webapp python
-
-DESCRIPTION="A scalable distributed monitoring system for clusters and grids"
-HOMEPAGE="http://ganglia.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ganglia/${P}.tar.gz"
-LICENSE="BSD"
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="minimal vhosts python"
-
-DEPEND="
-       dev-libs/confuse
-       dev-libs/expat
-       >=dev-libs/apr-1.0
-       python? ( >=dev-lang/python-2.3 )
-       !dev-db/firebird"
-
-RDEPEND="
-       ${DEPEND}
-       !minimal? ( net-analyzer/rrdtool
-               ${WEBAPP_DEPEND}
-               dev-lang/php[gd,xml,ctype,pcre,cgi]
-               media-fonts/dejavu
-       )"
-
-pkg_setup() {
-       use minimal || webapp_pkg_setup
-}
-
-src_prepare() {
-       # This patch just gives a group to the disk statistics.
-       # I.E. it's just cosmetics
-       epatch "${FILESDIR}"/${PN}-3.1.1-multidisk-group.patch
-}
-
-src_configure() {
-       econf \
-               --enable-gexec \
-               --sysconfdir="${EPREFIX}"/etc/${PN} \
-               $(use_enable python) \
-               $(use_with !minimal gmetad) || die "econf failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       newinitd "${FILESDIR}"/gmond.rc gmond
-       doman {mans/*.1,gmond/*.5} || die "Failed to install manpages"
-       dodoc AUTHORS ChangeLog INSTALL NEWS README || die
-
-       dodir /etc/ganglia/conf.d
-       gmond/gmond -t > "${ED}"/etc/ganglia/gmond.conf
-
-       # Sadly, there is no install target for any of this.
-       if use python; then
-               # We install the multidisk module, but not the configuration
-               # as this needs to be generated later.  See pkg_config
-               local gmond_py="disk/multidisk network/tcpconn"
-               local gmond_py_conf="tcpconn"
-               newdoc gmond/modules/python/README README.python_modules
-               insinto /etc/ganglia/conf.d
-               doins gmond/modules/conf.d/modpython.conf
-               for i in ${gmond_py_conf}; do
-                       doins gmond/python_modules/conf.d/${i}.pyconf
-               done
-               dodir /usr/$(get_libdir)/ganglia/python_modules
-               insinto /usr/$(get_libdir)/ganglia/python_modules
-               for i in ${gmond_py}; do
-                       doins gmond/python_modules/${i}.py
-               done
-       fi
-
-       if ! use minimal; then
-               webapp_src_preinst
-               insinto "${MY_HTDOCSDIR}"
-               doins -r web/*
-               webapp_configfile "${MY_HTDOCSDIR}"/conf.php
-               webapp_src_install
-
-               # webapp_src_install stomps on permissions, so do that
-               # stuff first.
-               insinto /etc/ganglia
-               doins gmetad/gmetad.conf
-               doman mans/gmetad.1
-
-               newinitd "${FILESDIR}"/gmetad.rc gmetad
-               keepdir /var/lib/ganglia/rrds
-               fowners nobody:nobody /var/lib/ganglia/rrds
-       fi
-}
-
-pkg_postinst() {
-       elog "A default configuration file for gmond has been generated"
-       elog "for you as a template by running:"
-       elog "    /usr/sbin/gmond -t > /etc/ganglia/gmond.conf"
-       elog "customize it from there or provide your own but be aware"
-       elog "the format has changed since 3.0 and so you won't be able"
-       elog "to use your current configuration (if you generated any)"
-       elog "in /etc/gmond.conf directly"
-       elog
-       elog "If you require disk {usage,total} statistics, please run"
-       elog "    emerge --config ${PN}"
-       elog "then check ${ROOT}etc/ganglia/conf.d/diskusage.pyconf"
-       elog "for correctness."
-
-       use minimal || webapp_pkg_postinst
-
-       use python && \
-               python_mod_optimize /usr/$(get_libdir)/ganglia/python_modules/
-}
-
-pkg_prerm() {
-       use minimal || webapp_pkg_prerm
-}
-
-pkg_postrm() {
-       use python && \
-               python_mod_cleanup /usr/$(get_libdir)/ganglia/python_modules/
-       [ -d "${ROOT}"/usr/$(get_libdir)/ganglia ] && \
-               rmdir "${ROOT}"/usr/$(get_libdir)/ganglia 2>/dev/null
-}
-
-pkg_config() {
-       local disk_used_metrics disk_total_metrics i
-       local disk_pyconf="${ROOT}"etc/ganglia/conf.d/diskusage.pyconf
-
-       if ! use python; then
-               einfo "No configuration necessary :)"
-               exit 0
-       fi
-
-       if [ ! -w ${disk_pyconf} ]; then
-               eerror "Cannot write to ${disk_pyconf}"
-               exit 1
-       fi
-
-       ebegin "Generating disk used/total metric configuration to ${disk_pyconf}"
-       disk_used_metrics=$(${ROOT}/usr/sbin/gmond -m | awk '/-disk_used/{print $1}')
-       disk_total_metrics=$(${ROOT}/usr/sbin/gmond -m | awk '/-disk_total/{print $1}')
-       cat > ${disk_pyconf} <<-EOF
-               #/* Disk usage collection groups for
-               #    multidisk python module */
-               #
-               # Autogenerated by pkg_config in the Gentoo ganglia ebuild.
-
-               modules {
-                 module {
-                   name = "multidisk"
-                   language = "python"
-                 }
-               }
-
-               collection_group {
-                 collect_every = 10
-                 time_threshold = 50
-       EOF
-       for i in ${disk_used_metrics}; do
-               printf \
-                       "\n  metric {\n    name = \"%s\"\n    value_threshold = 1.0\n  }" \
-                       ${i} >> ${disk_pyconf}
-       done
-       printf "\n}\n\n" >> ${disk_pyconf}
-
-       # Get the disk total metrics.
-       cat >> ${disk_pyconf} <<-EOF
-               collection_group {
-                 collect_once = yes
-                 time_threshold = 20
-       EOF
-       for i in ${disk_total_metrics}; do
-               printf \
-                       "\n  metric {\n    name = \"%s\"\n  }" \
-                       ${i} >> ${disk_pyconf}
-       done
-       printf "\n}\n" >> ${disk_pyconf}
-}