Version bumps

Package-Manager: portage-2.1.3.19

7 files changed, 128 insertions, 63 deletions

diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index f6132b977026..dd611576df58 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-fs/openafs-kernel
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.82 2007/11/14 12:26:06 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.83 2007/11/15 11:52:11 stefaan Exp $
+
+*openafs-kernel-1.5.27 (15 Nov 2007)
+*openafs-kernel-1.4.5 (15 Nov 2007)
+
+  15 Nov 2007; Stefaan De Roeck <stefaan@gentoo.org>
+  -files/tasklist_lock.patch, -files/tasklist_lock_1.5.12.patch,
+  +openafs-kernel-1.4.5.ebuild, +openafs-kernel-1.5.27.ebuild:
+  Version bumps
 
   14 Nov 2007; Stefaan De Roeck <stefaan@gentoo.org>
   -openafs-kernel-1.4.4_p20070724-r1.ebuild:
diff --git a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.5 b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.5
new file mode 100644
index 000000000000..07adb7804766
--- /dev/null
+++ b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.5
@@ -0,0 +1,6 @@
+MD5 fd92e736bac06668ad6151928dcc697e openafs-1.4.5-src.tar.bz2 12483615
+RMD160 baf00d0443ce113b380082b40b9b077cb4df5a17 openafs-1.4.5-src.tar.bz2 12483615
+SHA256 5c6a5f4f7f1f9e173af03a82e7394e6e588477b504ce89106b7722b9728effbe openafs-1.4.5-src.tar.bz2 12483615
+MD5 ba74f1663bc740bda8f993f54eef801f openafs-gentoo-0.14.tar.bz2 18293
+RMD160 2a7ed8a40395d402de2f972fe0f96154d811e2b6 openafs-gentoo-0.14.tar.bz2 18293
+SHA256 e27918d395d656659b6f0d288d8a4d2501bd4ca6582824b8f3bbd420b06e6f6c openafs-gentoo-0.14.tar.bz2 18293
diff --git a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.27 b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.27
new file mode 100644
index 000000000000..28003ec3f625
--- /dev/null
+++ b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.27
@@ -0,0 +1,6 @@
+MD5 4097bbb022e2c550bd6f073d502d5be1 openafs-1.5.27-src.tar.bz2 13241331
+RMD160 759a6fd12e4a813e58c837df65c70d946b359629 openafs-1.5.27-src.tar.bz2 13241331
+SHA256 0c7e9413990a779f357f4ca7bc730b98dbb07964f918141c404c83c9ec66d45b openafs-1.5.27-src.tar.bz2 13241331
+MD5 ba74f1663bc740bda8f993f54eef801f openafs-gentoo-0.14.tar.bz2 18293
+RMD160 2a7ed8a40395d402de2f972fe0f96154d811e2b6 openafs-gentoo-0.14.tar.bz2 18293
+SHA256 e27918d395d656659b6f0d288d8a4d2501bd4ca6582824b8f3bbd420b06e6f6c openafs-gentoo-0.14.tar.bz2 18293
diff --git a/net-fs/openafs-kernel/files/tasklist_lock.patch b/net-fs/openafs-kernel/files/tasklist_lock.patch
deleted file mode 100644
index f52981f67cb3..000000000000
--- a/net-fs/openafs-kernel/files/tasklist_lock.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Date: Fri, 27 Oct 2006 18:46:38 -0400
-From: Jeffrey Hutzelman
-To: "Peter N. Schweitzer"
-cc: Stefaan, openafs-info@openafs.org,
-        Jeffrey Hutzelman
-Subject: Re: [OpenAFS] tasklist_lock undefined Linux 2.6.18, OpenAFS 1.4.2
-
-
-On Friday, October 27, 2006 03:53:23 PM -0400 "Peter N. Schweitzer" wrote:
-
->#  nm afs_osi.o | grep tasklist_lock
->          U tasklist_lock
-
-OK; this is the one we're looking for.  That, combined with Stefaan's 
-comment about not having the problem if keyring support is enabled, makes 
-me think the compiler is doing something bogus here, like not correctly 
-handling the 'weak' attribute on an extern symbol not declared in global 
-scope.
-
-Try the following patch:
-
-
---- src/afs/afs_osi.c.orig	2006-10-27 18:45:35.000000000 -0400
-+++ src/afs/afs_osi.c	2006-10-27 18:45:43.000000000 -0400
-@@ -805,11 +805,11 @@
- #endif
-
- #if defined(AFS_LINUX22_ENV)
-+extern rwlock_t tasklist_lock __attribute__((weak));
- void
- afs_osi_TraverseProcTable()
- {
- #if !defined(LINUX_KEYRING_SUPPORT)
--    extern rwlock_t tasklist_lock __attribute__((weak));
-     struct task_struct *p;
-
-     if (&tasklist_lock)
-
-
-
-> I'm still thinking there's some kernel feature that I should have enabled
-> but didn't know I needed.
-
-No; the symbol really isn't exported in recent kernels; this is not about 
-kernel configuration.
-
-
diff --git a/net-fs/openafs-kernel/files/tasklist_lock_1.5.12.patch b/net-fs/openafs-kernel/files/tasklist_lock_1.5.12.patch
deleted file mode 100644
index 72553d92f767..000000000000
--- a/net-fs/openafs-kernel/files/tasklist_lock_1.5.12.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/afs/afs_osi_gcpags.c.old	2006-12-14 14:05:13.000000000 +0100
-+++ src/afs/afs_osi_gcpags.c	2006-12-14 14:05:28.000000000 +0100
-@@ -226,11 +226,11 @@
- #endif
- 
- #if defined(AFS_LINUX22_ENV)
-+extern rwlock_t tasklist_lock __attribute__((weak));
- void
- afs_osi_TraverseProcTable()
- {
- #if !defined(LINUX_KEYRING_SUPPORT)
--    extern rwlock_t tasklist_lock __attribute__((weak));
-     struct task_struct *p;
-  
-     if (&tasklist_lock)
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.4.5.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.4.5.ebuild
new file mode 100644
index 000000000000..393e6bf6ea8f
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.4.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 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.5.ebuild,v 1.1 2007/11/15 11:52:11 stefaan Exp $
+
+inherit eutils linux-mod versionator toolchain-funcs
+
+PATCHVER=0.14
+MY_PN=${PN/-kernel}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="The OpenAFS distributed file system kernel module"
+HOMEPAGE="http://www.openafs.org/"
+SRC_URI="http://openafs.org/dl/${PV}/${MY_P}-src.tar.bz2
+	mirror://gentoo/${MY_PN}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="IBM openafs-krb5 openafs-krb5-a APSL-2 sun-rpc"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
+
+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_unpack() {
+	unpack ${MY_P}-src.tar.bz2
+	unpack ${MY_PN}-gentoo-${PATCHVER}.tar.bz2
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+
+	./regen.sh || die "Failed: regenerating configure script"
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" econf --with-linux-kernel-headers=${KV_DIR} || die "Failed: econf"
+
+	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die "Failed: emake"
+}
+
+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
+}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.5.27.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.5.27.ebuild
new file mode 100644
index 000000000000..896b6b48f3f0
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.5.27.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 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.5.27.ebuild,v 1.1 2007/11/15 11:52:11 stefaan Exp $
+
+inherit eutils linux-mod versionator toolchain-funcs
+
+PATCHVER=0.14
+MY_PN=${PN/-kernel}
+MY_P=${MY_PN}-${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}/${PV}/${MY_P}-src.tar.bz2
+	mirror://gentoo/${MY_PN}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="IBM openafs-krb5 openafs-krb5-a APSL-2 sun-rpc"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
+
+CONFIG_CHECK="!DEBUG_RODATA"
+DEBUG_RODATA_ERROR="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+
+	./regen.sh || die "Failed: regenerating configure script"
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" econf --with-linux-kernel-headers=${KV_DIR} || die "Failed: econf"
+
+	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die "Failed: emake"
+}
+
+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) afspag(fs/openafs:$MOD_SRCDIR)'
+
+	linux-mod_src_install
+}