Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

3 files changed, 112 insertions, 0 deletions

diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index c1fed6eeb866..0b3362288b51 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,4 +1,7 @@
+AUX liborcus-0.13.4-boost-1.67.patch 1705 BLAKE2B 5c1fb62ff088163d07fceff4e230bee4728bae2bf4cf4f6e9b5cd0e15037560439efaa17a3b1cd4526df57fd0b5747454db54c6b7a382de4ff8afb9d1da87348 SHA512 eeb343ae4ec779e1b5a40ee93d3220d3e18a7bd3b906935d02e0019412a09c3e182a9e9ba67db30aa8f4e7b859a2fafcd68fd2daaa9d6506a004fd8176fc3ab0
+DIST liborcus-0.13.4.tar.xz 1816340 BLAKE2B f8e7251c8688f82604d5ac1212938890e42f23ce45edb09eba9ab26a810e5fd4215a23dd20e86ddf9100db67818fc73fbbee7357642a6390f8f60dc28596be31 SHA512 f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b
 DIST liborcus-0.14.1.tar.xz 1894680 BLAKE2B 0070baf319bf35275f36f3082141f154404ad43d8143588b35c00b8b536f0c1cf5bf38fd9e997c4be45a454f16de1cc1a25186da40e3ed0606a87e9a6a968053 SHA512 a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f
+EBUILD liborcus-0.13.4.ebuild 1339 BLAKE2B e3ffb431c8d4afb5f0e77ce8a6c1a6c2bebcf31eba4795161cd81fdb423997aecfdb7d9fea4bf2b4d328866128916f366e38837cea09ae5fb32dc59cbbd37bf6 SHA512 498f4d5deffdfc6bfdf42f41abd05bc4759ad88a0e29d0e1058a7e73eef0507e922cd5f79ea4f0dfddb6050868f0ffa3c6b2fced6f0dd347e5f6eff4a8aa7527
 EBUILD liborcus-0.14.1.ebuild 1232 BLAKE2B 9ce83461f3537a81c8d885b37b02f0d2d7b9db6d1ac3d89d8998c74f91d6f369790fd0c1d9a3086b96710dadcc129fd2b4375442ad2863335d1a3558276ac15f SHA512 59703cf3d056ed1c69de0f2d4a08067afcc1ea81541d9078d51e6bf270352d348d975420aa488e79f6710e321f7e283d8dab3c559694d6b12d46d39ee5eddfd5
 EBUILD liborcus-9999.ebuild 1235 BLAKE2B 9690fc7b0ae34d59f4fc3b96ddf1e590d101763859503e4097e7b63fc92412a57986e10f1b6f8750725dc8feab001636ac0dc4b44aebf43986fa860fd0617278 SHA512 63cc21fc924c9c599dad935ab51d4754e38ed6307dd21d0e6674c3fd74bd7f6fb623ee91a8778a409f1908ce5d6ee6646ecfd5fdecadc7ccaf4f50c651efabb7
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch b/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
new file mode 100644
index 000000000000..b1d44b8db4cb
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
@@ -0,0 +1,50 @@
+From f7485813af8e50f88c77312fb29b7bb489a0a17d Mon Sep 17 00:00:00 2001
+From: Adam Majer <amajer@suse.de>
+Date: Wed, 23 May 2018 10:45:56 +0200
+Subject: [PATCH] Fix build with Boost 1.67
+
+Boost:DateTime that no longer accepts non-integer types.
+In the past, these types were implicitly cast down to integer
+values. Now this requires explicit cast.
+
+https://svn.boost.org/trac10/ticket/11168
+
+This fixes #60
+---
+ src/spreadsheet/sheet.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/spreadsheet/sheet.cpp b/src/spreadsheet/sheet.cpp
+index 7df1aedb..33b372ad 100644
+--- a/src/spreadsheet/sheet.cpp
++++ b/src/spreadsheet/sheet.cpp
+@@ -289,7 +289,7 @@ void sheet::set_date_time(row_t row, col_t col, int year, int month, int day, in
+ 
+     double days_since_epoch = (d - origin).days();
+ 
+-    double ms = second * 1000000.0;
++    long ms = second * 1000000.0;
+ 
+     posix_time::time_duration t(
+         posix_time::hours(hour) +
+@@ -606,7 +606,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
+     if (time_fraction)
+     {
+         // Convert a fraction day to microseconds.
+-        double ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
++        long ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
+         posix_time::time_duration td = posix_time::microsec(ms);
+ 
+         hours = td.hours();
+@@ -615,7 +615,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
+ 
+         td -= posix_time::hours(hours);
+         td -= posix_time::minutes(minutes);
+-        td -= posix_time::seconds(seconds);
++        td -= posix_time::seconds((long)seconds);
+ 
+         ms = td.total_microseconds(); // remaining microseconds.
+ 
+-- 
+2.18.0
+
diff --git a/dev-libs/liborcus/liborcus-0.13.4.ebuild b/dev-libs/liborcus/liborcus-0.13.4.ebuild
new file mode 100644
index 000000000000..81e4c1673a31
--- /dev/null
+++ b/dev-libs/liborcus/liborcus-0.13.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
+inherit python-single-r1 ${GITECLASS}
+unset GITECLASS
+
+DESCRIPTION="Standalone file import filter library for spreadsheet documents"
+HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
+[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/0.13" # based on SONAME of liborcus.so
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+IUSE="python +spreadsheet-model static-libs tools"
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+	spreadsheet-model? ( =dev-libs/libixion-0.13*:= )
+"
+DEPEND="${RDEPEND}
+	=dev-util/mdds-1.3*:1
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}/${P}-boost-1.67.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable python) \
+		$(use_enable spreadsheet-model) \
+		$(use_enable static-libs static) \
+		$(use_with tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}