4 files changed, 6 insertions, 108 deletions
diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog
index d384bc06463f..9e19d1b42c22 100644
--- a/sys-devel/m4/ChangeLog
+++ b/sys-devel/m4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/m4
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.166 2015/07/20 04:31:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.167 2015/07/22 11:45:11 mrueg Exp $
+
+  22 Jul 2015; Manuel Rüger <mrueg@gentoo.org>
+  -files/m4-1.4.15-git-version-gen.patch,
+  -files/m4-1.4.15-uclibc-sched_param-def.patch, -m4-1.4.15.ebuild:
+  Remove old.
 
   20 Jul 2015; Mike Frysinger <vapier@gentoo.org> m4-1.4.16.ebuild,
   m4-1.4.17.ebuild:
diff --git a/sys-devel/m4/files/m4-1.4.15-git-version-gen.patch b/sys-devel/m4/files/m4-1.4.15-git-version-gen.patch
deleted file mode 100644
index 32f85d4bdf54..000000000000
--- a/sys-devel/m4/files/m4-1.4.15-git-version-gen.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://bugs.gentoo.org/355045
-
-[PATCH] git-version-gen: skip "-dirty" check when appropriate
-
-* build-aux/git-version-gen: Don't run any git commands
-when the version comes from .tarball-version.  Prior to this,
-we would run git update-index --refresh even from a just-unpacked
-tarball directory, and that could affect a .git/ directory in a
-parent of the build directory.  Reported by Mike Frysinger.
-
-diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
-index 68c7d64..686f703 100755
---- a/build-aux/git-version-gen
-+++ b/build-aux/git-version-gen
-@@ -124,13 +124,16 @@
-     # Change the first '-' to a '.', so version-comparing tools work properly.
-     # Remove the "g" in git describe's output string, to save a byte.
-     v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
-+    v_from_git=1
- else
-     v=UNKNOWN
-+    v_from_git=
- fi
- 
- v=`echo "$v" |sed 's/^v//'`
- 
- # Don't declare a version "dirty" merely because a time stamp has changed.
-+if test -n "$v_from_git"; then
- git update-index --refresh > /dev/null 2>&1
- 
- dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
-@@ -142,6 +145,7 @@
- 	  *) v="$v-dirty" ;;
- 	esac ;;
- esac
-+fi
- 
- # Omit the trailing newline, so that m4_esyscmd can use the result directly.
- echo "$v" | tr -d "$nl"
diff --git a/sys-devel/m4/files/m4-1.4.15-uclibc-sched_param-def.patch b/sys-devel/m4/files/m4-1.4.15-uclibc-sched_param-def.patch
deleted file mode 100644
index 50652d8babc2..000000000000
--- a/sys-devel/m4/files/m4-1.4.15-uclibc-sched_param-def.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
-and is not needed too per standard. gnulib attempts to use it but we have to account
-for it because in this case uclibc does not behave like glibc.
-
--Khem
-
-http://bugs.gentoo.org/336484
-
---- m4-1.4.14/lib/spawn.in.h
-+++ m4-1.4.14/lib/spawn.in.h
-@@ -31,7 +31,7 @@
- 
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
-    But avoid namespace pollution on glibc systems.  */
--#ifndef __GLIBC__
-+#if !defined __GLIBC__ || defined __UCLIBC__
- # include <sched.h>
- # include <signal.h>
- #endif
diff --git a/sys-devel/m4/m4-1.4.15.ebuild b/sys-devel/m4/m4-1.4.15.ebuild
deleted file mode 100644
index 9d3f02192f23..000000000000
--- a/sys-devel/m4/m4-1.4.15.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.15.ebuild,v 1.11 2011/02/22 02:48:32 vapier Exp $
-
-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="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="examples"
-
-# remember: cannot dep on autoconf since it needs us
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-uclibc-sched_param-def.patch #336484
-	epatch "${FILESDIR}"/${P}-git-version-gen.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
-	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
-}