fixed src_prepare so that autotools commands are actually executed; installed output changed so ebuild was bumped

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

3 files changed, 104 insertions, 5 deletions

diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index 318700d85f1e..6a6fd2f27617 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,13 @@
 # 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.155 2013/08/29 17:33:58 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.156 2013/08/29 18:03:10 axs Exp $
+
+*openafs-kernel-1.6.5-r1 (29 Aug 2013)
+
+  29 Aug 2013; Ian Stakenvicius <axs@gentoo.org>
+  +openafs-kernel-1.6.5-r1.ebuild:
+  fixed src_prepare so that autotools commands are actually executed; installed
+  output changed so ebuild was bumped
 
   29 Aug 2013; Ian Stakenvicius <axs@gentoo.org> openafs-kernel-1.6.2.ebuild:
   fixed one more erroneous 'linux_kernel' use, missed by last commit
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index adfabf5335be..b9e190bd35ee 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -11,13 +11,14 @@ DIST openafs-1.6.2-src.tar.bz2 14378378 SHA256 0db0877cd42131a744472ad0abfa26a44
 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-kernel-1.6.2.ebuild 2588 SHA256 c36ab3ac6e86e50f1d7299237e72474cc253e09178c77be3f1d57b3fbb23d7d2 SHA512 12d61e0315abc9bf6c018c9696d2a8556c6335e998ac74c7e2d7def45c5bbd65ce109d97ee7b8f3f7fbb0a8431a37017dcbbf1ec4cca3c40e2fb28bc1c10c1f1 WHIRLPOOL 8ec85ca99d8f612b0ef097ddc201e30882ff16daf44a02b7293e0e7e8ca0e147a2635821e9ecb6a4a73e7b3adcebbb1eba441c1c0961d056f40c0a189054e018
+EBUILD openafs-kernel-1.6.5-r1.ebuild 2618 SHA256 ac7486de8bdd14a219bc1d671ba2128c0265c2d6c97509ff181e0913744ad0d8 SHA512 582e6728dae0a268ab037794cf4a92762680bb8a225827f81c121a3ad683bd0cbdcc1f181898c6405239b55a4770adfff4d351bcc6163c055989e937d6887dd1 WHIRLPOOL 9bb5dff9d4d3c29ea59b2adf97d6325ba17530eb0c2ff6e784dea7f49ea14e6de74235e52b36b4c4d52aa747e787ed32f91d192dff43b43dd709e7580ca12d6e
 EBUILD openafs-kernel-1.6.5.ebuild 2531 SHA256 3c72afc97d5cb445209830b3e6d0be0ddd7944abc308b552e8595f9e6d7c17bb SHA512 178da6cf50e6391e74ea739f12caedc449dda89e751b6fc66ed7e4904eb10159c28b61687c7f476452e1e69b25434b1044564c861dec90d3c166295ff6d7444d WHIRLPOOL 928e952f3023d995e2456fa622f18798d17203f48bccb7c2a4417aaeecbbcb07d199a6c9b88b6fb5f9765871440c88ed6b2dba99c0fddebb22ec906e3fd8abf0
-MISC ChangeLog 25959 SHA256 6b1f7e5d78b1194600af75b8e9fbf769779d92d1c5b3bde4337e987a983ae43b SHA512 50e940be28791d9ff84c9d58af0dfab49fe145b0d01eb4f67d1021bd47efcdf2f453b58c76c4cee61e731958a7e25e54c1d751b03cee7eb2bdd3bb746aebf81c WHIRLPOOL 45017e7bb214a21cc592de37dca9aae4e92f71e0b842ec1fcfb4b86a650f2df543ad964866d6f0c90a66e412ddcbe7dfe74449987687dd4925461b7041ded372
+MISC ChangeLog 26202 SHA256 fbc0716dfa01391e2548eb1b12df4ca523d636a84de889eda025d136aa9a5aa3 SHA512 7598963f371b143e8bb893b60376aa292deeb70651eb7c69315344b498b0919c70fc8a16c767158f1a2ccd3f1f12d952795dd50dbb9996b47e04746c5a4cbbaa WHIRLPOOL 117ffec6caa009472d77faaebd2a6e6598c509750f85ae9743421251f48a13ac9dd84cc4cb95774dbc7da0edd501cdebcba5be801f59e9d23229d506d5fe3126
 MISC metadata.xml 286 SHA256 b3e704b0f9a832001902f16472eafe5d2aa59afbf04b1eb6cf87f927316d87d3 SHA512 203f23847bccc6104cd62343070b5ead629a5033bf88b5468420628189d260f435606f7185c555a9849cee50ca855c370dfcb19426c6bc11b5c2da1b331e693e WHIRLPOOL 3fe5d977e05abd548bc36fa5f9be966e4cc5813f37c7052a57ba921b2540b61fd15d664c385e710ad857615a5643e599fb66fa623a29cb67420ab38a2e1d8730
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlIfhhwACgkQ2ugaI38ACPBRrAD/TErP1Arz0ml+S3uGRt2avtxI
-is5q56qboaiEgkQA8FgBALrRsumVB8CyTGi+QuAxSMuY5GqOf7NpcBzcQudGOU/G
-=eA8S
+iF4EAREIAAYFAlIfjPQACgkQ2ugaI38ACPBCxQD+M7DnO+m23F+zOuUvkvlRNC2N
+RuMMQJv1gFSk3ESmdJcA/jMiWLC8dcqXuSNiqQs+t1gk8ZQAPyaHhMP3AjBfd6yj
+=g9Ml
 -----END PGP SIGNATURE-----
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.5-r1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.5-r1.ebuild
new file mode 100644
index 000000000000..0a5de7f33a8e
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.5-r1.ebuild
@@ -0,0 +1,91 @@
+# 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-r1.ebuild,v 1.1 2013/08/29 18:03:10 axs Exp $
+
+EAPI="4"
+
+inherit autotools 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 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() {
+	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
+}