full distutils-r1 support and sqlalchemy isn't so bad, it's more it's lack of distutils-r1 support that made me sad

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

6 files changed, 73 insertions, 60 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 1ceb9ab79c38..177fb7fa09ca 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/glance
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.15 2013/08/19 03:23:53 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.16 2013/09/12 04:47:49 prometheanfire Exp $
+
+*glance-2012.2.4-r4 (12 Sep 2013)
+*glance-2013.1.3-r1 (12 Sep 2013)
+
+  12 Sep 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +glance-2012.2.4-r4.ebuild, +glance-2013.1.3-r1.ebuild,
+  -glance-2012.2.4-r3.ebuild, -glance-2013.1.3.ebuild,
+  glance-2013.1.9999.ebuild, glance-9999.ebuild:
+  full distutils-r1 support and sqlalchemy isn't so bad, it's more it's lack of
+  distutils-r1 support that made me sad
 
   19 Aug 2013; Matthew Thode <prometheanfire@gentoo.org>
   glance-2013.1.9999.ebuild:
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 454edd9a861b..b36ae29ec077 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -7,26 +7,26 @@ AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e
 AUX glance.initd 1276 SHA256 030c10e8688916024eef7222d9f801f2fad2204c160ebc5898e3f764bc96c353 SHA512 4514ce8df0b96e1dbd51df4c55d79cf55122957199488dcfcdf8699de3f919b58e81609cc129203d62c2fd706865463ad480ac3cb50bd151471594171532cdb0 WHIRLPOOL f82ba96f3429c937e9404e0f4ceb643b05c32d127757eeabd5f0d0790eef91a62a11978a237cc0fa1abfd2246b811a9d61e03247ffb6320ae145d7ab9a2515b8
 DIST glance-2012.2.4.tar.gz 643408 SHA256 d50fa522e890258eff32aad1947684abdf0cf0c67a8a487f60a7179a84edd3f2 SHA512 fc91d799fa5fd2c66aef228d622c852623e70fa83e5babdeb10e041f77571e5a08c90c6fca16943dc98ca1cd50a09314fc5bd282e5530e7e1e44a623eee28198 WHIRLPOOL 34fdfab54444845ed4a3c0e849066f01ef88cf4317d952a0fedf562f331a41c87572d80234296651a722770929472de9263f7ded37deaaf6d65f35723e41031c
 DIST glance-2013.1.3.tar.gz 721788 SHA256 642782416d790dfcb6d5bb85626dd5d48784ba8f3a53e7863ec13312e86cb209 SHA512 260bd30555bbc4f9d170c4d542bd159039558f563da55f896095323cd0369f0a10f5b8d5ff52b9c1ad3b6fcc867a54a8ef276f35ef9e65cbc0083733de3e5643 WHIRLPOOL ad2d62004bc95033dc0031df426a508942466a432cd18de2e3ba9e89723357b880c69052badae32fde224b9004606cb667e98a1c63e74b182bfb1b308c2fff54
-EBUILD glance-2012.2.4-r3.ebuild 2690 SHA256 7ff1fbab494058436d41f56392ea32a9a701f77f61919247c2e08275d58e291f SHA512 6180bb2adbb5305f77caecead3771d32fc201e81635e694caac4162f835cae1125c2dda7829d2268af54e7bf64cb57f447e82e33c07bb46cb054801301324905 WHIRLPOOL 080efcb922f5ee8b58c80aa1ada75ff9ef085828c0b8c9a1280c52f6f6d5cf3d6167bb14bd198edabef9beee971885dd06d1cc9588e52921278b90d36e9863bd
-EBUILD glance-2013.1.3.ebuild 2859 SHA256 8b662a9d485c81edbe36085abdd74d9e660721651b29ac41e62de6eb234a3490 SHA512 3125e2af167b7641b4800143034e38faeecf8e6fe118cf09199be55f5bb3662ca95794db95306ed35a41858c5cf40eeee66c783e2c5e2275fbac2312d88ca408 WHIRLPOOL 2a462c3fac4bb173ad1c7598ff921f257a79876ab78dc049287afa8d6373e15b031438373ee6cb1b876245088a3618a387a03a1f9f601bee0b038a0b7e440394
-EBUILD glance-2013.1.9999.ebuild 2809 SHA256 927853c9ae5a60c8187101309f676cc99f5de9ac13800ae698cd616371603432 SHA512 38a51091186ced1420988605326c034777441aa80845888533d1d6f93e0a897249d2c6ef6ae5966fc31b6bcd5a5d4055615a90d7c213337a61930091adebc1ac WHIRLPOOL 785c483d13f5ce8fb6c3cb6910fec44584e03b812e5bd7121ee55dc8bbe0bdabe3de2cdb7fc8554f77954f8ec3bfed41fbbdc00d2eae1d40a61f58adbf8f2b02
-EBUILD glance-9999.ebuild 2794 SHA256 b3fa1ad7557e4664cc7f64342c6e1c05960b7716e197b78b91faa9714d6e8c6f SHA512 a3ae8f3129ce3d8ec61b7c0caf9530929a9e828b6123a2309520c4911b282e85e3730ef82cd6d94ec37d9fc2e65da7204b479c1dc054c58d46b275a847397a01 WHIRLPOOL e6aacaff9e45229517c5b221cdd4ea92a5d15023919d97657f2ca51e375b21767de71c4ddb1c93a24e6740256bece4e2525cca2ee95a1debe77b2f4650aef1d5
-MISC ChangeLog 3511 SHA256 89afd0ed43e8468822a3a316d99223ffe0e87010a878cd78e36a6f01918d03c4 SHA512 4fbf3f3a2ef9dcc2097d311ebc6c45818806891a65720b0109f1fcc52b6b82aa58cb2b8781e20d046b2fcdee89fa1a46fb3712cf889b9c99b839619675f49619 WHIRLPOOL 148b5e06aa8fbba9c86e3539a2ea35627da3a77e8a8336b30498094e0f580c2d505e96258b7b74dedba5668c171a512dc66bf5d961c31202251a7d8ebaed1bdc
+EBUILD glance-2012.2.4-r4.ebuild 3037 SHA256 f398b95d3fc89f70c9df63ba2203418c663b592321a5d8f83b746761afd88901 SHA512 0a03ab6e6eb3dc71f361d8271773c2b8c3bbcd4f779e479bdda4f54dd9ed0b05e4cfa1446758bef269dae6bcf3acd6ecfb646c01c7dd56cac5b7522950d4819c WHIRLPOOL 9e27596c1019e48c69affc0f76a13b288f6357483c2ea1bd9e16966be45b1a26b09e3495cbb51f804e9cc1524cdb4b5e102f6c546e8f1980899f3997227abfe4
+EBUILD glance-2013.1.3-r1.ebuild 3051 SHA256 84fa2485e7d929e6d3e05f0dee0737cd37e5bbbffb6d7575ceab6e337ce7dddd SHA512 140d77844820fcfaf53d0829e408f6802744c058978b82897e6dd4c43ee25b1442ecccac576b628fdb849d50ac19207eca04276c6dc3a19d9751356238a4562f WHIRLPOOL dec581e5dd1de2ba3fe5fb1f3f997744a26f75044cc3966aa5f92bd67cebfa4c19dc466fe421137f8c9499c764ea15898827b0132ea63c4d4982c6c1ed35ba36
+EBUILD glance-2013.1.9999.ebuild 2995 SHA256 aeaf487c935046ac693315d01a6a434135970dd1901b8bccfde258f8b5af0576 SHA512 ca709e0bc38d39e8e526e8179271f829c70ac879575a07a007158aeebb5eac23d48c721955300de4f3e88689ab073c5af59a6e11be5533d5083b2e71fd1e8bbc WHIRLPOOL 3193264255430dfd912e66aa97f32a2307e5ed4b3447dc5e99b69861c5dcb66bdb1bee4fed6d3e739bb7866488a1cb8361272042b2a53a0a47ded57cb1f6c5ee
+EBUILD glance-9999.ebuild 2980 SHA256 6a74d2db7d1011589d649922e49c7476272194c0f36deea7c2c9e7cf0b4c4241 SHA512 e477e3857b7949e39ccd7e61235add11dadba874efb18d52797f4cf5130e17b6ddb781a9664d267b7595227dd3bedd235fa5b8acc253abe35edf464f179801bd WHIRLPOOL 8e1e8dcd57034d2e20851e4ea6804b5258953350d9825813fe15a4a55ad0335ce7f565ab9610aaf49ff3d4722062cb24b08b5ca11b6eba06c88e661e57592516
+MISC ChangeLog 3920 SHA256 0db4cc51702d1a1e100a058909456b02e391fd5431c375ef79ad28d24041f84e SHA512 42375243381874243585be163f3b408917dd7ecccf0ab033ee9dead77c174d87682f4c6cc49e07ce77332e7de6a75eb2b5c40321e4dfd3fb87bae6518ec2a6cc WHIRLPOOL 1ceb446b296012ef814e416410ceb8e634ddf0cff51fa9b680e1fc755314893f3120956c8c814be6cc25a1c6cb220814884b20bf33ea09d500fcf6cc8e97e2e2
 MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSEZALAAoJECRx6z5ArFrD+gcQALbi9NP+lsST4T8R13QKPd3k
-yuZDYt566M/m3wRIPVub7epUt7BxxzmiDBtT1vAYnUJQurUy3yCSHDUebt1afJD+
-KbG0LM2tWZ3YeRUKWqCeAL7NDhmAibfNMJ38+xreD2Uupy56HqNZD4IgLg3kC4vL
-43fLXQiS2eJTuRAOstIe1yyVZC/HzJ7nZyweavdbLGWSMlC089xpyqA54u4pIbRq
-w0vroKh3uLt9VYkUtrq3viTcEHagFF/oJL11EOdnTBjbAauUWI8Fc9paImcm/jpZ
-IbT3U7uowUOW1lTsf+mdXQP38OxAAGRr1p45XPtZimMNjQBamUzKODI7HP+6gAJh
-revdQSz4vo2lNHjPYv3Nep140pizdhDw36mzv9YGg/IO0NFKcKQz284ma+y218Bi
-OpbZCSf0V7vtLOtJelO6QnS8PGvWRmBI9SByzQPHdUIf2BYXaqw9/IUQtWEgRbPo
-ARRIt+TTB+9/OlsYoRrV8Kpy/QQmppyWt3fBqp8ldfJTBPT0vIb4ePD230PnBYaj
-/Tz7jdhF2r+TIMmX8X07/8F1VTaJjAOnjDzaw69iVKrY45eu8zBHUaOsUroS4JlL
-iWirGvIhx28Jowy2G0ljgQbNvQLTlFmBPsmZnyJCggf8lexvwPpXWNC8Y6Gr2C5C
-OJMW5qEFaQz0T9P5ZqbJ
-=HAF3
+iQIcBAEBCAAGBQJSMUfRAAoJECRx6z5ArFrDMTkP+wQKxl/39ocOMrL+uKk2lp12
+cUgy5/rbwTfttXw5LP+qTRdeXvmphWDMgztFaawx/r+LRgSMyBuuSmxQam2dcGxF
+ytDqjZ8k0wjRTS/cw/AX3fbDCdYABwiLAdkT3yIt2xQ9nykIcoU7Dbf0mm0T+pVV
+I+HiyDsgy9GHJcD3AXZmVrgRylH5Ab7OSsPQ0PoLkNwwED3pEz5ZB2MT9vToIhmx
+7e8hSNRwPj0MB8rjTP6M9O6C0hQsdLiLiA++d7T1jnEN2v/haZWzaCHDSVpQPV4F
+WDqsXiKC4RMB4n2S3pSCFAs95nGzDS68nRKplo+FEY6f3oLA5us/VRz77UFoY56Q
+Rdyqg36BnDixn/9n1feRX2zDtvYj7PdKNTSlK8guOEnvXLU8zkWU0ziYR0BBPeZR
++Nbx264mqf9RfU3KN95wuKzqGF5WcBab+8HrGP/zTPPwYv6m7cfWi/WP7nNNpPLW
+H7oJO2p5YGsQQjdnavjfQinwZ8eetrjm0ertmp97hFkxMv4O96meRwjTEoivNdSO
+Yh1r6eqF0BpnhmzjkdDXAJxm1MLBrnOOQVWYuYDFsL1b4KfvHyD6CZqyXNsC1fEG
+EfGUsEls4cB/KQpNkPOYpRoP5YnOsTYcDJo5pJSFFqGBGO/QkpzZu4lwwFJmfigf
+ok8Da1mBHPJcSlJejozU
+=5wdv
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/glance-2012.2.4-r3.ebuild b/app-admin/glance/glance-2012.2.4-r4.ebuild
index 04e06a0b86ad..034797f8bc55 100644
--- a/app-admin/glance/glance-2012.2.4-r3.ebuild
+++ b/app-admin/glance/glance-2012.2.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2012.2.4-r3.ebuild,v 1.1 2013/07/02 15:33:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2012.2.4-r4.ebuild,v 1.1 2013/09/12 04:47:49 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -20,7 +20,7 @@ REQUIRED_USE="|| ( ldap mysql postgres sqlite )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	>=dev-python/boto-2.1.1
+	>=dev-python/boto-2.1.1[${PYTHON_USEDEP}]
 	dev-python/anyjson[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.9.12[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
@@ -32,20 +32,23 @@ RDEPEND="${DEPEND}
 	dev-python/passlib[${PYTHON_USEDEP}]
 	dev-python/paste[${PYTHON_USEDEP}]
 	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/pycrypto
+	dev-python/pycrypto[${PYTHON_USEDEP}]
 	dev-python/python-glanceclient[${PYTHON_USEDEP}]
 	dev-python/routes[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.7
+	>=dev-python/sqlalchemy-migrate-0.7[${PYTHON_USEDEP}]
 	=dev-python/webob-1.0.8-r1[${PYTHON_USEDEP}]
 	virtual/python-argparse[${PYTHON_USEDEP}]
 	swift? (
 		>=dev-python/python-swiftclient-1.2[${PYTHON_USEDEP}]
 		<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
 	)
-	sqlite? ( dev-python/sqlalchemy[sqlite] )
-	mysql? ( dev-python/sqlalchemy[mysql] )
-	postgres? ( dev-python/sqlalchemy[postgres] )
-	ldap? ( dev-python/python-ldap )"
+	sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
+	          <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
+	         <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
+	postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
+	            <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
 
 PATCHES=(
 		"${FILESDIR}/glance-gbug-474064-folsom.patch"
diff --git a/app-admin/glance/glance-2013.1.3.ebuild b/app-admin/glance/glance-2013.1.3-r1.ebuild
index 29a3448a661f..de8b571f112d 100644
--- a/app-admin/glance/glance-2013.1.3.ebuild
+++ b/app-admin/glance/glance-2013.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.3.ebuild,v 1.1 2013/08/11 01:00:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.3-r1.ebuild,v 1.1 2013/09/12 04:47:49 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -20,7 +20,7 @@ REQUIRED_USE="|| ( ldap mysql postgres sqlite )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	dev-python/boto
+	dev-python/boto[${PYTHON_USEDEP}]
 	dev-python/anyjson[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.9.12[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
@@ -34,24 +34,24 @@ RDEPEND="${DEPEND}
 	dev-python/passlib[${PYTHON_USEDEP}]
 	dev-python/paste[${PYTHON_USEDEP}]
 	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/pycrypto
+	dev-python/pycrypto[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 	dev-python/python-glanceclient[${PYTHON_USEDEP}]
 	dev-python/routes[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.7
+	>=dev-python/sqlalchemy-migrate-0.7[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 	virtual/python-argparse[${PYTHON_USEDEP}]
 	swift? (
 		>=dev-python/python-swiftclient-1.2[${PYTHON_USEDEP}]
 		<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
 	)
-	sqlite? ( >=dev-python/sqlalchemy-0.7[sqlite]
-	          <dev-python/sqlalchemy-0.8[sqlite] )
-	mysql? ( >=dev-python/sqlalchemy-0.7[mysql]
-	         <dev-python/sqlalchemy-0.8[mysql] )
-	postgres? ( >=dev-python/sqlalchemy-0.7[postgres]
-	            <dev-python/sqlalchemy-0.8[postgres] )
-	ldap? ( dev-python/python-ldap )"
+	sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
+	          <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
+	         <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
+	postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
+	            <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
 
 PATCHES=(
 )
diff --git a/app-admin/glance/glance-2013.1.9999.ebuild b/app-admin/glance/glance-2013.1.9999.ebuild
index d052a1e25f01..1e8c322bb838 100644
--- a/app-admin/glance/glance-2013.1.9999.ebuild
+++ b/app-admin/glance/glance-2013.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.9999.ebuild,v 1.2 2013/08/19 03:23:53 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.9999.ebuild,v 1.3 2013/09/12 04:47:49 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -21,7 +21,7 @@ REQUIRED_USE="|| ( ldap mysql postgres sqlite )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	dev-python/boto
+	dev-python/boto[${PYTHON_USEDEP}]
 	dev-python/anyjson[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.9.12[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
@@ -35,24 +35,24 @@ RDEPEND="${DEPEND}
 	dev-python/passlib[${PYTHON_USEDEP}]
 	dev-python/paste[${PYTHON_USEDEP}]
 	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/pycrypto
+	dev-python/pycrypto[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 	dev-python/python-glanceclient[${PYTHON_USEDEP}]
 	dev-python/routes[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.7
+	>=dev-python/sqlalchemy-migrate-0.7[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 	virtual/python-argparse[${PYTHON_USEDEP}]
 	swift? (
 		>=dev-python/python-swiftclient-1.2[${PYTHON_USEDEP}]
 		<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
 	)
-	sqlite? ( >=dev-python/sqlalchemy-0.7[sqlite]
-	          <=dev-python/sqlalchemy-0.8[sqlite] )
-	mysql? ( >=dev-python/sqlalchemy-0.7[mysql]
-	         <=dev-python/sqlalchemy-0.8[mysql] )
-	postgres? ( >=dev-python/sqlalchemy-0.7[postgres]
-	            <=dev-python/sqlalchemy-0.8[postgres] )
-	ldap? ( dev-python/python-ldap )"
+	sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
+	          <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
+	         <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
+	postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
+	            <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
 
 python_install() {
 	distutils-r1_python_install
diff --git a/app-admin/glance/glance-9999.ebuild b/app-admin/glance/glance-9999.ebuild
index 9fb9e157bf58..830e2b9826e2 100644
--- a/app-admin/glance/glance-9999.ebuild
+++ b/app-admin/glance/glance-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-9999.ebuild,v 1.4 2013/08/02 18:17:27 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-9999.ebuild,v 1.5 2013/09/12 04:47:49 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -21,7 +21,7 @@ REQUIRED_USE="|| ( ldap mysql postgres sqlite )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	dev-python/boto
+	dev-python/boto[${PYTHON_USEDEP}]
 	dev-python/anyjson[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.9.12[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
@@ -35,24 +35,24 @@ RDEPEND="${DEPEND}
 	dev-python/passlib[${PYTHON_USEDEP}]
 	dev-python/paste[${PYTHON_USEDEP}]
 	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/pycrypto
+	dev-python/pycrypto[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 	dev-python/python-glanceclient[${PYTHON_USEDEP}]
 	dev-python/routes[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.7
+	>=dev-python/sqlalchemy-migrate-0.7[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 	virtual/python-argparse[${PYTHON_USEDEP}]
 	swift? (
 		>=dev-python/python-swiftclient-1.2[${PYTHON_USEDEP}]
 		<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
 	)
-	sqlite? ( >=dev-python/sqlalchemy-0.7[sqlite]
-	          <=dev-python/sqlalchemy-0.8[sqlite] )
-	mysql? ( >=dev-python/sqlalchemy-0.7[mysql]
-	         <=dev-python/sqlalchemy-0.8[mysql] )
-	postgres? ( >=dev-python/sqlalchemy-0.7[postgres]
-	            <=dev-python/sqlalchemy-0.8[postgres] )
-	ldap? ( dev-python/python-ldap )"
+	sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
+	          <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
+	         <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
+	postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
+	            <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
 
 python_install() {
 	distutils-r1_python_install