more fixing of juno
authorMatt Thode <prometheanfire@gentoo.org>
Tue, 18 Nov 2014 22:17:38 +0000 (22:17 +0000)
committerMatt Thode <prometheanfire@gentoo.org>
Tue, 18 Nov 2014 22:17:38 +0000 (22:17 +0000)
Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

app-admin/glance/ChangeLog
app-admin/glance/Manifest
app-admin/glance/glance-2014.2.9999.ebuild
app-admin/glance/glance-2014.2.ebuild [new file with mode: 0644]

index 98ba6f5f5076f87dd4436864a5ea7a95134b42d8..56ae675e584c477a2db234f056f37a4fca349ea1 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/glance
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.50 2014/11/18 22:14:03 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.51 2014/11/18 22:17:25 prometheanfire Exp $
+
+*glance-2014.2 (18 Nov 2014)
+
+  18 Nov 2014; Matthew Thode <prometheanfire@gentoo.org> +glance-2014.2.ebuild,
+  glance-2014.1.2.ebuild, glance-2014.2.9999.ebuild:
+  more fixing of juno
 
 *glance-2014.2.9999 (18 Nov 2014)
 
index 0368bbbaa3de028e6b3cafdc0bd6b5a7cc7755db..3d66fe0581e2ddee54be757db089540472b5515e 100644 (file)
@@ -7,27 +7,29 @@ AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e
 AUX glance.initd 651 SHA256 1b2fc0e11d572bfcc121cb995ea7b3cce63ee705a05d2fb34a9f99d655546553 SHA512 c0ed1cac2038dda8882d5ce013b948debf1e5e411a062d8c9cbfdb1e1683c94bfd78a3f3468de63e0cc28930c59c0ff323a3116ce6a74ccf5d8ad1d547805bad WHIRLPOOL b0b25f4e983bf9f46cb9dd5872d14b24dc90e3c383dc458c79d065e0855bbf838afc4a13f0c92db640cd64311e22985d0b92e1ca4d428ce8b1f08ff23b89cecf
 DIST glance-2014.1.2.tar.gz 2117649 SHA256 497ebaf2736cc1f243eba7b17104d7cde08517c7cf70c021fb59768cb710a3bb SHA512 180ebdf6f4bcde4ae4b342c31ea2854eda1c45ae237245162772cb8cf8d300ba860748ff6fdaa87c0d1da60538f077441baab9f084924e578e0da0359758d80e WHIRLPOOL dac7e02a747260d3027de7bd927209303bf24862511c594116ab4861cae30b08fc5a39d2b77ee5ca61249dd465761de56184b5b0da9bea989395d52ec7aa5c84
 DIST glance-2014.1.3.tar.gz 2124337 SHA256 302a135e96c0a8d040957cabbee58a8fb71e8b3e30054641d825e4003070901c SHA512 8d23f7dbadf4368c4c15389b3d3198b9f6ad74d8831dbc50795e4d306ed2b5c3d9a6d9e324ce1555fa66c5063c0855ac96b99302ebc47c0dab67d88d3a109058 WHIRLPOOL 43771d78c3b58e321fb36c004945a22611ebfcd81c10f390112b10c6198bb9c6d99c0b7a82ddd3c463f286fe7860a76afdf7e3a69c0020508d693ccf04eac11f
+DIST glance-2014.2.tar.gz 780616 SHA256 49838163c3ccbe068c1868fe38b0567aa7267fbe3245b010e196de8624a07082 SHA512 782cc6d6e759f98dc5399566264769f5806a50dfa469ac35bbd95f27a33df31837252d4e07b080e442eb53c572d8d8f29332ae6dcbdcc8f7e3e836a06a83841f WHIRLPOOL f1731885c045665ce54dd3b2e39fe994a1e80db8f6b74cdb556899f94632681ae9037471864442a724d7cbb6f4deae100856ce482f112a485ec26fca81b22597
 EBUILD glance-2014.1.2.ebuild 4919 SHA256 f31b2d20bea14911985f43b5a5f0fe928f4bba8e876a44b59d116a100c116935 SHA512 11133e1522cdfd56fcd9f7af35a1270d6f31d07c9a2fc7b698c99ca71aabe551cd675e4247ae3a35d6c1a82f275be02f66d7caea04572338036192b031a5361a WHIRLPOOL 5fdab930a85042eb02b7311db3d01d199990aa5fe8762b9dfbea4390dd29d2f712e78a04aa212bc4afd16888071f8f97e98dee22bdb7f062c84e5b66bd0d8936
 EBUILD glance-2014.1.3.ebuild 4976 SHA256 c78810ffe73aaea1f81aba8b1c640d98596a48c464a500dffc3bb28dc5ae54ee SHA512 f43f930ac52dc99119c4ac84996c80d8d614877ee82734539d779c08c250d0a5091a164e0c893b97f50ba14916ce86fa36a98777c2c705051fd544bc767f329f WHIRLPOOL e57009fee8526c1e2f492dc81de666a261ad35882201d4945e60387e9cf6a582bcfe024acb7b07119a2f46b3cae96f599fa9394a054b5ff942901e6d94652c16
 EBUILD glance-2014.1.9999.ebuild 4986 SHA256 8173f54ab9ddaecf68be50998400700f45e4805f9e6e901395184bc2e63e475b SHA512 3b54a1bc0a46f0af680d64f41ce2bdcf743875ad1645c3b2d61c2f94a9bf111e47d578f1f7d7fb87f3f8e834ae708b9731d36b5bbbab310a044658f8b4ff1529 WHIRLPOOL 4b36bcd9b0bd8752af25209fe13628c8e3fb91133777c5b3064f4e5116a9fa69350a01d9a7bf2d4559abc0daacf12a5c7086dad2e4fb856a39b101d0134fe07d
-EBUILD glance-2014.2.9999.ebuild 5788 SHA256 0c4714782cf6ea3ae470eee01c3b8256cc2f98a293f8e6a2aecd442ebbe483b4 SHA512 9408d173807eda1de1d798f921922d31c472a68072cbbb78d658d874408300fce90a93c6839725cbe6a2f8d46ca4b4d446c24d28f8befdb7e65b19e765310d7c WHIRLPOOL 90f87764bcab0d878dfee73088c6909b43a1a6faf0bc4f661e5e8fa284b6626620e9c18198252b21117696305593a67107f7ca42a9bce6c4869f4d37ba04d310
+EBUILD glance-2014.2.9999.ebuild 5784 SHA256 5b4e882084d94385d26acea4a1218287ffae52faed3530d9b02d7d2138e8a90f SHA512 95cb4250a0dd83ba01bc4c8c802d2ef86b14e252064c63b7a3569a479461538052913ecd3f26a624bfa1d16be160bcc0d750fc7f15315b8fc4fb72451de47fd8 WHIRLPOOL 068714c990bd86a8d31c63c075a10f9560f23cbc0d20770598ed2929d55ee43e5de6d06cde300db14e20bf3c8724f403362744bef3a6e91e65d5a6d6e6c62b35
+EBUILD glance-2014.2.ebuild 5772 SHA256 d3c45f8e15d1a8ddcbae2dbd692790cd84adef0fa913839d8912b7abd939da77 SHA512 13d3452e284980a429b8d8d34731992694c710de215692d346fd7414e192bcc071b00f504fca298bd7d5e9a3da639112078aa572a2d70fdb1bad6f13c06f9f51 WHIRLPOOL 548ab8a9a6a9a0d0b5581c515f3e6c630b2973cbcf71639966c5e42088fb159180f3bdefd5740c3f303567bc25d31d311955dff05af61d2bb859d1f8b4d26d08
 EBUILD glance-9999.ebuild 4843 SHA256 cb262eac190bee1adb59ccc125809a3633adbd3448f5a15ee567b3c9a9e0b829 SHA512 e4aa1b6862ded7694eda77bf440ad71e6e6d413a7a7786f1dcd90f0084b8fdcf200486fe50cb49cb78936f0e2242e52b8122c84daa82c142836858e52d8137e7 WHIRLPOOL be80f071732df48b517f40015296c6a921afa665fece31c1efb3a12bb7bf89df20b9d113c10fa470c5ddf25da09d2e97377042ff295cdd7db2bb05e5fc04691f
-MISC ChangeLog 10231 SHA256 1a9fa8d51f4127ff35c7a41e28031e8dd3ef31b6945233b8a6032193696301cd SHA512 914d33df80ea9749158e3f4190d4380be2f2b717b9e77acd54d759a7406d9f48b839b4ad806c7999bb832e08903c09c41c1c3825828b2bf8370bf47f975add19 WHIRLPOOL e476ea7053fa8e92a785b2b3c2f0634ec40b13fe8fb6ca8cb882408330913ecfbe36d92af3516c8498fae512a92352a8cc44b2088db2b03be74f3c4d7cdade85
+MISC ChangeLog 10417 SHA256 ba4c8f8d921f6add357108b891ace7e7018649e746cd158c16750bbff359e31c SHA512 94b42e1b4fcf5a76fdc1751c3421bd361029fd74d6593403c7c2e046d5e14364c5178f38b73c0d85105c85021e2fb932ebf1ec963a539d9f77eb7a3feed71c1c WHIRLPOOL a0c2d6fd3bb9befb8d2bb2f4fc1ccfdbea0c2c97a958bf9baa8cd1eb131054f6878ec873c5a37f50138065a1992b07fab265c0cd36e705c7d556265dbc49f18b
 MISC metadata.xml 607 SHA256 b74d960c096528dbb7c9be6b0da777e10abe32928459f045e7c58b0156e22d95 SHA512 e38e4dd740fe55d73d6d97fd9ffa3aec5466fbb5f8e6484b125560313245ae697a0dcf612fb065125c6737a8254b6218c0703f7de79437bb2799c6c67f386e45 WHIRLPOOL 445bf712fd733fa90c395cc24fd02155bed15b092713d502b54331da9237f397877c2328adbf4049ee64ae163713ce031ebe5048c8826ed1a011d4ebcdbb681d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUa8TbAAoJECRx6z5ArFrD7McP/3IQrUJ6CJCQwQvPu33SxXmW
-75FIW1tIDrYDVYD5Ic4iGpBNb2kuVS8HbTab/ZUx10mnvEM2o+pLo6t+gPr/TI4b
-aFOCSpcVF8ApiS4D3LAVPhCvHHAwhTaz/Flb/Cboo5K+FrO/ed5tjpL9QfxnaFk0
-qt/WuH8ZrhMU13XK7LKxNwR6S1rLIncaMrjbOsJFGqF4QFaOo6xml3ZlEoLRinn5
-t4CndYHoYxbzRZq+wwsBk94yTpnamKFjvqunyG5nFvEGmM+SZdjY8Qa26hZ5VntH
-OSxUpzmOPDvIzfBmPxi15rkEnuT2lmXYpev97eMo/ux+PgfSE/VKVnk+csgvAqvn
-pd+FknpYjBt/svN8w2TjofIhDJwpHZHGFotNLtyGBAHbVkhl4Y5gyU98Yg7li/lK
-DIFi2rL2fBnyIv/1ISvNSRm68iTTYulQA3HbkFn1gDzMMdefsBiZRBQwO1jD4NAF
-3vVDu2q2f30g7lAGmKpy7qAt2N2r1y2JaqdUjYhQeQbOwtk7pACEVwOyidESgPFe
-RdUFlrGv4WVszVHSuId8xEgotYw1rfmObRehhuHy3WdpZfAUdY185QyyNSf+Pbq/
-cG1b/urHaKUebY4nIsNF6JKjyxSpzIpdsDeIs+bgs0Ti4QufLV0FAdxn0qPCAJ4x
-fY20TdaeWSkxb6Aj4cFC
-=bCl/
+iQIcBAEBCAAGBQJUa8WrAAoJECRx6z5ArFrDVVwP/RII3ZSRsmkfW9oHFGgtA205
+ZZQ4R0eazearm3/Hp95BOFIqULaxz7fRk2gZ68p7a9vkHLDthNqkQhncf0/5kZ22
++6rVBrLUVgs7iAuh9hKhqi/7Eu4v9TR6yKUCCtr1YmyFnhVq0xsxqryEfzODEaYC
+PDqA1R01ewZ/x21+6uO7BW0ZhnKUEWXoWD2XjbKYaZwqvCWaRA8+vRWIjpqEWC0i
+yxq3lvVVtD0dDNsfTATqgsf0ChTY7zsAs986oY6H5136BI8hI0dxZ2O9qLdI7lGo
+ghJXi9doyubSIKgBof35T/XoctiWnGUGGkHqRfYLjWXPiTvve+24YJtnUccDZDUV
+bqozPITUBGGiAYuyzaZKbSeXmLvV7qQe3GwK0rfy40jS1d2fnkUYvbv7HXDSgtK0
+kVS061qexbh/yhFKB1BIAS7HrvlOiZ+PDKHdXWD8/r2XF32LYCY+PZ2LnAuUqzYK
+/eN6ka2J5PWW+Xnuf+8koahc1usajExtk8sbVs+nz+06hrihiul+y663wJt+AJm0
+w5zTQrBaqztLn6MM8OK4gdz9EA623XhjG1v+m62A3/HkEPDGZQd3QB7kopUr0DoF
+4GVHJwk06h9v3HPDpx6fxfCbf4z+Uj/Arwo2qv6WX1DKUjaBNdKQqaBAxUkjEY9i
+Wb/r78Ca2kk217bq/CBT
+=+WIR
 -----END PGP SIGNATURE-----
index a0c3d9a116a488c391e3712af9585e34e38ed3a9..5938d153ad57c6fba7e3940368a6d9d4d59a29a7 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild,v 1.1 2014/11/18 22:14:03 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild,v 1.2 2014/11/18 22:17:25 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -11,7 +11,7 @@ DESCRIPTION="Provides services for discovering, registering, and retrieving
 virtual machine images with Openstack"
 HOMEPAGE="https://launchpad.net/glance"
 EGIT_REPO_URI="https://github.com/openstack/glance.git"
-EGIT_BRANCH="stable/icehouse"
+EGIT_BRANCH="stable/juno"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-admin/glance/glance-2014.2.ebuild b/app-admin/glance/glance-2014.2.ebuild
new file mode 100644 (file)
index 0000000..bcdb90c
--- /dev/null
@@ -0,0 +1,157 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.ebuild,v 1.1 2014/11/18 22:17:25 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Provides services for discovering, registering, and retrieving
+virtual machine images with Openstack"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="http://launchpad.net/${PN}/juno/${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? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
+                               <dev-python/hacking-0.9[${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/mock-1.0[${PYTHON_USEDEP}]
+                               >=dev-python/mox-0.5.3[${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-1.2.1[${PYTHON_USEDEP}]
+                               !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+                               >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+                               >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+                               >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+                               <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+                               dev-python/mysql-python[${PYTHON_USEDEP}]
+                               dev-python/psycopg[${PYTHON_USEDEP}]
+                               ~dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
+                               dev-python/qpid-python[${PYTHON_USEDEP}]
+                               >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+                               >=dev-python/oslo-sphinx-2.2.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.8.4[sqlite,${PYTHON_USEDEP}]
+                       <=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
+                       >=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.8.0[${PYTHON_USEDEP}]
+                       <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
+                       >=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.8.0[${PYTHON_USEDEP}]
+                       <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
+                       >=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.15.1[${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/boto-2.32.1[${PYTHON_USEDEP}]
+               >=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-migrate-0.9.2[${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.4.0[${PYTHON_USEDEP}]
+               >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
+               >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+               >=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
+               >=dev-python/WSME-0.6[${PYTHON_USEDEP}]
+               dev-python/posix_ipc[${PYTHON_USEDEP}]
+               swift? (
+                       >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+               )
+               >=dev-python/oslo-vmware-0.6.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-cinderclient-1.1.0[${PYTHON_USEDEP}]
+               >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
+               >=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
+               >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+               >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
+               >=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
+               >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
+               >=dev-python/retrying-1.2.2[${PYTHON_USEDEP}]
+               !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+               >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+               >=dev-python/glance_store-0.1.1[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-2013.2-sphinx_mapping.patch" )
+
+pkg_setup() {
+       enewgroup glance
+       enewuser glance -1 -1 /var/lib/glance glance
+}
+
+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
+       nosetests glance/ || die "tests failed 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/glance-api-paste.ini"
+       doins "etc/glance-api.conf"
+       doins "etc/glance-cache.conf"
+       doins "etc/glance-registry-paste.ini"
+       doins "etc/glance-registry.conf"
+       doins "etc/glance-scrubber.conf"
+       doins "etc/logging.cnf.sample"
+       doins "etc/policy.json"
+       doins "etc/schema-image.json"
+}
+
+python_install_all() {
+       use doc && local HTML_DOCS=( doc/build/html/. )
+       distutils-r1_python_install_all
+}