[gentoo-commits] dev/ultrabug:master commit in: sys-cluster/cman/files/, sys-cluster/cman/

[Tiziano Müller]

commit:     bb33c16387e69d0018961b554f35ece7e8a12e93
Author:     Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 10:16:17 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 10:16:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=bb33c163

Version bump and cleanup (EAPI=4 usage, HOMEPAGE, default phase usage). Init-script should create /var/run/cluster.

---
 sys-cluster/cman/Manifest                          |    8 ++---
 .../cman/{cman-3.1.1.ebuild => cman-3.1.5.ebuild}  |   28 +++++++++++++------
 sys-cluster/cman/files/cman.initd                  |    2 +
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/sys-cluster/cman/Manifest b/sys-cluster/cman/Manifest
index 22242a6..c15a268 100644
--- a/sys-cluster/cman/Manifest
+++ b/sys-cluster/cman/Manifest
@@ -1,7 +1,5 @@
+EBUILD cman-3.1.5.ebuild 2555 RMD160 91910641e1a1f4d7b35d8e15f05b6ab97edff1a8 SHA1 414a0c0ed320a36d9eb48f8d883d97de0f0ab0c9 SHA256 3ad68c252b091c9158986034b8ccc637a4895d15c42585c1acea13dae9cbb02e
 AUX cman.confd 2797 RMD160 9c4bdb0b651e60f25a7338b9ddad4cd582d2cd92 SHA1 f811a83fb2f31882b787aa7d5b4adc61599e63b2 SHA256 45f89870420c0855ace5a27149db878bd592a2f48c35711b40d29f3b358a2bf5
-AUX cman.confd.ori 5044 RMD160 03fb12f4345f78d3a1954a6777bdf6dcb356315e SHA1 42db7eacfa922d4939b99d327ef7bd39f82236fb SHA256 7438c251ec074392fb302b7b6798ff9ecab41681d9d283b33aefd307b9f5a10a
-AUX cman.initd 6952 RMD160 f3c35bb39e9fb790e2f7c4c9a847e3e16e39a64a SHA1 d18aa3b1b7138da3fd436465ca7c7acfc790fbb4 SHA256 03f3389465a4c10c0fa41b1c442345bc78e60e40cb6dedfe35f23bfef08209e7
-AUX cman.initd.ori 12471 RMD160 e787ba2db8de4b813a443cb709d213f42d6d537e SHA1 3826debc88f287921a1a19217c3952c54e375846 SHA256 a058154a6d87e4e7d85964b40dd8a57786e3f32352384ea093407af4856067d4
+AUX cman.initd 6983 RMD160 e1efdd4630d62abd91973d8d7d094e00efd09c03 SHA1 f1af73b99e78912b6b9d6a8d35963492ea0f6017 SHA256 4399345d8690fb485feaf0e514c3cb3918563988732967fb1ad9ee07e1b96c97
 AUX qdiskd.initd 588 RMD160 ce692384ae29823f0d6a9cc38e36b3a5481deeda SHA1 0918d79fcaa007cd8be4e9d3e5f87f8d0036c39d SHA256 7275f95a197484a339b3c3e4b0dd01998388e4a3fbd108f1b62d6b24b46ca94f
-DIST cluster-3.1.1.tar.gz 649198 RMD160 620b292d21f48a29f0a66d28354e373b8ae4cae6 SHA1 ecf3bacd90f623ff0462f08ed17357152c1b723b SHA256 0d8de2fc7933e427ce9eb03f53199d0b7bf3a1af967dfa45fa3f9cb62c7472a5
-EBUILD cman-3.1.1.ebuild 2295 RMD160 d4983388ca0c5e47565baab0defd6bfe59fff0b3 SHA1 69971d257c73319992ec5dbaf2c8cbe2de4d732b SHA256 854a560cf7b2038add76ee21bff1c655d23a00cea2e6637d0a6e1da6dc628e32
+DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e

diff --git a/sys-cluster/cman/cman-3.1.1.ebuild b/sys-cluster/cman/cman-3.1.5.ebuild
similarity index 77%
rename from sys-cluster/cman/cman-3.1.1.ebuild
rename to sys-cluster/cman/cman-3.1.5.ebuild
index 26ca861..2c4a7fc 100644
--- a/sys-cluster/cman/cman-3.1.1.ebuild
+++ b/sys-cluster/cman/cman-3.1.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit linux-info multilib toolchain-funcs versionator
 
@@ -10,19 +10,20 @@ CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
 
 MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
+MIN_PV="$(get_version_component_range 2-3)"
 
 DESCRIPTION="Cluster Manager"
-HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
+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 ~x86"
-IUSE="dbus"
+IUSE="dbus ldap"
 
 RDEPEND="dev-libs/libxml2
-	net-nds/openldap
+	dbus? ( sys-apps/dbus )
+	ldap? ( net-nds/openldap )
 	sys-cluster/corosync
 	~sys-cluster/libccs-${PV}
 	~sys-cluster/libfence-${PV}
@@ -38,7 +39,6 @@ S="${WORKDIR}/${MY_P}"
 
 # TODO:
 # * Gentoo'ise the init script
-# * fix magic dep on openldap
 
 src_configure() {
 	# cluster libs have their own separate packages
@@ -57,6 +57,9 @@ src_configure() {
 		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 \
@@ -74,9 +77,13 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake failed"
+	emake DESTDIR="${D}" install
 
-	keepdir /var/{lib,log,run}/cluster
+	# 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 \
@@ -85,5 +92,8 @@ src_install() {
 	dohtml doc/*.html
 
 	# lib-specific man pages are provided by the corresponding packages
-	rm -rf "${D}/usr/share/man/man3/libdlm.3"
+	rm "${D}/usr/share/man/man3/libdlm.3"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 }

diff --git a/sys-cluster/cman/files/cman.initd b/sys-cluster/cman/files/cman.initd
index 839de38..ac282c0 100644
--- a/sys-cluster/cman/files/cman.initd
+++ b/sys-cluster/cman/files/cman.initd
@@ -278,6 +278,8 @@ stop_dlm_controld() {
 start() {
 	load_modules "dlm lock_dlm"
 
+    mkdir -p /var/run/cluster
+
 	mount_configfs
 	start_ccsd
 	start_cman