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

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 37 insertions, 26 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/Manifest b/net-fs/openafs/Manifest
index 92418c258717..0b69610b6525 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -7,18 +7,14 @@ DIST openafs-1.6.2-src.tar.bz2 14378378 SHA256 0db0877cd42131a744472ad0abfa26a44
 DIST openafs-1.6.5-doc.tar.bz2 3488188 SHA256 754ce1fd1c3b9026883453d5cde1705452568f4e54e86fbf02a75debf8f57f2f SHA512 e58ebf61970dcf083cb8b5f6ae43930e3f0f680df0dfafaa852a5cf44bcaa47fefe3ee3a62d2e73a4f484314e4e09669e049d939a69dcf0d5b3aec5e0c31b34a WHIRLPOOL 6b3c9a0262d0bbd2c603451990ddf98c92f8bc3ade69eb6ac289c9d0dcfad7b78b0ee6d311efe5810f006640f5eeb8b3ef508f28da95b892187aceba400dfbf0
 DIST openafs-1.6.5-patches-1.tar.bz2 10880 SHA256 bde25a4ec9ab38cb9864deb38d4d3f4b3affc44969c072a3329844dbbebd1c5c SHA512 f6cd5916bc072cb855a0edfb640cf53cfdc5fb7d3b9ed0e23e9c739ea4f046653ac60b731cb469838085c92286485fafa00807b857f89ca2c90fea3dce2c9a56 WHIRLPOOL 93a6648ddc8e35c05c176a9d835fefcd97afc217bbf80547895e5da40ac4e0a85842dd89c5b3074986045db67548f766a72cd5a2c05eb24c62ae04f26a490e04
 DIST openafs-1.6.5-src.tar.bz2 14400420 SHA256 176fab2d710d8dcf566f5aa229fd796dd8165561d57590e32790a3034a195ef2 SHA512 2a03b87499f3304c85664787602f1e2f1988a5baa34bc7754e28f8ead6a1b70d826e63cd6ce4b4c5a97ae48fff6255a51be973c098f8a176369ae557b18830f1 WHIRLPOOL 66c058a09396054dc675351b1b27628144a7f29b2255e7192906290bd0b76ea8c08a398d773031a9835edbdd2452990cc6e3273c02e4d25560d62ddcd7318c97
-EBUILD openafs-1.6.2.ebuild 4422 SHA256 13f6221d2235c06a9df1a1b00c3f9a3bb38558f8089379219d713cb52a168578 SHA512 103679e20d8b34943c28a56bf019f523370b035e8c2d08958f24e2667c4d93f41f3a7b0d48eb143d78280c57fff7697879f12a90588b252d3c5b41b2d78fb50c WHIRLPOOL fc775f3eb60a28d6adcc2f41d1de079b16d29d8504bc7b6d08ab4c9b28f65e72c686e5b766098b9f48ae263311622e2d055c520aa254514043f64fc2cbd03dbf
-EBUILD openafs-1.6.5.ebuild 4425 SHA256 6397f1fa02a2467bd19f5a9c7809a5a6f138bd42c510c01a34185eafa9fb8b9a SHA512 f9cea1e54b94ded516e0c0ed54adf954dac1bf6b4c19894bcf30f98940fc5d07e305dc94a99c4cd82dcdacdb89853a1be6c0cc2d1cc38672a450a26425b593f1 WHIRLPOOL 2e033139c11e298fe6c27b28c81bd15ff21f629d00c19c8ae396f9dc31245eea0761b6dfe5d24b22be98ee439a4e499dc58f08531c51452e7869550d3ddf5f80
-MISC ChangeLog 31319 SHA256 bf2a2658ad56743a22775804f2d901a7ca607f4fbdb5585b3f0e256aa577a677 SHA512 761b7d43fe3d20f6b16d63c2e224787a5fe32781038da7e942a7eaaf13d9242b137502356425de7ca930e03e1d228bca2a84e0c0c3634cfcc092812a4ba973ff WHIRLPOOL 6164904f8312bc95497f6d40da43183d8a2e2a85487885205a5b93f4931f5696058fcb17641be992b183c581079d5bceaf20eb8204ffde907524258dd5a0bc2a
+EBUILD openafs-1.6.2-r1.ebuild 4506 SHA256 f70a6878ccf5ff0a5870416e90e5a6edbf45a88e8e79f652fb322da7df1d6852 SHA512 102ba706eb805ec88dcbb49f4056e01fc2a1d6e052e5edf3d6027331edfd93ab7666f004ad2b56e653c38b26a9d0ad7d837363dc2f9160246b7efe3ea72fc3ad WHIRLPOOL 00b822b06c7687f1f260b4e3d394929e554e89bd663aa5774ad87e09e53ff34435f67e3159a10dec4e7a904aa0683393053b2f5a78438edbd02bfb672ecf396e
+EBUILD openafs-1.6.5-r1.ebuild 4509 SHA256 d04117d3972e214ac5b2fdc1964f48d1dd544893eb01ffd64266893b256c9d9a SHA512 13fd680ebc7bff8e22d08250687f9c18e6e751813222b80e925bb1e595b5fdd94185dedc7e24c818095de07859b0ffa4edf3762dc0251b8faeee915a74d38486 WHIRLPOOL 23251b9c79f2606a85a75675938e5175049f4af88d9f405f2a87b889553b39b5d1f4d1bd2135cdcbff25d30c36ead342eeb7c99182c476faa29c3bfe9d1d3e97
+MISC ChangeLog 31754 SHA256 ec1cfb4fc3eaa91b0c7597387a00253a7c05b1a4b499dd8e4545feec97cc4d43 SHA512 e57919eeff31d5ecb7a7dbd1d4995d986d0e1c5f905af0e5132e3bf0312db49ddce9fcf3c6a56b5d12f186baa0c8bdf9165593f8cab7146c1df90029e6794f57 WHIRLPOOL 0977e4003fc02787154bb6b4651fbdb664728796e39c7228007a4870f96211b93265e7d415b216863366d7e9c20fbd7edb2ecb307035bed3fe0b5fee509b578e
 MISC metadata.xml 286 SHA256 b3e704b0f9a832001902f16472eafe5d2aa59afbf04b1eb6cf87f927316d87d3 SHA512 203f23847bccc6104cd62343070b5ead629a5033bf88b5468420628189d260f435606f7185c555a9849cee50ca855c370dfcb19426c6bc11b5c2da1b331e693e WHIRLPOOL 3fe5d977e05abd548bc36fa5f9be966e4cc5813f37c7052a57ba921b2540b61fd15d664c385e710ad857615a5643e599fb66fa623a29cb67420ab38a2e1d8730
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSHGAnAAoJEJWyH81tNOV9wsoH/jHAQr//UDIOKv1J19abmN0D
-ZEs9zxWwiH+VTdVcM/DbmhFq88VS+n/PUHa6AbZtQ1lXoZc3JV0fyPS1S8Cca2ml
-p0gn2aya4G8eRi07hWT3MPs5Dmufo0hnjGw9kc5ZAKg1Mt2qLxloQryL1qT+wfZl
-Zpaf/f3nDGQCa6cBUZ/s24DKmIzKNnoYrQJgFtn+eBCFwElo44oYez5V4kpgfayV
-+wb5lUQRXxAstTd4tMymRnRpqDT5idJ8kS3Ua37RB34euNh1xuvaYmLQhX4mla2j
-FxxSX2kQaSvh8h3uvYHCliLaDHtq70dEg4UjAGG4ryC6mouDKYVCHBGvZs9ukZE=
-=7tAK
+iF4EAREIAAYFAlIgsakACgkQ2ugaI38ACPDqlwEAn8TyFEHnFuFlMo7ZdvYBxbvz
+7VEnU+7pbfHnGBjud9QA/jGhuojpXYOkyoer2Bi8NOdNv14nwm1bgLIkfrpUd17r
+=e2Fq
 -----END PGP SIGNATURE-----
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() {