Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/files/, dev-libs/liborcus/
Date: Thu, 12 Sep 2019 20:27:58
Message-Id: 1568320053.9a219810105d6b01d02aa6e7f6f43fe0025ebd5b.asturm@gentoo
1 commit: 9a219810105d6b01d02aa6e7f6f43fe0025ebd5b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 12 20:25:04 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 12 20:27:33 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a219810
7
8 dev-libs/liborcus: Drop 0.13.4
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.17
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-libs/liborcus/Manifest | 1 -
14 .../files/liborcus-0.13.4-boost-1.67.patch | 50 ------------------
15 dev-libs/liborcus/liborcus-0.13.4.ebuild | 59 ----------------------
16 3 files changed, 110 deletions(-)
17
18 diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
19 index 5ef7b99786f..e358a2fd14f 100644
20 --- a/dev-libs/liborcus/Manifest
21 +++ b/dev-libs/liborcus/Manifest
22 @@ -1,2 +1 @@
23 -DIST liborcus-0.13.4.tar.xz 1816340 BLAKE2B f8e7251c8688f82604d5ac1212938890e42f23ce45edb09eba9ab26a810e5fd4215a23dd20e86ddf9100db67818fc73fbbee7357642a6390f8f60dc28596be31 SHA512 f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b
24 DIST liborcus-0.14.1.tar.xz 1894680 BLAKE2B 0070baf319bf35275f36f3082141f154404ad43d8143588b35c00b8b536f0c1cf5bf38fd9e997c4be45a454f16de1cc1a25186da40e3ed0606a87e9a6a968053 SHA512 a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f
25
26 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
27 deleted file mode 100644
28 index b1d44b8db4c..00000000000
29 --- a/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
30 +++ /dev/null
31 @@ -1,50 +0,0 @@
32 -From f7485813af8e50f88c77312fb29b7bb489a0a17d Mon Sep 17 00:00:00 2001
33 -From: Adam Majer <amajer@××××.de>
34 -Date: Wed, 23 May 2018 10:45:56 +0200
35 -Subject: [PATCH] Fix build with Boost 1.67
36 -
37 -Boost:DateTime that no longer accepts non-integer types.
38 -In the past, these types were implicitly cast down to integer
39 -values. Now this requires explicit cast.
40 -
41 -https://svn.boost.org/trac10/ticket/11168
42 -
43 -This fixes #60
44 ----
45 - src/spreadsheet/sheet.cpp | 6 +++---
46 - 1 file changed, 3 insertions(+), 3 deletions(-)
47 -
48 -diff --git a/src/spreadsheet/sheet.cpp b/src/spreadsheet/sheet.cpp
49 -index 7df1aedb..33b372ad 100644
50 ---- a/src/spreadsheet/sheet.cpp
51 -+++ b/src/spreadsheet/sheet.cpp
52 -@@ -289,7 +289,7 @@ void sheet::set_date_time(row_t row, col_t col, int year, int month, int day, in
53 -
54 - double days_since_epoch = (d - origin).days();
55 -
56 -- double ms = second * 1000000.0;
57 -+ long ms = second * 1000000.0;
58 -
59 - posix_time::time_duration t(
60 - posix_time::hours(hour) +
61 -@@ -606,7 +606,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
62 - if (time_fraction)
63 - {
64 - // Convert a fraction day to microseconds.
65 -- double ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
66 -+ long ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
67 - posix_time::time_duration td = posix_time::microsec(ms);
68 -
69 - hours = td.hours();
70 -@@ -615,7 +615,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
71 -
72 - td -= posix_time::hours(hours);
73 - td -= posix_time::minutes(minutes);
74 -- td -= posix_time::seconds(seconds);
75 -+ td -= posix_time::seconds((long)seconds);
76 -
77 - ms = td.total_microseconds(); // remaining microseconds.
78 -
79 ---
80 -2.18.0
81 -
82
83 diff --git a/dev-libs/liborcus/liborcus-0.13.4.ebuild b/dev-libs/liborcus/liborcus-0.13.4.ebuild
84 deleted file mode 100644
85 index 81e4c1673a3..00000000000
86 --- a/dev-libs/liborcus/liborcus-0.13.4.ebuild
87 +++ /dev/null
88 @@ -1,59 +0,0 @@
89 -# Copyright 1999-2019 Gentoo Authors
90 -# Distributed under the terms of the GNU General Public License v2
91 -
92 -EAPI=6
93 -
94 -EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
95 -
96 -PYTHON_COMPAT=( python{3_5,3_6} )
97 -
98 -[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
99 -inherit python-single-r1 ${GITECLASS}
100 -unset GITECLASS
101 -
102 -DESCRIPTION="Standalone file import filter library for spreadsheet documents"
103 -HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
104 -[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
105 -
106 -LICENSE="MIT"
107 -SLOT="0/0.13" # based on SONAME of liborcus.so
108 -[[ ${PV} == 9999 ]] || \
109 -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
110 -IUSE="python +spreadsheet-model static-libs tools"
111 -
112 -RDEPEND="
113 - dev-libs/boost:=
114 - sys-libs/zlib
115 - python? ( ${PYTHON_DEPS} )
116 - spreadsheet-model? ( =dev-libs/libixion-0.13*:= )
117 -"
118 -DEPEND="${RDEPEND}
119 - =dev-util/mdds-1.3*:1
120 -"
121 -
122 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
123 -
124 -PATCHES=( "${FILESDIR}/${P}-boost-1.67.patch" )
125 -
126 -pkg_setup() {
127 - use python && python-single-r1_pkg_setup
128 -}
129 -
130 -src_prepare() {
131 - default
132 - [[ ${PV} == 9999 ]] && eautoreconf
133 -}
134 -
135 -src_configure() {
136 - econf \
137 - --disable-werror \
138 - $(use_enable python) \
139 - $(use_enable spreadsheet-model) \
140 - $(use_enable static-libs static) \
141 - $(use_with tools)
142 -}
143 -
144 -src_install() {
145 - default
146 - find "${D}" -name '*.la' -delete || die
147 -}