Remove old.

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

6 files changed, 7 insertions, 290 deletions

diff --git a/app-text/csvfix/ChangeLog b/app-text/csvfix/ChangeLog
index b5e799e95ded..ead5b9bd7418 100644
--- a/app-text/csvfix/ChangeLog
+++ b/app-text/csvfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/csvfix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/csvfix/ChangeLog,v 1.6 2012/05/31 18:25:41 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/csvfix/ChangeLog,v 1.7 2012/05/31 18:27:12 radhermit Exp $
+
+  31 May 2012; Tim Harder <radhermit@gentoo.org>
+  -files/csvfix-1.00c-make.patch, -csvfix-1.10a.ebuild,
+  -files/csvfix-1.10a-escape-exec.patch, -csvfix-1.20.ebuild,
+  -files/csvfix-1.20-make.patch:
+  Remove old.
 
 *csvfix-1.3 (31 May 2012)
 
diff --git a/app-text/csvfix/csvfix-1.10a.ebuild b/app-text/csvfix/csvfix-1.10a.ebuild
deleted file mode 100644
index f297a508915e..000000000000
--- a/app-text/csvfix/csvfix-1.10a.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/csvfix/csvfix-1.10a.ebuild,v 1.1 2011/08/07 18:53:36 radhermit Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs versionator
-
-MY_PV="$(delete_all_version_separators)"
-MY_P="${PN}_src_${MY_PV}"
-DESCRIPTION="A stream editor for manipulating CSV files"
-HOMEPAGE="http://code.google.com/p/csvfix/"
-SRC_URI="http://csvfix.googlecode.com/files/${MY_P}.zip
-	doc? ( http://csvfix.googlecode.com/files/${PN}_man_html_${MY_PV/a/}.zip )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${PN}-build
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.00c-make.patch \
-		"${FILESDIR}"/${P}-tests.patch \
-		"${FILESDIR}"/${P}-escape-exec.patch
-
-	edos2unix $(find csvfix/tests -type f)
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX)" AR="$(tc-getAR)" lin
-}
-
-src_test() {
-	cd ${PN}/tests
-	chmod +x run1 runtests
-	./runtests || die "tests failed"
-}
-
-src_install() {
-	dobin csvfix/bin/csvfix
-	use doc && dohtml -r "${WORKDIR}"/CSVfix-HTML/*
-}
diff --git a/app-text/csvfix/csvfix-1.20.ebuild b/app-text/csvfix/csvfix-1.20.ebuild
deleted file mode 100644
index 5cf1034c6ea8..000000000000
--- a/app-text/csvfix/csvfix-1.20.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/csvfix/csvfix-1.20.ebuild,v 1.1 2011/12/14 03:56:06 radhermit Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs versionator
-
-MY_PV="$(delete_all_version_separators)"
-DESCRIPTION="A stream editor for manipulating CSV files"
-HOMEPAGE="http://code.google.com/p/csvfix/"
-SRC_URI="http://csvfix.googlecode.com/files/${PN}_src_${MY_PV}.zip
-	doc? ( http://csvfix.googlecode.com/files/${PN}_man_html_${MY_PV}.zip )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}-build"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
-	epatch "${FILESDIR}"/${PN}-1.10a-tests.patch
-
-	edos2unix $(find csvfix/tests -type f)
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX)" AR="$(tc-getAR)" lin
-}
-
-src_test() {
-	cd ${PN}/tests
-	chmod +x run1 runtests
-	./runtests || die "tests failed"
-}
-
-src_install() {
-	dobin csvfix/bin/csvfix
-	use doc && dohtml -r "${WORKDIR}"/${PN}${MY_PV}-html/*
-}
diff --git a/app-text/csvfix/files/csvfix-1.00c-make.patch b/app-text/csvfix/files/csvfix-1.00c-make.patch
deleted file mode 100644
index 37c768f4b536..000000000000
--- a/app-text/csvfix/files/csvfix-1.00c-make.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- csvfix-build.orig/alib/Makefile
-+++ csvfix-build/alib/Makefile
-@@ -5,9 +5,8 @@
- CC = g++

- IDIR = inc

- ODIR = obj

--XDIR = expat

- SDIR = src

--INC = -Iinc -Iexpat

-+INC = -Iinc

- 

- _OBJS = a_chsrc.o a_csv.o a_enc.o a_env.o a_except.o \

- 		a_expr.o a_myth.o a_inifile.o  a_exec.o \

-@@ -21,9 +20,6 @@
- _WINOBJS = a_db.o a_dir.o a_opsys.o a_winerr.o

- WINOBJS = $(patsubst %,$(ODIR)/%,$(_WINOBJS))

- 

--_EXPAT = xmlparse.o  xmlrole.o  xmltok.o  xmltok_impl.o  xmltok_ns.o

--EXPAT = $(patsubst %,$(ODIR)/%,$(_EXPAT))

--

- $(ODIR)/%.o: $(SDIR)/%.cpp $(IDIR)/%.h 

- 	$(CC) -c $(INC) $(CFLAGS) -o $@ $< 

- 

-@@ -31,10 +27,10 @@
- 	$(CC) -c $(INC) $(CFLAGS) -o $@ $< 

- 

- win: $(OBJS) $(EXPAT) $(WINOBJS)

--	ar rvs $(OUT) $^

-+	$(AR) rvs $(OUT) $^

- 

--lin: $(OBJS) $(EXPAT) 

--	ar rvs $(OUT) $^

-+lin: $(OBJS)

-+	$(AR) rvs $(OUT) $^

- 

- .PHONY: clean

- 

---- csvfix-build.orig/csvfix/Makefile
-+++ csvfix-build/csvfix/Makefile
-@@ -17,7 +17,7 @@
- INC = -Iinc -I../alib/inc

- 

- WINLIBS = ../alib/lib/alib.a -lodbc32 

--LINLIBS = ../alib/lib/alib.a 

-+LINLIBS = ../alib/lib/alib.a -lexpat

- 

- _OBJS = csved_atable.o \

- 		csved_case.o \

-@@ -81,16 +81,15 @@
- 	strip $(WINOUT)

- 

- $(LINOUT): $(OBJS) 

--	$(CC) -o $@ $^ $(LINLIBS)

--	strip $(LINOUT)

-+	$(CC) $(LDFLAGS) -o $@ $^ $(LINLIBS)

- 

- .PHONY: win

- win:

--	make $(WINOUT)

-+	$(MAKE) $(WINOUT)

- 

- .PHONY: lin

- lin:

--	make $(LINOUT)

-+	$(MAKE) $(LINOUT)

- 

- .PHONY: clean

- clean:

---- csvfix-build.orig/Makefile
-+++ csvfix-build/Makefile
-@@ -3,14 +3,14 @@
- 

- win:

- 	mkdir -p alib/{obj,lib} csvfix/{obj,bin}

--	cd alib; make win

--	cd csvfix; make win

-+	cd alib; $(MAKE) win

-+	cd csvfix; $(MAKE) win

- 

- lin:

- 	mkdir -p alib/{obj,lib} csvfix/{obj,bin}

--	cd alib; make lin

--	cd csvfix; make lin

-+	cd alib; $(MAKE) lin

-+	cd csvfix; $(MAKE) lin

- 

- clean:

--	cd alib; make clean

--	cd csvfix; make clean

-+	cd alib; $(MAKE) clean

-+	cd csvfix; $(MAKE) clean

diff --git a/app-text/csvfix/files/csvfix-1.10a-escape-exec.patch b/app-text/csvfix/files/csvfix-1.10a-escape-exec.patch
deleted file mode 100644
index fe349f139086..000000000000
--- a/app-text/csvfix/files/csvfix-1.10a-escape-exec.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- csvfix-build/csvfix/src/csved_exec.cpp.orig
-+++ csvfix-build/csvfix/src/csved_exec.cpp
-@@ -144,7 +144,9 @@
- 		if ( n < 0 || n > MAX_PARAM ) {

- 			CSVTHROW( "Invalid parameter: %" << p );

- 		}

--		return (unsigned int) n < row.size() ? row[n] : "";

-+		return (unsigned int) n < row.size()

-+			? ALib::Escape( row[n], "\\'\"", "\\" )

-+			: "";

- 	}

- 	else {

- 		ATHROW( "Invalid parameter" );

diff --git a/app-text/csvfix/files/csvfix-1.20-make.patch b/app-text/csvfix/files/csvfix-1.20-make.patch
deleted file mode 100644
index 7610bf8919fd..000000000000
--- a/app-text/csvfix/files/csvfix-1.20-make.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- csvfix-build.orig/alib/Makefile
-+++ csvfix-build/alib/Makefile
-@@ -5,9 +5,8 @@
- CC = g++

- IDIR = inc

- ODIR = obj

--XDIR = expat

- SDIR = src

--INC = -Iinc -Iexpat

-+INC = -Iinc

- 

- _OBJS = a_chsrc.o a_csv.o a_enc.o a_env.o a_except.o \

- 		a_expr.o a_myth.o a_inifile.o  a_exec.o \

-@@ -21,9 +20,6 @@
- _WINOBJS = a_db.o a_dir.o a_opsys.o a_winerr.o

- WINOBJS = $(patsubst %,$(ODIR)/%,$(_WINOBJS))

- 

--_EXPAT = xmlparse.o  xmlrole.o  xmltok.o  xmltok_impl.o  xmltok_ns.o

--EXPAT = $(patsubst %,$(ODIR)/%,$(_EXPAT))

--

- $(ODIR)/%.o: $(SDIR)/%.cpp $(IDIR)/%.h 

- 	$(CC) -c $(INC) $(CFLAGS) -o $@ $< 

- 

-@@ -31,10 +27,10 @@
- 	$(CC) -c $(INC) $(CFLAGS) -o $@ $< 

- 

- win: $(OBJS) $(EXPAT) $(WINOBJS)

--	ar rvs $(OUT) $^

-+	$(AR) rvs $(OUT) $^

- 

--lin: $(OBJS) $(EXPAT) 

--	ar rvs $(OUT) $^

-+lin: $(OBJS)

-+	$(AR) rvs $(OUT) $^

- 

- .PHONY: clean

- 

---- csvfix-build.orig/csvfix/Makefile
-+++ csvfix-build/csvfix/Makefile
-@@ -17,7 +17,7 @@
- INC = -Iinc -I../alib/inc

- 

- WINLIBS = ../alib/lib/alib.a -lodbc32 

--LINLIBS = ../alib/lib/alib.a 

-+LINLIBS = ../alib/lib/alib.a -lexpat

- 

- _OBJS = csved_atable.o \

- 		csved_case.o \

-@@ -86,16 +86,15 @@
- 	strip $(WINOUT)

- 

- $(LINOUT): $(OBJS) 

--	$(CC) -o $@ $^ $(LINLIBS)

--	strip $(LINOUT)

-+	$(CC) $(LDFLAGS) -o $@ $^ $(LINLIBS)

- 

- .PHONY: win

- win:

--	make $(WINOUT)

-+	$(MAKE) $(WINOUT)

- 

- .PHONY: lin

- lin:

--	make $(LINOUT)

-+	$(MAKE) $(LINOUT)

- 

- .PHONY: clean

- clean:

---- csvfix-build.orig/Makefile
-+++ csvfix-build/Makefile
-@@ -3,14 +3,14 @@
- 

- win:

- 	mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin

--	cd alib; make win

--	cd csvfix; make win

-+	cd alib; $(MAKE) win

-+	cd csvfix; $(MAKE) win

- 

- lin:

- 	mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin

--	cd alib; make lin

--	cd csvfix; make lin

-+	cd alib; $(MAKE) lin

-+	cd csvfix; $(MAKE) lin

- 

- clean:

--	cd alib; make clean

--	cd csvfix; make clean

-+	cd alib; $(MAKE) clean

-+	cd csvfix; $(MAKE) clean