version bump wrt #498730

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

3 files changed, 121 insertions, 3 deletions

diff --git a/sys-cluster/cman/ChangeLog b/sys-cluster/cman/ChangeLog
index 35347cef68a3..5f2783cac787 100644
--- a/sys-cluster/cman/ChangeLog
+++ b/sys-cluster/cman/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/cman
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.50 2012/12/11 23:54:24 robbat2 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.51 2014/12/11 14:38:14 ultrabug Exp $
+
+*cman-3.2.0 (11 Dec 2014)
+
+  11 Dec 2014; Ultrabug <ultrabug@gentoo.org> +cman-3.2.0.ebuild:
+  version bump wrt #498730
 
   11 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> files/cman.initd-3.1.5-r1:
   Even more checking of cman init.
diff --git a/sys-cluster/cman/Manifest b/sys-cluster/cman/Manifest
index ad4ed0b132fd..d7ae7197db6b 100644
--- a/sys-cluster/cman/Manifest
+++ b/sys-cluster/cman/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX cman.confd 2797 SHA256 45f89870420c0855ace5a27149db878bd592a2f48c35711b40d29f3b358a2bf5 SHA512 97cfe35230198091261ab3202c2c4eb2683f43ae311c07a6d34d9ae9c47c71c004ce615993ad25189ee536cbf2863fb721a57c520b439de2e70a7cd3d84ae3fe WHIRLPOOL cf34d8d3e7f2d6c1bfa367ab8f1c969e21e255febc9bbc7418be3662dd82264bd0fd64866db0885794c05bf2f1b52db7af97903ffbf79cb040422d85ca601ea3
 AUX cman.initd 7224 SHA256 c127d11d6f0655fbefe3de95ee3dac749081336fe93cb30b0cd975a0f1e0a0cd SHA512 3f55d0ac6a383edc0f0a9029b07372b7480e7df82d7a5a16f547527bfad54823d351100d687f8788bee70676f989ae41b81715699978126c42fe9866f1116e2a WHIRLPOOL a065384385bd9ba00273d07e6bb882184387669f2e7a59b3e98a7aed80277f71870ab2b05fc91694ece15d6f2d6f871718acd7397d273bbb667aaab9f221a147
 AUX cman.initd-3.1.5-r1 7977 SHA256 419a6d6683d6e8c59ab98214f701ab6aa85fbc9824f9a52426ff0660753dec83 SHA512 36230df5ee7d94ff3ae17faf89f9e65f476e705a448aa3647fa92c9a2e41c2813faba72969caf42b9fa8e8ca95417186ee65295e2e9355c22928f3f0f72c12d1 WHIRLPOOL e3da30dc1e3d750e28e04ee74d1492a7fd700c2bfca93a61e55806af547a901b0ee31ae293124cf5daafdeaee6242ad522db125c9dffa50abd8f8cfd51661f16
 AUX qdiskd.initd 578 SHA256 a680d858226b878bef90f76b4d1b772a2bf2b98be643a8633979e990b2f213cf SHA512 dacf2e4d96299b31f249276261885bc188755f9cebd186a39f67e4096486437cce05f16523b745a9875b71ad6111eceb979baf91261ea0be89746669a23adae8 WHIRLPOOL cad1b8a771193efb6b1de9b6fc1e96b4d44755fcf4f80e67a1854fb4701e9ea487005264804c0304d8736765414fce46640910854906ac0739d11b9c7921b5d5
 DIST cluster-3.1.5.tar.gz 651449 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e
+DIST cluster-3.2.0.tar.gz 688411 SHA256 96651381645cde0e32b06f83e180b1664232a5c589c72f06206e0539e0036cfb SHA512 00620b89564c4f9b67b679695749cd7515f49af43ace6a565e32e020ee66db219f3db3f53420d6460ea8c1cab03258305735fe5db81aab3953777015119533e9 WHIRLPOOL cc468ac8e879dadc157d585b22615d6ffcf0b38a5c93196f8aa9564467e8b8aae6c2688faa9d9e8a98e68a605b86d84b6a79edb474d0cde231e5a78729ebb4e4
 EBUILD cman-3.1.5-r1.ebuild 2706 SHA256 5acce6276b2ced0afc387e022f722c594d0423cfbcb3e43b598adffde07f2af1 SHA512 d0c500d992ad1cd7f9e70652e96955c11504624c4639725054a862ab2c6cba704a5e33dece2ea1e98e19e6740c2e9e070d4f278573f801e5de252446cc1367ff WHIRLPOOL 60376b4ab7b091548ada906a486b653ac4cfdee28add8bf3ecace6c48e65b02acbd0d4ddf9bd8e5c217e0c6e8cc60b0aa9a4496532e9a9d638aa5c26157e2846
 EBUILD cman-3.1.5.ebuild 2690 SHA256 9d861c07635ac8a61f277a6b52f50cbf1acd2344e266b6c57c94164f091b3b36 SHA512 2412e9a4705ab56de3d104192fd2b5b798a85590abb1168b239a8dcd8e1e534125d9c1b7674d791dd832077d0e3dd529c7410fe194b1aa3a8caa2c4a141e1112 WHIRLPOOL 98183ed3a6c9a2606b5f9b94aff695ba1d94e7c2f87d3143c51430ff1462fc4f2f3545ce48f43acf0b4473e2784b8252f96cf018e7bdf13f1c9fdb7e5da17a60
-MISC ChangeLog 944 SHA256 c40b57cc3233a2faab2c72f2741afca51af96c3f8f500e60b07456a782b0aa3d SHA512 b12763eacf232a9f1abde5c1787c97c46ffaeb02987dd52fd5143f76083c4f50dacc6f8a7c23a760676b0a46be03020f654033f5d052d8323db8c1608706762c WHIRLPOOL 3a62852450a9502d34fcf68e3904b971bccd327fc6b6115fbf540f20e3d0fd22844873689892bb16aaa86ccb5478ece158ef08e7870f15e9a8dfa6c7182d181b
+EBUILD cman-3.2.0.ebuild 2704 SHA256 40058571c15582bd9da7fad04539e8d9da7c860d54ed650cb9ac9db02d72a280 SHA512 7b007d738dc337945839f1b4710140ec14796180687ba56580354778b25e228c17555702beb31bd67ba9e9011428044fc6dcbdc86c58f6c91d8d562876b0344e WHIRLPOOL 05998b696ce10af9affd299a0a4842c41495b451db4989e25e6061a9a05d9a45c64dda613585d5de51401c9a308c958b4c451bed07012c754dd2d30665a55144
+MISC ChangeLog 1066 SHA256 f25e9da2b7123f6e89bb5cb13d9c0e43cb8bb6cc5bc4735bf639b5886b3a644e SHA512 9ab79b8c678e15c6b4ebc060b5288f25f21b50439e23fbf98fc75165986a5c01e0ae7f6d1ae0413982f2e9ec27090e601a459d078c0bb2ccca794fe853b4df75 WHIRLPOOL 32fef4593379214ab4f82af4777c42226eabf03800abac57c67273e02d724b0891003bfad67589c65fc91c24b856f600a7055fc6ae20b386e07ca8d2ba118bb2
 MISC metadata.xml 213 SHA256 69aa7f6654842583718e3cc6d05b1e7c3be2ec10baa05e6c5d6bddb040dbea2f SHA512 d8428d1102d2cc160c6a6b52f723276631c27285afb662c698c1f782c307bc1fdb722327eb252b1b42835990a964acb066f1b87243679eb506021de71ab002aa WHIRLPOOL 8abb0a6d9b1c5403a1a2a0d15d0bcec2ddae928a9dad65669a698420e5618014b678a33e96375d3981130c722d6a1165a91aa385b5b85bae97be1cd4458b7fa9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlSJrFsACgkQKiQSS7ZY+hOPIAD8CVCxkS7KV6SpsS6GA4qIgaAK
+msoBe+u9o/Hz7mBXMUkA/2CqNBHWG9Mjdd7TDcu2M9slxoaAwppnHdSOrQ6gHu4s
+=BFAV
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/cman/cman-3.2.0.ebuild b/sys-cluster/cman/cman-3.2.0.ebuild
new file mode 100644
index 000000000000..ff8a23c5c410
--- /dev/null
+++ b/sys-cluster/cman/cman-3.2.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-3.2.0.ebuild,v 1.1 2014/12/11 14:38:14 ultrabug Exp $
+
+EAPI=4
+
+inherit linux-info multilib toolchain-funcs versionator
+
+CLUSTER_RELEASE="${PV}"
+MY_P="cluster-${CLUSTER_RELEASE}"
+
+MAJ_PV="$(get_major_version)"
+MIN_PV="$(get_version_component_range 2-3)"
+
+DESCRIPTION="Cluster Manager"
+HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
+SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="dbus ldap"
+
+RDEPEND="dev-libs/libxml2
+	dev-libs/libxslt
+	dbus? ( sys-apps/dbus )
+	ldap? ( net-nds/openldap )
+	sys-cluster/corosync
+	sys-cluster/openais
+	~sys-cluster/libccs-${PV}
+	~sys-cluster/libfence-${PV}
+	~sys-cluster/libcman-${PV}
+	~sys-cluster/libdlm-${PV}
+	~sys-cluster/liblogthread-${PV}
+	!sys-cluster/dlm
+"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.24"
+
+S="${WORKDIR}/${MY_P}"
+
+# TODO:
+# * Gentoo'ise the init script
+
+src_configure() {
+	# cluster libs have their own separate packages
+	sed -i -e 's|lib||' "${S}/cman/Makefile" || die
+	sed -i -e 's|liblogthread||' "${S}/common/Makefile" || die
+	sed -i -e 's|libs||' "${S}/config/Makefile" || die
+	sed -i -e 's|libdlm libdlmcontrol||' "${S}/dlm/Makefile" || die
+	sed -i -e 's|libfence libfenced||' "${S}/fence/Makefile" || die
+	sed -i -e 's|fence/libfenced||' "${S}/Makefile" || die
+
+	sed -i \
+		-e 's|\(^all:.*\)depends |\1|' \
+		config/tools/ccs_tool/Makefile \
+		fence/fence{d,_node,_tool}/Makefile \
+		cman/{cman_tool,daemon,tests,qdisk,notifyd}/Makefile \
+		dlm/{tool,tests/usertest}/Makefile \
+		|| die "sed failed"
+
+	if ! use ldap ; then
+		sed -i -e 's|ldap||' config/plugins/Makefile || die "sed failed"
+	fi
+	local myopts=""
+	use dbus || myopts="--disable_dbus"
+	./configure \
+		--cc=$(tc-getCC) \
+		--cflags="-Wall" \
+		--libdir=/usr/$(get_libdir) \
+		--disable_kernel_check \
+		--kernel_src=${KERNEL_DIR} \
+		--somajor="$MAJ_PV" \
+		--sominor="$MIN_PV" \
+		--without_rgmanager \
+		--without_bindings \
+		${myopts} \
+		|| die "configure problem"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# we have to create it in the init.d script anyway
+	rmdir "${D}"/var/run/{cluster,}
+
+	keepdir /var/{lib,log}/cluster
+	keepdir /etc/cluster/cman-notify.d
+
+	rm -rf "${D}/usr/share/doc"
+	dodoc \
+		doc/{usage.txt,cman_notify_template.sh} \
+		config/plugins/ldap/*.ldif
+	dohtml doc/*.html
+
+	# lib-specific man pages are provided by the corresponding packages
+	rm "${D}/usr/share/man/man3/libdlm.3"
+
+	newinitd "${FILESDIR}/${PN}.initd-3.1.5-r1" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+}