Version bump.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 157 insertions, 8 deletions

diff --git a/app-text/csvfix/ChangeLog b/app-text/csvfix/ChangeLog
index 43d384b567ad..6356cd602dc3 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.4 2011/09/11 23:53:41 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/csvfix/ChangeLog,v 1.5 2011/12/14 03:56:06 radhermit Exp $
+
+*csvfix-1.20 (14 Dec 2011)
+
+  14 Dec 2011; Tim Harder <radhermit@gentoo.org> +csvfix-1.20.ebuild,
+  +files/csvfix-1.20-make.patch:
+  Version bump.
 
   11 Sep 2011; Tim Harder <radhermit@gentoo.org> -csvfix-1.00c.ebuild,
   -files/csvfix-1.00c-tests.patch:
diff --git a/app-text/csvfix/Manifest b/app-text/csvfix/Manifest
index 4c9ec63a3ccb..1b49d2ea0bf8 100644
--- a/app-text/csvfix/Manifest
+++ b/app-text/csvfix/Manifest
@@ -1,20 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX csvfix-1.00c-make.patch 1930 RMD160 363ac4a05a0d6818beaa902a3907125369f8c44a SHA1 59d4d08238aed823bd862dab7e20307fb2f8aa5a SHA256 17cde64bbe31ae59446c63d7672f19e3287e57fd7b941ad09757d68e29010256
 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
 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
-MISC ChangeLog 848 RMD160 8082e8a0107e240920f0244a08acbfcb15d0b11e SHA1 52f0440ce76fc68026ecd78f584b7c64ed43b1c6 SHA256 b401d83fdf15b87b6521d08c3a301cbbccb8d6e0b4a1ea076a507a8f89ed445b
+EBUILD csvfix-1.20.ebuild 1104 RMD160 ab22d4377007f6c8e5bff164b2f204ce844fa6ad SHA1 d5c177f2339a30f684cb92bc1be809497332180a SHA256 711cb830ea280886cffef9d01f766778ca3fce74572748ab4436aa6efafdc477
+MISC ChangeLog 996 RMD160 3ddc39c0d2254341de2049d3d5da65fd29dfd9db SHA1 1ea5c03c7855ab859e661cd7e9646220de0d063e SHA256 d38f10bf1de328dab51e2c81286f70ebd9a4c50c9878497eb7184eec50edfcb3
 MISC metadata.xml 232 RMD160 9725fc18735b1d8d4079f25759ee0823a0c6795d SHA1 ec75efe30e67f74a4f315324afc75ed2a8d30bb4 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk5/GKgACgkQfXuS5UK5QB0ySQP+Nzfky14SrC2i19sZvnKy7T54
-JgIO03v2A44msK5MFMey1X9cb1P7NwfmWnVAA1toVG1xa7Hz8vtY+rQColp7ePqY
-DM+SdLpvNUympyJitc0Zky9OQSNMgliFTWYP1xwjYQj+E/K/mcJGH45+tEG1mHJl
-3qExtY+u7vh/slCe/0w=
-=8S5s
+iQEcBAEBCgAGBQJO6B5cAAoJEEqz6FtPBkyjxtgIAIIUUzUNqsyKQHF6bDXfnrlE
+oJp1UtBVPNRqd6fGoysLiWF9mJRg25aWdRYgVX3aJMSwBn3K+4GfqlDw3vxoHET1
+gFyvfQh+aeuepTTub7JG8XDb4QoaOTUqvnypwoVG71ErME0MuCVD75+dbxrQyXV7
+g7h68C/d+gT4zUk2DGnSYCgylLX5Cbqyiap0xhLLNwraxPtQjXywNyZfa3vgWZ+c
+qXRWBjb9hFwBnK98sKBUE+Q+38QWdBtbBGdrPDAKjS9nYZFO5rgofSOn2fsYhuJn
+R/aWEEi66Z16Rp03fLkF+OAkrhAyiGMJgbdZlmpFVGNcA1KfNspkfvMXBfdFBhY=
+=P8lu
 -----END PGP SIGNATURE-----
diff --git a/app-text/csvfix/csvfix-1.20.ebuild b/app-text/csvfix/csvfix-1.20.ebuild
new file mode 100644
index 000000000000..5cf1034c6ea8
--- /dev/null
+++ b/app-text/csvfix/csvfix-1.20.ebuild
@@ -0,0 +1,46 @@
+# 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.20-make.patch b/app-text/csvfix/files/csvfix-1.20-make.patch
new file mode 100644
index 000000000000..7610bf8919fd
--- /dev/null
+++ b/app-text/csvfix/files/csvfix-1.20-make.patch
@@ -0,0 +1,91 @@
+--- 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