Version bump.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 118 insertions, 8 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 08b6b2b3d21e..492b6837dc0b 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/man
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.66 2005/03/04 23:31:53 ciaranm Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.67 2005/06/30 02:02:12 vapier Exp $
+
+*man-1.6 (30 Jun 2005)
+
+  30 Jun 2005; Mike Frysinger <vapier@gentoo.org> +man-1.6.ebuild:
+  Version bump.
 
   04 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> man-1.5p.ebuild:
   Move sys-apps/cronbase -> sys-process/cronbase
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 88da02b96002..6e0bbeeae619 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -1,9 +1,21 @@
-MD5 0d99dd6e4aa0b658bb8f597596737a87 ChangeLog 9848
-MD5 9c896566b39c57595f9b9c807aa05a00 man-1.5p.ebuild 2574
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 a1fe892ffb27e5e044ed342b611d2db1 files/makewhatis.cron 126
-MD5 6d6e219c5e8357b2d60e92e0ac88d76b files/digest-man-1.5p 60
-MD5 7b2b00aace5bcdb963286e235eaf22b2 files/man-1.5p-search-order.patch 519
+MD5 9c896566b39c57595f9b9c807aa05a00 man-1.5p.ebuild 2574
+MD5 145e574c19f760bd38cbe983c99a99a8 man-1.6.ebuild 2546
+MD5 0967a7dd0774d17bdfc1edd3180c8e3c ChangeLog 9955
+MD5 90c01e3cfecc4bc92266780a9be71429 files/digest-man-1.6 59
+MD5 80f2a25fb0b5692f39a1990527a93271 files/man-1.5m-groff-1.18.patch 923
 MD5 14e1c7533927dfb89900ee788666b342 files/man-1.5p-defmanpath-symlinks.patch 663
+MD5 6d6e219c5e8357b2d60e92e0ac88d76b files/digest-man-1.5p 60
 MD5 148b7ee661e1e9384930fbd508dd5027 files/man-1.5p-parallel-make.patch 437
-MD5 80f2a25fb0b5692f39a1990527a93271 files/man-1.5m-groff-1.18.patch 923
+MD5 a1fe892ffb27e5e044ed342b611d2db1 files/makewhatis.cron 126
+MD5 7b2b00aace5bcdb963286e235eaf22b2 files/man-1.5p-search-order.patch 519
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCw1K3gIKl8Uu19MoRAkXOAJ9quEarG5dnznzrhY+O7NGGOJwP3wCfWm5U
+IbZTgFul8TMxr2Ayd6QNhJE=
+=AEbj
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/man/files/digest-man-1.6 b/sys-apps/man/files/digest-man-1.6
new file mode 100644
index 000000000000..67b14c1f05b5
--- /dev/null
+++ b/sys-apps/man/files/digest-man-1.6
@@ -0,0 +1 @@
+MD5 c71fed22dd8d28c4bb93905faf95c13e man-1.6.tar.gz 234440
diff --git a/sys-apps/man/man-1.6.ebuild b/sys-apps/man/man-1.6.ebuild
new file mode 100644
index 000000000000..fa4a6f9aa566
--- /dev/null
+++ b/sys-apps/man/man-1.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6.ebuild,v 1.1 2005/06/30 02:02:12 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Standard commands to read man pages"
+HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
+SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="nls"
+
+DEPEND=""
+RDEPEND="sys-process/cronbase
+	>=sys-apps/groff-1.18
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Make sure we can build with -j :)
+	epatch ${FILESDIR}/man-1.5p-parallel-make.patch
+
+	# Fix search order in man.conf so that system installed manpages
+	# will be found first ...
+	epatch ${FILESDIR}/man-1.5p-search-order.patch
+
+	# For groff-1.18 or later we need to call nroff with '-c'
+	epatch ${FILESDIR}/man-1.5m-groff-1.18.patch
+
+	# makewhatis traverses manpages twice, as default manpath
+	# contains two directories that are symlinked together
+	epatch ${FILESDIR}/man-1.5p-defmanpath-symlinks.patch
+
+	# use non-lazy binds for man. And let portage handling stripping.
+	append-ldflags -Wl,-z,now
+	sed -i \
+		-e "/^LDFLAGS = -s/s:=.*:=${LDFLAGS}:" \
+		src/Makefile.in \
+		|| die "failed to edit default LDLFAGS"
+}
+
+src_compile() {
+	tc-export CC BUILD_CC
+
+	local myconf=
+	use nls && myconf="+lang all" || myconf="+lang none"
+	./configure \
+		-confdir=/etc \
+		+sgid +fhs \
+		${myconf} || die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make PREFIX="${D}" install || die "make install failed"
+	dosym man /usr/bin/manpath
+
+	dodoc LSM README* TODO
+
+	exeinto /etc/cron.weekly
+	newexe "${FILESDIR}"/makewhatis.cron makewhatis
+
+	keepdir /var/cache/man
+	diropts -m0775 -g man
+	local mansects=$(grep ^MANSECT "${D}"/etc/man.conf | cut -f2-)
+	for x in ${mansects//:/ } ; do
+		keepdir /var/cache/man/cat${x}
+	done
+}
+
+pkg_postinst() {
+	einfo "Forcing sane permissions onto ${ROOT}/var/cache/man (Bug #40322)"
+	chown -R root:man "${ROOT}"/var/cache/man
+	chmod -R g+w "${ROOT}"/var/cache/man
+	[[ -e ${ROOT}/var/cache/man/whatis ]] \
+		&& chown root:root "${ROOT}"/var/cache/man/whatis
+
+	echo
+
+	local files=$(ls "${ROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
+	if [[ ${files/$'\n'} != ${files} ]] ; then
+		ewarn "You have multiple makewhatis cron files installed."
+		ewarn "You might want to delete all but one of these:"
+		echo ${files}
+	fi
+}