[gentoo-commits] dev/ultrabug:master commit in: sys-cluster/libdlmcontrol/, sys-cluster/dlm-lib/, sys-cluster/libccs-perl/, ...

[Alexys Jacob]

commit:     3d757e09d5c50075554cd1f087bc7c9090c98cf9
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 11:26:33 2011 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 11:26:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=3d757e09

cluster suite 3.1.0

---
 sys-cluster/cman-lib/ChangeLog                     |   46 --------------
 sys-cluster/cman-lib/Manifest                      |    4 -
 sys-cluster/cman-lib/cman-lib-3.0.7.ebuild         |   47 --------------
 sys-cluster/cman-lib/metadata.xml                  |    5 --
 sys-cluster/cman/Manifest                          |    2 +
 sys-cluster/cman/cman-3.1.0.ebuild                 |   64 ++++++++++++++++++++
 sys-cluster/dlm-lib/ChangeLog                      |   51 ----------------
 sys-cluster/dlm-lib/Manifest                       |    4 -
 sys-cluster/dlm-lib/metadata.xml                   |    5 --
 sys-cluster/libccs-perl/Manifest                   |    2 +
 .../libccs-perl-3.1.0.ebuild}                      |   24 +++-----
 sys-cluster/libccs/Manifest                        |    2 +
 .../libccs-3.1.0.ebuild}                           |   23 +++-----
 sys-cluster/libcman/Manifest                       |    2 +
 .../libcman-3.1.0.ebuild}                          |   19 ++----
 sys-cluster/libdlm/Manifest                        |    2 +
 .../libdlm-3.1.0.ebuild}                           |   21 +++----
 sys-cluster/libdlmcontrol/Manifest                 |    2 +
 .../libdlmcontrol-3.1.0.ebuild}                    |   21 +++----
 sys-cluster/libfence/Manifest                      |    2 +
 .../libfence-3.1.0.ebuild}                         |   26 ++++----
 sys-cluster/liblogthread/Manifest                  |    2 +
 .../liblogthread-3.1.0.ebuild}                     |   23 +++-----
 23 files changed, 140 insertions(+), 259 deletions(-)

diff --git a/sys-cluster/cman-lib/ChangeLog b/sys-cluster/cman-lib/ChangeLog
deleted file mode 100644
index a85f1e5..0000000
--- a/sys-cluster/cman-lib/ChangeLog
+++ /dev/null
@@ -1,46 +0,0 @@
-# ChangeLog for sys-cluster/cman-lib
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-lib/ChangeLog,v 1.8 2011/01/20 11:00:37 xarthisius Exp $
-
-*cman-lib-2.03.09-r1 (20 Jan 2011)
-
-  20 Jan 2011; Kacper Kowalik <xarthisius@g.o>
-  -files/cman-lib-2.02.00-include.patch, +cman-lib-2.03.09-r1.ebuild:
-  Respect multilib paths, cleanup. Drop unused patch.
-
-  20 Oct 2010; Dawid Węgliński <cla@g.o> cman-lib-2.03.09.ebuild:
-  Respect LDFLAGS (#337652)
-
-  11 Sep 2010; Tomáš Chvátal <scarabeus@g.o> metadata.xml:
-  Drop useles maintainer line
-
-  10 Feb 2009; Christian Zoffoli <xmerlin@g.o> ChangeLog:
-  Stable on x86 and amd64.
-
-  21 Nov 2008; Christian Zoffoli <xmerlin@g.o>
-  cman-lib-2.03.09.ebuild:
-  Fixed homepage.
-
-*cman-lib-2.03.09 (13 Nov 2008)
-
-  13 Nov 2008; Christian Zoffoli <xmerlin@g.o>
-  -cman-lib-2.02.00.ebuild, -cman-lib-2.02.00-r1.ebuild,
-  +cman-lib-2.03.09.ebuild:
-  Ebuild cleanup, version bump.
-
-  23 Mar 2008; Christian Zoffoli <xmerlin@g.o>
-  +cman-lib-2.02.00-r1.ebuild:
-  Updated 2.02.00 to STABLE2 20080323.
-
-*cman-lib-2.02.00-r1 (23 Mar 2008)
-
-  23 Mar 2008; Christian Zoffoli <xmerlin@g.o>
-  +cman-lib-2.02.00-r1.ebuild:
-  Updated 2.02.00 to STABLE2 20080323.
-
-*cman-lib-2.02.00 (17 Mar 2008)
-
-  17 Mar 2008; Christian Zoffoli <xmerlin@g.o>
-  +files/cman-lib-2.02.00-include.patch, +cman-lib-2.02.00.ebuild:
-  Initial Import
-

diff --git a/sys-cluster/cman-lib/Manifest b/sys-cluster/cman-lib/Manifest
deleted file mode 100644
index 4d7c9ec..0000000
--- a/sys-cluster/cman-lib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cluster-3.0.7.tar.gz 1668883 RMD160 b2509655d97afc09e5ae3967d0e4e331f129887a SHA1 30e24445d6e2f8e7c39378435ba343fb3ae3b784 SHA256 f76c28edcd339cced4e79869ac7a2071e7f3907657c05875ef3cd64e837ae38e
-EBUILD cman-lib-3.0.7.ebuild 1228 RMD160 372055bf20fd9a9ad7eff0ffb8d10bf8436da0d6 SHA1 eef750e31d31d4ef1d4ba4741821245fb4525308 SHA256 b9e39368e1c8221944f5f1ec17746915fd17cf8785ed900b44a0774d3a2055da
-MISC ChangeLog 1492 RMD160 0e5988638cdd66883c37734aca77052612a87f30 SHA1 030a10a5d4a3912acdf9301aa1492140eaf74b1f SHA256 0253efa134e8e5122bf3ec6f3deec2761e0c7e84850571a223df9346687f41a9
-MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9

diff --git a/sys-cluster/cman-lib/cman-lib-3.0.7.ebuild b/sys-cluster/cman-lib/cman-lib-3.0.7.ebuild
deleted file mode 100644
index 61ea798..0000000
--- a/sys-cluster/cman-lib/cman-lib-3.0.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild,v 1.1 2011/01/20 11:00:37 xarthisius Exp $
-
-inherit eutils versionator multilib
-
-MY_P=cluster-${PV}
-
-MAJ_PV=$(get_major_version)
-MIN_PV=$(get_version_component_range 2).$(get_version_component_range 3)
-
-DESCRIPTION="A library for cluster management common to the various pieces of Cluster Suite."
-HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="!sys-cluster/cman-headers
-	!sys-cluster/cman-kernel
-	!=sys-cluster/cman-1*"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/${PN/-//}
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc="$(tc-getCC)" \
-			--libdir=/usr/$(get_libdir) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-	) || die "configure problem"
-
-	sed -e 's:\($(CC)\):\1 $(LDFLAGS):' \
-		-i Makefile "${WORKDIR}/${MY_P}/make/cobj.mk" || die
-
-	emake clean all || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}

diff --git a/sys-cluster/cman-lib/metadata.xml b/sys-cluster/cman-lib/metadata.xml
deleted file mode 100644
index 348e6c4..0000000
--- a/sys-cluster/cman-lib/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>cluster</herd>
-</pkgmetadata>

diff --git a/sys-cluster/cman/Manifest b/sys-cluster/cman/Manifest
new file mode 100644
index 0000000..b208526
--- /dev/null
+++ b/sys-cluster/cman/Manifest
@@ -0,0 +1,2 @@
+DIST cluster-3.1.0.tar.gz 641274 RMD160 276f4d183180282bf17fbc38408b8466d85a6637 SHA1 0aa7770bb6877b52dd002ec8b8ae446a692215af SHA256 595afb4a23ec4ee98689083a609c4c32b876436d386fc063b00c31f188576a15
+EBUILD cman-3.1.0.ebuild 1603 RMD160 777cd30d01a28dc8aaff0dc282dd27b005cef5c1 SHA1 eb5f67d96d2c1d1464828ece4ac197a75eb214af SHA256 b8597a8de93c9a6fc60e2c061bc79ad28bb681a2664905fe2e7d92b0d1d6a783

diff --git a/sys-cluster/cman/cman-3.1.0.ebuild b/sys-cluster/cman/cman-3.1.0.ebuild
new file mode 100644
index 0000000..a5d133b
--- /dev/null
+++ b/sys-cluster/cman/cman-3.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils linux-mod versionator
+
+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)"
+
+DESCRIPTION="General-purpose Distributed Lock Manager"
+HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
+SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="logrotate"
+
+DEPEND=">=sys-kernel/linux-headers-2.6.24
+	sys-cluster/libccs
+	sys-cluster/libfence
+	sys-cluster/libcman
+	sys-cluster/libdlm
+	sys-cluster/libdlmcontrol
+	sys-cluster/liblogthread
+	"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	# cluster libs have their own separate packages
+	sed -i 's/lib//' "${S}/cman/Makefile" || die
+	sed -i 's/liblogthread//' "${S}/common/Makefile" || die
+	sed -i 's/libs//' "${S}/config/Makefile" || die
+	sed -i 's/libdlm libdlmcontrol//' "${S}/dlm/Makefile" || die
+	sed -i 's/libfence libfenced//' "${S}/fence/Makefile" || die
+	sed -i 's@fence/libfenced@@' "${S}/Makefile" || die
+	use logrotate || sed -i '/^LOGRORATED/d' "${S}/doc/Makefile" || die
+}
+
+src_compile() {
+	./configure \
+		--cc=$(tc-getCC) \
+		--cflags="-Wall" \
+		--disable_kernel_check \
+		--kernel_src=${KERNEL_DIR} \
+		--somajor="$MAJ_PV" \
+		--sominor="$MIN_PV" \
+		--without_rgmanager \
+		--without_bindings \
+		|| die "configure problem"
+	
+	emake -j1 || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}

diff --git a/sys-cluster/dlm-lib/ChangeLog b/sys-cluster/dlm-lib/ChangeLog
deleted file mode 100644
index b903869..0000000
--- a/sys-cluster/dlm-lib/ChangeLog
+++ /dev/null
@@ -1,51 +0,0 @@
-# ChangeLog for sys-cluster/dlm-lib
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/ChangeLog,v 1.10 2010/09/11 14:21:31 scarabeus Exp $
-
-  11 Sep 2010; Tomáš Chvátal <scarabeus@g.o> metadata.xml:
-  Drop useles maintainer line
-
-*dlm-lib-2.03.11 (22 Mar 2010)
-
-  22 Mar 2010; Doug Goldstein <cardoe@g.o> +dlm-lib-2.03.11.ebuild:
-  version bump to fix #305463
-
-  06 Sep 2009; Robin H. Johnson <robbat2@g.o> dlm-lib-2.03.09.ebuild:
-  Cleaning up for linux-info work: inherit linux-mod implies inherit
-  linux-info.
-
-  10 Feb 2009; Christian Zoffoli <xmerlin@g.o> ChangeLog:
-  Stable on x86 and amd64.
-
-  21 Nov 2008; Christian Zoffoli <xmerlin@g.o>
-  dlm-lib-2.03.09.ebuild:
-  Fixed homepage.
-
-  13 Nov 2008; Christian Zoffoli <xmerlin@g.o>
-  -files/dlm-lib-2.02.00-include.patch:
-  Removed an old patch.
-
-*dlm-lib-2.03.09 (13 Nov 2008)
-
-  13 Nov 2008; Christian Zoffoli <xmerlin@g.o>
-  -dlm-lib-2.02.00.ebuild, -dlm-lib-2.02.00-r1.ebuild,
-  +dlm-lib-2.03.09.ebuild:
-  Ebuild cleanup, version bump.
-
-  23 Mar 2008; Christian Zoffoli <xmerlin@g.o>
-  dlm-lib-2.02.00-r1.ebuild:
-  Updated linux-headers dep.
-
-*dlm-lib-2.02.00-r1 (23 Mar 2008)
-
-  23 Mar 2008; Christian Zoffoli <xmerlin@g.o>
-  +dlm-lib-2.02.00-r1.ebuild:
-  Updated 2.02.00 to STABLE2 20080323.
-
-*dlm-lib-2.02.00 (17 Mar 2008)
-
-  17 Mar 2008; Christian Zoffoli <xmerlin@g.o>
-  +files/dlm-lib-2.02.00-include.patch, +metadata.xml,
-  +dlm-lib-2.02.00.ebuild:
-  Initial Import
-

diff --git a/sys-cluster/dlm-lib/Manifest b/sys-cluster/dlm-lib/Manifest
deleted file mode 100644
index 630876a..0000000
--- a/sys-cluster/dlm-lib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cluster-3.0.7.tar.gz 1668883 RMD160 b2509655d97afc09e5ae3967d0e4e331f129887a SHA1 30e24445d6e2f8e7c39378435ba343fb3ae3b784 SHA256 f76c28edcd339cced4e79869ac7a2071e7f3907657c05875ef3cd64e837ae38e
-EBUILD dlm-lib-3.0.7.ebuild 1327 RMD160 e6a21308f1c23a37d2a9e6d8408f85611afeac71 SHA1 7ee8af500865878953543609c21f4736352c6ddd SHA256 b08a5b32e9a855935a4135347cfccb5c268d860af6646ae5d2a835ce95ae5898
-MISC ChangeLog 1584 RMD160 6a2964a4b11a7a93462cdc3c99cfacea20af8ed2 SHA1 46f9e0822571605340c2090762fa9c289d45f936 SHA256 245779d5c1aa603574621139a2b1870678f09bdd656188e490acacf0fff0c092
-MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9

diff --git a/sys-cluster/dlm-lib/metadata.xml b/sys-cluster/dlm-lib/metadata.xml
deleted file mode 100644
index 348e6c4..0000000
--- a/sys-cluster/dlm-lib/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>cluster</herd>
-</pkgmetadata>

diff --git a/sys-cluster/libccs-perl/Manifest b/sys-cluster/libccs-perl/Manifest
new file mode 100644
index 0000000..37c4b27
--- /dev/null
+++ b/sys-cluster/libccs-perl/Manifest
@@ -0,0 +1,2 @@
+DIST cluster-3.1.0.tar.gz 641274 RMD160 276f4d183180282bf17fbc38408b8466d85a6637 SHA1 0aa7770bb6877b52dd002ec8b8ae446a692215af SHA256 595afb4a23ec4ee98689083a609c4c32b876436d386fc063b00c31f188576a15
+EBUILD libccs-perl-3.1.0.ebuild 1077 RMD160 ca79b9f0928fb1da6b3cf2363208aff5d86753b6 SHA1 ec8d8bc9c3d7f08f791e031b028540b25b403ed2 SHA256 7158aaba8aa76379d81fa00336f0cbbf527b7a8ede1da9e95d952651de49e423

diff --git a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild b/sys-cluster/libccs-perl/libccs-perl-3.1.0.ebuild
similarity index 58%
copy from sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
copy to sys-cluster/libccs-perl/libccs-perl-3.1.0.ebuild
index 01ffa70..605a4a3 100644
--- a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
+++ b/sys-cluster/libccs-perl/libccs-perl-3.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/dlm-lib-2.03.11.ebuild,v 1.1 2010/03/22 17:30:02 cardoe Exp $
+# $Header: $
 
 inherit eutils linux-mod versionator
 
@@ -12,7 +12,7 @@ MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
 
 DESCRIPTION="General-purpose Distributed Lock Manager"
 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,16 +20,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=sys-kernel/linux-headers-2.6.24
-	!sys-cluster/dlm-headers
-	!sys-cluster/dlm-kernel
+	sys-cluster/libccs
 	"
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}/dlm"
+S="${WORKDIR}/${MY_P}/bindings/perl"
 
 src_compile() {
-	echo ${S}
 	(cd "${WORKDIR}"/${MY_P};
 		./configure \
 			--cc=$(tc-getCC) \
@@ -38,17 +36,13 @@ src_compile() {
 			--kernel_src=${KERNEL_DIR} \
 			--somajor="$MAJ_PV" \
 			--sominor="$MIN_PV" \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
+			--ccslibdir=/usr/lib \
+			--ccsincdir=/usr/include \
 	) || die "configure problem"
 	
-	for i in libdlm libdlmcontrol; do
-		emake -C $i || die "compile problem"
-	done
+	emake -j1 || die "compile problem"
 }
 
 src_install() {
-	for i in libdlm libdlmcontrol; do
-		emake DESTDIR="${D}" -C $i install || die "install problem"
-	done
+	emake DESTDIR="${D}" install || die "install problem"
 }

diff --git a/sys-cluster/libccs/Manifest b/sys-cluster/libccs/Manifest
new file mode 100644
index 0000000..c972f23
--- /dev/null
+++ b/sys-cluster/libccs/Manifest
@@ -0,0 +1,2 @@
+DIST cluster-3.1.0.tar.gz 641274 RMD160 276f4d183180282bf17fbc38408b8466d85a6637 SHA1 0aa7770bb6877b52dd002ec8b8ae446a692215af SHA256 595afb4a23ec4ee98689083a609c4c32b876436d386fc063b00c31f188576a15
+EBUILD libccs-3.1.0.ebuild 1075 RMD160 d256f81983612bdb66e96e40faa7a842373a8d97 SHA1 4eda497424ff395b8b9b1c9fba0cb86a4297ab15 SHA256 1ca3a7bcd2ee5b36ef6ccf6baacd46d2d158d3dc44dd31e0e440bf55e625135a

diff --git a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild b/sys-cluster/libccs/libccs-3.1.0.ebuild
similarity index 58%
copy from sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
copy to sys-cluster/libccs/libccs-3.1.0.ebuild
index 01ffa70..03869e9 100644
--- a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
+++ b/sys-cluster/libccs/libccs-3.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/dlm-lib-2.03.11.ebuild,v 1.1 2010/03/22 17:30:02 cardoe Exp $
+# $Header: $
 
 inherit eutils linux-mod versionator
 
@@ -12,7 +12,7 @@ MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
 
 DESCRIPTION="General-purpose Distributed Lock Manager"
 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,16 +20,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=sys-kernel/linux-headers-2.6.24
-	!sys-cluster/dlm-headers
-	!sys-cluster/dlm-kernel
 	"
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}/dlm"
+S="${WORKDIR}/${MY_P}/config/libs"
 
 src_compile() {
-	echo ${S}
 	(cd "${WORKDIR}"/${MY_P};
 		./configure \
 			--cc=$(tc-getCC) \
@@ -38,17 +35,13 @@ src_compile() {
 			--kernel_src=${KERNEL_DIR} \
 			--somajor="$MAJ_PV" \
 			--sominor="$MIN_PV" \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
+			--ccslibdir=/usr/lib \
+			--ccsincdir=/usr/include \
 	) || die "configure problem"
 	
-	for i in libdlm libdlmcontrol; do
-		emake -C $i || die "compile problem"
-	done
+	emake -j1 || die "compile problem"
 }
 
 src_install() {
-	for i in libdlm libdlmcontrol; do
-		emake DESTDIR="${D}" -C $i install || die "install problem"
-	done
+	emake DESTDIR="${D}" install || die "install problem"
 }

diff --git a/sys-cluster/libcman/Manifest b/sys-cluster/libcman/Manifest
new file mode 100644
index 0000000..1557f32
--- /dev/null
+++ b/sys-cluster/libcman/Manifest
@@ -0,0 +1,2 @@
+DIST cluster-3.1.0.tar.gz 641274 RMD160 276f4d183180282bf17fbc38408b8466d85a6637 SHA1 0aa7770bb6877b52dd002ec8b8ae446a692215af SHA256 595afb4a23ec4ee98689083a609c4c32b876436d386fc063b00c31f188576a15
+EBUILD libcman-3.1.0.ebuild 1074 RMD160 a1f8614f1162085fd61005213a90a10789624201 SHA1 46efa43136086bbe15d2f1cbb724088e7aaee350 SHA256 d13b64bb73225f5e40e04a0f8b9450f0d78363243b6a05605ca2fc1006d6115c

diff --git a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild b/sys-cluster/libcman/libcman-3.1.0.ebuild
similarity index 62%
copy from sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
copy to sys-cluster/libcman/libcman-3.1.0.ebuild
index 01ffa70..9aa4cee 100644
--- a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
+++ b/sys-cluster/libcman/libcman-3.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/dlm-lib-2.03.11.ebuild,v 1.1 2010/03/22 17:30:02 cardoe Exp $
+# $Header: $
 
 inherit eutils linux-mod versionator
 
@@ -12,7 +12,7 @@ MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
 
 DESCRIPTION="General-purpose Distributed Lock Manager"
 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,16 +20,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=sys-kernel/linux-headers-2.6.24
-	!sys-cluster/dlm-headers
-	!sys-cluster/dlm-kernel
 	"
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}/dlm"
+S="${WORKDIR}/${MY_P}/cman/lib"
 
 src_compile() {
-	echo ${S}
 	(cd "${WORKDIR}"/${MY_P};
 		./configure \
 			--cc=$(tc-getCC) \
@@ -42,13 +39,9 @@ src_compile() {
 			--cmanincdir=/usr/include \
 	) || die "configure problem"
 	
-	for i in libdlm libdlmcontrol; do
-		emake -C $i || die "compile problem"
-	done
+	emake -j1 || die "compile problem"
 }
 
 src_install() {
-	for i in libdlm libdlmcontrol; do
-		emake DESTDIR="${D}" -C $i install || die "install problem"
-	done
+	emake DESTDIR="${D}" install || die "install problem"
 }

diff --git a/sys-cluster/libdlm/Manifest b/sys-cluster/libdlm/Manifest
new file mode 100644
index 0000000..503d4de
--- /dev/null
+++ b/sys-cluster/libdlm/Manifest
@@ -0,0 +1,2 @@
+DIST cluster-3.1.0.tar.gz 641274 RMD160 276f4d183180282bf17fbc38408b8466d85a6637 SHA1 0aa7770bb6877b52dd002ec8b8ae446a692215af SHA256 595afb4a23ec4ee98689083a609c4c32b876436d386fc063b00c31f188576a15
+EBUILD libdlm-3.1.0.ebuild 1124 RMD160 6fd54bb9203d3192ae2e8841ded835fd21cea7d0 SHA1 66b6ae401abea9e65d17724fcfb154f3de8947fb SHA256 1ae9a3d83191ae05a1280999b570aea12a50c12d7ee61376c70b27613446b695

diff --git a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild b/sys-cluster/libdlm/libdlm-3.1.0.ebuild
similarity index 62%
copy from sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
copy to sys-cluster/libdlm/libdlm-3.1.0.ebuild
index 01ffa70..6be4ace 100644
--- a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
+++ b/sys-cluster/libdlm/libdlm-3.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/dlm-lib-2.03.11.ebuild,v 1.1 2010/03/22 17:30:02 cardoe Exp $
+# $Header: $
 
 inherit eutils linux-mod versionator
 
@@ -12,7 +12,7 @@ MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
 
 DESCRIPTION="General-purpose Distributed Lock Manager"
 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,10 +26,9 @@ DEPEND=">=sys-kernel/linux-headers-2.6.24
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}/dlm"
+S="${WORKDIR}/${MY_P}/dlm/${PN}"
 
 src_compile() {
-	echo ${S}
 	(cd "${WORKDIR}"/${MY_P};
 		./configure \
 			--cc=$(tc-getCC) \
@@ -38,17 +37,13 @@ src_compile() {
 			--kernel_src=${KERNEL_DIR} \
 			--somajor="$MAJ_PV" \
 			--sominor="$MIN_PV" \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
+			--dlmlibdir=/usr/lib \
+			--dlmincdir=/usr/include \
 	) || die "configure problem"
 	
-	for i in libdlm libdlmcontrol; do
-		emake -C $i || die "compile problem"
-	done
+	emake -j1 || die "compile problem"
 }
 
 src_install() {
-	for i in libdlm libdlmcontrol; do
-		emake DESTDIR="${D}" -C $i install || die "install problem"
-	done
+	emake DESTDIR="${D}" install || die "install problem"
 }

diff --git a/sys-cluster/libdlmcontrol/Manifest b/sys-cluster/libdlmcontrol/Manifest
new file mode 100644
index 0000000..49ba33d
--- /dev/null
+++ b/sys-cluster/libdlmcontrol/Manifest
@@ -0,0 +1,2 @@
+DIST cluster-3.1.0.tar.gz 641274 RMD160 276f4d183180282bf17fbc38408b8466d85a6637 SHA1 0aa7770bb6877b52dd002ec8b8ae446a692215af SHA256 595afb4a23ec4ee98689083a609c4c32b876436d386fc063b00c31f188576a15
+EBUILD libdlmcontrol-3.1.0.ebuild 1138 RMD160 2bf65b07cbb2d2b3d889447fba3a0007bd04d771 SHA1 80cf2e78c55f30df9ace0ee4d217d7d06e12fdfe SHA256 f1ada65714445f2096035566b6fb699b66a21970878ce0a0749bb40680a8b3ff

diff --git a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild b/sys-cluster/libdlmcontrol/libdlmcontrol-3.1.0.ebuild
similarity index 62%
copy from sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
copy to sys-cluster/libdlmcontrol/libdlmcontrol-3.1.0.ebuild
index 01ffa70..9b70a0e 100644
--- a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
+++ b/sys-cluster/libdlmcontrol/libdlmcontrol-3.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/dlm-lib-2.03.11.ebuild,v 1.1 2010/03/22 17:30:02 cardoe Exp $
+# $Header: $
 
 inherit eutils linux-mod versionator
 
@@ -12,7 +12,7 @@ MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
 
 DESCRIPTION="General-purpose Distributed Lock Manager"
 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,10 +26,9 @@ DEPEND=">=sys-kernel/linux-headers-2.6.24
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}/dlm"
+S="${WORKDIR}/${MY_P}/dlm/${PN}"
 
 src_compile() {
-	echo ${S}
 	(cd "${WORKDIR}"/${MY_P};
 		./configure \
 			--cc=$(tc-getCC) \
@@ -38,17 +37,13 @@ src_compile() {
 			--kernel_src=${KERNEL_DIR} \
 			--somajor="$MAJ_PV" \
 			--sominor="$MIN_PV" \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
+			--dlmcontrollibdir=/usr/lib \
+			--dlmcontrolincdir=/usr/include \
 	) || die "configure problem"
 	
-	for i in libdlm libdlmcontrol; do
-		emake -C $i || die "compile problem"
-	done
+	emake -j1 || die "compile problem"
 }
 
 src_install() {
-	for i in libdlm libdlmcontrol; do
-		emake DESTDIR="${D}" -C $i install || die "install problem"
-	done
+	emake DESTDIR="${D}" install || die "install problem"
 }

diff --git a/sys-cluster/libfence/Manifest b/sys-cluster/libfence/Manifest
new file mode 100644
index 0000000..abdd02f
--- /dev/null
+++ b/sys-cluster/libfence/Manifest
@@ -0,0 +1,2 @@
+DIST cluster-3.1.0.tar.gz 641274 RMD160 276f4d183180282bf17fbc38408b8466d85a6637 SHA1 0aa7770bb6877b52dd002ec8b8ae446a692215af SHA256 595afb4a23ec4ee98689083a609c4c32b876436d386fc063b00c31f188576a15
+EBUILD libfence-3.1.0.ebuild 1247 RMD160 d3afbcd91cba24ff3dfe062c621f763de935044f SHA1 3a469c86ca4149d31756c67063b1cc5f603c0cd9 SHA256 80c730d5d25799319ef74000ecbbf8b425baf5152a3430fde7d612ba04d948d3

diff --git a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild b/sys-cluster/libfence/libfence-3.1.0.ebuild
similarity index 59%
copy from sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
copy to sys-cluster/libfence/libfence-3.1.0.ebuild
index 01ffa70..6abe31f 100644
--- a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
+++ b/sys-cluster/libfence/libfence-3.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/dlm-lib-2.03.11.ebuild,v 1.1 2010/03/22 17:30:02 cardoe Exp $
+# $Header: $
 
 inherit eutils linux-mod versionator
 
@@ -12,7 +12,7 @@ MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
 
 DESCRIPTION="General-purpose Distributed Lock Manager"
 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,16 +20,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=sys-kernel/linux-headers-2.6.24
-	!sys-cluster/dlm-headers
-	!sys-cluster/dlm-kernel
+	sys-cluster/libccs
 	"
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}/dlm"
+S="${WORKDIR}/${MY_P}/fence"
 
 src_compile() {
-	echo ${S}
 	(cd "${WORKDIR}"/${MY_P};
 		./configure \
 			--cc=$(tc-getCC) \
@@ -38,17 +36,19 @@ src_compile() {
 			--kernel_src=${KERNEL_DIR} \
 			--somajor="$MAJ_PV" \
 			--sominor="$MIN_PV" \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
+			--fencelibdir=/usr/lib \
+			--fenceincdir=/usr/include \
+			--fencedlibdir=/usr/lib \
+			--fencedincdir=/usr/include \
 	) || die "configure problem"
 	
-	for i in libdlm libdlmcontrol; do
-		emake -C $i || die "compile problem"
+	for i in libfence libfenced; do
+		emake -C ${i} || die "compile problem"
 	done
 }
 
 src_install() {
-	for i in libdlm libdlmcontrol; do
-		emake DESTDIR="${D}" -C $i install || die "install problem"
+	for i in libfence libfenced; do
+		emake DESTDIR="${D}" -C ${i} install || die "install problem"
 	done
 }

diff --git a/sys-cluster/liblogthread/Manifest b/sys-cluster/liblogthread/Manifest
new file mode 100644
index 0000000..0ea2956
--- /dev/null
+++ b/sys-cluster/liblogthread/Manifest
@@ -0,0 +1,2 @@
+DIST cluster-3.1.0.tar.gz 641274 RMD160 276f4d183180282bf17fbc38408b8466d85a6637 SHA1 0aa7770bb6877b52dd002ec8b8ae446a692215af SHA256 595afb4a23ec4ee98689083a609c4c32b876436d386fc063b00c31f188576a15
+EBUILD liblogthread-3.1.0.ebuild 1078 RMD160 addc7e8afbc392663e599b81155efa3625b0c275 SHA1 2b1cd0318bc1a3968c7939cee23fd110830b6a44 SHA256 0b926aa36565848b3690e72b406b5f517d7e37ab7b6d0b71106779d0db53a92e

diff --git a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild b/sys-cluster/liblogthread/liblogthread-3.1.0.ebuild
similarity index 58%
rename from sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
rename to sys-cluster/liblogthread/liblogthread-3.1.0.ebuild
index 01ffa70..c09315a 100644
--- a/sys-cluster/dlm-lib/dlm-lib-3.0.7.ebuild
+++ b/sys-cluster/liblogthread/liblogthread-3.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/dlm-lib-2.03.11.ebuild,v 1.1 2010/03/22 17:30:02 cardoe Exp $
+# $Header: $
 
 inherit eutils linux-mod versionator
 
@@ -12,7 +12,7 @@ MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
 
 DESCRIPTION="General-purpose Distributed Lock Manager"
 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,16 +20,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=sys-kernel/linux-headers-2.6.24
-	!sys-cluster/dlm-headers
-	!sys-cluster/dlm-kernel
 	"
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}/dlm"
+S="${WORKDIR}/${MY_P}/common/${PN}"
 
 src_compile() {
-	echo ${S}
 	(cd "${WORKDIR}"/${MY_P};
 		./configure \
 			--cc=$(tc-getCC) \
@@ -38,17 +35,13 @@ src_compile() {
 			--kernel_src=${KERNEL_DIR} \
 			--somajor="$MAJ_PV" \
 			--sominor="$MIN_PV" \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
+			--logtlibdir=/usr/lib \
+			--logtincdir=/usr/include \
 	) || die "configure problem"
 	
-	for i in libdlm libdlmcontrol; do
-		emake -C $i || die "compile problem"
-	done
+	emake -j1 || die "compile problem"
 }
 
 src_install() {
-	for i in libdlm libdlmcontrol; do
-		emake DESTDIR="${D}" -C $i install || die "install problem"
-	done
+	emake DESTDIR="${D}" install || die "install problem"
 }