syncing to stable/juno

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

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index d615d8c09cbb0c895118787a1b31fbb29c3c8d89..51fe1753f662c75eccfc8076f27fc6a441df02da 100644 (file)
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,10 @@
 # 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.64 2015/04/13 01:55:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.65 2015/04/13 03:02:24 prometheanfire Exp $
+
+  13 Apr 2015; Matthew Thode <prometheanfire@gentoo.org> glance-2014.2.3.ebuild,
+  glance-2014.2.9999.ebuild:
+  syncing to stable/juno
 
   13 Apr 2015; Matthew Thode <prometheanfire@gentoo.org> glance-2014.2.3.ebuild:
   try signing again

diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 9fa9346b336239654e23f3fd4f47f9096d4875d1..bd4aab0eea96c4687fcfd4057d34e9b39c576a21 100644 (file)
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -6,24 +6,24 @@ AUX glance-2013.2-sphinx_mapping.patch 582 SHA256 043c3f7ef413cf3675920880af5794
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
 AUX glance.initd 651 SHA256 1b2fc0e11d572bfcc121cb995ea7b3cce63ee705a05d2fb34a9f99d655546553 SHA512 c0ed1cac2038dda8882d5ce013b948debf1e5e411a062d8c9cbfdb1e1683c94bfd78a3f3468de63e0cc28930c59c0ff323a3116ce6a74ccf5d8ad1d547805bad WHIRLPOOL b0b25f4e983bf9f46cb9dd5872d14b24dc90e3c383dc458c79d065e0855bbf838afc4a13f0c92db640cd64311e22985d0b92e1ca4d428ce8b1f08ff23b89cecf
 DIST glance-2014.2.3.tar.gz 783651 SHA256 e0c4eda2ec6a38a11129b45f6776dc32a763b1e234f0834d36d108690ce85be4 SHA512 c7e0365fec7553a12b3f326f3f7fe69323bc9c20653aa6a972226ffee48cd54f4850cb3ee591b78f6932c6f2808cc260b7bc336cdb2f0a80852a05bf56dd717a WHIRLPOOL 96d1e7e5fc5061b0b87bfeb5371788d79c860d69ae638d61a616f74e930492b4c6dfe2206d427462cffb4c537f6ba99ac8d4bd81907cebc400084918e8500efa
-EBUILD glance-2014.2.3.ebuild 6082 SHA256 99f7362b3576661140cccf48d3fefd71bb736523db3eb3e02f81793c39fd7e72 SHA512 4cb90a1c770299d2081a56fbf098ef27042b8b7cf3f1b508cd942d3b1857b26bf87a462797b452897b225b32fe96b9d4c0a725e8d51bc3850d47acdfe07e7bd0 WHIRLPOOL 86724d9ccf58a6baa529d9d5d2d02d93af12ad586596727e3c217dbfe3126e1b41e6e2b406cee9f48e6daee5283b5da5b746af6f119e60fc428f9c91739ff371
-EBUILD glance-2014.2.9999.ebuild 5643 SHA256 b3d899888ba553231ca184b3d6cc2946617d408cc9f5f79de0a261e422232cf9 SHA512 9a59f916c35b591e69cecf4029690cda35ad6d4a4bc030f5bc49b8e978c13f9c7a395385f659fb728fbb6d824e25a39fbfcc61481b22dd52e0389e748c8ff9b0 WHIRLPOOL e570bffe372b08b968843afb11656d2a42387736e9d71b6ef2cb0b421e4fe26960143d1b93b24979bbcd9f26eeec310a3a8ba443d5421664d76b541263f6ba1e
-MISC ChangeLog 13000 SHA256 ef88ef2c23431ec71f98d76aa27b43c46722bc1e4e4c11a936fc20bf7e6fe011 SHA512 a1d9c9ebe7a74608bcd2560ffd144add9ff841cda95a470ba1f7c9a6ee81e0a0d8720b7eecb9deb99f14a3924c184e5219b6b4db78b4e9908f8b49ebcab04711 WHIRLPOOL 067233a54ecb2a438892203ee7be9b0c27edb527cef8c677c57ec4a0584e617ff0d857f714fa97da01d6c23d4c87d87af8bff55dc5f4f71e50f21d5a7472b49d
+EBUILD glance-2014.2.3.ebuild 6038 SHA256 e7ee0d58799a7aa1693dfeb1fef22fde87472ffd9c52971b54b760aa75f5cf4e SHA512 9a8728458833616bea0b31004e2ffc4492837b92972b72d4d4b766def8c892f13c3be5b6ab6a89edf6500604f3899cb34eca3faf07a93b0bf34694b4cc754ebc WHIRLPOOL e128f5beb5143134645bbbd8b54dde48ae3f46ed6e320d7f44157dbc72e5e2c4a9f428dcf6646a3cfb75109be1f43fb58e9eefedea56271f01f8e2c8c18cfef5
+EBUILD glance-2014.2.9999.ebuild 6048 SHA256 a3967e4b9f55d8a6d656bdaa811fca1c56005795598ef4d190e49ef3ecff5359 SHA512 50a27b93d296528974a41c11db2b948d66aab8aa5d4c9cf2480eca5632f67efeb666341b6416d166300e6b76ab380956d51a931011d4ee6d04277b88e976f9a0 WHIRLPOOL 5757379469b4104a5d31453702c7aff0ea5bde32de446114d89fce09bdda971636b195a0ee953615dbd31b137f68c1d7464855f6bf2f73d2564d40e2156c14d9
+MISC ChangeLog 13136 SHA256 7373881ee8b6ec6f0b4da63a536249fce20bdc74a2626dde839996ccad2fde37 SHA512 25b4a88e3f65111cce9e5b43db31efe1a215506b48ce5afb27dee651fe31269cd3eb9a0143e8512177cceb45e0e63418e8bc230bc81297b45df75001a091d9a2 WHIRLPOOL cd87f12758b9ce3e62ec05d86f0f79d98f2f14e68fb872d281c44039e941c8585f8a14c343f90be67db932641509f1c5bbefb2853bf64e953d3df4852317123c
 MISC metadata.xml 607 SHA256 b74d960c096528dbb7c9be6b0da777e10abe32928459f045e7c58b0156e22d95 SHA512 e38e4dd740fe55d73d6d97fd9ffa3aec5466fbb5f8e6484b125560313245ae697a0dcf612fb065125c6737a8254b6218c0703f7de79437bb2799c6c67f386e45 WHIRLPOOL 445bf712fd733fa90c395cc24fd02155bed15b092713d502b54331da9237f397877c2328adbf4049ee64ae163713ce031ebe5048c8826ed1a011d4ebcdbb681d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVKyLcAAoJEGSje+quGaToriIP/3Lizvi80PaR7Wp5Kph0zZOG
-Ba6PwgnB7RHCbvPj0S3+UDjTB8D3f5gPJjQJ3XvAJF1EIQohpMnzVuMq67E7qSQh
-95bqBnl+cJgYImiImeXhisOd8YWvELbknRJDJBb2iTt3U5SRw7NOz6/WlNbyUy45
-XPSxepYgrCx9v7/JbQMAEm85dB5QTPnPjT3jHY2MfxSBRtOR1t3xII/o/NIeLO+c
-ZZMdecH0EjTJ96HeYb8muPe6oGESGp5xctz0cvCVtHrieoMumUJq79Lyf0Go8HMS
-qkuLont4z0hHvqV+fLDGlv/324p6sv2w0Crb5Em5j0cIf9vWaffK/nKIxa+kvn7c
-kknoICYZ9ZIpR+1FxOvpNAkhc9iyBbLbDbLfysyZVTWMtPQHAVxGh184k8R91fsY
-RpYUfnxNSdsmWCeXVHaBaatr+ADuFFOF8Gh5yGyLgtFW1aouWIrIQ43aw3DF6AlV
-9RWzbIzgoLjf2EAQ2JTpdY9f5PTOAEyzfSyWN+MwnIK3CFHBg8/2W0+7pTky3VPm
-tlNgXqfkwopxOKtTPDYC7st0+3fbyyG6Y8Kqh0+PyxPURj4F3nd6uKHvhYg/R5wh
-sO55+zfDBowwx5uiopgZGY5UeUQh4tGD8u2t+yF7vPEiAkl02givh6LT4QcoRTwR
-NCQWftokkmdHjrgfIPNd
-=aMNT
+iQIcBAEBCAAGBQJVKzHKAAoJEGSje+quGaToSHIQANnZEvdl+1JuqXpruaSOEFbC
+eT5spY2tMUVxO1CmGfBMJgBpm4eqlGqUfQcuUJTQZdswJm319fTrCSy+dZcMkGvK
+lvHZ2O8GC8OoJ8BFnx2CREl9QvSf+HHHoIuFyGPX+5MhbG1+9Z5Eu8NRUqaLNnG0
+ilNI1z8x44OIEG5g0y0B4dbTYOYgZhmAviVFAXdwoko/b9ds+JnNAyLpH2hU9xm7
+aZUIWwuv5znn9L9y32hzYTHtshmsJtchZVxWaSw7P7kQpEK7I7mzA3yMHVs94sIx
+XjofnkBUgwh/ykgRJ3H438LeOEXdcu95a8+X7xsBmXx/OKTyCuSLbW77CdjeSwlV
+1pwjxB9rtIOsbsJ2J1EcYgqAstMxTobcjdbcM5BLcsF5EjehMWAQcxWR1TvUDmEg
+jsCH5AyoIn+/IfV+FW6/N8ubOd3es7MrrP+2UR2FokIPKfKwh55LD5NT3EXy8qDq
+At13ncs7tVgbGCu/UYtweNuByorTMJMjL7qTgrwV2/Q+eDSdwJt5oSt60VhHLVY3
+Rok1h3Ad0pK0jiFmgatnCpScLENtx+o9T5rwjXwQ8GuvmENYUW1XQNjRrE+zYLxC
++88CyNKO4iM+eBvgXyEG/rFeYLOuhRfD2JuwKziAzJDjWO1Dy09sNxpB1Tcr6ETq
++b7QutxhGqKyp3XhMiYP
+=Nf7n
 -----END PGP SIGNATURE-----

diff --git a/app-admin/glance/glance-2014.2.3.ebuild b/app-admin/glance/glance-2014.2.3.ebuild
index 1cc9a50b4bf63e2895e2a97812b21bcf923610c4..dd602a50674f2b3a95dc8bd114873d26db97d4f7 100644 (file)
--- a/app-admin/glance/glance-2014.2.3.ebuild
+++ b/app-admin/glance/glance-2014.2.3.ebuild
@@ -1,6 +1,6 @@
 # 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-2014.2.3.ebuild,v 1.2 2015/04/13 01:55:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.3.ebuild,v 1.3 2015/04/13 03:02:24 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -121,7 +121,6 @@ RDEPEND="
 
 PATCHES=(
        "${FILESDIR}/${PN}-2013.2-sphinx_mapping.patch"
-       "${FILESDIR}/2014.2.2-CVE-2015-1881.patch"
 )
 
 pkg_setup() {

diff --git a/app-admin/glance/glance-2014.2.9999.ebuild b/app-admin/glance/glance-2014.2.9999.ebuild
index 721562935a27204694ee1e6fe877167af3a24165..14f9b96f86d71b3145096f6e83528aaf7955524d 100644 (file)
--- a/app-admin/glance/glance-2014.2.9999.ebuild
+++ b/app-admin/glance/glance-2014.2.9999.ebuild
@@ -1,14 +1,14 @@
 # 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-2014.2.9999.ebuild,v 1.8 2015/04/13 01:53:21 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild,v 1.9 2015/04/13 03:02:24 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit git-2 distutils-r1 user
+inherit distutils-r1 git-2 user
 
 DESCRIPTION="Provides services for discovering, registering, and retrieving
-virtual machine images with Openstack"
+virtual machine images"
 HOMEPAGE="https://launchpad.net/glance"
 EGIT_REPO_URI="https://github.com/openstack/glance.git"
 EGIT_BRANCH="stable/juno"
@@ -19,33 +19,41 @@ KEYWORDS=""
 IUSE="doc mysql postgres +sqlite +swift test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+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.8.0[${PYTHON_USEDEP}]
                        <dev-python/hacking-0.9[${PYTHON_USEDEP}]
-                       >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+                       ~dev-python/Babel-1.3[${PYTHON_USEDEP}]
                        >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+                 <dev-python/coverage-3.7.2[${PYTHON_USEDEP}]
                        >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+                 <dev-python/fixtures-1.0.1[${PYTHON_USEDEP}]
                        >=dev-python/mock-1.0[${PYTHON_USEDEP}]
+                 <dev-python/mock-1.0.2[${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/requests-2.1.0[${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/testrepository-0.0.21[${PYTHON_USEDEP}]
+                 >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+                 !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+                 <dev-python/testtools-1.5.1[${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/mysql-python-1.2.4[${PYTHON_USEDEP}]
+                       <dev-python/psycopg-2.7[${PYTHON_USEDEP}]
                        >=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
-                       dev-python/qpid-python[${PYTHON_USEDEP}]
+                       <dev-python/qpid-python-0.26.2[${PYTHON_USEDEP}]
                        >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
                        >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+                 <dev-python/oslo-sphinx-2.5.1[${PYTHON_USEDEP}]
                )"
 
 #note to self, wsgiref is a python builtin, no need to package it
@@ -53,6 +61,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 RDEPEND="
        >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+       <dev-python/greenlet-0.4.3[${PYTHON_USEDEP}]
        sqlite? (
                >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
                <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]