Fix makewhatis variable settings #112249 by Guillaume Castagnino.

Package-Manager: portage-2.0.53_rc7

5 files changed, 155 insertions, 8 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 4429cf70cdc3..f42bcea391da 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/man
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.77 2005/11/10 23:49:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.78 2005/11/13 04:04:11 vapier Exp $
+
+*man-1.6b-r1 (13 Nov 2005)
+
+  13 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  files/man-1.6a-makewhatis-config.patch, +man-1.6b-r1.ebuild:
+  Fix makewhatis variable settings #112249 by Guillaume Castagnino.
 
 *man-1.6b (10 Nov 2005)
 
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 352319a1a8af..5da6eb6bb803 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a2e486655528aae9a7fd390a171ba815 ChangeLog 11483
+MD5 4dcd8f29e40b475220943a15cee51e11 ChangeLog 11693
 MD5 6d6e219c5e8357b2d60e92e0ac88d76b files/digest-man-1.5p 60
 MD5 90c01e3cfecc4bc92266780a9be71429 files/digest-man-1.6-r1 59
 MD5 1c3d9a443043b133adbe277b50105123 files/digest-man-1.6a 60
-MD5 bf0f39bbc9dbe51b036a060f0bcc5094 files/digest-man-1.6b 60
+MD5 bf0f39bbc9dbe51b036a060f0bcc5094 files/digest-man-1.6b-r1 60
 MD5 8b2016cc778ed4e2570b912c0f420266 files/makewhatis.cron 130
 MD5 80f2a25fb0b5692f39a1990527a93271 files/man-1.5m-groff-1.18.patch 923
 MD5 1d6fe29183fbb523a07b877255d686b4 files/man-1.5m2-apropos.patch 450
@@ -17,18 +17,18 @@ MD5 7b2b00aace5bcdb963286e235eaf22b2 files/man-1.5p-search-order.patch 519
 MD5 331c925e304b56d63aa2c97dcc8e08fc files/man-1.6-cross-compile.patch 1744
 MD5 ecb128fe6db790f05629a8b2eca4c4fa files/man-1.6-message-order.patch 833
 MD5 bc796c3f2d1f9becb3d0bedc1b6dc051 files/man-1.6-parallel-make.patch 1033
-MD5 337552be4f634e060fc97b19baaa1318 files/man-1.6a-makewhatis-config.patch 1226
+MD5 fda8d1252305100c69a17634a9ba5838 files/man-1.6a-makewhatis-config.patch 1818
 MD5 7b94b85c02df3b66046e3d01827cd173 files/man-1.6a-parallel-make.patch 657
 MD5 90f936cbc365fa88a17525afc2cc0d95 files/man-1.6b-build.patch 175
 MD5 816a0222228cedf51e8bc39acb32fa89 man-1.5p.ebuild 2648
 MD5 5c0c422d050f5191b66a7c4ed928835a man-1.6-r1.ebuild 2983
 MD5 9206115cdc98fb8e0d7cbd518ad9476b man-1.6a.ebuild 2897
-MD5 3e0bb5ba53d843b602dd89621d7ee4d7 man-1.6b.ebuild 2980
+MD5 49198b30903044247b59afa6147d2ea5 man-1.6b-r1.ebuild 2983
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDc9zagIKl8Uu19MoRAjpRAJwOHgJ14ctmNHcGiS9IfHZjKb8btQCeJNyQ
-zsRmQXO52b3tUqlWlclDuCs=
-=I8X9
+iD8DBQFDdrt6gIKl8Uu19MoRAjcDAJ9dX8cdV5/OY9h4+mKvCnihoXb3QgCffC8c
+FCNjj7DEF22xMlBJwPxVZ/0=
+=HdtU
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/man/files/digest-man-1.6b-r1 b/sys-apps/man/files/digest-man-1.6b-r1
new file mode 100644
index 000000000000..d165bbd8d8a6
--- /dev/null
+++ b/sys-apps/man/files/digest-man-1.6b-r1
@@ -0,0 +1 @@
+MD5 81d96091482b6445cbfa248fadb422b8 man-1.6b.tar.gz 238993
diff --git a/sys-apps/man/files/man-1.6a-makewhatis-config.patch b/sys-apps/man/files/man-1.6a-makewhatis-config.patch
index b8c3fad87262..5abe668bc6b6 100644
--- a/sys-apps/man/files/man-1.6a-makewhatis-config.patch
+++ b/sys-apps/man/files/man-1.6a-makewhatis-config.patch
@@ -4,6 +4,24 @@ http://bugs.gentoo.org/86863
 
 --- src/makewhatis.sh
 +++ src/makewhatis.sh
+@@ -33,7 +33,7 @@
+ #
+ # Note for Slackware users: "makewhatis -v -w -c" will work.
+ #
+-# makewhatis aeb 030801 (from %version%)
++# makewhatis aeb 030801 (from @version@)
+ 
+ program=`basename $0`
+ 
+@@ -63,7 +63,7 @@
+ # but that leads to problems and bugs.
+ 
+ # AWK=/usr/bin/gawk
+-AWK=%awk%
++AWK=@awk@
+ 
+ # Find a place for our temporary files. If security is not a concern, use
+ #	TMPFILE=/tmp/whatis$$; TMPFILEDIR=none
 @@ -92,7 +92,15 @@
  defmanpath=$DEFMANPATH
  defcatpath=
@@ -21,6 +39,15 @@ http://bugs.gentoo.org/86863
  
  for name in "$@"
  do
+@@ -111,7 +111,7 @@
+ fi
+ case $name in
+     --version|-V)
+-	echo "$program from %version%"
++	echo "$program from @version@"
+ 	exit 0;;
+     -c) topath=catpath
+ 	defmanpath=
 --- src/Makefile.in
 +++ src/Makefile.in
 @@ -93,8 +93,8 @@
diff --git a/sys-apps/man/man-1.6b-r1.ebuild b/sys-apps/man/man-1.6b-r1.ebuild
new file mode 100644
index 000000000000..6321f6a411f6
--- /dev/null
+++ b/sys-apps/man/man-1.6b-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6b-r1.ebuild,v 1.1 2005/11/13 04:04:11 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"
+IUSE="nls"
+
+DEPEND=""
+RDEPEND="sys-process/cronbase
+	>=sys-apps/groff-1.18
+	nls? ( sys-devel/gettext )"
+
+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
+	epatch "${FILESDIR}"/man-1.6b-build.patch
+
+	# Fix search order in man.conf so that system installed manpages
+	# will be found first ...
+	epatch "${FILESDIR}"/man-1.5p-search-order.patch
+
+	# For groff-1.18 or later we need to call nroff with '-c'
+	epatch "${FILESDIR}"/man-1.5m-groff-1.18.patch
+
+	# 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
+
+	# Fedora patches
+	epatch "${FILESDIR}"/man-1.5m2-apropos.patch
+	epatch "${FILESDIR}"/man-1.5p-man2html.patch
+	epatch "${FILESDIR}"/man-1.5p-mandirlist.patch
+
+	# use non-lazy binds for man
+	append-ldflags -Wl,-z,now
+
+	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"
+
+	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:root "${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:"
+		echo ${files}
+	fi
+}