8 files changed, 6 insertions, 328 deletions
diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index cf55fe7d7994..512b7f9364a4 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/man
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.24 2003/04/02 14:01:13 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.25 2003/04/03 19:14:55 azarah Exp $
+
+  03 Apr 2003; Martin Schlemmer <azarah@gentoo.org> man-1.5l-r2.ebuild :
+  Mark stable for all other arch's, as -r1 that is, is broken.
 
 *man-1.5l-r2 (30 Mar 2003)
 
diff --git a/sys-apps/man/files/digest-man-1.5k b/sys-apps/man/files/digest-man-1.5k
deleted file mode 100644
index e10394767019..000000000000
--- a/sys-apps/man/files/digest-man-1.5k
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c678a9ba4b0f3df4ce2915e99490aa19 man-1.5k.tar.gz 193480
diff --git a/sys-apps/man/files/digest-man-1.5l b/sys-apps/man/files/digest-man-1.5l
deleted file mode 100644
index 1d4a35da11da..000000000000
--- a/sys-apps/man/files/digest-man-1.5l
+++ /dev/null
@@ -1 +0,0 @@
-MD5 07fa5ab41c39afcd59cdef5139ef563b man-1.5l.tar.gz 218249
diff --git a/sys-apps/man/files/digest-man-1.5l-r1 b/sys-apps/man/files/digest-man-1.5l-r1
deleted file mode 100644
index 1d4a35da11da..000000000000
--- a/sys-apps/man/files/digest-man-1.5l-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 07fa5ab41c39afcd59cdef5139ef563b man-1.5l.tar.gz 218249
diff --git a/sys-apps/man/man-1.5k.ebuild b/sys-apps/man/man-1.5k.ebuild
deleted file mode 100644
index 9ec157b69ffb..000000000000
--- a/sys-apps/man/man-1.5k.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5k.ebuild,v 1.11 2003/02/13 16:04:53 vapier Exp $
-
-IUSE=""
-
-inherit eutils
-
-NV="${PV}"
-S="${WORKDIR}/${PN}-${NV}"
-DESCRIPTION="Standard commands to read man pages"
-SRC_URI="http://www.kernel.org/pub/linux/utils/man/man-${NV}.tar.gz"
-HOMEPAGE="http://freshmeat.net/projects/man/"
-
-DEPEND="virtual/glibc"
-
-RDEPEND="sys-apps/cronbase
-	sys-apps/groff"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips"
-LICENSE="GPL-2"
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	cp configure configure.orig
-	sed	-e 's:/usr/lib/locale:$(prefix)/usr/lib/locale:g' \
-		-e 's!/usr/bin:/usr/ucb:!/usr/bin:!' \
-		configure.orig > configure
-	local x
-	for x in / src/ man2html/ msgs/
-	do
-		cd ${S}/${x}
-		cp Makefile.in Makefile.in.orig
-		sed -e '/inst.sh/d' \
-			-e '/^CC =/c\' \
-			-e "CC = gcc" \
-			-e '/^CFLAGS =/c\' \
-			-e "CFLAGS = $CFLAGS" \
-			Makefile.in.orig > Makefile.in
-	done
-
-	cd ${S}/gencat
-	cp Makefile Makefile.orig
-	sed -e "s:cc -o:gcc -o:" Makefile.orig > Makefile
-
-	cd ${S}
-	# Fix a crash when calling man with:  man -k "foo bar" (bug #9761).
-	# <azarah@gentoo.org> (26 Dec 2002).
-	epatch ${FILESDIR}/${P}-util_c-segfault.patch
-
-	# Do not print the 'man: No such file or directory' error if
-	# 'man -d' was called and the NLS catalogue was not found, as
-	# it confuses people, and be more informative ... (bug #6360)
-	# <azarah@gentoo.org> (26 Dec 2002).
-	epatch ${FILESDIR}/${P}-locale-debug-info.patch
-}
-
-src_compile() {
-	local myconf=""
-	use nls && myconf="+lang all"
-
-	./configure -confdir=/etc \
-		+sgid +fhs \
-		${myconf} || die
-		
-	make || die
-}
-
-src_install() {
-	dodir /usr/{bin,sbin}
-	cd ${S}
-	make PREFIX=${D} install || die
-
-	if [ -n "`use nls`" ]
-	then
-		cd ${S}/msgs
-		./inst.sh ?? ${D}/usr/share/locale/%L/%N
-	fi
-	
-	chmod 2555 ${D}/usr/bin/man
-	chown root.man ${D}/usr/bin/man
-
-	# Needed for makewhatis
-	keepdir /var/cache/man
-
-	insinto /etc
-	cd ${S}
-	doins src/man.conf
-	
-	dodoc COPYING LSM README* TODO
-	
-	exeinto /etc/cron.daily
-	doexe ${FILESDIR}/makewhatis.cron
-}
-
-
diff --git a/sys-apps/man/man-1.5l-r1.ebuild b/sys-apps/man/man-1.5l-r1.ebuild
deleted file mode 100644
index a8568de7b3f4..000000000000
--- a/sys-apps/man/man-1.5l-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r1.ebuild,v 1.2 2003/03/27 01:04:28 zwelch Exp $
-
-IUSE=""
-
-inherit eutils
-
-NV="${PV}"
-S="${WORKDIR}/${PN}-${NV}"
-DESCRIPTION="Standard commands to read man pages"
-SRC_URI="http://www.kernel.org/pub/linux/utils/man/man-${NV}.tar.gz"
-HOMEPAGE="http://freshmeat.net/projects/man/"
-
-DEPEND="virtual/glibc"
-
-RDEPEND="sys-apps/cronbase
-	>=sys-apps/groff-1.18"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa arm mips"
-LICENSE="GPL-2"
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	cp configure configure.orig
-	sed	-e 's:/usr/lib/locale:$(prefix)/usr/lib/locale:g' \
-		-e 's!/usr/bin:/usr/ucb:!/usr/bin:!' \
-		configure.orig > configure
-	
-	local x=""
-	for x in / src/ man2html/ msgs/
-	do
-		cd ${S}/${x}
-		cp Makefile.in Makefile.in.orig
-		sed -e '/inst.sh/d' \
-			-e '/^CC =/c\' \
-			-e '/^CFLAGS =/c\' \
-			-e "CFLAGS = ${CFLAGS}" \
-			Makefile.in.orig > Makefile.in
-	done
-
-	cd ${S}/gencat
-	cp Makefile Makefile.orig
-	sed -e 's:cc -o:$(CC) -o:' Makefile.orig > Makefile
-
-	cd ${S}
-	# Fix search order in man.conf so that system installed manpages
-	# will be found first ...
-	epatch ${FILESDIR}/${P}-search-order.patch
-
-	# For groff-1.18 or later we need to call nroff with '-c'
-	epatch ${FILESDIR}/${P}-groff-1.18.patch
-
-	# Fix wierd failing in rare cases
-	epatch ${FILESDIR}/${P}-wrong-quotes.patch
-
-	# Fix a crash when calling man with:  man -k "foo bar" (bug #9761).
-	# <azarah@gentoo.org> (26 Dec 2002).
-	epatch ${FILESDIR}/${P}-util_c-segfault.patch
-
-	# Various fixes from Redhat
-	epatch ${FILESDIR}/${P}-redhat-patches.patch
-
-	# Do not print the 'man: No such file or directory' error if
-	# 'man -d' was called and the NLS catalogue was not found, as
-	# it confuses people, and be more informative  ... (bug #6360)
-	# <azarah@gentoo.org> (26 Dec 2002).
-	epatch ${FILESDIR}/${P}-locale-debug-info.patch
-}
-
-src_compile() {
-	local myconf=""
-	use nls && myconf="+lang all"
-
-	./configure -confdir=/etc \
-		+sgid +fhs \
-		${myconf} || die
-		
-	make CC="${CC}" || die
-}
-
-src_install() {
-	dodir /usr/{bin,sbin}
-	cd ${S}
-	make PREFIX=${D} install || die
-
-	if [ -n "`use nls`" ]
-	then
-		cd ${S}/msgs
-		./inst.sh ?? ${D}/usr/share/locale/%L/%N
-	fi
-	
-	chmod 2555 ${D}/usr/bin/man
-	chown root.man ${D}/usr/bin/man
-
-	# Needed for makewhatis
-	keepdir /var/cache/man
-	
-	insinto /etc
-	cd ${S}
-	doins src/man.conf
-	
-	dodoc COPYING LSM README* TODO
-	
-	exeinto /etc/cron.daily
-	doexe ${FILESDIR}/makewhatis.cron
-}
-
diff --git a/sys-apps/man/man-1.5l-r2.ebuild b/sys-apps/man/man-1.5l-r2.ebuild
index 83a3f84f09c9..1b774268528d 100644
--- a/sys-apps/man/man-1.5l-r2.ebuild
+++ b/sys-apps/man/man-1.5l-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r2.ebuild,v 1.3 2003/04/02 14:01:13 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r2.ebuild,v 1.4 2003/04/03 19:14:55 azarah Exp $
 
 IUSE=""
 
@@ -18,7 +18,7 @@ RDEPEND="sys-apps/cronbase
 	>=sys-apps/groff-1.18"
 
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha ~hppa ~arm ~mips"
+KEYWORDS="x86 ppc sparc alpha hppa arm mips"
 LICENSE="GPL-2"
 
 src_unpack() {
diff --git a/sys-apps/man/man-1.5l.ebuild b/sys-apps/man/man-1.5l.ebuild
deleted file mode 100644
index 83d08527e2c1..000000000000
--- a/sys-apps/man/man-1.5l.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l.ebuild,v 1.1 2003/03/18 17:39:13 aliz Exp $
-
-IUSE=""
-
-inherit eutils
-
-NV="${PV}"
-S="${WORKDIR}/${PN}-${NV}"
-DESCRIPTION="Standard commands to read man pages"
-SRC_URI="http://www.kernel.org/pub/linux/utils/man/man-${NV}.tar.gz"
-HOMEPAGE="http://freshmeat.net/projects/man/"
-
-DEPEND="virtual/glibc"
-
-RDEPEND="sys-apps/cronbase
-	>=sys-apps/groff-1.18"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa arm mips"
-LICENSE="GPL-2"
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	cp configure configure.orig
-	sed	-e 's:/usr/lib/locale:$(prefix)/usr/lib/locale:g' \
-		-e 's!/usr/bin:/usr/ucb:!/usr/bin:!' \
-		configure.orig > configure
-	
-	local x=""
-	for x in / src/ man2html/ msgs/
-	do
-		cd ${S}/${x}
-		cp Makefile.in Makefile.in.orig
-		sed -e '/inst.sh/d' \
-			-e '/^CC =/c\' \
-			-e "CC = gcc" \
-			-e '/^CFLAGS =/c\' \
-			-e "CFLAGS = ${CFLAGS}" \
-			Makefile.in.orig > Makefile.in
-	done
-
-	cd ${S}/gencat
-	cp Makefile Makefile.orig
-	sed -e "s:cc -o:gcc -o:" Makefile.orig > Makefile
-
-	cd ${S}
-	# Fix search order in man.conf so that system installed manpages
-	# will be found first ...
-	epatch ${FILESDIR}/${P}-search-order.patch
-
-	# For groff-1.18 or later we need to call nroff with '-c'
-	epatch ${FILESDIR}/${P}-groff-1.18.patch
-
-	# Fix wierd failing in rare cases
-	epatch ${FILESDIR}/${P}-wrong-quotes.patch
-
-	# Fix a crash when calling man with:  man -k "foo bar" (bug #9761).
-	# <azarah@gentoo.org> (26 Dec 2002).
-	epatch ${FILESDIR}/${P}-util_c-segfault.patch
-
-	# Various fixes from Redhat
-	epatch ${FILESDIR}/${P}-redhat-patches.patch
-
-	# Do not print the 'man: No such file or directory' error if
-	# 'man -d' was called and the NLS catalogue was not found, as
-	# it confuses people, and be more informative  ... (bug #6360)
-	# <azarah@gentoo.org> (26 Dec 2002).
-	epatch ${FILESDIR}/${P}-locale-debug-info.patch
-}
-
-src_compile() {
-	local myconf=""
-	use nls && myconf="+lang all"
-
-	./configure -confdir=/etc \
-		+sgid +fhs \
-		${myconf} || die
-		
-	make || die
-}
-
-src_install() {
-	dodir /usr/{bin,sbin}
-	cd ${S}
-	make PREFIX=${D} install || die
-
-	if [ -n "`use nls`" ]
-	then
-		cd ${S}/msgs
-		./inst.sh ?? ${D}/usr/share/locale/%L/%N
-	fi
-	
-	chmod 2555 ${D}/usr/bin/man
-	chown root.man ${D}/usr/bin/man
-
-	# Needed for makewhatis
-	keepdir /var/cache/man
-	
-	insinto /etc
-	cd ${S}
-	doins src/man.conf
-	
-	dodoc COPYING LSM README* TODO
-	
-	exeinto /etc/cron.daily
-	doexe ${FILESDIR}/makewhatis.cron
-}
-