4 files changed, 141 insertions, 8 deletions
diff --git a/sys-cluster/pvfs2/ChangeLog b/sys-cluster/pvfs2/ChangeLog
index a112ea8708bf..011b5db72c00 100644
--- a/sys-cluster/pvfs2/ChangeLog
+++ b/sys-cluster/pvfs2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/pvfs2
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/ChangeLog,v 1.6 2007/10/05 14:03:12 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/ChangeLog,v 1.7 2007/10/13 13:36:35 mabi Exp $
+
+*pvfs2-2.6.3-r1 (13 Oct 2007)
+
+  13 Oct 2007; Matti Bickel <mabi@gentoo.org> +pvfs2-2.6.3-r1.ebuild:
+  added server to IUSE, missed credits for the 2.6.3 ebuild: thanks to
+  Fernando Gutiérrez, Justin Bronder for all the work, tiny updates by me and
+  Adrian Knoth (all private email)
 
 *pvfs2-2.6.3 (05 Oct 2007)
 
diff --git a/sys-cluster/pvfs2/Manifest b/sys-cluster/pvfs2/Manifest
index 468d291d017e..10d60b17e6e8 100644
--- a/sys-cluster/pvfs2/Manifest
+++ b/sys-cluster/pvfs2/Manifest
@@ -51,14 +51,18 @@ EBUILD pvfs2-1.5.1.ebuild 1464 RMD160 e22aa50b13cadcb523472009feba21c6d173f58c S
 MD5 7f92a1c7e6e8cbe804bfcdc4b31c9c2f pvfs2-1.5.1.ebuild 1464
 RMD160 e22aa50b13cadcb523472009feba21c6d173f58c pvfs2-1.5.1.ebuild 1464
 SHA256 edafe431120365710251846f6cd68c48b774ec2c8e9bd1d644856d05b15cf46d pvfs2-1.5.1.ebuild 1464
+EBUILD pvfs2-2.6.3-r1.ebuild 3995 RMD160 3bd543f06f7a2163334160da91dc5d0fc230de27 SHA1 33d0c7a13ff2dff08419c410c84d71d2119a4fc8 SHA256 d8d64b735f89ebe10271ce40aeead56283608524dfbebda43c1163e7744d9e0b
+MD5 0a753b0bafca70c11684acd1e1f2e52a pvfs2-2.6.3-r1.ebuild 3995
+RMD160 3bd543f06f7a2163334160da91dc5d0fc230de27 pvfs2-2.6.3-r1.ebuild 3995
+SHA256 d8d64b735f89ebe10271ce40aeead56283608524dfbebda43c1163e7744d9e0b pvfs2-2.6.3-r1.ebuild 3995
 EBUILD pvfs2-2.6.3.ebuild 3905 RMD160 796f9e5e3b3fa3a2c9206d4f629d59a0c70a990b SHA1 47f532755af90f2efe4b6c68862a31485e4cc600 SHA256 caea9933087679dbcdbc1776813f495e6d03b098f5c2137f6de1844cdf972dff
 MD5 caf66e6128426b98a2a672b5e8e82355 pvfs2-2.6.3.ebuild 3905
 RMD160 796f9e5e3b3fa3a2c9206d4f629d59a0c70a990b pvfs2-2.6.3.ebuild 3905
 SHA256 caea9933087679dbcdbc1776813f495e6d03b098f5c2137f6de1844cdf972dff pvfs2-2.6.3.ebuild 3905
-MISC ChangeLog 1423 RMD160 8eb75edb8c1ebca031691e8b3772db6cf1dd940e SHA1 25126c14fa8242e224b5d939f5af4c95b3b45f31 SHA256 47ae71b034b63251ac6cbf464b323394641aa68b4f7ce062864c73e20f312ea8
-MD5 9cd77ed418ea3a70ef18aba252832e7d ChangeLog 1423
-RMD160 8eb75edb8c1ebca031691e8b3772db6cf1dd940e ChangeLog 1423
-SHA256 47ae71b034b63251ac6cbf464b323394641aa68b4f7ce062864c73e20f312ea8 ChangeLog 1423
+MISC ChangeLog 1710 RMD160 221814d6440a1adb761ddb8e230e516caa056e17 SHA1 58ce96a074bb5533b6731426bf72b558b663961f SHA256 2b93a759d30fb6859f969e5b0730aff56a9a78356e4e1589e42aa5e853d60926
+MD5 fbd45a5b962de1e92ca50fadb78bcc1a ChangeLog 1710
+RMD160 221814d6440a1adb761ddb8e230e516caa056e17 ChangeLog 1710
+SHA256 2b93a759d30fb6859f969e5b0730aff56a9a78356e4e1589e42aa5e853d60926 ChangeLog 1710
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
 MD5 6be723a646638c71a36096e65e6ef8f0 metadata.xml 163
 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 metadata.xml 163
@@ -69,10 +73,13 @@ SHA256 fcf877c9ce7112af65b7c8d8bbb1f844716fc52fb3a9cac3475b14107383914e files/di
 MD5 4bc10b25602e73fe3e1d88292dd04036 files/digest-pvfs2-2.6.3 235
 RMD160 12e2810c0fbb30c1d9b4c678ec5ce4b2e835bee7 files/digest-pvfs2-2.6.3 235
 SHA256 114639d022e3e3d7e0f1af6c94bed1ac5cbab5983d8009ff6fd867cc525af8b4 files/digest-pvfs2-2.6.3 235
+MD5 4bc10b25602e73fe3e1d88292dd04036 files/digest-pvfs2-2.6.3-r1 235
+RMD160 12e2810c0fbb30c1d9b4c678ec5ce4b2e835bee7 files/digest-pvfs2-2.6.3-r1 235
+SHA256 114639d022e3e3d7e0f1af6c94bed1ac5cbab5983d8009ff6fd867cc525af8b4 files/digest-pvfs2-2.6.3-r1 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHBkQofNMcoUhJ7GwRAndZAKCIGSO983feJk4DTpjnDrnTRjiltACfXCis
-G8yC0gzUYzgEYd0q4764fbs=
-=cMJy
+iD8DBQFHEMnqfNMcoUhJ7GwRAhJWAJ49PW/1+pgvEwof65gpfpgPuY5PJQCgnHWr
+OKEuD+Yrupxzxmrkoq2z+tg=
+=pRg9
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pvfs2/files/digest-pvfs2-2.6.3-r1 b/sys-cluster/pvfs2/files/digest-pvfs2-2.6.3-r1
new file mode 100644
index 000000000000..821ea2e0e1e1
--- /dev/null
+++ b/sys-cluster/pvfs2/files/digest-pvfs2-2.6.3-r1
@@ -0,0 +1,3 @@
+MD5 f7ba22bb0b4bdaadb69ca1c2d8e102a4 pvfs-2.6.3.tar.gz 3971014
+RMD160 a2dcfcf60bde46a3f99b1cc490e9148fdbaacda6 pvfs-2.6.3.tar.gz 3971014
+SHA256 e8468c277b8832ef26308400a41244fad6e98f38ffcfd417b42aae9f796c03f6 pvfs-2.6.3.tar.gz 3971014
diff --git a/sys-cluster/pvfs2/pvfs2-2.6.3-r1.ebuild b/sys-cluster/pvfs2/pvfs2-2.6.3-r1.ebuild
new file mode 100644
index 000000000000..7118218b3ea0
--- /dev/null
+++ b/sys-cluster/pvfs2/pvfs2-2.6.3-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/pvfs2-2.6.3-r1.ebuild,v 1.1 2007/10/13 13:36:35 mabi Exp $
+
+inherit linux-mod autotools toolchain-funcs
+
+MY_PN="${PN%[0-9]*}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Parallel Virtual File System version 2"
+HOMEPAGE="http://www.pvfs.org/pvfs2/"
+SRC_URI="ftp://ftp.parl.clemson.edu/pub/pvfs2/${MY_P}.tar.gz"
+IUSE="gtk server static doc"
+RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
+		 sys-libs/db"
+DEPEND="${RDEPEND}
+		virtual/linux-sources"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~x86"
+S="${WORKDIR}/${MY_P}"
+
+#Without this, the make kmod_install in src_install() would fail.
+#ARCH=$(tc-arch-kernel)
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if kernel_is 2 4; then
+		BUILD_TARGETS="just_kmod24"
+		ECONF_PARAMS="--with-kernel24=${KV_DIR}"
+		MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.4)"
+	else
+		BUILD_TARGETS="just_kmod"
+		ECONF_PARAMS="--with-kernel=${KV_DIR} --enable-verbose-build"
+		MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.6)"
+	fi
+
+	#Notice I don't include --disable-static because it makes the linker fail due to a missing library
+	#needed by LIBS_THREADED += -lpvfs2-threaded. However that library is only compiled if static is enabled. Anyway
+	#it is used to build pvfs2-client-core-threaded, which is not installed by make kmod_install (unstable perhaps?)
+	ECONF_PARAMS="${ECONF_PARAMS} --enable-mmap-racache $(use_enable !static shared)"
+	ECONF_PARAMS="${ECONF_PARAMS} $(use_enable gtk karma)"
+	ECONF_PARAMS="${ECONF_PARAMS} $(use_enable server)"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.5.1-destdir.patch
+	epatch "${FILESDIR}"/${PV}-link-librt-properly.patch
+	epatch "${FILESDIR}"/${PV}-soname.patch
+	epatch "${FILESDIR}"/${PV}-as-needed.patch
+
+	#Fix so we can install kernapps separate from kmod_install
+	sed -i '/^kmod_install: kmod/{
+		s/\(kmod_install:.*kernapps\)\(.*\)/\1_install\2\n.PHONY: kernapps_install\nkernapps_install: kernapps/}' Makefile.in
+	sed -i '/^kmod24_install: kmod/{
+		s/\(kmod24_install:.*kernapps\)\(.*\)/\1_install\2\n.PHONY: kernapps_install\nkernapps_install: kernapps/}' Makefile.in
+
+	if kernel_is gt 2 6 20 ; then
+		epatch "${FILESDIR}"/${PV}-register_sysctl_table.patch
+	fi
+
+	if kernel_is ge 2 6 22 ; then
+		epatch "${FILESDIR}"/${PV}-kmem-and-dtor-fix.patch
+	fi
+
+	#This is needed when gcc doesn't support -Wno-pointer-sign. Now it will give us some warnings so it also removes -Werror.
+	#It's unsafe, not recommended
+	if [ "$(gcc-major-version)" -lt "4" ]; then
+		ewarn "It's recommended to use gcc >= 4.0 to avoid the following patch"
+		epatch "${FILESDIR}"/${PV}-no-pointer-sign.patch
+	fi
+
+	AT_M4DIR="maint/config" eautoreconf
+}
+
+src_compile() {
+	econf ${ECONF_PARAMS} || die "Unable to run econf ${ECONF_PARAMS}"
+	linux-mod_src_compile || die "Unable to linux-mod_src_compile"
+	emake kernapps || die "Unable to make kernapps."
+	emake all || die "Unable to make all."
+}
+
+src_install() {
+	linux-mod_src_install || die "linux-mod_src_install failed"
+	emake DESTDIR="${D}" kernapps_install || die "kernapps_install failed"
+	emake DESTDIR="${D}" install || die "install failed"
+	if use server; then
+		newinitd "${FILESDIR}"/pvfs2-server.rc pvfs2-server
+		newconfd "${FILESDIR}"/pvfs2-server.conf pvfs2-server
+	fi
+	newinitd "${FILESDIR}"/pvfs2-client-init.d pvfs2-client
+	newconfd "${FILESDIR}"/pvfs2-client.conf pvfs2-client
+	dodoc AUTHORS CREDITS ChangeLog INSTALL README
+	docinto examples
+	dodoc examples/{fs.conf,pvfs2-server.rc,server.conf-localhost}
+	# this is LARGE (~5mb)
+	if use doc; then
+		docdir="/usr/share/doc/${PF}/"
+		cp -pPR "${S}"/doc "${D}${docdir}"
+		rm -rf "${D}${docdir}"/man
+	fi
+}
+
+pkg_preinst() {
+	linux-mod_pkg_preinst
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "To enable PVFS2 Server on boot you will have to add it to the"
+	elog "default profile, issue the following command as root to do so."
+	elog
+	elog "rc-update add pvfs2-server default"
+}