Version bump.

6 files changed, 161 insertions, 1 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 359deaade9a3..71c5b990d4f1 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,14 @@
 # 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.64 2005/01/08 02:23:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.65 2005/01/12 18:29:48 vapier Exp $
+
+*man-1.5p (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.5p-defmanpath-symlinks.patch,
+  +files/man-1.5p-parallel-make.patch, +files/man-1.5p-search-order.patch,
+  +man-1.5p.ebuild:
+  Version bump.
 
 *man-1.5o_p2 (07 Jan 2005)
 
diff --git a/sys-apps/man/files/digest-man-1.5p b/sys-apps/man/files/digest-man-1.5p
new file mode 100644
index 000000000000..a87e48b72e5e
--- /dev/null
+++ b/sys-apps/man/files/digest-man-1.5p
@@ -0,0 +1 @@
+MD5 037d5644f8ef9ea0ef22b271bae0297d man-1.5p.tar.gz 233732
diff --git a/sys-apps/man/files/man-1.5p-defmanpath-symlinks.patch b/sys-apps/man/files/man-1.5p-defmanpath-symlinks.patch
new file mode 100644
index 000000000000..277f7a91f67a
--- /dev/null
+++ b/sys-apps/man/files/man-1.5p-defmanpath-symlinks.patch
@@ -0,0 +1,20 @@
+--- man-1.5o2/src/makewhatis.sh.orig	2005-01-07 21:19:37.812163552 -0500
++++ man-1.5o2/src/makewhatis.sh	2005-01-07 21:20:43.023249960 -0500
+@@ -41,7 +41,7 @@
+ # and should be first.
+ # It is a bug to add /var/cache/man to DEFCATPATH.
+ dm=
+-for d in /usr/man /usr/share/man /usr/X11R6/man /usr/local/man
++for d in /usr/local/man /usr/share/man
+ do
+     if [ -d $d ]; then
+ 	if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi
+@@ -49,7 +49,7 @@
+ done
+ DEFMANPATH=$dm
+ dc=
+-for d in /usr/man/preformat /usr/man /usr/share/man/preformat /usr/share/man
++for d in /usr/local/man /usr/share/man
+ do
+     if [ -d $d ]; then
+ 	if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi
diff --git a/sys-apps/man/files/man-1.5p-parallel-make.patch b/sys-apps/man/files/man-1.5p-parallel-make.patch
new file mode 100644
index 000000000000..22f15fd7eadc
--- /dev/null
+++ b/sys-apps/man/files/man-1.5p-parallel-make.patch
@@ -0,0 +1,18 @@
+--- Makefile.in.orig	2005-01-12 10:59:10.934526728 -0500
++++ Makefile.in	2005-01-12 11:01:22.765485376 -0500
+@@ -33,13 +33,13 @@
+ source:	src/Makefile
+ 	cd src; $(MAKE)
+ 
+-manhtml: man2html/Makefile
++manhtml: man2html/Makefile source
+ 	cd man2html; $(MAKE)
+ 
+ manpages: man/Makefile
+ 	cd man; $(MAKE) subdirs
+ 
+-%messages: gencat/gencat msgs/Makefile
++%messages: gencat/gencat msgs/Makefile source
+ %	cd msgs; $(MAKE)
+ 
+ %gencat/gencat:
diff --git a/sys-apps/man/files/man-1.5p-search-order.patch b/sys-apps/man/files/man-1.5p-search-order.patch
new file mode 100644
index 000000000000..a3cbd1201d9d
--- /dev/null
+++ b/sys-apps/man/files/man-1.5p-search-order.patch
@@ -0,0 +1,17 @@
+diff -Narup man-1.5p.orig/src/man.conf.in man-1.5p/src/man.conf.in
+--- man-1.5p.orig/src/man.conf.in	2002-07-17 15:08:40.000000000 -0400
++++ man-1.5p/src/man.conf.in	2002-12-19 09:04:28.000000000 -0500
+@@ -36,11 +36,11 @@
+ #
+ # Every automatically generated MANPATH includes these fields
+ #
+-MANPATH	/usr/man
+ MANPATH	/usr/share/man
+-MANPATH	/usr/local/man
+ MANPATH	/usr/local/share/man
+ MANPATH	/usr/X11R6/man
++MANPATH	/usr/local/man
++MANPATH	/usr/man
+ #
+ # Uncomment if you want to include one of these by default
+ #
diff --git a/sys-apps/man/man-1.5p.ebuild b/sys-apps/man/man-1.5p.ebuild
new file mode 100644
index 000000000000..bc2a9b7c3db5
--- /dev/null
+++ b/sys-apps/man/man-1.5p.ebuild
@@ -0,0 +1,96 @@
+# 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.5p.ebuild,v 1.1 2005/01/12 18:29:48 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+NV="${PV/_p}"
+DESCRIPTION="Standard commands to read man pages"
+HOMEPAGE="http://freshmeat.net/projects/man/"
+SRC_URI="mirror://kernel/linux/utils/man/man-${NV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls"
+
+DEPEND="virtual/libc
+	>=sys-apps/sed-4"
+RDEPEND="sys-apps/cronbase
+	>=sys-apps/groff-1.18
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${PN}-${NV}"
+
+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
+}