[gentoo-commits] repo/gentoo:master commit in: app-admin/glance/, app-admin/glance/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/glance/, app-admin/glance/files/

[Matt Thode]

commit:     f6726d625afa61325cb4cebc3d9b39cec622be35
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 02:30:22 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 02:30:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6726d62

app-admin/glance: fixing bug 628548, new init

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-admin/glance/files/glance.initd-r2                  | 17 +++++++++++++++++
 ...lance-2017.1.9999.ebuild => glance-14.0.0-r1.ebuild} |  7 +++----
 app-admin/glance/glance-2017.1.9999.ebuild              |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app-admin/glance/files/glance.initd-r2 b/app-admin/glance/files/glance.initd-r2
new file mode 100644
index 00000000000..338de069750
--- /dev/null
+++ b/app-admin/glance/files/glance.initd-r2
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts ${RC_SVCNAME} service for OpenStack"
+
+command=/usr/bin/${RC_SVCNAME}
+command_user="${GLANCE_USER:-glance}"
+command_background=yes
+pidfile=/run/${RC_SVCNAME}.pid
+required_files=/etc/glance/${RC_SVCNAME}.conf
+
+start_stop_daemon_args="--quiet"
+
+depend() {
+	need net
+}

diff --git a/app-admin/glance/glance-2017.1.9999.ebuild b/app-admin/glance/glance-14.0.0-r1.ebuild
similarity index 97%
copy from app-admin/glance/glance-2017.1.9999.ebuild
copy to app-admin/glance/glance-14.0.0-r1.ebuild
index f3ec7d4dcba..02f04305b64 100644
--- a/app-admin/glance/glance-2017.1.9999.ebuild
+++ b/app-admin/glance/glance-14.0.0-r1.ebuild
@@ -4,16 +4,15 @@
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 
-inherit distutils-r1 git-r3 user
+inherit distutils-r1 user
 
 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
 HOMEPAGE="https://launchpad.net/glance"
-EGIT_REPO_URI="https://github.com/openstack/glance.git"
-EGIT_BRANCH="stable/ocata"
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc mysql postgres +sqlite +swift"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 

diff --git a/app-admin/glance/glance-2017.1.9999.ebuild b/app-admin/glance/glance-2017.1.9999.ebuild
index f3ec7d4dcba..abe2dce6724 100644
--- a/app-admin/glance/glance-2017.1.9999.ebuild
+++ b/app-admin/glance/glance-2017.1.9999.ebuild
@@ -117,7 +117,7 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	for svc in api glare registry scrubber; do
-		newinitd "${FILESDIR}/glance.initd" glance-${svc}
+		newinitd "${FILESDIR}/glance.initd-r2" glance-${svc}
 	done
 
 	diropts -m 0750 -o glance -g glance

[gentoo-commits] repo/gentoo:master commit in: app-admin/glance/, app-admin/glance/files/

[Matt Thode]

commit:     9b6399b82861fea546adffc3b0673b15226dadb7
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 18 04:22:43 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 04:54:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b6399b8

app-admin/glance: update init script one last time

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-admin/glance/files/glance.initd-2      | 15 +++++++++++++++
 app-admin/glance/glance-15.0.0.ebuild      |  4 +---
 app-admin/glance/glance-2017.2.9999.ebuild |  4 +---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app-admin/glance/files/glance.initd-2 b/app-admin/glance/files/glance.initd-2
new file mode 100644
index 00000000000..4d4849f77e7
--- /dev/null
+++ b/app-admin/glance/files/glance.initd-2
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts ${SVCNAME} service for OpenStack"
+
+command=/usr/bin/${RC_SVCNAME}
+command_user="${GLANCE_USER:-glance}"
+command_background=yes
+pidfile=/run/${RC_SVCNAME}.pid
+required_files=/etc/glance/${RC_SVCNAME}.conf
+
+depend() {
+	need net
+}

diff --git a/app-admin/glance/glance-15.0.0.ebuild b/app-admin/glance/glance-15.0.0.ebuild
index 495638699ed..9bea9ce0a55 100644
--- a/app-admin/glance/glance-15.0.0.ebuild
+++ b/app-admin/glance/glance-15.0.0.ebuild
@@ -125,9 +125,7 @@ python_compile_all() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	for svc in api glare registry scrubber; do
-		newinitd "${FILESDIR}/glance.initd-r2" glance-${svc}
-	done
+	newinitd "${FILESDIR}/glance.initd-2" glance-api
 
 	diropts -m 0750 -o glance -g glance
 	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber

diff --git a/app-admin/glance/glance-2017.2.9999.ebuild b/app-admin/glance/glance-2017.2.9999.ebuild
index c65b743b462..71b923e6de6 100644
--- a/app-admin/glance/glance-2017.2.9999.ebuild
+++ b/app-admin/glance/glance-2017.2.9999.ebuild
@@ -126,9 +126,7 @@ python_compile_all() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	for svc in api glare registry scrubber; do
-		newinitd "${FILESDIR}/glance.initd-r2" glance-${svc}
-	done
+	newinitd "${FILESDIR}/glance.initd-2" glance-api
 
 	diropts -m 0750 -o glance -g glance
 	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber