Version bump #371274 by Andrej Filipcic.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

3 files changed, 171 insertions, 2 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index 4e4279ed5c6d..66b6397a3b9c 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/openafs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.171 2011/03/20 09:58:35 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.172 2011/06/17 04:18:27 vapier Exp $
+
+*openafs-1.6.0_pre6 (17 Jun 2011)
+
+  17 Jun 2011; Mike Frysinger <vapier@gentoo.org> +openafs-1.6.0_pre6.ebuild:
+  Version bump #371274 by Andrej Filipcic.
 
 *openafs-1.6.0_pre3 (20 Mar 2011)
 
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 37408a592e2d..bec97c29ad2d 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST openafs-1.4.12.1-doc.tar.bz2 3721359 RMD160 ea16d4aa03e87e2d0b4f1ad98a955cf07e561261 SHA1 1c9dcc41de19470953fa339e4cfea1b0e780b9fd SHA256 297e7e70fac13505843afcbf48f2d49a9c9c07ff8cfcdb698fe256b565919c91
 DIST openafs-1.4.12.1-patches-2.tar.bz2 12632 RMD160 93f910ba4806d83bd3f9da870d54b6557ad40054 SHA1 f9a208be0f79dcda407bec1466d340530d9d1994 SHA256 488ae2cc366ba600f8a1ef10459c662abd076683c9ea34694276e873caaf54a0
 DIST openafs-1.4.12.1-src.tar.bz2 11797335 RMD160 5c0d370a52faa2f7787b9c321cbfe733ae212be1 SHA1 b91a4d6213af1b31311b089a85e729b52980c18b SHA256 2335542deba8e1c1751d0586f88adf7fdc642305241c0ebb896f4d264dd6298e
@@ -11,10 +14,13 @@ DIST openafs-1.5.34-doc.tar.bz2 3268687 RMD160 c7824edf73b4cd8f0929cf7d4fab5b4c1
 DIST openafs-1.5.34-src.tar.bz2 12151866 RMD160 188f79e90de1eaa8457f2c5612cb2512a2e996e5 SHA1 11d9526b46395397a15ea83654584aaf61c7e594 SHA256 015f448bbc05e2b774858a6adfad1a37ce4d4aa402c6f63325c638d0153912b9
 DIST openafs-1.6.0_pre2-patches-1.tar.bz2 9782 RMD160 334688e56c54c47e91014b01f34204049f899dee SHA1 52b5adb06ca1c576282803f27cd0340afd3f7df8 SHA256 01a5cb8b1dd6ab3fdb7e509a91911e0b13723ba1074b2eed90dcfc46df877036
 DIST openafs-1.6.0_pre3-patches-1.tar.bz2 10024 RMD160 7d25c59c789cc9367b7dc382c95c20b7ee738c70 SHA1 c122b5b34f150c1c750f67e0ceb1e1567e8b2029 SHA256 415d67d17290611351e206bf9b735a4c1fb2a32fb28f03e663485abe7f3d6a86
+DIST openafs-1.6.0_pre6-patches-1.tar.bz2 9794 RMD160 74a886fce47161e40e567f82a7334e2c35d18893 SHA1 89506aea53f8408ecf07b5c1aa605ec4d70ec34e SHA256 e25faf670e5ca68484b98a07304ce0cc1c86579fadd0edc0ce344ab4e026177b
 DIST openafs-1.6.0pre2-doc.tar.bz2 3472280 RMD160 4013ef2a2d9a626ce221f88e3402e273ad4f71f2 SHA1 77804f962b37d7c7d552abb9d6cfe77c6b3c791e SHA256 c3ed34578e02ae4a7bc99f8b006a4ab2b2cd67e35616489d5f0c6ebe7a2f2ea7
 DIST openafs-1.6.0pre2-src.tar.bz2 14261701 RMD160 a1b147a16aaedd7c32e0c6ab62b30b740a4c0446 SHA1 6a086331da64189fdc23cf5da75ff847e942a7c7 SHA256 a221f9fa2b18645d6799adb1ba838a3bfac7e5d444f5823b2c374d7fea02c481
 DIST openafs-1.6.0pre3-doc.tar.bz2 3474560 RMD160 77229447d480a12402f1565dcfb8d1be4bffbae1 SHA1 b52c98abd7402d860cf8d847c5fba90326cfd65e SHA256 78436aa438a8b4ca76e4080e3dc1746aeaebbf7bd7b42dcbe59112a74067f083
 DIST openafs-1.6.0pre3-src.tar.bz2 14309287 RMD160 164d8578a0c66171f01d3513112d4efc7a9542ee SHA1 de64accb7eee810f84cef6f98a3027e0580f86fa SHA256 4e37553bbd2b9152dc1f78f116421ecf76e799b92dab8bdb544bdda4e9ac0249
+DIST openafs-1.6.0pre6-doc.tar.bz2 3474552 RMD160 b21117f71a48dc44fd2a8a585d20088886c341a2 SHA1 7c1aba597d6c990f5967819afe02f75fbd159e6d SHA256 53db2ee049a00522072c79ea63916e8621ae4498a68e9002157c4ecaa8d61216
+DIST openafs-1.6.0pre6-src.tar.bz2 14308775 RMD160 c20351f2c73f0f2a2b8016c3ae8cca3e04ab3950 SHA1 cc21259c17e40bbfa648fc7537ae7285dd9cd363 SHA256 34a9c959949b1a8395bc299656fb7aaae1087ee85d00d9823606db9d4d8413e5
 DIST openafs-gentoo-0.14.tar.bz2 18293 RMD160 2a7ed8a40395d402de2f972fe0f96154d811e2b6 SHA1 dbff67178e7eae1bdbd5af43f6bedaeb747bd25a SHA256 e27918d395d656659b6f0d288d8a4d2501bd4ca6582824b8f3bbd420b06e6f6c
 DIST openafs-gentoo-0.15.tar.bz2 20155 RMD160 40270539fe8992f76953b6ab5f133ec23b017316 SHA1 8f985eb753786c9289721cc7818d96112a5310fc SHA256 3448b50e839826f3fe09ae95a593030a8029c5a769744e74b6d8f3f52f03f940
 EBUILD openafs-1.4.12.1-r2.ebuild 4324 RMD160 cfef537ff1b69dcf7efd8fbba0598b07b0b207d9 SHA1 d0dbe727221a592f8f52afc7b714ec9ead05f7ad SHA256 1bd27c0cd2949deee2c79f16cf099b5370c87e946cd745553012aff6fd9168e7
@@ -24,5 +30,13 @@ EBUILD openafs-1.4.9.ebuild 4588 RMD160 b9f2cad932b3d8fe39ae2e86268b6f6d201132a8
 EBUILD openafs-1.5.34.ebuild 4260 RMD160 70b62797335398fa841121589299d84808160a6d SHA1 d17fb635c824096a8a5ccd7f534af7918abb92f8 SHA256 1deb70901d5d3daacb6e4823618d8b87ee25d2a16963fd21850ce3c5482b56ba
 EBUILD openafs-1.6.0_pre2.ebuild 4429 RMD160 2f825bc122e967d379124503353e20b79c8e58df SHA1 1e86c271a2261ea953eb2f89e0470867bdf66a4d SHA256 50f8c87823f124a32f5f4cc2efe114029b9984fe00dc5a05498517e7faf1fb78
 EBUILD openafs-1.6.0_pre3.ebuild 4448 RMD160 3b00931b48f288a9af45c208113ddb43409f3c77 SHA1 10f41de34d93ea4585a78a34a9c0411a17660bee SHA256 7dbfe05d93689d002d8e5044a79f4c1cb765e8dd4607ce9a764ec8251e1d99d5
-MISC ChangeLog 27444 RMD160 009a4aa0a58079179ae16f1b481ecd6f07c2a098 SHA1 c3a8dbd042bbc90dae75f1a47298afa6613b195a SHA256 493b54dddfa72f412467a6bd9d01ce5615d98d30b43b931d8fa404af586c68f9
+EBUILD openafs-1.6.0_pre6.ebuild 4447 RMD160 4f68de86ce8c5d2e95ce1f6c8f94bf9c82d9f7f5 SHA1 35aa3ef93fe326e78319c0e6688df49735add81d SHA256 356ba7750df37609425fc591ec69ecfaced65e6c13a566e3e0f986e2cfb7b58d
+MISC ChangeLog 27600 RMD160 1d8d048dff1898361707eb7339223013a7f56ef3 SHA1 4b7a940e37d6ec5085ad0e024573583d0e156e8a SHA256 72ce03f53a843c9e66ccecf7b8fafe0ccd34acd6b544fe406841db57a8e15843
 MISC metadata.xml 348 RMD160 4ad6baa2e922d8ab7a2ceb6587d98203c4693d3b SHA1 e4c2d8e5cadb6a474828228d5d34331eb41ba25f SHA256 173c0aaaba2d44913bbb77a69c9821b86450e76990f7b2c3a2af7798afcd12d6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk361aoACgkQaC/OocHi7JZK4AD8De0khv1h8tr2jZ1EzCc9K9OX
+1wMWK4JI3RUen6UI5ewA+wVHfgLOw7XQ+Ia+hwCShlX9EsDw9jLz0DVmnA5eyRYG
+=dbaY
+-----END PGP SIGNATURE-----
diff --git a/net-fs/openafs/openafs-1.6.0_pre6.ebuild b/net-fs/openafs/openafs-1.6.0_pre6.ebuild
new file mode 100644
index 000000000000..d6ce106e8fc7
--- /dev/null
+++ b/net-fs/openafs/openafs-1.6.0_pre6.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.0_pre6.ebuild,v 1.1 2011/06/17 04:18:27 vapier Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
+
+MY_PV=$(delete_version_separator '_')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+PVER="1"
+DESCRIPTION="The OpenAFS distributed file system"
+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/candidate/${MY_PV}/${MY_P}-src.tar.bz2
+	http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-doc.tar.bz2
+	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="doc kerberos pam"
+
+RDEPEND="~net-fs/openafs-kernel-${PV}
+	sys-libs/ncurses
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )"
+
+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() {
+	# cannot use "use_with" macro, as --without-krb5-config crashes the econf
+	local myconf=""
+	if use kerberos; then
+		myconf="--with-krb5-conf=$(type -p krb5-config)"
+	fi
+
+	AFS_SYSKVERS=26 \
+	XCFLAGS="${CFLAGS}" \
+	econf \
+		$(use_enable pam) \
+		--enable-supergroups \
+		--disable-kernel-module \
+		--disable-strip-binaries \
+		${myconf}
+}
+
+src_compile() {
+	emake all_nolibafs || die
+}
+
+src_install() {
+	local CONFDIR=${WORKDIR}/gentoo/configs
+	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
+
+	emake DESTDIR="${D}" install_nolibafs || die
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB || die
+	echo "/afs:/var/cache/openafs:200000" > "${D}"/etc/openafs/cacheinfo
+	echo "openafs.org" > "${D}"/etc/openafs/ThisCell
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use pam ; then
+		dopammod "${D}"/usr/$(get_libdir)/pam_afs* || die
+	fi
+	rm -f "${D}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${D}"/usr/sbin/kdump*
+
+	# avoid collision with mit_krb5's version of kpasswd
+	mv "${D}"/usr/bin/kpasswd{,_afs} || die
+	mv "${D}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+
+	# move lwp stuff around #200674 #330061
+	mv "${D}"/usr/include/{lwp,lock,timer}.h "${D}"/usr/include/afs/ || die
+	mv "${D}"/usr/$(get_libdir)/liblwp* "${D}"/usr/$(get_libdir)/afs/ || die
+	# update paths to the relocated lwp headers
+	sed -ri \
+		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+		"${D}"/usr/include/*.h \
+		"${D}"/usr/include/*/*.h \
+		|| die
+
+	# minimal documentation
+	use pam && doman src/pam/pam_afs.5
+	dodoc "${CONFDIR}"/README src/afsd/CellServDB
+
+	# documentation package
+	if use doc ; then
+		dodoc doc/{arch,examples,pdf,protocol,txt}/*
+		dohtml -A xml -r doc/{html,xml}/*
+	fi
+
+	# Gentoo related scripts
+	newinitd "${SCRIPTDIR}"/openafs-client openafs-client || die
+	newconfd "${CONFDIR}"/openafs-client openafs-client || die
+	newinitd "${SCRIPTDIR}"/openafs-server openafs-server || die
+	newconfd "${CONFDIR}"/openafs-server openafs-server || die
+
+	# used directories: client
+	keepdir /etc/openafs
+	keepdir /var/cache/openafs
+
+	# used directories: server
+	keepdir /etc/openafs/server
+	diropts -m0700
+	keepdir /var/lib/openafs
+	keepdir /var/lib/openafs/db
+	diropts -m0755
+	keepdir /var/lib/openafs/logs
+
+	# link logfiles to /var/log
+	dosym ../lib/openafs/logs /var/log/openafs
+}
+
+pkg_preinst() {
+	## Somewhat intelligently install default configuration files
+	## (when they are not present)
+	local x
+	for x in cacheinfo CellServDB ThisCell ; do
+		if [ -e "${ROOT}"/etc/openafs/${x} ] ; then
+			cp "${ROOT}"/etc/openafs/${x} "${D}"/etc/openafs/
+		fi
+	done
+}
+
+pkg_postinst() {
+	elog "This installation should work out of the box (at least the"
+	elog "client part doing global afs-cell browsing, unless you had"
+	elog "a previous and different configuration).  If you want to"
+	elog "set up your own cell or modify the standard config,"
+	elog "please have a look at the Gentoo OpenAFS documentation"
+	elog "(warning: it is not yet up to date wrt the new file locations)"
+	elog
+	elog "The documentation can be found at:"
+	elog "  http://www.gentoo.org/doc/en/openafs.xml"
+}