3 files changed, 6 insertions, 144 deletions
diff --git a/dev-embedded/srecord/ChangeLog b/dev-embedded/srecord/ChangeLog
index d0920b6f7f0c..c775cfdb9dc1 100644
--- a/dev-embedded/srecord/ChangeLog
+++ b/dev-embedded/srecord/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/srecord
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/srecord/ChangeLog,v 1.11 2011/12/23 02:58:25 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/srecord/ChangeLog,v 1.12 2012/01/16 04:49:40 radhermit Exp $
+
+  16 Jan 2012; Tim Harder <radhermit@gentoo.org> -srecord-1.42.ebuild,
+  -files/srecord-1.42-gcc44.patch:
+  Remove old.
 
 *srecord-1.58 (23 Dec 2011)
 
diff --git a/dev-embedded/srecord/files/srecord-1.42-gcc44.patch b/dev-embedded/srecord/files/srecord-1.42-gcc44.patch
deleted file mode 100644
index 392037dc4209..000000000000
--- a/dev-embedded/srecord/files/srecord-1.42-gcc44.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ur srecord-1.42.orig/lib/arglex.cc srecord-1.42/lib/arglex.cc
---- srecord-1.42.orig/lib/arglex.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/arglex.cc	2009-07-25 21:58:48.000000000 +0300
-@@ -16,6 +16,7 @@
- // along with this program. If not, see <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- #include <cctype>
- #include <cstring>
- #include <cstdlib>
-diff -ur srecord-1.42.orig/lib/interval.cc srecord-1.42/lib/interval.cc
---- srecord-1.42.orig/lib/interval.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/interval.cc	2009-07-25 22:01:00.000000000 +0300
-@@ -18,6 +18,8 @@
- //
- 
- 
-+#include <cstdio>
-+
- #include <lib/interval.h>
- #include <iostream>
- using namespace std;
-diff -ur srecord-1.42.orig/lib/quit/normal.cc srecord-1.42/lib/quit/normal.cc
---- srecord-1.42.orig/lib/quit/normal.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/quit/normal.cc	2009-07-25 22:01:57.000000000 +0300
-@@ -17,6 +17,7 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- #include <cstdarg>
- #include <cstdlib>
- #include <cstring>
-diff -ur srecord-1.42.orig/lib/srec/input/file.cc srecord-1.42/lib/srec/input/file.cc
---- srecord-1.42.orig/lib/srec/input/file.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/srec/input/file.cc	2009-07-25 22:03:08.000000000 +0300
-@@ -17,6 +17,7 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- 
- #include <errno.h>
- #include <iostream>
-diff -ur srecord-1.42.orig/lib/srec/input/generator/constant.cc srecord-1.42/lib/srec/input/generator/constant.cc
---- srecord-1.42.orig/lib/srec/input/generator/constant.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/srec/input/generator/constant.cc	2009-07-25 22:04:11.000000000 +0300
-@@ -17,6 +17,8 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
-+
- #include <lib/srec/input/generator/constant.h>
- 
- 
-diff -ur srecord-1.42.orig/lib/srec/output/file/asm.cc srecord-1.42/lib/srec/output/file/asm.cc
---- srecord-1.42.orig/lib/srec/output/file/asm.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/srec/output/file/asm.cc	2009-07-25 22:08:49.000000000 +0300
-@@ -17,6 +17,7 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- #include <cstring>
- 
- #include <lib/interval.h>
-diff -ur srecord-1.42.orig/lib/srec/output/file/basic.cc srecord-1.42/lib/srec/output/file/basic.cc
---- srecord-1.42.orig/lib/srec/output/file/basic.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/srec/output/file/basic.cc	2009-07-25 22:14:36.000000000 +0300
-@@ -17,6 +17,7 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- #include <cstring>
- 
- #include <lib/interval.h>
-diff -ur srecord-1.42.orig/lib/srec/output/file.cc srecord-1.42/lib/srec/output/file.cc
---- srecord-1.42.orig/lib/srec/output/file.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/srec/output/file.cc	2009-07-25 22:07:17.000000000 +0300
-@@ -17,6 +17,7 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- 
- #include <errno.h>
- #include <iostream>
-diff -ur srecord-1.42.orig/lib/srec/output.cc srecord-1.42/lib/srec/output.cc
---- srecord-1.42.orig/lib/srec/output.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/srec/output.cc	2009-07-25 22:05:56.000000000 +0300
-@@ -17,6 +17,7 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- #include <cerrno>
- #include <cstring>
- 
diff --git a/dev-embedded/srecord/srecord-1.42.ebuild b/dev-embedded/srecord/srecord-1.42.ebuild
deleted file mode 100644
index a86ab49c86d4..000000000000
--- a/dev-embedded/srecord/srecord-1.42.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/srecord/srecord-1.42.ebuild,v 1.2 2009/07/25 19:21:34 ssuominen Exp $
-
-inherit eutils
-
-DESCRIPTION="A collection of powerful tools for manipulating EPROM load files."
-HOMEPAGE="http://srecord.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="test"
-
-DEPEND="dev-libs/boost
-	test? ( app-arch/sharutils )"
-RDEPEND=""
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	sed -i \
-		-e 's/(SOELIM) -I. -Ietc man\/man1/(SOELIM) -I. -Ietc -Iman\/man1 man\/man1/' \
-		-e 's/(SOELIM) -I. -Ietc man\/man5/(SOELIM) -I. -Ietc -Iman\/man5 man\/man5/' \
-		-e '/\$(mandir)\/man1\/srec_license.1 \\/d' \
-		"${S}"/Makefile.in || die "Patching failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	dodoc "${S}"/README
-	insinto /usr/share/doc/${PF}
-	doins "${S}"/etc/reference.ps
-}
-
-src_test() {
-	make sure || die "Tests failed"
-}