gentoo resync : 02.08.2019

3 files changed, 25 insertions, 3 deletions

diff --git a/app-text/csvfix/Manifest b/app-text/csvfix/Manifest
index 12c4e0edd392..56ba21b8dc60 100644
--- a/app-text/csvfix/Manifest
+++ b/app-text/csvfix/Manifest
@@ -1,6 +1,7 @@
 AUX csvfix-1.10a-tests.patch 1004 BLAKE2B 3b7c1b133ccf4a38bd8be053498c61b0d34c699d9400d5100f07cebc17f235a3510dcde21caa42775681a0f47023d0ad51b9282ffb28a6fc798c71863ad19564 SHA512 3f2330d44872cb022f9f0d9ef9f3bf43d27da94d53ec306d84d56c6d5cf6bbd2afbfa710872cb7a144caeefcf90ce7837422fc421bee30a0af78bdef7d991383
 AUX csvfix-1.6-makefile.patch 1604 BLAKE2B d8f012a3f02c513f8b26e8fa5c7e805a0d333623a7018fadde5c6fea76bd2dd0582587e5aeedd990a71924dd2beba43e5d36c9332f2b257841536e4de8357433 SHA512 f1f5cf1e2d1b7d5d3031ff27fa570ec501af38e9340e8d00be62bee1a46afb9e2941de6d40644d7f5d1326abd8d94036bfc5b04d4fad0e5dba15faaaa22b66dc
+AUX csvfix-1.6-shuffle-test.patch 510 BLAKE2B 4eebe2755d8f42838d4cd9da3a1c2eb1a448c3f978a1c77e625b4937469428a762ac2ac255d9b85944b6dac8513c2316fe1ab876a1a2a1bce89959b6c7e4ed18 SHA512 322812af5799b4e7538e76cde1c39e96ec4494e8db1df6fa2f7b8ed1fc16915cc259dd793ee06682d1520bc47659ca043afdaa749868c8a82f1dab27f76f5efb
 DIST csvfix-1.6.tar.bz2 322530 BLAKE2B 8bda635a5182b31efe2c5c6613baaea13fe2f5c32f97c2bcbdaf05447103507c46190557f0a07e46aa0f442a6ed6b63b0d46d9759e5ddb2b19f00a31a38ddcce SHA512 abd525cff11e6dc4e59f5b26d57b2327564327e27009bbf777a6d83a6f8e474415b4448408aa162c6fb20b9a5bbaf970bdca23d8a9d7e31c3b8aaa19cd878035
 DIST csvfix_man_html_160.zip 403468 BLAKE2B 8007ca95891a99926f6c2968a73ddc30211ff07017261583664dc44ac84a508d097cb4acb81529891caa2f98ca4f094565f46cfa9d79e0d99df92ffd5acc908e SHA512 868047ca4eef7bbbf3735f25489c72820465c414af2ffa11fd3e61fd45ca80661d73082a90b94c4503876bb2355a6b3751f8ede862744f0d7223e77ae770ccd5
-EBUILD csvfix-1.6.ebuild 1079 BLAKE2B b579923ad074ed361048e391a0c4674d139a7c63de347130e7b869d31f23b9964bba63e0652e493b733f2cf35b1de4584f6d925bcf588d6b8a2d22893f41b2a9 SHA512 c311b14e8465c49c44c58a8017107b05c76edc9b66a9519a50889041812c2d215d4b9c3b0c3f44bbe08126bd612a7bf90b4c09b2641eab2cb225f5ae653798b0
+EBUILD csvfix-1.6.ebuild 1122 BLAKE2B 0a3ff9921ea152f6546e2f42ee6d6e9e7255621e6f1f66e6d7b98fd64b34c2a269e1b7c51e9099a40d402e5fe82efb9320c076f9de9d1679eb6ecd3933cc2fd1 SHA512 faec708a59bcd6b58d273f93ba0cf65bbd7a1d8f68ae75eb8f49140fa2a8a517bc397c257761095e45c412e780d051e66408b93fc54a48ac7bbb309edaa08603
 MISC metadata.xml 336 BLAKE2B d48b98955a4ccd6b3c1dfab49fc5e7a18820c7f787fbb5dcf5833690b082efda24bdda2168fc90f58a4d571c71c6856c86e319596840fe669f0fd3208c44da4e SHA512 e2d5e85fd1ecca319a7fe32f7fcd1f897cc3ba4c5fb4200ca9be1a4ebbc1e26c7200fbdf8cf5df9850bc57b62c9ef227cb907c611d43c2e5f04de3639811caa1
diff --git a/app-text/csvfix/csvfix-1.6.ebuild b/app-text/csvfix/csvfix-1.6.ebuild
index e79e239ef7de..8f35d4536767 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 000000000000..3916e92e0592
--- /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"