dev-libs/libixion: 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>

diff --git a/dev-libs/libixion/libixion-0.14.1.ebuild b/dev-libs/libixion/libixion-0.14.1.ebuild
index 51e6e3935b8129b9dfd8b92bb2c72f33bf728906..e962aadc35eb9f31e481cd48f7be0a048ee0bdaf 100644 (file)
--- a/dev-libs/libixion/libixion-0.14.1.ebuild
+++ b/dev-libs/libixion/libixion-0.14.1.ebuild
@@ -1,36 +1,34 @@
-# 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/ixion/ixion.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="General purpose formula parser & interpreter"
 HOMEPAGE="https://gitlab.com/ixion/ixion"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
+
+if [[ ${PV} == 9999 ]]; then
+       EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
+       inherit git-r3 autotools
+else
+       SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
+       KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0/0.14" # based on SONAME of libixion.so
-[[ ${PV} == 9999 ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="debug python static-libs +threads"
 
-RDEPEND="
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
        dev-libs/boost:=
-       python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
        >=dev-util/mdds-1.4.1:1=
+       python? ( ${PYTHON_DEPS} )
 "
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
        use python && python-single-r1_pkg_setup

diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index 9dbcab360b8fa7e0fb1a81982976e2a54920206f..860c13488fc6a9c42996d0729b726c3f52f8a6c5 100644 (file)
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -1,35 +1,34 @@
-# 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/ixion/ixion.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="General purpose formula parser & interpreter"
 HOMEPAGE="https://gitlab.com/ixion/ixion"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
+
+if [[ ${PV} == 9999 ]]; then
+       EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
+       inherit git-r3 autotools
+else
+       SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
+       KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0/0.15" # based on SONAME of libixion.so
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="debug python static-libs +threads"
 
-RDEPEND="
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
        dev-libs/boost:=
-       python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
        >=dev-util/mdds-1.4.1:1=
+       python? ( ${PYTHON_DEPS} )
 "
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
        use python && python-single-r1_pkg_setup