gentoo resync : 18.11.2019

5 files changed, 73 insertions, 37 deletions

diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
index 72ccd1656d4b..8ccfb3314caa 100644
--- a/app-text/xlsx2csv/Manifest
+++ b/app-text/xlsx2csv/Manifest
@@ -1,5 +1,4 @@
-DIST xlsx2csv-0.7.3.tar.gz 201482 BLAKE2B a2268e584097777d28f2565a19d0f271cb694066e1abffffd7578ecf0271efd420af63932eaea4389c062e050da257fa2f7164c9de7cdfa4ab3fd416692e7968 SHA512 855fcce9ae6ec51c46673e085a456d2862912d0da5130fdac34d88e5612c64d2bc0674c13b3bfb6cd6b7017e513fe0924dbb594db543020842705a82b6006e8e
-DIST xlsx2csv-0.7.4.tar.gz 212472 BLAKE2B de77f4d199bd5fbb43fb4aa775aed9b36aea4c956846be42e9387b79bf76727ba457a0c54db3b4803376b82af12923f21786aa34d21542e2d6ab354be33ad3f3 SHA512 771af30dce63b64272fc8d4dccbcab2106f60a2c9d33370b4d4034a21606e5726c84d963d59e88e2aa124c60f62fd57831ca5fb442d7540474ff1d688da9aaf6
-EBUILD xlsx2csv-0.7.3.ebuild 537 BLAKE2B 67658251bb02b53b8e8d3b10f88e005da228c7f918c4b5fb2ac1a468603b49fea5d7b4bda97613d4ce81ee8869965f2cc43634cd3f564129959579d93ed71e03 SHA512 5597dc43ac4440b0d281cbcc0ed9451f356d2ba8853a2b66de3c9beab0cef65f8311eb2eeb4a396534a80f76cb0cf18886a6e6e14246c1fefa4375b0a86bdce5
-EBUILD xlsx2csv-0.7.4.ebuild 541 BLAKE2B 08d860d1c47c8115ba9b5cf265d875d18d71c47c184fe76f868cec57dbb3c67a9027310aa99be4c387417613a3120f9e52854f5f60820eac669f70a40a689d42 SHA512 97fbf3ff6333cd179acc7d1e5028708a1b5727ee6fb1f853f740d9ae40e5788e26dbbb1faecb9c125fcae0bffe2d1c3ee37cbe96f824986baffeab0d63a888e3
-MISC metadata.xml 385 BLAKE2B 6392216bb79b39e6121a2b6e48f838c04acc0682e1cff0c4c39c68cc7439edb2ff924b817e6bef0e94af24c64b19e68c897d5ef620bee4c171004a7420f7e151 SHA512 e608a317791c590b9dc226f44cc9ddfc2c2d4ebf39cad1b41d230d14549d2718ad09a8cdd79afc2c2e75f4929907ea14d4944923013e00001e9ab0e87c58619b
+AUX xlsx2csv-0.7.6-tests.patch 2180 BLAKE2B 173aa4d2650b86648a7b0897a86f49650acffd1603cb6af4f8fa603d70bc902b23cd280cba0453176e477907e7e93447693ff8ec28b531213c1aa690e9288d7b SHA512 7374e315fbe73532e91278eea825d0171642f4d4d5c412e904932c67ecde0b71291c37d8f5cf8908449663435a587f11e10f409bc82128ef9388be0c002da22e
+DIST xlsx2csv-0.7.6.tar.gz 231283 BLAKE2B d0271c6a82b7ed2825e3224f0e34637db3dacda3fe99c6ef5a087cc8d248592efc169b466514abd18b50f6625e8d9743c812b46ecb6f76ce7d1fdc51dfe34fc4 SHA512 7fc8e0da0c050e12d0cfd73f16ffd9c00f19bf05925b54cc68d6a0858a75db89d52e46312956dfd149e0ec88778f68056942a090db44e6148796fad33fa26489
+EBUILD xlsx2csv-0.7.6.ebuild 664 BLAKE2B 79ea8f4872a09df3aa62aa48ff9a68d8a8e53bd30493388c01068dfce76053373cd0fafd3e8b31b601d1776ac59376927177c3e92a0664fcc49b5705d16d7ab8 SHA512 bbb235c480ce938becbb3a87e69fd3a33abc49a01dc5a0ab7148c8f2d160b2dc8f63f5ced099159a382bf57e61c73c665212c9b740b71f6774a63ad579b2f65c
+MISC metadata.xml 301 BLAKE2B b6bbde41ddb21a05cbfaf8a75bbc5e0d2eb24ce3b62bb93966e7712811cbda3cd258d351f584253d1e831806e2c26fc499092311d2c2d36fa0a8f7323e0b85e0 SHA512 bd16895b82a69676daacc8cf9f4c196423b61600a7dc9ffe8b8d3962cb0a06e46bee7e38a4c692c368a93879be4a83d7d70ce1fb82db6ef4bec25d21a86203c8
diff --git a/app-text/xlsx2csv/files/xlsx2csv-0.7.6-tests.patch b/app-text/xlsx2csv/files/xlsx2csv-0.7.6-tests.patch
new file mode 100644
index 000000000000..f3e04b827bd0
--- /dev/null
+++ b/app-text/xlsx2csv/files/xlsx2csv-0.7.6-tests.patch
@@ -0,0 +1,61 @@
+--- xlsx2csv-0.7.6/test/run
++++ xlsx2csv-0.7.6/test/run
+@@ -5,8 +5,6 @@
+ import subprocess
+ from io import open
+ 
+-PYTHON_VERSIONS = ["2.7"]
+-
+ """
+ This test uses sys.stdout.
+ That means this test doesn't verify:
+@@ -16,31 +14,24 @@
+ 
+ def compare(case, arguments=[]):
+     failed = False
+-    for pyver in PYTHON_VERSIONS:
+-        ext = "xlsx"
+-        if os.path.exists("test/%s.xlsm" % case):
+-            ext = "xlsm"
+-
+-        if os.name == 'posix':# in case of Linux
+-            left = subprocess.check_output(["python%s" %pyver, "./xlsx2csv.py"] + arguments + ["test/%s.%s" %(case, ext)]).decode('utf-8').replace('\r','')
+-        elif os.name == 'nt':# in case of Windows
+-            # Use py.exe http://blog.python.org/2011/07/python-launcher-for-windows_11.html on Windows
+-            left = subprocess.check_output(["py", "-%s" %pyver, "./xlsx2csv.py"] + arguments + ["test/%s.%s" %(case, ext)]).decode('utf-8').replace('\r','')
+-        else:
+-            print("os.name is unexpected: "+os.name)
+-            sys.exit(1)
+-
+-        f = open("test/%s.csv" %case, "r", encoding="utf-8", newline="")
+-        right = f.read().replace('\r','')
+-        f.close()
+-
+-        if left != right:
+-            print("FAILED: %s %s" %(case, pyver))
+-            print(" actual:", left.replace("\r", "\\r").replace("\n", "\\n"))
+-            print(" expected:", right.replace("\r", "\\r").replace("\n", "\\n"))
+-            failed = True
+-        else:
+-            print("OK: %s %s" %(case, pyver))
++    ext = "xlsx"
++    if os.path.exists("test/%s.xlsm" % case):
++        ext = "xlsm"
++
++    left = subprocess.check_output(["./xlsx2csv.py"] + arguments + ["test/%s.%s" %(case, ext)]).decode('utf-8').replace('\r','')
++
++    f = open("test/%s.csv" %case, "r", encoding="utf-8", newline="")
++    right = f.read().replace('\r','')
++    f.close()
++
++    if left != right:
++        print("FAILED: %s" % (case,))
++        print(" actual:", left.replace("\r", "\\r").replace("\n", "\\n"))
++        print(" expected:", right.replace("\r", "\\r").replace("\n", "\\n"))
++        failed = True
++    else:
++        print("OK: %s" % (case,))
++
+     if failed:
+         sys.exit(1)
+ 
diff --git a/app-text/xlsx2csv/metadata.xml b/app-text/xlsx2csv/metadata.xml
index 4b2ed89ad35a..69984cfb9abb 100644
--- a/app-text/xlsx2csv/metadata.xml
+++ b/app-text/xlsx2csv/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">xlsx2csv</remote-id>
     <remote-id type="github">dilshod/xlsx2csv</remote-id>
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild
deleted file mode 100644
index 59143bd10f79..000000000000
--- a/app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-DESCRIPTION="Convert MS Office xlsx files to CSV"
-HOMEPAGE="https://github.com/dilshod/xlsx2csv/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-lang/perl"
-
-python_compile_all() {
-	emake -C man
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/${PN}.1
-}
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.4.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
index cb66033d17d4..a23cd8563014 100644
--- a/app-text/xlsx2csv/xlsx2csv-0.7.4.ebuild
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
@@ -17,10 +17,16 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="dev-lang/perl"
 
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
 python_compile_all() {
 	emake -C man
 }
 
+python_test() {
+	"${PYTHON}" test/run || die "tests failed with ${EPYTHON}"
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 	doman man/${PN}.1