commit: 829fc2ec07dfac20f79b5f4845484424b66b225b Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Thu Jul 25 08:47:43 2019 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Thu Jul 25 08:50:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=829fc2ec
app-text/csvfix: inherit missing eutils eclass and fix tests Closes: https://bugs.gentoo.org/630640 Closes: https://bugs.gentoo.org/647986 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> app-text/csvfix/csvfix-1.6.ebuild | 5 +++-- app-text/csvfix/files/csvfix-1.6-shuffle-test.patch | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app-text/csvfix/csvfix-1.6.ebuild b/app-text/csvfix/csvfix-1.6.ebuild index e79e239ef7d..8f35d453676 100644 --- a/app-text/csvfix/csvfix-1.6.ebuild +++ b/app-text/csvfix/csvfix-1.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit toolchain-funcs versionator vcs-snapshot +inherit toolchain-funcs versionator vcs-snapshot eutils MY_PV="$(delete_all_version_separators)" DESCRIPTION="A stream editor for manipulating CSV files" @@ -23,6 +23,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${P}-makefile.patch "${FILESDIR}"/${PN}-1.10a-tests.patch + "${FILESDIR}"/${P}-shuffle-test.patch ) src_prepare() { diff --git a/app-text/csvfix/files/csvfix-1.6-shuffle-test.patch b/app-text/csvfix/files/csvfix-1.6-shuffle-test.patch new file mode 100644 index 00000000000..3916e92e059 --- /dev/null +++ b/app-text/csvfix/files/csvfix-1.6-shuffle-test.patch @@ -0,0 +1,20 @@ +Fix the expected data output for the shuffle test. + +--- a/csvfix/tests/correct/shuffle.test ++++ b/csvfix/tests/correct/shuffle.test +@@ -5,10 +5,10 @@ + "Oscar","Wilde","M" + "Charles","Dickens","M" + "George","Elliot","F" +-"Charles","Dickens","M" +-"Austen","F","Jane" ++"Charles","M","Dickens" ++"Jane","F","Austen" + "Herman","M","Melville" + "M","Flann","O'Brien" +-"Elliot","George","F" +-"Virginia","Woolf","F" +-"M","Wilde","Oscar" ++"George","F","Elliot" ++"Woolf","F","Virginia" ++"Wilde","M","Oscar"
