From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B24E3138335 for ; Sun, 25 Nov 2018 23:41:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8320DE07AE; Sun, 25 Nov 2018 23:41:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4B4C9E07AE for ; Sun, 25 Nov 2018 23:41:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9254A335D8D for ; Sun, 25 Nov 2018 23:41:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE4684B8 for ; Sun, 25 Nov 2018 23:41:52 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1543189232.02bb431630eb46f2d14890415fa99c4c62f0e9a9.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/oyranos/oyranos-0.9.6.ebuild media-libs/oyranos/oyranos-9999.ebuild X-VCS-Directories: media-libs/oyranos/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 02bb431630eb46f2d14890415fa99c4c62f0e9a9 X-VCS-Branch: master Date: Sun, 25 Nov 2018 23:41:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8682c4cb-ee70-44c2-9843-c3929d30a64d X-Archives-Hash: 849624315cdfd2c19ef433e544697122 commit: 02bb431630eb46f2d14890415fa99c4c62f0e9a9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 25 20:18:14 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 25 23:40:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02bb4316 media-libs/oyranos: Use https, live conditional consolidation Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/oyranos/oyranos-0.9.6.ebuild | 6 ++---- media-libs/oyranos/oyranos-9999.ebuild | 17 +++++++---------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/media-libs/oyranos/oyranos-0.9.6.ebuild b/media-libs/oyranos/oyranos-0.9.6.ebuild index d71e0603f7d..86b7fa8d98d 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 11aa763bfd8..fc646f0fac2 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}]