Sync with portage [Tue Apr 14 20:41:45 MSK 2015].

9 years ago · fa420e5e7e
parent 7666d8ea4f
commit fa420e5e7e
3129 changed files with 7716 additions and 7138 deletions
--- a/dev-python/keystonemiddleware/ChangeLog
+++ b/dev-python/keystonemiddleware/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for dev-python/keystonemiddleware
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keystonemiddleware/ChangeLog,v 1.1 2014/09/22 21:29:58 prometheanfire Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keystonemiddleware/ChangeLog,v 1.2 2015/04/14 16:11:45 prometheanfire Exp $
+
+*keystonemiddleware-1.5.0 (14 Apr 2015)
+
+  14 Apr 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +files/cve-2015-1852-master-keystonemiddleware.patch,
+  +keystonemiddleware-1.5.0.ebuild, -keystonemiddleware-1.1.1.ebuild:
+  updating for CVE-2015-1852

 *keystonemiddleware-1.1.1 (22 Sep 2014)

--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256

-DIST keystonemiddleware-1.1.1.tar.gz 114215 SHA256 29e2823138219b29a86450293cac64f7554bf6c5cab79f091068137887bc8b70 SHA512 517d59c413785904814b1315ffd0894df54ebe7668ead42d69dfe89da680277ffdf822f6a0300060f90f238c4d2a98624462239de3c74bbce639a4fdc0136e8a WHIRLPOOL 8cea6d2b87b0b7caa8db05299aab91b7e4949bcd1a5c6f1a431473d31149962e8ea1a90f3c3bc1a5ce9c16ff2ce94823d353f7d0bb68dd3a30b9785bade30801
-EBUILD keystonemiddleware-1.1.1.ebuild 2306 SHA256 36ea6e66dd70e1fdd3dbe2296d8e5b0afee6a84d017d113630013120cf848c62 SHA512 2c962df39f6818709c662a67109adcfe4542b6db8a3d6f3deec0ac70e06df3ea06ba0ac51930cc702dce361620b9111ae390bbf572684d857ac4c526d5b37c0d WHIRLPOOL 5630219ce95116850e41dc35a25c79e5cf5552ba2672abab01b353e65e1f6df94c8189326851d93bb9317947c0c9f792e8a8f42c6f756eddda7e6cc3f7246e6d
-MISC ChangeLog 406 SHA256 2df00dd1d97522968f52e249e720dbd4334c333669ae8f8a524c3a893882dc74 SHA512 a2e694d75a7c332bd3575cef56df85744666395dabde6548726c6c810d440f0050751f9c2d20757a1b78083767710affb9f982849e90339a106008f0b82f4d17 WHIRLPOOL 4a633f760ae0f63be0de98fced107efb06ec2cea4be8017cfea3af6b8bf9a9211298cd37ec6d90906e887eac0c060b5a081a6782ad6cfd56120a307c63e5eeb3
+AUX cve-2015-1852-master-keystonemiddleware.patch 2606 SHA256 3f1fe254a8be40bfbf3441dc1db69d409b300cf3e7aa7fa143a81527cd37d1ca SHA512 90bf9bb62cc874fe7c34f67dc1069858c9a8da7ab32506b296e78a61d88597d21ae9c4e1334c0b91e31a6bc02c85170030b9c604e46ba30e7043998342dc920b WHIRLPOOL 04c941466ef6d209ef34195bd2f05ecb9716bd5801a59cea87a4e5f53ffc9ca15deed0fa4dc58f7e15dce6d6a98f2cb0455b2f51a06753bd338030a93e0beaed
+DIST keystonemiddleware-1.5.0.tar.gz 176315 SHA256 73e98aab8bceb7843b6cc8aba2cbff824a379428519e2f9ffbb8e32578b38fe8 SHA512 365643f7eba633587d8055204df04cfb40bdcc28c57d7ecf8c4ed67803b9b027b6334f868a1bc634d9beefd7410d74da08a7ed599637ec1656e6ef6196043dab WHIRLPOOL da7014869d3fc1ac5339671344542e33c22ac07adfb76ad00144cdcf4e1e26c60eea7ca7867cea6c6e105af1d05be64eff7d55ae1b3cf5114597da966b756b55
+EBUILD keystonemiddleware-1.5.0.ebuild 2696 SHA256 4e06d7e3286d34c37c1b00ea399fb78fee97ca795bb998127149ed80d80a448c SHA512 591b06b2cb54327365b258de7c465b3ec7dd3843a27519656af045ff168917b1a045a770728861b7080a2e69b6faa389d5cc2e9ef8ad840e582700d4884ec121 WHIRLPOOL 3dc6e256dcfe85cae1d6342e58988c298b94a18bffc2dd8022969704576cc0edf9f27a45691fecbcc0e86c56f1bf6f9b75455aa8c2110942d79e68f941c440a4
+MISC ChangeLog 660 SHA256 4a162abc574af48c67a675aa2d6e668d6533b3c3fb1da986e6ab02e1af2d5134 SHA512 7cf816882285301e100dbeafbaa043558bcff4be80278fc0f5da6ded3286206c552ab8dc3101a6116631ca2c2f7b6fc964c8efcad029d31436700d99dca8d9d6 WHIRLPOOL 79d8d26dbc0aead69c4c8cbd87db756ce53b276cf0f247b3970323e3856aaaac7c8efc0701cdc09636227acfd4653412b03b5bfbab26ba237451e2900ab14d61
 MISC metadata.xml 368 SHA256 2977a1caa70d2a7b2687f84c15f2db09e8feb739b3dc46d8a1c9143e5e550a1e SHA512 18c1f98d2e52e14aa4fdbd8842c40c6e3555d51dd5cb6cd4d88a6e13017f87fd8fd8f57729fc9deec819d6a4d04f864714844f23cadb5befa6000d1cd144921f WHIRLPOOL 9c8369f8f3448863124702ba3a3e9968f1bf5d763485730bb8a92006dba8e3023488486244bb6e0c5486c8039c3504598c97393433cc884d374bd9675a6fe50e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iQIcBAEBCAAGBQJUIJT3AAoJECRx6z5ArFrDV+YP/0pUncsZgPDr9rLvkPZBXzsq
-yS9U4iC07g5kRrupkQIz+yjQilsbUf+o/FLygPVicN27++/RU7RnXPJgRvNDJ09V
-mR/lgo+dgNTvluOFE4iBFF19B+BMHwNsdPT0rMfeBL8KlyxXaE5aoDaBIvNRzPew
-nS4HHXD6KBf1wNmPlftLXszaYOL5m9F58JdE2EwaYR2HY63zsb9kDH/lgygFk0r1
-MVhDjpIqx/Q3uOG3n2z+mGgOzmkTjvxfcJNGF0M1HkFEl9gaBlZK/C0Y1G5f6Wcw
-v3kF0ReEApl2PW8HdVOdpB5k8YCE/fwb6Z2Eni8XGrWw1GNwsvkqE9oWbH0Euyyk
-c5RwHwsQZ5aoK1wMEHZjjjw20dI4AhT6BoDLykXLEkVhkv8QbB1BK7uFt39TbQXP
-17+gxjrovs51YpQWWZtpJ1MVk96ylVy1jj6PSpTH6mfB5Q+XgLGvbzZbuYr4O+wI
-Q8654Oq0EiPZwYD9mCQIvs4WrfJyE5dqn2PnNKVIE/Bche3Bl4J2FV0/0WBVRvwv
-94oOr7knfXnUFHEjWjWc//85K3ca7C/gEsAblBdvEeG76zurqh2hJ0L8OUOdnI29
-dT1rVYKUStoBzlTRgb8i62ANw9kY2YPTsGhfjFx3Bo+mL9p6YzYtJtmLcTW4KufL
-RAD/dNBnHYYLZkFYn9i7
-=p0z9
+iQIcBAEBCAAGBQJVLTxMAAoJEGSje+quGaTo0+kP/RGklNzzRqzK1rUmxAKdo055
+5ICErbAsrkm3zrI/eHNjcAyJs73agnIlo7GkL/tAtlOuQcG8L6A7s4ZC6wO+M5Iv
+TMJSuRF8TYo2gxi+s6MhXe1E4Wy7qVpqWsRNhpn7yGGmQQ/nl1xu4UkH6U5zKQAu
+vbhvFNU2+R+9KmxiMOnjvNaXW+OzameeuqKMjPBveECZDtqKp3iAIb2RqwmL44e3
+MeEMlTwEuXH4QVLAUtmrUWAMpV27xUCyEpKnXb+cYq6MGoMlUit1ZNNxXdnaBHMX
+8LNzRv9OOvTTPkcEs0x8s6Iak6yGgDRy89SR3RH5N5D2ewNWEEnSAD2/9/l6V/HA
+zoKguszjIVZFG++Y4JCKIOdxyrU/eB1K0jynvrq0WXQ9QdGQHk6RTd5D2S3Jz1P9
+OxJtdiCpmK8cUh04o1HDv3SQi/uNtnok7NZ96O1XyRT416/+ziBpKQg1qqC6bzsH
+8y5o2VP1QYazCure4qs6iaaNZwc1agcMd3Nk1XbkEL9fe4rmvSpfjOL+CUnxi//c
+i3f6dVc+JuJGlX1haNgszENjZvhzywsEzPnz9lApjVZ/TpkR1oq2lBrEuO/ntjmy
+L21d1sDBW41NgbLHUPa4RG1reLLo82ZUzWSAVHB2RK8ue3kfW+mb78TP6nZKrplA
+S79L6GYE8lmd/UWa5X9e
+=0pjL
 -----END PGP SIGNATURE-----
--- a/dev-python/keystonemiddleware/files/cve-2015-1852-master-keystonemiddleware.patch
+++ b/dev-python/keystonemiddleware/files/cve-2015-1852-master-keystonemiddleware.patch
@ -0,0 +1,63 @@
+diff --git a/keystonemiddleware/s3_token.py b/keystonemiddleware/s3_token.py
+index d56482f..3fe13f9 100644
+--- a/keystonemiddleware/s3_token.py
+++ b/keystonemiddleware/s3_token.py
+@@ -35,6 +35,7 @@ import logging
+ import webob
+ 
+ from oslo_serialization import jsonutils
+from oslo_utils import strutils
+ import requests
+ import six
+ from six.moves import urllib
+@@ -116,7 +117,7 @@ class S3Token(object):
+                                             auth_port)
+ 
+         # SSL
+-        insecure = conf.get('insecure', False)
+        insecure = strutils.bool_from_string(conf.get('insecure', False))
+         cert_file = conf.get('certfile')
+         key_file = conf.get('keyfile')
+ 
+diff --git a/keystonemiddleware/tests/test_s3_token_middleware.py b/keystonemiddleware/tests/test_s3_token_middleware.py
+index fdadb76..4b910a6 100644
+--- a/keystonemiddleware/tests/test_s3_token_middleware.py
+++ b/keystonemiddleware/tests/test_s3_token_middleware.py
+@@ -124,7 +124,7 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
+     @mock.patch.object(requests, 'post')
+     def test_insecure(self, MOCK_REQUEST):
+         self.middleware = (
+-            s3_token.filter_factory({'insecure': True})(FakeApp()))
+            s3_token.filter_factory({'insecure': 'True'})(FakeApp()))
+ 
+         text_return_value = jsonutils.dumps(GOOD_RESPONSE)
+         if six.PY3:
+@@ -142,6 +142,28 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
+         mock_args, mock_kwargs = MOCK_REQUEST.call_args
+         self.assertIs(mock_kwargs['verify'], False)
+ 
+    def test_insecure_option(self):
+        # insecure is passed as a string.
+
+        # Some non-secure values.
+        true_values = ['true', 'True', '1', 'yes']
+        for val in true_values:
+            config = {'insecure': val, 'certfile': 'false_ind'}
+            middleware = s3_token.filter_factory(config)(FakeApp())
+            self.assertIs(False, middleware._verify)
+
+        # Some "secure" values, including unexpected value.
+        false_values = ['false', 'False', '0', 'no', 'someweirdvalue']
+        for val in false_values:
+            config = {'insecure': val, 'certfile': 'false_ind'}
+            middleware = s3_token.filter_factory(config)(FakeApp())
+            self.assertEqual('false_ind', middleware._verify)
+
+        # Default is secure.
+        config = {'certfile': 'false_ind'}
+        middleware = s3_token.filter_factory(config)(FakeApp())
+        self.assertIs('false_ind', middleware._verify)
+
+ 
+ class S3TokenMiddlewareTestBad(S3TokenMiddlewareTestBase):
+     def setUp(self):
--- a/dev-python/keystonemiddleware/keystonemiddleware-1.5.0.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-1.5.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keystonemiddleware/keystonemiddleware-1.1.1.ebuild,v 1.1 2014/09/22 21:29:58 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keystonemiddleware/keystonemiddleware-1.5.0.ebuild,v 1.1 2015/04/14 16:11:45 prometheanfire Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -17,38 +17,45 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
 		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
 		test? (
+			>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
 			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
 			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			>=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-			>=dev-python/httpretty-0.8.0[${PYTHON_USEDEP}]
-			!~dev-python/httpretty-0.8.1[${PYTHON_USEDEP}]
-			!~dev-python/httpretty-0.8.2[${PYTHON_USEDEP}]
-			>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
 			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
 			>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-			dev-python/oslo-sphinx[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+			dev-python/oslotest[${PYTHON_USEDEP}]
+			dev-python/oslo-messaging[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${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/testrepository-0.0.18[${PYTHON_USEDEP}]
 			>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+			>=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
 		)"

 RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pycadf-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+		!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"

 PATCHES=(
+"${FILESDIR}/cve-2015-1852-master-keystonemiddleware.patch"
 )

 python_compile_all() {
--- a/dev-python/pycadf/ChangeLog
+++ b/dev-python/pycadf/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pycadf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycadf/ChangeLog,v 1.4 2014/11/10 06:49:00 prometheanfire Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycadf/ChangeLog,v 1.5 2015/04/14 16:06:18 prometheanfire Exp $
+
+*pycadf-0.8.0 (14 Apr 2015)
+
+  14 Apr 2015; Matthew Thode <prometheanfire@gentoo.org> +pycadf-0.8.0.ebuild:
+  updating as a dep for other updates

 *pycadf-0.6.0 (10 Nov 2014)

--- a/dev-python/pycadf/Manifest
+++ b/dev-python/pycadf/Manifest
@ -4,24 +4,26 @@ Hash: SHA256
 AUX CVE-2014-4615.patch 901 SHA256 f589f668e9152a0cdde02afc9d28b13de15983846f4ff636dd112120661160b3 SHA512 9c9da786c276dfbb121623418d285ce50250a313df52ce03dcca1a947d674755c88be34d7cc34619cced018a6f7f525647a63878d9ea749674655bcb0027e430 WHIRLPOOL 22f585b98b98ee01ab09902868bfa27381e03c3a03cee2494c36a2ae10e603c38155387cb7939f8e13e4e530d85c2b9d03cf3c8915b3868a808f06ded381700b
 DIST pycadf-0.5.tar.gz 273168 SHA256 b150df953b822c0317c6f1fbd35b950db0d2ce8bc53bb7319cc921e3018e59e1 SHA512 c7c108ba79c8f34ffcac77d43317d6bed34ecd9e23980ecf4a061c5d9fa52d446835a92263bef030cfb974e750245c19c634902f3e3b79233a12a02affdb9a54 WHIRLPOOL c058201b9e396930de463fa43ba73145663c7efa0a2e4c57303e1d5919ad7ecc7e972d010ea48427b8984ea536cf75a5e71c13a868b7ef12c79162229b7b4a31
 DIST pycadf-0.6.0.tar.gz 277434 SHA256 9ba1e9ac52ee2a2d6d9cc89847323559cc2ffe7b4d80b703944a0a1f75c7093f SHA512 97e223296e5cf77bbc2f7f8b2caba70f76d418ccd476bbc07462dac2c01399f920ae7801f1e30ef91ac6dbfe340b8b45dff2426bf457c1239f54293dbadeef61 WHIRLPOOL 96644ae4b82352cd0a296f3a9adf161b8500d043d8d2bce239c23473a53e1a2feb43f60d92c67bf1543b3b101bbf722bf9104b2c6b16fa7240b94e86cc6a2aa1
+DIST pycadf-0.8.0.tar.gz 255774 SHA256 240d7775682a0f49fb580310dd6459e8a8b5f5619dfdc687f043c3fe21b48ba1 SHA512 3b8446c33f0bf740b0f2384bb9e4c5ab5d960690e50bd52cf2217eb184f9f8061dfe39da9b21ef275a7c66ba4e35b912bfd9476469b28c3c2cd6f33d912ac6f7 WHIRLPOOL bf28052eee894a1a986c1903f44f2f800f096979188a6b0ff502b7316d38ce7c43197405e635da097de038e24c1d870140a4ddd1c0eaa543841b3073055f1c19
 EBUILD pycadf-0.5-r1.ebuild 2280 SHA256 7c73730df43eb1fd0ac503be19c819f93392ca47bc4f1bdab03dd2e4ab24b44a SHA512 3d483abae95706db6b1df05e8b1eff87ed3d4ec1ffc5206d45350a238b7e1fd2ba410c860dc1c7ff7bc6c283103cc87758fba1e8f46530f23e10b66d521eaefb WHIRLPOOL 1f255b845807926c9cf2d15fc70ff01e2b33383047349d77d18607374395f44f65fe29d503cee0419424c9d592742d03af42ee4a2df4c9c6f6225bd24fc4da62
 EBUILD pycadf-0.6.0.ebuild 2394 SHA256 e11e7fdd1b30e74eeb326c2d97a5facddec6494447403afd8af722cd34f3c42c SHA512 c06f2e2b89d528c4608c6788205ddc020f14df28df414f8789b097ecf3ebeaef30e723d4afabd3374a0865cc5e376f9b58eab4dc2418c9b45b6707686dfea0cc WHIRLPOOL 7ba120cbcc133438f788d3186c8ce3eb75c65841252b572ece3794396d174b46b5a6db8a0c26d6588faa54900263249821384a93f5dc573b553a673a63fcff64
-MISC ChangeLog 933 SHA256 da6afb734a638b54e03becfe66594e686d35e8a54998f4d858c02f8705370ee9 SHA512 e415bde916a2b270075da6343fc5f276c1e0af182b6d358963c291c1917d1c63c2bab990c29360895b17648958bb02a39443b02a90c139251f87114f5875a1f5 WHIRLPOOL a98122cbcf6ecef478a1ef589f2e95e646428c11122876a3f1fed6221458c567fa71aeb37f5773587173a91f49c6c850d50ddedea54a53b65ec4718cb9d419ae
+EBUILD pycadf-0.8.0.ebuild 2380 SHA256 e4d6bcd4f33e428c54d5dfa648e06f002ffd75a7e055d1b47783aac81184a1e9 SHA512 d880f8ee6bc804f875d8998f48663f487842654faecaf8d92d3c91b9fb12cadb85ea395911f106f3821eb9362796d59fd5d2258805e8df8d64e83c0e02b05512 WHIRLPOOL ab5f9f1ed2eee751ac27e63b96a235d2fa6cdb4025017f8084e80c7e486c59eacfd480aac17c325656a58c7a43c171d17827d821565f8404ccef0d0fefab3138
+MISC ChangeLog 1080 SHA256 e44b21875707f67e33126ec054c01920ba71f00afa2addf3ea78189cee0dacb2 SHA512 44223223860896890aa8a5054c8581644ea80cf30d3a91c9ebba2797258007ef3fa08a5af36e208a39baa515d4086538e2eeec2bf6c1afd93a865fce03926a0a WHIRLPOOL 4a7530be33acc1ccba8c8aa523f64c6f80e5dd72f4d8b3048ed8e08e35fd250ea574ab1ef7776bfaa1fd2ac0622e272a2f53b69760542a120ce6bf370c34f982
 MISC metadata.xml 384 SHA256 e554e1cbaac2696fab87d6e468b9088f941f2ce0b954a84b747d162f528c152c SHA512 39cf42bd900c1a1296baa9552b46877708fcd1a94a747a7f8b260ceba698f44d7ef422bcdb4687d355bff6ada696bcf85b733c62094caf896a1049737c6c74f7 WHIRLPOOL b8c6b4f46fa9c9415c28d2b6fd4c80e1ac1fb010cf9fd1ed314f8dcd82fd4422dc0ab511e4972630429420325e9c1b409e88723ca9be9dbd1c2c7f1a137e8593
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iQIcBAEBCAAGBQJUYGAGAAoJECRx6z5ArFrDvhsP/2j3DviLK3j26T32nJAGODsT
-Xgiq+1zVby3TvNwCxrAC5vgHO22XTZO05IiBIiguJqiWqo/rds7kIa+JGNaKhq6s
-wL0PnRNjRqkDPxqN/pJZ5RzJhc1CYXXJBJbUJyKJ0TFoxNU9rqjwHD4MnPnm5+xH
-/fke2zsr3wBZeA6bzooSzBasZ6j1CGiCut+jWbc2ZKtWrqANeFQvylr/GE9NeHtR
-BOBrJmqKCu9ebFGLGMwaPe1q4JmQPIkJrWAaAMSEnkJpYaY0Rue33pBlP3HSbYtk
-ZGM2pcptBvcj9QH5VyblRkpZIXtPE5O+VKaepUc41CLXz2dw87HvDA7d/RXnYM5c
-Vlg+Qo5k9Y8suSsNC7dWcotqRC3MI88uZiLfgAgKMDttTWKrleNzVXW4chGIS/36
-DBaJ5cwmgbnxIgypmRatOp78yZN+ieARSkJ3AQaZLrSCThVpcHHLf0gumCby6Jpo
-y7nMjtsqCjYrWUjRxLgmDU5QibfH4IeHyUNnEVDkTctAKB4KpJlnSfT6Z3FQOV7j
-11bQXbAlz0cTTQ9MskJ9WFHcqgYlcA3a70UE/lo63g4NCzC/K20kRMPuCMylGd7T
-rWQWRaCdsFZIWSbXNZEx4oeWxlk6yrEtf1yz862DtQLWN5jaa8//yvc1BWU+NHx+
-r2lveHAHlymDLpSB/xhs
-=TR4f
+iQIcBAEBCAAGBQJVLTsFAAoJEGSje+quGaToIWUP/26VVE4rzzCg/7m0M0JcqEIw
+fk3IPNwNTSAgpeNeBirSMwA78r6sTO/fFbJ/GTez8Are/0JnTOYk/aHdV6gYZrJT
+mffOCLf/FzNvizN1WsJB9Nfo2eKq64dNTcrormmm6kahEV1MdSEk312YuQq8/o/Y
+KBLVbq7pB9mY4K4fGO45doHpMABckAU2USIP8+kIqswmdIADkHiF9YGzYIIzIHCB
+qROcpyfTtqSO3T/WDuiPXUdGOyPKPxo23ifESfeK1NiogIRk+QKs3bjkjPGlUqb
+m+ZDXSik2YjzQ323q+UBpA3sqlPwgnAI/DSQKOO/VvpA2VQuPlG42mDp7OFnFfHx
+qRZYijyVfHVX+yJ8dgQLmaeEhN/OaO32ViQyMG4X+IPyXE9//wmO0qUcYJME8V9U
+Toq0u6J5+m6sKXOSVni07kOBPJ1+dtKLxZ214VLXr5/szZ+VtGHj6gKYCUtVa75l
+MjxGQL3cEwq8Ny1xzlWHl/7keRU9eZBsrRrfRbMhnymMABFOvcjkmbvmGjOclGwR
+FUlHlAEWjyf2qg2z3neHcJ6Hj/dVz8lTIsE8v7PdVnPN0ktHr7ViCkyKQHGiOI+i
+4zpmheFxBn5VTEiQ8EzqylpBbVQhtE7z/sUKJU+CaDT0xmjwaoO5dSbsnw2KkmOL
+l8TP3FCSglcQMvAXGsXv
+=tnS6
 -----END PGP SIGNATURE-----
--- a/dev-python/pycadf/pycadf-0.8.0.ebuild
+++ b/dev-python/pycadf/pycadf-0.8.0.ebuild
@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycadf/pycadf-0.8.0.ebuild,v 1.1 2015/04/14 16:06:18 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
+HOMEPAGE="https://pypi.python.org/pypi/pycadf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${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/oslo-messaging-1.6.0
+		>=dev-python/oslotest-1.2.0
+		>=dev-python/subunit-0.0.18[${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/oslo-sphinx-2.2.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/nose[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/oslo-sphinx[${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}]
+	)"
+
+RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-context-0.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2013d[${PYTHON_USEDEP}]
+		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
+
+PATCHES=()
+
+python_prepare_all() {
+	# ? typo error in conf.py
+	sed -e s':oslosphinx:oslo.sphinx:' -i doc/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	nosetests ${PN}/tests || die "test failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/python-keystoneclient/ChangeLog
+++ b/dev-python/python-keystoneclient/ChangeLog
@ -1,6 +1,16 @@
 # ChangeLog for dev-python/python-keystoneclient
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.47 2015/04/02 19:56:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.48 2015/04/14 16:17:32 prometheanfire Exp $
+
+*python-keystoneclient-1.3.0-r2 (14 Apr 2015)
+
+  14 Apr 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +files/cve-2015-1852-master-keystoneclient.patch,
+  +python-keystoneclient-1.3.0-r2.ebuild, -python-keystoneclient-0.11.0.ebuild,
+  -python-keystoneclient-0.11.1.ebuild, -python-keystoneclient-0.11.2.ebuild,
+  -python-keystoneclient-1.0.0.ebuild, -python-keystoneclient-1.1.0.ebuild,
+  -python-keystoneclient-1.2.0.ebuild, -python-keystoneclient-1.3.0-r1.ebuild:
+  fixing CVE-2015-1852

 *python-keystoneclient-1.3.0-r1 (02 Apr 2015)

--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@ -1,36 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256

-DIST python-keystoneclient-0.11.0.tar.gz 326504 SHA256 99f99bd1a6b886e4655e414d82515a3c7ea0788fa80a3e33463778e13e576fe4 SHA512 540963583c73178e193576d9ffed6aaae49572017c97aaee7b85844dac9c91828355552c16ef27f8996bcf328cee069459436cd58b5ffec7597458f3b356e823 WHIRLPOOL 7d9e54173a37eac4e596a49db28012513469c2c5aa96bca7131e0e83902216fb5dc8368dea9e2e82fcd73cc77e00d23474ecac462677fc09b6ce297483a23505
-DIST python-keystoneclient-0.11.1.tar.gz 325416 SHA256 263f274ac5c04f94442b5f85b0119673ba4cf21030a5accc8f4692e168b6a301 SHA512 19c3b015ab2875f09698bf13757312cbc82d19804ca353f55e3baca59052e6d4e86777bedf4f98c59f58160034ea89c956832c14a45ac07a56eb2dc39694ab7a WHIRLPOOL b959262da5358db75dcad4a994b2fdfb61fd19b0ea9f55f2e791d75f87ea1dce2fd6eb31bcc99b87731df6758f9a8e3ebd88ef08643a32788e342c786a5adc58
-DIST python-keystoneclient-0.11.2.tar.gz 325055 SHA256 3e074f64ba2b85dfa430ccfcf207376ba105cf8177e74f5cc227a7332e135796 SHA512 04e8f808cb1ab416122c7b839dc791ecf1e807dc02ebc85abe7564d5059e5b948f021cb6b70a1192d05cd9e2942002001d3925e8185f78d6f2199ffd755df712 WHIRLPOOL 30d46d75f4e676b4d539aefa6d8118631ab9dd28ca614421c9bf194baaac22dd7969342da400370b2266b993e2aebcedc3952cec22db88fde3012aee15db6bd1
-DIST python-keystoneclient-1.0.0.tar.gz 314308 SHA256 6d960d2196efc7a181519a77f757a27ceeeac71f41f624318ae7f1088d2e6db4 SHA512 331d1f634c06f142628c6c641e49a75ca721eb6a37e11827b12db293eeef3e39e9565b38db27d9e39464ef80f5a6d1da2b4e0365dc2eba2b22f63abe0b2992fc WHIRLPOOL abd1173e4caf31ffdef01e7a5f13869dcea4d8c053805ec995b675a46350f2c2a8d5c6d692127a048690b018c3785dc005d6c752df86277dc04873a4daa19525
-DIST python-keystoneclient-1.1.0.tar.gz 325072 SHA256 30224d92f8e3cdadbd8b07326eee527b292c3881e311a202eb538bcfffeeb74d SHA512 29942c7aae184ae15ec90b034b968e64f055a1d71f801a3ecc5a312e4d7b2aded4fc7a7f90c3256969f7e86ddfffe3b239bf7a4ef3fca3ec3c55be5524211b80 WHIRLPOOL bbbce14bd6327c49d6b54cd11c8f566f0dedddb4d5f2a065ab4838fb3c9ae3f9abb0ad3189e5657b36f61603afc5c20e80d18410fbe118c079fd98ce2125bf11
-DIST python-keystoneclient-1.2.0.tar.gz 331325 SHA256 c2776f59b79202e7ad5d709021fecce541bec53dbf2e652fffe8406b0019c054 SHA512 9447a5caa1fd4c932efdc8ddb3ba9607d74dde58debe1e00e64674fabed2782c0c1810a70ceffffe2135e6b2abd45f11fe5f9c451a910f8115bf447cb592820a WHIRLPOOL f6d0f9b22aa5b1387883a28d87c1f05ab0fa7f7d853f889706ec3737d03db13ffb2f5b14bb130e5db19a6fc7cf27c3b5bcc2002a035179921e7ff68aa330569e
+AUX cve-2015-1852-master-keystoneclient.patch 3303 SHA256 e1f742aff5e763f0061672c1329f699cc9120c9a03467b40658f3c3460c25a0a SHA512 ff65dd7d9da92e4d58a158177a370c9c8c2d60c9e54bc78184d1587667f4609325bf0185e3f1ea137ef9084f98c3cbd379b7def215eb4f70d72be65424d13a27 WHIRLPOOL 4631705c1fb320dfe337dd8eeed95818b8926564da148fb4a4773912574f7a4a23f083ea20f066e2369ce2158848d9e181d9c366290febbcecb8d6803c82e781
 DIST python-keystoneclient-1.3.0.tar.gz 338528 SHA256 c009445d9a36fa788a14b093f67501091b246fefccb30fb63925e6e4fbeaac04 SHA512 51fd09419479ed00a9bd1785c0bf08cd7ee5393cb2eabba02558cf9828cbd9070f671377d759ff3dda0b675846f22dc8bb7419443e0b850c26f3263cd3b9b533 WHIRLPOOL 4f134aaefe9353382ab78a74109c139df55f9275cc2d932eae5cd8764e74f3b608fcf5bcfb659ac14504d87e944494b6a0221051dcf82a21bec109ddefeda7bf
-EBUILD python-keystoneclient-0.11.0.ebuild 2611 SHA256 79146d87ee05a3fb62f27d8fc2323d815c9fa0578c38e78f1410291ada35077f SHA512 3505a2880a7889ab5423b2c098d6f7cc14cf95c6604ad6a801c8dca0fb9511ddb63066750243f087e68faf89f69d701789fd9fb7d777955f1c75b06137c3f176 WHIRLPOOL 3259ee2aaa17a25f7175eb2164e58145030c3c8b3109faa6bf7f878c735be0c34b4e72e892aada8e00abbfbd752d8e271458255b044c4e9c9f90f066b68ac5b6
-EBUILD python-keystoneclient-0.11.1.ebuild 2686 SHA256 62cc538d37f33995fa53e29678adb3319b7d25d8bf4322f1bcd84439199ec6d3 SHA512 53430f51ba5be8619de670368b672769e37960f4ffbd76410581cfa90464907ab46a5d2d0cbd46365e53eeba7d00aabbd35e9118b4043934664828a246320e3f WHIRLPOOL 01241ea2155d2c36a9465c1cff2a98d4f8c3c059f4618ea574c6a9f89beaa6fa37a6bf1a01888b9eec9b9728918ec408e6a7ea95e5f92e3e82d88a1bedaa2f92
-EBUILD python-keystoneclient-0.11.2.ebuild 2909 SHA256 9b3ff6245c447b8304c5115508324d138eb79bdcf73b4e87233eafa9a48057ee SHA512 7542b9093eaedbf6b5238ba1093e671917302d18f399031ea5edc4ca5e6168682bdefafe1b73094dea20a24eedf379b780dc6d5b45df5aa5a823a026e75101cf WHIRLPOOL d512313f5ba04fe5a8cfecba3dc1581f76dc2e24060f71526e1ff0b3cfa4ac5890b498084aad5311473668f39bd716ee2ba8a818cc89e4f9bb5f3b68e26ebb97
-EBUILD python-keystoneclient-1.0.0.ebuild 3089 SHA256 d67aec23521077c99880b7780d7876d8c949b049ddc827982ef6d18aa452ad74 SHA512 9912e2dce4e9ca0314c0ff389e1aab843995f82a536cfdd2dd1d086e9c6f750e3e652429bbe7b869cdcb805def50467737c58b075fb132b79240b1adba2c6ad5 WHIRLPOOL dc3d93b5b53c7db120d5e8848221c2eb6fa6f5c50bdbfa02391a19565ea3f761d48c706bfa96e26c5521ddba32bea6f4ae047a788a906134b7c0c0061a0c5424
-EBUILD python-keystoneclient-1.1.0.ebuild 3036 SHA256 83f5825a44df46ff5271fb63eeacfa5e27b2408c55890d90e9958cbc1dacc133 SHA512 0b0ff7e14be6c11f49399f5c9fbdd3f106dbe42f63ff719a001f07c80cba5db21e53b6b86c7f493aaf2e350dd408458d65917c290a1d82bf28e0b9449cbe8223 WHIRLPOOL e2fe45bb35b2c90efacf6452e6d349aad7d95e2e5e2aa7e7ca9f032fb3032283b3a0eaee6ee911db551be1412e2e367efd38b9c5bcf2c0d176b66fa98f3ebda5
-EBUILD python-keystoneclient-1.2.0.ebuild 3056 SHA256 6be820957f571d0fe6db8b2027cd5a296e26c6eb1112a17cdd8ddcab47df7ab2 SHA512 9d4056dc44c3643f7b403e1a32524462288af038b16f7aa45438eb3b3373f19b115455452bf8f4055277bb678d7dd6cca9b5de57ef1331f71a60d59166830c4a WHIRLPOOL f0bec6488cfeeed40ca309d3aa9a69f2ccd6a5ff738c8326192a675b1a63904b5d1a33700446a892974bd0a7a9a0d120d4d696a17cfcfa5fa0fd89307bfa5e72
-EBUILD python-keystoneclient-1.3.0-r1.ebuild 3029 SHA256 2cebf498869ac968712cf0030b055f5568a33ad5e491adb0099273821507ee65 SHA512 2c035d8399e17d3412cb1621014f7d2d7031553a5da9a98c43ec729805bc759926da1ffeeec17d363cbe0fc784d3cea9578bb813e900b2fc5661e6612752a0c9 WHIRLPOOL 6c4ff7d92175545cba5f3604da1b21d04d6b5262c9eca7208ddb775f6d35debd565f1f78fdc3c947e7611b795ccc1de779f80636877049482bafb019c51aaf31
-MISC ChangeLog 9910 SHA256 cbebf93bf650752f1e131e71dea8554dc6f0cf817adfcb9b6ec308518813b904 SHA512 a77768c497ef1a78feff4b3962c774bbc842ced2428ad06b26f714a23860a547f5e7816f6da1b595d0e27236525ea5323cc1cfcb7e4287ab414317325056ad57 WHIRLPOOL f2d4c73ed22b440e3ab373bfa9cfefb52ebb3a086771ff779a3d1ffa3af37ee181b8ead47bdbc9b74c43a30e881f7e0e9bc78cecb88994b987219fc456a064d3
+EBUILD python-keystoneclient-1.3.0-r2.ebuild 3130 SHA256 81ae36d6bb1f5771d16f91a80999c0de63c3776316f2cfdd0cc32b58f49fc30c SHA512 36f6c0e18f14c2231085c63cd94f695767089a2a510d2e79c9017cbf8da93cd3ee82f94bdd6eda5e8c8bef6207db8aabb2663c1c2436c676648ff491959aedb1 WHIRLPOOL c6ba85116c8b6b4b8ec9ac6b704eb968559be8edb847c46365ae7ccc5ad1159281446d5a066dbdadf3d1014f299c323138f8bf64534c33d9056eeadf68ea8a12
+MISC ChangeLog 10403 SHA256 5b34f96c7e7503764355bce7d9f3a2319440b0d9d547b110a971f553ebe7b64d SHA512 b20bee6ce0fb9342e273af520da52f9a91e7c04927d44ba0f61a12cc8ff572a05c8b9846d9dd79838b51a90f6edfdb18fb2f2e58e88e759e163f7b5c68b1041b WHIRLPOOL aab2d76ef2e5d80e8208d9cf49e4182c1da06c693e854f25b19f5a05e58a897afe9ea898314ee45e3bbb13a103dce1cbc02f5a68584ba1bd874f374837a9c079
 MISC metadata.xml 368 SHA256 a91cef59b9f9006441eae6ac81afcf9efd4382762bcb6300f16046ba2851ce8d SHA512 6035564d5afb3100400c97ba1671a2ca65387a1fd67a77145ed3968c2ccadaa28eec54afa03b9ae67b1e69843275adbe92646dad8ffb9995d2270c85f94ca679 WHIRLPOOL 858f1f68eb57ac301bfa5bcf8db0f01853c5c1a612570f2e45a867fd16fddf84da77bff85441dec22df18634c56018874675d056f200e8336da9709d49d0ad48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iQIcBAEBCAAGBQJVHZ7+AAoJEGSje+quGaTojKMQALfQZkgI8GAwL+1l7Yk0RvRl
-DGdIZEzN1yXsy6T0S37qXoCGllwhfMkp1jGnpd+zlfInmuNqVUjm6y1bOru20DEk
-1c5C0Ugg/qLs5smNqUbzZ+cfjE2xlmIJwc61QWg0scLnlgqdT9DnS3JRUEc0xVEi
-4iSqFJ2xaBGLMpwCSybRisYcS5Rq79xlB1n19V9MVbLmSOBPyuZSS2eAOrSO5bfj
-76vgx3rC+rsCgGHkGBQ7xRTVzD5+LwsQdXycWRB1t5ATvfyGc0mjz6TEpP84h1Rl
-ROS9Ssqchlfc4avU3SG9zCFZksS576YQDZiDuWxfGmRE1ZJegXwnytxDnHrswPGK
-V3+8YtpxMh52pnUneB31RxH1Gb9eK0LKcJ0vpCvJJiCIn1kHvnyEgiDITghtvkp0
-5vFprOXOnz6f2WZWp+n8OjNdFERnhHMcj/m+vwlSrxj5BMu9kvuMmoZZQUnBDXA0
-wbUMf8JfLwcHQ3k5DI8RDdOEYBPmbf/0V6DwSMN9Z30ibv7E3lv1Jf2oPkR52tGf
-4YmU2PNIdsOyDAX78iKAf86JJQbLkMQAtcD7X+EgQC78HSGgKSA45W5cJzJBr8XN
-RSUfpc/FXIxpkL465ulseBa23HfTNkb8KKGtvkagvUBKcr/+vS5LydiL3KgrFz/5
-DxATN6Vl8KbaLaxD90MX
-=+nNW
+iQIcBAEBCAAGBQJVLT2nAAoJEGSje+quGaTor/IP/jTnhwHdlxtOk8sQIgTurhQj
+d+P+zERGQOBZCwmGgz9eFaqO2Mv2i+eWUDqfpT2yha9Tc/Zrjm4esO0zSlW7msqc
+jinxnm1MqzXLSN74HrOsTUvMVXB4Yv+SDrUm/D7RGNN+P6/Oxla9a5mxZg+yiwN5
+z9/4fuYxTHcjQZOiIkFZ/RezKVbS5SqgObxrg3RJbg94Q3w62kjeK2oQ4C07+nUp
+ktNpa/zr0qO+CILK/3Je9wSXtAOOBdc942CleDui7zGOuDNdny/5ZZvUZN3O1Cv
+YwE0lSpA906dPAGSMM8t8P+cENuYUo1gmULMabjCUlTdfywF+Z77bAEhIqqqH8dr
+sPbrJxYFLNfGI/vqOGNFZgsnxdmQ2TQ8alAIxtGrvRV/Xjo+8a6XkX4ox/2REPHx
+EBzm8W9hHTzb40vNxmV+82MULZK9lX923oJpQkQ/fyv7qNdIW3xO9aYxBQgWwU7Y
+UIYs8phZNpxtdhSf2l6alEDgOnpHvVnur0BDEfBcBH+BEKSCgfcnJRcJ17Bp4OOT
+y0Wr4QWQSH8m96W0gXufsf+E1JorSvsx+m78vDcvVZhXkTHj32J6eHEWymhjVvFR
+9UUYhYJQxjE7EXlPbAbdRlAgpuNnyOF/j3gnaAFEv/EgmGqUEbW/OLPMXcvu6RCD
+G8GLO0CD9Q8IN33ZmLyo
+=iUTJ
 -----END PGP SIGNATURE-----
--- a/dev-python/python-keystoneclient/files/cve-2015-1852-master-keystoneclient.patch
+++ b/dev-python/python-keystoneclient/files/cve-2015-1852-master-keystoneclient.patch
@ -0,0 +1,84 @@
+From 46f8d86c197376b0cdd9589310f2e66ef7af027a Mon Sep 17 00:00:00 2001
+From: Brant Knudson <bknudson@us.ibm.com>
+Date: Tue, 7 Apr 2015 19:38:29 +0000
+Subject: [PATCH] Fix s3_token middleware parsing insecure option
+
+The "insecure" option was being treated as a bool when it was
+actually provided as a string. The fix is to parse the string to
+a bool.
+
+Closes-Bug: 1411063
+Change-Id: I508dae8d7bedfc903e476cdefac43d05cbd7fbe1
+---
+ keystoneclient/middleware/s3_token.py              |  3 ++-
+ .../tests/unit/test_s3_token_middleware.py         | 24 +++++++++++++++++++++-
+ 2 files changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/keystoneclient/middleware/s3_token.py b/keystoneclient/middleware/s3_token.py
+index 7552893..f8d1ce0 100644
+--- a/keystoneclient/middleware/s3_token.py
+++ b/keystoneclient/middleware/s3_token.py
+@@ -34,6 +34,7 @@ This WSGI component:
+ import logging
+ 
+ from oslo_serialization import jsonutils
+from oslo_utils import strutils
+ import requests
+ import six
+ from six.moves import urllib
+@@ -116,7 +117,7 @@ class S3Token(object):
+         self.request_uri = '%s://%s:%s' % (auth_protocol, auth_host, auth_port)
+ 
+         # SSL
+-        insecure = conf.get('insecure', False)
+        insecure = strutils.bool_from_string(conf.get('insecure', False))
+         cert_file = conf.get('certfile')
+         key_file = conf.get('keyfile')
+ 
+diff --git a/keystoneclient/tests/unit/test_s3_token_middleware.py b/keystoneclient/tests/unit/test_s3_token_middleware.py
+index d5a62e8..dfb4406 100644
+--- a/keystoneclient/tests/unit/test_s3_token_middleware.py
+++ b/keystoneclient/tests/unit/test_s3_token_middleware.py
+@@ -124,7 +124,7 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
+     @mock.patch.object(requests, 'post')
+     def test_insecure(self, MOCK_REQUEST):
+         self.middleware = (
+-            s3_token.filter_factory({'insecure': True})(FakeApp()))
+            s3_token.filter_factory({'insecure': 'True'})(FakeApp()))
+ 
+         text_return_value = jsonutils.dumps(GOOD_RESPONSE)
+         if six.PY3:
+@@ -142,6 +142,28 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
+         mock_args, mock_kwargs = MOCK_REQUEST.call_args
+         self.assertIs(mock_kwargs['verify'], False)
+ 
+    def test_insecure_option(self):
+        # insecure is passed as a string.
+
+        # Some non-secure values.
+        true_values = ['true', 'True', '1', 'yes']
+        for val in true_values:
+            config = {'insecure': val, 'certfile': 'false_ind'}
+            middleware = s3_token.filter_factory(config)(FakeApp())
+            self.assertIs(False, middleware.verify)
+
+        # Some "secure" values, including unexpected value.
+        false_values = ['false', 'False', '0', 'no', 'someweirdvalue']
+        for val in false_values:
+            config = {'insecure': val, 'certfile': 'false_ind'}
+            middleware = s3_token.filter_factory(config)(FakeApp())
+            self.assertEqual('false_ind', middleware.verify)
+
+        # Default is secure.
+        config = {'certfile': 'false_ind'}
+        middleware = s3_token.filter_factory(config)(FakeApp())
+        self.assertIs('false_ind', middleware.verify)
+
+ 
+ class S3TokenMiddlewareTestBad(S3TokenMiddlewareTestBase):
+     def setUp(self):
+-- 
+1.9.1
+
+
+
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.11.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-0.11.0.ebuild
@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.11.0.ebuild,v 1.1 2014/09/21 21:26:32 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/python-keystoneclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			>=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-			>=dev-python/httpretty-0.8.0[${PYTHON_USEDEP}]
-			!~dev-python/httpretty-0.8.1[${PYTHON_USEDEP}]
-			!~dev-python/httpretty-0.8.2[${PYTHON_USEDEP}]
-			>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-			>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-			>=dev-python/pycrypto-2.6[${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/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-			>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		)"
-
-RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.1[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.14[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/.)
-	distutils-r1_python_install_all
-}
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.11.1.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-0.11.1.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.11.1.ebuild,v 1.1 2014/09/27 20:16:02 alunduil Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="https://github.com/openstack/python-keystoneclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
-IUSE="examples test"
-
-# NOTE: docs to not install due to pbr configuration issues
-
-# NOTE: dev-python/discover not actually used
-# dev-python/discover[${PYTHON_USEDEP}]
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.4.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/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/.)
-
-	distutils-r1_python_install_all
-}
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.11.2.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-0.11.2.ebuild
@ -1,91 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.11.2.ebuild,v 1.1 2014/11/11 02:12:05 alunduil Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="https://github.com/openstack/python-keystoneclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
-IUSE="doc examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-TCDEPEND="
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-mock-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		${TCDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${TCDEPEND}
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.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}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/.)
-
-	distutils-r1_python_install_all
-}
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.0.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.0.0.ebuild
@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-1.0.0.ebuild,v 1.3 2015/03/09 00:03:42 pacho Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="https://github.com/openstack/python-keystoneclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-TCDEPEND="
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-mock-0.5.1[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${TCDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${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}]
-	)
-	doc? (
-		${TCDEPEND}
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.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}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.1.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.1.0.ebuild
@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-1.1.0.ebuild,v 1.1 2015/02/24 04:48:08 alunduil Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
-IUSE="doc examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-TCDEPEND="
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-mock-0.5.1[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${TCDEPEND}
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.5.1[${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}]
-	)
-	doc? (
-		${TCDEPEND}
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.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}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.2.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.2.0.ebuild
@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-1.2.0.ebuild,v 1.2 2015/02/28 20:10:04 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
-IUSE="doc examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-TCDEPEND="
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-mock-0.5.1[${PYTHON_USEDEP}]
-	>=dev-python/tempest-lib-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		${TCDEPEND}
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.5.1[${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}]
-	)
-	doc? (
-		${TCDEPEND}
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.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}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r2.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r2.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/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r1.ebuild,v 1.1 2015/04/02 19:56:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r2.ebuild,v 1.1 2015/04/14 16:17:32 prometheanfire Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
@ -70,9 +70,13 @@ RDEPEND="
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
 "
+PATCHES=(
+"${FILESDIR}/cve-2015-1852-master-keystoneclient.patch"
+)

 python_prepare_all() {
 	use doc && esetup.py build_sphinx
+	distutils-r1_python_prepare_all
 }

 python_test() {
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.303 2015/04/14 07:42:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.304 2015/04/14 15:14:19 floppym Exp $
+
+  14 Apr 2015; Mike Gilbert <floppym@gentoo.org> cmake-3.2.1.ebuild:
+  Fix mgorny's change; wrong variable name.

  14 Apr 2015; Michał Górny <mgorny@gentoo.org> cmake-3.2.1.ebuild,
  metadata.xml:
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@ -38,25 +38,13 @@ EBUILD cmake-2.8.12.2-r2.ebuild 5702 SHA256 e92cff9b67120db42d8b2b408aa42fe3a593
 EBUILD cmake-2.8.12.2.ebuild 5551 SHA256 589273d08366fd0a979406f3f9f46a8b84764472f2b5e8dad64aa1bd2d574776 SHA512 10a02c2ace51ed3c80a6a65cd2032547c8feee32fd7b45c30d0548926cebf605b61232fbfed2420bee0bf86a8fbd48237e2c15758ac83c18c28c6504944d2e73 WHIRLPOOL 359dae6d17a23382a514b5891cb6df1c867f51fb5952482fb0d5bf504e19ae9342be667ad9c17f89f0478bc2bd9f1ec630da0f831769bfd524c3fba3673d2d52
 EBUILD cmake-3.0.2.ebuild 5156 SHA256 6c841ac46ae5769e22ac16b6af6b1cf234266d3d640507cf0379619ed2582649 SHA512 05f7cee174b3373ca62bafbaee1461e84418a4065895c69c5462f667a0236bbd2d90f4f5a4eb624dc24335c1481f689f223b6d8f84be633939840781ef0058fc WHIRLPOOL 1504c0f74e9d463a590338c4eeac5430c011a6f390f0121a88efc8b2cf88033133f86c7c6836faf66a943974898e01aedb34561c98f750341265f57cf7e1ca93
 EBUILD cmake-3.1.0.ebuild 5099 SHA256 b8af207aee127c21224279e8bdbf9a5cf62760f74d3e192c50719bfad0e5a63b SHA512 5ae290035da81569ac4019e327881fbe42aeca31f25bb62740f3afef8ef1b5308e66fabb5a9f5c4159d5065112131efc606d85e1e456bddfcaa60344c2543956 WHIRLPOOL 0fb06a7127411a0ced9eb316dc602714c21b80dd560c3234ec43e4e8bfd21da77c7fd972737ab07f5713f99efa60862a68ae1dce48bed7dc949dbb22bad6e88b
-EBUILD cmake-3.2.1.ebuild 5274 SHA256 c2081f0e35213607c799c2502df15063d2ad1a85572322dcca8c441a3ce62a71 SHA512 1c019b10cc1209bbede25f3a6f2eb7c71acf8596b0b887f45a0c0f4af9566a33a8188bea71d7be95d617fabf4d9e1ef53d1b66f32a02cbd3f929856dbc07824f WHIRLPOOL 3835e20dfcbdeeb1a35b8423e3326230b4f782f8d2ed0ffaa3d0e626dfa26568aeb33fd22a81d2542730935e98b78d2095ac5bf97220aaee686011b3550e54c7
-MISC ChangeLog 49228 SHA256 d69257d7100bc12d867af090b96c5ebff182baba8798019e64c01866fc4f6b4e SHA512 6c837175ed1945a9cc329d6685ef37b379d9581d3fd669b7698365d96c93cacb81b5c5c7538c103766349c8a7fd105a1f88ee54797ad0934e7c2a91e92120d9f WHIRLPOOL 02aaae1967db2c76bb9a2ee8a233ea495a3868b8aa8fbd02c17881c6cf4e4fb931285b354292de862d0947258e60063132cf8e8b1b5506b6e64fca82d02cfd63
+EBUILD cmake-3.2.1.ebuild 5293 SHA256 ad25a667d7c8e07cdb3553ff1cf6c4ca21398c6a7ae92a3d05183dbb9a126f23 SHA512 cd8243ca9e35681df6e1837497f8f743be733c1269de0444728922a3c56a104ff596beb5b0239f9a69e66ad8aceee0b0f5c445ae6f422d722fe3fea373bda0a7 WHIRLPOOL 20f3462453efe6dd10579315ae2f63d95e0065af045f3475b4b29fb1be8c2184567e37e308b70db486407728399b99d06e279c5997ffaf99c56018ce55d8026d
+MISC ChangeLog 49343 SHA256 445408df51c8e8e3b656b15a0c39c33e6f9cd98c570d50a4a14b5b2b3abd87b5 SHA512 16ecbf63f19464e522a20a7ade5038e3aaae0e8d847fe27d4e2bff105516162f3803675f8168cdc1faa273ffea89000abcaa598111eb81abe7ccb50f07ed0801 WHIRLPOOL f1bd8db32129856b79a4d17747e2897dade165be15360b07fc304c8802b606e7495865ddea6f0bb76c0fa92e580fd3b51c52e9ca90920115cac0db62275f9049
 MISC metadata.xml 358 SHA256 77e9931c9dcc148b60da6f5b9fa3424d3ddf1d393c2d5cb519e7ed488cf75e57 SHA512 ad506c358d613fc3b78c9776a7e811281c710df8d84c041b966660845385e826b75d677a370ef77f550362ab5a8012af4076183e725539529ce2da5b4d8316f3 WHIRLPOOL ba4f93d32f3b4ceadf4b3588c082c213425fd342ee712ff690080fab42484e2619e51382f508c88599424be96a91f3c736aa7e0b63f49cf60fdce9e1f4c3c1ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iQJ8BAEBCABmBQJVLMTiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5TMQALWT0m8CnqOZDRHJd957Tuwq
-m+1GvSghfrdfG2cx79MZyIgJMn38mJVA6dN2cWJzLX1F6r7bHAdY2l5yodaLAGAR
-LMmUsWiLJmEZbH6rEGWE4/0gEVZWBbJ3VLkllBQcI14TdgqEKAh2aenHdti2kIyi
-m2xsf9JecXy9aXskU+fPIPtsA+/1ioMZ/1abgWoWLShzl/XYCnZWgM46t2tyflqL
-ICNXqmZCFy7tzovIZwjy7ONVBQ9x0rINKH2v45qkQHeo5DKoqk5JHWBv42Ka2PLz
-x09eJMzG9Oww9huRlOxWNNxT3uMHri3WWxK5GqV9V5X9/yG38u4CfbcqFsJ78UHf
-Ek5y9G8INX5PhMl9/NsduWSvKGermTqLY70nU127OLnK+dJ/R/fvZfwkw1X2x+fe
-aPQsFXmO0qD/vTTTZ2UXgkS7vt4DcyYw6n6BFUFhzMM5tj5H7AgJU95PR6f14miM
-dzXco0Y+E6ATlpHW8Q8ATS23RhIRSuAiZ65Lcc47/1IWDMzdFdrmsjminBBl25RI
-nkP1VqrmvRXK8312k1ZmSlEQ5Bb+mu4CXkCKjESPHQp6ntdAwhcQROT48xq28+cx
-dszxQXApcE16lUP5XgG1mOZ4qaVdmDfVJFSulG35GNt7BbTu4HCYiwniS9rTdNBZ
-oX+w3MMFcv6P+FHnit/J
-=ze4r
+iF4EAREIAAYFAlUtLs4ACgkQC77qH+pIQ6SuGQEAy05BMpwE22upPd8MXtYPVXpW
+0XzIJxEExOgBzNBE/W8BAIaVzyrOodWdCu09E/HXLagu+k0RJLmz2bPv43NzrYD/
+=90CK
 -----END PGP SIGNATURE-----
--- a/dev-util/cmake/cmake-3.2.1.ebuild
+++ b/dev-util/cmake/cmake-3.2.1.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/dev-util/cmake/cmake-3.2.1.ebuild,v 1.2 2015/04/14 07:42:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild,v 1.3 2015/04/14 15:14:19 floppym Exp $

 EAPI=5

@ -133,7 +133,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_JSONCPP=$(usex !internal-jsoncpp)
+		$(cmake-utils_useno internal-jsoncpp CMAKE_USE_SYSTEM_LIBRARY_JSONCPP)
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
 		-DCMAKE_DOC_DIR=/share/doc/${PF}
 		-DCMAKE_MAN_DIR=/share/man
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1586 2015/04/11 17:11:22 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1587 2015/04/14 14:08:34 chewi Exp $
+
+  14 Apr 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
+  Consider SLOTs when checking Java dependencies. Comment out the longer error
+  message for now to avoid spamming both users and ourselves because this issue
+  is currently widespread.

  11 Apr 2015; Michael Palimaka <kensington@gentoo.org> kde5-functions.eclass,
  kde5.eclass:
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@ -2,11 +2,11 @@
 #
 # Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
 # Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
-# Copyright (c) 2004-2011, Gentoo Foundation
+# Copyright (c) 2004-2015, Gentoo Foundation
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.157 2015/04/04 21:04:49 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.158 2015/04/14 14:08:34 chewi Exp $

 # @ECLASS: java-utils-2.eclass
 # @MAINTAINER:
@ -2687,42 +2687,54 @@ java-pkg_ensure-dep() {
 	local target_pkg="${2}"
 	local dev_error=""

-	# remove the version specification, which may include globbing (* and [123])
-	local stripped_pkg=$(echo "${target_pkg}" | sed \
-		's/-\([0-9*]*\(\[[0-9]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//')
+	# Transform into a regular expression to look for a matching package
+	# and SLOT. SLOTs don't have to be numeric so foo-bar could either
+	# mean foo-bar:0 or foo:bar. So you want to get your head around the
+	# line below?
+	#
+	# * The target package first has any dots escaped, e.g. foo-1.2
+	#   becomes foo-1\.2.
+	#
+	# * sed then looks at the component following the last - character,
+	#   or the whole string if there is no - character. It uses this to
+	#   build a new regexp with two significant branches.
+	#
+	# * The first checks for the whole target package string, optionally
+	#   followed by a version number, and then :0.
+	#
+	# * The second checks for the first part of the target package
+	#   string, optionally followed by a version number, followed by the
+	#   aforementioned component, treating that as a SLOT.
+	#
+	local stripped_pkg=/$(sed -r 's/-?([^-]+)$/(\0(-[^:]+)?:0|(-[^:]+)?:\1)/' <<< "${target_pkg//./\\.}")\\b

 	debug-print "Matching against: ${stripped_pkg}"

-	if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
-		dev_error="The ebuild is attempting to use ${target_pkg} that is not"
-		dev_error="${dev_error} declared in DEPEND."
+	if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ $stripped_pkg ) ]]; then
+		dev_error="The ebuild is attempting to use ${target_pkg}, which is not "
+		dev_error+="declared with a SLOT in DEPEND."
 		if is-java-strict; then
-			eerror "${dev_error}"
 			die "${dev_error}"
-		elif [[ ${BASH_SUBSHELL} = 0 ]]; then
-			eerror "${dev_error}"
-			elog "Because you have this package installed the package will"
-			elog "build without problems, but please report this to"
-			elog "http://bugs.gentoo.org"
+		else
+			eqawarn "${dev_error}"
+			# Uncomment this once we've dealt with more of these or
+			# we'll get hit with a wave of bug reports. :(
+#			eerror "Because you have ${target_pkg} installed,"
+#			eerror "the package will build without problems, but please"
+#			eerror "report this to http://bugs.gentoo.org."
 		fi
-	fi
-
-	if [[ ${limit_to} != build ]]; then
-		if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
-			if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
-				dev_error="The ebuild is attempting to use ${target_pkg},"
-				dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
-				dev_error="${dev_error} or PDEPEND."
-				if is-java-strict; then
-					eerror "${dev_error}"
-					die "${dev_error}"
-				elif [[ ${BASH_SUBSHELL} = 0 ]]; then
-					eerror "${dev_error}"
-					elog "The package will build without problems, but may fail to run"
-					elog "if you don't have ${target_pkg} installed, so please report"
-					elog "this to http://bugs.gentoo.org"
-				fi
-			fi
+	elif [[ ${limit_to} != build && ! ( "${RDEPEND}${PDEPEND}" =~ ${stripped_pkg} ) ]]; then
+		dev_error="The ebuild is attempting to use ${target_pkg}, which is not "
+		dev_error+="declared with a SLOT in [RP]DEPEND and --build-only wasn't given."
+		if is-java-strict; then
+			die "${dev_error}"
+		else
+			eqawarn "${dev_error}"
+			# Uncomment this once we've dealt with more of these or
+			# we'll get hit with a wave of bug reports. :(
+#			eerror "The package will build without problems, but may fail to run"
+#			eerror "if you don't have ${target_pkg} installed,"
+#			eerror "so please report this to http://bugs.gentoo.org."
 		fi
 	fi
 }
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 14 Apr 2015 13:36:52 +0000
+Tue, 14 Apr 2015 16:37:05 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Tue, 14 Apr 2015 13:36:52 +0000
+Tue, 14 Apr 2015 16:37:06 +0000
--- a/metadata/md5-cache/app-accessibility/brltty-5.0-r3
+++ b/metadata/md5-cache/app-accessibility/brltty-5.0-r3
@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://mielke.cc/brltty/archive/brltty-5.0.tar.xz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5fa532280c190fb351b84555d3e3d753
--- a/metadata/md5-cache/app-accessibility/brltty-5.2
+++ b/metadata/md5-cache/app-accessibility/brltty-5.2
@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://brltty.com/archive/brltty-5.2.tar.xz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ece3953e8a210b823c05f895f38d8b34
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
@ -8,5 +8,5 @@ LICENSE=jsapi? ( sun-bcla-jsapi ) freetts
 RDEPEND=>=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/freetts/freetts-1.2.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=47d1f65838064f4ecd5292d71dbd8e4a
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.2
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.2
@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/freetts/freetts-1.2.2-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b662bb80a4642bb0514b239d2c8062d0
--- a/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
+++ b/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
@ -10,5 +10,5 @@ PDEPEND=net-nds/389-admin
 RDEPEND=|| ( >=virtual/jre-1.5 >=virtual/jdk-1.5 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1.7 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/389-admin-console-1.1.8.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b37a1518356a0c8edba8f4f11b43bb37
--- a/metadata/md5-cache/app-admin/389-console-1.1.7-r1
+++ b/metadata/md5-cache/app-admin/389-console-1.1.7-r1
@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=dev-java/java-config-2.1.9-r1
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/389-console-1.1.7.tar.bz2 http://dev.gentoo.org/~lxnay/389-console/fedora.png
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=60c13f02f88a97013e0c9ba30f223284
--- a/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
+++ b/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 net-nds/389-ds-base >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=http://directory.fedoraproject.org/sources/389-ds-console-1.2.6.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5048d44119bf049f103085c86621184
--- a/metadata/md5-cache/app-admin/chef-10.24.0-r1
+++ b/metadata/md5-cache/app-admin/chef-10.24.0-r1
@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/chef-10.24.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3bb2ca9ae6540d2659466f1b682dfaa9
--- a/metadata/md5-cache/app-admin/chef-expander-10.24.0
+++ b/metadata/md5-cache/app-admin/chef-expander-10.24.0
@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/chef-expander-10.24.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e4f410aa5621e568968d48ebbe0d524e
--- a/metadata/md5-cache/app-admin/chef-server-10.24.0
+++ b/metadata/md5-cache/app-admin/chef-server-10.24.0
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~app-admin/chef-server-api-10.24.0[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/chef-server-10.24.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3053a7a8e0692617065b7d2e41f0c101
--- a/metadata/md5-cache/app-admin/chef-server-api-10.24.0
+++ b/metadata/md5-cache/app-admin/chef-server-api-10.24.0
@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/chef-server-api-10.24.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e0bab12ee8ed3174a997e9bb08838c44
--- a/metadata/md5-cache/app-admin/chef-server-webui-10.24.0
+++ b/metadata/md5-cache/app-admin/chef-server-webui-10.24.0
@ -10,5 +10,5 @@ RDEPEND=>=dev-db/couchdb-0.10.0 >=net-misc/rabbitmq-server-1.7.0 ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/chef-server-webui-10.24.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=becc1a5a84ac8d8dd7dd4bc01b7a0285
--- a/metadata/md5-cache/app-admin/chef-solr-10.24.0
+++ b/metadata/md5-cache/app-admin/chef-solr-10.24.0
@ -10,5 +10,5 @@ RDEPEND=>=net-misc/rabbitmq-server-1.7.2 >=virtual/jre-1.6 ruby_targets_ruby19?
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/chef-solr-10.24.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=21b3f00ff39f58fd0f2a4e3810f085ea
--- a/metadata/md5-cache/app-admin/ec2-api-tools-1.6.7.2-r4
+++ b/metadata/md5-cache/app-admin/ec2-api-tools-1.6.7.2-r4
@ -10,5 +10,5 @@ RDEPEND=dev-java/bcprov:1.45 dev-java/commons-cli:1 dev-java/commons-codec:0 dev
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.6.7.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=12735c8c26829372c24c92b58250ed95
--- a/metadata/md5-cache/app-admin/mcollective-2.5.3
+++ b/metadata/md5-cache/app-admin/mcollective-2.5.3
@ -10,5 +10,5 @@ RDEPEND=dev-ruby/stomp ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://puppetlabs.com/downloads/mcollective/mcollective-2.5.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=05847f702ccf509c52caf69eeae69d84
--- a/metadata/md5-cache/app-admin/mcollective-2.8.0
+++ b/metadata/md5-cache/app-admin/mcollective-2.8.0
@ -10,5 +10,5 @@ RDEPEND=dev-ruby/stomp ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://puppetlabs.com/downloads/mcollective/mcollective-2.8.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f0510246b5328c00d2bdea80f474f941
--- a/metadata/md5-cache/app-admin/puppet-2.7.24
+++ b/metadata/md5-cache/app-admin/puppet-2.7.24
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/facter-1.5.6[ruby_targets_ruby19] auge
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-2.7.24.tar.gz
-_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
 _md5_=09b216d8dcae56d5b89ac5fbe878cc85
--- a/metadata/md5-cache/app-admin/puppet-2.7.25
+++ b/metadata/md5-cache/app-admin/puppet-2.7.25
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/facter-1.5.6[ruby_targets_ruby19] auge
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-2.7.25.tar.gz
-_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
 _md5_=ae9d967a08b8f8292a99364e9e302f2a
--- a/metadata/md5-cache/app-admin/puppet-3.4.1
+++ b/metadata/md5-cache/app-admin/puppet-3.4.1
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/fa
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-3.4.1.tar.gz
-_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
 _md5_=8ba0c3b09de89dc50538408543de61e7
--- a/metadata/md5-cache/app-admin/puppet-3.6.2
+++ b/metadata/md5-cache/app-admin/puppet-3.6.2
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-3.6.2.tar.gz
-_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
 _md5_=ce3d5a1ec7fe3eb01b91f1b3d12f0df9
--- a/metadata/md5-cache/app-admin/puppet-3.7.1
+++ b/metadata/md5-cache/app-admin/puppet-3.7.1
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-3.7.1.tar.gz
-_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
 _md5_=29551ac65ff95f5cd3cc3826543a73f7
--- a/metadata/md5-cache/app-admin/puppet-3.7.2
+++ b/metadata/md5-cache/app-admin/puppet-3.7.2
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-3.7.2.tar.gz
-_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
 _md5_=ff9a51e6a553ac2546306b091c82baea
--- a/metadata/md5-cache/app-admin/puppet-3.7.3
+++ b/metadata/md5-cache/app-admin/puppet-3.7.3
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-3.7.3.tar.gz
-_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
 _md5_=d9f8d4f8c59e45cf68e74ef4b9a80f02
--- a/metadata/md5-cache/app-admin/puppet-3.7.4
+++ b/metadata/md5-cache/app-admin/puppet-3.7.4
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-3.7.4.tar.gz
-_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
 _md5_=4b76ad89373b10d0f65cd4bc1c508eca
--- a/metadata/md5-cache/app-admin/puppet-lint-0.3.2
+++ b/metadata/md5-cache/app-admin/puppet-lint-0.3.2
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/puppet-lint-0.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=949b3efa071b3cca69f16df0422ab753
--- a/metadata/md5-cache/app-admin/puppet-lint-1.1.0
+++ b/metadata/md5-cache/app-admin/puppet-lint-1.1.0
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/puppet-lint-1.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1ee685e62294696aeaceb06789261783
--- a/metadata/md5-cache/app-admin/r10k-1.1.3
+++ b/metadata/md5-cache/app-admin/r10k-1.1.3
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/colored-1.2[ruby_targets_ruby19] =dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/r10k-1.1.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=815c3fecee921fa8f04960dda1f3a229
--- a/metadata/md5-cache/app-admin/setools-3.3.8-r5
+++ b/metadata/md5-cache/app-admin/setools-3.3.8-r5
@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.1.4 >=sys-libs/libselinux-2.3 >=dev-db/sqlite-3.2:
 RESTRICT=test
 SLOT=0
 SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.8/setools-3.3.8.tar.bz2 http://dev.gentoo.org/~swift/patches/setools/setools-3.3.8-01-fedora-patches.tar.gz http://dev.gentoo.org/~swift/patches/setools/setools-3.3.8-03-gentoo-patches.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e9cfd92cfa43129f98bdb33b21de5669
--- a/metadata/md5-cache/app-admin/setools-3.3.8-r7
+++ b/metadata/md5-cache/app-admin/setools-3.3.8-r7
@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.1.4 >=sys-libs/libselinux-2.3 >=dev-db/sqlite-3.2:
 RESTRICT=test
 SLOT=0
 SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.8/setools-3.3.8.tar.bz2 http://dev.gentoo.org/~perfinion/patches/setools/setools-3.3.8-04-gentoo-patches.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6865513588f67ded70eebff2f8011479
--- a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4
+++ b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4
@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 beanshell? ( dev-java/bsh ) >=dev-java/bsf-2.3 =dev-java/junit-3.8* java-virtuals/javamail >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://apache/jakarta/jmeter/source/jakarta-jmeter-2.0.1_src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d03f65dbddf57b2253588506d90db0b5
--- a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5
+++ b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5
@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 beanshell? ( dev-java/bsh ) >=dev-java/bsf-2.3 =dev-java/junit-3.8* java-virtuals/javamail >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/jmeter/source/jakarta-jmeter-2.0.1_src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ae7c3b3d5be3f6ccbe6719dc8998d101
--- a/metadata/md5-cache/app-cdr/webcdwriter-2.8.2-r2
+++ b/metadata/md5-cache/app-cdr/webcdwriter-2.8.2-r2
@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 app-cdr/cdrdao virtual/cdrtools mp3? ( media-sound/mpg123 ) sox? ( media-sound/sox ) vorbis? ( media-sound/vorbis-tools ) >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://joerghaeger.de/webCDwriter/download/webCDwriter-2.8.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=60c7fe33d900b4e554c3d21493c3fde4
--- a/metadata/md5-cache/app-crypt/jacksum-1.7.0
+++ b/metadata/md5-cache/app-crypt/jacksum-1.7.0
@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.3.1 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jacksum/jacksum-1.7.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d0834201c08c2dba01c19c1cbdd0653
--- a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r1
+++ b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r1
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 SLOT=0
 SRC_URI=http://prime.sourceforge.jp/src/prime-dict-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b941d6648809c92ed9a8e459c0004598
--- a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r2
+++ b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r2
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://prime.sourceforge.jp/src/prime-dict-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4e7373230bf9761a48b95aa090750164
--- a/metadata/md5-cache/app-editors/diakonos-0.9.4
+++ b/metadata/md5-cache/app-editors/diakonos-0.9.4
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://diakonos.pist0s.ca/archives/diakonos-0.9.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eac72c9b3a179682f245ec7834fe2bed
--- a/metadata/md5-cache/app-editors/jedit-5.0.0
+++ b/metadata/md5-cache/app-editors/jedit-5.0.0
@ -10,5 +10,5 @@ RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jedit/jedit5.0.0source.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bdc2c72ca23b9557a8276c6f8bd9fd30
--- a/metadata/md5-cache/app-editors/jext-5.0
+++ b/metadata/md5-cache/app-editors/jext-5.0
@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 JPython )
 RDEPEND=>=virtual/jre-1.4 dev-java/jython:0 dev-java/jgoodies-looks:1.2 dev-java/gnu-regexp:1 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jext/jext-sources-5.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e534970a666527e23906a615bc6627aa
--- a/metadata/md5-cache/app-editors/jext-5.0-r1
+++ b/metadata/md5-cache/app-editors/jext-5.0-r1
@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 JPython )
 RDEPEND=>=virtual/jre-1.6 dev-java/jython:0 dev-java/jgoodies-looks:1.2 dev-java/gnu-regexp:1 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jext/jext-sources-5.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bf39534838c41cacdbf438cc9db783d5
--- a/metadata/md5-cache/app-emacs/jde-2.4.1
+++ b/metadata/md5-cache/app-emacs/jde-2.4.1
@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/jdk-1.3 app-emacs/elib dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/jdee-2.4.1.tar.xz
-_eclasses_=elisp	b7ff113c97bf466ace6f3235f80af600	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=elisp	b7ff113c97bf466ace6f3235f80af600	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ebf834dffab1dac91d41a5d7e347120
--- a/metadata/md5-cache/app-emulation/edumips64-1.1
+++ b/metadata/md5-cache/app-emulation/edumips64-1.1
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/edumips64/edumips64-1.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff15ed62d085b494baf95d7debac1209
--- a/metadata/md5-cache/app-emulation/edumips64-1.2
+++ b/metadata/md5-cache/app-emulation/edumips64-1.2
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/edumips64/edumips64-1.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b4343aee969c3fd8e68accf82fcb134c
--- a/metadata/md5-cache/app-emulation/vagrant-1.0.7
+++ b/metadata/md5-cache/app-emulation/vagrant-1.0.7
@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mitchellh/vagrant/archive/v1.0.7.tar.gz -> vagrant-1.0.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=790d14bfe82c15a438822bdccbe89caa
--- a/metadata/md5-cache/app-emulation/vagrant-1.4.3-r2
+++ b/metadata/md5-cache/app-emulation/vagrant-1.4.3-r2
@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mitchellh/vagrant/archive/v1.4.3.tar.gz -> vagrant-1.4.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a3aca740e8ab33bcc67f583b1b659c3e
--- a/metadata/md5-cache/app-emulation/virtualbox-4.3.18
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.3.18
@ -11,5 +11,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.18 d
 REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.18/VirtualBox-4.3.18.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.16-patches-01.tar.xz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=69adad3f0b67ab094a40640474866beb
--- a/metadata/md5-cache/app-emulation/virtualbox-4.3.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.3.24
@ -11,5 +11,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.24 d
 REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.24/VirtualBox-4.3.24.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.16-patches-01.tar.xz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0c087848220b3856ab6d5a18ca857b99
--- a/metadata/md5-cache/app-emulation/virtualbox-4.3.26
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.3.26
@ -11,5 +11,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.26 d
 REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.26/VirtualBox-4.3.26.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.16-patches-01.tar.xz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=70fe9d51ad067f76d347ebe49b6c75eb
--- a/metadata/md5-cache/app-misc/bfm-1.2-r1
+++ b/metadata/md5-cache/app-misc/bfm-1.2-r1
@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/sun-java3d-bin-1.3 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://bfm.webhop.net/releases/bfm-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=77725f0a5a5146546b54bfe5cb8e8f0c
--- a/metadata/md5-cache/app-misc/bfm-1.2-r2
+++ b/metadata/md5-cache/app-misc/bfm-1.2-r2
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/sun-java3d-bin:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://bfm.webhop.net/releases/bfm-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d96c2371fcb9997997678bdfe4194106
--- a/metadata/md5-cache/app-misc/booh-0.9.4-r1
+++ b/metadata/md5-cache/app-misc/booh-0.9.4-r1
@ -10,5 +10,5 @@ RDEPEND=media-gfx/exiv2 gtk? ( >=x11-libs/gtk+-2.8:2 ) || ( media-gfx/imagemagic
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://booh.org/packages/booh-0.9.4.tar.bz2
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f159065c5fa5115030499a605cf23ef2
--- a/metadata/md5-cache/app-misc/freemind-0.9.0-r1
+++ b/metadata/md5-cache/app-misc/freemind-0.9.0-r1
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/freemind/freemind-src-0.9.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b440744e578b14df818d7b19ebd05992
--- a/metadata/md5-cache/app-misc/freemind-1.0.0-r1
+++ b/metadata/md5-cache/app-misc/freemind-1.0.0-r1
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/freemind/freemind-src-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1f57e56c42154fac61feeaff7e31fd58
--- a/metadata/md5-cache/app-misc/freemind-1.0.1
+++ b/metadata/md5-cache/app-misc/freemind-1.0.1
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/freemind/freemind-src-1.0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e72896ab34f170e889d38395ee6b80f
--- a/metadata/md5-cache/app-misc/hivex-1.3.11
+++ b/metadata/md5-cache/app-misc/hivex-1.3.11
@ -10,5 +10,5 @@ RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oc
 REQUIRED_USE=python? ( )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.11.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	7a1c6bac46bba968758a2f7666af645b	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	7a1c6bac46bba968758a2f7666af645b	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7959ceff479dd4a34f70ae0725bae10
--- a/metadata/md5-cache/app-misc/hivex-1.3.11-r1
+++ b/metadata/md5-cache/app-misc/hivex-1.3.11-r1
@ -10,5 +10,5 @@ RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oc
 REQUIRED_USE=python? ( )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.11.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	7a1c6bac46bba968758a2f7666af645b	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	7a1c6bac46bba968758a2f7666af645b	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b2b1f86fbbbb338978bf481bd3630a66
--- a/metadata/md5-cache/app-misc/jdictionary-1.8-r2
+++ b/metadata/md5-cache/app-misc/jdictionary-1.8-r2
@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jdictionary/jdictionary-1_8.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=13a7cf002aa52339344a382eacb75530
--- a/metadata/md5-cache/app-misc/jdictionary-1.8-r3
+++ b/metadata/md5-cache/app-misc/jdictionary-1.8-r3
@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jdictionary/jdictionary-1_8.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b1bcc760bf29fc9187552fdd0ff516e5
--- a/metadata/md5-cache/app-misc/jitac-0.3.0
+++ b/metadata/md5-cache/app-misc/jitac-0.3.0
@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/sun-jimi:0 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://www.roqe.org/jitac/jitac-0.3.0.src.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5013f2b50ebb8371b807cd711fe4e633
--- a/metadata/md5-cache/app-misc/slashtime-0.5.11
+++ b/metadata/md5-cache/app-misc/slashtime-0.5.11
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-gnome-4.0.14_rc2:4.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://research.operationaldynamics.com/projects/slashtime/dist/slashtime-0.5.11.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=28173eccb3a6aa4e423eccc8305d598c
--- a/metadata/md5-cache/app-misc/slashtime-0.5.13-r1
+++ b/metadata/md5-cache/app-misc/slashtime-0.5.13-r1
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/java-gnome:4.1 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://research.operationaldynamics.com/projects/slashtime/dist/slashtime-0.5.13.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc57a57b04c5f0f13555838553788b9f
--- a/metadata/md5-cache/app-office/borg-1.7.4-r1
+++ b/metadata/md5-cache/app-office/borg-1.7.4-r1
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 java-virtuals/javamail:0 >=virtual/jre-1.5 dev-db/hsqldb:0 dev-java/jgoodies-looks:2.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/borg-calendar/borg%201.7/BORG%201.7.4/borg_src_1_7_4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5ccbb92a370847961208435a81100e65
--- a/metadata/md5-cache/app-office/borg-1.7.4-r2
+++ b/metadata/md5-cache/app-office/borg-1.7.4-r2
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 java-virtuals/javamail:0 >=virtual/jre-1.5 dev-db/hsqldb:0 dev-java/jgoodies-looks:2.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/borg-calendar/borg%201.7/BORG%201.7.4/borg_src_1_7_4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d1ab48106c14e3c4ab0b2cb8db10b4e2
--- a/metadata/md5-cache/app-office/hourglass-0.7.2
+++ b/metadata/md5-cache/app-office/hourglass-0.7.2
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/log4j dev-java/jcommon:1.0 dev-java/jdom:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/hourglass/hourglass-0.7.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2a3a9edc4bbafd253b91db7b4392ac83
--- a/metadata/md5-cache/app-office/libreoffice-4.4.1.2
+++ b/metadata/md5-cache/app-office/libreoffice-4.4.1.2
@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) bluetooth? ( dbus ) collada? ( gltf ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-4.4.1.2.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-4.4.1.2.tar.xz http://download.documentfoundation.org/libreoffice/src/4.4.1//libreoffice-4.4.1.2.tar.xz http://download.documentfoundation.org/libreoffice/src/4.4.1//libreoffice-help-4.4.1.2.tar.xz http://download.documentfoundation.org/libreoffice/old/4.4.1.2//libreoffice-4.4.1.2.tar.xz http://download.documentfoundation.org/libreoffice/old/4.4.1.2//libreoffice-help-4.4.1.2.tar.xz http://dev-www.libreoffice.org/src//d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b2848fade1b1324d9f60ff905b814fb4
--- a/metadata/md5-cache/app-office/libreoffice-4.4.2.2
+++ b/metadata/md5-cache/app-office/libreoffice-4.4.2.2
@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) bluetooth? ( dbus ) collada? ( gltf ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-4.4.2.2.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-4.4.2.2.tar.xz http://download.documentfoundation.org/libreoffice/src/4.4.2//libreoffice-4.4.2.2.tar.xz http://download.documentfoundation.org/libreoffice/src/4.4.2//libreoffice-help-4.4.2.2.tar.xz http://download.documentfoundation.org/libreoffice/old/4.4.2.2//libreoffice-4.4.2.2.tar.xz http://download.documentfoundation.org/libreoffice/old/4.4.2.2//libreoffice-help-4.4.2.2.tar.xz http://dev-www.libreoffice.org/src//d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b403d284671510528f8e43b8c9c4a588
--- a/metadata/md5-cache/app-office/libreoffice-4.4.9999
+++ b/metadata/md5-cache/app-office/libreoffice-4.4.9999
@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) bluetooth? ( dbus ) collada? ( gltf ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=d6f4fbf55a81b6152373ba9debdeffb3
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) bluetooth? ( dbus ) collada? ( gltf ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=55f830a7aaf52dc32523fbb79a5a6705
--- a/metadata/md5-cache/app-office/libreoffice-bin-4.4.1.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-4.4.1.2
@ -12,5 +12,5 @@ REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-4.4.1.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-4.4.1.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-4.4.1.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-4.4.1.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-4.4.1.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-4.4.1.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-4.4.1.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-4.4.1.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-4.4.1.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-4.4.1.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-4.4.1.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-4.4.1.2.xd3 ) ) ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2a7db4fb60c480bb9d9d91d655bd74f4
--- a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
+++ b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
@ -10,5 +10,5 @@ RDEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7 virtual/libiconv bluetooth? ( ne
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pilot-link.org/source/pilot-link-0.12.5.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=75aebca19e5db57eb12090b967bddcd3
--- a/metadata/md5-cache/app-text/deplate-0.8.5
+++ b/metadata/md5-cache/app-text/deplate-0.8.5
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/deplate-0.8.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bd5306a99ca3c216364bbb8bb9664b40
--- a/metadata/md5-cache/app-text/epubcheck-1.1
+++ b/metadata/md5-cache/app-text/epubcheck-1.1
@ -9,5 +9,5 @@ LICENSE=MIT BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/jigsaw:0 dev-java/saxon:6.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=https://epubcheck.googlecode.com/files/epubcheck-src-1.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eb28736fe002941d248d8ee357d8912c
--- a/metadata/md5-cache/app-text/glark-1.10.4
+++ b/metadata/md5-cache/app-text/glark-1.10.4
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/jpace/glark/archive/v1.10.4.tar.gz -> glark-git-1.10.4.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=237eb49de59b6582821c8fa57a045d85
--- a/metadata/md5-cache/app-text/glark-1.10.5
+++ b/metadata/md5-cache/app-text/glark-1.10.5
@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jpace/glark/archive/v1.10.5.tar.gz -> glark-git-1.10.5.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9813e83fcc8fdec515f6f7e0580b005f
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.10-r1
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.10-r1
@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? ( app-text/mecab ) ruby? ( dev-lang/ruby ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://fallabs.com/hyperestraier/hyperestraier-1.4.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc34cbcd9918ecf7922dc60fe2e79b8e
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13
@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? ( app-text/mecab ) ruby? ( dev-lang/ruby ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f3848ef1aeea02d1d8506a3936511ac
--- a/metadata/md5-cache/app-text/jabref-2.10
+++ b/metadata/md5-cache/app-text/jabref-2.10
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	85dc5414cfdfbdf5b56e6d8345d2c658	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2257adeaac9408ab545ef49ae751bae6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3d99f33444563ca65982e10caf94c3fd
--- a/Show More
+++ b/Show More