From d287a33fe1f26c642044417202a462fa016396cc Mon Sep 17 00:00:00 2001 From: Jeremy Olexa Date: Thu, 8 Jan 2009 01:53:39 +0000 Subject: Add new USE flag (lzma) and patch to squash automagic dep on lzma-utils, see bug 205147 Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.27.10 x86_64 --- sys-apps/man/ChangeLog | 11 ++- sys-apps/man/Manifest | 6 +- sys-apps/man/files/man-1.6f-compress.patch | 42 ++++++++++ sys-apps/man/man-1.6f-r3.ebuild | 119 +++++++++++++++++++++++++++++ sys-apps/man/metadata.xml | 5 ++ 5 files changed, 179 insertions(+), 4 deletions(-) create mode 100644 sys-apps/man/files/man-1.6f-compress.patch create mode 100644 sys-apps/man/man-1.6f-r3.ebuild (limited to 'sys-apps/man') diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog index 95d422827aa9..15aec34a137e 100644 --- a/sys-apps/man/ChangeLog +++ b/sys-apps/man/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/man -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.142 2008/10/02 16:52:21 ranger Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.143 2009/01/08 01:53:38 darkside Exp $ + +*man-1.6f-r3 (08 Jan 2009) + + 08 Jan 2009; Jeremy Olexa + +files/man-1.6f-compress.patch, metadata.xml, +man-1.6f-r3.ebuild: + Add new USE flag (lzma) and patch to squash automagic dep on lzma-utils, see + bug 205147 02 Oct 2008; Brent Baude man-1.6f-r2.ebuild: stable ppc, bug 239117 diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest index 8be1c499e37a..802fd1e9699a 100644 --- a/sys-apps/man/Manifest +++ b/sys-apps/man/Manifest @@ -11,6 +11,7 @@ AUX man-1.6e-dont-kill-shebangs.patch 599 RMD160 3977ba6da44e7902143c65ee07faefc AUX man-1.6e-headers.patch 241 RMD160 04052f079124c57fcc6b0ebe29a4a62eba39baa4 SHA1 4b421073a2c88ca32bc6d8a448710cc921d0e6cf SHA256 d62108e3baaec771d99226eff07a6f604a8b9afefd25ec596b9817574a638e20 AUX man-1.6e-man2html-bzip2.patch 1511 RMD160 1a2cd248001f272d5ce79b952c7e59b9244f5df4 SHA1 ed923a79f45650cf53c77e4d08ed50e108c1bb8c SHA256 ac080c92233d0de35f09641b7ff79f71dd0fff60bf95a310b33dc55134b3505c AUX man-1.6e-readonly-whatis2.patch 1179 RMD160 71e357153c18bcf444b9264b64d29de7e303ecab SHA1 981ab4e9743dce40a07fbb90d2c179c7a8716c56 SHA256 e87c4a98c9caee7fe80f873f29523232c9754f42aa78830028af2ddc40f408a8 +AUX man-1.6f-compress.patch 941 RMD160 b0aef2f2c6953f397e7fa8082f4047bc7fc39796 SHA1 a1239954d67180782a5ce9ee8cc786ad7b4b12be SHA256 d0e1d976201bb61c7769ce407991647411f7f8da2945b56af64797357ce389b3 AUX man-1.6f-man2html-compression.patch 1559 RMD160 c154c9d0f27ded25a9b60e1bf1496d624fe9cc08 SHA1 a7714a9ee7421ba3dd7b1a4fd66a436caadbe6da SHA256 dba59d9d94684995f670065ad09da392af5318f1b95eeba66806631f5339afa9 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 @@ -19,6 +20,7 @@ DIST man-1.6f.tar.gz 254827 RMD160 8680bb94bff9b86fb9d061f58d9acb08c934531e SHA1 EBUILD man-1.6e-r3.ebuild 3557 RMD160 136047613d1e60452b2bb8a168c77fd314023e98 SHA1 2c5a28b01d7fe022a94dfb0eb8e27a546db9c264 SHA256 2c8306e947f7521669be148d64389b3d15546f01aa8972d9e573bb858bc4366a EBUILD man-1.6f-r1.ebuild 2989 RMD160 7cd2f69cebf830ad75a2267a18450463f1476cce SHA1 e7b5dfc59ee9dd1fd9065d91be6868eabe24a95a SHA256 85041144b5de565af5f163bc34123fc9170dc45a3640b3e0246ed77db60c639e EBUILD man-1.6f-r2.ebuild 3035 RMD160 1663b6853e9bef07787f6da729d7bcd6a7ded0cb SHA1 5c33f8c7a0f22b52c04a0e8c3d4083475444e496 SHA256 cf796420af9ee8489b30bfb0a1f5765b2ff43514402d26730506bb2fc880f1f2 +EBUILD man-1.6f-r3.ebuild 3235 RMD160 1f026fcd64380b3f18bae3611be99b1208e373b3 SHA1 31a2fa4145ddada29298f778abec8c5aee054410 SHA256 3b9a752e2c4987cf0d53e6b31b1517049f192f2b01aadba3b6d1f9f9110fa4ac EBUILD man-1.6f.ebuild 2974 RMD160 45440f8db6942835007bc02d050252337fa94f17 SHA1 944ff93af0fe39773a0a7036f1038a16517a048c SHA256 b80ac0b104fffe3f166a4fcf2b532ab861a19bcb9acb101c0f5a535b6ab96167 -MISC ChangeLog 19495 RMD160 8db0e66b07079ff5c74585d2509b4b2559134ad5 SHA1 fa0c3dcf462648cb82cd9964e32d865dae392b6d SHA256 6d402ba07526741297e52a6a59ff919dbeec9128a1203f7a1baedee7911e5666 -MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 +MISC ChangeLog 19737 RMD160 d0bfcb18cd5184abe7fe83e69a1e67eadc87a948 SHA1 d31aebb710a2300f838f4bc97ee35f15f9332f7f SHA256 4096f2d65603309888521e25219d135b1fedeafea95c34352e8f190a7bd962b2 +MISC metadata.xml 329 RMD160 5120c92ca5f6331554baa726567c4367d8dea6f4 SHA1 3d9cf63688ff3e757816ea41b2dcac6d9dfe5d4f SHA256 2e95447c6cf6d6de9be0d4e1019d7ba41c99cc033fe94c5d81d2543124dbfc8d diff --git a/sys-apps/man/files/man-1.6f-compress.patch b/sys-apps/man/files/man-1.6f-compress.patch new file mode 100644 index 000000000000..f110acd806da --- /dev/null +++ b/sys-apps/man/files/man-1.6f-compress.patch @@ -0,0 +1,42 @@ +--- configure.orig 2008-12-26 23:59:40.779042906 -0600 ++++ configure 2008-12-27 00:13:15.265256215 -0600 +@@ -1012,20 +1012,25 @@ + if test "$ans" = "true" + then + DO_COMPRESSION=true +- compress= +- for i in lzma bzip2 gzip bzip tzip pack compress freeze yabba +- do +- eval F$i=missing +- for j in $DEFPATH +- do +- if test -f $j/$i +- then +- eval F$i=$j/$i +- if [ x$compress = x ]; then compress=$j/$i; fi +- break +- fi +- done +- done ++ if [ x$COMPRESS != x ]; then ++ compress=$COMPRESS ++ echo $compress ++ else ++ compress= ++ for i in lzma bzip2 gzip bzip tzip pack compress freeze yabba ++ do ++ eval F$i=missing ++ for j in $DEFPATH ++ do ++ if test -f $j/$i ++ then ++ eval F$i=$j/$i ++ if [ x$compress = x ]; then compress=$j/$i; fi ++ break ++ fi ++ done ++ done ++ fi + + if [ x$default = x ]; then + echo "" diff --git a/sys-apps/man/man-1.6f-r3.ebuild b/sys-apps/man/man-1.6f-r3.ebuild new file mode 100644 index 000000000000..67d9e2b08887 --- /dev/null +++ b/sys-apps/man/man-1.6f-r3.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6f-r3.ebuild,v 1.1 2009/01/08 01:53:38 darkside Exp $ + +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 ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="lzma nls" + +DEPEND="nls? ( sys-devel/gettext )" +RDEPEND=">=sys-apps/groff-1.19.2-r1 + !sys-apps/man-db + !app-arch/lzma + lzma? ( app-arch/lzma-utils )" +PROVIDE="virtual/man" + +pkg_setup() { + enewgroup man 15 + enewuser man 13 -1 /usr/share/man man +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/man-1.6f-man2html-compression.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.patch + epatch "${FILESDIR}"/man-1.6f-compress.patch + + strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ }) +} + +src_compile() { + 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 + if use lzma; then + mycompress=/usr/bin/lzma + else + mycompress=/bin/bzip2 + fi + COMPRESS=$mycompress \ + ./configure \ + -confdir=/etc \ + +sgid +fhs \ + +lang ${mylang} \ + || die "configure failed" + + emake || die "emake 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 +} diff --git a/sys-apps/man/metadata.xml b/sys-apps/man/metadata.xml index 96a2d586367d..37039b8b8144 100644 --- a/sys-apps/man/metadata.xml +++ b/sys-apps/man/metadata.xml @@ -2,4 +2,9 @@ base-system + + Uses app-arch/lzma-utils for the COMPRESS + feature. Could also be used to guarantee that lzma is on the + system. + -- cgit v1.2.3-65-gdbad