gentoo resync : 19.03.2019

3 files changed, 36 insertions, 39 deletions

diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 346d9edd3dae..2fd83d17c775 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,6 +1,6 @@
 DIST libixion-0.13.0.tar.xz 413756 BLAKE2B 04aef61a1cc691bb159d7e8131e2e47fe2590634adc93f2e5771ed106316eb1c92ee7c4aa05ba753a1751cb5e7c55cba9263515671a26f9bc9983a1cfcacceff SHA512 15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0
 DIST libixion-0.14.1.tar.xz 360568 BLAKE2B e4da21f0eff9111272618d1bad87790ed0c4b461478473654f8366b0023c0650b41d355b0737a4fd4ac943e66f919e2f0d6bf04250e597e54a290d4415f3a093 SHA512 e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3
 EBUILD libixion-0.13.0.ebuild 1153 BLAKE2B d0ce72e3f189cd8324977528761a99f454f387167efbba9f6fc0c578ae924904365d147a7f88bb04a5fe35cc0f24188e0381670bd9667d280327728c2e7c5f08 SHA512 15fa6ecc16de6da5fa03bbaab0b9f2c0eb8652331eada59b7d7cdf180669320af4797ff765854b325b1e683441034d6652a271a09fbcf0cc19d2d31e0991f87a
-EBUILD libixion-0.14.1.ebuild 1164 BLAKE2B 1275494a8edcc72ffd850eb78711f4a69e77f9184ab8fbc648d3cd7fc412d12853ea105c8e7e7df50c2b5dbdee6884f95feca333d7a10d468f6e8d6c3db64f11 SHA512 ef9a464b6efd6e0d7fb3971c86939db24c9f48d54f3c7b33922f49b9913b34f5c63b21525ec317cf59b5d9af7ee43a2c8e316037a2132e0f4e940a8158c2c142
-EBUILD libixion-9999.ebuild 1150 BLAKE2B 38594e3d79ea10b4203f3d7ee9cda5fa981344902e184be7001488c800abdf425776f9e38758218aecf617fa297f8cea6e80ce1f8c2a6275ebbcd1523e8ea861 SHA512 3a237abfa6be00e21902f39be0bd78c355393e8005749d13898f4a3eba1652ba995014a4e9e8e2cb1d4c124b4747a3707eb55920afbec748c8becd1f0985dd77
+EBUILD libixion-0.14.1.ebuild 1084 BLAKE2B ff5b6d6c3277231498f8416e8897352f87c2aa9bf728ab9fb2c39d0e713cae0809a21b34c250132e48e7d8b6280159fb2b971b1e1e3d7bd37278a6df6996db47 SHA512 00a1a5b73de958d514d105cc83ce849059388238cca6188fa425802f719c0b03b958c2cf7642dcd03aa54a9c130bfae033dc58acc4d37801c2aeec71bd8413d1
+EBUILD libixion-9999.ebuild 1084 BLAKE2B 31dec65a5e55763ff9b3ba5d775e8553210cecec7e5d302ff49346f8072cd829503ded8ae215089f04cf97d4ebd54ff59be951870d04cfa81579413fd101806c SHA512 4b3f43b37e3c527d9f33ce09a6aed3d472b84fc037f30fd56380eb3b706b5e8913284cfe49d601d9c6790060d9b09d1fa1a68e7a2443972092573da75b586a31
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.14.1.ebuild b/dev-libs/libixion/libixion-0.14.1.ebuild
index 51e6e3935b81..e962aadc35eb 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 9dbcab360b8f..860c13488fc6 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