put back autotools commands and eclass for stable ebuild also; revbumped to be sure nobody keeps a potentially broken version installed; removed old

(Portage version: 2.1.12.2/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 2B6559ED)

3 files changed, 19 insertions, 96 deletions

diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index 6a6fd2f27617..3419ebad877c 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.156 2013/08/29 18:03:10 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.157 2013/08/29 18:44:48 axs Exp $
+
+*openafs-kernel-1.6.2-r1 (29 Aug 2013)
+
+  29 Aug 2013; Ian Stakenvicius <axs@gentoo.org>
+  +openafs-kernel-1.6.2-r1.ebuild, -openafs-kernel-1.6.2.ebuild,
+  -openafs-kernel-1.6.5.ebuild:
+  put back autotools commands and eclass for stable ebuild also; revbumped to be
+  sure nobody keeps a potentially broken version installed; removed old
 
 *openafs-kernel-1.6.5-r1 (29 Aug 2013)
 
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.2.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.2-r1.ebuild
index 2d680a4ef799..a39cf197a07e 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.2.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.2.ebuild,v 1.7 2013/08/29 17:33:58 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.6.2-r1.ebuild,v 1.1 2013/08/29 18:44:48 axs Exp $
 
 EAPI="4"
 
-inherit eutils multilib linux-mod versionator toolchain-funcs
+inherit eutils autotools multilib linux-mod versionator toolchain-funcs
 
 MY_PV=$(delete_version_separator '_')
 MY_PN=${PN/-kernel}
@@ -44,11 +44,14 @@ src_prepare() {
 	epatch "${WORKDIR}"/gentoo/patches
 	epatch "${FILESDIR}"/openafs-1.6.2-kernel-3.8-{1..5}.patch
 
-	# 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
+	# packaging is f-ed up, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	eaclocal -I src/cf
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache
 }
 
 src_configure() {
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.5.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.5.ebuild
deleted file mode 100644
index 855eb23d74f1..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2013 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.5.ebuild,v 1.3 2013/08/29 17:30:28 axs Exp $
-
-EAPI="4"
-
-inherit eutils multilib 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/openafs/${MY_PV}/${MY_P}-src.tar.bz2
-	mirror://gentoo/${MY_P2}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
-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!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-	fi
-}
-
-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() {
-	if use kernel_linux; then
-		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
-		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
-
-		MODULE_NAMES="libafs(fs/openafs:${srcdir})"
-
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		insinto /boot/modules
-		doins "${S}"/src/libafs/MODLOAD/libafs.ko
-	fi
-}
-
-pkg_postinst() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postrm
-}