4 files changed, 126 insertions, 7 deletions
diff --git a/app-text/csvfix/ChangeLog b/app-text/csvfix/ChangeLog
index 6356cd602dc3..b5e799e95ded 100644
--- a/app-text/csvfix/ChangeLog
+++ b/app-text/csvfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/csvfix
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/csvfix/ChangeLog,v 1.5 2011/12/14 03:56:06 radhermit Exp $
+# 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 $
+
+*csvfix-1.3 (31 May 2012)
+
+  31 May 2012; Tim Harder <radhermit@gentoo.org> +csvfix-1.3.ebuild,
+  +files/csvfix-1.3-make.patch:
+  Version bump.
 
 *csvfix-1.20 (14 Dec 2011)
 
diff --git a/app-text/csvfix/Manifest b/app-text/csvfix/Manifest
index c85bc8bd04b2..e5bd11c11f55 100644
--- a/app-text/csvfix/Manifest
+++ b/app-text/csvfix/Manifest
@@ -5,18 +5,26 @@ AUX csvfix-1.00c-make.patch 1930 RMD160 363ac4a05a0d6818beaa902a3907125369f8c44a
 AUX csvfix-1.10a-escape-exec.patch 402 RMD160 b0dc85ff94aeb96c9820141d782fb7f6508bb47e SHA1 369ef7007de843dc06890395ed572917e8993f5d SHA256 8d7621019cc7bf934a91a3bcb956bc0e2b8e6fc1ce29f4dd91ca6454769abcdc
 AUX csvfix-1.10a-tests.patch 1004 RMD160 89bbb0648c4d09d2c16b06aff4a8c103585c46ed SHA1 05ce762b288f6939399e65c4f210076610ddecf0 SHA256 1cd14d0b00845b739e2ed79a4efd76ba62976eb448786e9704e645a559914e85
 AUX csvfix-1.20-make.patch 1946 RMD160 1d542ebba45be11db4091af9e462edc1d56cf129 SHA1 720798a6336201a41780ab4de1a78708a8d338d4 SHA256 a76f4da5204d6f3dece70619d624655995d8d2830d0edefb16118d2ef5bad3c2
+AUX csvfix-1.3-make.patch 1368 RMD160 c36e355d86fd100e7ff43b4ae0da1cbd45431553 SHA1 fea21526ab6c3bf02aef882db844ebdbca1dbd9e SHA256 a6fec8348a42e553ccaf979685baeed11caaf188377a128c1db30a40652bde05
+DIST CSVfix_man_html_130.zip 379022 RMD160 fb664a60225abdbefa2be2dd77d3d280ea1911e3 SHA1 72345aea9325b89722149795b91d3b7ee5d8f916 SHA256 a71553bc6c9ff407af203c35a7340851b11133bbfc55398e4a0f2c926a333e1c
+DIST csvfix-1.3.tar.bz2 284900 RMD160 2c292bf21dd959536dc2be21817683caeaaa8f8f SHA1 a004a0f91fe25114dfaade06e23fd623cf3d3864 SHA256 0f00b8aa9ccd7e297b4381c5ca4b129d9df9b7f02166846e98b4ddd7f0d0c99d
 DIST csvfix_man_html_110.zip 592910 RMD160 fc88d779ae4111fce1582a03ae87bf34e807aeb8 SHA1 6ce67c8e126b2463deea3b88e1edcdd5edf71885 SHA256 e50e9b319f6937c33a1bf70b80ad662f3a6a2410af4d9683ab594bf78346075f
 DIST csvfix_man_html_120.zip 245034 RMD160 dd173e6b4d272a053294bc9ec1f00090d607d72e SHA1 fd272fe0dc89ff9809d2db514b897470b06a7b5b SHA256 b01deea380609881d35741f22ea9cfd4ff24ccf447b61bcb320ba674e493b0c8
 DIST csvfix_src_110a.zip 376793 RMD160 6203d95efac9e758fed61bb1b8f0e31ebd77ca62 SHA1 d579c6223a9570e207b9e9b9eccb7f621916e673 SHA256 86f832317ffbc19256421f9f2df6feb76e500667f5b921d5caa97f8ce6e19507
 DIST csvfix_src_120.zip 387151 RMD160 ffd51bc8a07e0b8e458daca8b9008829b57e3199 SHA1 ec0b6d491429d908a9208d6e474591f30dec654c SHA256 9baae9b9e2bbdc2357eee466e6cca0a176d206716df9cda3a8bbbf8e9ff66e81
 EBUILD csvfix-1.10a.ebuild 1149 RMD160 64311f0a7e661f21cf676164d7bcdf14f9c7ebe2 SHA1 e4a078a1108dfdf6c4e88116a5963ee450e6b7a1 SHA256 a519e1fc56bdad890d13193ff3858f22cdfef62f55b435827a7e01f5975c01b5
 EBUILD csvfix-1.20.ebuild 1104 RMD160 ab22d4377007f6c8e5bff164b2f204ce844fa6ad SHA1 d5c177f2339a30f684cb92bc1be809497332180a SHA256 711cb830ea280886cffef9d01f766778ca3fce74572748ab4436aa6efafdc477
-MISC ChangeLog 996 RMD160 3ddc39c0d2254341de2049d3d5da65fd29dfd9db SHA1 1ea5c03c7855ab859e661cd7e9646220de0d063e SHA256 d38f10bf1de328dab51e2c81286f70ebd9a4c50c9878497eb7184eec50edfcb3
+EBUILD csvfix-1.3.ebuild 1074 RMD160 7b286edc8e37da8b1ddbbf1ab847348d1a10595a SHA1 764d8fbf5e1011d80ecdaacfe9cf0fdb0b0a3d0c SHA256 0e68abe189ef6833854fccd4a38ab4e2fbaf446da0787ac14dc9e1ac6f584d44
+MISC ChangeLog 1141 RMD160 97783ac11a82d772d3cdddad9cbc22a22e85c62e SHA1 68e5ecce9ccc87d01483270db2a83bcb505337be SHA256 8e2944bff19ca15add5e22f40e499c387c40335450251b5e2169d0f285c538c0
 MISC metadata.xml 308 RMD160 fe47571cce89a9938f093ed3d79d64b1fdee76bc SHA1 009a3bcb22fba4e15c982bf1c9b2f9ccbbfc0829 SHA256 cf206f22ea0f58a29005011bbf5273547369cfd18ebacf3f7e2d627eb697cb4d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk93QooACgkQuUQtlDBCeQKQZgCfeP6OX7z3SLdaqCPX7V50z/TU
-YqEAn2fiml2OmuH0yOyyX1cEIs1DKYT7
-=jw6A
+iQEcBAEBCgAGBQJPx7erAAoJEEqz6FtPBkyj+GMH/2ebbc7MPt2g9hWNaSa5CnF7
+hobEmi+bKhYsfIYMY5uP7PZsN71dIfRJt0IYHBSeh/7rgnWXYYue82tth6E/KoEX
+VcbVVeFvB/ezqJO5FgzVlNhR3y27Fym1bNskZEcLlJ24C9/8R0B7nb9LiXb3JO+t
+N/Pf021lji7fp5L1G7LuOINMYswqyQtmOOdmfwU7K4Su7Z+8exWTc23rOXZ/trrr
+XSqWu1fckbwYNieN/HSb5PLZuV5I58dTZqiphb7eAoTCEmKqgcxqWvof5+ajP49n
+jjj6CYp/BOklnteaXFfG8IT5gIB6PfV71z6d2fplt1ZRE9gV2ikFeyCjkHcluEI=
+=oyfO
 -----END PGP SIGNATURE-----
diff --git a/app-text/csvfix/csvfix-1.3.ebuild b/app-text/csvfix/csvfix-1.3.ebuild
new file mode 100644
index 000000000000..49c46e49afc5
--- /dev/null
+++ b/app-text/csvfix/csvfix-1.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/csvfix/csvfix-1.3.ebuild,v 1.1 2012/05/31 18:25:41 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://dev.gentoo.org/~radhermit/dist/${P}.tar.bz2
+	doc? ( http://csvfix.googlecode.com/files/CSVfix_man_html_${MY_PV}0.zip )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/expat"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )"
+
+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}/*
+}
diff --git a/app-text/csvfix/files/csvfix-1.3-make.patch b/app-text/csvfix/files/csvfix-1.3-make.patch
new file mode 100644
index 000000000000..33ea0732107d
--- /dev/null
+++ b/app-text/csvfix/files/csvfix-1.3-make.patch
@@ -0,0 +1,61 @@
+--- csvfix-1.3/alib/Makefile
++++ csvfix-1.3/alib/Makefile
+@@ -2,12 +2,12 @@
+ # Copyright (C) 2009 Neil Butterworth
+ 
+ OUT = lib/alib.a
++AR = ar
+ 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 +21,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 +28,10 @@
+ 	$(CC) -c $(INC) $(CFLAGS) -o $@ $< 
+ 
+ win: $(OBJS) $(EXPAT) $(WINOBJS)
+-	ar rvs $(OUT) $^
++	$(AR) rvs $(OUT) $^
+ 
+ lin: $(OBJS) $(EXPAT) 
+-	ar rvs $(OUT) $^
++	$(AR) rvs $(OUT) $^
+ 
+ .PHONY: clean
+ clean:
+--- csvfix-1.3/csvfix/Makefile
++++ csvfix-1.3/csvfix/Makefile
+@@ -18,7 +18,7 @@
+ 
+ ALIB = ../alib/lib/alib.a
+ WINLIBS = ../alib/lib/alib.a -lodbc32 
+-LINLIBS = ../alib/lib/alib.a 
++LINLIBS = ../alib/lib/alib.a -lexpat
+ 
+ _OBJS = csved_atable.o \
+ 		csved_block.o \
+@@ -89,8 +89,7 @@
+ 	strip $(WINOUT)
+ 
+ $(LINOUT): $(OBJS) $(ALIB)
+-	$(CC) -o $@ $^ $(LINLIBS)
+-	strip $(LINOUT)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LINLIBS)
+ 
+ .PHONY: win
+ win: