Pull upstream fix for BSD systems.

Package-Manager: portage-2.1.3.13

5 files changed, 87 insertions, 5 deletions

diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog
index 1ea8daff89e4..3481c4b3a053 100644
--- a/sys-devel/m4/ChangeLog
+++ b/sys-devel/m4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/m4
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.99 2007/10/12 20:19:38 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.100 2007/10/15 09:03:09 uberlord Exp $
+
+*m4-1.4.10-r1 (15 Oct 2007)
+
+  15 Oct 2007; Roy Marples <uberlord@gentoo.org>
+  +files/m4-1.4.10-seek.patch, +m4-1.4.10-r1.ebuild:
+  Pull upstream fix for BSD systems.
 
   12 Oct 2007; Lars Weiler <pylon@gentoo.org> m4-1.4.10.ebuild:
   stable ppc, bug #195257
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 7347b0a5e8db..9c9013968fba 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,9 +1,17 @@
+AUX m4-1.4.10-seek.patch 464 RMD160 9735fbb77be58aa4a872cd782c92c82fa4b0c088 SHA1 d64fdf5436c5ad9c38ccb1a176831fc78521eb35 SHA256 fca5ca8e40622af682fcd07f9e9195a7971706eb6070f9bf2387706a56e8ec39
+MD5 1f3d60c216c50719df7ddcc7dc00b47e files/m4-1.4.10-seek.patch 464
+RMD160 9735fbb77be58aa4a872cd782c92c82fa4b0c088 files/m4-1.4.10-seek.patch 464
+SHA256 fca5ca8e40622af682fcd07f9e9195a7971706eb6070f9bf2387706a56e8ec39 files/m4-1.4.10-seek.patch 464
 AUX m4-1.4.9-signed-division.patch 909 RMD160 9c8bf8f6f442d9c870906882af553ee8abf8a65d SHA1 2313db3ae6e7e84ed1e72a937d6081f212101522 SHA256 9c3c0c8b3e0e10f8e9d8264a5fd46fbf5bfbacb50d444a053deeeab3b541111b
 MD5 d915231daf11f3c3bd24d4bf9538f2ac files/m4-1.4.9-signed-division.patch 909
 RMD160 9c8bf8f6f442d9c870906882af553ee8abf8a65d files/m4-1.4.9-signed-division.patch 909
 SHA256 9c3c0c8b3e0e10f8e9d8264a5fd46fbf5bfbacb50d444a053deeeab3b541111b files/m4-1.4.9-signed-division.patch 909
 DIST m4-1.4.10.tar.bz2 739154 RMD160 db9e91a01104a7543e69527da6d4f059a56ffefb SHA1 df46910c7e711aef1a654b077ef48d86a6a0cc6b SHA256 b2b66e645cd566a95d9714848a5d084427f3130ace5c5a0c6cb5544f11b7cbd7
 DIST m4-1.4.9.tar.bz2 609666 RMD160 5a9b3d5a607f36c02aa818d5ded5b151f2b182e0 SHA1 28b8493688ceb752ee5a96ea8fc3a335cf44beb6 SHA256 a8e29386374ba0eacbd7b339b97f169603d63a736bd87eee85ed2771ed7c3d29
+EBUILD m4-1.4.10-r1.ebuild 1238 RMD160 f63861bd83756e5eca02f697eee5e468b0f586fa SHA1 c04c1ff50f616b2bc3cf2a3143324540dee30e86 SHA256 909f4384f5ada8c7954a069aa136f69c5c3fe4c814fe1f8eaf5f5c56a9ed2770
+MD5 cf52c190997c7982bf5cb8efc425fab1 m4-1.4.10-r1.ebuild 1238
+RMD160 f63861bd83756e5eca02f697eee5e468b0f586fa m4-1.4.10-r1.ebuild 1238
+SHA256 909f4384f5ada8c7954a069aa136f69c5c3fe4c814fe1f8eaf5f5c56a9ed2770 m4-1.4.10-r1.ebuild 1238
 EBUILD m4-1.4.10.ebuild 1083 RMD160 9a6795d2b31437bb41f25e73efc4cd0154b7ea91 SHA1 3c08556465e1a444964b79ff5c0ff8b27e21fffc SHA256 8e9101280f2648990eed3c9ec05f6736c0137896885799bea14fb1aafa819c9e
 MD5 bc6633f0005c239cf242975a5aa0a8a1 m4-1.4.10.ebuild 1083
 RMD160 9a6795d2b31437bb41f25e73efc4cd0154b7ea91 m4-1.4.10.ebuild 1083
@@ -16,10 +24,10 @@ EBUILD m4-1.4.9.ebuild 1079 RMD160 031f4af8532f108479b1f251798a41c4e50607bf SHA1
 MD5 fd64b0c2760fed6316cee07c6714c2d3 m4-1.4.9.ebuild 1079
 RMD160 031f4af8532f108479b1f251798a41c4e50607bf m4-1.4.9.ebuild 1079
 SHA256 c28ab0bd5bdbcb37aeaaf0eb92b0d487df334fc451b3ce2d4fc0ef3283783a54 m4-1.4.9.ebuild 1079
-MISC ChangeLog 10827 RMD160 95630fd1ec2ad0870480135449418cd883a84d83 SHA1 b617a144f025fb0d805213bef5bb29b255b23bc7 SHA256 74b054cdde785602d593009c6e6f5a758e66ff85115bf9e90e058d2189d1ebc5
-MD5 3aee70760690c273f896d4b57ec9ed0e ChangeLog 10827
-RMD160 95630fd1ec2ad0870480135449418cd883a84d83 ChangeLog 10827
-SHA256 74b054cdde785602d593009c6e6f5a758e66ff85115bf9e90e058d2189d1ebc5 ChangeLog 10827
+MISC ChangeLog 11000 RMD160 f9048a47c8bb121ad5284abc49a6a562b1a28f7f SHA1 d10611fc101eb75d150f9e4c4e82e5d789f2cee9 SHA256 39ce1a37e598931dc3a5960e8075735748fd6ccdb86596a4873ed507a8fd26e9
+MD5 a6cd15f5ddb0269a739d7f8f0fc9f556 ChangeLog 11000
+RMD160 f9048a47c8bb121ad5284abc49a6a562b1a28f7f ChangeLog 11000
+SHA256 39ce1a37e598931dc3a5960e8075735748fd6ccdb86596a4873ed507a8fd26e9 ChangeLog 11000
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -27,6 +35,9 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 14150d2060a7de72f786277fe1676929 files/digest-m4-1.4.10 232
 RMD160 ec26717c6c4faa05f882badd7286c81c9a253990 files/digest-m4-1.4.10 232
 SHA256 751d8ad91b534d2702651574afd7bcad8fcb2bfd272d07110c061241fd592aa7 files/digest-m4-1.4.10 232
+MD5 14150d2060a7de72f786277fe1676929 files/digest-m4-1.4.10-r1 232
+RMD160 ec26717c6c4faa05f882badd7286c81c9a253990 files/digest-m4-1.4.10-r1 232
+SHA256 751d8ad91b534d2702651574afd7bcad8fcb2bfd272d07110c061241fd592aa7 files/digest-m4-1.4.10-r1 232
 MD5 27a273f2cc1cc1c9fd998b559b90fbc3 files/digest-m4-1.4.9 229
 RMD160 481d2bd633df2a7509799e96761795fdd6b79750 files/digest-m4-1.4.9 229
 SHA256 f8b34c06c50e1667d12b18619d3f5260e6bd116f74343851798cc3650d175597 files/digest-m4-1.4.9 229
diff --git a/sys-devel/m4/files/digest-m4-1.4.10-r1 b/sys-devel/m4/files/digest-m4-1.4.10-r1
new file mode 100644
index 000000000000..6fffe4cf2239
--- /dev/null
+++ b/sys-devel/m4/files/digest-m4-1.4.10-r1
@@ -0,0 +1,3 @@
+MD5 0a35bab2f5d605e08083d7e3cbd4b8b0 m4-1.4.10.tar.bz2 739154
+RMD160 db9e91a01104a7543e69527da6d4f059a56ffefb m4-1.4.10.tar.bz2 739154
+SHA256 b2b66e645cd566a95d9714848a5d084427f3130ace5c5a0c6cb5544f11b7cbd7 m4-1.4.10.tar.bz2 739154
diff --git a/sys-devel/m4/files/m4-1.4.10-seek.patch b/sys-devel/m4/files/m4-1.4.10-seek.patch
new file mode 100644
index 000000000000..572d266373f1
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.10-seek.patch
@@ -0,0 +1,13 @@
+diff -ur a/src/output.c b/src/output.c
+--- a/src/output.c	2007-07-05 04:56:06 +0100
++++ b/src/output.c	2007-10-15 09:56:23 +0100
+@@ -252,6 +252,9 @@
+   else if (set_cloexec_flag (fileno (file), true) != 0)
+     M4ERROR ((warning_status, errno,
+ 	      "Warning: cannot protect diversion across forks"));
++  else if (fseeko (file, 0, SEEK_SET) != 0)
++    M4ERROR ((EXIT_FAILURE, errno,
++              "cannot seek to beginning of diversion"));
+   return file;
+ }
+ 
diff --git a/sys-devel/m4/m4-1.4.10-r1.ebuild b/sys-devel/m4/m4-1.4.10-r1.ebuild
new file mode 100644
index 000000000000..96071a324b40
--- /dev/null
+++ b/sys-devel/m4/m4-1.4.10-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.10-r1.ebuild,v 1.1 2007/10/15 09:03:09 uberlord Exp $
+
+inherit eutils
+
+DESCRIPTION="GNU macro processor"
+HOMEPAGE="http://www.gnu.org/software/m4/m4.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
+	ftp://ftp.seindal.dk/gnu/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="examples nls"
+
+# remember: cannot dep on autoconf since it needs us
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix for BSD systems pulled from upstream.
+	epatch "${FILESDIR}/${P}"-seek.patch
+}
+
+src_compile() {
+	local myconf=""
+	[ "${USERLAND}" != "GNU" ] && myconf="--program-prefix=g"
+	econf \
+		$(use_enable nls) \
+		--enable-changeword \
+		${myconf} \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc BACKLOG ChangeLog NEWS README* THANKS TODO
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+		rm -f "${D}"/usr/share/doc/${PF}/examples/Makefile*
+	fi
+	rm -f "${D}"/usr/lib/charset.alias #172864
+}