old

(Portage version: 2.1.3_rc6)

13 files changed, 2 insertions, 710 deletions

diff --git a/sys-apps/man/files/digest-man-1.6d b/sys-apps/man/files/digest-man-1.6d
deleted file mode 100644
index 8d7dd63c72eb..000000000000
--- a/sys-apps/man/files/digest-man-1.6d
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 36d3f65bcc10f0754a3234e00d92ad6d man-1.6d.tar.gz 270140
-RMD160 2c476a735c211acbb478d604b73a1becb54cb87b man-1.6d.tar.gz 270140
-SHA256 a6d03bdabe16542a5a51471b5d8e7eaa50ad782577c7b31d9c478382097cf4eb man-1.6d.tar.gz 270140
diff --git a/sys-apps/man/files/digest-man-1.6e b/sys-apps/man/files/digest-man-1.6e
deleted file mode 100644
index 69ec127910e1..000000000000
--- a/sys-apps/man/files/digest-man-1.6e
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d8187cd756398baefc48ba7d60ff6a8a man-1.6e.tar.gz 252657
-RMD160 486099dc1b34fe86a2c1d19b7c89dc19b9787837 man-1.6e.tar.gz 252657
-SHA256 022faf23844eabb3662eabb105836925dd83bedda10271e2450a5bc5b61a5b5f man-1.6e.tar.gz 252657
diff --git a/sys-apps/man/files/digest-man-1.6e-r1 b/sys-apps/man/files/digest-man-1.6e-r1
deleted file mode 100644
index 69ec127910e1..000000000000
--- a/sys-apps/man/files/digest-man-1.6e-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d8187cd756398baefc48ba7d60ff6a8a man-1.6e.tar.gz 252657
-RMD160 486099dc1b34fe86a2c1d19b7c89dc19b9787837 man-1.6e.tar.gz 252657
-SHA256 022faf23844eabb3662eabb105836925dd83bedda10271e2450a5bc5b61a5b5f man-1.6e.tar.gz 252657
diff --git a/sys-apps/man/files/digest-man-1.6e-r2 b/sys-apps/man/files/digest-man-1.6e-r2
deleted file mode 100644
index 69ec127910e1..000000000000
--- a/sys-apps/man/files/digest-man-1.6e-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d8187cd756398baefc48ba7d60ff6a8a man-1.6e.tar.gz 252657
-RMD160 486099dc1b34fe86a2c1d19b7c89dc19b9787837 man-1.6e.tar.gz 252657
-SHA256 022faf23844eabb3662eabb105836925dd83bedda10271e2450a5bc5b61a5b5f man-1.6e.tar.gz 252657
diff --git a/sys-apps/man/files/man-1.6a-makewhatis-config.patch b/sys-apps/man/files/man-1.6a-makewhatis-config.patch
deleted file mode 100644
index bda196f8ef0c..000000000000
--- a/sys-apps/man/files/man-1.6a-makewhatis-config.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Use sections from config files rather than hardcoding.
-
-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=
- 
--sections="1 2 3 4 5 6 7 8 9 n l"
-+if [ -n "$MANSECT" ]; then
-+	sections=$MANSECT
-+else
-+	sections=`$AWK '($1 == "MANSECT") { print $2 }' @man_config_file@`
-+	if [ x"$sections" = x ]; then
-+		sections="@sections@"
-+	fi
-+fi
-+sections=`echo $sections | sed -e 's/:/ /g'`
- 
- 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 @@
- 
- makewhatis: makewhatis.sh Makefile
- 	rm -f makewhatis
--	sed -e 's,%version%,@version@,' \
--	    -e 's,%awk%,@awk@,' makewhatis.sh > makewhatis
-+	cp makewhatis.sh makewhatis.in
-+	../conf_script makewhatis
- 	chmod +x makewhatis
- 
- MANCONFIG=$(DESTDIR)$(PREFIX)@man_config_file@
---- man/en/makewhatis.man
-+++ man/en/makewhatis.man
-@@ -62,8 +62,8 @@
- .I sections
- of
- .IR manpath " or " catpath .
--If the option is absent, its value is assumed to be
--.I  \'1 2 3 4 5 6 7 8 9 n l\'
-+If the option is absent, the MANSECT env var will be used.  If it too
-+is absent, the MANSECT setting in man.conf will be used.
- .TP 
- .BI -c " catpath"
- The preformatted manual pages located in
diff --git a/sys-apps/man/files/man-1.6b-build.patch b/sys-apps/man/files/man-1.6b-build.patch
deleted file mode 100644
index cfced4b6add3..000000000000
--- a/sys-apps/man/files/man-1.6b-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in
-+++ src/Makefile.in
-@@ -25,7 +25,7 @@
- 	$(CC) -c $(CWARN) $(CFLAGS) -I. $(DEFS) $<
- 
- # LDFLAGS = -g
--LDFLAGS = -s
-+LDFLAGS += $(BINDNOW_FLAGS)
- 
- LIBOBJS = @LIBOBJS@
- 
diff --git a/sys-apps/man/files/man-1.6d-headers.patch b/sys-apps/man/files/man-1.6d-headers.patch
deleted file mode 100644
index 7c5bf83a5e38..000000000000
--- a/sys-apps/man/files/man-1.6d-headers.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- src/makemsg.c
-+++ src/makemsg.c
-@@ -18,6 +18,7 @@
-  *	makemsg -c input message_catalog
-  */
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #ifdef __QNX__
- #include <unix.h>
---- gencat/gencat.c
-+++ gencat/gencat.c
-@@ -41,6 +41,7 @@
- */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #ifdef SYSV
- #include <sys/fcntl.h>
-@@ -48,6 +49,10 @@
- #else
- #include <strings.h>
- #endif
-+#ifdef __linux__
-+#include <string.h>
-+#include <unistd.h>
-+#endif
- #include <sys/file.h>
- #include <sys/stat.h>
- #include "gencat.h"
---- gencat/genlib.c
-+++ gencat/genlib.c
-@@ -48,9 +48,11 @@
- */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #ifdef SYSV
- #include <sys/types.h>
- #include <unistd.h>
-+#endif
- 
- #ifndef __linux__
- #include <memory.h>
-@@ -66,9 +68,10 @@
- {
-     memset(b, '\0', length);
- }
-+#else
-+#include <string.h>
- #endif
- 
--#endif
- #include <sys/file.h>
- #include <ctype.h>
- #include "msgcat.h"
diff --git a/sys-apps/man/files/man-1.6e-readonly-whatis.patch b/sys-apps/man/files/man-1.6e-readonly-whatis.patch
deleted file mode 100644
index d0f8ce1aab9a..000000000000
--- a/sys-apps/man/files/man-1.6e-readonly-whatis.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Dont update makewhatis files if they're on readonly filesystems
-
-http://bugs.gentoo.org/163932
-
---- src/makewhatis.sh
-+++ src/makewhatis.sh
-@@ -184,6 +188,34 @@
-      if [ x$verbose != x ]; then
- 	echo "about to enter $mandir" > /dev/stderr
-      fi
-+
-+     # kludge for Slackware's /usr/man/preformat
-+     if [ $mandir = /usr/man/preformat ]
-+     then
-+	mandir1=/usr/man
-+     else
-+	mandir1=$mandir
-+     fi
-+
-+     # if $mandir is on a readonly partition, and the whatis file
-+     # is not a symlink, then let's skip trying to update it
-+     if [ ! -L ${mandir1}/whatis ]
-+     then
-+	if [ -e ${mandir1}/whatis ] && [ ! -w ${mandir1}/whatis ]
-+	then
-+	   if [ x$verbose != x ]; then
-+	      echo skipping $mandir - whatis file is readonly > /dev/stderr
-+	   fi
-+	   continue
-+	elif [ ! -e ${mandir1}/whatis ] && [ ! -w ${mandir1} ]
-+	then
-+	   if [ x$verbose != x ]; then
-+	      echo skipping $mandir - directory is readonly > /dev/stderr
-+	   fi
-+	   continue
-+	fi
-+     fi
-+
-      if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then
- 	if [ x$verbose != x ]; then
- 	   echo skipping $mandir - we did it already > /dev/stderr
-@@ -407,14 +439,6 @@
- 
-        cd $here
- 
--       # kludge for Slackware's /usr/man/preformat
--       if [ $mandir = /usr/man/preformat ]
--       then
--	 mandir1=/usr/man
--       else
--	 mandir1=$mandir
--       fi
--
-        if [ -f ${mandir1}/whatis ]
-        then
- 	 cat ${mandir1}/whatis >> $TMPFILE
diff --git a/sys-apps/man/man-1.6d.ebuild b/sys-apps/man/man-1.6d.ebuild
deleted file mode 100644
index 755e0af8719c..000000000000
--- a/sys-apps/man/man-1.6d.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6d.ebuild,v 1.13 2006/10/17 11:17:57 uberlord 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 ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-DEPEND=">=sys-apps/groff-1.18
-	!sys-apps/man-db"
-PROVIDE="virtual/man"
-
-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
-
-	# 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
-
-	# add more sections to default search path
-	epatch "${FILESDIR}"/man-1.6b-more-sections.patch
-
-	# cut out symlinked paths #90186
-	epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
-
-	# Fedora patches
-	epatch "${FILESDIR}"/man-1.5m2-apropos.patch
-
-	# include more headers
-	epatch "${FILESDIR}"/man-1.6d-headers.patch
-
-	# use non-lazy binds for man
-	epatch "${FILESDIR}"/man-1.6b-build.patch
-
-	# Fixes compilation in FreeBSD wrt #138123
-	epatch "${FILESDIR}"/man-1.6d-fbsd.patch
-
-	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"
-
-	export BINDNOW_FLAGS=$(bindnow-flags)
-	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:0 "${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:"
-		ewarn ${files}
-	fi
-}
diff --git a/sys-apps/man/man-1.6e-r1.ebuild b/sys-apps/man/man-1.6e-r1.ebuild
deleted file mode 100644
index f84dbf014389..000000000000
--- a/sys-apps/man/man-1.6e-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6e-r1.ebuild,v 1.7 2007/04/06 22:13:35 opfer 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 ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-DEPEND=">=sys-apps/groff-1.18
-	!sys-apps/man-db"
-PROVIDE="virtual/man"
-
-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
-
-	# 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
-
-	# add more sections to default search path
-	epatch "${FILESDIR}"/man-1.6b-more-sections.patch
-
-	# cut out symlinked paths #90186
-	epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
-
-	# Fedora patches
-	epatch "${FILESDIR}"/man-1.5m2-apropos.patch
-
-	# Fixes compilation in FreeBSD wrt #138123
-	epatch "${FILESDIR}"/man-1.6d-fbsd.patch
-
-	epatch "${FILESDIR}"/man-1.6e-dont-kill-shebangs.patch #159192
-	epatch "${FILESDIR}"/man-1.6e-headers.patch
-
-	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"
-
-	append-ldflags $(bindnow-flags)
-	emake || die "emake failed"
-}
-
-src_install() {
-	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/man-1.6e-r2.ebuild b/sys-apps/man/man-1.6e-r2.ebuild
deleted file mode 100644
index 11f3cece5be1..000000000000
--- a/sys-apps/man/man-1.6e-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6e-r2.ebuild,v 1.1 2007/01/12 02:04:47 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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-DEPEND=">=sys-apps/groff-1.18
-	!sys-apps/man-db"
-PROVIDE="virtual/man"
-
-pkg_setup() {
-	enewgroup man 15
-	enewuser man 13 -1 /usr/share/man man
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# add support for bzip2 pages
-	epatch "${FILESDIR}"/man-1.6e-man2html-bzip2.patch
-
-	# We love to cross-compile
-	epatch "${FILESDIR}"/man-1.6-cross-compile.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
-
-	# add more sections to default search path
-	epatch "${FILESDIR}"/man-1.6b-more-sections.patch
-
-	# cut out symlinked paths #90186
-	epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
-
-	# Fedora patches
-	epatch "${FILESDIR}"/man-1.5m2-apropos.patch
-
-	# Fixes compilation in FreeBSD wrt #138123
-	epatch "${FILESDIR}"/man-1.6d-fbsd.patch
-
-	epatch "${FILESDIR}"/man-1.6e-dont-kill-shebangs.patch #159192
-	epatch "${FILESDIR}"/man-1.6e-headers.patch
-
-	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"
-
-	append-ldflags $(bindnow-flags)
-	emake || die "emake failed"
-}
-
-src_install() {
-	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/man-1.6e-r3.ebuild b/sys-apps/man/man-1.6e-r3.ebuild
index 1cbac1b16def..30959e4496fa 100644
--- a/sys-apps/man/man-1.6e-r3.ebuild
+++ b/sys-apps/man/man-1.6e-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6e-r3.ebuild,v 1.11 2007/05/11 15:27:53 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6e-r3.ebuild,v 1.12 2007/07/04 18:42:12 vapier Exp $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Standard commands to read man pages"
 HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
@@ -84,7 +84,6 @@ src_compile() {
 		+lang ${mylang} \
 		|| die "configure failed"
 
-	append-ldflags $(bindnow-flags)
 	emake || die "emake failed"
 }
 
diff --git a/sys-apps/man/man-1.6e.ebuild b/sys-apps/man/man-1.6e.ebuild
deleted file mode 100644
index 3fc9af54a9bb..000000000000
--- a/sys-apps/man/man-1.6e.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6e.ebuild,v 1.2 2006/12/27 16:15:47 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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-DEPEND=">=sys-apps/groff-1.18
-	!sys-apps/man-db"
-PROVIDE="virtual/man"
-
-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
-
-	# 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
-
-	# add more sections to default search path
-	epatch "${FILESDIR}"/man-1.6b-more-sections.patch
-
-	# cut out symlinked paths #90186
-	epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
-
-	# Fedora patches
-	epatch "${FILESDIR}"/man-1.5m2-apropos.patch
-
-	# Fixes compilation in FreeBSD wrt #138123
-	epatch "${FILESDIR}"/man-1.6d-fbsd.patch
-
-	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"
-
-	append-ldflags $(bindnow-flags)
-	emake || die "emake failed"
-}
-
-src_install() {
-	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
-}