sys-apps/man: sync

(Portage version: 2.2.20-prefix/hg/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)

4 files changed, 215 insertions, 5 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 5fc92dee8e..564352dbe7 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/man
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.178 2014/11/02 09:47:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.179 2015/05/08 03:22:04 vapier Exp $
+
+*man-1.6g-r1 (08 May 2015)
+
+  08 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.6g-echo-escape.patch, +man-1.6g-r1.ebuild,
+  -files/man-1.5p-defmanpath-symlinks.patch, -files/man-1.5p-search-order.patch,
+  -files/man-1.6b-more-sections.patch, -files/man-1.6d-fbsd.patch,
+  -files/man-1.6f-compress.patch, -files/man-1.6f-xz.patch, -man-1.6f-r4.ebuild,
+  -man-1.6f-r5.ebuild:
+  Avoid escape sequences with `echo` #523874 by Alex Xu.
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> man-1.6g.ebuild:
   Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 11f1d47cac..6d7f9606b9 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -34,17 +34,19 @@ AUX man-1.6f-unicode.patch 656 SHA256 1c7624b5824e5585abd1c3d27ffd8e2d9207a05bf6
 AUX man-1.6f-xz.patch 3738 SHA256 c1b3e6f257f5e6d5303ce5f763ec7adc98bd171cbc03e59536e9d39ab3db4295 SHA512 c5d3824d9e116853b054ebc8420216a51dab9395ae448e202fc0f97e7e797a93e3beccca1c4225eeabc4b814ef83a124e78fdfa095d0b64ecd021676fff86ac5 WHIRLPOOL 708904a8d38b6b9d0d65c1678b17b05ac4f3c478f6b398e29f4cbc27370da2f7cd2345c730fa42d407d9bf95d0ac3cf50ed99189450ae0369bae1762a2fb9bb0
 AUX man-1.6g-bsdish.patch 601 SHA256 96e2b57cb8d38f7bb96d0d2024919adee6c314895739869c7386c4317c677a17 SHA512 d71e3b0fd7f085c2f491a70ab54a443feb45b2951280352035419b2fad324fcb4a5a0c8f305ff62e8fc24c959b7228b3ebbf91d7e096bd4baffc5a114b17932a WHIRLPOOL 51439f3a255ebcdc89e2a68866c41c0ccd217326231d5ecee244948b1726e160b730425c8a2446dbc7878b678b13883efddf54807f9315ce4e89a9c06747c1af
 AUX man-1.6g-compress.patch 343 SHA256 96945eded649cfe908088b75da4a71e7bfb461795e463d0126f34985410bd40f SHA512 eab984c95b75bbf29b65ff38029bbcfa870972fa2cff208da5d4d43c89dd0ceeb32a8faceb43836ced9ff50ee5765d2a5c4f1faf51f5507f0ea97b6ffcfe36c8 WHIRLPOOL ccfb29da707bed5c6e2ad9ace2ba51882d3cdea36c29010a78b1359969b8dcd303467d7566c497cc2a4068e2fb13b8bd2a559c8f96ae60af47e5212d355347db
+AUX man-1.6g-echo-escape.patch 630 SHA256 31ae1e0f3321b2e9e16b604c71cbd9a806d061e80e80a3ff1ae24b22c8a501df SHA512 d66aa7ccc97fe1af2afe1165e2305c4ad4cd4ec48078707432a1ccd79db80f7ff11ad977175651fb6c6875e31461a1e04352f2a3b542762afaf9a07290fe03c0 WHIRLPOOL 447949c0a7a953fbce4598e532ded3acb45bd0bb7d2aa5ef89c38c9f451b90f75f2d68425ab314821de43ff31df06f55b7cca0fa16ec880967fd06451322796e
 AUX man-1.6g-fbsd.patch 366 SHA256 fd4e50be32571103e9880b9291c691d45a225a7d6f2b27ff05168d22dbce7336 SHA512 4019267584b1350b2c9da9aa1851a2e4e96f271265d189ecd677206be20dac67cd212b2887f844f43c10d96076a76613a12e53f3b29a185ec62ed4bff4c5a502 WHIRLPOOL 60bc8aff0c96036ba2842e0113adaa3851a7b0e179b73f013e8e5b42e12511eb1cf07e5c3cbd07f8d7613c4cf2ccb40f6276cc50e9f2ffb7ee9cecf435f0bb77
 AUX man-1.6g-prefix-path.patch 1273 SHA256 4a406c86ff4cd541f4526f73ecf94163639b2034ef479bb8aa19d5de6824caef SHA512 28d07493a68b09694260bf9855dec8d4ee466dbbe15ec58c54160a84224071e42398188bc8573c0a7ea389684d158e3e5bb3d9ba6eaa7e3035a92213db3418d7 WHIRLPOOL bb0f49d9e48ac8ea463e793e46f0208b4dc8d56eb88662fec78bfcc3668d9201f281c692ca4e8470d96b697a4fbe8682fc90e18df484a8fa5f7b51b739dfa529
 AUX man-1.6g-xz.patch 1848 SHA256 7c11114ec34f017d0641c9a7ecd9ad8b93f6c226e9bdd54fd0fedf1313451634 SHA512 6a883fa800a6d3b11c76a70e1a31c0736d380271c9f21315863ddaca9529e3d613b587724287fb94bab2b0d97215f6ccb3f1438a5c5e339e5a2edf872c92515c WHIRLPOOL 4f2ffd7d09ddda0a3bc49d4a1b36a7ef953f9afde4d0dfa164a917783516e549e9a12196994239f65d9c26b3ef1c64553601bb68fcfad4286e882fb0465cb0aa
 DIST man-1.6g.tar.gz 256906 SHA256 ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b WHIRLPOOL 1b531476108c27a3993023da430831c2d20f8045a51490d559a7f588f0771931defd7a3a745e9f1f03797e681eea8767aad4a27ab9abdd5d06ad935dc96a5020
+EBUILD man-1.6g-r1.ebuild 5598 SHA256 954de5fe472e7283c2a2f8a22700f6e710f5c9db07edd4a3427fe2ff6ebff21f SHA512 22e92df664e4b3bcff2a62234cefe2414a05c9f32a9aca6f9219c754c2a33c76da33d1632db5c010c5d1f04abd3d14c69444ff7bdb07fc30b52d6d287287d4d4 WHIRLPOOL 60d1bdd0429db144f242639ce3bb43ec6370536cd8543d81e706cea3e1c3086e21be712119c8324a6a6459e30ad652dc6ed69e22a53d3704955488bbc4892156
 EBUILD man-1.6g.ebuild 5764 SHA256 b6a229047feef84632cc369bc95b76396f2ceeb7539ea25ac6c1f06a79d5ef7e SHA512 65c67e1b7f0e94524514d79921f43d343d216b615f59b3e60778c09d42685a720539f01bec8619a5af74640e1fc0b6a37b808b9d371e13bc8e3e04e23b72df04 WHIRLPOOL 7bf49e187a6b9f7be7ec489f0c6ef1aea3eb0758d2d1fa16b82df70db12c57b8e4725884e918eb3eb1e908038819d4282bc7d38c69c55115877674c6efaafadd
-MISC ChangeLog 24368 SHA256 f42b33cea0497e03c1481420533fa64c9e9d616329e52cf96cf86f6aa7abd3f0 SHA512 ba96c2f0790e5a343ab0b45c6ad820379fa46a3ca2d0ac37089696259ca8caac29489e563037f6ac937181ea31b0ff16f986785d0b6a687a369581b7684efe7b WHIRLPOOL 81ab3d121bf107b776cbdced7365a545cb11b0940ae3dc1f65b2360d9ea18c43c8b5cdb859acbe1ed5877bdb1642d76a200ffe1c4007830c495a11cad89367a8
+MISC ChangeLog 24815 SHA256 246995690bfdf8b7c1e7d0a012a15d21955983967365cb3201ade29a38e2faa8 SHA512 231e4ad86a93dff35f11c3676c7db9c19cb49cf1a3a91ec9dc7e484cb11d42cda0b5492fee75fa881f23f4a340b526fe469a0c773ebf7074c7b01a3298b65b26 WHIRLPOOL 3c692e40173882cf0600b518910e685b0598c99a1b93c3e52797de32505b0c6a7b5b1d285341c29f440c83297bdab0c3516e25d33391ea6388d346618827c06f
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTRNNAACgkQX3X2B8XHTonxnwCghWekTjlDeEhsa9PKxijG7U7e
-TkQAnRepWIltb5PgxMZK1dEtaYI0fklX
-=1LNC
+iEYEAREIAAYFAlWpUTwACgkQX3X2B8XHTokRVACfSYu8Pxl16V4TZIznGoS8+gz2
+gboAnitQiMXzVooq1kcIpoo8/Dz3lU/f
+=0iuR
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/man/files/man-1.6g-echo-escape.patch b/sys-apps/man/files/man-1.6g-echo-escape.patch
new file mode 100644
index 0000000000..96e950a51e
--- /dev/null
+++ b/sys-apps/man/files/man-1.6g-echo-escape.patch
@@ -0,0 +1,15 @@
+avoid using escape sequences in echo as they're not portable
+
+https://bugs.gentoo.org/523874
+
+--- a/src/man.c
++++ b/src/man.c
+@@ -626,7 +626,7 @@ make_roff_command (const char *path, const char *file) {
+ 		 the current position plus 10 lines.  This plus setpl()
+ 		 gives us a single page that just contains the whole
+ 		 man page. (William Webber, wew@cs.rmit.edu.au) */
+-	      strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \\n(nlu+10\"");
++	      strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \"; echo \"(nlu+10\"");
+ #if 0
+ 	      /* In case this doesnt work for some reason,
+ 		 michaelkjohnson suggests: I've got a simple
diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild
new file mode 100644
index 0000000000..61976b3945
--- /dev/null
+++ b/sys-apps/man/man-1.6g-r1.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6g-r1.ebuild,v 1.1 2015/05/08 03:22:04 vapier Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs user flag-o-matic prefix
+
+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="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+lzma nls selinux"
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND="|| ( >=sys-apps/groff-1.19.2-r1 app-doc/heirloom-doctools )
+	!sys-apps/man-db
+	!<app-arch/lzma-4.63
+	lzma? ( app-arch/xz-utils )
+	selinux? ( sec-policy/selinux-makewhatis )"
+
+pkg_setup() {
+	enewgroup man 15
+	enewuser man 13 -1 ${EPREFIX}/usr/share/man man
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/man-1.6f-man2html-compression-2.patch
+	epatch "${FILESDIR}"/man-1.6-cross-compile.patch
+	epatch "${FILESDIR}"/man-1.6f-unicode.patch #146315
+	epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
+	epatch "${FILESDIR}"/man-1.5m2-apropos.patch
+	epatch "${FILESDIR}"/man-1.6g-fbsd.patch #138123
+	epatch "${FILESDIR}"/man-1.6e-headers.patch
+	epatch "${FILESDIR}"/man-1.6f-so-search-2.patch
+	epatch "${FILESDIR}"/man-1.6g-compress.patch #205147
+	epatch "${FILESDIR}"/man-1.6f-parallel-build.patch #207148 #258916
+	epatch "${FILESDIR}"/man-1.6g-xz.patch #302380
+	epatch "${FILESDIR}"/man-1.6f-makewhatis-compression-cleanup.patch #331979
+	epatch "${FILESDIR}"/man-1.6g-echo-escape.patch #523874
+	# make sure `less` handles escape sequences #287183
+	sed -i -e '/^DEFAULTLESSOPT=/s:"$:R":' configure
+
+	# This patch could be easily merged with the FreeBSD one, but we don't
+	# because the files have no CVS header and then auto syncing overwrites the
+	# local difference we make.  <grobian@gentoo.org>
+	epatch "${FILESDIR}"/man-1.6g-bsdish.patch
+	# Solaris needs fcntl.h included for O_CREAT etc, like SYSV
+	epatch "${FILESDIR}"/man-1.6e-solaris.patch
+	# hpux does not have setenv()
+	epatch "${FILESDIR}"/man-1.6e-hpux.patch
+	# irix support is a bit messed up in defines
+	epatch "${FILESDIR}"/man-1.6f-irix.patch
+	# Results in grabbing as much tools from the prefix, instead of main
+	# system in a prefixed environment
+	epatch "${FILESDIR}"/man-1.6g-prefix-path.patch
+
+	# Fix the makewhatis script for prefix.
+	cp "${FILESDIR}"/makewhatis.cron "${T}"/
+	pushd "${T}" > /dev/null
+	epatch "${FILESDIR}"/makewhatis.cron-prefix.patch
+	popd > /dev/null
+	eprefixify "${T}"/makewhatis.cron
+
+	# fix man.conf file, bug #351245
+	sed -i \
+		-e "/^MANPATH\t/s:\t/:\t${EPREFIX}/:" \
+		-e "/^MANPATH_MAP\t/s:\t/:\t${EPREFIX}/:g" \
+		src/man.conf.in || die
+
+	if use prefix ; then
+		ebegin "Allowing unpriviliged install"
+		sed -i \
+			-e 's/@man_install_flags@//g' \
+			"${S}"/src/Makefile.in
+		eend $?
+	fi
+
+}
+
+echoit() { echo "$@" ; "$@" ; }
+src_configure() {
+	strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ })
+
+	unset NLSPATH #175258
+
+	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
+
+	local myconf=
+	use prefix || myconf="${myconf} +sgid"
+
+	export COMPRESS
+	if use lzma ; then
+		COMPRESS="${EPREFIX}"/usr/bin/xz
+	else
+		COMPRESS="${EPREFIX}"/bin/bzip2
+	fi
+	echoit \
+	./configure \
+		-prefix="${EPREFIX}/usr" \
+		-confdir="${EPREFIX}"/etc \
+		${myconf} \
+		+fhs \
+		+lang ${mylang} \
+		|| die "configure failed"
+}
+
+src_install() {
+	unset NLSPATH #175258
+
+	emake DESTDIR="${D}" install || die "make install failed"
+	dosym man /usr/bin/manpath
+
+	dodoc LSM README* TODO
+
+	# Make all Solaris man-pages available
+	if [[ ${CHOST} == *-solaris* && -e /usr/share/man/man.cf ]] ; then
+		source /usr/share/man/man.cf
+		sed -i -e 's/^\(MANSECT.*\)$/\1:'"${MANSECTS//,/:}"'/' \
+			"${ED}"/etc/man.conf || die "failed to adapt to Solaris"
+	fi
+
+	# makewhatis only adds man-pages from the last 24hrs
+	exeinto /etc/cron.daily
+	newexe "${T}"/makewhatis.cron makewhatis
+
+	keepdir /var/cache/man
+	use prefix || diropts -m0775 -g man && diropts -m0775
+	local mansects=$(grep ^MANSECT "${ED}"/etc/man.conf | cut -f2-)
+	for x in ${mansects//:/ } ; do
+		keepdir /var/cache/man/cat${x}
+	done
+}
+
+pkg_postinst() {
+	if use !prefix ; then
+
+	einfo "Forcing sane permissions onto ${EROOT}var/cache/man (Bug #40322)"
+	chown -R root:man "${EROOT}"/var/cache/man
+	[[ -e ${EROOT}/var/cache/man/whatis ]] \
+		&& chown root:0 "${EROOT}"/var/cache/man/whatis
+
+	fi # end lame indenting
+
+	chmod -R g+w "${EROOT}"/var/cache/man
+
+	echo
+
+	local f files=$(ls "${EROOT}"/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 "${EROOT}"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
+
+	if has_version app-doc/heirloom-doctools; then
+		ewarn "Please note that the /etc/man.conf file installed will not"
+		ewarn "work with heirloom's nroff by default (yet)."
+		ewarn ""
+		ewarn "Check app-doc/heirloom-doctools elog messages for the proper"
+		ewarn "configuration."
+	fi
+}