EAPI4, updated RDEPEND, fix build wrt #399077 thx to xarthisius and alexxy

(Portage version: 2.1.10.47/cvs/Linux x86_64)

4 files changed, 160 insertions, 4 deletions

diff --git a/sys-fs/ocfs2-tools/ChangeLog b/sys-fs/ocfs2-tools/ChangeLog
index 7b6efdbbddd7..3199e13638af 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ChangeLog,v 1.6 2011/08/31 17:15:18 alexxy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ChangeLog,v 1.7 2012/02/21 14:29:00 ultrabug Exp $
+
+*ocfs2-tools-1.6.4-r1 (21 Feb 2012)
+
+  21 Feb 2012; Ultrabug <ultrabug@gentoo.org> +ocfs2-tools-1.6.4-r1.ebuild,
+  +files/ocfs2-tools-1.6.4-asneeded.patch:
+  EAPI4, updated RDEPEND, fix build wrt #399077
 
 *ocfs2-tools-1.6.4 (31 Aug 2011)
 
diff --git a/sys-fs/ocfs2-tools/files/ocfs2-tools-1.6.4-asneeded.patch b/sys-fs/ocfs2-tools/files/ocfs2-tools-1.6.4-asneeded.patch
new file mode 100644
index 000000000000..c382522f14ed
--- /dev/null
+++ b/sys-fs/ocfs2-tools/files/ocfs2-tools-1.6.4-asneeded.patch
@@ -0,0 +1,78 @@
+--- configure.in.orig	2011-01-19 20:43:35.000000000 +0100
++++ configure.in	2012-02-21 11:14:51.047974999 +0100
+@@ -265,7 +265,6 @@
+         cpg_package=openais
+     fi
+     TRY_PATH="$AIS_TRY_PATH"
+-    AC_MSG_CHECKING([for cpg_initialize in -lcpg])
+     while test "x$TRY_PATH" != "x"; do
+         TRY="`echo $TRY_PATH | cut -f1 -d:`"
+         NEW_TRY_PATH="`echo $TRY_PATH | cut -f2- -d:`"
+@@ -281,9 +280,8 @@
+         # TRY="$TRY"
+ 
+         saved_LDFLAGS="$LDFLAGS"
+-        LDFLAGS="$LDFLAGS $TRY -lcpg"
+-        AC_LINK_IFELSE([AC_LANG_CALL([], [cpg_initialize])],
+-        	       cpg_found=yes)
++        LDFLAGS="$LDFLAGS $TRY"
++        AC_SEARCH_LIBS([cpg_initialize], [cpg], [cpg_found=yes], [], [])
+         LDFLAGS="$saved_LDFLAGS"
+ 
+         if test "x$cpg_found" = "xyes"; then
+@@ -292,10 +290,7 @@
+         fi
+     done
+ fi
+-if test "x$cpg_found" = "xyes"; then
+-    AC_MSG_RESULT(yes)
+-else
+-    AC_MSG_RESULT(no)
++if test "x$cpg_found" = "xno"; then
+     AC_MSG_WARN([libcpg not found, ocfs2_controld will not be built])
+ fi
+ AC_SUBST(CPG_LDFLAGS)
+@@ -309,7 +304,6 @@
+ if test "x$ckpt_found" = "xyes"; then
+     ckpt_found=
+     TRY_PATH="$AIS_TRY_PATH"
+-    AC_MSG_CHECKING([for saCkptInitialize in -lSaCkpt])
+     while test "x$TRY_PATH" != "x"; do
+         TRY="`echo $TRY_PATH | cut -f1 -d:`"
+         NEW_TRY_PATH="`echo $TRY_PATH | cut -f2- -d:`"
+@@ -325,9 +319,8 @@
+         # TRY="$TRY"
+ 
+         saved_LDFLAGS="$LDFLAGS"
+-        LDFLAGS="$LDFLAGS $TRY -lSaCkpt"
+-        AC_LINK_IFELSE([AC_LANG_CALL([], [saCkptInitialize])],
+-        	       ckpt_found=yes)
++        LDFLAGS="$LDFLAGS $TRY"
++        AC_SEARCH_LIBS([saCkptInitialize], [SaCkpt], [ckpt_found=yes], [], [])
+         LDFLAGS="$saved_LDFLAGS"
+ 
+         if test "x$ckpt_found" = "xyes"; then
+@@ -336,10 +329,7 @@
+         fi
+     done
+ fi
+-if test "x$ckpt_found" = "xyes"; then
+-    AC_MSG_RESULT(yes)
+-else
+-    AC_MSG_RESULT(no)
++if test "x$ckpt_found" = "xno"; then
+     AC_MSG_WARN([libSaCkpt not found, ocfs2_controld will not be built])
+ fi
+ AC_SUBST(AIS_LDFLAGS)
+
+--- ocfs2_controld/Makefile.orig	2012-02-21 11:49:36.248974932 +0100
++++ ocfs2_controld/Makefile	2012-02-21 11:49:47.943974980 +0100
+@@ -14,7 +14,7 @@
+ ifneq ($(BUILD_PCMK_SUPPORT),)
+ SBIN_PROGRAMS += ocfs2_controld.pcmk
+ # Some pacemaker headers which pacemaker.c includes want this.
+-PCMK_INCLUDES = -I/usr/include/pacemaker -I/usr/include/heartbeat/ $(GLIB_CFLAGS)
++PCMK_INCLUDES = -I/usr/include/pacemaker -I/usr/include/heartbeat/ `pkg-config --cflags libxml-2.0` $(GLIB_CFLAGS)
+ endif
+ 
+ INCLUDES = -I$(TOPDIR)/include -I. $(PCMK_INCLUDES)
diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4-r1.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4-r1.ebuild
new file mode 100644
index 000000000000..7d164841dd40
--- /dev/null
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4-r1.ebuild
@@ -0,0 +1,72 @@
+# 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.6.4-r1.ebuild,v 1.1 2012/02/21 14:29:00 ultrabug Exp $
+
+EAPI=4
+PYTHON_DEPEND="gtk? 2"
+inherit autotools python 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 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"
+
+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 "${FILESDIR}"/${P}-asneeded.patch
+	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
+}
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 2110c4f11418..74109404d08f 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.6.4.ebuild,v 1.1 2011/08/31 17:15:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild,v 1.2 2012/02/21 14:29:00 ultrabug Exp $
 
 EAPI=3
 PYTHON_DEPEND="gtk? 2"