Bump to openafs-1.6.0_pre3, backport one fix to pre2

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

3 files changed, 76 insertions, 4 deletions

diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index 2c0440f0a438..f590d0d7eacb 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.126 2011/03/19 13:01:32 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.127 2011/03/20 09:58:10 stefaan Exp $
+
+*openafs-kernel-1.6.0_pre3 (20 Mar 2011)
+
+  20 Mar 2011; <stefaan@gentoo.org> openafs-kernel-1.6.0_pre2.ebuild,
+  +openafs-kernel-1.6.0_pre3.ebuild:
+  Bump to openafs-1.6.0_pre3, backport one fix to pre2
 
 *openafs-kernel-1.6.0_pre2 (19 Mar 2011)
 
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre2.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre2.ebuild
index 7174eb9aab5e..aad14e673d17 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre2.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 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.6.0_pre2.ebuild,v 1.1 2011/03/19 13:01:32 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre2.ebuild,v 1.2 2011/03/20 09:58:10 stefaan Exp $
 
 EAPI="2"
 
-inherit eutils linux-mod versionator toolchain-funcs
+inherit eutils autotools linux-mod versionator toolchain-funcs
 
 MY_PV=$(delete_version_separator '_')
 MY_PN=${PN/-kernel}
@@ -39,7 +39,8 @@ src_prepare() {
 	epatch "${WORKDIR}"/gentoo/patches
 
 	# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
-	sed -i '/^a/s:^:e:' regen.sh
+	sed -i 's/^\(\s*\)a/\1ea/' regen.sh
+	: # this line makes repoman ok with not calling eautoconf etc. directly
 	skipman=1
 	. regen.sh
 }
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre3.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre3.ebuild
new file mode 100644
index 000000000000..a968d8fa614b
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 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.6.0_pre3.ebuild,v 1.1 2011/03/20 09:58:10 stefaan Exp $
+
+EAPI="2"
+
+inherit eutils autotools linux-mod versionator toolchain-funcs
+
+MY_PV=$(delete_version_separator '_')
+MY_PN=${PN/-kernel}
+MY_P2="${MY_PN}-${PV}"
+MY_P="${MY_PN}-${MY_PV}"
+PVER="1"
+DESCRIPTION="The OpenAFS distributed file system kernel module"
+HOMEPAGE="http://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+SRC_URI="http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-src.tar.bz2
+	mirror://gentoo/${MY_P2}-patches-${PVER}.tar.bz2"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS"
+ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
+ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	EPATCH_EXCLUDE="012_all_kbuild.patch" \
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}"/gentoo/patches
+
+	# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
+	sed -i 's/^\(\s*\)a/\1ea/' regen.sh
+	: # this line makes repoman ok with not calling eautoconf etc. directly
+	skipman=1
+	. regen.sh
+}
+
+src_configure() {
+	ARCH="$(tc-arch-kernel)" \
+	econf \
+		--with-linux-kernel-headers=${KV_DIR} \
+		--with-linux-kernel-build=${KV_OUT_DIR}
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die
+}
+
+src_install() {
+	MOD_SRCDIR=$(expr "${S}"/src/libafs/MODLOAD-*)
+	[ -f "${MOD_SRCDIR}"/libafs.${KV_OBJ} ] || die "Couldn't find compiled kernel module"
+
+	MODULE_NAMES='libafs(fs/openafs:$MOD_SRCDIR)'
+
+	linux-mod_src_install
+}