restored autotools (in direct calling form, the same as openafs-kernel) to ensure patches to build system are applied (reverting regression from Aug.27th) ; bumping to be sure all users get the proper updates on-disk

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

3 files changed, 30 insertions, 15 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index 9533c1d90b63..cc932528fc41 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-fs/openafs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.194 2013/08/27 08:15:30 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.195 2013/08/30 14:52:17 axs Exp $
+
+*openafs-1.6.2-r1 (30 Aug 2013)
+*openafs-1.6.5-r1 (30 Aug 2013)
+
+  30 Aug 2013; Ian Stakenvicius <axs@gentoo.org> +openafs-1.6.2-r1.ebuild,
+  +openafs-1.6.5-r1.ebuild, -openafs-1.6.2.ebuild, -openafs-1.6.5.ebuild:
+  restored autotools (in direct calling form, the same as openafs-kernel) to
+  ensure patches to build system are applied (reverting regression from
+  Aug.27th) ; bumping to be sure all users get the proper updates on-disk
 
 *openafs-1.6.5 (27 Aug 2013)
 
diff --git a/net-fs/openafs/openafs-1.6.2.ebuild b/net-fs/openafs/openafs-1.6.2-r1.ebuild
index 324b20f90785..fcfc079d07fd 100644
--- a/net-fs/openafs/openafs-1.6.2.ebuild
+++ b/net-fs/openafs/openafs-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/openafs-1.6.2.ebuild,v 1.5 2013/08/27 08:15:30 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.2-r1.ebuild,v 1.1 2013/08/30 14:52:17 axs Exp $
 
 EAPI="4"
 
-inherit flag-o-matic eutils multilib toolchain-funcs versionator pam
+inherit flag-o-matic eutils autotools multilib toolchain-funcs versionator pam
 
 MY_PV=$(delete_version_separator '_')
 MY_P="${PN}-${MY_PV}"
@@ -32,11 +32,14 @@ src_prepare() {
 	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
+	# 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/openafs-1.6.5.ebuild b/net-fs/openafs/openafs-1.6.5-r1.ebuild
index 87a5a82bb755..6d8639c10e34 100644
--- a/net-fs/openafs/openafs-1.6.5.ebuild
+++ b/net-fs/openafs/openafs-1.6.5-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/openafs-1.6.5.ebuild,v 1.1 2013/08/27 08:15:30 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.5-r1.ebuild,v 1.1 2013/08/30 14:52:17 axs Exp $
 
 EAPI="4"
 
-inherit flag-o-matic eutils multilib toolchain-funcs versionator pam
+inherit flag-o-matic eutils autotools multilib toolchain-funcs versionator pam
 
 MY_PV=$(delete_version_separator '_')
 MY_P="${PN}-${MY_PV}"
@@ -32,11 +32,14 @@ src_prepare() {
 	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
+	# 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() {