summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-03-12 00:25:49 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-03-12 08:07:38 +0100
commit469d95c4cb2a9214718b24d24d8304fb9d2979b1 (patch)
tree601863037f2649a1738d993a22e172aa2f7eae6b
parentdev-libs/libixion: EAPI-7 bump, python3_7, restore KEYWORDS (diff)
downloadgentoo-469d95c4cb2a9214718b24d24d8304fb9d2979b1.tar.gz
gentoo-469d95c4cb2a9214718b24d24d8304fb9d2979b1.tar.bz2
gentoo-469d95c4cb2a9214718b24d24d8304fb9d2979b1.zip
dev-libs/liborcus: EAPI-7 bump, python3_7, restore KEYWORDS
Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--dev-libs/liborcus/liborcus-0.14.1.ebuild25
-rw-r--r--dev-libs/liborcus/liborcus-9999.ebuild24
2 files changed, 24 insertions, 25 deletions
diff --git a/dev-libs/liborcus/liborcus-0.14.1.ebuild b/dev-libs/liborcus/liborcus-0.14.1.ebuild
index fe85aa632bbd..24dd4371bd52 100644
--- a/dev-libs/liborcus/liborcus-0.14.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.14.1.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit python-single-r1 ${GITECLASS}
-unset GITECLASS
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit python-single-r1
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"
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
+ inherit git-r3 autotools
+else
+ SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
LICENSE="MIT"
SLOT="0/0.14" # based on SONAME of liborcus.so
-[[ ${PV} == 9999 ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
IUSE="python +spreadsheet-model static-libs tools"
RDEPEND="
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index 14b3e2eefd74..24dd4371bd52 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit python-single-r1 ${GITECLASS}
-unset GITECLASS
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit python-single-r1
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"
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
+ inherit git-r3 autotools
+else
+ SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
LICENSE="MIT"
SLOT="0/0.14" # based on SONAME of liborcus.so
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
IUSE="python +spreadsheet-model static-libs tools"
RDEPEND="