Hack/fix incompatibility with autoconf-2.62 (bug #218234)

Package-Manager: portage-2.1.5_rc6

3 files changed, 163 insertions, 2 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index 878695e18d5b..02bb2c5f577f 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/openafs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.145 2008/04/10 10:22:14 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.146 2008/05/01 14:41:50 stefaan Exp $
+
+*openafs-1.4.7_pre3-r1 (01 May 2008)
+
+  01 May 2008; Stefaan De Roeck <stefaan@gentoo.org>
+  +openafs-1.4.7_pre3-r1.ebuild:
+  Hack/fix incompatibility with autoconf-2.62 (bug #218234)
 
 *openafs-1.4.7_pre3 (10 Apr 2008)
 
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 5c02a7027baa..f646f483c21a 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -13,7 +13,8 @@ DIST openafs-gentoo-0.14.tar.bz2 18293 RMD160 2a7ed8a40395d402de2f972fe0f96154d8
 EBUILD openafs-1.4.6.ebuild 4341 RMD160 a22676428837ff00762f7530c7245a6b405c6949 SHA1 a4222de4091ceba7512914346a60d2bebed79ad6 SHA256 e4bd02cf1c37bb7d74e1f727088bf02c18d1214d85b3b0f0021160e6dbca5904
 EBUILD openafs-1.4.6_p20080222.ebuild 4897 RMD160 a26cecfbf39106d69d4095b2b81d55e0f41945c9 SHA1 df0372e765685b7c9cf3030e4c741f6704e0a002 SHA256 847149ed63a03a58e63716ac8b8164fb2122b45d02c7cc811a15f028658ba0b9
 EBUILD openafs-1.4.7_pre2.ebuild 4731 RMD160 bddec3a989a2552d38e796613c0552f8ac27e4bf SHA1 621b7acad370a60b1b29ce6ae9369216b1b66496 SHA256 0695d970015c8572d07e19bbabe368b48c036ac99f17bf6ba63fd92d87f4b9e0
+EBUILD openafs-1.4.7_pre3-r1.ebuild 4833 RMD160 0d1111a7373946e8698d5264af7448873978a86e SHA1 841b6a9cf604470bda9ae5ae8134943087cea3d2 SHA256 0a2d6b323b52bb3510b79391b484a0298e967366ba01f3f6f21e7250a1ac912f
 EBUILD openafs-1.4.7_pre3.ebuild 4731 RMD160 bd7bf12ae227f02ee0ef9aeb1814dca98f6420fd SHA1 56a15e7cb03a600ce2fddfa3940b6cc0e9b46f4e SHA256 5fd89d240488b173733b4533c3039dec29cf7b2446124b0d1b7229e2f814a750
 EBUILD openafs-1.5.34.ebuild 4288 RMD160 d2198b8e8c5aa4f19c50c37b8437156405b2a850 SHA1 54d2ed75c695dcd41400fe43fb1307cca4abaaac SHA256 9dd45f5d87c98437ebc2438110f36fde84d1fd6dc047d17f922622763d7c8f73
-MISC ChangeLog 23048 RMD160 c9687000c1ae58ffe705cadbec579566b7d961be SHA1 f305655f3f41ff68402663c0e3fe5876d989b41e SHA256 062d1cde9c63921abac822f36a1bd3d51d147ddcba1200dc31895887629775a6
+MISC ChangeLog 23233 RMD160 a5ba63797ac0097fb08116018a12d8fb299bf946 SHA1 7c89aab82215d809ea7a768885e7b7a58c4c8707 SHA256 e7f2953e9a5b36bb6df70c0f31b55d37de33b84af5a082ec67981e536c60c502
 MISC metadata.xml 254 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 SHA1 a4ad632b650953fa9c9f203a9c55f58ddba37705 SHA256 90d7dcb6aede67bf64f610984a31fc03573512de9e241db42acb32601373db62
diff --git a/net-fs/openafs/openafs-1.4.7_pre3-r1.ebuild b/net-fs/openafs/openafs-1.4.7_pre3-r1.ebuild
new file mode 100644
index 000000000000..10043ef11a16
--- /dev/null
+++ b/net-fs/openafs/openafs-1.4.7_pre3-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.7_pre3-r1.ebuild,v 1.1 2008/05/01 14:41:50 stefaan Exp $
+
+inherit flag-o-matic eutils toolchain-funcs versionator pam
+
+PATCHVER=0.14
+MY_PV=${PV/_pre/pre}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="http://www.openafs.org/"
+SRC_URI="http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-src.tar.bz2
+	doc? ( http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-doc.tar.bz2 )
+	mirror://gentoo/${PN}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="IBM openafs-krb5 openafs-krb5-a APSL-2 sun-rpc"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug kerberos pam doc"
+
+RDEPEND="~net-fs/openafs-kernel-${PV}
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )"
+
+PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
+CONFDIR=${WORKDIR}/gentoo/configs
+SCRIPTDIR=${WORKDIR}/gentoo/scripts
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+
+	# Apply patches to apply chosen compiler settings, fix the hardcoded paths
+	# to be more FHS friendly, and the fix the incorrect typecasts for va_arg
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+
+	# enable UCONTEXT on alpha
+	epatch "${FILESDIR}"/openafs-alpha-ucontext.patch
+	# don't use mapfiles to strip symbols (bug #202489)
+	epatch "${FILESDIR}"/openafs-1.4.5-shared-libs.patch
+
+	# disable XCFLAGS override
+	sed -i 's/^[ \t]*XCFLAGS.*/:/' src/cf/osconf.m4
+	# disable compiler choice override
+	sed -i 's/^[ \t]\+\(CC\|CCOBJ\|MT_CC\)="[^ ]*\(.*\)"/\1="${CC}\2"/' src/cf/osconf.m4
+
+	# fix autoconf cludge (bug #218234)
+	sed -i 's/^AC_\(AIX\|MINIX\)$//' acinclude.m4
+
+	./regen.sh || die "Failed: regenerating configure script"
+}
+
+src_compile() {
+	# 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: fix linux version at 2.6
+	AFS_SYSKVERS=26 \
+	XCFLAGS="${CFLAGS}" \
+	econf \
+		$(use_enable pam) \
+		$(use_enable debug) \
+		--enable-largefile-fileserver \
+		--enable-supergroups \
+		--disable-kernel-module \
+		${myconf} || die econf
+
+	emake -j1 all_nolibafs || die "Build failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install_nolibafs || die "Installing failed"
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use pam; then
+		dopammod "${D}"/usr/$(get_libdir)/pam_afs*
+		rm -f "${D}"/usr/$(get_libdir)/pam_afs*
+	fi
+
+	# compile_et collides with com_err.  Remove it from this package.
+	rm "${D}"/usr/bin/compile_et
+
+	# avoid collision with mit_krb5's version of kpasswd
+	(cd "${D}"/usr/bin; mv kpasswd kpasswd_afs)
+	use doc && (cd "${D}"/usr/share/man/man1; mv kpasswd.1 kpasswd_afs.1)
+
+	# minimal documentation
+	dodoc ${CONFDIR}/README ${CONFDIR}/CellServDB
+
+	# documentation package
+	if use doc; then
+		use pam && doman src/pam/pam_afs.5
+
+		cp -pPR doc/* "${D}"/usr/share/doc/${PF}
+	fi
+
+	# Gentoo related scripts
+	newconfd ${CONFDIR}/openafs-client openafs-client
+	newconfd ${CONFDIR}/openafs-server openafs-server
+	newinitd ${SCRIPTDIR}/openafs-client openafs-client
+	newinitd ${SCRIPTDIR}/openafs-server openafs-server
+
+	# 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)
+	# CellServDB
+	if [ ! -e "${ROOT}"etc/openafs/CellServDB ] \
+		|| grep "GCO Public CellServDB" "${ROOT}"etc/openafs/CellServDB &> /dev/null
+	then
+		cp ${CONFDIR}/CellServDB "${D}"etc/openafs
+	fi
+	# cacheinfo: use a default location cache, 200 megabyte in size
+	# (should be safe for about any root partition, the user can increase
+	# the size as required)
+	if [ ! -e "${ROOT}"etc/openafs/cacheinfo ]; then
+		echo "/afs:/var/cache/openafs:200000" > "${D}"etc/openafs/cacheinfo
+	fi
+	# ThisCell: default to "openafs.org"
+	if [ ! -e "${ROOT}"etc/openafs/ThisCell ]; then
+		echo "openafs.org" > "${D}"etc/openafs/ThisCell
+	fi
+}
+
+pkg_postinst() {
+	elog
+	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"
+}