[gentoo-commits] proj/sci:master commit in: sys-cluster/ganglia_jobmonarch/

[gentoo-commits] proj/sci:master commit in: sys-cluster/ganglia_jobmonarch/

[Alexey Shvetsov]

commit:     bea2dce43578f3bc0df35db1a8c50d4398c8bcf7
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 18:02:10 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 18:02:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bea2dce4

[sys-cluster/ganglia_jobmonarch] Dont need to compile

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 .../ganglia_jobmonarch-0.3.1.ebuild                |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild b/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
index 5d7f801..b7e0e1d 100644
--- a/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
+++ b/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
@@ -32,6 +32,10 @@ pkg_setup() {
 	webapp_pkg_setup
 }
 
+src_compile() {
+	einfo "Nothing to do"
+}
+
 src_install() {
 	insinto /etc
 	doins "${S}/jobmond/jobmond.conf"

[gentoo-commits] proj/sci:master commit in: sys-cluster/ganglia_jobmonarch/

[Justin Lecher]

commit:     3f7581d96fb010ca19225d7861ffafb7966dac97
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 09:56:40 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 09:56:40 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=3f7581d9

sys-cluster/ganglia_jobmonarch: Fix SRC_URI

Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild b/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
index b846c3b..c5d8a29 100644
--- a/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
+++ b/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
@@ -10,7 +10,7 @@ inherit eutils webapp depend.php python-r1
 
 DESCRIPTION="Ganglia addons for Torque"
 HOMEPAGE="https://oss.trac.surfsara.nl/jobmonarch/"
-SRC_URI="http://ftp.surfsara.nl/pub/outgoing/${PN}/${PV}/${P}.tar.bz2"
+SRC_URI="http://ftp.surfsara.nl/pub/outgoing/jobmonarch/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"

[gentoo-commits] proj/sci:master commit in: sys-cluster/ganglia_jobmonarch/

[Justin Lecher]

commit:     7ed57d49372f38998685d248b83343fdb2118a13
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 09:47:50 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 09:47:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7ed57d49

sys-cluster/ganglia_jobmonarch: Fix for EAPI=5

Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../ganglia_jobmonarch-0.3.1.ebuild                | 35 ++++++++++++----------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild b/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
index ede0685..b846c3b 100644
--- a/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
+++ b/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
@@ -1,26 +1,30 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=5
 
+PYTHON_COMPAT=( python2_7 )
 WEBAPP_OPTIONAL="yes"
-inherit eutils webapp depend.php
+inherit eutils webapp depend.php python-r1
 
 DESCRIPTION="Ganglia addons for Torque"
-HOMEPAGE="https://subtrac.sara.nl/oss/jobmonarch/"
-SRC_URI="ftp://ftp.sara.nl/pub/outgoing/jobmonarch/latest/${P}.tar.bz2"
+HOMEPAGE="https://oss.trac.surfsara.nl/jobmonarch/"
+SRC_URI="http://ftp.surfsara.nl/pub/outgoing/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="vhosts"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 WEBAPP_MANUAL_SLOT="yes"
 
 GANGLIA="ganglia"
 JOBMONARCH="ganglia_jobmonarch"
 
-DEPEND="
+DEPEND="${PYTHON_DEPS}
 	sys-cluster/ganglia
 	dev-lang/php[gd,xml,ctype]
 	media-libs/gd
@@ -46,21 +50,20 @@ src_install() {
 
 	dodir /var/lib/jobarchive
 
-	insopts -m0755
-	insinto /sbin
-	doins "${S}/jobmond/jobmond.py"
-	doins "${S}/jobarchived/jobarchived.py"
-	doins "${S}/jobarchived/pipe_jobarchived.py"
-	doins "${FILESDIR}/job_monarch_link.sh"
+	python_scriptinto /usr/sbin
+	python_foreach_impl python_doscript \
+		"${S}/jobmond/jobmond.py" \
+		"${S}/jobarchived/jobarchived.py" \
+		"${S}/jobarchived/pipe_jobarchived.py" \
+		"${FILESDIR}/job_monarch_link.sh"
 
 	newinitd "${FILESDIR}/jobmond.initd" jobmond
 	newinitd "${FILESDIR}/jobarchived.initd" jobarchived
 
-	cd "${S}/web/templates/job_monarch/"
-	rm images/*
-	rmdir images
+	cd "${S}/web/templates/job_monarch/" || die
+	rm -r images || die
 
-	cd "${S}"
+	cd "${S}" || die
 	webapp_src_preinst
 	insinto "${MY_HTDOCSDIR}"
 	doins -r web/*