Tweak lwp install a bit more #330061 by Andrew Savchenko.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 158 insertions, 5 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index 1cc6e17a03ad..f05cf0e65f77 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/openafs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.166 2010/08/21 22:10:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.167 2010/08/23 22:01:06 vapier Exp $
+
+*openafs-1.4.12.1-r2 (23 Aug 2010)
+
+  23 Aug 2010; Mike Frysinger <vapier@gentoo.org> +openafs-1.4.12.1-r2.ebuild:
+  Tweak lwp install a bit more #330061 by Andrew Savchenko.
 
 *openafs-1.4.12.1-r1 (21 Aug 2010)
 
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index db05955256df..28d4714dc24c 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -19,15 +19,16 @@ DIST openafs-gentoo-0.15.tar.bz2 20155 RMD160 40270539fe8992f76953b6ab5f133ec23b
 EBUILD openafs-1.4.10.ebuild 4636 RMD160 3284094695c20852761b8401a3aca3b9755b9075 SHA1 3fd0ec7fb51e211a9159ac0c806e191e02a4d1f0 SHA256 fec9a948af4666c406ada7c894a21d2c9df85f67af6474bfbd7d202f5a948abe
 EBUILD openafs-1.4.11.ebuild 4591 RMD160 c1f48b93303c1902ebe5aab93abe7262c1c3ebe8 SHA1 92de212ebf54d4c3283d9018eac3e82768e3eb43 SHA256 0229b10114ba6ad6e12ee7d883040199de28539afbcc309db71060fdfcebe519
 EBUILD openafs-1.4.12.1-r1.ebuild 4045 RMD160 2951449652cafbbccb6e30084bc42e554a8411eb SHA1 9bb3f2e73068192e3f527b9f0ccea94bda5ae708 SHA256 1088ffec1f63316d0f1d9da80843d50ae826f4e4692027a3add1dc8d75510b97
+EBUILD openafs-1.4.12.1-r2.ebuild 4324 RMD160 cfef537ff1b69dcf7efd8fbba0598b07b0b207d9 SHA1 d0dbe727221a592f8f52afc7b714ec9ead05f7ad SHA256 1bd27c0cd2949deee2c79f16cf099b5370c87e946cd745553012aff6fd9168e7
 EBUILD openafs-1.4.12.1.ebuild 4043 RMD160 f8597dd1063998213c1b20deda738db35fc764b8 SHA1 1437b82a1f2cf539c3c2db9934ffd2d4f6440cfc SHA256 77d730519f6071857665ec6fc490a8418797ba3e07f56149d6dc5e7333302aa1
 EBUILD openafs-1.4.9.ebuild 4588 RMD160 b9f2cad932b3d8fe39ae2e86268b6f6d201132a8 SHA1 ee4483d117f6d458fe119333d955d7fe373afb8e SHA256 0351b7c9e0e2c9b5d0c5d878fb0c2b4a29d7aa111666fc7f545245c107c16229
 EBUILD openafs-1.5.34.ebuild 4260 RMD160 70b62797335398fa841121589299d84808160a6d SHA1 d17fb635c824096a8a5ccd7f534af7918abb92f8 SHA256 1deb70901d5d3daacb6e4823618d8b87ee25d2a16963fd21850ce3c5482b56ba
-MISC ChangeLog 26596 RMD160 111a7ae0c227094b71ab580a756c585a7bdcf07c SHA1 a0c3ec024fb9af85c3d0ef812cfe02d3d6ba19c6 SHA256 3d2ee11457d2262107557a8668c0505a373f34c430ae6e404c8f8c6e26fe0db3
+MISC ChangeLog 26772 RMD160 1082d114fd8b6c514f61533c7cf35c05ca4d75fb SHA1 cddbc58f0bc9b58d6df9588a1080fe36c014536e SHA256 15b06de348094e451a03be6a7aeebaa5261e11bdefe69956516f49b319680597
 MISC metadata.xml 348 RMD160 4ad6baa2e922d8ab7a2ceb6587d98203c4693d3b SHA1 e4c2d8e5cadb6a474828228d5d34331eb41ba25f SHA256 173c0aaaba2d44913bbb77a69c9821b86450e76990f7b2c3a2af7798afcd12d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxwT4oACgkQTwhj9JtAlp69vQD/f6uKhE2R9nfbXNvpE8sZ8pIn
-P6bd7TCYGDFOOoE9ZS4A/1EgyA+3PoIeqmvrvWBom8Clp3ikmruCr2GHNOrdtij6
-=+G53
+iF4EAREIAAYFAkxy8F4ACgkQTwhj9JtAlp5kCAEAgKXfGQ+1KvbF37+HLZG3aZ0u
+nma8FvIFp+NYKASM7gsBAIdN02baXRJObdsjcL+CrMqnFwrj3RrUZYTve4BkO36i
+=v8rQ
 -----END PGP SIGNATURE-----
diff --git a/net-fs/openafs/openafs-1.4.12.1-r2.ebuild b/net-fs/openafs/openafs-1.4.12.1-r2.ebuild
new file mode 100644
index 000000000000..d755d55c6353
--- /dev/null
+++ b/net-fs/openafs/openafs-1.4.12.1-r2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.12.1-r2.ebuild,v 1.1 2010/08/23 22:01:06 vapier Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
+
+MY_PV=$(get_version_component_range 1-3)
+PVER="2"
+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/${MY_PV}/${P}-src.tar.bz2
+	http://openafs.org/dl/${MY_PV}/${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}
+	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 '/^a/s:^:e:' regen.sh
+	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-largefile-fileserver \
+		--enable-supergroups \
+		--disable-kernel-module \
+		--disable-strip-binaries \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1 all_nolibafs || die
+}
+
+src_install() {
+	local CONFDIR=${WORKDIR}/gentoo/configs
+	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
+
+	emake -j1 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"
+}