[sys-fs/ocfs2-tools] Version bump. Since 1.6.4 doesnt work with ocfs in 3.3+ kernels

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

3 files changed, 105 insertions, 15 deletions

diff --git a/sys-fs/ocfs2-tools/ChangeLog b/sys-fs/ocfs2-tools/ChangeLog
index 58728890e1eb..e87c8f32ae30 100644
--- a/sys-fs/ocfs2-tools/ChangeLog
+++ b/sys-fs/ocfs2-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/ocfs2-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ChangeLog,v 1.8 2012/05/05 12:59:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ChangeLog,v 1.9 2012/05/05 13:12:09 alexxy Exp $
+
+*ocfs2-tools-1.8.2 (05 May 2012)
+
+  05 May 2012; Alexey Shvetsov <alexxy@gentoo.org> +ocfs2-tools-1.8.2.ebuild:
+  [sys-fs/ocfs2-tools] Version bump. Since 1.6.4 doesnt work with ocfs in 3.3+
+  kernels
 
   05 May 2012; Alexey Shvetsov <alexxy@gentoo.org>
   +files/ocfs2-tools-recent-kernels.patch, ocfs2-tools-1.6.4-r1.ebuild,
diff --git a/sys-fs/ocfs2-tools/Manifest b/sys-fs/ocfs2-tools/Manifest
index 0667b42fd63e..de01b047a3af 100644
--- a/sys-fs/ocfs2-tools/Manifest
+++ b/sys-fs/ocfs2-tools/Manifest
@@ -6,24 +6,26 @@ AUX ocfs2-tools-recent-kernels.patch 650 RMD160 8f610623080bda9889a289c60c6dfed6
 AUX ocfs2.confd 1605 RMD160 18f07f87a57dc0c385996b5e28eeef9460ef8917 SHA1 295520b6dc716285390289835ca67b45e1cbe7bf SHA256 2fef37296825b1c2df2084cf4392ae555b68860aa0f673b93bec54c044f81dcf
 AUX ocfs2.initd 4114 RMD160 adf28acd493e7572fe9474ea1e45a8b258a209eb SHA1 1ac80848e784dcbc5d4dac4c9bcaf71eb3dcd006 SHA256 8be50bd1c1747896769447b56f289cdd9b1477268348b293c4b1224df22ed430
 DIST ocfs2-tools-1.6.4.tar.gz 823914 RMD160 c8b65f4c26017e257c4190322d6df64e9ef7925b SHA1 1409a13f63b55457a474c5f5662260e420452ee9 SHA256 dda9db208312e3e5f4f55ee77e66e7b35b9cc10421bc02065a6c168e42b24755
+DIST ocfs2-tools-1.8.2.tar.gz 1474406 RMD160 f8d465db8658ad2e69e35d55f97886218df8d23f SHA1 be88916ce6ccfb072657a5afd2b04320e1fe4ea4 SHA256 d329ef568ede8e247b98e360833d202d5507a0c6eda7ceb431aac03fa748ddcb
 EBUILD ocfs2-tools-1.6.4-r1.ebuild 1754 RMD160 46981aa0c1f5c932be2be294646a84fc73e9c755 SHA1 432f3dd7eb78b7a28f77641ef88001e72fe1106f SHA256 b0c8308fbc4527f4cf8ec4e2e5cae6bff9b333ee02fdf64cf9cb691cfbd39bbb
 EBUILD ocfs2-tools-1.6.4.ebuild 1740 RMD160 15174ddc555dd0c614c77bb425522bb9b851e1d1 SHA1 e47d85c598ca2156953b1d3221a6c9352827d176 SHA256 5fcb12145d7a63c21c51db3b50a9d702fb91b553c18a1c3ed07a9abf1c0a5243
-MISC ChangeLog 811 RMD160 ae78266e72376f48fa8b8fb0a7a3bc346002295d SHA1 0c5b5711795612c7dafcbb906439a4767d7fa74c SHA256 f3c94acfc203d0c55974121b4d9b798b21d9b8039bb3478f83898ed82de6e870
+EBUILD ocfs2-tools-1.8.2.ebuild 1853 RMD160 53eb8afe3cbe8368ca0fb2c271607fdd4cd9679b SHA1 69c0e3a25f4c62f46538447614b395e362f9c721 SHA256 c3987745fcd70916181bb84bf4048cda01f38b4f0e58b7f431eef82e5b7a8bea
+MISC ChangeLog 1013 RMD160 70fe60d88b58449346a5afa5760b1fddd4db05b1 SHA1 b7f228f9541cd4afe53668fa195dc9367dddc10c SHA256 2499db624eb123382993694acbfc303c88d3d4e164bef725383c131e053be894
 MISC metadata.xml 318 RMD160 125e0bce8608c63cfac4690707384f4b9a5118ec SHA1 99e5d8c06141cc6cfb6b5d21be8ed7236b718466 SHA256 4adb0813c6bc1eb64cef456f02e0fe3488b2c497ac4d5612b55d235be981dc07
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPpSQkAAoJEOf+E+/4L5Lm8REP/i+Kqayollb3DvrHJlafm3TE
-6ZcKuoT8w6z55rQQEUYu/JpnxIIYeMMRZtTFUT5PCNssaOsAMLrvFir9UYEOkw6A
-6n2+JiSPGmAX2P2lhAW8KFPgQLxPc04zITFlT3HL5Brd7rh2T05GOx6KySIB1xaC
-DTdqkPdUWuWX8acyvP34CfdMm8BVyTn+e0WT0ETWSJsePDzF6f86BOF3QgK8mLkZ
-sfKQbSivmxnu8nBC9lGEhrZN66i6tRldHnU2Z5wxvYBywXPEPkxBH86yRHjkTp55
-xNUoSm5vx4Km8ULo5SWZ0jNAvVfZC5PqJ6MXOtA46eUZ8M84YGPIyA1Y7zYLBUD7
-cVr5MVqonRIrymnUrG3B+syLb+qUbXGJ0KwKRrZKcHEboiAcx6uYuHWQevQ+9ptW
-LcAo76ZvdvTXmNlZygyHTEV1udEYhFma2alM2u8JceX65vQ1zYT0+ToRqXuxaoKS
-cUeMx9gNgc1g3rqDSnR6DT3w6zgM5nHQIl3GZdaXDF0wxRxsPJvSOT2tajfUKP+K
-r982rINQ369hquIc9rtd6O01kq2M76PvOKrC8S02dtjWt4ORXGYJSArgcd5a7I9H
-iskVY5Pf3bGwz0QAnpORPk9O7/tzH+HSyBVtXFMGF2JJnVfEEpLPTsBHpL11Pkax
-j9cflLbfuKXk+D9FHKA/
-=WzzJ
+iQIcBAEBCAAGBQJPpScIAAoJEOf+E+/4L5LmK1YP/15+/LhP1jI8EHLJH5Z0agR6
+sQcqx+0RVNpC+Ur+IY0EJ2lxbZP6bMcq9WyAMYIWTMxqY29qUP5Dzbc2TOgqAKO8
+7zjuQB40gAIBlO2LjbQeIcfKSXbTYfceEuPkHNZnORhUNi7E1gGiheboyM2FTQSS
+5RD57GnG1boQZ3cchmqIf6PvirIRKxSy2pfTFe58TOE0qq6uElPV0ER9VAuxU9/J
+StFVBMPdwQjs9NT6W+FAaftP8QrumxK8m5Pzbssqin/CXrNP86xGaO2toXJC+3xG
+08VLQdCS3kUp5s1XHeqV2W7M4KDyJ8pkmnQn7TMt/ltMw/S16bXlTfKL47ONNtI9
+5l/osCkQlgRokWHm4tYIewnQ07r3/5BUl1FMSmqqKBOBKICX8/0/1LzDDrk3zImN
+EH9/e8bLX4fz1IDvKJakEapzZb3nf/hFn8i4KmU349cickohwQKQS+AixXeYmMvs
+ZwqbaVJ7uGGvx0YwNHptYnsqRgTv/dEX2LZuGg4zcsphMCc2HEzotadgRsX5JWi6
+5fq+jwDqtRrBEpTh1hGoG0PggeEIDXFltmeq/BHqa7xwV/Kp0LsXtWFc8Un6s1yg
+CAIzw5k2fAJIeoqk48+OEbieo26ooL0xQIhnV1E91SN9mmgB1c33MUX0UwssR3e5
+Ksi/CmM6RnFeN6rqLlJj
+=HWlI
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2.ebuild
new file mode 100644
index 000000000000..63ecd00297ea
--- /dev/null
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2.ebuild,v 1.1 2012/05/05 13:12:09 alexxy Exp $
+
+EAPI=4
+PYTHON_DEPEND="gtk? 2"
+inherit autotools python
+
+# seems like they stopped providing snapshots
+GIT_HASH="db4aef69fa6e9705e17c0b35b9dabc4a41a1d40a"
+
+DESCRIPTION="Support programs for the Oracle Cluster Filesystem 2"
+HOMEPAGE="http://oss.oracle.com/projects/ocfs2-tools/"
+SRC_URI="http://oss.oracle.com/git/?p=ocfs2-tools.git;a=snapshot;h=${GIT_HASH} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug external gtk"
+
+RDEPEND="
+	sys-apps/util-linux
+	sys-cluster/libcman
+	external? (
+		sys-cluster/libdlm
+		<sys-cluster/pacemaker-1.1[-heartbeat]
+		)
+	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}"
+
+DOCS=(
+	"${S}/documentation/samples/cluster.conf"
+	"${S}/documentation/users_guide.txt"
+)
+
+MAKEOPTS+=" -j1"
+
+PATCHES=(
+		"${FILESDIR}/${PN}-1.6.4-asneeded.patch"
+		"${FILESDIR}/${PN}-recent-kernels.patch"
+		)
+
+S="${WORKDIR}/${PN}.git"
+
+pkg_setup() {
+	python_set_active_version 2
+	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"
+	epatch ${PATCHES[@]}
+	rm -f aclocal.m4
+	AT_M4DIR=. eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug debug) \
+		$(use_enable debug debugexe) \
+		$(use_enable gtk ocfs2console) \
+		--enable-dynamic-fsck \
+		--enable-dynamic-ctl
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/ocfs2.initd" ocfs2
+	newconfd "${FILESDIR}/ocfs2.confd" ocfs2
+}