Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Alexey Shvetsov <alexxy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/ganglia_jobmonarch/files/, sys-cluster/ganglia_jobmonarch/
Date: Wed, 29 Jun 2011 18:00:09
Message-Id: d7b1bb8b62f83fc37f79c835b62c4e3c4b86dc00.alexxy@gentoo
1 commit: d7b1bb8b62f83fc37f79c835b62c4e3c4b86dc00
2 Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 29 17:59:35 2011 +0000
4 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 29 17:59:35 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d7b1bb8b
7
8 [sys-cluster/ganglia_jobmonarch] Drop unneded patch
9
10 (Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key F82F92E6)
11
12 ---
13 .../files/ganglia_jobmonarch-0.3.1-fix.patch | 79 --------------------
14 .../ganglia_jobmonarch-0.3.1.ebuild | 4 -
15 2 files changed, 0 insertions(+), 83 deletions(-)
16
17 diff --git a/sys-cluster/ganglia_jobmonarch/files/ganglia_jobmonarch-0.3.1-fix.patch b/sys-cluster/ganglia_jobmonarch/files/ganglia_jobmonarch-0.3.1-fix.patch
18 deleted file mode 100644
19 index e23b12a..0000000
20 --- a/sys-cluster/ganglia_jobmonarch/files/ganglia_jobmonarch-0.3.1-fix.patch
21 +++ /dev/null
22 @@ -1,79 +0,0 @@
23 -diff -Naur ganglia_jobmonarch-0.3.1/web/addons/job_monarch/host_view.php ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/host_view.php
24 ---- ganglia_jobmonarch-0.3.1/web/addons/job_monarch/host_view.php 2007-07-06 17:05:08.000000000 +0200
25 -+++ ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/host_view.php 2008-04-14 19:47:12.000000000 +0200
26 -@@ -73,8 +73,8 @@
27 - $trd = new TarchRrdGraph( $clustername, $hostname );
28 - $rrdirs = $trd->getRrdDirs( $period_start, $period_stop );
29 -
30 -- $longtitle = "Batch Archive Node Report :: Powered by Job Monarch!";
31 -- $title = "Batch Archive Node Report";
32 -+ $longtitle = "Host Node";
33 -+ $title = "Host Node";
34 -
35 - makeHeader( 'host_view', $title, $longtitle );
36 -
37 -diff -Naur ganglia_jobmonarch-0.3.1/web/addons/job_monarch/libtoga.php ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/libtoga.php
38 ---- ganglia_jobmonarch-0.3.1/web/addons/job_monarch/libtoga.php 2008-02-28 09:33:32.000000000 +0100
39 -+++ ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/libtoga.php 2008-04-16 20:09:11.000000000 +0200
40 -@@ -1433,7 +1433,7 @@
41 - //
42 - $colorblue = imageColorAllocate( $image, 0, 0, 255 );
43 -
44 -- imageString( $image, $font, 2, 2, "Monarch Joblist - cluster: ".$this->clustername, $colorblue );
45 -+ imageString( $image, $font, 2, 2, "Joblist - cluster: ".$this->clustername, $colorblue );
46 - }
47 -
48 - if( $this->isBig() && ( isset( $SORT_XLABEL ) || isset( $SORT_YLABEL ) ) )
49 -@@ -1583,7 +1583,7 @@
50 -
51 - $colorblue = imageColorAllocate( $image, 0, 0, 255 );
52 -
53 -- imageString( $image, $font, 2, 2, "Monarch Joblist - cluster: ".$this->clustername, $colorblue );
54 -+ imageString( $image, $font, 2, 2, "Joblist - cluster: ".$this->clustername, $colorblue );
55 - }
56 -
57 - for( $n = 0; $n < $node_rows; $n++ ) {
58 -@@ -1810,7 +1810,7 @@
59 -
60 - $colorblue = imageColorAllocate( $this->image, 0, 0, 255 );
61 -
62 -- imageString( $this->image, $this->font, 1, $this->y_offset, "Monarch Joblist - host: ".$this->host, $colorblue );
63 -+ imageString( $this->image, $this->font, 1, $this->y_offset, "Joblist - host: ".$this->host, $colorblue );
64 - $this->newLineOffset();
65 -
66 - $this->drawHeader();
67 -diff -Naur ganglia_jobmonarch-0.3.1/web/addons/job_monarch/search.php ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/search.php
68 ---- ganglia_jobmonarch-0.3.1/web/addons/job_monarch/search.php 2007-07-06 17:06:44.000000000 +0200
69 -+++ ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/search.php 2008-04-14 19:53:38.000000000 +0200
70 -@@ -261,8 +261,8 @@
71 - //printf("start = %s stop = %s\n", $start, $stop );
72 - //printf("m %s\n", $metricname );
73 -
74 -- $longtitle = "Batch Archive Search :: Powered by Job Monarch!";
75 -- $title = "Batch Archive Search";
76 -+ $longtitle = "Archive Search";
77 -+ $title = "Archive Search";
78 -
79 - makeHeader( 'search', $title, $longtitle );
80 -
81 -diff -Naur ganglia_jobmonarch-0.3.1/web/addons/job_monarch/templates/header.tpl ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/templates/header.tpl
82 ---- ganglia_jobmonarch-0.3.1/web/addons/job_monarch/templates/header.tpl 2007-04-23 19:17:40.000000000 +0200
83 -+++ ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/templates/header.tpl 2008-08-06 19:21:50.000000000 +0200
84 -@@ -1,7 +1,7 @@
85 - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
86 - <HTML>
87 - <HEAD>
88 --<TITLE>Ganglia :: {longpage_title}</TITLE>
89 -+<TITLE>Ganglia Batch Report of {longpage_title}</TITLE>
90 - <META http-equiv="Content-type" content="text/html; charset=utf-8">
91 - <META http-equiv="refresh" content="{refresh}{redirect}" >
92 - <LINK rel="stylesheet" href="./styles.css" type="text/css">
93 -@@ -34,7 +34,7 @@
94 - <TR BGCOLOR="#DDDDDD">
95 - <TD BGCOLOR="#DDDDDD">
96 - <FONT SIZE="+1">
97 -- <B>{page_title} for {date}</B>
98 -+ <B>{page_title} @ {date}</B>
99 - </FONT>
100 - </TD>
101 - <TD BGCOLOR="#DDDDDD" ALIGN="RIGHT">
102
103 diff --git a/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild b/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
104 index dc1b010..5d7f801 100644
105 --- a/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
106 +++ b/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
107 @@ -32,10 +32,6 @@ pkg_setup() {
108 webapp_pkg_setup
109 }
110
111 -src_prepare() {
112 - epatch "${FILESDIR}"/${P}-fix.patch
113 -}
114 -
115 src_install() {
116 insinto /etc
117 doins "${S}/jobmond/jobmond.conf"
Report Message
Find on MARC Find on Google Groups