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 4B19D1382C5 for ; Thu, 1 Mar 2018 09:57:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58EA1E08FA; Thu, 1 Mar 2018 09:57:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 224B4E08FA for ; Thu, 1 Mar 2018 09:57:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 ECB8E335C30 for ; Thu, 1 Mar 2018 09:57:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB255213 for ; Thu, 1 Mar 2018 09:57:50 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1519898250.e0105fccf94ef240ed22c444030051a2308e8f32.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/keystone/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/keystone/Manifest sys-auth/keystone/keystone-13.0.0.ebuild sys-auth/keystone/keystone-2018.1.9999.ebuild X-VCS-Directories: sys-auth/keystone/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: e0105fccf94ef240ed22c444030051a2308e8f32 X-VCS-Branch: master Date: Thu, 1 Mar 2018 09:57:50 +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: 26cb2432-ef90-4552-a348-7b2e84f72dca X-Archives-Hash: b02b899de5a0dd3cd8b2fabb50593465 commit: e0105fccf94ef240ed22c444030051a2308e8f32 Author: Matthew Thode gentoo org> AuthorDate: Thu Mar 1 09:37:41 2018 +0000 Commit: Matt Thode gentoo org> CommitDate: Thu Mar 1 09:57:30 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0105fcc sys-auth/keystone: 13.0.0 bup QUEENS Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-auth/keystone/Manifest | 1 + .../{keystone-2018.1.9999.ebuild => keystone-13.0.0.ebuild} | 13 +++++++++---- sys-auth/keystone/keystone-2018.1.9999.ebuild | 13 +++++++++---- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest index 565ce9bb9f6..fda817ca53e 100644 --- a/sys-auth/keystone/Manifest +++ b/sys-auth/keystone/Manifest @@ -1 +1,2 @@ DIST keystone-12.0.0.tar.gz 1491044 BLAKE2B ebe5fd423509e94d636e303825ac499cf9017a616971654ee52dead111b0fdc76379cf24554c7dd115b1d1a65b081e6931bd890613736f6bffe75e8628f94f7a SHA512 7b7e6cb56b9d22e92834ccfb31dcd6d28d7318e2d8160da93cbc48cdb72aa626021db5b38068ca76caae88e68204c3650f7ce728bc8e1791df8fc8d36072483c +DIST keystone-13.0.0.tar.gz 1462543 BLAKE2B f34da8cd1af58e8de589c0eb5f3f1f6519f4fcadc6152289c9d1196e6fc9fc3ac607af9686884d3a8072514ed8e6c275a2147c5a4d38c3a93660c1b499544539 SHA512 97e6eba83e47480e3f756f8a726012835c5fcb33534d8cc7eb31343a29e4c23ddf20be10adafb257850c8d846fbf2f674dc5f44a09fd901f95ef5b342c066097 diff --git a/sys-auth/keystone/keystone-2018.1.9999.ebuild b/sys-auth/keystone/keystone-13.0.0.ebuild similarity index 95% copy from sys-auth/keystone/keystone-2018.1.9999.ebuild copy to sys-auth/keystone/keystone-13.0.0.ebuild index 05c7509a3f5..8640cea7f1b 100644 --- a/sys-auth/keystone/keystone-2018.1.9999.ebuild +++ b/sys-auth/keystone/keystone-13.0.0.ebuild @@ -5,16 +5,21 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit distutils-r1 git-r3 user +inherit distutils-r1 user DESCRIPTION="The Openstack authentication, authorization, and service catalog" HOMEPAGE="https://launchpad.net/keystone" -EGIT_REPO_URI="https://github.com/openstack/keystone.git" -EGIT_BRANCH="stable/queens" +if [[ ${PV} == *9999 ]];then + inherit git-r3 + EGIT_REPO_URI="https://github.com/openstack/keystone.git" + EGIT_BRANCH="stable/queens" +else + SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="" IUSE="+sqlite ldap memcached mongo mysql postgres test" REQUIRED_USE="|| ( mysql postgres sqlite )" diff --git a/sys-auth/keystone/keystone-2018.1.9999.ebuild b/sys-auth/keystone/keystone-2018.1.9999.ebuild index 05c7509a3f5..8640cea7f1b 100644 --- a/sys-auth/keystone/keystone-2018.1.9999.ebuild +++ b/sys-auth/keystone/keystone-2018.1.9999.ebuild @@ -5,16 +5,21 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit distutils-r1 git-r3 user +inherit distutils-r1 user DESCRIPTION="The Openstack authentication, authorization, and service catalog" HOMEPAGE="https://launchpad.net/keystone" -EGIT_REPO_URI="https://github.com/openstack/keystone.git" -EGIT_BRANCH="stable/queens" +if [[ ${PV} == *9999 ]];then + inherit git-r3 + EGIT_REPO_URI="https://github.com/openstack/keystone.git" + EGIT_BRANCH="stable/queens" +else + SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="" IUSE="+sqlite ldap memcached mongo mysql postgres test" REQUIRED_USE="|| ( mysql postgres sqlite )"