diff options
author | 2011-02-11 22:07:41 +0000 | |
---|---|---|
committer | 2011-02-11 22:07:41 +0000 | |
commit | eabe017d52951b7367fe11a220931728f5388d66 (patch) | |
tree | 4787b5113653baf7ea5f69c638c5c23765d2e2fd | |
parent | sys-fs/ocfs2-tools: version bump, digged in attic... (diff) | |
download | pva-eabe017d52951b7367fe11a220931728f5388d66.tar.gz pva-eabe017d52951b7367fe11a220931728f5388d66.tar.bz2 pva-eabe017d52951b7367fe11a220931728f5388d66.zip |
sys-fs/ocfs2-tools: python fixes, updated conf.d/ocfs2
svn path=/; revision=472
-rw-r--r-- | sys-fs/ocfs2-tools/Manifest | 4 | ||||
-rw-r--r-- | sys-fs/ocfs2-tools/files/ocfs2.conf | 182 | ||||
-rw-r--r-- | sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild | 11 |
3 files changed, 16 insertions, 181 deletions
diff --git a/sys-fs/ocfs2-tools/Manifest b/sys-fs/ocfs2-tools/Manifest index b4e1599..d426e74 100644 --- a/sys-fs/ocfs2-tools/Manifest +++ b/sys-fs/ocfs2-tools/Manifest @@ -1,5 +1,5 @@ AUX INSTALL.GENTOO 3933 RMD160 2b6adb01de96dbd503f07a5d067ede79416e5cc1 SHA1 8d4a006c699741ab584096d603d1158a6cba3e10 SHA256 6b5962e4f1b3a463c302bb08380b4b992fdb5eb88150a803bd22b24b7df64027 -AUX ocfs2.conf 4400 RMD160 01b052775dc31f290a51940f8dec9abf4764038a SHA1 979da795b8290260f395df413e56a4b2418f36d2 SHA256 4ceb77ebda201ccf00dea66db4791848653daed601cfcf97301f5ba8b16549aa +AUX ocfs2.conf 333 RMD160 26d8edef7b1d1f1b5311ccc25c91559cf3c292ae SHA1 0e520288a9da9e3ce2d05a50115e324925a7b8d8 SHA256 082109a55c563eb2022837988eb26e90507a835423cdd34ca6a1ad389cc327ab AUX ocfs2.init 2988 RMD160 a155616b632419fc54443e45b69a248d8660520c SHA1 5b5e23fdb617f1f6ca7122588e9d832966e804df SHA256 fecbc0b8ffd12b7f354e360296a24cb35bf6dcb2bcec77ba8ec5b9028232589c DIST ocfs2-tools-1.6.4.tar.gz 823914 RMD160 c8b65f4c26017e257c4190322d6df64e9ef7925b SHA1 1409a13f63b55457a474c5f5662260e420452ee9 SHA256 dda9db208312e3e5f4f55ee77e66e7b35b9cc10421bc02065a6c168e42b24755 -EBUILD ocfs2-tools-1.6.4.ebuild 1694 RMD160 84509e0a7c051737c71c6dfce83ec9a3297b2f00 SHA1 f4d2703a7b3692c0843e382813f747ea9818a9a9 SHA256 9652c506fe29f8aa47270db6fa203f76b7dcc1c29abac7bcdadafd0f618366f4 +EBUILD ocfs2-tools-1.6.4.ebuild 1745 RMD160 b295baea5195a5ec9e71ac6ac80b0a14dda53d14 SHA1 7206299643f21fe118c448f8a9c0ce34352d8d58 SHA256 690b9ac64413d585c77670e235c0e59d1e6da74c2252732d48fe0bd6cd8437d7 diff --git a/sys-fs/ocfs2-tools/files/ocfs2.conf b/sys-fs/ocfs2-tools/files/ocfs2.conf index c951737..29b236d 100644 --- a/sys-fs/ocfs2-tools/files/ocfs2.conf +++ b/sys-fs/ocfs2-tools/files/ocfs2.conf @@ -1,178 +1,6 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/files/Attic/ocfs2.conf,v 1.2 2009/10/08 09:03:35 flameeyes dead $ - - - - - - - - - - -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" -"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<!-- ViewVC :: http://www.viewvc.org/ --> -<head> -<title>[gentoo-x86] Contents of /sys-fs/ocfs2-tools/files/ocfs2.conf</title> -<meta name="generator" content="ViewVC 1.1.8" /> -<link rel="shortcut icon" href="/cgi-bin/viewvc.cgi/*docroot*/images/favicon.ico" type="image/x-icon" /> -<link rel="stylesheet" href="/cgi-bin/viewvc.cgi/*docroot*/styles.css" type="text/css" /> - -</head> -<body> -<div class="vc_navheader"> -<table><tr> -<td><strong><a href="/cgi-bin/viewvc.cgi?hideattic=0"><span class="pathdiv">/</span></a><a href="/cgi-bin/viewvc.cgi/gentoo-x86/?hideattic=0">[gentoo-x86]</a><span class="pathdiv">/</span><a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-fs/?hideattic=0">sys-fs</a><span class="pathdiv">/</span><a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-fs/ocfs2-tools/?hideattic=0">ocfs2-tools</a><span class="pathdiv">/</span><a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-fs/ocfs2-tools/files/?hideattic=0">files</a><span class="pathdiv">/</span><a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-fs/ocfs2-tools/files/ocfs2.conf?hideattic=0&view=log">ocfs2.conf</a></strong></td> -<td style="text-align: right;"> -</td> -</tr></table> -</form> -</div> -<div style="float: right; padding: 5px;"><a href="http://www.gentoo.org/" title="Gentoo Linux"><img src="/cgi-bin/viewvc.cgi/*docroot*/images/gentoo-new.gif" alt="Gentoo" width="182" height="59" /></a></div> -<h1>Contents of /sys-fs/ocfs2-tools/files/ocfs2.conf</h1> - -<p style="margin:0;"> - -<a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-fs/ocfs2-tools/files/?hideattic=0"><img src="/cgi-bin/viewvc.cgi/*docroot*/images/back_small.png" class="vc_icon" alt="Parent Directory" /> Parent Directory</a> - -| <a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-fs/ocfs2-tools/files/ocfs2.conf?hideattic=0&view=log"><img src="/cgi-bin/viewvc.cgi/*docroot*/images/log.png" class="vc_icon" alt="Revision Log" /> Revision Log</a> - - - - -</p> - -<hr /> -<div class="vc_summary"> -Revision <strong>1.2</strong> - -(<a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-fs/ocfs2-tools/files/ocfs2.conf?annotate=1.2&hideattic=0"><strong>show annotations</strong></a>) -(<a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-fs/ocfs2-tools/files/ocfs2.conf?revision=1.2"><strong>download</strong></a>) - - -<br /><em>Thu Oct 8 09:03:35 2009 UTC</em> -(16 months ago) -by <em>flameeyes</em> - - -<br />Branch: <strong>MAIN</strong> - - -<br />CVS Tags: <strong>HEAD</strong> - - - - -<br />Changes since <strong>1.1: +1 -1 lines</strong> - - - -<br />File MIME type: text/plain - - - - - - -<br /><strong><em>FILE REMOVED</em></strong> - - -<pre class="vc_log">Remove packages slated for QA removal today. -</pre> - -</div> - - - - - - -<div id="vc_file"> -<table cellspacing="0" cellpadding="0"> - - - - - - - - -<tr class="vc_row_odd" id="l1"> -<td class="vc_file_line_number">1</td> - -<td class="vc_file_line_text"><span class="pygments-"># Copyright 1999-2006 Gentoo Foundation</span> -</td> -</tr> - - - - -<tr class="vc_row_odd" id="l2"> -<td class="vc_file_line_number">2</td> - -<td class="vc_file_line_text"><span class="pygments-"># Distributed under the terms of the GNU General Public License v2</span> -</td> -</tr> - - - - -<tr class="vc_row_odd" id="l3"> -<td class="vc_file_line_number">3</td> - -<td class="vc_file_line_text"><span class="pygments-"># $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/files/Attic/ocfs2.conf,v 1.2 2009/10/08 09:03:35 flameeyes dead $</span> -</td> -</tr> - - - - -<tr class="vc_row_odd" id="l4"> -<td class="vc_file_line_number">4</td> - -<td class="vc_file_line_text"> -</td> -</tr> - - - - -<tr class="vc_row_odd" id="l5"> -<td class="vc_file_line_number">5</td> - -<td class="vc_file_line_text"><span class="pygments-"># Put your cluster names here, separated by space, ie.</span> -</td> -</tr> - - - - -<tr class="vc_row_odd" id="l6"> -<td class="vc_file_line_number">6</td> - -<td class="vc_file_line_text"><span class="pygments-"># OCFS2_CLUSTER="cluster1 admincluster cluster2" </span> -</td> -</tr> - - -</table> -</div> - - - - - -<hr /> -<table> -<tr> -<td> </td> -<td style="text-align: right;"><strong><a href="/cgi-bin/viewvc.cgi/*docroot*/help_rootview.html">ViewVC Help</a></strong></td> -</tr> -<tr> -<td>Powered by <a href="http://viewvc.tigris.org/">ViewVC 1.1.8</a></td> -<td style="text-align: right;"> </td> -</tr> -</table> -</body> -</html> - +# Put your cluster names here, separated by space, ie. +# OCFS2_CLUSTER="cluster1 admincluster cluster2" diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild index f80ce8b..e7718fc 100644 --- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild +++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild @@ -3,6 +3,10 @@ # $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/Attic/ocfs2-tools-1.2.1.ebuild,v 1.5 2009/10/08 09:03:35 flameeyes dead $ EAPI="3" + +PYTHON_DEPEND="X? 2" +inherit python + PV_MAJOR="${PV%%.*}" PV_MINOR="${PV#*.}" PV_MINOR="${PV_MINOR%%.*}" @@ -19,8 +23,7 @@ IUSE="X" RDEPEND=" X? ( x11-libs/gtk+:2 - >=dev-lang/python-2 - >=dev-python/pygtk-2 + dev-python/pygtk:2 ) sys-apps/util-linux >=dev-libs/glib-2.2.3 @@ -34,6 +37,10 @@ src_configure() { --enable-dynamic-ctl } +src_compile() { + emake -j1 || die +} + src_install() { make DESTDIR="${D}" install || die "Failed to install" |