Fix path in makewhatis #160317 by Paul Taylor, make sure #!shebangs arent destroyed to handle lame root shells #159192 by Gautam Iyer, and include some more headers.

(Portage version: 2.1.2_rc4-r6)

6 files changed, 177 insertions, 3 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 1b4ef0bce0c7..925d944c4841 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/man
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.105 2006/12/27 16:15:47 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.106 2007/01/06 01:34:35 vapier Exp $
+
+*man-1.6e-r1 (06 Jan 2007)
+
+  06 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.6e-dont-kill-shebangs.patch, +files/man-1.6e-headers.patch,
+  files/makewhatis.cron, +man-1.6e-r1.ebuild:
+  Fix path in makewhatis #160317 by Paul Taylor, make sure #!shebangs arent
+  destroyed to handle lame root shells #159192 by Gautam Iyer, and include
+  some more headers.
 
   27 Dec 2006; Mike Frysinger <vapier@gentoo.org> man-1.6e.ebuild:
   Move makewhatis to /etc/cron.daily.
diff --git a/sys-apps/man/files/digest-man-1.6e-r1 b/sys-apps/man/files/digest-man-1.6e-r1
new file mode 100644
index 000000000000..69ec127910e1
--- /dev/null
+++ b/sys-apps/man/files/digest-man-1.6e-r1
@@ -0,0 +1,3 @@
+MD5 d8187cd756398baefc48ba7d60ff6a8a man-1.6e.tar.gz 252657
+RMD160 486099dc1b34fe86a2c1d19b7c89dc19b9787837 man-1.6e.tar.gz 252657
+SHA256 022faf23844eabb3662eabb105836925dd83bedda10271e2450a5bc5b61a5b5f man-1.6e.tar.gz 252657
diff --git a/sys-apps/man/files/makewhatis.cron b/sys-apps/man/files/makewhatis.cron
index 6bcf1105e5f9..bef5ea6d1e2d 100644
--- a/sys-apps/man/files/makewhatis.cron
+++ b/sys-apps/man/files/makewhatis.cron
@@ -2,4 +2,4 @@
 # this is part of the man package
 # it updates the search database for manpages
 
-exec /bin/nice /usr/sbin/makewhatis -u
+exec nice makewhatis -u
diff --git a/sys-apps/man/files/man-1.6e-dont-kill-shebangs.patch b/sys-apps/man/files/man-1.6e-dont-kill-shebangs.patch
new file mode 100644
index 000000000000..dbbc243b5631
--- /dev/null
+++ b/sys-apps/man/files/man-1.6e-dont-kill-shebangs.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/159192
+
+--- configure
++++ configure
+@@ -1250,6 +1250,7 @@
+ allargs='$@'
+ infiles='$infiles'
+ infile='$infile'
++shebang='`sed -n -e 1p $infile.in`'
+ cb='$cb'
+ cs='$cs'
+ ce='$ce'
+@@ -1273,7 +1274,11 @@
+   *.1|*.5|*.8|*.man)
+     cb=$mancomment; cs=$mancomment; ce=$mancomment;;
+   *)
+-    cb="#"; cs="#"; ce="#";;
++    case "$shebang" in
++    '#!'*) cb="$shebang";;
++    *)     cb="#";;
++    esac
++    cs="#"; ce="#";;
+   esac
+   echo "$cb"                                                    > $infile
+   echo "$cs Generated automatically from $infile.in by the"     >> $infile
diff --git a/sys-apps/man/files/man-1.6e-headers.patch b/sys-apps/man/files/man-1.6e-headers.patch
new file mode 100644
index 000000000000..9c6fd6f43516
--- /dev/null
+++ b/sys-apps/man/files/man-1.6e-headers.patch
@@ -0,0 +1,13 @@
+--- gencat/genlib.c
++++ gencat/genlib.c
+@@ -49,10 +49,8 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#ifdef SYSV
+ #include <sys/types.h>
+ #include <unistd.h>
+-#endif
+ 
+ #if !defined(__linux__) && !defined(__FreeBSD__)
+ #include <memory.h>
diff --git a/sys-apps/man/man-1.6e-r1.ebuild b/sys-apps/man/man-1.6e-r1.ebuild
new file mode 100644
index 000000000000..a868bdb36c25
--- /dev/null
+++ b/sys-apps/man/man-1.6e-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6e-r1.ebuild,v 1.1 2007/01/06 01:34:35 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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nls"
+
+DEPEND="nls? ( sys-devel/gettext )"
+DEPEND=">=sys-apps/groff-1.18
+	!sys-apps/man-db"
+PROVIDE="virtual/man"
+
+pkg_setup() {
+	enewgroup man 15
+	enewuser man 13 -1 /usr/share/man man
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# We love to cross-compile
+	epatch "${FILESDIR}"/man-1.6-cross-compile.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
+
+	# add more sections to default search path
+	epatch "${FILESDIR}"/man-1.6b-more-sections.patch
+
+	# cut out symlinked paths #90186
+	epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
+
+	# Fedora patches
+	epatch "${FILESDIR}"/man-1.5m2-apropos.patch
+
+	# Fixes compilation in FreeBSD wrt #138123
+	epatch "${FILESDIR}"/man-1.6d-fbsd.patch
+
+	epatch "${FILESDIR}"/man-1.6e-dont-kill-shebangs.patch #159192
+	epatch "${FILESDIR}"/man-1.6e-headers.patch
+
+	strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ })
+}
+
+src_compile() {
+	tc-export CC BUILD_CC
+
+	local mylang=
+	if use nls ; then
+		if [[ -z ${LINGUAS} ]] ; then
+			mylang="all"
+		else
+			mylang="${LINGUAS// /,}"
+		fi
+	else
+		mylang="none"
+	fi
+	./configure \
+		-confdir=/etc \
+		+sgid +fhs \
+		+lang ${mylang} \
+		|| die "configure failed"
+
+	append-ldflags $(bindnow-flags)
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake PREFIX="${D}" install || die "make install failed"
+	dosym man /usr/bin/manpath
+
+	dodoc LSM README* TODO
+
+	# makewhatis only adds man-pages from the last 24hrs
+	exeinto /etc/cron.daily
+	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:0 "${ROOT}"/var/cache/man/whatis
+
+	echo
+
+	local f files=$(ls "${ROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
+	for f in ${files} ; do
+		[[ ${f} == */etc/cron.daily/makewhatis ]] && continue
+		[[ $(md5sum "${f}") == "8b2016cc778ed4e2570b912c0f420266 "* ]] \
+			&& rm -f "${f}"
+	done
+	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:"
+		ewarn ${files}
+	fi
+}