projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: deecf71)
Version bump
authorTim Harder <radhermit@gentoo.org>
Sun, 7 Aug 2011 18:53:36 +0000 (18:53 +0000)
committerTim Harder <radhermit@gentoo.org>
Sun, 7 Aug 2011 18:53:36 +0000 (18:53 +0000)
Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

app-text/csvfix/ChangeLog patch | blob | history
app-text/csvfix/Manifest patch | blob | history
app-text/csvfix/csvfix-1.10a.ebuild [new file with mode: 0644] patch | blob
app-text/csvfix/files/csvfix-1.10a-escape-exec.patch [new file with mode: 0644] patch | blob
app-text/csvfix/files/csvfix-1.10a-tests.patch [new file with mode: 0644] patch | blob

diff --git a/app-text/csvfix/ChangeLog b/app-text/csvfix/ChangeLog
index 951a2ce8bb6c9efe3932714bf76e3644590e0e94..1072024e8a786ca85adfec5980dbe0cedb5cb01c 100644 (file)
--- 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.2 2011/06/07 09:27:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/csvfix/ChangeLog,v 1.3 2011/08/07 18:53:36 radhermit Exp $
+
+*csvfix-1.10a (07 Aug 2011)
+
+  07 Aug 2011; Tim Harder <radhermit@gentoo.org> +csvfix-1.10a.ebuild,
+  +files/csvfix-1.10a-escape-exec.patch, +files/csvfix-1.10a-tests.patch:
+  Version bump
 
   07 Jun 2011; Tim Harder <radhermit@gentoo.org> files/csvfix-1.00c-make.patch:
   Respect LDFLAGS (bug #370423).
diff --git a/app-text/csvfix/Manifest b/app-text/csvfix/Manifest
index 609f5128eb7c5c9cb580152623b19f8afb798864..005b813a2a3c660a2b2c2728e59b1d6adb15682d 100644 (file)
--- a/app-text/csvfix/Manifest
+++ b/app-text/csvfix/Manifest
@@ -1,21 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX csvfix-1.00c-make.patch 1930 RMD160 363ac4a05a0d6818beaa902a3907125369f8c44a SHA1 59d4d08238aed823bd862dab7e20307fb2f8aa5a SHA256 17cde64bbe31ae59446c63d7672f19e3287e57fd7b941ad09757d68e29010256
 AUX csvfix-1.00c-tests.patch 1168 RMD160 e3c6db613bb9e299f0ebb6af6d5b40666580bcf8 SHA1 7b8590836510d5268ad0f29d0c450d33eb22bdb6 SHA256 b9bfb7c693e1cf2368c774c68b4e3910170ff0ce17bbbd50c42d728fad9c905c
+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
 DIST csvfix_man_html_100.zip 136082 RMD160 21733e776b8b5d532ca529b84009b0298fc6373c SHA1 52ccf40ed9266c010da4118495caddc3dc6e3be3 SHA256 9a0eb5ca4b75e08514404618f435c5a9692570398f28f26920536a15065357e6
+DIST csvfix_man_html_110.zip 592910 RMD160 fc88d779ae4111fce1582a03ae87bf34e807aeb8 SHA1 6ce67c8e126b2463deea3b88e1edcdd5edf71885 SHA256 e50e9b319f6937c33a1bf70b80ad662f3a6a2410af4d9683ab594bf78346075f
 DIST csvfix_src_100c.zip 367572 RMD160 3e67b12acd11c2ddf3881087e04a3ea7d460b288 SHA1 db579e8966e3d9250c269e2a727e59cecf7400ef SHA256 ce4303143b8e71bb08b5991c9ef716584b8c761d1ef3b0490ec7a8b29234256b
+DIST csvfix_src_110a.zip 376793 RMD160 6203d95efac9e758fed61bb1b8f0e31ebd77ca62 SHA1 d579c6223a9570e207b9e9b9eccb7f621916e673 SHA256 86f832317ffbc19256421f9f2df6feb76e500667f5b921d5caa97f8ce6e19507
 EBUILD csvfix-1.00c.ebuild 1116 RMD160 ddf5f9bb505fe59c6792b51c20cfc533dd77e9ff SHA1 f6e9e23e925315f54330d8a69a8cb2b76cf27745 SHA256 f5231084502680577cebe26cc8bcccdd2ab741188435d8229cee90de3f30599d
-MISC ChangeLog 537 RMD160 c93b9f03d32ae1c6b5015aeb695589ecdd5bf36b SHA1 e0145ede94a3103f9907d0fff7002d547d55ad73 SHA256 11f014940a4fe4bd0770354bfea74e4c0857c1ada1d26dcfde73774095b5cd2b
+EBUILD csvfix-1.10a.ebuild 1149 RMD160 64311f0a7e661f21cf676164d7bcdf14f9c7ebe2 SHA1 e4a078a1108dfdf6c4e88116a5963ee450e6b7a1 SHA256 a519e1fc56bdad890d13193ff3858f22cdfef62f55b435827a7e01f5975c01b5
+MISC ChangeLog 727 RMD160 7903bbb45c3ba0a4294f06a3e6a4c4f79d81256f SHA1 30cc22ee34ed605880df7671e8841ece3a40e252 SHA256 58a7c73956b77a9cff11cf8492d1c2b94384d4b455220cd45306cd087fa6b096
 MISC metadata.xml 254 RMD160 161337e6910a0fd0b752294ab4aa7640c7c2aad6 SHA1 e1d817485dd8943fcb7bfefec4ccff1d56e5b2f7 SHA256 27ec031bea6f122f30a7a6ce887a0174396b7aa96aa28472472ac67b2b24078b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN7e7+AAoJEEqz6FtPBkyjXvoH/0ITJayFI/7SMOfCrE2+8wAs
-VmG1wTjWR+Vzv2wigZYn3mSMdT2RAhjF5Wc8ejry8eSjoRsJSdc/hNM4xONEq54D
-BMiffJt0aNGRRTwpd2VmYUXPE0ZzcCaECeK0GWiXPgXSmGB9bqQgXdRK2uLafJL0
-Nlyv1kL2E3bL/oR3fhyrLQtHyUgu9wpunjpT/iGiqxLGSjyoxD/KcUhFuNEDKcMn
-czUMAAkpLtAPhUN9UsO0y1DZGkx2hg9sB7M6bjKfopRHCFnPDKSLffWRELISW9tF
-Phg6qVezNzTaYsUHZpHBbdHoHmr2Zc192eTsibqoAol2sGjj/5bL3qUVnyj2xwM=
-=6bXU
+iQEcBAEBCgAGBQJOPt85AAoJEEqz6FtPBkyjFTAH/ReN2npNC+Hpfnyfwj897/Qr
+x8RKNRcVBME4YWjTbe9kLRyp5CzuQ9eKrILnmLWYP5SkVY8Gzz1yh7Ghc71a/uv5
+dUadcbhIHV6O4yGW1ADxIdz/chXbbXbCFvmD6ALv0H0jQ6tC8LR4KZWrHvH+Mqio
+Tnj+NL9hBjicpBYfhOH+QIkEcrGyAgsUl7evVmrmnJ9Ax8CMDwQN44zxeerVMsR4
+DIrB9d8ekn16w8CThH4yKnyM0cp+dman2zc/8O8W3w4aKLE1Q9XdWhSTvg/3VzFj
+QZuWPa2YE5pd7Fj8jzHbgfuJCDwN/SovfQ4PyBiJ+06kdhw5oqGuBXyxbvMZwH0=
+=3kRG
 -----END PGP SIGNATURE-----
diff --git a/app-text/csvfix/csvfix-1.10a.ebuild b/app-text/csvfix/csvfix-1.10a.ebuild
new file mode 100644 (file)
index 0000000..f297a50
--- /dev/null
+++ b/app-text/csvfix/csvfix-1.10a.ebuild
@@ -0,0 +1,48 @@
+# 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/files/csvfix-1.10a-escape-exec.patch b/app-text/csvfix/files/csvfix-1.10a-escape-exec.patch
new file mode 100644 (file)
index 0000000..fe349f1
--- /dev/null
+++ b/app-text/csvfix/files/csvfix-1.10a-escape-exec.patch
@@ -0,0 +1,13 @@
+--- 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 ) {\r
+                       CSVTHROW( "Invalid parameter: %" << p );\r
+               }\r
+-              return (unsigned int) n < row.size() ? row[n] : "";\r
++              return (unsigned int) n < row.size()\r
++                      ? ALib::Escape( row[n], "\\'\"", "\\" )\r
++                      : "";\r
+       }\r
+       else {\r
+               ATHROW( "Invalid parameter" );\r
diff --git a/app-text/csvfix/files/csvfix-1.10a-tests.patch b/app-text/csvfix/files/csvfix-1.10a-tests.patch
new file mode 100644 (file)
index 0000000..8e4461d
--- /dev/null
+++ b/app-text/csvfix/files/csvfix-1.10a-tests.patch
@@ -0,0 +1,51 @@
+--- csvfix-build.orig/csvfix/tests/run1
++++ csvfix-build/csvfix/tests/run1
+@@ -1,4 +1,4 @@
+-#!bash\r
++#!/bin/bash\r
+ # run1\r
+ # run single test\r
+ # copyright (C) 2008 Neil Butterworth\r
+@@ -49,7 +49,7 @@
+ fi\r
+ \r
+ # exe to be tested - used in tests\r
+-CSVED=../bin/csvfix.exe\r
++CSVED=../bin/csvfix\r
+ export CSVED\r
+ \r
+ if [ ! -f "$CSVED" ]\r
+@@ -64,7 +64,7 @@
+ fi\r
+ \r
+ # where to find diff & where to put output\r
+-DIFF=/bin/diff\r
++DIFF=/usr/bin/diff\r
+ DIFFOUT=tmp/_diffout\r
+ WINDIFF="C:/Program Files/Microsoft Visual Studio/Common/Tools/WINDIFF.EXE"\r
+ TEST=`basename $TEST`\r
+@@ -133,5 +133,7 @@
+       fi\r
+ else\r
+       echo "Execution problem with $TEST - please correct"\r
++      color_red "FAILED $TEST"\r
++      exit 1\r
+ fi\r
+ \r
+--- csvfix-build.orig/csvfix/tests/runtests
++++ csvfix-build/csvfix/tests/runtests
+@@ -1,4 +1,4 @@
+-#!bash\r
++#!/bin/bash\r
+ # runall.bash\r
+ # run all tests and report\r
+ \r
+@@ -22,3 +22,8 @@
+ echo $FAILS failed, $PASSES passed\r
+ echo ""\r
+ \r
++if [[ $FAILS -gt 0 ]]; then\r
++      exit 1\r
++else\r
++      exit 0\r
++fi\r
Unnamed repository; edit this file 'description' to name the repository.