gentoo resync : 14.07.2018

5 files changed, 79 insertions, 0 deletions

diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
new file mode 100644
index 000000000000..70bc4ff43900
--- /dev/null
+++ b/dev-libs/libxls/Manifest
@@ -0,0 +1,5 @@
+AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
+AUX libxls-1.4.0-infinite.patch 583 BLAKE2B 2d3dbe60123e6005d6c71fd24e0fee43f82137b2bb47e0240d8cda53bc56f970272bc9324c12ac7eeccd3cf90ddbd7a776c15a212723f3cdde874d8193150e5f SHA512 04ab1274723fbfc485d45a1fafd8fb21ccef0af3670b07ad8e4248a442d98a478a944dcaa0f40343026e3c22ae2dee26c27fcc37e73ba9a0cfb48d475446d00d
+DIST libxls-1.4.0.zip 428782 BLAKE2B 52b67eff4ae315dfde42abd276ace7adaecdd4d88d971a97f9aca1f0cce0c874cbcfa6a060880f1101e4fa685fa566475e753eb34ee621e509fbee8c427e6d52 SHA512 e55c0faa25b17a42d53ca939c80e1d3fd0c0e91de7f73d3d10d1fb6658e58e8f38f4e6288a3e3ecb9ae53ea681629ee66ec173229325eea69e01cbd038e68c95
+EBUILD libxls-1.4.0-r1.ebuild 665 BLAKE2B 3cb64d41eb10dd5d43df0a93b9f465d98e8527fd6eaeb6ebef50e785618990c738fca67c877277b22ceef84ee941ff05c9acd6b7390279d99fa639bb5e2e83aa SHA512 5cf6a129b79b2ca631da4ecf8981a39bb1e0107b343697c31ccd0354d30667eb262b34f4e71bbd7b47dcc9baa350c52d4d7305b46a7a58f66d3c2400791f8e2c
+MISC metadata.xml 337 BLAKE2B d83ec5bbbb5d64ad33a946df5fd82206062d9e443363bdbbb4ffbbfd3217cde0e026aa86db0ae1bf2da14fd8dbc435b22c6b0b6c4b1d6eadd3e23ccc8253cc68 SHA512 6cb16eae4b9d04f9cbb1442854c5d827fa19023c2c69e6de5d0eef7d5f7772b4202101b489136e9813f6598d80cae0963b8eca1e736a9a9218d6b8b532bc0c7d
diff --git a/dev-libs/libxls/files/libxls-1.4.0-asprintf.patch b/dev-libs/libxls/files/libxls-1.4.0-asprintf.patch
new file mode 100644
index 000000000000..71a6c82fbf3d
--- /dev/null
+++ b/dev-libs/libxls/files/libxls-1.4.0-asprintf.patch
@@ -0,0 +1,8 @@
+diff --git a/src/xlstool.c b/src/xlstool.c
+index 54eab0e..ef1c7e9 100644
+--- a/src/xlstool.c
++++ b/src/xlstool.c
+@@ -32,2 +32,3 @@
+ 
++#define _GNU_SOURCE /* asprintf */
+ #include "config.h"
diff --git a/dev-libs/libxls/files/libxls-1.4.0-infinite.patch b/dev-libs/libxls/files/libxls-1.4.0-infinite.patch
new file mode 100644
index 000000000000..6f6e9fc1e1ec
--- /dev/null
+++ b/dev-libs/libxls/files/libxls-1.4.0-infinite.patch
@@ -0,0 +1,16 @@
+cellRow and cellCol need to be of a type larger than WORD.
+Otherwise for for documents with 65535 columns condition
+loops forever in the following line:
+    for (cellRow = 0; cellRow <= pWS->rows.lastrow; cellRow++) {
+In this case <= 65535 is always true.
+
+https://bugs.gentoo.org/607094 has an example doc of this kind.
+diff --git a/libxls/src/xls2csv.c b/libxls/src/xls2csv.c
+index b804267..1f0d4b3 100644
+--- a/src/xls2csv.c
++++ b/src/xls2csv.c
+@@ -104,3 +104,3 @@ int main(int argc, char *argv[]) {
+ 	struct st_row_data* row;
+-	WORD cellRow, cellCol;
++	DWORD cellRow, cellCol;
+ 
diff --git a/dev-libs/libxls/libxls-1.4.0-r1.ebuild b/dev-libs/libxls/libxls-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..fd8b84de8c06
--- /dev/null
+++ b/dev-libs/libxls/libxls-1.4.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="A library which can read Excel (xls) files"
+HOMEPAGE="http://libxls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/libxls/${P}.zip"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0/1" # libxlsreader.so.1
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+RESTRICT=test # test driver is missing
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-asprintf.patch
+	"${FILESDIR}"/${P}-infinite.patch
+)
+
+src_configure() {
+	econf \
+		--disable-static
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+}
diff --git a/dev-libs/libxls/metadata.xml b/dev-libs/libxls/metadata.xml
new file mode 100644
index 000000000000..8a47f96b1b95
--- /dev/null
+++ b/dev-libs/libxls/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slyfox@gentoo.org</email>
+    <name>Sergei Trofimovich</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">libxls</remote-id>
+  </upstream>
+</pkgmetadata>