disable diff man page

11 files changed, 63 insertions, 226 deletions

diff --git a/sys-apps/diffutils/ChangeLog b/sys-apps/diffutils/ChangeLog
index 471e11e1a200..68b48576f896 100644
--- a/sys-apps/diffutils/ChangeLog
+++ b/sys-apps/diffutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/diffutils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/ChangeLog,v 1.26 2003/11/07 10:59:39 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/ChangeLog,v 1.27 2003/12/10 04:00:45 seemant Exp $
+
+  09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> diffutils-2.7.7.ebuild,
+  diffutils-2.8.4-r1.ebuild, diffutils-2.8.4-r2.ebuild,
+  diffutils-2.8.4-r3.ebuild, diffutils-2.8.4-r4.ebuild:
+  diff man page installation disabled in this package, since it blows goats. The
+  diff man page is installed by the man-pages package
 
   07 Nov 2003; Tavis Ormandy <taviso@gentoo.org> diffutils-2.8.4-r4.ebuild:
   stable.
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index bf047c6d86df..168000865fcd 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,15 +1,10 @@
-MD5 cd1396c17fe57c6c046a073e05f30a23 ChangeLog 3544
-MD5 332877516a82ff3ebc92d1e0f86bdc0c diffutils-2.7.7.ebuild 1431
-MD5 459a5f2b68cd6b6a9b33045e31c36677 diffutils-2.8.4-r1.ebuild 1638
-MD5 4bed8cec2a344c74156ebb0129203bf1 diffutils-2.8.4-r2.ebuild 1841
-MD5 00c43ab70c98ce89543d27a28517eea2 diffutils-2.8.4-r3.ebuild 1903
-MD5 0df7dccc85db47213a77ea2768a57b94 diffutils-2.8.4-r4.ebuild 2063
+MD5 36346beeb1b3fd88fb9314f6e5e2bbee diffutils-2.8.4-r4.ebuild 2245
+MD5 5a00ad4a8e1325da39c6e2d277995468 ChangeLog 3869
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 88eef724512016e5400a58e4057ef235 files/diffutils-2.8.4-Makefile-fix-typeo.patch 1158
-MD5 fcb3554acdf9074aad98b90af6cb915d files/diffutils-2.8.4-sdiff-no-waitpid.patch 525
+MD5 5727f59e5cc67dec4d1892b80872e65c diffutils-2.8.4-r3.ebuild 2042
 MD5 a571ebf3fcef3b033e33a4f013521e13 files/diffutils-2.8.4-tabsize-dumps-core.diff 804
-MD5 9529ec57ddcde7ce5c18cef8de250645 files/digest-diffutils-2.7.7 67
-MD5 7abb095c2c2ecdbd465a1953cb443289 files/digest-diffutils-2.8.4-r1 67
-MD5 7abb095c2c2ecdbd465a1953cb443289 files/digest-diffutils-2.8.4-r2 67
+MD5 88eef724512016e5400a58e4057ef235 files/diffutils-2.8.4-Makefile-fix-typeo.patch 1158
+MD5 bb27bd30edca169156e905ebe7dab570 files/diffutils-2.8.4-no-manpage.patch 1168
 MD5 7abb095c2c2ecdbd465a1953cb443289 files/digest-diffutils-2.8.4-r3 67
 MD5 7abb095c2c2ecdbd465a1953cb443289 files/digest-diffutils-2.8.4-r4 67
+MD5 fcb3554acdf9074aad98b90af6cb915d files/diffutils-2.8.4-sdiff-no-waitpid.patch 525
diff --git a/sys-apps/diffutils/diffutils-2.7.7.ebuild b/sys-apps/diffutils/diffutils-2.7.7.ebuild
deleted file mode 100644
index cea593e26434..000000000000
--- a/sys-apps/diffutils/diffutils-2.7.7.ebuild
+++ /dev/null
@@ -1,66 +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/diffutils/diffutils-2.7.7.ebuild,v 1.15 2003/09/07 02:28:11 msterret Exp $
-
-IUSE="nls build"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Tools to make diffs and compare files"
-SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
-KEYWORDS="x86 amd64 ppc sparc alpha arm"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
-
-if [ -z "`use build`" ]
-then
-	DEPEND="$DEPEND sys-apps/texinfo"
-fi
-
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	local myconf=""
-	[ -z "`use nls`" ] && myconf="--disable-nls"
-	./configure --build=${CHOST} \
-		--prefix=/usr \
-		${myconf} || die
-
-	if [ "`use build`" ]
-	then
-		#disable texinfo building so we can remove the dep
-		cp Makefile Makefile.orig
-		sed -e 's/^all: ${PROGRAMS} info/all: ${PROGRAMS}/g' \
-			Makefile.orig > Makefile
-	fi
-	emake || die
-
-	if [ -z "`use build`" ]
-	then
-	 	#fix the info page
-		cp doc/diff.info doc/diff.info.orig
-		sed -e 's/^Diff: (diff)/* Diff: (diff)/' \
-			doc/diff.info.orig > doc/diff.info
-	fi
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	if [ -z "`use build`" ]
-	then
-		dodoc COPYING ChangeLog NEWS README
-	else
-		rm -rf ${D}/usr/share/info
-	fi
-}
-
-
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild
deleted file mode 100644
index 3293bfc208a1..000000000000
--- a/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild
+++ /dev/null
@@ -1,67 +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/diffutils/diffutils-2.8.4-r1.ebuild,v 1.11 2003/09/07 02:28:11 msterret Exp $
-
-IUSE="nls build"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Tools to make diffs and compare files"
-SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
-
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc
-	nls? ( sys-devel/gettext )
-	!build? ( sys-apps/texinfo )"
-
-RDEPEND="virtual/glibc"
-
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	if [ -n "`use build`" ]
-	then
-		#disable texinfo building so we can remove the dep
-		cp Makefile.in Makefile.in.orig
-		sed -e 's:SUBDIRS = doc:SUBDIRS =:' \
-			Makefile.in.orig > Makefile.in
-	fi
-
-	# Build fails with make -j5 or greater on pentium4.  This is because
-	# the jobs creating the opjects, which depend on paths.h is sheduled
-	# at the same time paths.h is generated.  This patch just fix a small
-	# typeo that caused this.  This closes bug #8934.
-	# <azarah@gentoo.org> (14 Oct 2002)
-	cd ${S}; patch -p1 < ${FILESDIR}/${P}-Makefile-fix-typeo.patch || die
-}
-
-src_compile() {
-	local myconf=""
-	[ -z "`use nls`" ] && myconf="--disable-nls"
-
-	econf --build=${CHOST} \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		datadir=${D}/usr/share \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		install || die
-
-	if [ -z "`use build`" ]
-	then
-		dodoc COPYING ChangeLog NEWS README
-	else
-		rm -rf ${D}/usr/share/info
-	fi
-}
-
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r2.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r2.ebuild
deleted file mode 100644
index 129b9c8428ba..000000000000
--- a/sys-apps/diffutils/diffutils-2.8.4-r2.ebuild
+++ /dev/null
@@ -1,73 +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/diffutils/diffutils-2.8.4-r2.ebuild,v 1.7 2003/09/07 02:28:11 msterret Exp $
-
-IUSE="nls build"
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Tools to make diffs and compare files"
-SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
-
-KEYWORDS="x86 amd64 ppc ~sparc ~alpha ~mips ~hppa arm"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc
-	nls? ( sys-devel/gettext )
-	!build? ( sys-apps/texinfo )"
-
-RDEPEND="virtual/glibc"
-
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	if [ -n "`use build`" ]
-	then
-		#disable texinfo building so we can remove the dep
-		cp Makefile.in Makefile.in.orig
-		sed -e 's:SUBDIRS = doc:SUBDIRS =:' \
-			Makefile.in.orig > Makefile.in
-	fi
-
-	# Build fails with make -j5 or greater on pentium4.  This is because
-	# the jobs creating the opjects, which depend on paths.h is sheduled
-	# at the same time paths.h is generated.  This patch just fix a small
-	# typeo that caused this.  This closes bug #8934.
-	# <azarah@gentoo.org> (14 Oct 2002)
-	cd ${S}; epatch ${FILESDIR}/${P}-Makefile-fix-typeo.patch
-
-	# Removes waitpid() call after pclose() on piped diff stream, closing
-	# bug #11728, thanks to D Wollmann <converter@dalnet-perl.org>
-	cd ${S}; epatch ${FILESDIR}/${P}-sdiff-no-waitpid.patch
-}
-
-src_compile() {
-	local myconf=""
-	[ -z "`use nls`" ] && myconf="--disable-nls"
-
-	econf --build=${CHOST} \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		datadir=${D}/usr/share \
-		infodir=${D}/usr/share/info \
-		andir=${D}/usr/share/man \
-		install || die
-
-	if [ -z "`use build`" ]
-	then
-		dodoc COPYING ChangeLog NEWS README
-	else
-		rm -rf ${D}/usr/share/info
-	fi
-}
-
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild
index 8a90220e6d95..248bee545867 100644
--- a/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.4-r3.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/diffutils/diffutils-2.8.4-r3.ebuild,v 1.14 2003/09/07 02:28:11 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild,v 1.15 2003/12/10 04:00:45 seemant Exp $
 
 IUSE="nls build static"
 
@@ -48,6 +48,10 @@ src_unpack() {
 	# Removes waitpid() call after pclose() on piped diff stream, closing
 	# bug #11728, thanks to D Wollmann <converter@dalnet-perl.org>
 	epatch ${FILESDIR}/${P}-sdiff-no-waitpid.patch
+
+	# The diff man page is better in the man-pages package so we disable it
+	# from installing here
+	epatch ${FILESDIR}/${P}-no-manpage.patch
 }
 
 src_compile() {
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
index 6695e45b07ab..d5710ad81db7 100644
--- a/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.4-r4.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/diffutils/diffutils-2.8.4-r4.ebuild,v 1.5 2003/11/07 10:59:39 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild,v 1.6 2003/12/10 04:00:45 seemant Exp $
 
 IUSE="nls build static"
 
@@ -13,12 +13,12 @@ filter-flags "-mpowerpc-gfxopt"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Tools to make diffs and compare files"
-SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
+SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 
-KEYWORDS="x86 alpha ia64"
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc ~sparc alpha ~hppa ~mips ~arm ~amd64 ia64"
 
 DEPEND="virtual/glibc
 	>=sys-apps/portage-2.0.47-r10
@@ -53,6 +53,10 @@ src_unpack() {
 	# diff dump core, closing #24238.
 	# <taviso@gentoo.org> (1 Aug 2003)
 	epatch ${FILESDIR}/${P}-tabsize-dumps-core.diff
+
+	# the manpage for diff is better provided by the man-pagees package, so
+	# we disable it here
+	epatch ${FILESDIR}/${P}-no-manpage.patch
 }
 
 src_compile() {
@@ -66,7 +70,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall
+	einstall || die
 
 	if [ -z "`use build`" ] ; then
 		dodoc COPYING ChangeLog NEWS README
diff --git a/sys-apps/diffutils/files/diffutils-2.8.4-no-manpage.patch b/sys-apps/diffutils/files/diffutils-2.8.4-no-manpage.patch
new file mode 100644
index 000000000000..03ea7be5f310
--- /dev/null
+++ b/sys-apps/diffutils/files/diffutils-2.8.4-no-manpage.patch
@@ -0,0 +1,37 @@
+diff -urN diffutils-2.8.4.orig/man/Makefile.am diffutils-2.8.4/man/Makefile.am
+--- diffutils-2.8.4.orig/man/Makefile.am	2002-03-10 20:53:34.000000000 -0800
++++ diffutils-2.8.4/man/Makefile.am	2003-12-09 19:54:47.000000000 -0800
+@@ -17,12 +17,11 @@
+ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ ## 02111-1307, USA.
+ 
+-dist_man_MANS =	cmp.1 diff.1 diff3.1 sdiff.1
++dist_man_MANS =	cmp.1 diff3.1 sdiff.1
+ MAINTAINERCLEANFILES = $(dist_man_MANS)
+ 
+ S = $(top_srcdir)/src
+ cmp.1: $S/cmp.c
+-diff.1: $S/diff.c
+ diff3.1: $S/diff3.c
+ sdiff.1: $S/sdiff.c
+ 
+diff -urN diffutils-2.8.4.orig/man/Makefile.in diffutils-2.8.4/man/Makefile.in
+--- diffutils-2.8.4.orig/man/Makefile.in	2002-06-28 00:04:58.000000000 -0700
++++ diffutils-2.8.4/man/Makefile.in	2003-12-09 19:54:58.000000000 -0800
+@@ -108,7 +108,7 @@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+ 
+-dist_man_MANS = cmp.1 diff.1 diff3.1 sdiff.1
++dist_man_MANS = cmp.1 diff3.1 sdiff.1
+ MAINTAINERCLEANFILES = $(dist_man_MANS)
+ 
+ S = $(top_srcdir)/src
+@@ -282,7 +282,6 @@
+ 	uninstall-info-am uninstall-man uninstall-man1
+ 
+ cmp.1: $S/cmp.c
+-diff.1: $S/diff.c
+ diff3.1: $S/diff3.c
+ sdiff.1: $S/sdiff.c
+ 
diff --git a/sys-apps/diffutils/files/digest-diffutils-2.7.7 b/sys-apps/diffutils/files/digest-diffutils-2.7.7
deleted file mode 100644
index 41383baf9e4c..000000000000
--- a/sys-apps/diffutils/files/digest-diffutils-2.7.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d467e099be4ffaab9dca52c0c60c5fec diffutils-2.7.7.tar.gz 803157
diff --git a/sys-apps/diffutils/files/digest-diffutils-2.8.4-r1 b/sys-apps/diffutils/files/digest-diffutils-2.8.4-r1
deleted file mode 100644
index ab1523b47820..000000000000
--- a/sys-apps/diffutils/files/digest-diffutils-2.8.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a9c028579abc79ecd6842d60a13abf1d diffutils-2.8.4.tar.gz 828766
diff --git a/sys-apps/diffutils/files/digest-diffutils-2.8.4-r2 b/sys-apps/diffutils/files/digest-diffutils-2.8.4-r2
deleted file mode 100644
index ab1523b47820..000000000000
--- a/sys-apps/diffutils/files/digest-diffutils-2.8.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a9c028579abc79ecd6842d60a13abf1d diffutils-2.8.4.tar.gz 828766