public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sys-fs/ocfs2-tools/
@ 2011-03-07 12:01 Justin Lecher
  0 siblings, 0 replies; 10+ messages in thread
From: Justin Lecher @ 2011-03-07 12:01 UTC (permalink / raw
  To: gentoo-commits

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."
 }
-



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

* [gentoo-commits] proj/sci:master commit in: sys-fs/ocfs2-tools/
@ 2011-06-22 14:42 Alexey Shvetsov
  0 siblings, 0 replies; 10+ messages in thread
From: Alexey Shvetsov @ 2011-06-22 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     9ccae397af9691f4aac45bafe178e736e5f5077e
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 14:41:46 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 14:41:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9ccae397

Update ocfs2

---
 sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild |   58 +++++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
new file mode 100644
index 0000000..26aaeaf
--- /dev/null
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+PYTHON_DEPEND="gtk? 2"
+inherit python base versionator
+
+DESCRIPTION="Support programs for the Oracle Cluster Filesystem 2"
+HOMEPAGE="http://oss.oracle.com/projects/ocfs2-tools/"
+SRC_URI="http://oss.oracle.com/projects/${PN}/dist/files/source/v$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gtk"
+
+RDEPEND="
+	sys-apps/util-linux
+	sys-cluster/cman-lib
+	|| ( sys-cluster/corosync sys-cluster/openais )
+	sys-fs/e2fsprogs
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-process/psmisc
+	gtk? (
+		dev-python/pygtk
+	)
+"
+# 99% of deps this thing has is automagic
+# specialy cluster things corosync/pacemaker
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-gcc45.patch"
+	"${FILESDIR}/${PV}-cpg.patch"
+)
+
+DOCS=(
+	"${S}/documentation/samples/cluster.conf"
+	"${S}/documentation/users_guide.txt"
+)
+
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug debug) \
+		$(use_enable debug debugexe) \
+		$(use_enable gtk ocfs2console) \
+		--enable-dynamic-fsck \
+		--enable-dynamic-ctl
+}



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

* [gentoo-commits] proj/sci:master commit in: sys-fs/ocfs2-tools/
@ 2011-06-22 14:49 Alexey Shvetsov
  0 siblings, 0 replies; 10+ messages in thread
From: Alexey Shvetsov @ 2011-06-22 14:49 UTC (permalink / raw
  To: gentoo-commits

commit:     623531ab335c121790bc21852ca835454279b4e2
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 14:48:45 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 14:48:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=623531ab

Update patches

---
 sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

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 26aaeaf..2c67aba 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
@@ -31,11 +31,6 @@ RDEPEND="
 # specialy cluster things corosync/pacemaker
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PV}-gcc45.patch"
-	"${FILESDIR}/${PV}-cpg.patch"
-)
-
 DOCS=(
 	"${S}/documentation/samples/cluster.conf"
 	"${S}/documentation/users_guide.txt"



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

* [gentoo-commits] proj/sci:master commit in: sys-fs/ocfs2-tools/
@ 2011-06-22 14:52 Alexey Shvetsov
  0 siblings, 0 replies; 10+ messages in thread
From: Alexey Shvetsov @ 2011-06-22 14:52 UTC (permalink / raw
  To: gentoo-commits

commit:     7d49abf3674a36c9a1d7bda596795aa1e2bd32c6
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 14:51:44 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 14:51:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7d49abf3

Update deps

---
 sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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 2c67aba..71c1d44 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
@@ -18,7 +18,7 @@ IUSE="debug gtk"
 RDEPEND="
 	sys-apps/util-linux
 	sys-cluster/cman-lib
-	|| ( sys-cluster/corosync sys-cluster/openais )
+	|| ( sys-cluster/corosync sys-cluster/openais sys-cluster/dlm-lib )
 	sys-fs/e2fsprogs
 	sys-libs/ncurses
 	sys-libs/readline



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

* [gentoo-commits] proj/sci:master commit in: sys-fs/ocfs2-tools/
@ 2011-06-22 15:01 Alexey Shvetsov
  0 siblings, 0 replies; 10+ messages in thread
From: Alexey Shvetsov @ 2011-06-22 15:01 UTC (permalink / raw
  To: gentoo-commits

commit:     60767a345a6c8d975dbf7b8834569c7c22657974
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 15:00:45 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 15:00:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=60767a34

Make use of external locking optional

---
 sys-fs/ocfs2-tools/metadata.xml             |    3 +++
 sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild |    6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys-fs/ocfs2-tools/metadata.xml b/sys-fs/ocfs2-tools/metadata.xml
index efb490d..a815fb9 100644
--- a/sys-fs/ocfs2-tools/metadata.xml
+++ b/sys-fs/ocfs2-tools/metadata.xml
@@ -5,4 +5,7 @@
 <maintainer>
   <email>sci@gentoo.org</email>
 </maintainer>
+<use>
+	<flag name='extrenal'>Enable external locking</flag>
+</use>
 </pkgmetadata>

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 71c1d44..bb85668 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
@@ -13,12 +13,14 @@ SRC_URI="http://oss.oracle.com/projects/${PN}/dist/files/source/v$(get_version_c
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug gtk"
+IUSE="debug gtk external"
 
 RDEPEND="
 	sys-apps/util-linux
 	sys-cluster/cman-lib
-	|| ( sys-cluster/corosync sys-cluster/openais sys-cluster/dlm-lib )
+	external?  (
+				|| ( sys-cluster/corosync sys-cluster/openais sys-cluster/dlm-lib )
+				)
 	sys-fs/e2fsprogs
 	sys-libs/ncurses
 	sys-libs/readline



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

* [gentoo-commits] proj/sci:master commit in: sys-fs/ocfs2-tools/
@ 2011-06-22 19:48 Alexey Shvetsov
  0 siblings, 0 replies; 10+ messages in thread
From: Alexey Shvetsov @ 2011-06-22 19:48 UTC (permalink / raw
  To: gentoo-commits

commit:     43e9ae44851283e458b7d5fb24be5cc17c1660ec
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 19:47:05 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 19:47:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=43e9ae44

Fix typo

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

---
 sys-fs/ocfs2-tools/metadata.xml             |    2 +-
 sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-fs/ocfs2-tools/metadata.xml b/sys-fs/ocfs2-tools/metadata.xml
index a815fb9..3807468 100644
--- a/sys-fs/ocfs2-tools/metadata.xml
+++ b/sys-fs/ocfs2-tools/metadata.xml
@@ -6,6 +6,6 @@
   <email>sci@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='extrenal'>Enable external locking</flag>
+	<flag name='external'>Enable external locking</flag>
 </use>
 </pkgmetadata>

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 68e27a5..4b6420b 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -55,6 +55,6 @@ src_configure() {
 }
 
 src_install() {
-	base-src_install
+	default
 	newinitd "${FILESDIR}/ocfs2.init"
 }



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

* [gentoo-commits] proj/sci:master commit in: sys-fs/ocfs2-tools/
@ 2011-06-22 19:52 Alexey Shvetsov
  0 siblings, 0 replies; 10+ messages in thread
From: Alexey Shvetsov @ 2011-06-22 19:52 UTC (permalink / raw
  To: gentoo-commits

commit:     548805f119426093a94b8cbb957ecc3ad2dbb915
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 19:51:53 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 19:51:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=548805f1

One more fix

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

---
 sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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 4b6420b..67b1bc9 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
@@ -55,6 +55,6 @@ src_configure() {
 }
 
 src_install() {
-	default
-	newinitd "${FILESDIR}/ocfs2.init"
+	emake DESTDIR="${D}" install || die
+	newinitd "${FILESDIR}/ocfs2.init" || die
 }



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

* [gentoo-commits] proj/sci:master commit in: sys-fs/ocfs2-tools/
@ 2011-06-22 19:56 Alexey Shvetsov
  0 siblings, 0 replies; 10+ messages in thread
From: Alexey Shvetsov @ 2011-06-22 19:56 UTC (permalink / raw
  To: gentoo-commits

commit:     3657aeceac3fa2a7ff0a29951f68c715b52e17e8
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 19:56:03 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 19:56:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3657aece

And one more

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

---
 sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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 67b1bc9..21a324d 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
@@ -56,5 +56,5 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	newinitd "${FILESDIR}/ocfs2.init" || die
+	newinitd "${FILESDIR}/ocfs2.init" ocfs2  || die
 }



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

* [gentoo-commits] proj/sci:master commit in: sys-fs/ocfs2-tools/
@ 2011-06-24 17:09 Justin Lecher
  0 siblings, 0 replies; 10+ messages in thread
From: Justin Lecher @ 2011-06-24 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     a9153fafae9e552239c2d577b14865012ff70451
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 16:22:43 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 16:22:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a9153faf

Sort inherit and/or USE

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

---
 sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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 21a324d..f8431e2 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=3
 PYTHON_DEPEND="gtk? 2"
-inherit python base versionator
+inherit base python versionator
 
 DESCRIPTION="Support programs for the Oracle Cluster Filesystem 2"
 HOMEPAGE="http://oss.oracle.com/projects/ocfs2-tools/"
@@ -13,7 +13,7 @@ SRC_URI="http://oss.oracle.com/projects/${PN}/dist/files/source/v$(get_version_c
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug gtk external"
+IUSE="debug external gtk"
 
 RDEPEND="
 	sys-apps/util-linux



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

* [gentoo-commits] proj/sci:master commit in: sys-fs/ocfs2-tools/
@ 2011-07-13 22:34 Alexey Shvetsov
  0 siblings, 0 replies; 10+ messages in thread
From: Alexey Shvetsov @ 2011-07-13 22:34 UTC (permalink / raw
  To: gentoo-commits

commit:     12628e3ae52fe6ec7eb9df0c1a4fe600c2390481
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 22:26:46 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 22:33:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=12628e3a

Update ocfs2

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

---
 sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

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 f8431e2..bd2d152 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
@@ -45,6 +45,13 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_prepare() {
+	# gentoo uses /sys/kernel/dlm as dlmfs mountpoint
+	sed -e 's:"/dlm/":"/sys/kernel/dlm":g' \
+		-i libo2dlm/o2dlm_test.c \
+		-i libocfs2/dlm.c || die "sed failed"
+}
+
 src_configure() {
 	econf \
 		$(use_enable debug debug) \



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

end of thread, other threads:[~2011-07-13 22:34 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-22 15:01 [gentoo-commits] proj/sci:master commit in: sys-fs/ocfs2-tools/ Alexey Shvetsov
  -- strict thread matches above, loose matches on Subject: below --
2011-07-13 22:34 Alexey Shvetsov
2011-06-24 17:09 Justin Lecher
2011-06-22 19:56 Alexey Shvetsov
2011-06-22 19:52 Alexey Shvetsov
2011-06-22 19:48 Alexey Shvetsov
2011-06-22 14:52 Alexey Shvetsov
2011-06-22 14:49 Alexey Shvetsov
2011-06-22 14:42 Alexey Shvetsov
2011-03-07 12:01 Justin Lecher

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