6 files changed, 71 insertions, 21 deletions
diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index df5554dee598..7c4d16dca30c 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/openafs-kernel
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.6 2005/07/29 18:01:27 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.7 2005/09/01 23:51:34 stefaan Exp $
+
+*openafs-kernel-1.4.0_rc2 (01 Sep 2005)
+
+  01 Sep 2005; Stefaan De Roeck <stefaan.deroeck@gentoo.org>
+  openafs-kernel-1.2.13.ebuild, +openafs-kernel-1.4.0_rc2.ebuild:
+  version bump to 1.4.0 rc2 in the 1.4 family
 
   29 Jul 2005; Daniel Drake <dsd@gentoo.org> openafs-kernel-1.2.13.ebuild,
   openafs-kernel-1.3.85.ebuild:
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index 0fecc9908bc0..b1ac9d3e60ff 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4b4125b4c4a4d5d3c5b5bde63c2ec185 openafs-kernel-1.3.85.ebuild 1376
-MD5 03a2e43ef2368865b61663bc06a95c5e openafs-kernel-1.2.13.ebuild 1542
-MD5 0e547044c89ccb5b4c259e3a8f248528 ChangeLog 1138
+MD5 a6472bd664d4a27a835d41a6b7e4e20d ChangeLog 1357
 MD5 59bbb0e897a1a23a82305e12742e9ac6 metadata.xml 398
-MD5 87bbfd1999ad85475d820a6c42e49e84 files/digest-openafs-kernel-1.2.13 143
+MD5 a4552f859ce00bdeffa11204fe7d8122 openafs-kernel-1.2.13.ebuild 1540
+MD5 4b4125b4c4a4d5d3c5b5bde63c2ec185 openafs-kernel-1.3.85.ebuild 1376
+MD5 9e7610ee8b00a013d40a951fab61f48b openafs-kernel-1.4.0_rc2.ebuild 1409
+MD5 154b7f0bf57bb9377c49d03565366b15 files/digest-openafs-kernel-1.2.13 144
 MD5 783c2d18fada2fa1d874b8aabf98e84d files/digest-openafs-kernel-1.3.85 143
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC6mw1TOXg++0VvJQRAu1OAJ0buvHc7YparaUjI8W4TS1iMi34tACfQIGz
-YWVfzQeqW5EyZ6XaRkclMng=
-=f7bo
------END PGP SIGNATURE-----
+MD5 4e24ea4a9fc322e49aec4643b8a47756 files/digest-openafs-kernel-1.4.0_rc2 147
diff --git a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.2.13 b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.2.13
index 577c7bdfddb9..cce296d1754b 100644
--- a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.2.13
+++ b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.2.13
@@ -1,2 +1,2 @@
 MD5 6a1e6b5ad2da4532d6e1086024150ecd openafs-1.2.13-src.tar.bz2 10354615
-MD5 574492d1b49925ec909217053d29077a openafs-gentoo-0.1.tar.bz2 17005
+MD5 dfca6186129259559b8c491b1d6072c6 openafs-gentoo-0.2a.tar.bz2 17761
diff --git a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.0_rc2 b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.0_rc2
new file mode 100644
index 000000000000..6865f4b5dc67
--- /dev/null
+++ b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.0_rc2
@@ -0,0 +1,2 @@
+MD5 9dbef5c07eddd7a90e680079b9035e17 openafs-1.4.0-rc2-src.tar.bz2 10989632
+MD5 dfca6186129259559b8c491b1d6072c6 openafs-gentoo-0.2a.tar.bz2 17761
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.2.13.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.2.13.ebuild
index 2b4d085b90a3..bcac06a46456 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.2.13.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.2.13.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.2.13.ebuild,v 1.5 2005/07/29 18:01:27 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.2.13.ebuild,v 1.6 2005/09/01 23:51:34 stefaan Exp $
 
 inherit eutils linux-mod versionator toolchain-funcs
 
-PATCHVER=0.1
+PATCHVER=0.2a
 MY_PN=${PN/-kernel}
 MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_P}
@@ -12,18 +12,18 @@ DESCRIPTION="The OpenAFS distributed file system kernel module"
 HOMEPAGE="http://www.openafs.org/"
 SRC_URI="http://openafs.org/dl/${MY_PN}/${PV}/${MY_P}-src.tar.bz2
 	mirror://gentoo/${MY_PN}-gentoo-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${MY_PN}-gentoo-${PATCHVER}.tar.bz2"
+	http://dev.gentoo.org/~stefaan/distfiles/${MY_PN}-gentoo-${PATCHVER}.tar.bz2"
 
 LICENSE="IPL-1"
 SLOT="0"
 KEYWORDS="~x86 ~alpha ~ia64"
 
-PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)/kernel
+PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
 
 pkg_setup() {
 	if kernel_is gt 2 4; then
 		eerror "openafs-1.2 does not support kernels newer than Linux 2.4."
-		einfo "Please try the openafs-1.3 series"
+		einfo "Please try the openafs-1.4 series"
 		die "Kernel is too new!"
 	fi
 	linux-mod_pkg_setup
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.4.0_rc2.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.4.0_rc2.ebuild
new file mode 100644
index 000000000000..c586d69077a9
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.4.0_rc2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.4.0_rc2.ebuild,v 1.1 2005/09/01 23:51:34 stefaan Exp $
+
+inherit eutils linux-mod versionator toolchain-funcs
+
+PATCHVER=0.2a
+MY_PN=${PN/-kernel}
+MY_PV=${PV/_/-}
+MY_P=${MY_PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="The OpenAFS distributed file system kernel module"
+HOMEPAGE="http://www.openafs.org/"
+SRC_URI="http://openafs.org/dl/${MY_PN}/candidate/${MY_PV}/${MY_P}-src.tar.bz2
+	mirror://gentoo/${MY_PN}-gentoo-${PATCHVER}.tar.bz2
+	http://dev.gentoo.org/~stefaan/distfiles/${MY_PN}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="IPL-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+
+PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+}
+
+src_compile() {
+	econf --with-linux-kernel-headers=${KV_DIR} || die "Failed: econf"
+	ARCH="$(tc-arch-kernel)" make only_libafs || die "Failed: make"
+}
+
+src_install() {
+	MOD_SRCDIR=$(expr ${S}/src/libafs/MODLOAD-*)
+	if [ ! -e ${MOD_SRCDIR}/libafs.${KV_OBJ} ]; then
+		cp ${MOD_SRCDIR}/libafs-*.${KV_OBJ} ${MOD_SRCDIR}/libafs.${KV_OBJ} \
+			|| die "Couldn't find compiled kernel module"
+	fi
+
+	MODULE_NAMES='libafs(openafs:$MOD_SRCDIR)'
+
+	linux-mod_src_install
+}
+