Updated 2.02.00 to STABLE2 20080323.

Package-Manager: portage-2.1.4.4

3 files changed, 105 insertions, 6 deletions

diff --git a/sys-fs/gfs/ChangeLog b/sys-fs/gfs/ChangeLog
index ad2197eb54e3..9d230c443afc 100644
--- a/sys-fs/gfs/ChangeLog
+++ b/sys-fs/gfs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.32 2008/03/21 11:59:51 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.33 2008/03/23 22:43:30 xmerlin Exp $
+
+*gfs-2.02.00-r1 (23 Mar 2008)
+
+  23 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  +gfs-2.02.00-r1.ebuild:
+  Updated 2.02.00 to STABLE2 20080323.
 
   21 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> files/gfs-2.0x.rc:
   Removed gulm from the init script, now it's deprecated.
diff --git a/sys-fs/gfs/Manifest b/sys-fs/gfs/Manifest
index 13c2e199d5ba..19481ad1919c 100644
--- a/sys-fs/gfs/Manifest
+++ b/sys-fs/gfs/Manifest
@@ -6,18 +6,20 @@ AUX gfs-2.0x.rc 3959 RMD160 47af3ef7e75fead4164f85da8828ec1fb87d48bb SHA1 fcdc78
 DIST cluster-1.02.00.tar.gz 1356451 RMD160 e9c0cdd1f5a7542c8a4ea38ccf6d057767269dc5 SHA1 d74cadb1ef21d1cfda333b20d7ef20272e0002d6 SHA256 de45885146f1481808f7a34af5e6b7e2042895a4e3844eaa6161f942345c7849
 DIST cluster-1.03.00.tar.gz 1658274 RMD160 6fc16e2edba73dd1a83ecfad749b1553eca6d938 SHA1 c205d8ec034433c33f26724f7f69b0028d2a63d4 SHA256 e61c2438c7ee8d546aec9dd86ee1851c9a71f127c25ad1fb0c59eb4ed534e97b
 DIST cluster-1.04.00.tar.gz 1663798 RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 SHA1 af3bb244a11a6a26c31b142009f6c1f771799337 SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2
-DIST cluster-2.02.00.tar.gz 8316680 RMD160 3d054699b91f57d8b07d7013dd718a7662d712aa SHA1 8471618222882427ca395f098695c33d2466559c SHA256 c68a62b49780a59dcf075e57fc2aac4524dd27e63ad80c8a2f1313307bca9498
+DIST cluster-2.02.00.tar.gz 1764851 RMD160 b5a56a0ae69c2959c85e5e89319f96c974d8efb1 SHA1 c86510ed8be84704271c10466cd5a4732eb5f6c9 SHA256 92117aa02d17cdde9ae7d6e71c2b12314a99e24e90f131c491e97d8fbda52196
 DIST gfs-1.02.00-20060713-cvs.patch.gz 16947 RMD160 0168763ffeabb7b4604415a30001c52f04b9f62d SHA1 10cb9b6a56b3b3fcef843c5f2a9f304b3998b87e SHA256 66687928c6208f1301c66118cbd38e96359e71dc8c9864753ca7e5833d1cda42
+DIST gfs-2.02.00-20080323-cvs.patch.bz2 25743 RMD160 648b85f02231bd81a8cfcc6a334d70b76a445780 SHA1 3061d9b4a703dd582b30fc60b981f5a8c2fc863d SHA256 699297ea985d7eb69c94c27d0cb661187047afe56110b88bab68afdf15f1b072
 EBUILD gfs-1.02.00-r1.ebuild 1406 RMD160 1b7faed1faea4223bce965468539e5a5dee61b46 SHA1 dd197aa7c5613eefae21adca3cf16dfde3eaa47f SHA256 21a6ac245ff6b668209c3bb7f744ff94a37d9b05aa2b5968bfe3146a9fd94653
 EBUILD gfs-1.03.00.ebuild 1124 RMD160 2f4323d575b357b29554947334ea05ea3ab13734 SHA1 969520150fb6ad47669722a742c8cdaa91341310 SHA256 e18bb18e5f61c96acf5dcffac0c7a46bb705f57ddb0b0e86f1212a45460fbcdb
 EBUILD gfs-1.04.00.ebuild 1125 RMD160 6208632ec8a1bbe6ea0886d3944b3a0db2212bb4 SHA1 0c10be46d403f50996c6df98ccf1345dc60b7ac6 SHA256 769ed1e4831bb8463fabadc0813e86c6b2bdd45b0b94e468ec63d3d87ff946c3
+EBUILD gfs-2.02.00-r1.ebuild 2313 RMD160 ea9749b85a5c880b4fd6bd1f758af007d0637d2b SHA1 5614ec501c588661a3f8646373a8afdeb3c1362a SHA256 496a24d4873182f81e42a5cab6f893d95192f9ea0a24405022d385f7b169331d
 EBUILD gfs-2.02.00.ebuild 2037 RMD160 92bd5a015586443ad1e9f17166d1ff08803d930a SHA1 d95ab859991403e9062253757068364b307c090b SHA256 4778decc4c9f75e2e5b8e35a3d71b7ebcc002b86d67e0b08ad3cf8b0d5e76c45
-MISC ChangeLog 4631 RMD160 df2f97326b00da392223f393c6bec3d8cf3bdee2 SHA1 107de75a2cf0138e0e5bc6d018ef8165ff44eb3c SHA256 165b1575206f5ade9d0beda67cb197f8d480e683616430dde2da7d9469789e2b
+MISC ChangeLog 4782 RMD160 a6db4096f61c314cce6c7880ba9d28bd9fabef9c SHA1 6b81b481239cfcda41c3e9949414363b198bdbcb SHA256 117ba54f379c9b20251e0cff0431a959b279740394c414107a9c891b2e81dc2d
 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH46NLgMUyd/cdjWsRAscTAJ926JzjaSdpdHWDdU/MuROyTld57gCfdVDG
-lSjXNszWjteh2QGQ8e3+Jy0=
-=lygN
+iD8DBQFH5t0bgMUyd/cdjWsRAia3AJ9hTfGldcRVBCNaDlYDqBh8hqmhXACfVGHq
+q8VWUvx8/yVnCVuXWg8PVQQ=
+=Ligh
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/gfs/gfs-2.02.00-r1.ebuild b/sys-fs/gfs/gfs-2.02.00-r1.ebuild
new file mode 100644
index 000000000000..2f7680f5b025
--- /dev/null
+++ b/sys-fs/gfs/gfs-2.02.00-r1.ebuild
@@ -0,0 +1,91 @@
+# 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 $
+
+inherit eutils versionator
+
+CVS_RELEASE="20080323"
+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="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"
+
+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}*
+	sys-fs/e2fsprogs"
+
+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() {
+	(cd "${WORKDIR}"/${MY_P};
+		./configure \
+			--cc=$(tc-getCC) \
+			--cflags="-Wall" \
+			--disable_kernel_check \
+			--somajor="$MAJ_PV" \
+			--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 -ggdb CFLAGS
+	#sed -i \
+	#	-e '/-ggdb/d' \
+	#	libgfs/Makefile
+
+	# fix the manual pages have executable bit
+	sed -i -e '
+		/\tinstall -d/s/install/& -m 0755/; t
+		/\tinstall/s/install/& -m 0644/' \
+		man/Makefile
+
+	emake -j1 clean all || die "compile problem"
+}
+
+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
+
+	if use doc ; then
+		dodoc "${WORKDIR}"/${MY_P}/doc/*.txt || die
+	fi
+}