bup

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

3 files changed, 198 insertions, 14 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 5b6245c47505..9a53937347a0 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/glance
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.77 2015/07/29 18:16:39 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.78 2015/07/29 23:24:16 prometheanfire Exp $
+
+*glance-2015.1.1 (29 Jul 2015)
+
+  29 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +glance-2015.1.1.ebuild:
+  bup
 
   29 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> -glance-2015.1.0.ebuild:
   Drop insecure version (bug #556188)
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 9060bae28074..a2d023bf6745 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 2014.2.2-CVE-2015-1881.patch 4298 SHA256 f0f2d7c1f3014781158f3f238226f1dc25cce61e23e689078a5378c6f726ee59 SHA512 6def2047c1e44b601338cdb9f84dc43e21d26a821214ee0b5f99bc820d21d6ebf235d34fac2a0e3628f3fd2bea7b12b5cd5c66065d290ecb10eb6e57d6269a8e WHIRLPOOL 2e874def7b33cd9254922df5e4501dec4d3d889f43b9b6cc93898767273661cc7d271b387df8203cbe495681e1f7a943ccd5752fb9964364d05fc166f4d5cd5b
 AUX CVE-2015-3289_2015.1.0.patch 2085 SHA256 fa07fb892700c6fbd69358a5a7e58237645bd6f0bf36ad64bcaacdea3e338337 SHA512 a39c0ab605c6b4b7443994eb803064f7dc1d722c6e5f7d8ff8185c747c6651b4feb6a1689892e2ab884fab43229220526aa136186689cb6475f3338607abbdd2 WHIRLPOOL 40939353b84736d9621e4b53a7fd0c5bbff8f93e55768037973e277c794f655dd0186d08c54cf5ddf98a625200e67be164338354586b3ffaef3ecdf8d7f6f7a6
 AUX glance-2013.2-sphinx_mapping.patch 582 SHA256 043c3f7ef413cf3675920880af57943b909ec9f3376f6e86a1ae1d5948d9ad98 SHA512 d012ce5eaed00c3ba7b6219813cee503f68cdb14b8e50eedc731afc63767e1867749d6e4824611e0d024b2fdebfe5a2b3ad53b0ad7b18a39defcc17094da4a0f WHIRLPOOL 659bf94e7740be3ea0d2f130b332e694ebdcca8b90acfb479b8502eec4b867eda999ec2c6cdecc1f3dcbe3e3ddf72798c76bdf16ab4ab561ce61975a451c4585
@@ -8,18 +5,11 @@ AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e
 AUX glance.initd 651 SHA256 1b2fc0e11d572bfcc121cb995ea7b3cce63ee705a05d2fb34a9f99d655546553 SHA512 c0ed1cac2038dda8882d5ce013b948debf1e5e411a062d8c9cbfdb1e1683c94bfd78a3f3468de63e0cc28930c59c0ff323a3116ce6a74ccf5d8ad1d547805bad WHIRLPOOL b0b25f4e983bf9f46cb9dd5872d14b24dc90e3c383dc458c79d065e0855bbf838afc4a13f0c92db640cd64311e22985d0b92e1ca4d428ce8b1f08ff23b89cecf
 DIST glance-2014.2.3.tar.gz 783651 SHA256 e0c4eda2ec6a38a11129b45f6776dc32a763b1e234f0834d36d108690ce85be4 SHA512 c7e0365fec7553a12b3f326f3f7fe69323bc9c20653aa6a972226ffee48cd54f4850cb3ee591b78f6932c6f2808cc260b7bc336cdb2f0a80852a05bf56dd717a WHIRLPOOL 96d1e7e5fc5061b0b87bfeb5371788d79c860d69ae638d61a616f74e930492b4c6dfe2206d427462cffb4c537f6ba99ac8d4bd81907cebc400084918e8500efa
 DIST glance-2015.1.0.tar.gz 1100719 SHA256 0d8be9f28b1686de3d0d1037498eaaf717d39ad9fa85d2a07016131fff470009 SHA512 04f99eaf1043291eb5622c069d2a15d344d7d508740d7b738fce36e1373ec0df26172077b3bdf9f23cd8234d74a34995e3d66ac120430ff17017fe788eb3e9d6 WHIRLPOOL 862b2d89801f3a750434d50fafd75b8f22d031532910b7f63d6b8ca00546a19fa5a07dea1c286e4f5fea9b11614a4c25750a4b2ca5c429a03984a2972f681b40
+DIST glance-2015.1.1.tar.gz 1102359 SHA256 5c5714264c4ad9c3d178b983899b54f69f138505ddd77e13141dc5f3d1598ebe SHA512 d9233b78174ec0f84b317abf7d26153a7e3ead25b4ebc31acbe5d0806b6877da5875de52ee0742dcbdd5fd3d23cb0240208f6fd57fa59cc403ad228ac85f2a0f WHIRLPOOL 69a4cd27b4ac57a47523ceb4b899bbbb3569e7af2bb8f3e64373d98b7c72450bd587c6da96d33903dcbf44e02f89ea563d116d9d2dc90d4a0f472eca89963a87
 EBUILD glance-2014.2.3.ebuild 6039 SHA256 f24748da45ad30a8ae2476580de57211a6cfd3b3ec61131747db520d985eacec SHA512 a3a0331cd798bebdd268084700569823d1c15e7128a5ba3f512b642fe8f95c6abc553aaaf65a4dfe3b160109b09dd8c0ce1673a3992691600a2f2706530befa0 WHIRLPOOL b598821a118da0159ec0c5b8644e71d609902b1725011c9024412d7f20e5257639992f6641dd3440f645777749c53bc1bd8076abd791140d1cbc3e30750e3973
 EBUILD glance-2014.2.9999.ebuild 6050 SHA256 4d635412e9e750e9746d976b2ae7f678b4ec364a9485a54d461faefc3255b297 SHA512 cfa163e1ab038507021c72d73a3a9a6fae11a54cf1d52799b3696fd437848b83a934f1760efb2a1143484fa53c295818648b5a664a471bd546eb5be2ffda3577 WHIRLPOOL 6149a9f2070d9ad8d82f7044ee1e5b7c5456a707ff279cb1cb50da39aed4eb6c3a3b2a6fb56797bdf03baf28ef335fb15352c76f6194c369101e45a005976217
 EBUILD glance-2015.1.0-r1.ebuild 6651 SHA256 4cf14769e4c7f50b4efdeda3d4d19ff796777ad86550bf9034c1618aa079c330 SHA512 fe19df1dd7a8c4a22a3a587d2ac3834bead3138d629c180aadaef91d7369c5b7e8e02be84e504e65226faf159b9e4a8c6880b14adefae6cfc564a225ea40eb83 WHIRLPOOL aaa117aa260ed1007a126e4fbe347d52c23b3c624cad73e27831b37c8c5451226266542a346dab087ac383ec57b96eeb852343206795310cb70b25b34226802f
+EBUILD glance-2015.1.1.ebuild 6745 SHA256 261b6bab7c8e5422a4bd8879e6c965fed92f95389aa021d4cdc8c24a6a177984 SHA512 1f1c8c57641afbd5a1c61f0bb59cadf6f7401e02ab088c59cb46295fac55ba1592f687fb7ac3fb7857b30bd191be66a254b4b536009a27bac323cf4e8a34217c WHIRLPOOL 0c937f43320b7b1cf98f452265ec510ad1a6bcb2d9d99ba110c69c1d36f0d8e8decdc9602768af6f47b0e5193e18aec764a3f906f07d08e87af3946f9a996472
 EBUILD glance-2015.1.9999.ebuild 6623 SHA256 6a1a2199bd94ed97dab93cbe4043bad04e2cb6d5f9e4b7175641b8bbddb053c3 SHA512 28311194982c85dd14f2ebc4a90c53dd1fc2840c061439e7bded0eba1ccad66c449a1838d52adc481714be282f3b6b66954b3131e263e4a4c97c976a4223a420 WHIRLPOOL df1d27ec0579fc20773f3bdd223fb3efbf4a78af5f1395db983775c0fed668670fa8276ba98fbcac9ac530f98d11898683e0eebda315e03427a4196d92cba6b9
-MISC ChangeLog 14744 SHA256 75ccbca7962c6dfb48b6c93a77750605d1c8ef08084525e0f9a23f6c0930655b SHA512 35b04861652b6cf283be377db85800042ab7acc5e27fbe5f20804cbe03b49795b96fce0cac4a8e6081cb194b7c3e81794782597531e01ac2cbdeeca1b519e3aa WHIRLPOOL 5e4c508a899b41ad88686df48155a0714cf5d28b9229fa9458a643e0c0df48ad3333ea623ad30ea4d68510e5e210623b947c4c54323c09fab90300c02e5aabfb
+MISC ChangeLog 14874 SHA256 38e7ef131405a216b7ec436616f484371c27c20df55ef123714d52fe1509e8a2 SHA512 fcee44fb38b0bad6cd249a452e9a470598aa66155e38628f15481553e7bde9fa572883b25cf37ece4ff21093584d421deed7ea8c322e5b2405a60f061703b7bd WHIRLPOOL eadd7cf0df4447ca51588884b7014351d373b947772c08ae2efe8ab7bd6fa569575a5eb006fc33a88a959835ffeee8c9805be24c333dd5c60fb63bbafe149d3c
 MISC metadata.xml 684 SHA256 1ef788456271f080736aea2b5b997f6bbe69e5682dc1e95c923ce77c5235eb78 SHA512 325e17a5fb4840a87e93fb4947cebeec1788b483a4ef64f615efbef07e17b79ca5dcc8637420dd3e7bf89ea858eea25e47d48bdaf07e0aa77df5b40aeeff7c06 WHIRLPOOL 821b3e8cf042676c408a0d8918b609a34fdc4270f960c14e831475669bfa7c2fc9acc1ef1839ad28749979ebeabb7bf1e0a8b1fa39a139c3fb4a5fbf4ff63bcf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iJwEAQEIAAYFAlW5F/wACgkQG9wOWsQutdaEFQQAlpHr6ZxzipsQ8c5ARNFOpBRZ
-K4pYgoz26+/f+aJt0IjCWHXcLXAROTDb6xlU2/68dW68ZvCsHLQK8KLL8geOjoVZ
-HAUIDqBpZTlBEeEo5/xB60xLTZG8jMqvOihfCpjdy/PCPfiNqZ8j+PtifMTsWeWJ
-uHbLz43phnAXc+RFafc=
-=hkXa
------END PGP SIGNATURE-----
diff --git a/app-admin/glance/glance-2015.1.1.ebuild b/app-admin/glance/glance-2015.1.1.ebuild
new file mode 100644
index 000000000000..926dd9980579
--- /dev/null
+++ b/app-admin/glance/glance-2015.1.1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2015.1.1.ebuild,v 1.1 2015/07/29 23:24:16 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Provides services for discovering, registering, and retrieving
+virtual machine images"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc mysql postgres +sqlite +swift test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? (
+			${RDEPEND}
+			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+			~dev-python/Babel-1.3[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+			>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+			>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+			<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+			<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+			dev-python/psycopg[${PYTHON_USEDEP}]
+			~dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
+			dev-python/qpid-python[${PYTHON_USEDEP}]
+			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+			>=dev-python/elasticsearch-py-1.3.0[${PYTHON_USEDEP}]
+		)"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	dev-python/ordereddict[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.6[${PYTHON_USEDEP}]
+	<dev-python/WSME-0.7[${PYTHON_USEDEP}]
+	dev-python/posix_ipc[${PYTHON_USEDEP}]
+	swift? (
+		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+		<dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/glance_store-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	# https://bugs.launchpad.net/glance/+bug/1251105
+	# https://bugs.launchpad.net/glance/+bug/1242501
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	for svc in api registry scrubber; do
+		newinitd "${FILESDIR}/glance.initd" glance-${svc}
+	done
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins etc/*.ini
+	doins etc/*.conf
+	doins etc/*.sample
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}