[gentoo-musl] [PATCH 1/7] sys-devel/m4: in tree version works

[Felix Janda]

---
 sys-devel/m4/Manifest                              |  6 ---
 .../m4/files/m4-1.4.16-fix-test-readlink.patch     | 11 -----
 sys-devel/m4/files/m4-1.4.16-gnulib-musl.patch     | 18 --------
 sys-devel/m4/files/m4-1.4.16-no-gets.patch         | 24 ----------
 sys-devel/m4/m4-1.4.16-r99.ebuild                  | 53 ----------------------
 sys-devel/m4/metadata.xml                          |  8 ----
 6 files changed, 120 deletions(-)
 delete mode 100644 sys-devel/m4/Manifest
 delete mode 100644 sys-devel/m4/files/m4-1.4.16-fix-test-readlink.patch
 delete mode 100644 sys-devel/m4/files/m4-1.4.16-gnulib-musl.patch
 delete mode 100644 sys-devel/m4/files/m4-1.4.16-no-gets.patch
 delete mode 100644 sys-devel/m4/m4-1.4.16-r99.ebuild
 delete mode 100644 sys-devel/m4/metadata.xml

diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
deleted file mode 100644
index 384b034..0000000
--- a/sys-devel/m4/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX m4-1.4.16-fix-test-readlink.patch 326 SHA256 5d036a2aab097de8c0b83b6562732235e9863542478d302f5b96d58ee1fe9717 SHA512 cd7a9efd742b7e4aeb2c3ba0b5fe089d21604ed1a59a90a123a29450f8866eae4f7444ad3c3e679e6ac55785f27162d26f8a890635e516876fd2415965320abb WHIRLPOOL 688fc2d34e42148855501d71b2f80afed6b086ce22903088bd8a22b7a2ac5ca0f13194e5902c39b680be2be57053f2c5a1c43bdd050d841f786245413a657ba4
-AUX m4-1.4.16-gnulib-musl.patch 639 SHA256 9508f42d238c19a778e7e992b809aa9b8dba49dfe29df1442e73c7f8d8f8372e SHA512 de86188320a04851fe86547b28216db6e950ff4840ceb5fdd69bad925be273f96e87a288b57432bc726d41f9f354f1f02f7d3ce78395d6b74b353b17aa66f597 WHIRLPOOL f29cb8fd76ec977a640f5ba83489d85b4fb756060b8d755efccb9764f64222eabdb84b9313f282331ca680e875e310a9984f74580441330bf9a332b4c33dcad3
-AUX m4-1.4.16-no-gets.patch 809 SHA256 6059410a6ed64f68a07aa28cc65bc1c7ee6c6528f2750f1c5ba966d82eb521b3 SHA512 eca7f8f669314fe824351e9c05fbd4d152afe2e434f083060ddc1fa47f65822f0147468260ad058890644e8aef68ec317c1003f45bcfe31d3884d62f029d9fd3 WHIRLPOOL f12bb58b7ea491f3d764224fe52426db8d847f78e9908d8e2dd8f51add9b461fd8dd0296f9c07bd7dbc8aaab29c13aa1e3d361501318c67af236627138fca3e4
-DIST m4-1.4.16.tar.xz 1005264 SHA256 d5b5d51cf8f5b18f3bac39bc2f6b1e61f34d400136ae1a87d075e26a38028d5d SHA512 1123671ab3e0b1b13a4a08035e792a93af0d7d0a5b9027982fe7b5104488a0746906068a0f4774c1f1bc2648ba1bc74d690836e90ff9391464278e4ccbc7edf0 WHIRLPOOL 0438098dab71f6a66c2b18aed2941ef9a2152a8061c2f9903373a1348b261354429806c2bd313f55c7aaa612fe4c2f7628a1fff3c80819565df2a3b664485c23
-EBUILD m4-1.4.16-r99.ebuild 1357 SHA256 1faea587553192a96589b33c5543c1d3c64c7195e4cf2df13d9378a2d8ac764b SHA512 f18674bc83958d4da77551a551726353e83baa59f6085cb900cd6add017751c2a81c0300c1cd2941120ccbd7e6d1c2eaa3f22b0b3bb3a36fb26f4d42486839d7 WHIRLPOOL 618f8acc7aca4862d77a3e0c21d320336ddd8290a430ff86814c4db0717efdad9f2966c7c7af26036381e03a0311559174a2622bb1d89aa757278f00ec03a2a6
-MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-devel/m4/files/m4-1.4.16-fix-test-readlink.patch b/sys-devel/m4/files/m4-1.4.16-fix-test-readlink.patch
deleted file mode 100644
index bb887c4..0000000
--- a/sys-devel/m4/files/m4-1.4.16-fix-test-readlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/test-readlink.h
-+++ tests/test-readlink.h
-@@ -38,7 +38,7 @@
-   ASSERT (errno == ENOENT);
-   errno = 0;
-   ASSERT (func ("", buf, sizeof buf) == -1);
--  ASSERT (errno == ENOENT);
-+  ASSERT (errno == ENOENT || errno == EINVAL);
-   errno = 0;
-   ASSERT (func (".", buf, sizeof buf) == -1);
-   ASSERT (errno == EINVAL);
diff --git a/sys-devel/m4/files/m4-1.4.16-gnulib-musl.patch b/sys-devel/m4/files/m4-1.4.16-gnulib-musl.patch
deleted file mode 100644
index 8bf0507..0000000
--- a/sys-devel/m4/files/m4-1.4.16-gnulib-musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur m4-1.4.16.orig/lib/freadahead.c m4-1.4.16/lib/freadahead.c
---- m4-1.4.16.orig/lib/freadahead.c	2011-03-01 16:39:27.000000000 +0000
-+++ m4-1.4.16/lib/freadahead.c	2013-07-06 03:37:11.809388632 +0000
-@@ -25,6 +25,7 @@
- size_t
- freadahead (FILE *fp)
- {
-+#if 0
- #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_write_ptr > fp->_IO_write_base)
-     return 0;
-@@ -82,4 +83,6 @@
- #else
-  #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread, ungetc on your system, then report this to bug-gnulib."
- #endif
-+#endif
-+  return 0;
- }
diff --git a/sys-devel/m4/files/m4-1.4.16-no-gets.patch b/sys-devel/m4/files/m4-1.4.16-no-gets.patch
deleted file mode 100644
index bb8069b..0000000
--- a/sys-devel/m4/files/m4-1.4.16-no-gets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/424978
-
-hack until m4 pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@××××××.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -125,7 +125,6 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/sys-devel/m4/m4-1.4.16-r99.ebuild b/sys-devel/m4/m4-1.4.16-r99.ebuild
deleted file mode 100644
index ec63cfe..0000000
--- a/sys-devel/m4/m4-1.4.16-r99.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="GNU macro processor"
-HOMEPAGE="http://www.gnu.org/software/m4/m4.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="examples"
-
-# remember: cannot dep on autoconf since it needs us
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-test-readlink.patch #376639
-	epatch "${FILESDIR}"/${P}-no-gets.patch #424978
-	epatch "${FILESDIR}"/${P}-gnulib-musl.patch
-}
-
-src_configure() {
-	# Disable automagic dependency over libsigsegv; see bug #278026
-	export ac_cv_libsigsegv=no
-
-	local myconf=""
-	[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
-	econf --enable-changeword ${myconf}
-}
-
-src_test() {
-	[[ -d /none ]] && die "m4 tests will fail with /none/" #244396
-	emake check || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	# autoconf-2.60 for instance, first checks gm4, then m4.  If we don't have
-	# gm4, it might find gm4 from outside the prefix on for instance Darwin
-	use prefix && dosym /usr/bin/m4 /usr/bin/gm4
-	dodoc BACKLOG ChangeLog NEWS README* THANKS TODO
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-		rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile*
-	fi
-}
diff --git a/sys-devel/m4/metadata.xml b/sys-devel/m4/metadata.xml
deleted file mode 100644
index 56c1244..0000000
--- a/sys-devel/m4/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@g.o</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
-- 
2.7.3