Ebuild cleanup, version bump.

Package-Manager: portage-2.1.4.4

10 files changed, 82 insertions, 212 deletions

diff --git a/sys-fs/gfs/ChangeLog b/sys-fs/gfs/ChangeLog
index 9d230c443afc..3148af64fd28 100644
--- a/sys-fs/gfs/ChangeLog
+++ b/sys-fs/gfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/gfs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.33 2008/03/23 22:43:30 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.34 2008/11/13 19:17:40 xmerlin Exp $
+
+*gfs-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> -files/gfs-1.0x.rc,
+  -gfs-1.02.00-r1.ebuild, -gfs-1.03.00.ebuild, -gfs-1.04.00.ebuild,
+  -gfs-2.02.00.ebuild, -gfs-2.02.00-r1.ebuild, +gfs-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
 
 *gfs-2.02.00-r1 (23 Mar 2008)
 
diff --git a/sys-fs/gfs/gfs-1.02.00-r1.ebuild b/sys-fs/gfs/gfs-1.02.00-r1.ebuild
deleted file mode 100644
index cbc1d5847ab9..000000000000
--- a/sys-fs/gfs/gfs-1.02.00-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-1.02.00-r1.ebuild,v 1.8 2008/03/17 17:30:28 xmerlin Exp $
-
-inherit eutils
-
-CLUSTER_RELEASE="1.02.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-CVS_RELEASE="20060713"
-
-DESCRIPTION="Shared-disk cluster file system"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/${PN}-${PV}-${CVS_RELEASE}-cvs.patch.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${PN}-${PV}-${CVS_RELEASE}-cvs.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="=sys-cluster/gfs-headers-${CLUSTER_RELEASE}*
-	=sys-cluster/iddev-${CLUSTER_RELEASE}*
-	sys-fs/e2fsprogs
-	"
-
-RDEPEND="sys-fs/e2fsprogs
-	=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-${CLUSTER_RELEASE}*
-	=sys-cluster/magma-${CLUSTER_RELEASE}*
-	=sys-cluster/magma-plugins-${CLUSTER_RELEASE}*
-	=sys-cluster/fence-${CLUSTER_RELEASE}*
-	"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${PN}-${PV}-${CVS_RELEASE}-cvs.patch || die
-}
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	keepdir /etc/cluster || die
-	newinitd "${FILESDIR}"/${PN}-1.0x.rc ${PN} || die
-}
diff --git a/sys-fs/gfs/gfs-1.03.00.ebuild b/sys-fs/gfs/gfs-1.03.00.ebuild
deleted file mode 100644
index 86dcf1e16987..000000000000
--- a/sys-fs/gfs/gfs-1.03.00.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-1.03.00.ebuild,v 1.7 2008/03/17 17:30:28 xmerlin Exp $
-
-CLUSTER_RELEASE="1.03.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="Shared-disk cluster file system"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="=sys-cluster/gfs-headers-${CLUSTER_RELEASE}*
-	=sys-cluster/iddev-${CLUSTER_RELEASE}*
-	sys-fs/e2fsprogs
-	"
-
-RDEPEND="sys-fs/e2fsprogs
-	=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-${CLUSTER_RELEASE}*
-	=sys-cluster/magma-${CLUSTER_RELEASE}*
-	=sys-cluster/magma-plugins-${CLUSTER_RELEASE}*
-	=sys-cluster/fence-${CLUSTER_RELEASE}*
-	"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	keepdir /etc/cluster || die
-	newinitd "${FILESDIR}"/${PN}-1.0x.rc ${PN} || die
-}
diff --git a/sys-fs/gfs/gfs-1.04.00.ebuild b/sys-fs/gfs/gfs-1.04.00.ebuild
deleted file mode 100644
index 79da46b4c70b..000000000000
--- a/sys-fs/gfs/gfs-1.04.00.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-1.04.00.ebuild,v 1.3 2008/03/17 17:30:28 xmerlin Exp $
-
-CLUSTER_RELEASE="1.04.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="Shared-disk cluster file system"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="=sys-cluster/gfs-headers-${CLUSTER_RELEASE}*
-	=sys-cluster/iddev-${CLUSTER_RELEASE}*
-	sys-fs/e2fsprogs
-	"
-
-RDEPEND="sys-fs/e2fsprogs
-	=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-${CLUSTER_RELEASE}*
-	=sys-cluster/magma-${CLUSTER_RELEASE}*
-	=sys-cluster/magma-plugins-${CLUSTER_RELEASE}*
-	=sys-cluster/fence-${CLUSTER_RELEASE}*
-	"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	keepdir /etc/cluster || die
-	newinitd "${FILESDIR}"/${PN}-1.0x.rc ${PN} || die
-}
diff --git a/sys-fs/gfs/gfs-2.02.00.ebuild b/sys-fs/gfs/gfs-2.03.09.ebuild
index 56f4faf1dbba..77dd34ad676f 100644
--- a/sys-fs/gfs/gfs-2.02.00.ebuild
+++ b/sys-fs/gfs/gfs-2.03.09.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-2.02.00.ebuild,v 1.2 2008/03/17 23:12:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-2.03.09.ebuild,v 1.1 2008/11/13 19:17:40 xmerlin Exp $
 
 inherit eutils versionator
 
+CVS_RELEASE="20080323"
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
 
@@ -29,14 +30,20 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}/${PN}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+}
+
 src_compile() {
 	(cd "${WORKDIR}"/${MY_P};
 		./configure \
 			--cc=$(tc-getCC) \
 			--cflags="-Wall" \
 			--disable_kernel_check \
-			--release_major="$MAJ_PV" \
-			--release_minor="$MIN_PV" \
+			--somajor="$MAJ_PV" \
+			--sominor="$MIN_PV" \
 	) || die "configure problem"
 
 	# gfs now depeneds on gfs2, due to common mount command.
diff --git a/sys-fs/gfs2/ChangeLog b/sys-fs/gfs2/ChangeLog
new file mode 100644
index 000000000000..b4beda1823b1
--- /dev/null
+++ b/sys-fs/gfs2/ChangeLog
@@ -0,0 +1,16 @@
+# ChangeLog for sys-fs/gfs2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs2/ChangeLog,v 1.1 2008/11/13 19:19:30 xmerlin Exp $
+
+*gfs2-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> +files/gfs2.rc,
+  +metadata.xml, +gfs2-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
+
+*gfs2-2.02.00 (17 Mar 2008)
+
+  17 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> +files/gfs2.rc,
+  +metadata.xml, +gfs2-2.02.00.ebuild:
+  Initial import.
+
diff --git a/sys-fs/gfs2/Manifest b/sys-fs/gfs2/Manifest
new file mode 100644
index 000000000000..cc06da652a88
--- /dev/null
+++ b/sys-fs/gfs2/Manifest
@@ -0,0 +1,5 @@
+AUX gfs2.rc 3982 RMD160 336857fc829dd2e358c56f85a763745565f5fc68 SHA1 d12ed163c9942af573cc64e2aa0b1612bd61afcd SHA256 7c49c243810b7e22928a4522832c8b499f1d08ffbb35cdec7ee6ecf35952a310
+DIST cluster-2.03.09.tar.gz 1784357 RMD160 9ac5c3fd0fece8ec17bd31d116c43b33612741d0 SHA1 c2cdbc657da2a9efde4b1e6d2657170e1c09b5b8 SHA256 b6d6f35f58b2f8628c369391e0fd01b1803af40029ec1e6ef88865dda38b855f
+EBUILD gfs2-2.03.09.ebuild 1630 RMD160 2b9ca998a7e9e944ba4cba2337e9750d54baca57 SHA1 f70d54bdf60a7fe19e1e283b5efc5de3f419082a SHA256 6c380e11f02da4ce5c29fcbeeaca5ca18aa4e58d144d60193bf6e186d08fa391
+MISC ChangeLog 440 RMD160 bd5cc28fc7fb2f0dff44439c35659a3bea953d51 SHA1 aadd6f9575b77916f6c82bfbaf3727fc9576e6a3 SHA256 fdc8c0116cf97e30cac0bc2a7cef1a4869d39e40329d8aaf5f3fbfb949aea80e
+MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
diff --git a/sys-fs/gfs/files/gfs-1.0x.rc b/sys-fs/gfs2/files/gfs2.rc
index cf7dbccf6d3e..ee52247e4b9e 100755
--- a/sys-fs/gfs/files/gfs-1.0x.rc
+++ b/sys-fs/gfs2/files/gfs2.rc
@@ -1,13 +1,13 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/files/gfs-1.0x.rc,v 1.1 2008/03/17 17:30:29 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs2/files/gfs2.rc,v 1.1 2008/11/13 19:19:30 xmerlin Exp $
 
 opts="${opts} mountall"
 
 depend() {
-	local myneed="cluster-manager cluster-locking-manager fenced"
-	local devices="$(awk '!/^#/ && $3 == "gfs" && $4 !~ /noauto/ {print $1 }' /etc/fstab)"
+	local myneed="cman"
+	local devices="$(awk '!/^#/ && $3 == "gfs2" && $4 !~ /noauto/ {print $1 }' /etc/fstab)"
 
 	if [ -n "${devices}" ]; then
 		local device=""
@@ -24,12 +24,11 @@ depend() {
 
 	use dns logger net
 	need ${myneed}
-	provide cluster
 }
 
-mount_gfs_filesystems() {
+mount_gfs2_filesystems() {
 	local remaining=""
-	remaining="$(awk '!/^#/ && $3 == "gfs"  { if ($4 !~ "noauto") print $1 }' /etc/fstab)"
+	remaining="$(awk '!/^#/ && $3 == "gfs2"  { if ($4 !~ "noauto") print $1 }' /etc/fstab)"
 	
 	if [ -n "${remaining}" ]; then
 	
@@ -48,13 +47,14 @@ mount_gfs_filesystems() {
 			einfo "Mounting GFS filesystems"
 			device=""
 			for device in ${remaining_verified}; do
-				local target="$(awk '!/^#/ && $3 == "gfs" && $1 == device { print $2 }' device=${device} /etc/fstab)"
-				local mounted="$(awk '$3 == "gfs" && $1 == device { print $2 }' device=${device} /proc/mounts)"
+				local target="$(awk '!/^#/ && $3 == "gfs2" && $1 == device { print $2 }' device=${device} /etc/fstab)"
+				local mounted="$(awk '$3 == "gfs2" && $1 == device { print $2 }' device=${device} /proc/mounts)"
+				local options="$(awk '!/^#/ && $3 == "gfs2" && $1 == device { print $4 }' device=${device} /etc/fstab)"
 				
 				# mount only filesystems not already mounted
 				if [ -z "${mounted}" ]; then
 					ebegin "--> mounting ${device} on ${target}"
-					mount -t gfs ${device} ${target} >/dev/null
+					mount -t gfs2 ${device} ${target} -o ${options} >/dev/null
 					eend $?
 				else
 					einfo "--> ${device} already mounted on ${target}"
@@ -68,9 +68,9 @@ mount_gfs_filesystems() {
 }
 
 
-umount_gfs_filesystems() {
+umount_gfs2_filesystems() {
 	local sig retry
-	local remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
+	local remaining="$(awk '$3 == "gfs2" { print $2 }' /proc/mounts | sort -r)"
 
 	if [ -n "${remaining}" ]
 	then
@@ -88,7 +88,7 @@ umount_gfs_filesystems() {
 	                        umount ${remaining} &>/dev/null
 	                        eend $? "Failed to unmount GFS filesystems"
 	                fi
-	                remaining="$(awk '$3 == "gfs" { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
+	                remaining="$(awk '$3 == "gfs2" { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
 	                [ -z "${remaining}" ] && break
 	                /bin/fuser -k -m ${sig} ${remaining} &>/dev/null
 	                sleep 5
@@ -120,44 +120,24 @@ unload_modules() {
 	done
 }
 
-load_gfs_modules() {
-	local modules
-	
-	# detect cluster/locking manager cman+dlm or gulm ?
-	if [ -d /proc/cluster/config/cman ]; then
-		if [ ! -d /proc/cluster/lock_dlm ]; then
-			modules="${modules} lock_dlm"
-		fi
-	else
-		if [ ! -d /proc/cluster/lock_gulm ]; then
-			modules="${modules} lock_gulm"
-		fi
+load_gfs2_modules() {
+	if [ ! -f /proc/fs/gfs2 ]; then
+		load_modules gfs2
 	fi
-	if [ ! -f /proc/fs/gfs ]; then
-		modules="${modules} gfs"
-	fi
-	load_modules ${modules}
 }
 
-unload_gfs_modules() {
-	if [ -f /proc/fs/gfs ]; then
-		modules="gfs lock_harness"
-	fi
-	if [ -d /proc/cluster/lock_dlm ]; then
-		modules="${modules} lock_dlm"
-	fi
-	if [ -d /proc/cluster/lock_gulm ]; then
-		modules="${modules} lock_gulm"
+unload_gfs2_modules() {
+	if [ -f /proc/fs/gfs2 ]; then
+		unload_modules gfs2
 	fi
-	unload_modules ${modules}
 }
 
 mountall() {
-	mount_gfs_filesystems
+	mount_gfs2_filesystems
 }
 
 start() {
-	einfo "Starting gfs cluster:"
+	einfo "Starting gfs2 cluster:"
 	
 	if [ ! -f /etc/ntp.conf ] ; then
 		eerror "Please create /etc/ntp.conf"
@@ -165,14 +145,14 @@ start() {
 		eend 1
 	fi
 	
-	load_gfs_modules
-	mount_gfs_filesystems
+	load_gfs2_modules
+	mount_gfs2_filesystems
 }
 
 stop() {
-	einfo "Stopping gfs cluster:"
+	einfo "Stopping gfs2 cluster:"
 	
-	umount_gfs_filesystems
-	unload_gfs_modules
+	umount_gfs2_filesystems
+	unload_gfs2_modules
 }
 
diff --git a/sys-fs/gfs/gfs-2.02.00-r1.ebuild b/sys-fs/gfs2/gfs2-2.03.09.ebuild
index 2f7680f5b025..5c8e086084a9 100644
--- a/sys-fs/gfs/gfs-2.02.00-r1.ebuild
+++ b/sys-fs/gfs2/gfs2-2.03.09.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-2.02.00-r1.ebuild,v 1.1 2008/03/23 22:43:30 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs2/gfs2-2.03.09.ebuild,v 1.1 2008/11/13 19:19:30 xmerlin Exp $
 
 inherit eutils versionator
 
-CVS_RELEASE="20080323"
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
 
@@ -13,16 +12,13 @@ MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
 
 DESCRIPTION="Shared-disk cluster file system"
 HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2
-	http://dev.gentoo.org/~xmerlin/gfs/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-#RDEPEND="=sys-cluster/gfs2-${CLUSTER_RELEASE}*"
 RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
 	=sys-cluster/cman-${CLUSTER_RELEASE}*
 	=sys-cluster/fence-${CLUSTER_RELEASE}*
@@ -30,15 +26,12 @@ RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
 
 DEPEND="${RDEPEND}"
 
+
 S="${WORKDIR}/${MY_P}/${PN}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	(cd "${WORKDIR}"/${MY_P};
-		epatch "${WORKDIR}"/gfs-2.02.00-20080323-cvs.patch || die
-	)
 }
 
 src_compile() {
@@ -51,21 +44,15 @@ src_compile() {
 			--sominor="$MIN_PV" \
 	) || die "configure problem"
 
-	# gfs now depeneds on gfs2, due to common mount command.
-	# to avoid a dependency on gfs2, we simply build its mount command twice
-	# and rename it
-	sed -i \
-		-e '/ln -sf [u]\?mount.gfs2 [u]\?mount.gfs/d' \
-		Makefile
-
-	(cd "${WORKDIR}"/${MY_P}/gfs2/mount;
-		emake -j1 \
-	) || die "compile problem"
+	# fix symlinks error
+	#sed -i \
+	#	-e '\@\tln -sf ${sbindir}/${TARGET1}@s@${sbindir}/@@' \
+	#	mkfs/Makefile fsck/Makefile
 
 	# fix -ggdb CFLAGS
 	#sed -i \
 	#	-e '/-ggdb/d' \
-	#	libgfs/Makefile
+	#	edit/Makefile mkfs/Makefile libgfs2/Makefile
 
 	# fix the manual pages have executable bit
 	sed -i -e '
@@ -79,11 +66,8 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "install problem"
 
-	mv "${WORKDIR}"/${MY_P}/gfs2/mount/mount.gfs2 "${D}"/sbin/mount.gfs
-	mv "${WORKDIR}"/${MY_P}/gfs2/mount/umount.gfs2 "${D}"/sbin/umount.gfs
-
 	keepdir /etc/cluster || die
-	newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die
+	newinitd "${FILESDIR}"/${PN}.rc ${PN} || die
 
 	if use doc ; then
 		dodoc "${WORKDIR}"/${MY_P}/doc/*.txt || die
diff --git a/sys-fs/gfs2/metadata.xml b/sys-fs/gfs2/metadata.xml
new file mode 100644
index 000000000000..b2c73e8f3872
--- /dev/null
+++ b/sys-fs/gfs2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ha-cluster</herd>
+<maintainer>
+  <email>ha-cluster@gentoo.org</email>
+</maintainer>
+</pkgmetadata>