Semi auto-sync

(manually editted for 1m 15s) -- sys-apps/man (2010-11-10 19:54:02.672648000 +0100)

(Portage version: 2.2.01.16711-prefix/svn/SunOS i386)

5 files changed, 287 insertions, 4 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 3f157578d4..124845b9a7 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for sys-apps/man
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.157 2010/01/28 06:21:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.164 2010/10/30 16:17:51 armin76 Exp $
+
+  30 Oct 2010; Raúl Porcel <armin76@gentoo.org> man-1.6f-r4.ebuild:
+  alpha/ia64/m68k/s390/sh/sparc stable wrt #338088
+
+  12 Oct 2010; Jeroen Roovers <jer@gentoo.org> man-1.6f-r4.ebuild:
+  Stable for HPPA (bug #338088).
+
+  10 Oct 2010; Markus Meier <maekke@gentoo.org> man-1.6f-r4.ebuild:
+  arm stable, bug #338088
+
+  30 Sep 2010; Brent Baude <ranger@gentoo.org> man-1.6f-r4.ebuild:
+  stable ppc64, bug 338088
+
+  27 Sep 2010; Brent Baude <ranger@gentoo.org> man-1.6f-r4.ebuild:
+  Marking man-1.6f-r4 ppc for bug 38088
+
+  25 Sep 2010; Markus Meier <maekke@gentoo.org> man-1.6f-r4.ebuild:
+  amd64/x86 stable, bug #338088
+
+*man-1.6f-r5 (19 Sep 2010)
+
+  19 Sep 2010; Mike Frysinger <vapier@gentoo.org> +man-1.6f-r5.ebuild,
+  +files/man-1.6f-makewhatis-compression-cleanup.patch:
+  Add fix by William Throwe with misdetecting package names of compressed man
+  pages #331979.
 
   28 Jan 2010; Mike Frysinger <vapier@gentoo.org>
   files/man-1.6f-parallel-build.patch:
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index b03d650dd6..52f1f8ad98 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -21,6 +21,7 @@ AUX man-1.6f-compress.patch 941 RMD160 b0aef2f2c6953f397e7fa8082f4047bc7fc39796
 AUX man-1.6f-echo.patch 1371 RMD160 332deca6209fac3d5763083dc176fb3b31e20573 SHA1 8a9d58d1ec822d3dbe4b12041245d4fadaf069b0 SHA256 00faa3e06e358dd4d47aece1d51d6ef17624594f4f84f2b46cf92dd7081f33d7
 AUX man-1.6f-interix-all_source.patch 563 RMD160 a019305ae7ce95c0a9bb6e658fc39e2ed19263e3 SHA1 8a352ad7e6829edf999f3881ae607c25aba1747a SHA256 e7d38815e6ed64c2f19c929d2dc0681d7c2abdaca0441ad121e84c56b5cd9789
 AUX man-1.6f-irix.patch 790 RMD160 a2c8b2b0f8b8df2a2321bd052d9bba8fa4656836 SHA1 7302e2aae47dc88da6a4a9c9d02668bb9605f1ca SHA256 d3fe4f77c8ca76920fd7f3458fdc46dbc48ce9051bc61a366219e1e9cb6eace9
+AUX man-1.6f-makewhatis-compression-cleanup.patch 2384 RMD160 ab4e612c82647139be06b2879b62c0e7ab0e908a SHA1 4b22f8463a07ef0bf533f742de7f6cd235753de7 SHA256 885fde98225f122597dc16ab05cd5666c808df9d2004589e3aefe7ba63860267
 AUX man-1.6f-man2html-compression-2.patch 1725 RMD160 f657abc5322b2a80ed861bb7b90158cfdc617e45 SHA1 fd2e1b82733d6c115b5929f38abb7eb7a75848a9 SHA256 f9df05eabad2408a017790954f46ac06eb565fed4de603d6d20bb3145439f97a
 AUX man-1.6f-man2html-compression.patch 1559 RMD160 c154c9d0f27ded25a9b60e1bf1496d624fe9cc08 SHA1 a7714a9ee7421ba3dd7b1a4fd66a436caadbe6da SHA256 dba59d9d94684995f670065ad09da392af5318f1b95eeba66806631f5339afa9
 AUX man-1.6f-parallel-build.patch 2312 RMD160 cd5913529555c278904946e213939283f782e322 SHA1 f6842ba6a8ff790a4ca41e65831b8dea57b691bd SHA256 158a5bfb6bcfe7f82b1ed4586a62a30cbd7c7688244e3c274fcb490112c18d13
@@ -30,6 +31,7 @@ AUX man-1.6f-unicode.patch 656 RMD160 298d0012b34c803fb296d7cacc07febd8d314f39 S
 AUX man-1.6f-xz.patch 3738 RMD160 56ccb9f0e3d3353425ab5f9e0546d77528f9827b SHA1 b1759769630a720bf8232846182494c4473dacf5 SHA256 c1b3e6f257f5e6d5303ce5f763ec7adc98bd171cbc03e59536e9d39ab3db4295
 DIST man-1.6f.tar.gz 254827 RMD160 8680bb94bff9b86fb9d061f58d9acb08c934531e SHA1 c97012607ed9d75a6eee7e66d257a99a8ed86918 SHA256 9f208c7e1981371ad4481d6e6c2c566bc726a15778723f94136d220fb9375f6c
 EBUILD man-1.6f-r3.ebuild 5658 RMD160 8d89dc25b089ec05155e6ac8e2133621b7b5c332 SHA1 ea094ce499249b59714d4b0d8d157a20c3a84048 SHA256 520040f1fe0ceb9c1751d7ca0aba3ecbdfd36c1901d31da56334660dd763f4fb
-EBUILD man-1.6f-r4.ebuild 5834 RMD160 5a2aa869cc456406b39d6311b1136b52dabd51b0 SHA1 12fb7ac3c09141db0a14ee650d2e404d74d17a16 SHA256 d509fe66a13871fab8a9bfe55494a64e16e0e189f1629ab7515b5376d63c527c
-MISC ChangeLog 21656 RMD160 c1acc09b2493b1a1adf0afed749f5ea06c4399ea SHA1 55846d5b6b260d8bc17387cc320e49b87939916c SHA256 6b19ef89343fee508eb98c6aa36bcd6951bb631deb5631032647bdd66e479f2b
+EBUILD man-1.6f-r4.ebuild 5835 RMD160 4cbf2f6ecbbe682ba2da89ba15c800f2eefc0924 SHA1 cf2bacf41a546aee96eadbb30d49e5a665e229e2 SHA256 83a48dcf3fa967b73b75fa7774784387df68bc447a29006ce856bca455995710
+EBUILD man-1.6f-r5.ebuild 5912 RMD160 2451837fe812f423f6e36148cf59f854eca63bef SHA1 3f8462ba59e0fd2fe56b29fda04fbf48a3171835 SHA256 474ec4719c99f8d6594e818b423e0b1d721f05c6f3cd9b276787e2f378df1556
+MISC ChangeLog 22529 RMD160 c2d1bde94261118407850fbbe2bdb89371087ec1 SHA1 382141f8399f531308e760fdee6b6a9107a7d909 SHA256 6183723783b2d12f081bc735f56253e96a54ef0fd5f397b46da35a3a3a0f137b
 MISC metadata.xml 329 RMD160 5120c92ca5f6331554baa726567c4367d8dea6f4 SHA1 3d9cf63688ff3e757816ea41b2dcac6d9dfe5d4f SHA256 2e95447c6cf6d6de9be0d4e1019d7ba41c99cc033fe94c5d81d2543124dbfc8d
diff --git a/sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch b/sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch
new file mode 100644
index 0000000000..a7d74c32be
--- /dev/null
+++ b/sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch
@@ -0,0 +1,69 @@
+http://bugs.gentoo.org/331979
+
+patch by William Throwe <wthrowe@mit.edu>
+
+The problem is that a failed match() resets the RSTART variable used to
+extract filename_no_gz (visible in the trailing context of the patch),
+so it is important that no more match() commands are attempted after the
+successful one.  Without the scoping, if (for example) the test for .bz2
+succeeds, it prevents testing for .lzma, but doesn't prevent testing for
+.xz.  The failing .xz test causes RSTART to be set to zero so
+filename_no_gz becomes the empty string.
+
+--- man-1.6f/src/makewhatis.sh
++++ man-1.6f/src/makewhatis.sh
+@@ -234,7 +234,7 @@
+ 	    find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
+ 
+ 	    function readline() {
+-              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
++	      if (use_compression) {
+ 		result = (pipe_cmd | getline);
+ 		if (result < 0) {
+ 		  print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
+@@ -249,7 +249,7 @@
+ 	    }
+ 	    
+ 	    function closeline() {
+-              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
++	      if (use_compression) {
+ 		return close(pipe_cmd);
+ 	      } else {
+ 		return close(filename);
+@@ -263,16 +263,20 @@
+ 	      if (verbose) {
+ 		print "adding " filename > "/dev/stderr"
+ 	      }
+-	      
++
+ 	      use_zcat = match(filename,"\\.Z$") ||
+ 			 match(filename,"\\.z$") || match(filename,"\\.gz$");
+-	      if (!use_zcat)
++	      if (!use_zcat) {
+ 		use_bzcat = match(filename,"\\.bz2");
+-              if(!use_bzcat)
+-                use_lzcat = match(filename,"\\.lzma");
+-              if(!use_lzcat)
+-                use_xzcat = match(filename,"\\.xz");
+-              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
++		if (!use_bzcat) {
++		  use_lzcat = match(filename,"\\.lzma");
++		  if (!use_lzcat) {
++		    use_xzcat = match(filename,"\\.xz");
++		  }
++		}
++	      }
++	      use_compression = (use_zcat || use_bzcat || use_lzcat || use_xzcat);
++	      if (use_compression) {
+ 		filename_no_gz = substr(filename, 0, RSTART - 1);
+ 	      } else {
+ 		filename_no_gz = filename;
+@@ -285,7 +289,7 @@
+ 		actual_section = section;
+ 	      }
+ 	      sub(/\..*/, "", progname);
+-              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
++	      if (use_compression) {
+ 		if (use_zcat) {
+ 		  pipe_cmd = "zcat \"" filename "\"";
+                 } else if (use_bzcat) {
diff --git a/sys-apps/man/man-1.6f-r4.ebuild b/sys-apps/man/man-1.6f-r4.ebuild
index 70945b49c5..52c6f3b8a8 100644
--- a/sys-apps/man/man-1.6f-r4.ebuild
+++ b/sys-apps/man/man-1.6f-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6f-r4.ebuild,v 1.2 2010/01/28 06:20:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6f-r4.ebuild,v 1.8 2010/10/30 16:17:51 armin76 Exp $
 
 EAPI="2"
 inherit eutils toolchain-funcs flag-o-matic prefix
diff --git a/sys-apps/man/man-1.6f-r5.ebuild b/sys-apps/man/man-1.6f-r5.ebuild
new file mode 100644
index 0000000000..850ce8aec5
--- /dev/null
+++ b/sys-apps/man/man-1.6f-r5.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6f-r5.ebuild,v 1.1 2010/09/19 23:52:08 vapier Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs 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"
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND="|| ( >=sys-apps/groff-1.19.2-r1 app-doc/heirloom-doctools )
+	!sys-apps/man-db
+	!app-arch/lzma
+	lzma? ( app-arch/xz-utils )"
+PROVIDE="virtual/man"
+
+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.5p-search-order.patch
+	epatch "${FILESDIR}"/man-1.6f-unicode.patch #146315
+	epatch "${FILESDIR}"/man-1.5p-defmanpath-symlinks.patch
+	epatch "${FILESDIR}"/man-1.6b-more-sections.patch
+	epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
+	epatch "${FILESDIR}"/man-1.5m2-apropos.patch
+	epatch "${FILESDIR}"/man-1.6d-fbsd.patch
+	epatch "${FILESDIR}"/man-1.6e-headers.patch
+	epatch "${FILESDIR}"/man-1.6f-so-search-2.patch
+	epatch "${FILESDIR}"/man-1.6f-compress.patch
+	epatch "${FILESDIR}"/man-1.6f-parallel-build.patch #207148 #258916
+	epatch "${FILESDIR}"/man-1.6f-xz.patch #302380
+	epatch "${FILESDIR}"/man-1.6f-makewhatis-compression-cleanup.patch #331979
+	# 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.6e-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.6e-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
+	# Hardcode path to echo(1), to keep some shells (e.g. zsh, mksh) from
+	# expanding "\n".
+	epatch "${FILESDIR}"/man-1.6f-echo.patch
+	eprefixify "${S}"/src/man.c
+	# don't use built-in versions of bcopy and bzero if _ALL_SOURCE is deinfed
+	# on interix, since they have conflicting definitions with system headers.
+	epatch "${FILESDIR}"/${P}-interix-all_source.patch
+}
+
+echoit() { echo "$@" ; "$@" ; }
+src_configure() {
+	strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ })
+
+	if use prefix ; then
+		ebegin "Allowing unpriviliged install"
+		sed -i \
+			-e 's/@man_install_flags@//g' \
+			"${S}"/src/Makefile.in
+		eend $?
+	fi
+
+	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"
+
+	[[ ${CHOST} == *-interix* ]] && append-flags "-D_POSIX_SOURCE"
+
+	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
+}