17 files changed, 131 insertions, 72 deletions
diff --git a/dev-java/castor/ChangeLog b/dev-java/castor/ChangeLog
index 6c977ccf78d6..6f2c252d9f00 100644
--- a/dev-java/castor/ChangeLog
+++ b/dev-java/castor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/castor
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.58 2015/04/24 12:28:59 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.59 2015/06/13 11:34:21 ago Exp $
+
+  13 Jun 2015; Agostino Sarubbo <ago@gentoo.org> castor-0.9.9.1-r7.ebuild,
+  castor-1.1.1-r3.ebuild:
+  Stable for amd64, wrt bug #551524
 
   24 Apr 2015; Patrice Clement <monsieurp@gentoo.org> castor-1.1.1-r3.ebuild:
   Adjust cglib-2.1 to cglib-3. Fix bug 547570.
diff --git a/dev-java/castor/Manifest b/dev-java/castor/Manifest
index 21265672015e..fd41111f9354 100644
--- a/dev-java/castor/Manifest
+++ b/dev-java/castor/Manifest
@@ -1,10 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0.9.5.3-jikes.patch 1316 SHA256 e6e7b56cdf09eedef1e09bb4599d60837af1cc4251cfa0ac637c3994a135519f SHA512 ad39d5fedb2f1fbe2d7457ba6d4eaec0ec1215f388aa4921ecc866260ac6729a791340d3230ef14d36f1d282570ab7146ea69b04d1774530e9f83574d9f599cb WHIRLPOOL a34fc1d0f63f16d2efeb68999c5359637593e9da6af0f26299a254a7b25f74b1317edae00c294c62188743fabe4d8a8023b963e2feaf31b0dadf1bf8aefefb65
 AUX 1.1.1-jdk-1.4.patch 1403 SHA256 5d49640c380ffedbc54223944226f6320636a9996e328abe280b8de9344248dc SHA512 b24b648c6cf4d9a0b2d7c11a6dd41e963c8a6581839d4ee1a2a708776bb0a6f04209e5bbaa48212c4bf6bccd1e9be18c1304385b7500f2273ca1bc5cac62a7fe WHIRLPOOL eb6bf05b7025e88db86e8b0e22cbe314e6fc45bafc35854a1a5f4e9701911e50d301c7b1db5aec2458d8bed7babfac88a386992122e0204f71ea446622722809
 DIST castor-0.9.9.1-src.tgz 6794995 SHA256 df569ab985714477956e68ed497ac1fa9fde5f95a8bc0264ee2d31125a970f81 SHA512 d3150af0fdccf4c477b401fe24c7b429d7573693f697f7e6e2e88a13573ca9aa43749c8ee0d381e5a4fd9cc729719f04cc6efadb3c20426a609fa8217bbc45da WHIRLPOOL 01aa718cc1d819103dbf2c6d52f2301e8144ee941ff7d4e3c5c9548898c7a1e7c3587982183851569c67032b612efdb79ac3068bd72546f5251b405b9df5a41a
 DIST castor-1.1.1-src.tgz 9067936 SHA256 f39f96e7f42cbe429ea8050e2f600783cd04c3b07642486a8c1e23dcf2a1cfda SHA512 ec066a227e71c1884e168dea8f7a3bfbfd3275e4c7b83a07e9673b3f84dc52c734c337694bd725de1db5c7a803cc2dadbdd3d1f7507fadc93687d5c05e3a26d5 WHIRLPOOL 2d5312a5ae2ab6bb86b960d3f9c2cc6e6d9de823ed3b0ce6ffa03570ffcf931b59b67d4ef2e5ddf32f6ae1f791b2e0e7ca51935379a0b54f30959ad844768367
 EBUILD castor-0.9.9.1-r6.ebuild 1815 SHA256 f611daa917beba3e9128ec0a6360d6bb228cae3d26dba186ad468a21a2937f20 SHA512 64a2b87cdeb8966c3ec9a203f62d4d13ee01bc7482cd474c3d6ba5c28c7c58ade5aeb38f382a0d84c785450e23cf500651db5e73b1e81f2b175ea3ab60639b6c WHIRLPOOL ae3a6469bc0453875f5d1dfee0071b765e0bd551bec351eeb820d192b91cbb085eb28781a8ae81c15f7b02d1fec3ecc79bdd3bb668d8ff7ad0cce7cee8ebc4ee
-EBUILD castor-0.9.9.1-r7.ebuild 2119 SHA256 055ba25b2ce888c61a1cabf7c93f38fd835d5245369beb2f65c401409cce5658 SHA512 2a4287af63a04ef45cf677494de6f3de135376ccec69e14367cb59b329998a2d7d0b89af4c0f6e58931c7b050896e84d0a1b0ed1e9a6d54a309630292bef0e06 WHIRLPOOL e59d1aefbcfd7c36e65fd3bcefe48af20f0a77a322e8fca91ca0980d79b801e483c8ae44cfa8b65f9f31788407f8d2d0f28786788f5ebedfb7c6cd7108eb5897
+EBUILD castor-0.9.9.1-r7.ebuild 2112 SHA256 a20c7a18aaccc08a01055f934bafb774d4d62cfdfc25edda12d12c10c95ab1a0 SHA512 3a91b6da1c07cfcdcab0f76802f08a10575699e456b8b665a98209a0b88c402a6c176887a249ee632dd35ff5c524b7de10d58fd8d19b4d2d8c23a737fb134d8b WHIRLPOOL 60ed4b23d932bbf55519bfea1d48f1b08c6a65053692e38f71793a47cda567ae96fc287e43618a44bac15407d9686d81d77f5285c2e438f151728c970e4acf9b
 EBUILD castor-1.1.1-r2.ebuild 2483 SHA256 c647f145f0662f5dbf3aeba63ce6272a71fb2490e2972ae423f96af11526540e SHA512 83b2c08e2043878873c27d83b5696e40d2c7d48f3c1e74ecd2c3822a7540e3e9b3779598b2077ad28c8d71ba8923a951f8d6d35c1c77c9b0a9200869d6ec1894 WHIRLPOOL f7deb9f08cde940d14cca7e5be144f38d313c8bb2cfd01835378da12ae89d6a71e20ec408893cbb38f0f827680875ddae196b310f7fe1aa596bdae7359fe8673
-EBUILD castor-1.1.1-r3.ebuild 2486 SHA256 581d148f956fa4147870f8174c05ac21c3b04829ed5ad3d0c33c4a61348c2923 SHA512 03dbc90f0c59c30fcea2fff6caa01e82bc96eef4cded133ed1fc6e7bb89dca5661f3334a5cf44bb6aeb7ebfd31c20345123abde6fc13d8ccc66e4a96a13d76b8 WHIRLPOOL d47a5c02f5e518defc559d2d90b8d14361d6dbb0cdcbcc0e2278652a97f4bb2941412e49969d86978278b89a047648ad5faf26fa9c1758c379630a5fafd72f14
-MISC ChangeLog 7745 SHA256 cab7764f78788efcd0f085c9322d773d00ff872a4367a4d4953960dbc46a20e6 SHA512 9ef4725ec8f6e6c30ce1dc63247275376be32280aa6869a9a0ee4a465cc1158f0634ef67a8714da62dc55e6d845bad072b8fee6a2cc5a797efa1547e990b00f8 WHIRLPOOL f54f07e0735dff637b85a872feaf79033b75bef268fe81acb8e9e9584f4d2020382ceeba94fa777f82ff02add79f3bbdcfdf7c14558d60d91a9acd0a1544c369
+EBUILD castor-1.1.1-r3.ebuild 2479 SHA256 fb12e82f163609bcce1b920ca069555e42ab11c3ed9a2b51566d8a7f2ad5f1ed SHA512 21f55aa82df49c103bb846705e21c2cfebfeccdf887a2bc06cea178b787e044ceabd7b8f46bec4fb95ed8b83c3b29f04240b26ba3243f9c45002bfd8667bfa09 WHIRLPOOL 2f51b5221e0434c6032616267509e244345f38cb7e9d6fe02f842b82546bdc9eff5ec046904f767459ce21a66ccc4557152113ac1e2c869ca69b5e2297f7123b
+MISC ChangeLog 7877 SHA256 ad50b1f3d6eb757d134e427e5673c9bb3b6e920c4985e5d7ef5a02a129d7e2d2 SHA512 af73c9cf4565e80fe7d5701bf37ab987989fac1b6b3fd4f2847727050fb6b4c46b0c56e77df66d900cc22b0b519fd5bba12d6e56df480c45160b4ea290982490 WHIRLPOOL 4c51780db755da33eaa16ecee095751afe95e5c0f36b6e410146c8d1395f72bf2767da4be541999ceeb8648411426edb4a7d7a1079e67ad321502c1c68841da2
 MISC metadata.xml 414 SHA256 fc981b706c1199b5fdd5636a4514f7e214c5a504e9f44c2a4dcd6ca17946c575 SHA512 0e61c76e21f9c7155b8f0236a0e0e52b05cfd7b6a620d6e406d6fcb54e8a4a857a9822c682363b4e76527d119500f24722454d330692f99dc90d9e20a4d49afd WHIRLPOOL 50e69dc8fef6f1fd7c40c1c09ace4eab370e02f19649859c279dc695bac89c6381edad6d78cabb1ca0034dbe95adc0f12e51dff93215cc17b31a189e812dcb42
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVfBU+AAoJELp701BxlEWfx4sP/jFwU627pqwRXl1QAHiOOnFR
+w4zlLebdAbbBGaty+olnO6Q8Z1k0flg66fJ1Uy91g6+4Us1rmuNUFnFv4ers+mXJ
+vx/+QoGojkj6TTiu0beO8VWrLmKVyD4esxu2Nmz1FMjDH1hqRcF8WAB49iJzjIPk
+j4z5B1KSIGfYftzkh7yjPQ1cXQhsS7uDRTw1bYvu1ZdWr4Ln33JvHpNfWE6k4DKk
+YM75PflALuAihCNy7OWtFZ2GdXmslsIR5Mhj1nlOVbuKXDTCYJmw96jN2qTS6959
+wXDd9aKtxruisgoZ0g3mM7iiBgVKBTYGNtKioYBU5GMZPZo6Vdjvm3lkvikAgI4d
++LTmVwsw3fCG9pXMyseWK0PXgqvxVNLcj3pHzo+I4wCRPOuf8uTVRiU8PX4luJNh
+ikBaAgPkNHtBFjW5rZQoiZX0fteL+/A3WRO1viJZmSoYm8aFerFRXDXSAg9bRKGX
+r9UZhcHGZLmEeogU251vgWw28NPOuliQR38F9q2RvJs/5vG8Z/CFDZ/8y02bGN6V
+6/FWbwtMWOp8m5IZyIjuqEgou2RN3iQYKxnQQ08MuN5S8EZxv6cJJYEEt+bd0/ya
+6SG3eDGQWKAdIXkdKmGXXP/Vbiq3oeLn38CmxV2S68jRYiB0h0rhDzKYh9cIpI2J
+2IwCSTqs8W8CNoCZcVgp
+=QQul
+-----END PGP SIGNATURE-----
diff --git a/dev-java/castor/castor-0.9.9.1-r7.ebuild b/dev-java/castor/castor-0.9.9.1-r7.ebuild
index 9d612cc1a2dd..9bac0bd88d2c 100644
--- a/dev-java/castor/castor-0.9.9.1-r7.ebuild
+++ b/dev-java/castor/castor-0.9.9.1-r7.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-java/castor/castor-0.9.9.1-r7.ebuild,v 1.1 2015/04/11 21:58:31 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.9.1-r7.ebuild,v 1.2 2015/06/13 11:34:21 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ DESCRIPTION="Data binding framework for Java"
 SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${P}-src.tgz"
 HOMEPAGE="http://www.castor.org"
 LICENSE="Exolab"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="0.9"
 IUSE=""
 
diff --git a/dev-java/castor/castor-1.1.1-r3.ebuild b/dev-java/castor/castor-1.1.1-r3.ebuild
index 45deed763206..146b98e15659 100644
--- a/dev-java/castor/castor-1.1.1-r3.ebuild
+++ b/dev-java/castor/castor-1.1.1-r3.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-java/castor/castor-1.1.1-r3.ebuild,v 1.2 2015/04/24 12:28:59 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-1.1.1-r3.ebuild,v 1.3 2015/06/13 11:34:21 ago Exp $
 EAPI=5
 
 JAVA_PKG_IUSE="doc examples source"
@@ -22,7 +22,7 @@ SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${P}-src.tgz"
 
 LICENSE="Exolab"
 SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # tests and full documentation when support will be added
diff --git a/dev-java/guice/ChangeLog b/dev-java/guice/ChangeLog
index d97c06c1a86e..53b31a35f2bc 100644
--- a/dev-java/guice/ChangeLog
+++ b/dev-java/guice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/guice
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/ChangeLog,v 1.5 2015/04/23 06:52:14 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/ChangeLog,v 1.6 2015/06/13 11:34:27 ago Exp $
+
+  13 Jun 2015; Agostino Sarubbo <ago@gentoo.org> guice-2.0-r1.ebuild,
+  guice-3.0-r1.ebuild:
+  Stable for amd64, wrt bug #551524
 
   23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org> guice-2.0-r1.ebuild:
   guice-2.0-r1 does not build with jdk 1.8
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 97f35f873e45..8fcd101b8809 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,12 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.0-build.xml.patch 624 SHA256 cb5f8c4021ab7386ffeab33e86c3443b5b88623bdd9e1572770cb1e54110d9f3 SHA512 1619d921e7bb4718ea754ccb3beb7a7facda933c716a87ae063392f7f3b9e3478ce74c50ec6cce12fe23277a48a1831564252293c79577c846fade993079f91d WHIRLPOOL 212332e3cf4e0aacad39d76ba2e90af32e3038d8ee327aa72b4a5a7a027d5fa0c82cd70ef01de5867fef938a9cd0837dc6897de4889da5adf43e020c3efa2eb1
 AUX 2.0-common.xml.patch 1122 SHA256 c68dd2657cf7f056ce60039dbe0f93d3672390adcbb0a2d8a7b7103b8ebd483f SHA512 5689455fc54732e06ca162e937d8acb889cef410e266b5d287b398edaff4a1fe1322bcf9643eff7c3b0c493d19172975bedb5e2d75028329bd4b1d8d9fd140c5 WHIRLPOOL 6bb269abf389a2864206768dfe900487bef42685bba903d66d18b8704e2b96b37167ce7ac21795536cca17508582292afd2bb5962b2a564c9ed24fbecb92f28f
 AUX 3.0-build.xml.patch 2486 SHA256 9d9cc3f7bb73992a83c13b05b2c774a0c7dc8b280b5c837122adc5abf9c57c45 SHA512 d1f6d56f108533bbb97f6ef7ec951fb68d125c778bcfde3d4a4e24d5f1b78be413252f56567862fc620926f688251e7dd6e0cf5ba3bcad662e555df47711c600 WHIRLPOOL c22e41641e66371a78ac4d4cfb00dc20aa4f4b9e355246f05ce7a252dddaab110840c9aa48e54cb437c32c8cdcbbff92224db2f0886e18d2c52eee637465f075
 AUX 3.0-common.xml.patch 1562 SHA256 39b1cc3190d17232d3064bdf47c411eb861f7a5c199bb1c00acf648d9031c681 SHA512 2c2d332781d2c464f7f2a2cc2e5f0009a4ab0cd6f58d12867de68a4ec8a0d410de156156495cc30680140ec4e80d59e27c84b01ac07b1b54cb31ed47b8912719 WHIRLPOOL 35a94dd7cc0041960914c1e6fad6407054b801aa910dd70804b4a401aa60e5d09902d261a922b62126f9ee3eb07bd2a5e8f043108f8d5aff9afd3d0fe302f0cc
 DIST guice-2.0-src.zip 17342981 SHA256 7f836156d9d6b7688d373a4c70971b8b42e3a553e26a8f98a110a868eb749394 SHA512 61e1c5b6bbd7db5017a99b2998b706071717781360ab8d622d163be2cc954d9b34ab8b68d2ab02f29bb1a8b640ac25350dca302c390855641ca3e4cc4438a1b9 WHIRLPOOL 7be8673b603ad1aa722ddb76cefaec5e1d03e9a4199d25cbb1a58a31f89c33ac1d9e0a479951b5412cc2c94504d46afd56f42a57f3d87ef3915554fbf821d506
 DIST guice-3.0-src.zip 24396399 SHA256 aaa4da9c2d588018b69a757879966da7fcaa02b4a6b208f1300a313c1a426eba SHA512 2918a2ec1c355025d789c6de4275e1b87fa0263e4529813b9758f219d9faeb08cdcba5a82962c3ec632fbdb31376c03198d12599ce6b2ae872cf8b252edd7a05 WHIRLPOOL e2b602bff8e85c6223f05bc750b912e1068f8546cc78fc31957107b6e9e8d0d23e99ea9e94b51562882ccabab14485245207f6754137d33d5e8cc6358e3e9402
-EBUILD guice-2.0-r1.ebuild 1328 SHA256 2ddbdca59eddd69d4b12abe7d57d8a36fd4e8462f0a549e63c4a51d3653f49ed SHA512 58b90bf5ee0b51310633b779dbe6d2f3393965e1df43c8eab29233acdd7bc19398b85bbc606c3fe6798ec2a5d9d5d3953350f3eef4221a1e6117cfae51e27924 WHIRLPOOL 4adc96a15f53a5921a87118806669bf0a1fe36d91f20ae2b1a5ffbcab5a248901401246bfa3bc882ed10e0ac112f7fa6872e7c9836ca50389c2c99cd8f8dd1ee
+EBUILD guice-2.0-r1.ebuild 1322 SHA256 97318fbc88aa190d18c34bd64227b35ce3be879b820ad55dbcae4f38c86efa58 SHA512 0a8f1c779e0315ad0ce1f42d6b96a0a6dd9f70f6e3dc35c60ae93c55f0bb355e50e4d284cf5a0490af7a6cc8053c5f0ccb2a57edb355813659fd41b1dfc1165a WHIRLPOOL 23aac21cd952b948be97caeed1a3d61426d85761fbddba90ad690e137ca4953224ec8c128d257df00284f3fd480c6797b51f195caa77bac49572bbccce41a6d3
 EBUILD guice-2.0.ebuild 1288 SHA256 1066331bb8c089cfd90d6581af60fc88a71d0dbe19829d54d854ddba558719fe SHA512 8f06187cb9f6040f7fe553d17d237f5d7e26c12aa63eaef7249f874497862a2517807e7a85e0d0f8253d3c96c4bd8a79ad7d0c9dc5fd77fc5032238c2a3dbfa1 WHIRLPOOL b713268a2105df0b4a4e6c89a740102e1c03e3ac5bb79e7632c43d4c59bcb47974ac1eed854acb298bede4955f428fa606f87bc425290241380208550bf7aa12
-EBUILD guice-3.0-r1.ebuild 1243 SHA256 5d3582f952cbe4d3bb26c8db7f0fc4ce800f06d18b85f8b82fd4893032837a07 SHA512 72bf32fb9e7d79d67b47334e55b737c0f3d3109626f9a44531207b00444217499f21f00bd846c1359f59c0219484d405a450c9ff8fb7f53086666fb4746afba4 WHIRLPOOL 5b8157e32203f98b139a58f67498dd984fc42aee4b176afd52a5e703215910d16ff3d76fb3d53cbcd5350e562439929ac85da592c068f1a090838f11fed648e2
+EBUILD guice-3.0-r1.ebuild 1236 SHA256 8d89736ac5feddb1a45feae1d6fbf9cf69df8be47290ac3abe3f8eca21ec1ad9 SHA512 c145b81976dddcb44f6a0bd9116702e1fd8d417b8c7c01e1e8bb4ac21209b09f39ff44e2365287fd44d3280e205d4877b15e979298fe3b948d65a4b673391daf WHIRLPOOL 5ec6c950683e8919e88b7b035c446930f3ce8bcee07de19e938fb4101f9d2754475d1793be54772fcaea14a217be6fec35b8a1868910ef5e9657c5ce9d3c6b84
 EBUILD guice-3.0.ebuild 1241 SHA256 42c00f10ff32972966380b315cc93ebb520a84dee9d7ff69b6aab3d2202d386f SHA512 cd10203dabdc243d2546ac6fe6f3ccc063fab706799c9c292cf0a01a2289f7174d33d6902ab528656222beb4fc064276313392e63379670c2177317f3b91423d WHIRLPOOL 32e5cb82c61330a19da304afd42a5fa06fdfae77660649efc8b8473bdd4d8d7c9b6534d4247321fc2e68439c0feb15da9148706220ddf5ba7fc6f93dd5a56159
-MISC ChangeLog 1102 SHA256 bafb6445754c9849c292a24dc9c6ff971dc216b0328681cf93be2e7e72a18d2f SHA512 0a8a1ac267932c36938daecbfafee9c722b9b5988e3310df17725b0c2f86dcb08a9c73eef87e8d772ee23510f9a5fb95e74e0016b599f3e9ba63b3ceedefbaa2 WHIRLPOOL e7ff004e031a4784ecbe6907a7e8b0a8cc9d721ee189e08e003daa8087b531d70d5c0a8a7a3d9bc53d5a897286fb043842b733a12403071626977e0a33e2c72d
+MISC ChangeLog 1227 SHA256 d4ace6ff987a5d2a44324dd1954623f9d5983bc16d9413ff4299060c0041481e SHA512 61638bafe03bc5b398f0cb5f6e32ef6418556fb39d456da4e6c6e32bed189c6d924941da4aa68ce5ce5147eddda00089776a886ed7bc6663db7b9305f2b1685d WHIRLPOOL d701028f02e0e6169f2e9f889f4365d27a1295c9cc302577d70b40b790ce7fa33869e3e61367d094cbfbc4792534c1f50452c4531c9fef449ba3d33d0ab5d77a
 MISC metadata.xml 241 SHA256 06abd52331abac969df4f818ffe7047e0cc3fdfc1a243cec03e53b5a665cfdb1 SHA512 2aab29c42487d867d041d8753ad7fa8261f418a14aa8981c169955c6ccca991e1fd5b7c83a451fb1dc724c5a94ac28a552fff7eb9a78ea5988a1916a1803246f WHIRLPOOL c53ad30024ef34350c7759715758ec6b8296d5dcbd322724c0e0c3ee5a3a6f4fbfddd7d2d605bd08d605103c56e05e7e9038e12074a623631d2c542898581850
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVfBVEAAoJELp701BxlEWf+9YP/3sN5EzlB/4rkIMXphlTBQ5Q
+WhkyCLRmVSf1ptWDj6K0b8nmQp55GgyD9N+eeuefrzWlUKyKAiiT/4ZsHEYeK75t
+mCu0FbOFHXboNhPOiclSX/F+NGq0fUuoSmfVFPspffYXeTAfijtNWuqmV8q1FKlF
+SMyyrVyWA7y3sU2KChlZ/6I7Er/sqMgTTPyZwGCN/fH3LNHR1DwplHjtXteZ85+8
+Tw+m/OKuCiWNEUtbhSmIVOSkJgyN5YhIA3gdrlQWLcKM+5Qn56OeZtktLtwOdogt
+qUbgAYRF3ttAO3BxHduJtRQzoNQT9TA6EcRJVpXUmD8eitn5MAKgw9ckY78caybA
+bnBH15IecoiEtF1ALwE07OhHCNz8WMtS9wt9kOrRPSKWX1Z8AOI87yxozOy7SnC2
+iU4M7I0cT1Kd5F2Spb6ZY6dzP5ggNUxX0nABM2dnDRMoNKuJexwm42lSWZHCcUSN
+cOAydY40XoW0pW3B8GlthSpHkxWDUIoOdmqXppA6KG1a6tknp91SZtfdtxWCo4cF
+pn47pMKNyyL0sqdL5wYbIR0DteclG1zJvhgT/rr0jcXB0ZT/qx6Bi7RELrlc3Bd+
+AtD6s0PxQAnBiyCQYs5Y+ayBo3W5muL7KDeCNiy7NkLXK++D70eM1uBgyzT3W5KB
+qHOskj8KL/NXto6kFR5U
+=yxPk
+-----END PGP SIGNATURE-----
diff --git a/dev-java/guice/guice-2.0-r1.ebuild b/dev-java/guice/guice-2.0-r1.ebuild
index 6b734130c9fb..451d3cc7c290 100644
--- a/dev-java/guice/guice-2.0-r1.ebuild
+++ b/dev-java/guice/guice-2.0-r1.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-java/guice/guice-2.0-r1.ebuild,v 1.2 2015/04/23 06:52:14 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/guice-2.0-r1.ebuild,v 1.3 2015/06/13 11:34:27 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="http://google-guice.googlecode.com/files/${P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE=""
 
diff --git a/dev-java/guice/guice-3.0-r1.ebuild b/dev-java/guice/guice-3.0-r1.ebuild
index 87be890f705f..5cfadc1ed090 100644
--- a/dev-java/guice/guice-3.0-r1.ebuild
+++ b/dev-java/guice/guice-3.0-r1.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-java/guice/guice-3.0-r1.ebuild,v 1.1 2015/04/11 22:25:47 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/guice-3.0-r1.ebuild,v 1.2 2015/06/13 11:34:27 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="http://google-guice.googlecode.com/files/${P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE=""
 
diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index 13d9e2a19934..06c7277af953 100644
--- a/dev-java/hibernate/ChangeLog
+++ b/dev-java/hibernate/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/hibernate
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.49 2015/06/09 13:37:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.50 2015/06/13 11:34:33 ago Exp $
+
+  13 Jun 2015; Agostino Sarubbo <ago@gentoo.org> hibernate-3.1.3-r4.ebuild:
+  Stable for amd64, wrt bug #551524
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
index 8ee3d2190f9d..7ec4eaa58f0c 100644
--- a/dev-java/hibernate/Manifest
+++ b/dev-java/hibernate/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST hibernate-3.1.3.tar.gz 18529984 SHA256 e34feddabd7e1a432f11c670d08338720beb6c1dc5bb62952612f05260944c49 SHA512 5a5acf5abc82bbc38313148dc73cea981f69c68fb6b3023f1c6261a392853b5bd4a9852991011891e8b678ff0c35aea9554ebdd17e0da1b8fdf816ffcaca4dea WHIRLPOOL 0c2c6d5f0d5c04e9cb5e10f9eb22dbb796133791a57b8c4c18e780aa8eb637fd5fe2fa793da4885fdfe8902f7676bcce8e740219afc5176be4284bb575c99497
 EBUILD hibernate-3.1.3-r3.ebuild 1814 SHA256 a4b7efe4361a88cbab9d04ccd1ee2a8ad2407102d4c123e20a8c137340874906 SHA512 564220817c4fad1e8b55c7474a0b6e90de1ca74e5065074f901f76692f00dd7991fa040906944d9f5ae9c6697eb57200eec4fffe04e1361de169d757b0ab0e26 WHIRLPOOL 3c149dddb422fad3f18a74a3413f0ff7c2a3fa14bdb33bcf464e48bbab071331c847adfb7ca754113c5e57257fa4b0049947b6ecfa7ae58a6b67db5bcb1ff563
-EBUILD hibernate-3.1.3-r4.ebuild 2108 SHA256 5d833c93639989ee579e292050b2a5ac90e10e26f51b530aea090f7190d57e75 SHA512 b6229038800f28e5d54abd8fd513804485c75bfcf72f3125f695645491234a0866e89bf500ac59fc002f4cc4a7554ed3b9a9c2e6845522efe425a81e327f7047 WHIRLPOOL 09eb08cd1fd5007d9d0f74e1f38457d77007492e1d7c88ae2f7653ce04dc4dc544c3bb7e9de36b18b4d13eee79727abab50538e33c05f433c999bb3c0d7ffe2f
-MISC ChangeLog 7188 SHA256 c20a3da0f0b45900acd08b4d8e2e7c8c82a16cd9c710bc632036b661ab6e4998 SHA512 68d5ab0ec218f59de9dbe0549d490ac52af7de196c74974cb029f86403d7f7bc63f4e9e1348b49c4a88fc9e542bb17d0eb1f69d3e6a84344fe594369a6d3044c WHIRLPOOL ba1712f266481e2fab44665a1aa57d8b23cb883ce8158f7437a012874f8eba4d07c73c8af64506620058cfc47739f8381afedf9233bb36ed6c3df4f5150ea166
+EBUILD hibernate-3.1.3-r4.ebuild 2101 SHA256 268bac4910e451eda3657760a2765475011524e234052b8a7826cc86902cc8ce SHA512 94bdc3b062528f2d4a19e93a238f218500073b7d2fd08614dc5a297ad57cc3500aa4aec27810b41da5cb8e3d06f7ed791cf52a2b551071d107598c978f4386d9 WHIRLPOOL 491ebb5b16c3d82cfcf5fef2b56675d2e9455e27ed3f8f57676464dd43f8466411f90addc0f0924fc4945b2406aae237e4ea7970354e90a46294eb65a1fbd7b7
+MISC ChangeLog 7300 SHA256 34fe93357541f032813247972a5575aea888a081e0c8af22642cc3c42baa65a6 SHA512 197d634c307f8884bf0f0a460bbf5811768eb18928a397cb72bdb82df2e2007fd923e4c533e2f776cbc7d74f3c078193e756f98986df7987d4a53840d16b5c52 WHIRLPOOL b190ebf7d6211f6a14a2d11395da58a40c8ca91d6b2acbad850fe0b511e77eb0255fcb6be2d76c91a22c00704c30e1bf4e888e1b78271a695edec031de2e64a3
 MISC metadata.xml 237 SHA256 42328874e697e7f822c6da29d0e674d25838616c12310070cfab28643b7a3461 SHA512 4214b2ee41cce5ccae91dc40a9925a97910dbc7ab1656b721aebfb820a602d0b1361c595158aca36832834121351ea9e92273abf8c7140a544c527b8103c2284 WHIRLPOOL 1e34df891ff004359e883337870d9566016d96955af654127724f43eff372b055093d47447363e1930fa16c8a0669bcd9e31a3315ac0150b3e9b46ed4a601654
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVduwdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+SUQAK4me8ABMCfr2Q/bmPFgr84y
-awePoJW97gvVZa13XB+DWSo6+xuaKtbyb01MTTCm9C3iFT6zdFHRxAq34EMe8wuc
-vKGUBltfLQbs5yHCnyOgKtCzVHSNgGBXl/apfcO6o+DetXfn+fMgGSi6frNK0Ldi
-/QkgMxRWRC6wRDuQq9NMpi9ktscWb/hbnL7r+j5SuEP0PzyQumVjHlmlPQ7a4rqv
-pvU+8pUGdRXTt2S9rnsicL6PiNtdz643dsUFGP7w/U5Ewpu7uuglIF0FbwRQn+c4
-3NdxlaV3FHv1gaO4q8Gp30eIEaK6+ITbd5iliPSKJYeDxqj2fkl7McOxGJ6icovJ
-o+I3WA/z3Dn1TFU7E2HRnrNtwrl0QiwdxWh1esw2wuS1TBXOP7ju5r6PiUro77pP
-GbYWWvB0MnjYfPOOpEDoFquLcTCZJAlCr/aL+05zVetNyggx4R2jb3R/+DmJlZDt
-Nx2B2aQGJBpUpjIZOvMDgheqtoK5jI35t6LKE9+KYfVmWrP1FcZj4Ha2NmSjP6bG
-A3b7WBaZ85dkfMVbFWDuq7z6XHSvYaV8mu5KZfCcS6NIGHmP7ASOrzxAyUxHx/6W
-ts3DJC9nG7mYaUioF8FeqgcRwNShLFUwljSp+hre4AnNu2KK3jbm/b2woWLffu5z
-iHlsvF2jcyS4MRMZWp10
-=Shwz
+iQIcBAEBCAAGBQJVfBVKAAoJELp701BxlEWfUOYP/jEPiGKbRze9yjxehu+opQZy
+y/+/b9iTyESH92njTpuPJzezNjP3GsRazwe+OB4ukYDdqr2/7shKJXg3GDxFx7H4
+Z1hp2JZacMqN+rlP6J14WwU1CnEQaA02LLWnc5JQ3Bwqb5dgLYP29datXdDAkCgT
+mWRs81OWAledEFT4CqjFXsPHqzciGyr6KJSZv0q322qtZjO1ro+yfRRPSh/4bEn9
+qdrcO6+0bofFzp2j4fFBTlX9bwfJOv6+ZbjrhuBfrGlDcpNBf/O7zjvGRLv/3LiF
+konCsIstyuCSFIU2Sv5IZhqBvTOg24mkBv4gKWCm218mVdaTNVZDK+9uHKvmOziP
+EZNbaPlGY0ihGOXbwd5DSqxNPkxkAPoZXUFJD2beBL71LbQqmapW4H8qp36KyZDn
+qR+vGOCwi4/OwD/dPyXwjC6Tktb3Yis1Dk7g2vQQwYzdphLQ1G1iIDY5n6XBjPsv
+nb4qJ+jgUoqpiLrTnyXR2gNCNKXGjdt4OAwgsx5LbFiWOj9lEM+WstjVITDR6GLZ
+F6dSzAqtSYhrJIvR/72Dr5GoYzKIUby2cPmdsekDyA3+iitCwX/VSChPBqKswUAP
+2jv+CygMHGq5/eFv1ltjZwZmA0+OhkxlC86aMOxhNF/V5OgYCSRr4kfHVG4f2bvg
+Exd2euEZTYBwt9N4Ac+R
+=DhLu
 -----END PGP SIGNATURE-----
diff --git a/dev-java/hibernate/hibernate-3.1.3-r4.ebuild b/dev-java/hibernate/hibernate-3.1.3-r4.ebuild
index 96c6bbcff140..24041348eb9a 100644
--- a/dev-java/hibernate/hibernate-3.1.3-r4.ebuild
+++ b/dev-java/hibernate/hibernate-3.1.3-r4.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-java/hibernate/hibernate-3.1.3-r4.ebuild,v 1.1 2015/04/17 08:47:18 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.1.3-r4.ebuild,v 1.2 2015/06/13 11:34:33 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.hibernate.org"
 LICENSE="LGPL-2"
 IUSE=""
 SLOT="3.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-java/antlr-2.7.7:0[java]
diff --git a/dev-java/spin/ChangeLog b/dev-java/spin/ChangeLog
index 1df611b89e7d..a52866d80479 100644
--- a/dev-java/spin/ChangeLog
+++ b/dev-java/spin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/spin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/spin/ChangeLog,v 1.21 2015/06/09 14:03:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/spin/ChangeLog,v 1.22 2015/06/13 11:34:39 ago Exp $
+
+  13 Jun 2015; Agostino Sarubbo <ago@gentoo.org> spin-1.5-r1.ebuild:
+  Stable for amd64, wrt bug #551524
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-java/spin/Manifest b/dev-java/spin/Manifest
index 23d04f3b421a..ab74c5e91829 100644
--- a/dev-java/spin/Manifest
+++ b/dev-java/spin/Manifest
@@ -1,29 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 1.5-build.xml 8638 SHA256 3d12461c120fa893159383093dfe93386741a9b3df4446679215501fbe9b88df SHA512 8126661b264cac4a86dfbd646a8e88598075173479d1d952dcaa3c756793394bb50ff1bd5a57f4a4a86cad99d4b49cd5bd398ad608fb199a12adeecb64228583 WHIRLPOOL b47941c72060efce4564ca9227b4229f369fb4d45d43c9f996e2214265f9651b1325d627fcc566605071366dc6c0833590cc86537513ddc392053b52543d24c2
 AUX 1.5-maven-build.properties 673 SHA256 786fa052cb592effe0fa867f8c670665bee7b6770d6e07a8183aa82f1fd599aa SHA512 1004515f5a89a2d22409cd7553fb11767a4580d1288393516f4dc3c0efa0c149d7bc3e46fac93800e6481fc7885302730e52e9e518d6d7224a0d9220d0f3c3a2 WHIRLPOOL 18963767a383a147b3dd054e0da85a15c54d4ce828b481ee83a85ee15e4fab25f1ba16b8115affb09a89951ef077706c24f90ebd0de3d537441988c67708d979
 DIST spin-1.5-all.zip 482286 SHA256 5515bb6b6724c856e94271bc3bd11fcc0170cf37835bf5fd93026b98c6bf3594 SHA512 ce1fad3b138781359d472727b186722d6f1f23b7002dd1ada294efd80b3a9caf5de15207cdd682fcbfcafa85c63895c7dd9683fefb5ce5b09cc4115ae3733466 WHIRLPOOL f5e598f01d923cdc202e776fddcefe34abb1a312b5ec9ba68f3745431faf89fb58d9ee233b62225bd1a549ec0829a13bea126e8a3802ec78a72f9dc6ef01eb88
-EBUILD spin-1.5-r1.ebuild 1124 SHA256 5699818e84a52abb62b19cf6703cf0088e3d59c433a5b6d40da943256010727f SHA512 48947128d1d5e003dbb0b5ebf60f2f7d94d89dada706cb93493f943656853254a4b30d135a671dcb221edb89cb512e5bcc7d6067bdabda488094acabab6a5d32 WHIRLPOOL 3a1974162ed0a54d4fb475b439b192f338e073f9bfe39c8912f8a104ea111529366e837fb6786894d1fe2d4c9e3aa4f724d4e6950e5215d91341cd73b750853d
+EBUILD spin-1.5-r1.ebuild 1117 SHA256 05c5bb2b2dd042ba0a954efb0694205a13fe9803ccc91604baa55b89691b0d15 SHA512 7107a56ae723cd89ed3802694c3208392e2034dae31704d56a38c833f142a37c311d66db7a25bea7f0a043f3a6e74be9f5c09a0332af5461f2aa54f61571211c WHIRLPOOL 332236434935e2384fd66db8b5982768a5f937affb47787353ee3ca3e586fef27b6ee5c828fdd67695175370d87823118881157bf156f13fbe547e66a939c0b4
 EBUILD spin-1.5.ebuild 1118 SHA256 65cc3fd07446c2333ea9eac10082b80b39e8d44cb1ab8dacb9ac800293cf22be SHA512 4366c0f6a6895aca534d60db5f6bb068ee92a5dfabb5549c7cf8420db0aa1d97ffcba38b0cae834a7e33111fa853d5e16558603b3af706af84a80e567ab8a3f6 WHIRLPOOL be1ca10a7b2a87d13ded53bf002062e80d9627d09cc3d7741a3d3882e5d5d3f9ab746ab1a45f0d182ad8904a85fa92a39790aa40262ac48851078a27619d6390
-MISC ChangeLog 2656 SHA256 477d7747fe2e6c7389305f151320f34ef375a14820c1c884896266f593e0073e SHA512 801ea2c1f0beedcc977589f6115bffb72340b15752a5ce40a89917bcce384fd4c38d5bdc08896607435ce4abb09a75134cea3c871443ff74304a068ed602c704 WHIRLPOOL c30bb4ed6c69211da452af63e0aac290a903ea7e9a09da2f3daf47ce1844471f623fb0925fed19869a078c3452c94b0382e3288aa6de208d9a8cb4298a742f00
+MISC ChangeLog 2761 SHA256 2e0e575ac55240447cd44b87b39939c8f0956efe67320094838902b5f193af2b SHA512 66acc8e23f03954d1221c0b01e76de10b5f23b00ce3170e61ac07f332e6dcb2412983411130a45fe58a6e68ee5f38217e6cbb1d6ccbeb36402e15238d30858ba WHIRLPOOL 53b5cacb5dbdd20b04f7164c877815f652071693969c4b88a6adb00e992766195ade61a68964fdabe9778b8ef268250241644d3bedd49c6f27dbdd06e23f5958
 MISC metadata.xml 232 SHA256 3842e9d1d0f702aed57b82ab72bde0dd9c7250e5e32524dcd7d4891a1632ff2a SHA512 261de7095dd63483a3dfdc0ed4e2571c53cd3beb844bd4e0e27990a718128393f29302c2f6516b0de01397b335fff8a334497acb7803d5edd87acdd88f62cf78 WHIRLPOOL 72e4d43324dd88fe6bcd7281e727903e26606722b3cffca2b7cb5a63ecadc203d1f6ef142d6df40b3a9cb22bbfdcf8f8419c67e3f042c78c1d2e533dbc317045
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdvIyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiaMoP/30ZN3hmcOG2qILiI1muOKGH
-hq+rwGaX/HaoPfc/eZGoRe4sff+NHLWbWo6239HjiMNrerpEcx7HZiJg3hTT/EXV
-472P9eH1EQ3rEMN1Ys8NaHbDvyRun8ZnFCPUdpxjB4nnhZ2/PKmAwtFOl5WbfrBt
-gju69KIBCorIO6MoOA+Iqmb0phAZDtTa6x7TjJKCXs47LzYdatf8dYJ+NAd5JV+7
-I/1++3/UclMwsKJUVzWaWfspoOzIKVPYR0jpKWrSaPLBSC3gKvhNCsHhcDXv1C+E
-O14u2KsCZuMs3nZFHLq/1RQUUqeTpBJKwQbvPbSHvNMe9sIVK5usTTH7VHWQGq7B
-0HdcbjwMPJ1ML2OAWcNdyVrwJGiqiZOe6Rrbf5foa85KQ37dsRCq1kqW4/JvI2/i
-l7Q4RSkkBvudWbLWNleSBzE64kll3lo40layZJY7kBUyNENGK1YtHhOAGSSPAioO
-qXJIuqHtvGkQjINS0RLr9WtiqRr0dqlNGWYDcItn+P/SGBcl2YYroIMj/YqzrUtg
-6mG4SxftOhqwF6jLbYxgEBycafM67+xplnRQwWn6EZRUZH7AilE+pWQwSOdbBbcR
-aED9VQSlQNPLRtHD4BBuTzq0xnhcfey08TRg0pX7yrIPn5BTSnUG9TX4K7eEf+oR
-CbGnpRKzAgPdW+veJGe0
-=O1e6
+iQIcBAEBCAAGBQJVfBVQAAoJELp701BxlEWfSAUQAK6I6eGDw6Uqh1q5cuO7NqWB
+5J/CjSt37nj9wZ4tU5ag2+9R13lGUiaFmJy3vBJ5qk3hSNBxP7TGwMb0GIqOPu6V
+FBEmh1oAXenodqzVFFI+wt64jGaI7jX5guKOb///3R06N4KOsK66O51TEnyOmSPP
+WTMrG89pEzAC7hRNiCtSVijTGeHVYPh8CTYHRrhCXzIi7lvyf0joZO6xNCOO9i//
+l9CNuXMDrmUSncuShWvyUcJwnTl8w77e24ijutcP/p8w261nSUMgcsSxnf+uhmKU
++mgQWgo2JdHubGft4T5yE+uqmeSGxj+0NYCT3wz9wf1+hhdzJpfFUHFb9yXC2NGD
+IbBxUzD2sFAIiapM4zlVt/Pb4frsql2+8sC7WtbuRh6yc0pU9L8a03sm7WctUJzQ
+y3uLjOxkn1GWsLQ+6sMgAiPCf5Zs3CrHMtqb3juQhb4w0OrWsECAiVm5Rcg8cI/P
+YABLedwoIehZFzhx8L10Kdte/1PTJ821xoe2NAy3q0T0xIPn91E7oghBAh33oRMg
+VHxJ/59PCWcW1OQI39ftZz2yvFi626i8vKXHIqUPdbFCpOYvcfzmPxYqpiZAeDuO
+wn/nKmvcgPuZGkWm31lUHijGeD9NWXOby0KqEdyx3m6Q975/2sZsfGkZegz42gO+
+jhGn6BxlTylWuN4/mEVo
+=CyX4
 -----END PGP SIGNATURE-----
diff --git a/dev-java/spin/spin-1.5-r1.ebuild b/dev-java/spin/spin-1.5-r1.ebuild
index db33ba68311e..e3deac751511 100644
--- a/dev-java/spin/spin-1.5-r1.ebuild
+++ b/dev-java/spin/spin-1.5-r1.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-java/spin/spin-1.5-r1.ebuild,v 1.1 2015/04/14 19:50:22 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/spin/spin-1.5-r1.ebuild,v 1.2 2015/06/13 11:34:39 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-all.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEP="dev-java/cglib:3"
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index 0c9d2ce147d6..aec714148aa2 100644
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xstream
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.32 2015/04/14 20:13:59 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.33 2015/06/13 11:34:45 ago Exp $
+
+  13 Jun 2015; Agostino Sarubbo <ago@gentoo.org> xstream-1.3.1-r2.ebuild:
+  Stable for amd64, wrt bug #551524
 
 *xstream-1.3.1-r2 (14 Apr 2015)
 
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index 55bf54e730df..c63ea5c0f2e8 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -3,17 +3,23 @@ Hash: SHA256
 
 DIST xstream-distribution-1.3.1-src.zip 7505723 SHA256 df645ea4e2e16c4a149fb45966ea50d48b54776ead4727837348195daad94f6b SHA512 c8c92879a26599d7444fce0638ba13d185fd3c1f42962b92fe1b984d2ea41f8e434acb6af5613ac9f44354816fb7abc60f751f864f36deb9c2413b0caec5c2ac WHIRLPOOL 13ac006402bbecbf6d3ff9fe30662cc6e3807cdf3a391255f878cea37800842adc929914f2e4aace3a7788294809afb26edd64181f85a7e5dc46f3e1f9c0e9b6
 EBUILD xstream-1.3.1-r1.ebuild 2119 SHA256 1818fbdcc2d8b68d5b2d702a67322efde5d60a325322c12f836c11696430cbbd SHA512 6027eba9cb7e37d2c81a1bebb6a9f5b7eb67b68cdbb363f43978ab584a5680cea82757fe0a255282f8589134bee3ca76d70d20a7d6f97cf86f0c88e9a38e0e6e WHIRLPOOL 59fc0ea003834ab1d54da6c2994b1bfb79c6dd9a0912d4449faef9d3a41f60917683d80a20d70b3a7d3965b9446dd686168beb535b7fd8e9892d8e4b57c1a742
-EBUILD xstream-1.3.1-r2.ebuild 2098 SHA256 9638b3341406da31542840c695a08383d0a8e833263e8f19222e51e1dd2e9c3d SHA512 3c80d64e56829926f98db94550471a34ca7301171cade0104317b8ba53efd22f4798baad6d414e2ec4cf70b9c6df5069836c306e32a3073a29c81582c19db568 WHIRLPOOL bda7bdcc80ff63a2aeeda103508c77f8daf58507d3a779e8d95d7b8a01ef1e7bcfbcf44248a2b2359611e5851291bda8e2a26f7378a533b3e65adcf346e642e6
-MISC ChangeLog 4637 SHA256 1aaa5dba1e2a2a41b4c5ff76975a8792abc8573bcaaade590d79a4c1ddf43ea7 SHA512 71d87dbc2e7a0a326c9810493c277b63a28de5c2d74f9c365e5aaf498c977c8708c3cd762485683ce339ea10467fd350a920e342b0667ecf732ac1a4c500092d WHIRLPOOL 0573343d482bd99c963f483286098ee6b5ea7642446fb4f5b445a6fa891af09171f20057dcc3c19663c354e7593237316b6c7869d8fd530c6c86e17ccfd33197
+EBUILD xstream-1.3.1-r2.ebuild 2091 SHA256 574aff2100aa8e71aa399e28e6ef9386d6f39090d5ebbda207213709c8720a9f SHA512 d4b41460d42349b81b16c05e47dab5478d20606e6f58588de867d44ee36543e8eb70c509d6f34fb54250c9ecc2242d90ce66653119b9cb4dff45f90b408d0913 WHIRLPOOL 24c6d9cac73c081d0caa679d574f7f0f7836cc116ff0685d160987baa11bad5fcad10c5604d9814bc15ddcc99e7a3d3adc2218bf82e085a34c6394a9ea777143
+MISC ChangeLog 4742 SHA256 83709c3c1856eb671c482ade63398865afd9e1af6ac65390eb799aa8a78626b6 SHA512 a3c60c4396e32417be6e82336107dd47e2aadaab7cacc1911fe4b1866368d91834595850c5835843d1bf68218f3580dc83cfdec35be4990581a32bf3c90bfb52 WHIRLPOOL 3d4ed00c8cc602eaf51b0191ee35bdafed60984c5803d607fb0f8cd6cbf3f568f8487ace96d0e43c41ffcc4a6fc1744e850ef1c96d9ff4637c3ed887c284248f
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVLXVCAAoJEJGRpfGTSRu4vCsH/1rAhTvZemPfC1iU1EazuFnB
-RXbMMU3XfCTqxjCAp09ybvI2SwOU0qdUCuw4jWpis/El/sfOLKqDrYX1hAyH3yeg
-xILFKrvcYyKN7PGpWqxpxf2PGslq2qwJq05R8y6n4HLm7G/Guv/JrRYqJAcF5Jb7
-SjLCPArLM0AuuKk8lMkXVQF3XYpef+by7NUfcFBetEYn+mpd6jPF9nBh9huhiUTf
-hAhOfzU2Rg9X47+auWp0oEOIf7An0GZjKSsWoWE4RdYnVmJ6ajodUPTIlCSD/Tge
-sq+9qBBY4PqvuerY6xWUaFn4nsr1RyqQrXIRQSH5kOfbLpdNpcrhSev9HzMPIb8=
-=syfb
+iQIcBAEBCAAGBQJVfBVWAAoJELp701BxlEWfVXMP/1YyCeyCAj3MIGaIMAi8q19Q
+eGTOHYBQ4aZPeXOmq2G8Q+rLW/lyaeMrMe5pCzxP0kkwk9IgmJeYwzsQ5HHQF6EV
+lcbOikpdLDH6Q+wSirRHIpw7rKV3+s92YwFc0Vxmzg9LHLdcS6Z/knyI8BENEPcS
+b/KjQH9UxyFDMaaHe/L6kzam9ACvSiVuNphO3L5V1jV82upL60mKU/BcB5YL/0Sb
+XTQuhbZf/QNRo/PQNa4fpJpKE/fEVBAluuZCS23DSHDu9i5AzWFDwrbyRHbBJcX1
+8eULfhPc8vgJnqH+u9t1fdML4Ebbbf1MhpWfATEosYEMsYMwngda+8e6FR6MAzum
+KxbwC9JEMDNGjGfM0++dc+i+7FygO6HP5SKfrcMiWcShlX56z5HRAndeR/GdEo/v
+ldzsNzU71cRisatKpOCxliCPeqgfLeLbHE1dKACDJu9hjl/zX3burcO8UIauyPu1
+eVlfkiL5v3bUpqA/ryL7HOwPuwNc5sZ8nDzPlfLJecXCW01qf0L/EtvoMpKuloxq
+I3CNPEuibvrS90Vt3TVIzMlp0IDY71mgTXegzc3u2oLJ3ng5cRSvyziA1k7e08j6
+Ah2DIaes3m8FMzMjaJZzRAGb3J+MotpPhZWGpoBwpvPKGftdaKBuoEDzXdc/VU4h
+EW8TK3yUHx0gtOhOa57L
+=vJwO
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xstream/xstream-1.3.1-r2.ebuild b/dev-java/xstream/xstream-1.3.1-r2.ebuild
index 0c363255f0af..66f26781ce72 100644
--- a/dev-java/xstream/xstream-1.3.1-r2.ebuild
+++ b/dev-java/xstream/xstream-1.3.1-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-java/xstream/xstream-1.3.1-r2.ebuild,v 1.1 2015/04/14 20:13:59 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.3.1-r2.ebuild,v 1.2 2015/06/13 11:34:45 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}-distributio
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE=""