Version bump.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

7 files changed, 239 insertions, 12 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 124845b9a735..830a5d9fca0d 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,13 @@
 # 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.164 2010/10/30 16:17:51 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.165 2011/01/02 03:22:35 vapier Exp $
+
+*man-1.6g (02 Jan 2011)
+
+  02 Jan 2011; Mike Frysinger <vapier@gentoo.org> +man-1.6g.ebuild,
+  +files/man-1.6g-compress.patch, +files/man-1.6g-fbsd.patch,
+  +files/man-1.6g-xz.patch, metadata.xml:
+  Version bump.
 
   30 Oct 2010; Raúl Porcel <armin76@gentoo.org> man-1.6f-r4.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #338088
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index a8f415e7a609..b9a0458e4720 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX makewhatis.cron 115 RMD160 166a144a1f876c494e252836fd32142dc52e4b0a SHA1 2c7f9fd209f8c2078751ea877d4e3b09a75475ab SHA256 3e7f377a6c9ecdeff6e85f918993a4af0cf8bb5bcc63bf7a35e6426d50e434a4
 AUX man-1.5m2-apropos.patch 450 RMD160 b2045e2b0633009c11630548e7992d5377a7763a SHA1 2aeb82e4952d768761b62bd565ecc9d830860bcc SHA256 c524c12eaa1f40e26eba40e3c6b88b32b5b24bd4cb75d2ba9a0361a539877ec9
 AUX man-1.5p-defmanpath-symlinks.patch 881 RMD160 f9be8d92840f20d05dee8cc86207c036538e44d1 SHA1 47e16f452e3b7fc0eb431209d311ff59a898e620 SHA256 bd6bdb63af8c78f088ef8b19723adadc1bd465c799a4f97601c0fa9c5ff48a0d
@@ -10,15 +13,24 @@ AUX man-1.6e-headers.patch 241 RMD160 04052f079124c57fcc6b0ebe29a4a62eba39baa4 S
 AUX man-1.6f-compress.patch 941 RMD160 b0aef2f2c6953f397e7fa8082f4047bc7fc39796 SHA1 a1239954d67180782a5ce9ee8cc786ad7b4b12be SHA256 d0e1d976201bb61c7769ce407991647411f7f8da2945b56af64797357ce389b3
 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
 AUX man-1.6f-so-search-2.patch 1062 RMD160 559faa19c7130bba8e5b508ac5e024a44b5b9e02 SHA1 917a8de958266fbefcca1ad4d5d552a0b66d0be4 SHA256 8f4c6bcfde17291f92c677b82e2367458916488a1a8de6ba345eecd5bfccb2e8
-AUX man-1.6f-so-search.patch 1055 RMD160 1e8e098a0ef2b52003043f3ac12bc5719c3541ee SHA1 6927649688d13027439f28742a81e97aefdfad63 SHA256 73e047a205a01ff6519ee331755b0429d48d79e1d6a5fd9683eabd2e3791419b
 AUX man-1.6f-unicode.patch 656 RMD160 298d0012b34c803fb296d7cacc07febd8d314f39 SHA1 c4c716ae4417b949721fbfec0b667a91cf560810 SHA256 1c7624b5824e5585abd1c3d27ffd8e2d9207a05bf67e268aeaabaddf842d4709
 AUX man-1.6f-xz.patch 3738 RMD160 56ccb9f0e3d3353425ab5f9e0546d77528f9827b SHA1 b1759769630a720bf8232846182494c4473dacf5 SHA256 c1b3e6f257f5e6d5303ce5f763ec7adc98bd171cbc03e59536e9d39ab3db4295
+AUX man-1.6g-compress.patch 343 RMD160 f4e5511b5edb41da3d5d52eabf6d8c6d47e6b340 SHA1 946cb89e1678e4232cb58685c052c2bc9f609b65 SHA256 96945eded649cfe908088b75da4a71e7bfb461795e463d0126f34985410bd40f
+AUX man-1.6g-fbsd.patch 366 RMD160 0b1340eac6f15befae81f5392c59e088a7ebcc89 SHA1 675d06ddbced45f0e1ebcfcb88c82136702bd860 SHA256 fd4e50be32571103e9880b9291c691d45a225a7d6f2b27ff05168d22dbce7336
+AUX man-1.6g-xz.patch 1848 RMD160 222e3152d36397cc6723564d61d4e6a394239767 SHA1 e1386c99b0d39fcf7d6f3cc9889c64519d51d96e SHA256 7c11114ec34f017d0641c9a7ecd9ad8b93f6c226e9bdd54fd0fedf1313451634
 DIST man-1.6f.tar.gz 254827 RMD160 8680bb94bff9b86fb9d061f58d9acb08c934531e SHA1 c97012607ed9d75a6eee7e66d257a99a8ed86918 SHA256 9f208c7e1981371ad4481d6e6c2c566bc726a15778723f94136d220fb9375f6c
-EBUILD man-1.6f-r3.ebuild 3562 RMD160 9b401537ab36815f8ca222c0e0dd48a7a997eb72 SHA1 ec3bf84b7257f38ebf99c9c4116bc82cd827a1da SHA256 0115dbcb39e9347a8f7eb865a8c5fbc8336d3f8678a372118a866554daf6a15d
+DIST man-1.6g.tar.gz 256906 RMD160 f1a845bcf454424f49a3281a86217af0328d88e2 SHA1 ef9e1f36a1a536a31112d52c3f39340900b0d3cb SHA256 ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f
 EBUILD man-1.6f-r4.ebuild 3745 RMD160 fa660db9286daab73ddfc3645752a165b6b19bf4 SHA1 4c0f1fe4a2a780a90b420894a21d1a65f2fd672b SHA256 ec175f60e860f5d2343aa5d9305397cf3490f0f7647ff9f15d453d500d28ee2e
 EBUILD man-1.6f-r5.ebuild 3834 RMD160 b9720976db3b4abadd1501c2fe2b76242d479037 SHA1 81fa13363d4ac4b22964298ceb551df0307225b3 SHA256 0a2648d4ee172603253df4660758b136495bf5ba3186fd4e8a5be55a6b801ea7
-MISC ChangeLog 22529 RMD160 c2d1bde94261118407850fbbe2bdb89371087ec1 SHA1 382141f8399f531308e760fdee6b6a9107a7d909 SHA256 6183723783b2d12f081bc735f56253e96a54ef0fd5f397b46da35a3a3a0f137b
-MISC metadata.xml 329 RMD160 5120c92ca5f6331554baa726567c4367d8dea6f4 SHA1 3d9cf63688ff3e757816ea41b2dcac6d9dfe5d4f SHA256 2e95447c6cf6d6de9be0d4e1019d7ba41c99cc033fe94c5d81d2543124dbfc8d
+EBUILD man-1.6g.ebuild 3689 RMD160 63745631c7e0367b372b4461070da89d34c34fe0 SHA1 24124f964012c12849c1ab4c307b548c09848598 SHA256 2186d2337a683d6265fb8c9e4552327b673763ecc3637ea098597ee20a355191
+MISC ChangeLog 22742 RMD160 002bf85c85ede0dd7bb4f60616b577644bef8b06 SHA1 e35854c442663526890b43e959fb32ca601ff41c SHA256 d193c125dd7e712879daee48c13cc5950c161e6998fcdf4b92501505ba4fef64
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAk0f72AACgkQaC/OocHi7JYNuQD/adr1PfoeHI6ZzpSgxTHbKKlo
+Ke6XHj5qAf+RDTponfYA/2/op2MHRlWnw+/wI3ThCcYl7NLTXtq0e4Z+2qIMwcHc
+=eAFP
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/man/files/man-1.6g-compress.patch b/sys-apps/man/files/man-1.6g-compress.patch
new file mode 100644
index 000000000000..374d80730074
--- /dev/null
+++ b/sys-apps/man/files/man-1.6g-compress.patch
@@ -0,0 +1,17 @@
+allow selection of default cache compressor
+
+http://bugs.gentoo.org/205147
+
+--- configure
++++ configure
+@@ -1012,6 +1012,10 @@
+       done
+     done
+ 
++    if [ x$COMPRESS != x ]; then
++      compress=$COMPRESS
++    fi
++
+     if [ x$default = x ]; then
+       echo ""
+       echo "What program should be used to compress the formatted pages?"
diff --git a/sys-apps/man/files/man-1.6g-fbsd.patch b/sys-apps/man/files/man-1.6g-fbsd.patch
new file mode 100644
index 000000000000..ef01a6e01fc0
--- /dev/null
+++ b/sys-apps/man/files/man-1.6g-fbsd.patch
@@ -0,0 +1,15 @@
+Fixes compilation in FreeBSD
+
+http://bugs.gentoo.org/138123
+
+--- man-1.6g/gencat/genlib.c
++++ man-1.6g/gencat/genlib.c
+@@ -54,7 +54,7 @@
+ #include <unistd.h>
+ #endif
+ 
+-#if !defined(__linux__) && !defined(__CYGWIN__)
++#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+ #include <memory.h>
+ static int bcopy(src, dst, length)
+ char *src, *dst;
diff --git a/sys-apps/man/files/man-1.6g-xz.patch b/sys-apps/man/files/man-1.6g-xz.patch
new file mode 100644
index 000000000000..fcf91f71d376
--- /dev/null
+++ b/sys-apps/man/files/man-1.6g-xz.patch
@@ -0,0 +1,53 @@
+add support for xz
+
+http://bugs.gentoo.org/302380
+
+--- a/src/makewhatis.sh
++++ b/src/makewhatis.sh
+@@ -230,7 +230,7 @@
+ 	    find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
+ 
+ 	    function readline() {
+-              if (use_zcat || use_bzcat || use_lzcat) {
++              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
+ 		result = (pipe_cmd | getline);
+ 		if (result < 0) {
+ 		  print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
+@@ -245,7 +245,7 @@
+ 	    }
+ 	    
+ 	    function closeline() {
+-              if (use_zcat || use_bzcat || use_lzcat) {
++              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
+ 		return close(pipe_cmd);
+ 	      } else {
+ 		return close(filename);
+@@ -266,7 +266,9 @@
+ 		use_bzcat = match(filename,"\\.bz2");
+               if(!use_bzcat)
+                 use_lzcat = match(filename,"\\.lzma");
+-              if (use_zcat || use_bzcat || use_lzcat ) {
++              if(!use_lzcat)
++                use_xzcat = match(filename,"\\.xz");
++              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
+ 		filename_no_gz = substr(filename, 0, RSTART - 1);
+ 	      } else {
+ 		filename_no_gz = filename;
+@@ -279,13 +281,15 @@
+ 		actual_section = section;
+ 	      }
+ 	      sub(/\..*/, "", progname);
+-              if (use_zcat || use_bzcat || use_lzcat) {
++              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
+ 		if (use_zcat) {
+ 		  pipe_cmd = "zcat \"" filename "\"";
+                 } else if (use_bzcat) {
+ 		  pipe_cmd = "bzcat \"" filename "\"";
+-                } else {
++                } else if (use_lzcat) {
+                   pipe_cmd = "lzcat \"" filename "\"";
++                } else {
++                  pipe_cmd = "xzcat \"" filename "\"";
+                 }
+ 		# try to avoid suspicious stuff
+ 		if (filename ~ /[;&|`$(]/) {
diff --git a/sys-apps/man/man-1.6g.ebuild b/sys-apps/man/man-1.6g.ebuild
new file mode 100644
index 000000000000..1672dd89cd59
--- /dev/null
+++ b/sys-apps/man/man-1.6g.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6g.ebuild,v 1.1 2011/01/02 03:22:35 vapier Exp $
+
+EAPI="2"
+
+inherit eutils 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 ~sparc-fbsd ~x86-fbsd"
+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 /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
+	# make sure `less` handles escape sequences #287183
+	sed -i -e '/^DEFAULTLESSOPT=/s:"$:R":' configure
+}
+
+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
+	export COMPRESS
+	if use lzma ; then
+		COMPRESS=/usr/bin/xz
+	else
+		COMPRESS=/bin/bzip2
+	fi
+	echoit \
+	./configure \
+		-confdir=/etc \
+		+sgid +fhs \
+		+lang ${mylang} \
+		|| die "configure failed"
+}
+
+src_install() {
+	unset NLSPATH #175258
+
+	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
+
+	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
+}
diff --git a/sys-apps/man/metadata.xml b/sys-apps/man/metadata.xml
index 37039b8b8144..96a2d586367d 100644
--- a/sys-apps/man/metadata.xml
+++ b/sys-apps/man/metadata.xml
@@ -2,9 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<use>
-	<flag name='lzma'>Uses <pkg>app-arch/lzma-utils</pkg> for the COMPRESS
-		feature. Could also be used to guarantee that lzma is on the
-		system.</flag>
-</use>
 </pkgmetadata>