public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-cluster/ganglia: ChangeLog ganglia-3.1.7-r1.ebuild
@ 2010-07-03  2:44 Justin Bronder (jsbronder)
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Bronder (jsbronder) @ 2010-07-03  2:44 UTC (permalink / raw
  To: gentoo-commits

jsbronder    10/07/03 02:44:24

  Modified:             ChangeLog
  Added:                ganglia-3.1.7-r1.ebuild
  Log:
  Update python handling (#316933).  Install pymods as examples per upstream.  Remove warnings about versions that are not in the tree.  Drop now useless pkg_config.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.36                 sys-cluster/ganglia/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ChangeLog?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ChangeLog?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ChangeLog?r1=1.35&r2=1.36

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog	23 Apr 2010 03:50:43 -0000	1.35
+++ ChangeLog	3 Jul 2010 02:44:24 -0000	1.36
@@ -1,6 +1,14 @@
 # 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.35 2010/04/23 03:50:43 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.36 2010/07/03 02:44:24 jsbronder Exp $
+
+*ganglia-3.1.7-r1 (03 Jul 2010)
+
+  03 Jul 2010; Justin Bronder <jsbronder@gentoo.org>
+  +ganglia-3.1.7-r1.ebuild:
+  Update python handling (#316933). Install pymods as examples per upstream.
+  Remove warnings about versions that are not in the tree. Drop now useless
+  pkg_config.
 
 *ganglia-3.1.7 (23 Apr 2010)
 



1.1                  sys-cluster/ganglia/ganglia-3.1.7-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r1.ebuild?rev=1.1&content-type=text/plain

Index: ganglia-3.1.7-r1.ebuild
===================================================================
# 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-r1.ebuild,v 1.1 2010/07/03 02:44:24 jsbronder Exp $

EAPI="3"
WEBAPP_OPTIONAL="yes"

PYTHON_DEPEND="python? 2"
WEBAPP_MANUAL_SLOT="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"

SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="minimal vhosts python examples"

DEPEND="
	dev-libs/confuse
	dev-libs/expat
	>=dev-libs/apr-1.0
	!dev-db/firebird"

RDEPEND="
	${DEPEND}
	!minimal? ( net-analyzer/rrdtool
		${WEBAPP_DEPEND}
		dev-lang/php[gd,xml,ctype,pcre,cgi]
		media-fonts/dejavu
	)"

pkg_setup() {
	if use python; then
		python_set_active_version 2
		python_pkg_setup
	fi
	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() {
	local exdir=/usr/share/doc/${P}

	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

	if use examples; then
		insinto ${exdir}/cmod-examples
		doins gmond/modules/example/*.c
		if use python; then
			# Installing as an examples per upstream.
			insinto ${exdir}/pymod-examples
			doins gmond/python_modules/*/*.py
			insinto ${exdir}/pymod-examples/conf.d
			doins gmond/python_modules/conf.d/*.pyconf
		fi
	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"

	use minimal || webapp_pkg_postinst
}

pkg_prerm() {
	use minimal || webapp_pkg_prerm
}

pkg_postrm() {
	[ -d "${ROOT}"/usr/$(get_libdir)/ganglia ] && \
		rmdir "${ROOT}"/usr/$(get_libdir)/ganglia 2>/dev/null
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-cluster/ganglia: ChangeLog ganglia-3.1.7-r1.ebuild
@ 2010-07-03 15:34 Matti Bickel (mabi)
  0 siblings, 0 replies; 2+ messages in thread
From: Matti Bickel (mabi) @ 2010-07-03 15:34 UTC (permalink / raw
  To: gentoo-commits

mabi        10/07/03 15:34:23

  Modified:             ChangeLog ganglia-3.1.7-r1.ebuild
  Log:
  update RDEPEND for bug #298205
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.38                 sys-cluster/ganglia/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ChangeLog?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ChangeLog?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ChangeLog?r1=1.37&r2=1.38

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog	3 Jul 2010 02:45:36 -0000	1.37
+++ ChangeLog	3 Jul 2010 15:34:23 -0000	1.38
@@ -1,6 +1,9 @@
 # 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.37 2010/07/03 02:45:36 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.38 2010/07/03 15:34:23 mabi Exp $
+
+  03 Jul 2010; Matti Bickel <mabi@gentoo.org> ganglia-3.1.7-r1.ebuild:
+  update RDEPEND for php-5.3 (bug #298205)
 
   03 Jul 2010; Justin Bronder <jsbronder@gentoo.org>
   -ganglia-3.1.2-r1.ebuild, -ganglia-3.1.7.ebuild:



1.2                  sys-cluster/ganglia/ganglia-3.1.7-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r1.ebuild?r1=1.1&r2=1.2

Index: ganglia-3.1.7-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ganglia-3.1.7-r1.ebuild	3 Jul 2010 02:44:24 -0000	1.1
+++ ganglia-3.1.7-r1.ebuild	3 Jul 2010 15:34:23 -0000	1.2
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2010/07/03 02:44:24 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r1.ebuild,v 1.2 2010/07/03 15:34:23 mabi Exp $
 
 EAPI="3"
 WEBAPP_OPTIONAL="yes"
@@ -29,7 +29,8 @@
 	${DEPEND}
 	!minimal? ( net-analyzer/rrdtool
 		${WEBAPP_DEPEND}
-		dev-lang/php[gd,xml,ctype,pcre,cgi]
+		dev-lang/php[gd,xml,ctype,cgi]
+		|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
 		media-fonts/dejavu
 	)"
 






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-07-03 15:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-03  2:44 [gentoo-commits] gentoo-x86 commit in sys-cluster/ganglia: ChangeLog ganglia-3.1.7-r1.ebuild Justin Bronder (jsbronder)
  -- strict thread matches above, loose matches on Subject: below --
2010-07-03 15:34 Matti Bickel (mabi)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox