From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 25 Nov 2018 20:18:14 +0000 (+0100)
Subject: media-libs/oyranos: Use https, live conditional consolidation
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=02bb431630eb46f2d14890415fa99c4c62f0e9a9;p=gentoo.git

media-libs/oyranos: Use https, live conditional consolidation

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---

diff --git a/media-libs/oyranos/oyranos-0.9.6.ebuild b/media-libs/oyranos/oyranos-0.9.6.ebuild
index d71e0603f7db..86b7fa8d98d0 100644
--- a/media-libs/oyranos/oyranos-0.9.6.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit cmake-multilib flag-o-matic ${GITECLASS}
 unset GITECLASS
 
 DESCRIPTION="Colour management system allowing to share settings across apps and services"
-HOMEPAGE="http://www.oyranos.org/"
+HOMEPAGE="https://www.oyranos.org/"
 [[ ${PV} != *9999 ]] && \
 SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~asturm/${P}-patches.tar.xz"
@@ -23,8 +23,6 @@ IUSE="X cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test
 
 REQUIRED_USE="qt5? ( X ) test? ( static-libs )"
 
-#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
-
 COMMON_DEPEND="
 	>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
 	dev-libs/libxml2[${MULTILIB_USEDEP}]
diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
index 11aa763bfd8b..fc646f0fac22 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -1,29 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 if [[ ${PV} = *9999 ]]; then
-	GITECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
-inherit cmake-multilib flag-o-matic ${GITECLASS}
-unset GITECLASS
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="Colour management system allowing to share settings across apps and services"
-HOMEPAGE="http://www.oyranos.org/"
-[[ ${PV} != *9999 ]] && \
-SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.oyranos.org/"
 
-KEYWORDS=""
 LICENSE="BSD"
 SLOT="0"
 IUSE="X cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff"
 
 REQUIRED_USE="qt5? ( X ) test? ( static-libs )"
 
-#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
-
 COMMON_DEPEND="
 	>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
 	dev-libs/libxml2[${MULTILIB_USEDEP}]