Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/glance/
Date: Wed, 14 Feb 2018 03:18:00
Message-Id: 1518575374.7ca0774652eb979e4ed2bf6a6917187215adb6dd.prometheanfire@gentoo
1 commit: 7ca0774652eb979e4ed2bf6a6917187215adb6dd
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 14 02:29:34 2018 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 14 02:29:34 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca07746
7
8 app-admin/glance: 15.0.1 bup
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 app-admin/glance/Manifest | 1 +
13 .../{glance-2017.2.9999.ebuild => glance-15.0.1.ebuild} | 14 ++++++++++----
14 app-admin/glance/glance-2017.2.9999.ebuild | 14 ++++++++++----
15 3 files changed, 21 insertions(+), 8 deletions(-)
16
17 diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
18 index 0824f911194..7dcfed1c9ed 100644
19 --- a/app-admin/glance/Manifest
20 +++ b/app-admin/glance/Manifest
21 @@ -1 +1,2 @@
22 DIST glance-15.0.0.tar.gz 1803491 BLAKE2B 70e0f1f7eab6aa0066d16e30e9325ac45d9c0eb9df875e3b26e90463e10299d6c7c272c0b070137f27332bdfcb33abeda68e3375e2562c83942ca72fcb24de38 SHA512 beb5744f9e8b296356cb731c79f1efd7b60408c1282e8a64ab7d414929c447c4f2ff0562a0d59c0a05f828d420ba190946866543a37dbd2df73ae322cbcabab5
23 +DIST glance-15.0.1.tar.gz 1815463 BLAKE2B ec6e51340fc4d737e2bd777baf03163a0b515d19c1dc8e5203918e07b304a9539f47ba763207e26def985c6a384d21250ffe1386b433d8b606b55d3d70e4431a SHA512 2da3ada256424a7817d0c49aac0940443cbefcfff3df77a623d7099badf356808b5df59f109ac233f84ac561b7310d3b8d53cafd6c9955a8e2b296a1655cedd3
24
25 diff --git a/app-admin/glance/glance-2017.2.9999.ebuild b/app-admin/glance/glance-15.0.1.ebuild
26 similarity index 95%
27 copy from app-admin/glance/glance-2017.2.9999.ebuild
28 copy to app-admin/glance/glance-15.0.1.ebuild
29 index 34a29aa8cf5..d1d9d7d3639 100644
30 --- a/app-admin/glance/glance-2017.2.9999.ebuild
31 +++ b/app-admin/glance/glance-15.0.1.ebuild
32 @@ -4,16 +4,22 @@
33 EAPI=6
34 PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
35
36 -inherit distutils-r1 git-r3 user
37 +inherit distutils-r1 user
38
39 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
40 HOMEPAGE="https://launchpad.net/glance"
41 -EGIT_REPO_URI="https://github.com/openstack/glance.git"
42 -EGIT_BRANCH="stable/pike"
43 +
44 +if [[ ${PV} == *9999 ]];then
45 + inherit git-r3
46 + EGIT_REPO_URI="https://github.com/openstack/glance.git"
47 + EGIT_BRANCH="stable/pike"
48 +else
49 + SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
50 + KEYWORDS="~amd64 ~arm64 ~x86"
51 +fi
52
53 LICENSE="Apache-2.0"
54 SLOT="0"
55 -KEYWORDS=""
56 IUSE="doc mysql postgres +sqlite +swift"
57 REQUIRED_USE="|| ( mysql postgres sqlite )"
58
59
60 diff --git a/app-admin/glance/glance-2017.2.9999.ebuild b/app-admin/glance/glance-2017.2.9999.ebuild
61 index 34a29aa8cf5..d1d9d7d3639 100644
62 --- a/app-admin/glance/glance-2017.2.9999.ebuild
63 +++ b/app-admin/glance/glance-2017.2.9999.ebuild
64 @@ -4,16 +4,22 @@
65 EAPI=6
66 PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
67
68 -inherit distutils-r1 git-r3 user
69 +inherit distutils-r1 user
70
71 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
72 HOMEPAGE="https://launchpad.net/glance"
73 -EGIT_REPO_URI="https://github.com/openstack/glance.git"
74 -EGIT_BRANCH="stable/pike"
75 +
76 +if [[ ${PV} == *9999 ]];then
77 + inherit git-r3
78 + EGIT_REPO_URI="https://github.com/openstack/glance.git"
79 + EGIT_BRANCH="stable/pike"
80 +else
81 + SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
82 + KEYWORDS="~amd64 ~arm64 ~x86"
83 +fi
84
85 LICENSE="Apache-2.0"
86 SLOT="0"
87 -KEYWORDS=""
88 IUSE="doc mysql postgres +sqlite +swift"
89 REQUIRED_USE="|| ( mysql postgres sqlite )"