ebuild cleanup thx to dev-zero

21 files changed, 259 insertions, 178 deletions

diff --git a/metadata/layout.conf b/metadata/layout.conf
new file mode 100644
index 0000000..d43e61c
--- /dev/null
+++ b/metadata/layout.conf
@@ -0,0 +1 @@
+masters = gentoo
diff --git a/profiles/categories b/profiles/categories
new file mode 100644
index 0000000..db80833
--- /dev/null
+++ b/profiles/categories
@@ -0,0 +1,3 @@
+mail-filter
+sys-cluster
+sys-fs
\ No newline at end of file
diff --git a/sys-cluster/cman/Manifest b/sys-cluster/cman/Manifest
index b208526..ec8c102 100644
--- a/sys-cluster/cman/Manifest
+++ b/sys-cluster/cman/Manifest
@@ -1,2 +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
+EBUILD cman-3.1.0.ebuild 2185 RMD160 cf91a9346a2613b6af1fb7780321e839ac689e6a SHA1 e27d9b0de8358759191baafe0e7efb65d202c47f SHA256 6054ee5fe48d8aed8a9d58eeb9b060ad7680008a139d236acd6d71b1f0f292a1
diff --git a/sys-cluster/cman/cman-3.1.0.ebuild b/sys-cluster/cman/cman-3.1.0.ebuild
index a5d133b..d8eda09 100644
--- a/sys-cluster/cman/cman-3.1.0.ebuild
+++ b/sys-cluster/cman/cman-3.1.0.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI="4"
 
-inherit eutils linux-mod versionator
+inherit linux-info multilib toolchain-funcs versionator
 
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -19,35 +19,48 @@ SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="logrotate"
+IUSE=""
 
-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}"
+RDEPEND="dev-libs/libxml2
+	sys-cluster/corosync
+	~sys-cluster/libccs-${PV}
+	~sys-cluster/libfence-${PV}
+	~sys-cluster/libcman-${PV}
+	~sys-cluster/libdlm-${PV}
+	~sys-cluster/libdlmcontrol-${PV}
+	~sys-cluster/liblogthread-${PV}"
+DEPEND="${RDEPEND}
+    >=sys-kernel/linux-headers-2.6.24"
 
 S="${WORKDIR}/${MY_P}"
 
+# TODO:
+# * man pages for functions and libs should be installed by the corresponding
+#   lib ebuilds
+# * Gentoo'ise the init script
+# * fix magic dep on openldap
+
 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
-}
+	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"
 
-src_compile() {
 	./configure \
 		--cc=$(tc-getCC) \
 		--cflags="-Wall" \
+		--libdir=/usr/$(get_libdir) \
 		--disable_kernel_check \
 		--kernel_src=${KERNEL_DIR} \
 		--somajor="$MAJ_PV" \
@@ -55,10 +68,16 @@ src_compile() {
 		--without_rgmanager \
 		--without_bindings \
 		|| die "configure problem"
-	
-	emake -j1 || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
+
+	keepdir /var/{lib,log,run}/cluster
+
+	rm -rf "${D}/usr/share/doc"
+	dodoc \
+		doc/{usage.txt,cman_notify_template.sh} \
+		config/plugins/ldap/*.ldif
+	dohtml doc/*.html
 }
diff --git a/sys-cluster/libccs-perl/Manifest b/sys-cluster/libccs-perl/Manifest
index 37c4b27..6edeb91 100644
--- a/sys-cluster/libccs-perl/Manifest
+++ b/sys-cluster/libccs-perl/Manifest
@@ -1,2 +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
+EBUILD libccs-perl-3.1.0.ebuild 1097 RMD160 eac8f378a8392ce89851f671c58ba090ff66e8ff SHA1 1691dbc97e61979879786eb89b85917652a383f2 SHA256 7c2234e674908925bd7eeff26fd3ed246723f7c26a26c4eaaf284e5eed382886
diff --git a/sys-cluster/libccs/Manifest b/sys-cluster/libccs/Manifest
index c972f23..a7a282d 100644
--- a/sys-cluster/libccs/Manifest
+++ b/sys-cluster/libccs/Manifest
@@ -1,2 +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
+EBUILD libccs-3.1.0.ebuild 1149 RMD160 453f1d2c7cd99b204f73d90c5d19c02615fe6794 SHA1 07cd7f433f4d4ff5a1edd142861db4c7f41b656f SHA256 47a91e9e56c985f3c2c52ceda34853d87e18d5ada0a18609b3368539b36a4275
diff --git a/sys-cluster/libccs/libccs-3.1.0.ebuild b/sys-cluster/libccs/libccs-3.1.0.ebuild
index 03869e9..fd24cc3 100644
--- a/sys-cluster/libccs/libccs-3.1.0.ebuild
+++ b/sys-cluster/libccs/libccs-3.1.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils linux-mod versionator
+EAPI="4"
+
+inherit linux-info multilib toolchain-funcs versionator
 
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -10,38 +12,38 @@ 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"
+DESCRIPTION="Cluster Configuration System Library"
 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
 SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-kernel/linux-headers-2.6.24
-	"
+IUSE="static-libs"
 
-RDEPEND="${DEPEND}"
+RDEPEND="sys-cluster/corosync
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.24"
 
 S="${WORKDIR}/${MY_P}/config/libs"
 
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--kernel_src=${KERNEL_DIR} \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--ccslibdir=/usr/lib \
-			--ccsincdir=/usr/include \
-	) || die "configure problem"
-	
-	emake -j1 || die "compile problem"
+src_configure() {
+	cd "${WORKDIR}/${MY_P}"
+	./configure \
+		--cc=$(tc-getCC) \
+		--cflags="-Wall" \
+		--libdir=/usr/$(get_libdir) \
+		--disable_kernel_check \
+		--kernel_src=${KERNEL_DIR} \
+		--somajor="$MAJ_PV" \
+		--sominor="$MIN_PV" \
+		--ccslibdir=/usr/$(get_libdir) \
+		--ccsincdir=/usr/include \
+	    || die "configure problem"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
+	default
+	use static-libs || rm -f "${D}"/usr/lib*/*.a
 }
diff --git a/sys-cluster/libcman/Manifest b/sys-cluster/libcman/Manifest
index 1557f32..5fc5ad9 100644
--- a/sys-cluster/libcman/Manifest
+++ b/sys-cluster/libcman/Manifest
@@ -1,2 +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
+EBUILD libcman-3.1.0.ebuild 1081 RMD160 cf455659090bb8e9ea1da580a0e8da2eeda292a1 SHA1 fde29db5f66cd01c01b3830ea45e15a522960d1c SHA256 8b4aac2fcd6051423b3ba3ef97966f0f2e4eb420cf22f19c94b4d684de373aee
diff --git a/sys-cluster/libcman/libcman-3.1.0.ebuild b/sys-cluster/libcman/libcman-3.1.0.ebuild
index 9aa4cee..2708703 100644
--- a/sys-cluster/libcman/libcman-3.1.0.ebuild
+++ b/sys-cluster/libcman/libcman-3.1.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils linux-mod versionator
+EAPI="4"
+
+inherit linux-info multilib toolchain-funcs versionator
 
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -10,38 +12,36 @@ 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"
+DESCRIPTION="Cluster Manager Library"
 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
 SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-kernel/linux-headers-2.6.24
-	"
+IUSE="static-libs"
 
-RDEPEND="${DEPEND}"
+DEPEND=">=sys-kernel/linux-headers-2.6.24"
+RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/cman/lib"
 
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--kernel_src=${KERNEL_DIR} \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
-	) || die "configure problem"
-	
-	emake -j1 || die "compile problem"
+src_configure() {
+	cd "${WORKDIR}/${MY_P}"
+	./configure \
+		--cc=$(tc-getCC) \
+		--cflags="-Wall" \
+		--libdir=/usr/$(get_libdir) \
+		--disable_kernel_check \
+		--kernel_src=${KERNEL_DIR} \
+		--somajor="$MAJ_PV" \
+		--sominor="$MIN_PV" \
+		--cmanlibdir=/usr/$(get_libdir) \
+		--cmanincdir=/usr/include \
+		|| die "configure failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
+	default
+	use static-libs || rm -f "${D}"/usr/lib*/*.a
 }
diff --git a/sys-cluster/libdlm/Manifest b/sys-cluster/libdlm/Manifest
index 503d4de..3d0da64 100644
--- a/sys-cluster/libdlm/Manifest
+++ b/sys-cluster/libdlm/Manifest
@@ -1,2 +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
+EBUILD libdlm-3.1.0.ebuild 1173 RMD160 b34d1d884929d7624ce0471caac4f0c421a854db SHA1 944c503a5e7a155236ed9a369c2d8c59c49366a3 SHA256 52401b8bb978b2742949f10d9168ac6c78d39a36535c6d1224ce493c66cb70f6
diff --git a/sys-cluster/libdlm/libdlm-3.1.0.ebuild b/sys-cluster/libdlm/libdlm-3.1.0.ebuild
index 6be4ace..7f7cdeb 100644
--- a/sys-cluster/libdlm/libdlm-3.1.0.ebuild
+++ b/sys-cluster/libdlm/libdlm-3.1.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils linux-mod versionator
+EAPI="4"
+
+inherit linux-info multilib toolchain-funcs versionator
 
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -10,40 +12,38 @@ 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"
+DESCRIPTION="General-purpose Distributed Lock Manager Library"
 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
 SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-kernel/linux-headers-2.6.24
-	!sys-cluster/dlm-headers
-	!sys-cluster/dlm-kernel
-	"
+IUSE="static-libs"
 
-RDEPEND="${DEPEND}"
+RDEPEND="!sys-cluster/dlm-headers
+	!sys-cluster/dlm-kernel"
+DEPEND="${RDEPEND}
+    >=sys-kernel/linux-headers-2.6.24"
 
 S="${WORKDIR}/${MY_P}/dlm/${PN}"
 
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--kernel_src=${KERNEL_DIR} \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--dlmlibdir=/usr/lib \
-			--dlmincdir=/usr/include \
-	) || die "configure problem"
-	
-	emake -j1 || die "compile problem"
+src_configure() {
+	cd "${WORKDIR}/${MY_P}"
+	./configure \
+		--cc=$(tc-getCC) \
+		--cflags="-Wall" \
+		--libdir=/usr/$(get_libdir) \
+		--disable_kernel_check \
+		--kernel_src=${KERNEL_DIR} \
+		--somajor="$MAJ_PV" \
+		--sominor="$MIN_PV" \
+		--dlmlibdir=/usr/$(get_libdir) \
+		--dlmincdir=/usr/include \
+	    || die "configure problem"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
+	default
+	use static-libs || rm -f "${D}"/usr/lib*/*.a
 }
diff --git a/sys-cluster/libdlmcontrol/Manifest b/sys-cluster/libdlmcontrol/Manifest
index 49ba33d..4537cdf 100644
--- a/sys-cluster/libdlmcontrol/Manifest
+++ b/sys-cluster/libdlmcontrol/Manifest
@@ -1,2 +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
+EBUILD libdlmcontrol-3.1.0.ebuild 1195 RMD160 dc0835d7898b8c761249b191f6c266eb82a5470b SHA1 8443a0afa9c8b1be78b578df7c040cd142a2720f SHA256 84c4363b25e54b658e3835d19ada8a208e8173653673acdb74703dcdbb7165e7
diff --git a/sys-cluster/libdlmcontrol/libdlmcontrol-3.1.0.ebuild b/sys-cluster/libdlmcontrol/libdlmcontrol-3.1.0.ebuild
index 9b70a0e..4d30ad7 100644
--- a/sys-cluster/libdlmcontrol/libdlmcontrol-3.1.0.ebuild
+++ b/sys-cluster/libdlmcontrol/libdlmcontrol-3.1.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils linux-mod versionator
+EAPI="4"
+
+inherit linux-info multilib toolchain-funcs versionator
 
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -10,40 +12,38 @@ 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"
+DESCRIPTION="General-purpose Distributed Lock Manager Control Library"
 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
 SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-kernel/linux-headers-2.6.24
-	!sys-cluster/dlm-headers
-	!sys-cluster/dlm-kernel
-	"
+IUSE="static-libs"
 
-RDEPEND="${DEPEND}"
+RDEPEND="!sys-cluster/dlm-headers
+	!sys-cluster/dlm-kernel"
+DEPEND="${RDEPEND}
+    >=sys-kernel/linux-headers-2.6.24"
 
 S="${WORKDIR}/${MY_P}/dlm/${PN}"
 
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--kernel_src=${KERNEL_DIR} \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--dlmcontrollibdir=/usr/lib \
-			--dlmcontrolincdir=/usr/include \
-	) || die "configure problem"
-	
-	emake -j1 || die "compile problem"
+src_configure() {
+	cd "${WORKDIR}/${MY_P}"
+	./configure \
+		--cc=$(tc-getCC) \
+		--cflags="-Wall" \
+		--libdir=/usr/$(get_libdir) \
+		--disable_kernel_check \
+		--kernel_src=${KERNEL_DIR} \
+		--somajor="$MAJ_PV" \
+		--sominor="$MIN_PV" \
+		--dlmcontrollibdir=/usr/$(get_libdir) \
+		--dlmcontrolincdir=/usr/include \
+	    || die "configure problem"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
+	default
+	use static-libs || rm -f "${D}"/usr/lib*/*.a
 }
diff --git a/sys-cluster/libfence/Manifest b/sys-cluster/libfence/Manifest
index abdd02f..2a3b66c 100644
--- a/sys-cluster/libfence/Manifest
+++ b/sys-cluster/libfence/Manifest
@@ -1,2 +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
+EBUILD libfence-3.1.0.ebuild 1398 RMD160 a1121b2f063bb184096aee6ecb6188205f17ec6b SHA1 b613d2c30e7d9ac308bb446006cb07bb505f54d9 SHA256 29fca1b94b26e721c1dcf84cc350d5f6c618db8a03cce00bd0e7c63a2e23666e
diff --git a/sys-cluster/libfence/libfence-3.1.0.ebuild b/sys-cluster/libfence/libfence-3.1.0.ebuild
index 6abe31f..de72166 100644
--- a/sys-cluster/libfence/libfence-3.1.0.ebuild
+++ b/sys-cluster/libfence/libfence-3.1.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils linux-mod versionator
+EAPI="4"
+
+inherit linux-info multilib toolchain-funcs versionator
 
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -10,45 +12,49 @@ 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"
+DESCRIPTION="Cluster Fencing Library"
 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
 SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-kernel/linux-headers-2.6.24
-	sys-cluster/libccs
-	"
+IUSE="static-libs"
 
-RDEPEND="${DEPEND}"
+RDEPEND="~sys-cluster/libccs-${PV}"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.24"
 
 S="${WORKDIR}/${MY_P}/fence"
 
+src_configure() {
+	cd "${WORKDIR}/${MY_P}"
+	./configure \
+		--cc=$(tc-getCC) \
+		--cflags="-Wall" \
+		--libdir=/usr/$(get_libdir) \
+		--disable_kernel_check \
+		--kernel_src=${KERNEL_DIR} \
+		--somajor="$MAJ_PV" \
+		--sominor="$MIN_PV" \
+		--fencelibdir=/usr/$(get_libdir) \
+		--fenceincdir=/usr/include \
+		--fencedlibdir=/usr/$(get_libdir) \
+		--fencedincdir=/usr/include \
+		--ccslibdir=/usr/$(get_libdir) \
+		--ccsincdir=/usr/include \
+	    || die "configure problem"
+}
+
 src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--kernel_src=${KERNEL_DIR} \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--fencelibdir=/usr/lib \
-			--fenceincdir=/usr/include \
-			--fencedlibdir=/usr/lib \
-			--fencedincdir=/usr/include \
-	) || die "configure problem"
-	
 	for i in libfence libfenced; do
-		emake -C ${i} || die "compile problem"
+		emake -C ${i}
 	done
 }
 
 src_install() {
 	for i in libfence libfenced; do
-		emake DESTDIR="${D}" -C ${i} install || die "install problem"
+		emake DESTDIR="${D}" -C ${i} install
 	done
+	use static-libs || rm -f "${D}"/usr/lib*/*.a
 }
diff --git a/sys-cluster/liblogthread/Manifest b/sys-cluster/liblogthread/Manifest
index 0ea2956..f74c354 100644
--- a/sys-cluster/liblogthread/Manifest
+++ b/sys-cluster/liblogthread/Manifest
@@ -1,2 +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
+EBUILD liblogthread-3.1.0.ebuild 1100 RMD160 7dde1d2417c94c4c73f5d8bc7e3caa0944bd2883 SHA1 64e18cb46b43bb316aef51938f7973ee72bcbbab SHA256 d87d0b34e1c8b0e8fb18a279e12316e6fa0fb7a392d9d7846020ac410cce7910
diff --git a/sys-cluster/liblogthread/liblogthread-3.1.0.ebuild b/sys-cluster/liblogthread/liblogthread-3.1.0.ebuild
index c09315a..7fda391 100644
--- a/sys-cluster/liblogthread/liblogthread-3.1.0.ebuild
+++ b/sys-cluster/liblogthread/liblogthread-3.1.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils linux-mod versionator
+EAPI="4"
+
+inherit linux-info multilib toolchain-funcs versionator
 
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -10,38 +12,36 @@ 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"
+DESCRIPTION="Thread-Safe Syslog Logging Library"
 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
 SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-kernel/linux-headers-2.6.24
-	"
+IUSE="static-libs"
 
-RDEPEND="${DEPEND}"
+RDEPEND=""
+DEPEND=">=sys-kernel/linux-headers-2.6.24"
 
 S="${WORKDIR}/${MY_P}/common/${PN}"
 
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--kernel_src=${KERNEL_DIR} \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--logtlibdir=/usr/lib \
-			--logtincdir=/usr/include \
-	) || die "configure problem"
-	
-	emake -j1 || die "compile problem"
+src_configure() {
+	cd "${WORKDIR}/${MY_P}"
+	./configure \
+		--cc=$(tc-getCC) \
+		--cflags="-Wall" \
+		--libdir=/usr/$(get_libdir) \
+		--disable_kernel_check \
+		--kernel_src=${KERNEL_DIR} \
+		--somajor="$MAJ_PV" \
+		--sominor="$MIN_PV" \
+		--logtlibdir=/usr/$(get_libdir) \
+		--logtincdir=/usr/include \
+	    || die "configure problem"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
+	default
+	use static-libs || rm -f "${D}"/usr/lib*/*.a
 }
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 58e324b..f507513 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -2,4 +2,4 @@ AUX pacemaker-1.1.5-autotools.patch 10094 RMD160 fc2c40684eee70a2d6899c2bae1518a
 AUX pacemaker.initd 922 RMD160 1ee204b244f3e40a6fb272f43d0cf11d7e4404d0 SHA1 7ffa0222674d5003d550b51bad7f0735366ffe01 SHA256 0253da4a3a91d8c3aa7badd30062cbba32a0626b77f1a27db1d731d1bbe133af
 AUX pacemaker.service 105 RMD160 e743788acefa97f879ea67b5b3bbbff715c71bce SHA1 42739d9a111a25a643d8f5f8b9fdd2cf1267853a SHA256 43034635a3a92ef55bf638ea3e29c2285240228283a70fbd88fe5e28c0d57c8c
 DIST Pacemaker-1.1.5.tar.bz2 23531621 RMD160 56761cb9bb9aa22d0275fedc851269a5f472d29e SHA1 da8c6f09e549879961231028582fdbe69c9ac8c6 SHA256 aa1dcf2dc6deff3676fa7d0938f80bb4f163011d491d0478798e971ca2d58fb2
-EBUILD pacemaker-1.1.5.ebuild 2210 RMD160 2320bbab2916c77935900868d88df7dd461dd206 SHA1 23d0269330f9514af260e384e78eaa87ab362891 SHA256 f1a0315cc61e50f144c078dade036f9724c60006d4a3be82cda9c96353cc483e
+EBUILD pacemaker-1.1.5.ebuild 2211 RMD160 3862e48ac2cec771c4d117b59f6de69aacc889c6 SHA1 086deb68cdaa419b762c4d2524c7080e907c8091 SHA256 031777077c95758591753b2c24b04e5d22381a11fb6d9da53022ff25072010e1
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
index 94665ce..42b5adb 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
@@ -4,10 +4,11 @@
 
 EAPI="2"
 
+inherit autotools base eutils flag-o-matic multilib python
+
 MY_PN="Pacemaker"
 MY_P="${MY_PN}-${PV}"
 PYTHON_DEPEND="2"
-inherit autotools base eutils flag-o-matic multilib python
 
 DESCRIPTION="Pacemaker CRM"
 HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
diff --git a/sys-fs/gfs2-utils/Manifest b/sys-fs/gfs2-utils/Manifest
new file mode 100644
index 0000000..8fdbf7c
--- /dev/null
+++ b/sys-fs/gfs2-utils/Manifest
@@ -0,0 +1,2 @@
+DIST gfs2-utils-3.1.1.tar.gz 333918 RMD160 bb6c9fde301d98b4457fc3caf131b2cc51bf2742 SHA1 f76a6ed93256c6be826d78fbcf3043a70bf338e4 SHA256 6e8b4e0a61485b5ef42d11552890c7094afa05ab488c63749a5b98480a664033
+EBUILD gfs2-utils-3.1.1.ebuild 862 RMD160 c95e706f197cc4d28a9b36ebc826a73186749f64 SHA1 f867db0fa77232092bc67a2d985a00be3804b844 SHA256 c7d3d0f52fd365e7484916d651a81b5d8b4d3b86db6160b69104e9f144b1ded8
diff --git a/sys-fs/gfs2-utils/gfs2-utils-3.1.1.ebuild b/sys-fs/gfs2-utils/gfs2-utils-3.1.1.ebuild
new file mode 100644
index 0000000..e6788fc
--- /dev/null
+++ b/sys-fs/gfs2-utils/gfs2-utils-3.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit autotools linux-info
+
+DESCRIPTION="GFS2 Utilities"
+HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
+SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="sys-cluster/corosync
+	sys-cluster/openais
+	sys-cluster/liblogthread
+	sys-cluster/libccs
+	sys-cluster/libfence
+	sys-cluster/libdlm
+	sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	mkdir m4
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		--with-kernel="${KERNEL_DIR}" \
+		--localstatedir=/var
+}
+
+src_install() {
+	default
+	rm -rf "${D}/usr/share/doc"
+	dodoc doc/*.txt
+	keepdir /var/{lib,log,run}/cluster
+}