commit: b65514cb8356aa124e564f6b82b0e60c9862c41d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Mar 11 23:22:50 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Mar 12 07:07:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65514cb
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 <AT> gentoo.org> dev-libs/libixion/libixion-0.14.1.ebuild | 36 +++++++++++++++----------------- dev-libs/libixion/libixion-9999.ebuild | 35 +++++++++++++++---------------- 2 files changed, 34 insertions(+), 37 deletions(-) diff --git a/dev-libs/libixion/libixion-0.14.1.ebuild b/dev-libs/libixion/libixion-0.14.1.ebuild index 51e6e3935b8..e962aadc35e 100644 --- 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 9dbcab360b8..860c13488fc 100644 --- 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
