Make sure we dont try to regenerate the manpages #55479.

3 files changed, 35 insertions, 54 deletions

diff --git a/sys-apps/diffutils/ChangeLog b/sys-apps/diffutils/ChangeLog
index 2da4e8416582..2a4c11c294b6 100644
--- a/sys-apps/diffutils/ChangeLog
+++ b/sys-apps/diffutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/diffutils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/ChangeLog,v 1.37 2004/09/03 21:03:23 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/ChangeLog,v 1.38 2004/12/09 05:07:21 vapier Exp $
+
+  09 Dec 2004; Mike Frysinger <vapier@gentoo.org> diffutils-2.8.4-r4.ebuild,
+  diffutils-2.8.7.ebuild:
+  Make sure we dont try to regenerate the manpages #55479.
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   diffutils-2.8.4-r4.ebuild:
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
index 4588b2829faf..3dd82434e4db 100644
--- a/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.20 2004/12/08 01:07:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild,v 1.21 2004/12/09 05:07:21 vapier Exp $
 
-inherit eutils flag-o-matic gnuconfig
+inherit eutils flag-o-matic
 
 DESCRIPTION="Tools to make diffs and compare files"
 HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
@@ -11,26 +11,15 @@ SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls build static"
+IUSE="nls static"
 
-DEPEND="virtual/libc
-	>=sys-apps/portage-2.0.47-r10
-	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )
-	!build? ( sys-apps/texinfo sys-apps/help2man )"
 RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
-	gnuconfig_update
-
-	if use build ; then
-		#disable texinfo building so we can remove the dep
-		sed -i -e 's:SUBDIRS = doc:SUBDIRS =:' \
-			Makefile.in || die "Makefile.in sed"
-	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
@@ -48,24 +37,23 @@ src_unpack() {
 	# <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
+	# Make sure we don't try generating the manpages ... this requires 
+	# 'help2man' which is a perl app which is not available in a 
+	# stage2 / stage3 ... don't DEPEND on it or we get a DEPEND loop :(
+	# for more info, see #55479
+	touch man/*.1
 }
 
 src_compile() {
 	econf $(use_enable nls) || die "econf"
-
 	use static && append-ldflags -static
-	emake LDFLAGS="${LDFLAGS}" || die
+	emake LDFLAGS="${LDFLAGS}" || die "make"
 }
 
 src_install() {
-	einstall || die
+	make install DESTDIR="${D}" || die
+	dodoc ChangeLog NEWS README
 
-	if ! use build ; then
-		dodoc ChangeLog NEWS README
-	else
-		rm -r ${D}/usr/share/info
-	fi
+	# use the manpage from 'sys-apps/man-pages'
+	rm -f "${D}"/usr/share/man/man1/diff.1*
 }
diff --git a/sys-apps/diffutils/diffutils-2.8.7.ebuild b/sys-apps/diffutils/diffutils-2.8.7.ebuild
index 1a898f397475..50e4a7c52a5b 100644
--- a/sys-apps/diffutils/diffutils-2.8.7.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.7.ebuild,v 1.11 2004/12/08 18:53:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.7.ebuild,v 1.12 2004/12/09 05:07:21 vapier Exp $
 
-inherit eutils flag-o-matic gnuconfig
+inherit eutils flag-o-matic
 
 DESCRIPTION="Tools to make diffs and compare files"
 HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
@@ -11,48 +11,37 @@ SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* amd64 ~hppa ppc ~ppc64 ~x86"
-IUSE="nls build static"
+IUSE="nls static"
 
-DEPEND="virtual/libc
-	>=sys-apps/portage-2.0.47-r10
-	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )
-	!build? ( sys-apps/texinfo sys-apps/help2man )"
 RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
-	gnuconfig_update
-
-	if use build ; then
-		#disable texinfo building so we can remove the dep
-		sed -i -e 's:SUBDIRS = doc:SUBDIRS =:' \
-			Makefile.in || die "Makefile.in sed"
-	fi
 
 	# Removes waitpid() call after pclose() on piped diff stream, closing
 	# bug #11728, thanks to D Wollmann <converter@dalnet-perl.org>
 	epatch ${FILESDIR}/diffutils-2.8.4-sdiff-no-waitpid.patch
 
-	# the manpage for diff is better provided by the man-pages package, so
-	# we disable it here
-	epatch ${FILESDIR}/${P}-no-manpage.patch
+	# Make sure we don't try generating the manpages ... this requires 
+	# 'help2man' which is a perl app which is not available in a 
+	# stage2 / stage3 ... don't DEPEND on it or we get a DEPEND loop :(
+	# for more info, see #55479
+	touch man/*.1
 }
 
 src_compile() {
 	econf $(use_enable nls) || die "econf"
 	use static && append-ldflags -static
-	emake LDFLAGS="${LDFLAGS}" || die
+	emake LDFLAGS="${LDFLAGS}" || die "make"
 }
 
 src_install() {
-	einstall || die
+	make install DESTDIR="${D}" || die
+	dodoc ChangeLog NEWS README
 
-	if ! use build ; then
-		dodoc ChangeLog NEWS README
-	else
-		rm -rf ${D}/usr/share/info
-	fi
+	# use the manpage from 'sys-apps/man-pages'
+	rm -f "${D}"/usr/share/man/man1/diff.1*
 }