New version

7 files changed, 126 insertions, 19 deletions

diff --git a/sys-apps/diffutils/ChangeLog b/sys-apps/diffutils/ChangeLog
index cbd7e10d7f6d..d7701fcfc227 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.31 2004/03/01 19:59:51 aliz Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/ChangeLog,v 1.32 2004/05/10 14:42:04 lu_zero Exp $
+
+*diffutils-2.8.7 (10 May 2004)
+
+  10 May 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/diffutils-2.8.7-no-manpage.patch, +diffutils-2.8.7.ebuild:
+  New version, solves many problems with sdiff on ppc.
 
   28 Dec 2003; Joshua Kinard <kumba@gentoo.org> diffutils-2.8.4-r4.ebuild:
   Move to mips stable (~mips -> mips)
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 1c6e0c14cb64..29aba589e21d 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,10 +1,13 @@
-MD5 88eef724512016e5400a58e4057ef235 files/diffutils-2.8.4-Makefile-fix-typeo.patch 1158
+MD5 b8c9d7323929747ae97baf3acd91e69c ChangeLog 4435
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 7b6f15d1f450e878cca4ee7dda45c7df diffutils-2.8.7.ebuild 1500
+MD5 4b087bf07f14ab6c2662236a10cd5711 diffutils-2.8.4-r4.ebuild 2074
+MD5 40a61350526b77978e20f415d7bf9bf0 diffutils-2.8.4-r3.ebuild 2038
 MD5 bb27bd30edca169156e905ebe7dab570 files/diffutils-2.8.4-no-manpage.patch 1168
 MD5 fcb3554acdf9074aad98b90af6cb915d files/diffutils-2.8.4-sdiff-no-waitpid.patch 525
-MD5 a571ebf3fcef3b033e33a4f013521e13 files/diffutils-2.8.4-tabsize-dumps-core.diff 804
+MD5 88eef724512016e5400a58e4057ef235 files/diffutils-2.8.4-Makefile-fix-typeo.patch 1158
 MD5 7abb095c2c2ecdbd465a1953cb443289 files/digest-diffutils-2.8.4-r3 67
+MD5 96bfbc8c9d4a828ec67d9d537a52d756 files/diffutils-2.8.7-no-manpage.patch 1231
 MD5 7abb095c2c2ecdbd465a1953cb443289 files/digest-diffutils-2.8.4-r4 67
-MD5 54eae8b19811c4b96f6f1583af48626a ChangeLog 4228
-MD5 f591a9b7747961624ef1daa0e1d473dd diffutils-2.8.4-r3.ebuild 2040
-MD5 73ac8651083977ae7600c427cc066470 diffutils-2.8.4-r4.ebuild 2075
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 a571ebf3fcef3b033e33a4f013521e13 files/diffutils-2.8.4-tabsize-dumps-core.diff 804
+MD5 28aba2261ffb7634265a612938df28f5 files/digest-diffutils-2.8.7 68
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild
index 22f367532715..4ad29f8dcef3 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.
+# Copyright 1999-2004 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.16 2004/02/23 00:40:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild,v 1.17 2004/05/10 14:42:04 lu_zero Exp $
 
 IUSE="nls build static"
 
diff --git a/sys-apps/diffutils/diffutils-2.8.7.ebuild b/sys-apps/diffutils/diffutils-2.8.7.ebuild
new file mode 100644
index 000000000000..5d2e234acbb3
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-2.8.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 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.7.ebuild,v 1.1 2004/05/10 14:42:04 lu_zero 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~ppc ~ppc64"
+IUSE="nls build static"
+
+DEPEND="virtual/glibc
+	>=sys-apps/portage-2.0.47-r10
+	>=sys-apps/sed-4
+	nls? ( sys-devel/gettext )
+	!build? ( sys-apps/texinfo sys-apps/help2man )"
+RDEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	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
+}
+
+src_compile() {
+	econf --build=${CHOST} `use_enable nls` || die "econf"
+
+	if use static ; then
+		emake LDFLAGS=-static || die
+	else
+		emake || die
+	fi
+}
+
+src_install() {
+	einstall || die
+
+	if ! use build ; then
+		dodoc ChangeLog NEWS README
+	else
+		rm -rf ${D}/usr/share/info
+	fi
+}
diff --git a/sys-apps/diffutils/files/diffutils-2.8.7-no-manpage.patch b/sys-apps/diffutils/files/diffutils-2.8.7-no-manpage.patch
new file mode 100644
index 000000000000..5238dda8f163
--- /dev/null
+++ b/sys-apps/diffutils/files/diffutils-2.8.7-no-manpage.patch
@@ -0,0 +1,37 @@
+diff -ruN diffutils-2.8.7.orig/man/Makefile.am diffutils-2.8.7/man/Makefile.am
+--- diffutils-2.8.7.orig/man/Makefile.am	2004-05-10 16:06:33.155320992 +0200
++++ diffutils-2.8.7/man/Makefile.am	2004-05-10 16:07:11.170541800 +0200
+@@ -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 -ruN diffutils-2.8.7.orig/man/Makefile.in diffutils-2.8.7/man/Makefile.in
+--- diffutils-2.8.7.orig/man/Makefile.in	2004-05-10 16:06:33.155320992 +0200
++++ diffutils-2.8.7/man/Makefile.in	2004-05-10 16:07:42.455785720 +0200
+@@ -183,7 +183,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-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
+ all: all-am
+@@ -388,7 +388,6 @@
+ 	uninstall-am 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.8.7 b/sys-apps/diffutils/files/digest-diffutils-2.8.7
new file mode 100644
index 000000000000..22e15e44701a
--- /dev/null
+++ b/sys-apps/diffutils/files/digest-diffutils-2.8.7
@@ -0,0 +1 @@
+MD5 18d6587cb915e7aa110a5d463d6ed156 diffutils-2.8.7.tar.gz 1057977
diff --git a/sys-apps/speedfreq/Manifest b/sys-apps/speedfreq/Manifest
index 55f6b727875c..5f95748808af 100644
--- a/sys-apps/speedfreq/Manifest
+++ b/sys-apps/speedfreq/Manifest
@@ -1,12 +1,12 @@
-MD5 d46afb4e9c52383f9cd2f8d52413e25e files/battery.sh 790
-MD5 384a3c0ba9c47cef45f4b202e69f5581 files/digest-speedfreq-0.5 64
-MD5 1cab56f6e74cd2e900c9f59f55383d11 files/speedfreq.conf 783
+MD5 37d3516356493e67947112763901c341 speedfreq-0.5.ebuild 1841
+MD5 016bdd4bf54783deab0992311ded84ae speedfreq-0.7.2-r1.ebuild 1852
+MD5 f6037b67f5a4802c932cd0d78af4a17f speedfreq-0.7.2.ebuild 1842
+MD5 f7a1ea7e9df1e6f19409f0c4b175a21d ChangeLog 788
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 15c2bcca7f009a18cb5cf7abd39d3fef files/speedfreq.rc 1340
-MD5 f96b11d757583258d2fff576c68b06e2 files/digest-speedfreq-0.7.2 66
 MD5 f96b11d757583258d2fff576c68b06e2 files/digest-speedfreq-0.7.2-r1 66
 MD5 4ae134571b43465ff61cbd376539f6cf files/0.7.2-python-ver.patch 348
-MD5 8bfdb5e08d9a9f2827bb3b236e2a622e ChangeLog 675
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 37d3516356493e67947112763901c341 speedfreq-0.5.ebuild 1841
-MD5 f6037b67f5a4802c932cd0d78af4a17f speedfreq-0.7.2.ebuild 1842
-MD5 f628315f94f79b9901c3fe636c7c5667 speedfreq-0.7.2-r1.ebuild 1847
+MD5 f96b11d757583258d2fff576c68b06e2 files/digest-speedfreq-0.7.2 66
+MD5 1cab56f6e74cd2e900c9f59f55383d11 files/speedfreq.conf 783
+MD5 384a3c0ba9c47cef45f4b202e69f5581 files/digest-speedfreq-0.5 64
+MD5 d46afb4e9c52383f9cd2f8d52413e25e files/battery.sh 790