Install man pages again #177676 by Duncan and touchup build slightly.

Package-Manager: portage-2.1.2.9

5 files changed, 107 insertions, 33 deletions

diff --git a/sys-apps/diffutils/ChangeLog b/sys-apps/diffutils/ChangeLog
index 8fc8f7b19725..04bb652fa84d 100644
--- a/sys-apps/diffutils/ChangeLog
+++ b/sys-apps/diffutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/diffutils
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/ChangeLog,v 1.51 2007/02/19 23:02:41 wolf31o2 Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/ChangeLog,v 1.52 2007/06/13 23:06:53 vapier Exp $
+
+*diffutils-2.8.7-r2 (13 Jun 2007)
+
+  13 Jun 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/diffutils-2.8.7-headers.patch, +diffutils-2.8.7-r2.ebuild:
+  Install man pages again #177676 by Duncan and touchup build slightly.
 
   19 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> ChangeLog:
   Added Manifest2.
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 57fd2e1b4a14..fd1dcb908c89 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,41 +1,35 @@
-AUX diffutils-2.8.4-Makefile-fix-typeo.patch 1158 RMD160 499d0a348d642de171f6d63a2bd1fa3a90a4139e SHA1 89ce013ce5ec16c37b2ef71b7ee6224ed88477ec SHA256 45a55f626b3c5e23a32cd822f4328fb12bf88c70b0c695ee78280afa0e22edae
-MD5 88eef724512016e5400a58e4057ef235 files/diffutils-2.8.4-Makefile-fix-typeo.patch 1158
-RMD160 499d0a348d642de171f6d63a2bd1fa3a90a4139e files/diffutils-2.8.4-Makefile-fix-typeo.patch 1158
-SHA256 45a55f626b3c5e23a32cd822f4328fb12bf88c70b0c695ee78280afa0e22edae files/diffutils-2.8.4-Makefile-fix-typeo.patch 1158
-AUX diffutils-2.8.4-no-manpage.patch 1168 RMD160 e3b4930d29c0996bdbdd60e3668dc58943ac41bf SHA1 e3cb06f7ea6b708de9f7c5771cc031af2f008c50 SHA256 4fcb0dcd26652926438c11537c45e8429a61dc36774326966932863d273fbb66
-MD5 bb27bd30edca169156e905ebe7dab570 files/diffutils-2.8.4-no-manpage.patch 1168
-RMD160 e3b4930d29c0996bdbdd60e3668dc58943ac41bf files/diffutils-2.8.4-no-manpage.patch 1168
-SHA256 4fcb0dcd26652926438c11537c45e8429a61dc36774326966932863d273fbb66 files/diffutils-2.8.4-no-manpage.patch 1168
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX diffutils-2.8.4-sdiff-no-waitpid.patch 525 RMD160 ea9e3ca6220a5f85f35e39e68b31df6060a3cdf4 SHA1 6cf97589930ce02ea4ae0afee687cbae45714a16 SHA256 826a5b92458b88905c8e12ea9ad45fbc842274720b0800fcbd37b3886c6c4765
 MD5 fcb3554acdf9074aad98b90af6cb915d files/diffutils-2.8.4-sdiff-no-waitpid.patch 525
 RMD160 ea9e3ca6220a5f85f35e39e68b31df6060a3cdf4 files/diffutils-2.8.4-sdiff-no-waitpid.patch 525
 SHA256 826a5b92458b88905c8e12ea9ad45fbc842274720b0800fcbd37b3886c6c4765 files/diffutils-2.8.4-sdiff-no-waitpid.patch 525
-AUX diffutils-2.8.4-tabsize-dumps-core.diff 804 RMD160 fe8c7f59fcbbaf2b6df328ef4c764ecae8a0a3a3 SHA1 33fbe2fd2f964c2dab46f5701d456ced4565751f SHA256 7404734bdcbc9c9741cb9067e0949c8403d23a2750cfbe2034bb849fe0d209a1
-MD5 a571ebf3fcef3b033e33a4f013521e13 files/diffutils-2.8.4-tabsize-dumps-core.diff 804
-RMD160 fe8c7f59fcbbaf2b6df328ef4c764ecae8a0a3a3 files/diffutils-2.8.4-tabsize-dumps-core.diff 804
-SHA256 7404734bdcbc9c9741cb9067e0949c8403d23a2750cfbe2034bb849fe0d209a1 files/diffutils-2.8.4-tabsize-dumps-core.diff 804
-DIST diffutils-2.8.4.tar.gz 828766 RMD160 dafa1a85496b382f7ce1ebd870348680d2dee8e4 SHA1 08a1b5bed2c9b713bf85335730251f03fd20e9c4 SHA256 06e46e297381e08b8fd9ed0b2e2cfb52e63de41fc4f3566adc69341d13d18227
+AUX diffutils-2.8.7-headers.patch 179 RMD160 3510d6182eabeecac120ea38e7ae5def5967cbb4 SHA1 893fe2e5e6f7cc8ff27e19038b02751ce4ad3f4a SHA256 99a77be4e24f6f8333b09145568ad09b6a205aa5025bd8bc58179653e1635eed
+MD5 b50ae3a131d30ba979b7059e4e4d20c2 files/diffutils-2.8.7-headers.patch 179
+RMD160 3510d6182eabeecac120ea38e7ae5def5967cbb4 files/diffutils-2.8.7-headers.patch 179
+SHA256 99a77be4e24f6f8333b09145568ad09b6a205aa5025bd8bc58179653e1635eed files/diffutils-2.8.7-headers.patch 179
 DIST diffutils-2.8.7-i18n.patch.bz2 4388 RMD160 c1d8640f86e2362551d1e94893f7f0079839fa75 SHA1 3ad149e0ff8725ffb82e8f5613dcfdf58ef606f8 SHA256 a6a8f47d75ea9e61a0b9dba45f4a85bf1d54572c191bb7ad9e0cb7e8edd867c0
 DIST diffutils-2.8.7.tar.gz 1057977 RMD160 389518f9008e56a283884809d7abac4b3cb8edce SHA1 b05cfdd651137d46d97872dd646db0dd92077f0d SHA256 53d9c10830ac322c00dfcccf60d961014e767da86d2c802ccc5cbad7e7aea07c
-EBUILD diffutils-2.8.4-r4.ebuild 1933 RMD160 d136104a8f8e9443ad1ba349524c226d49e8b97d SHA1 670ed29d9fb3d49c7f5afdd139dece7ec7853296 SHA256 8a835111ea2235645f7870a57584b80620dbb9b8b005a55e12739a4aeb4d7c2b
-MD5 2b8888ea3c1b05e81e1bbf61b1f2b945 diffutils-2.8.4-r4.ebuild 1933
-RMD160 d136104a8f8e9443ad1ba349524c226d49e8b97d diffutils-2.8.4-r4.ebuild 1933
-SHA256 8a835111ea2235645f7870a57584b80620dbb9b8b005a55e12739a4aeb4d7c2b diffutils-2.8.4-r4.ebuild 1933
-EBUILD diffutils-2.8.7-r1.ebuild 1708 RMD160 2721a75fb323fa90dc197765a63446c80d9847ba SHA1 832ff1b5bfbeaf1ded750a4377bd2895a738c5e5 SHA256 8cedd55e557fe1404526008a6cfe5a41d921486c2d6d956f9afe7cb37d3414cf
-MD5 1f5a2917c8d20aa8f1d44c345d615743 diffutils-2.8.7-r1.ebuild 1708
-RMD160 2721a75fb323fa90dc197765a63446c80d9847ba diffutils-2.8.7-r1.ebuild 1708
-SHA256 8cedd55e557fe1404526008a6cfe5a41d921486c2d6d956f9afe7cb37d3414cf diffutils-2.8.7-r1.ebuild 1708
-MISC ChangeLog 6475 RMD160 10644e603e39af88570a784651ff21ee726c5dc2 SHA1 fea3c0a8ccb835b09d38a8d464cae03c46239398 SHA256 7f1474f0b5dfd78045f58a28adc5cb525bad0c434eba2481d2cbbb2d316826a3
-MD5 559a993fd44ebd9c74c624e19500ac39 ChangeLog 6475
-RMD160 10644e603e39af88570a784651ff21ee726c5dc2 ChangeLog 6475
-SHA256 7f1474f0b5dfd78045f58a28adc5cb525bad0c434eba2481d2cbbb2d316826a3 ChangeLog 6475
+EBUILD diffutils-2.8.7-r2.ebuild 1682 RMD160 8fbc702e60155459e20893b8a7bbe74500e10af8 SHA1 8ceaeb05860116f0e8bb22bd4e1fde556f80e22a SHA256 fd331df02a3643fede1dc889750a77854ea61ed4aa151a83f9a5c18336863f35
+MD5 a9f19bbf13323200215c47535171f6e4 diffutils-2.8.7-r2.ebuild 1682
+RMD160 8fbc702e60155459e20893b8a7bbe74500e10af8 diffutils-2.8.7-r2.ebuild 1682
+SHA256 fd331df02a3643fede1dc889750a77854ea61ed4aa151a83f9a5c18336863f35 diffutils-2.8.7-r2.ebuild 1682
+MISC ChangeLog 6699 RMD160 ea874b7501400ee51a0d31e664d7f23cac9c352e SHA1 57fb54bfb42f88ce202c028a3812f1dea9b29ea6 SHA256 2f26bb16634610907b917779efc5f50b3a12975936ddf3d73f35c6ecff1255d0
+MD5 976f5d30fc49e80c1b9be63af3cacf4c ChangeLog 6699
+RMD160 ea874b7501400ee51a0d31e664d7f23cac9c352e ChangeLog 6699
+SHA256 2f26bb16634610907b917779efc5f50b3a12975936ddf3d73f35c6ecff1255d0 ChangeLog 6699
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 55c3f10df1cc6c67ca58f5f407c71f5e files/digest-diffutils-2.8.4-r4 247
-RMD160 1cc7b4f33c6c88950c5461955c76bdd36d9c9344 files/digest-diffutils-2.8.4-r4 247
-SHA256 ae7b9609f89c860ee16baa40d21c18b374ffb5ec14956e7fa7c91c5c5e883ccc files/digest-diffutils-2.8.4-r4 247
-MD5 a77ee47e41597686d2ff4c50b482ee0e files/digest-diffutils-2.8.7-r1 515
-RMD160 314ad75555675accbd628e662885fb401bf2e503 files/digest-diffutils-2.8.7-r1 515
-SHA256 af09c94e1f3aca8686ffcb87161f505f92cb5db020f029510cd4b6e632be5beb files/digest-diffutils-2.8.7-r1 515
+MD5 a77ee47e41597686d2ff4c50b482ee0e files/digest-diffutils-2.8.7-r2 515
+RMD160 314ad75555675accbd628e662885fb401bf2e503 files/digest-diffutils-2.8.7-r2 515
+SHA256 af09c94e1f3aca8686ffcb87161f505f92cb5db020f029510cd4b6e632be5beb files/digest-diffutils-2.8.7-r2 515
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGcHiw8bi6rjpTunYRAnKIAJ93sZ8SqpGhXk8diHEsHtQSy1ExXwCeMObk
+L1qckDI0ECD5/M2D6ALkLR0=
+=5J0W
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/diffutils/diffutils-2.8.7-r2.ebuild b/sys-apps/diffutils/diffutils-2.8.7-r2.ebuild
new file mode 100644
index 000000000000..000c71891e79
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-2.8.7-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 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-r2.ebuild,v 1.1 2007/06/13 23:06:53 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Tools to make diffs and compare files"
+HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
+SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz
+	mirror://gentoo/${P}-i18n.patch.bz2"
+
+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 static"
+
+RDEPEND="userland_GNU? ( >=sys-apps/man-pages-2.46 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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
+
+	# Fix utf8 support.  Patch from MDK. #71689
+	epatch "${WORKDIR}"/${P}-i18n.patch
+
+	epatch "${FILESDIR}"/${P}-headers.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
+
+	# There's no reason for this crap to use the private version
+	sed -i 's:__mempcpy:mempcpy:g' lib/*.c
+
+	# Fix userpriv perm problems #76600
+	chmod ug+w config/*
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	econf $(use_enable nls) || die "econf"
+	emake || die "make"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog NEWS README
+}
diff --git a/sys-apps/diffutils/files/diffutils-2.8.7-headers.patch b/sys-apps/diffutils/files/diffutils-2.8.7-headers.patch
new file mode 100644
index 000000000000..d3e72d7e232f
--- /dev/null
+++ b/sys-apps/diffutils/files/diffutils-2.8.7-headers.patch
@@ -0,0 +1,12 @@
+get prototype for gettimeofday()
+
+--- src/system.h
++++ src/system.h
+@@ -93,6 +93,7 @@
+ #endif
+ 
+ #include <time.h>
++#include <sys/time.h>
+ 
+ #if HAVE_FCNTL_H
+ # include <fcntl.h>
diff --git a/sys-apps/diffutils/files/digest-diffutils-2.8.7-r2 b/sys-apps/diffutils/files/digest-diffutils-2.8.7-r2
new file mode 100644
index 000000000000..90aa20a30302
--- /dev/null
+++ b/sys-apps/diffutils/files/digest-diffutils-2.8.7-r2
@@ -0,0 +1,6 @@
+MD5 406c758a923f531f350edb82423aef56 diffutils-2.8.7-i18n.patch.bz2 4388
+RMD160 c1d8640f86e2362551d1e94893f7f0079839fa75 diffutils-2.8.7-i18n.patch.bz2 4388
+SHA256 a6a8f47d75ea9e61a0b9dba45f4a85bf1d54572c191bb7ad9e0cb7e8edd867c0 diffutils-2.8.7-i18n.patch.bz2 4388
+MD5 18d6587cb915e7aa110a5d463d6ed156 diffutils-2.8.7.tar.gz 1057977
+RMD160 389518f9008e56a283884809d7abac4b3cb8edce diffutils-2.8.7.tar.gz 1057977
+SHA256 53d9c10830ac322c00dfcccf60d961014e767da86d2c802ccc5cbad7e7aea07c diffutils-2.8.7.tar.gz 1057977