drop old, fix ncurses detection and drop old pacemaker dependency

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

4 files changed, 12 insertions, 154 deletions

diff --git a/sys-fs/ocfs2-tools/ChangeLog b/sys-fs/ocfs2-tools/ChangeLog
index 9cd2bdd504eb..b8b2a3988642 100644
--- a/sys-fs/ocfs2-tools/ChangeLog
+++ b/sys-fs/ocfs2-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/ocfs2-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ChangeLog,v 1.15 2015/02/04 09:30:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ChangeLog,v 1.16 2015/04/07 16:37:33 ultrabug Exp $
+
+*ocfs2-tools-1.8.2-r1 (07 Apr 2015)
+
+  07 Apr 2015; Ultrabug <ultrabug@gentoo.org> -ocfs2-tools-1.6.4.ebuild,
+  -ocfs2-tools-1.6.4-r1.ebuild, -ocfs2-tools-1.8.2.ebuild,
+  +ocfs2-tools-1.8.2-r1.ebuild:
+  drop old, fix ncurses detection and drop old pacemaker dependency
 
   04 Feb 2015; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Drop maintainer-needed as there is a herd.
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
deleted file mode 100644
index f2f4ab890f24..000000000000
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.3 2012/05/24 04:13:39 vapier Exp $
-
-EAPI=4
-PYTHON_DEPEND="gtk? 2"
-inherit autotools eutils 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"
-
-PATCHES=(
-		"${FILESDIR}/${P}-asneeded.patch"
-		"${FILESDIR}/${PN}-recent-kernels.patch"
-		)
-
-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
-}
diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
deleted file mode 100644
index 9a7742d09c2c..000000000000
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.4 2012/05/29 12:52:50 xarthisius Exp $
-
-EAPI=3
-PYTHON_DEPEND="gtk? 2"
-inherit base 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/cman-lib
-	external?  (
-				|| ( sys-cluster/corosync sys-cluster/openais sys-cluster/dlm-lib )
-				)
-	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}/${P}-asneeded.patch"
-		"${FILESDIR}/${PN}-recent-kernels.patch"
-		)
-
-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"
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug debug) \
-		$(use_enable debug debugexe) \
-		$(use_enable gtk ocfs2console) \
-		--enable-dynamic-fsck \
-		--enable-dynamic-ctl
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	newinitd "${FILESDIR}/ocfs2.initd" ocfs2 || die
-	newconfd "${FILESDIR}/ocfs2.confd" ocfs2 || die
-}
diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2-r1.ebuild
index 5f855b74d2d2..2a9410dc785e 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 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.4 2012/05/29 12:52:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2-r1.ebuild,v 1.1 2015/04/07 16:37:33 ultrabug Exp $
 
 EAPI=4
 PYTHON_DEPEND="gtk? 2"
@@ -21,7 +21,7 @@ RDEPEND="
 	sys-cluster/libcman
 	external? (
 		sys-cluster/libdlm
-		<sys-cluster/pacemaker-1.1[-heartbeat]
+		sys-cluster/pacemaker[-heartbeat]
 		)
 	sys-fs/e2fsprogs
 	sys-libs/ncurses
@@ -53,6 +53,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	sed -e 's/ncurses, tgetstr/ncurses, printw/g' -i configure.in || die
 	# gentoo uses /sys/kernel/dlm as dlmfs mountpoint
 	sed -e 's:"/dlm/":"/sys/kernel/dlm":g' \
 		-i libo2dlm/o2dlm_test.c \