Dont force -T anymore when calling groff #146315 by Matthias Schwarzott.

(Portage version: 2.1.1_rc1-r3)

4 files changed, 160 insertions, 1 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index acefd1f67dc4..6f90c326743f 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,12 @@
 # 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.100 2006/08/22 13:34:07 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.101 2006/09/04 22:48:37 vapier Exp $
+
+*man-1.6d-r1 (04 Sep 2006)
+
+  04 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.6d-groff.patch, +man-1.6d-r1.ebuild:
+  Dont force -T anymore when calling groff #146315 by Matthias Schwarzott.
 
   22 Aug 2006; Stephen P. Becker <geoman@gentoo.org> man-1.6d.ebuild:
   stable on mips
diff --git a/sys-apps/man/files/digest-man-1.6d-r1 b/sys-apps/man/files/digest-man-1.6d-r1
new file mode 100644
index 000000000000..8d7dd63c72eb
--- /dev/null
+++ b/sys-apps/man/files/digest-man-1.6d-r1
@@ -0,0 +1,3 @@
+MD5 36d3f65bcc10f0754a3234e00d92ad6d man-1.6d.tar.gz 270140
+RMD160 2c476a735c211acbb478d604b73a1becb54cb87b man-1.6d.tar.gz 270140
+SHA256 a6d03bdabe16542a5a51471b5d8e7eaa50ad782577c7b31d9c478382097cf4eb man-1.6d.tar.gz 270140
diff --git a/sys-apps/man/files/man-1.6d-groff.patch b/sys-apps/man/files/man-1.6d-groff.patch
new file mode 100644
index 000000000000..822b6f012384
--- /dev/null
+++ b/sys-apps/man/files/man-1.6d-groff.patch
@@ -0,0 +1,28 @@
+Don't force output encoding, let groff do the detectiong
+
+http://bugs.gentoo.org/146315
+
+--- man-1.6d/configure
++++ man-1.6d/configure
+@@ -473,9 +473,9 @@
+   then
+     if test $Fnroff = "missing"
+     then
+-      nroff="nroff -Tlatin1 -mandoc"
++      nroff="nroff -mandoc"
+     else
+-      nroff="$Fnroff -Tlatin1 -mandoc"
++      nroff="$Fnroff -mandoc"
+     fi
+     troff="troff -mandoc"
+     echo "Warning: could not find groff"
+@@ -484,7 +484,7 @@
+     then
+       nroff="$Fgroff -Tlatin1 -mandoc"
+     else
+-      nroff="$Fnroff -Tlatin1 -mandoc"
++      nroff="$Fnroff -mandoc"
+     fi
+     troff="$Fgroff -Tps -mandoc"
+     jnroff="$Fgroff -Tnippon -mandocj"
+
diff --git a/sys-apps/man/man-1.6d-r1.ebuild b/sys-apps/man/man-1.6d-r1.ebuild
new file mode 100644
index 000000000000..afcb95ff21c8
--- /dev/null
+++ b/sys-apps/man/man-1.6d-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6d-r1.ebuild,v 1.1 2006/09/04 22:48:37 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 ~x86-fbsd"
+IUSE="nls"
+
+DEPEND="nls? ( sys-devel/gettext )"
+DEPEND=">=sys-apps/groff-1.19
+	!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
+
+	epatch "${FILESDIR}"/man-1.6d-groff.patch #146315
+
+	# makewhatis traverses manpages twice, as default manpath
+	# contains two directories that are symlinked together
+	epatch "${FILESDIR}"/man-1.5p-defmanpath-symlinks.patch
+
+	# makewhatis should get section info from config, not hardcode it #86863
+	epatch "${FILESDIR}"/man-1.6a-makewhatis-config.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
+
+	# include more headers
+	epatch "${FILESDIR}"/man-1.6d-headers.patch
+
+	# use non-lazy binds for man
+	epatch "${FILESDIR}"/man-1.6b-build.patch
+
+	# Fixes compilation in FreeBSD wrt #138123
+	epatch "${FILESDIR}"/man-1.6d-fbsd.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"
+
+	export BINDNOW_FLAGS=$(bindnow-flags)
+	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:0 "${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:"
+		ewarn ${files}
+	fi
+}