drop old, fix ncurses detection and drop old pacemaker dependency

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

5 files changed, 18 insertions, 163 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/Manifest b/sys-fs/ocfs2-tools/Manifest
index f4687e6d3220..f005dd57e2e0 100644
--- a/sys-fs/ocfs2-tools/Manifest
+++ b/sys-fs/ocfs2-tools/Manifest
@@ -5,17 +5,14 @@ AUX ocfs2-tools-1.6.4-asneeded.patch 2608 SHA256 1b017ccf60365b270a950f6c5772736
 AUX ocfs2-tools-recent-kernels.patch 650 SHA256 23da66f6f13392b552ff345daa1748e9b1385cd0a2052250d952dee104c550ef SHA512 4e5f5f5fa3a8cbde6f937e574b97c1d6a76d4cec5b9df16a094527c5ca59ed37857f54c4687dfd4557ef4c0fd701825d5ee2091d76eabbecd2b029b5fdf27b1e WHIRLPOOL 086d4387be582f1b496bc4ee25698c363af7926077454f84bf998e57942b13a81fd169814d713b49942906de2745e3f10d6622c47f65b020df0902ed832656eb
 AUX ocfs2.confd 1605 SHA256 2fef37296825b1c2df2084cf4392ae555b68860aa0f673b93bec54c044f81dcf SHA512 bc54880063187aba1d1fbb0be7ff6a17d7f3d54de441d929fdae069e0c045842093a772449019f62e3cd36ce84e05c54a5a97043efb75345ef5ea93fa3508970 WHIRLPOOL fe73fa6b50f643b9f3621af821f0d2e4333af6f330139f2941ba61f247f52f326ef8cbb84ac3dd40ff32d9a9572814fce6074904cfb0d48709093322cafdd93d
 AUX ocfs2.initd 4114 SHA256 8be50bd1c1747896769447b56f289cdd9b1477268348b293c4b1224df22ed430 SHA512 a249e7d75ab77aecebd7dfb01fab5203acd6dc74f63f275bb86aadc0bd556ad2ad8da70d23039976be54122c6e87872da1553114fba9c2613fa5f96c3a95862f WHIRLPOOL d33c80287fde41c5edfdcf368ea6a0d68caeaed07023cff36167ab079ff81e7a1aac512997ce6ffdb3318664a4e8dbc9904307f701c925d6ffc95f8966ea3346
-DIST ocfs2-tools-1.6.4.tar.gz 823914 SHA256 dda9db208312e3e5f4f55ee77e66e7b35b9cc10421bc02065a6c168e42b24755
-DIST ocfs2-tools-1.8.2.tar.xz 963132 SHA256 3af5e43695bf780531208b5b058741320c1f03fe54568390bf74cba5066f315b
-EBUILD ocfs2-tools-1.6.4-r1.ebuild 1761 SHA256 2f2239a1dcaf709e26cf846cdb85b65d51b9894899eaa35be7ef8345dbf8b978 SHA512 f9120fbdbc41888f649275ba0345a26d7b115078d982a26600dda16dc69d077925fdea3d9661a7e1219bd2172ff7ada48cd7e2e561c4588e9edc6894e1007842 WHIRLPOOL 3bb57fa8497c34518ca2bc686214bf143590665ab37948b6965cc681a48cd7fc3b25dc704c65845e2b52256587b93ed9a99e918826d64a3c3ca4c1b6085546f9
-EBUILD ocfs2-tools-1.6.4.ebuild 1742 SHA256 5f1b3f14614bb26ded352bc1eeceb8b4bf101903c818ba312e75a9c2c032c1a3 SHA512 d241ba7bc9062b4ecc8609bb574c6e7db4cb3f3f85059c60fe63c817f82dc0068f439f85277e3edfd14f2a9470b80790752214028f5ec716fa1874c94db9570e WHIRLPOOL c56b8823daec4180faf43d6507619272e862c171e2c7b7bd6c3d77a375de177f536a7eee9f58e83d991cdb09747684f92e59114b7a6041b646efdc435a796cd8
-EBUILD ocfs2-tools-1.8.2.ebuild 1723 SHA256 ec0010ad67e606fad3b1a38b4e2c335439ef61b8518a2ae28769597e596b57e1 SHA512 2517ed66bb23e028ddfb8d39422024cebd73a211833012ae95a5b53335d6ce8779dcab8f41a9bdf91da2b2d4bf9935aad96c954a24a3ba21105705eb15c8d5b5 WHIRLPOOL dec8a0881154da42ec4e4b0ecdbe361954d0316d1d06c30e5d6826967fdbd92498798e0da9332a44ca32d6c92418bd855cf3cf531276b4868989ee794ff41269
-MISC ChangeLog 1946 SHA256 e35d87c304e7aeef0082bb57a0f293b9e7793ebc7c4c72d7cfe905a05b0e5082 SHA512 5dee1a8930915e9f300aab7d6b7c33f999c71827e9ae1f6c5a3388119c73a6f8da9557664f61a044fb3da3b04a0e4e3c86339470cf766bd95fe0593c66f6ca8d WHIRLPOOL ca8dd3cbe2db3728e751cdef78df159d218cca376506537b8b78f8d7d6d9aafe9b42d80ef1c2824641bd8c3b3836839ecef44c3b8b49f0f8551023859a116f9a
+DIST ocfs2-tools-1.8.2.tar.xz 963132 SHA256 3af5e43695bf780531208b5b058741320c1f03fe54568390bf74cba5066f315b SHA512 b1354730a1e51117497b56e0a1fd79667d608cdf2ccdfa9eb7355f9f40684e64c0787722fa8e6046b35dd00c2ff7a822719b47d059f23253f0bab64e181875ee WHIRLPOOL 88621b43622635dbc4e02b3f5a0c9ff2a411e0481459abc13850f33456fad5ebdc23d5bd3f3fe541ab83cb404fe49bd7814f9f6199dc7f258a8432a12302174a
+EBUILD ocfs2-tools-1.8.2-r1.ebuild 1789 SHA256 348c511fee4e2344fe5fcce567a8fcf33ce7355a075ee512f468c0a66278f2c0 SHA512 cd67cbaa22aebbf39dad69a90900b92c3d4f3c97e6abcac5dc7a85f70b78841815a69953a3bb729a03cc25b499872118e8c8860550a003ca06b28c5920d17209 WHIRLPOOL 2f50f0263d7633a826fd67d99d5739e7a8d36164c13078162826d83bac720de4b685b46d42d3b609615ebe917aad7523f434db9ea85d754404767cdbde11aff9
+MISC ChangeLog 2221 SHA256 012e27d3fcecf2a058a94f8bd3758649a458c8e3972d57f7f26e529bd3893908 SHA512 824f0c496c87a68f0eaaf2a15c0aac61431ec7cc69e1636bf2830158fc94814993ab2b3774df21ea3918e4ff2911d5e74b2bd4a819be9ab2e22c427fb8c829fc WHIRLPOOL d482bd1bec42f2e46cc9b86886499c8081c58d78fb8c91d6cefbd692846568c78c8c1abae11becbe6c40f8cb1a5f57531a22a1757bb00db0ace93532e599c65f
 MISC metadata.xml 227 SHA256 4817ba20b1418047c21861fa5f184de29c0389ffbd523f14e8143a0e2f9b1a1f SHA512 a3a90fca72c73c84951a165ad1d80a438560c0d6898609209136fd501f148d1b7ee1a306674840612330fc948ff04b96306b4d89550d8bab18d7bbdc8899ed42 WHIRLPOOL 07d30207b3140d1b249b51e41e0bc7c588237e73fa933c61b081547635cda408d8dbeb4f29b54ce46c0529d7356de2a129d12d6e7eb094bc2ac94038c9cf74bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTR5sYACgkQVWmRsqeSphOQaACfZNEpmbGVTJPG8lk7QHRE7wFB
-R4UAmgPL6r7Ave3R9uWfCNRY09hBmwRC
-=Q+Vl
+iF4EAREIAAYFAlUkB9EACgkQKiQSS7ZY+hMxHgD/doFwQ6thQVr6Q2hPPi811aK6
+mefluvxB/FqpAnx3y2kBANNrUI2/WPbAkitAUfDbTpYlFJbeNqTzh/3/0M7FQq7e
+=u5SM
 -----END PGP SIGNATURE-----
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 \