1 |
commit: 469d95c4cb2a9214718b24d24d8304fb9d2979b1 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 11 23:25:49 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 12 07:07:38 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=469d95c4 |
7 |
|
8 |
dev-libs/liborcus: EAPI-7 bump, python3_7, restore KEYWORDS |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-libs/liborcus/liborcus-0.14.1.ebuild | 25 ++++++++++++------------- |
14 |
dev-libs/liborcus/liborcus-9999.ebuild | 24 ++++++++++++------------ |
15 |
2 files changed, 24 insertions(+), 25 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/liborcus/liborcus-0.14.1.ebuild b/dev-libs/liborcus/liborcus-0.14.1.ebuild |
18 |
index fe85aa632bb..24dd4371bd5 100644 |
19 |
--- a/dev-libs/liborcus/liborcus-0.14.1.ebuild |
20 |
+++ b/dev-libs/liborcus/liborcus-0.14.1.ebuild |
21 |
@@ -1,25 +1,24 @@ |
22 |
-# Copyright 1999-2018 Gentoo Foundation |
23 |
+# Copyright 1999-2019 Gentoo Authors |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
-EAPI=6 |
27 |
+EAPI=7 |
28 |
|
29 |
-EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" |
30 |
- |
31 |
-PYTHON_COMPAT=( python{3_4,3_5,3_6} ) |
32 |
- |
33 |
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools" |
34 |
-inherit python-single-r1 ${GITECLASS} |
35 |
-unset GITECLASS |
36 |
+PYTHON_COMPAT=( python3_{5,6,7} ) |
37 |
+inherit python-single-r1 |
38 |
|
39 |
DESCRIPTION="Standalone file import filter library for spreadsheet documents" |
40 |
HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" |
41 |
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz" |
42 |
+ |
43 |
+if [[ ${PV} == *9999* ]]; then |
44 |
+ EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" |
45 |
+ inherit git-r3 autotools |
46 |
+else |
47 |
+ SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz" |
48 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
49 |
+fi |
50 |
|
51 |
LICENSE="MIT" |
52 |
SLOT="0/0.14" # based on SONAME of liborcus.so |
53 |
-[[ ${PV} == 9999 ]] || \ |
54 |
-KEYWORDS="" |
55 |
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" |
56 |
IUSE="python +spreadsheet-model static-libs tools" |
57 |
|
58 |
RDEPEND=" |
59 |
|
60 |
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild |
61 |
index 14b3e2eefd7..24dd4371bd5 100644 |
62 |
--- a/dev-libs/liborcus/liborcus-9999.ebuild |
63 |
+++ b/dev-libs/liborcus/liborcus-9999.ebuild |
64 |
@@ -1,24 +1,24 @@ |
65 |
-# Copyright 1999-2018 Gentoo Foundation |
66 |
+# Copyright 1999-2019 Gentoo Authors |
67 |
# Distributed under the terms of the GNU General Public License v2 |
68 |
|
69 |
-EAPI=6 |
70 |
+EAPI=7 |
71 |
|
72 |
-EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" |
73 |
- |
74 |
-PYTHON_COMPAT=( python{3_4,3_5,3_6} ) |
75 |
- |
76 |
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools" |
77 |
-inherit python-single-r1 ${GITECLASS} |
78 |
-unset GITECLASS |
79 |
+PYTHON_COMPAT=( python3_{5,6,7} ) |
80 |
+inherit python-single-r1 |
81 |
|
82 |
DESCRIPTION="Standalone file import filter library for spreadsheet documents" |
83 |
HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" |
84 |
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz" |
85 |
+ |
86 |
+if [[ ${PV} == *9999* ]]; then |
87 |
+ EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" |
88 |
+ inherit git-r3 autotools |
89 |
+else |
90 |
+ SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz" |
91 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
92 |
+fi |
93 |
|
94 |
LICENSE="MIT" |
95 |
SLOT="0/0.14" # based on SONAME of liborcus.so |
96 |
-[[ ${PV} == 9999 ]] || \ |
97 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" |
98 |
IUSE="python +spreadsheet-model static-libs tools" |
99 |
|
100 |
RDEPEND=" |