[gentoo-commits] proj/sci:master commit in: sys-fs/ocfs2-tools/

["Justin Lecher" <jlec@gentoo.org>]

commit:     8b0061655baa6fe5439a45b68d2f4b88eadec8a8
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  7 11:09:25 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 11:09:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8b006165

QA things

(Portage version: 2.2.0_alpha26/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sys-fs/ocfs2-tools/ChangeLog                |   11 ++++++++
 sys-fs/ocfs2-tools/metadata.xml             |    8 ++++++
 sys-fs/ocfs2-tools/ocfs2-tools-1.4.4.ebuild |   37 ++++++++++++++++-----------
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/sys-fs/ocfs2-tools/ChangeLog b/sys-fs/ocfs2-tools/ChangeLog
new file mode 100644
index 0000000..98dbc50
--- /dev/null
+++ b/sys-fs/ocfs2-tools/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for sys-fs/ocfs2-tools
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  07 Mar 2011; Justin Lecher <jlec@gentoo.org> ocfs2-tools-1.4.4.ebuild,
+  +metadata.xml:
+  QA things
+
+  07 Mar 2011; Justin Lecher <jlec@gentoo.org> ocfs2-tools-1.4.4.ebuild:
+  Correct Slots for gtk 3 introduction to tree
+

diff --git a/sys-fs/ocfs2-tools/metadata.xml b/sys-fs/ocfs2-tools/metadata.xml
new file mode 100644
index 0000000..efb490d
--- /dev/null
+++ b/sys-fs/ocfs2-tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+</maintainer>
+</pkgmetadata>

diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.4.4.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.4.4.ebuild
index a2c7148..150093f 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.4.4.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.4.4.ebuild
@@ -1,34 +1,43 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header$
+# $Header: $
 
-EAPI="4"
+EAPI="3"
 
-inherit eutils
+PYTHON_DEPEND="2"
+
+inherit eutils python
 
 PV_MAJOR="${PV%%.*}"
 PV_MINOR="${PV#*.}"
 PV_MINOR="${PV_MINOR%%.*}"
+
 DESCRIPTION="Support programs for the Oracle Cluster Filesystem 2"
 HOMEPAGE="http://oss.oracle.com/projects/ocfs2-tools/"
 SRC_URI="http://oss.oracle.com/projects/ocfs2-tools/dist/files/source/v${PV_MAJOR}.${PV_MINOR}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="X"
+
 # (#142216) build system's broke, always requires glib for debugfs utility
-RDEPEND="X? (
-		=x11-libs/gtk+-2*
-		>=dev-lang/python-2
-		>=dev-python/pygtk-2
-	)
+RDEPEND="
+	dev-libs/glib:2
 	sys-cluster/openais
 	sys-cluster/dlm-lib
 	sys-cluster/cman-lib
-	>=dev-libs/glib-2.2.3
-	sys-fs/e2fsprogs"
+	sys-fs/e2fsprogs
+	X? (
+		x11-libs/gtk+:2
+		dev-python/pygtk:2
+		)"
 DEPEND="${RDEPEND}"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	epatch "${FILESDIR}/gcc45-ftbfs.patch"
 }
@@ -38,12 +47,11 @@ src_configure() {
 
 	econf \
 		$(use_enable X ocfs2console) \
-		${myconf} \
-		|| die "Failed to configure"
+		${myconf}
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "Failed to install"
+	emake DESTDIR="${D}" install || die "Failed to install"
 
 	dodoc \
 		COPYING CREDITS MAINTAINERS README README.O2CB debugfs.ocfs2/README \
@@ -63,4 +71,3 @@ pkg_postinst() {
 	elog "Read ${ROOT}usr/share/doc/${P}/INSTALL.GENTOO* for instructions"
 	elog "about how to install, configure and run ocfs2."
 }
-