diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 62843067c9c4..fab979170d8f 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/apache-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.183 2014/04/22 12:28:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.184 2014/04/24 09:36:42 polynomial-c Exp $
+
+  24 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> metadata.xml:
+  Cleaned up maintainer list.
 
   22 Apr 2014; Agostino Sarubbo <ago@gentoo.org> apache-tools-2.2.27.ebuild:
   Stable for arm, wrt bug #507866
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index ab37d2e628ce..a59d8b167043 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -13,22 +13,22 @@ EBUILD apache-tools-2.2.25.ebuild 2293 SHA256 fff4f2fe5a2ac60c51a3a097536c8ffe51
 EBUILD apache-tools-2.2.26.ebuild 2304 SHA256 05f2a55971059d10270af92157bf5aa6c0a1dabdaeb2f643536d94b67131dc87 SHA512 a714cfa882da3b9fb671e0c7dbe880e8447905f310fae7b530d8a3338f7def9a29f3817c3a82432ef45f72c5959bce71df1a23911131a5b57eaefc71062e5e41 WHIRLPOOL 35b637536efd72f7aaf731135ebcac3a58cbfa47c185ababce1002ff4db565648decfb304a1ae8e4b2931bb89f75dac7ed3679e4324a8eaa7c4bddf66b7de92f
 EBUILD apache-tools-2.2.27.ebuild 2297 SHA256 b2825b9592428779473a4f7f1b2cb8700d781a67e5b9813c8833df1ba7d963a8 SHA512 b6d30518eb4e88e1c932295209cf7c376f9207365c030db3075126ab2bfbee3a7760861b5d392ffc07da429239693d071eaed8d5882934b3a277f709965922ad WHIRLPOOL dfa40ca57b87b84119cccfc367859c7e2f092c80dd15407e19c085e4cb66c5eb811f64e7f9206e9001739a00d7af4cbd1cb559c0df0a20dd47a4ebad0534a134
 EBUILD apache-tools-2.4.9.ebuild 2654 SHA256 60370b7dbbe5b6bcd0ef7fbd9955c7736b858ce36ad7d4cec4ea15fa77a52f77 SHA512 6f100df08e950180d03e94e90d478d5fc95528270073cd17808112befdd5c315a6fa2859c8a561058eeaee4b3a5eb197c588d57e3c327f95d27ee9815a6a2c88 WHIRLPOOL 8de719407decf4b79fc09b5d2549f7f863ba00bb3c701d410edea225a9ac9dd38043f0021d6cd3c590aec620af02cd601ca102c77bf26b07b4f6e30521ce48d4
-MISC ChangeLog 24602 SHA256 a107b74385eedfb11f31dc6162d395c1809c87a88802f028e8cbd29b7ffb352e SHA512 645da7d553934956e375a4b7ac37e51452b7fd86c83cb45721697c5489bd5058aa4d5c24cdb008cbdb9436d049694ade8202e10f53cd4b940ee40cb15cb0069a WHIRLPOOL f0fd104c042f6e412fe1908787fd5b0edace77587d6a864a1a75b2e2f079b317094594e715f62da409a9d0353109088141c5df1e32086a8dcf20213eed396d31
-MISC metadata.xml 587 SHA256 7a663c163db27db13913e30a4936a622ffd9d0bb8718645e6267db0ff274c072 SHA512 9554e1963db41540801093b18efbfc1b85b2662ceef2b4e061065b4464a2de35212ae64257541261573d0c39c58a1e02d5da1b0fe139fede0aa9d9114a6fce7b WHIRLPOOL 14cf07a79457057ef8b2c97d663ce7d0ece8a7770c6fd60af1aaa9b4e187e0f823863629a991a0730c965407fae882f668756c7a68f3ad441ecb049a345d12eb
+MISC ChangeLog 24710 SHA256 ce2c8867255683e1561e9e4c6cc2d726fe95ce4416fea1a6a75fdfa89369873a SHA512 7efa4688635e0b780b94828bd0f1404a3824b7b0358887978626769fd7c4227c7b06a519e00cdace29ff6b4acd65b3301a6ff23030d4a750abdd0b5a2134eb98 WHIRLPOOL fca0164958812a37b884a41ed3c17bf9220b0475d09bbae8aea29ed77e56f5363bcba539765b3d3e26ab0ddbb1d72fe2ea41ad052c505d430a015cc40939a32d
+MISC metadata.xml 494 SHA256 0f4f12f8ac67c0049e4fd82fe8f5e15d9e7bedf2dc1d6c8a0950c596d897e67a SHA512 5e60a3af9bb8dfcae4d980d03f7a21f8454adea57c81110989da85aa31b0ca82e1293475b22c17a65220609f5b4a1f11bc14c4536fd4e650c2bbba7fde2b92f0 WHIRLPOOL 837e5f0e5548403c696c344cb53d24f5faebc2699a4351aa8d5ad053b92e8c0f0af64469aedd14dd6bafe16a0104ec59e9268e370fee2e9a5ebd8c90d805c161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTVmBUAAoJELp701BxlEWf/WgQAKlCz0OGrl9ZbMnJw86bDrED
-Lt9NYcJP4fz0KLqfyMuyUUa9oBuyH62e58PTCwiDSJbrFDBRDABXO7B/1vZnxUc9
-PE2nhFczFAwOopIiokbcorPyf2qwe3ytuv3XFEBtRwam8HYxxL3oRqPJ/58g8970
-oQN1d9HCYY1CsCIcNCZL8CPzRioyjB6N47eub4TKze8ZU8TXCAISEZxh4pudsa2m
-fgmDNq74oGWoSe4Cmvk60QSVYMfcDGtzQ8RNmZqzrny7l2/t84KlMcEOLN+ziJxq
-QmTzUGRzbx4PFl7VU8D1dho/CKhU3BAh8B3LBe19bJFBdBN7TYlWkz4NYSd9K1rT
-G4HUPatAaWRumwJbGvKsiNWRKHPmIk68kSFpB/wAS9iEia2RjG6ZKyZ+3xFMXOGe
-CNVA0LsjjRJMwthyEXPTcJ2HFtQclatq8ZGOXnTtTy20/4LZkfsB9losmDYP715r
-mu473KkSSZTlaQUBf73ld5ehexsezQ9EMxGf48azZTZBh6SfnKUWLEDRciCfmobq
-byALYsh/NTZOuyucb6dUL4yGb38DmE3np0IKvZQDmQTSnlqVn9zYEFHSpJL8VMqI
-rzF8CYgJZVCTelI6pP2RY37sVheK3wvXINqXytrHmuPDi2Cmx2naBJiZcLhBYnUF
-IAOqBr7fPM+A7p6pOoNQ
-=Fl6a
+iQIcBAEBCAAGBQJTWNsrAAoJEPiazRVxLXTFcgkP/1TdxkEU+prTzraL+bHQoZIY
+r2mBCALfnmVeaPAmkX8Ykxp+tunEvVLdgi8pcmUyd3NIUpXNkY6oeaXHM/3WEZLV
+PDAw8SBllVNGdbMfEDRNFx35f8AIv514y5Zp/8iz496rqppXHL6fZHm3yXX93xeS
+OpQJb+azAdssOFfV01GX8Nfb2PCj25Wz2+wgetkThvaRIhYVdOhIIeNuX821jzU5
+DMkHimGwAEtu5kJYIhdnltr2mvIT9ZnmCIv0GIYLAd2Zs1aA+OZS9HjGSug6uT7n
+bul/UBpVHWsbYaAQMpUUD17QWgKJ5IVzp6YkgZ5sFIGoEE/vgPuiQvoPD/Xzk5aK
+4cx12KoAB6eykmd0nBvRaY/u2OtKSQC6JQIWI39mFr2IGha5kV6e4WuQaki+RBQk
+6/O1/jmk9Mlw3aSV0RmWKreLYuikh9tS1EEcD6CWFXzLE+OYOUmjbXqwzzNqoJPT
+NBG2ajdi2V1uAr5ejvJfEhvQoXE32BhZkTd6skq6npUKqbbSw75tEg7wvhJvTBDF
+GlItsTKc5xYTATiyCI5uAKfmBceHsvpRAuoX7EKxUGCU5M68uW5v26YUxO2b8nnf
+6LfmoWP6DSRgkj/fk0S4I2IJ4eSrkP/A1GOcGs4UVF5AP60DIwjmFbtw+mhzvKb/
+nqrnniqzjkkOG9+w+NRx
+=bA1c
 -----END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/metadata.xml b/app-admin/apache-tools/metadata.xml
index ca4c48597ac9..0530e463d6b4 100644
--- a/app-admin/apache-tools/metadata.xml
+++ b/app-admin/apache-tools/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer>
-                <email>patrick@gentoo.org</email>
-        </maintainer>
         <maintainer>
                 <email>polynomial-c@gentoo.org</email>
                 <name>Lars Wendler</name>
diff --git a/app-admin/pass/ChangeLog b/app-admin/pass/ChangeLog
index aa669be56f73..12e650c48115 100644
--- a/app-admin/pass/ChangeLog
+++ b/app-admin/pass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/pass
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/ChangeLog,v 1.14 2014/04/24 09:21:50 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/ChangeLog,v 1.15 2014/04/24 16:38:48 zx2c4 Exp $
+
+*pass-1.6 (24 Apr 2014)
+
+  24 Apr 2014; Jason A. Donenfeld <zx2c4@gentoo.org> +pass-1.6.ebuild,
+  pass-9999.ebuild:
+  Version bump
 
   24 Apr 2014; Jason A. Donenfeld <zx2c4@gentoo.org> metadata.xml,
   pass-9999.ebuild:
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index ab173954c14e..eb76a0b2489b 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -3,25 +3,27 @@ Hash: SHA256
 
 DIST password-store-1.4.2.tar.xz 19248 SHA256 ac5261b176e2be60b44c5c785dc5770a3e0f459bc6dbc42136679d68d3986e04 SHA512 bc846a79417c54ab8352380e08673c3aa2f38b68eb57e957f6f3c02c938a65ea8e6b87c2144cc0a675c9a0a7f3bb859135599c4a75eb83e2f06a201caa14ca0f WHIRLPOOL 60ae449685c6bd241995c2685c044bfeaa77e8a861c1fcb7f7ffeec32be4b35f78b034c95ab1cfa4f84f26095a7b25f48dbe34fc2cc5df1817d775cd5b3aed77
 DIST password-store-1.5.tar.xz 24848 SHA256 6d3f327b039bb64157662d3d11af5ecebd3774b886ad6e52a684654d9914a8f3 SHA512 f031b36a80ee562d699c65b5ed63db23400c575fb726359fe02ec1d17b5b3e7194c55d3768fe006c0cd44d623355288967863db3196d2f31505105c4f2d3c670 WHIRLPOOL d2cb30a7d7bffeab445066619890a6d4390aa5148d15864f47ae87a2b5b6b32154f6288fa44132471b70a85cb2b0e2f073f11f5a2144198fb984d706060fccc1
+DIST password-store-1.6.tar.xz 51048 SHA256 456b0b2fd0e8f05f9e6862747a7a411a39f4e12c706ea401aafc77251d328992 SHA512 6bc57122da6821b51e90b900deb8f5cb5f0483a7911571f03685a44976ca053dc4b8a4a621f95d8fc9dc458578bdb2fc48b19481a92d8e0a3d7dccd90722e0a1 WHIRLPOOL d36087b49b3b730fa6c8309bc8ad283ee2e8f349b8c1cbada10c6e4b76ee13d06cd061ef547fce81eb8b404871aadc3bd31f5835b793b1e85f92fa10a1542da7
 EBUILD pass-1.4.2.ebuild 1716 SHA256 9766600a3c47e07e8460d53ab9c07b1aa271e63bf88bbbcef22925fbcceddb1a SHA512 cf03fc057e125f69f6cd4eb7c6245f3d67e139025f368571bc38b11c9bf6a139f4d7c994f69690e3510d88ec2b9480808ff306db069ef7ae6bd915d019361c0e WHIRLPOOL 031ccb2351be02706ebc4aa7c014b2ec939a4c439677957305464a3779602c7450dbfc8e3efac5f45186766d63cd2a9052ddfe1615121c6ac6f0fec304263811
 EBUILD pass-1.5.ebuild 1762 SHA256 a8c0883e5da97018b61bcf6be4c82a640b0ff63089e23bb29ac7e8d9358fa7cb SHA512 5b492556c5840f092f92bb40ec64f7c85299099d297b83f616f4b47a25b34427114e0efbded40e5585d80522d73a4cad6e345d285f7f0776b77ba334ecc2ff9a WHIRLPOOL 6658a561795bfc19525780965f1430171d1fde840bdbbe1a08235fa2581548ca49ba47474e3e2e137146cdf8abab33ab07d2a100ec1d8e6ca2c47573c48ecf5e
-EBUILD pass-9999.ebuild 1611 SHA256 9b34fade08cc1009850c24df89c53f4c073b3633c0687b0668752ebb46bd79db SHA512 0c5b0300382368e6132b165fdeff605f6d364b10bf022c5b3ee226e60860b8594d1a6c8bc865ddb716a0c2e1954e549d15c3bdebfdfaef8d550178d2f996551d WHIRLPOOL e1ae2cf475c2c30a431ff54e3056e01da7a831a091acc86f781470d88e728f8b9f5ffc99211097a85ac5f2b56a592a625cb744c8270d91659deba4ba85a347ba
-MISC ChangeLog 1908 SHA256 c361422dfe747a2a6cd37c4b54598f1c685b9693d92e4fc970692fa4ce6e6598 SHA512 b5bd862ae9dd00b35da75d8176604e22687315c536cb36be0a5fa672c5bd6017dd3eabb187e539ab509bd476674f16e044bcb45c8ffbbfa61199d425412ac069 WHIRLPOOL 4fb6c9dcea65d6aaa28aabc44dc73c0b960836fb2fe48ec7c3f2db1213bfae793e2031c77b6b1bbe452077f062d41983ffff9cb1249e34d321050cf410d78bd6
+EBUILD pass-1.6.ebuild 1584 SHA256 db04bedea7319074e2e56ea1996af0f44fceb6ff0027d813d71d9ff773edade2 SHA512 5f35e4f7e596f4b1775c0ac504783bf614dfa6abda0de255be14d2a9ecad16b613ded1c69a9a8023d8c99ea46ca01f759f347a30a2012e6ebf180d98deb74586 WHIRLPOOL 876f82555ecf793132f9623df4dc8bab31d2a37d552632bd71e1eaa323c1673523668e981bfa3f00bc76a989c1e4db20cc4025dbcccb0628b8e799f95868f653
+EBUILD pass-9999.ebuild 1541 SHA256 7ee59adf0af38e567de3105a6efb7b7885b9b94b537427c9bbb7b52bc9d840d4 SHA512 6c0b13599a799944cac7e7ad67d9e7cbbb351a7046c8bb6950c2b04e4c81b5d491b4c2a32631fbdb156a7f2c5b217d6ca2b259c885d7dc2cb0187805129030c7 WHIRLPOOL 749585fc8db12017e9c1c2bb78f110dbaa82ea0c7cb70efcc0476f3671822b800f20e53545950c6fb0dded68b76e75c5570c407749b2444ead239514cfd0b485
+MISC ChangeLog 2040 SHA256 0dce2c8331d7e90a115d7e6596af222a2217d15a9592b3c6c37a532a8cbd5de8 SHA512 a367ed90bfa15d1deda59da7508f3c761f442f5c4c5d28e4cf96799d03c301e8b0d2b6924184ddd08ef92581968443eac4303eb69e5cfd8a32efb941a22a3e63 WHIRLPOOL 9c372367f9275659b7aacfebc8f8127f2967781fc0a8d15d89014e0ededd1cbd5e92086b207527e24742f12246c7f9e7ff2fa0b491df0b5115c6d20733df3ff3
 MISC metadata.xml 748 SHA256 2d991838a8e3f6beb1e8daaf555fd718a76c8099dfec9feff7e06e4a6c565f6b SHA512 f8743fca195e1bf16b93acfe11bfe0969aaf9de7ac842ef405067b4d109ddbf47a11fe9966d9066706ca21214f4b4c22055e96c72232e9607c3c32d818b8661a WHIRLPOOL 5bfb4040dee452285b62e1fefe301be2be7bfc1341707e20fc425b172f442f75f66ad653e623b088fc0e7355869d730ead8a3b071da458935cb78a3fc53ba2dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTWNfkAAoJEEn8cBKl3gOuvh8QAKBNJptU4ndgYos2JFDPvWLD
-vXg3GdDwK4zuMNi5TxHaWaPdskMhS8sVKtD4nEqO0BgnERaFP/RYYf/q0CzQM+zf
-UGnxWHZ+Dk3Uyim2bTl60fyTllpHsNsHqtEsXOJLkfwiGk84068wgPuVwZjK8WnT
-PJO3J8aUbnDgnqXsojQEIkS+KAo2OKkcYndhmL8aIlUVTST3PI9VRcrmVNIRaf8X
-Zvw+4oNix4ZlLOjssvaprcHBJjT0LWQ2YX05ON9raJyfurneyu68vcawhpiVA2TO
-yj2cevknNgTcYKjOCdlWaSNGOZNjszYhTzbFPQQrmyxp1EsCS3XxEJOtjGAJ6aKs
-K9JSkF+9miiD5NaogqFLXwKkWp56IK7ugBu1X4FiYhR+PZN3bxlvYJZh+WI/VpZ9
-PEZHnDUvrmBTn7MsWBDq8w3nb7ICwdiNEEppSzJ4zjCoRtbfpeeXanloKdh33qdR
-RDcNXXjNeplZs1igsWU9xG/rraKhjHUxj9D6cs3OWdFguK+UX7jPgcRahkxkqZ0j
-I+ID8lF4D/poJRwJuSgiigfHtDTm36Q6LTNRU++hgTSvZU6Wtq51c38b6EkP2vud
-L5d2pn1gDi8Dx4ttaYfhis6j7PKBxvlkydc9D4bMIoVIQ5Ab+sWkGx550YO9XKUV
-m630IQb/mrkIeMNeteMd
-=FwLo
+iQIcBAEBCAAGBQJTWT5LAAoJEEn8cBKl3gOujDUP/3NOOqTV/hgG6044or1drZyO
+BPSjNpp+FaN/8JGar52/WuityxJXwgsz1/Nl2wne8cHUpmTr4LCKseJtAW08AYwB
+2KcazOCv3uaLVl0SKkYHkBKt9Vueb8GKdT3NaOfNBYuNbB8tOcirzVGEQ4bwrlAq
+VpE+9BrsTOV5YD+RsvQ4AuAbWuGge9sWKrvm2Y6D0dZuynkm69hUNQyBIaUAL4Fr
+p35NREX8JFUEIB+NZxB821wyTuCNAJS5H0TZGt3yi8C5D+WmuiIdH122+NzDXtPQ
+dNLpYzjHEzHoB90rNnImbTaeKGhmI2d1FyRB7F+n2pYCVsqWmsuUR1qdKqL771JC
+tiENFdyrk69FObzbYTDXrZnyxumIA2pzPjQdCdJAwaKuVG3/hQB7+RdPE1C5dTFe
+Q2Q0xlJ9gsChqBPEApY8vqBBJc/8xuCq+6LCuTaOqGAr02n29c1qXkRUdcxazUyu
+3ByJsJ7U4NhnxqjWtLRnOUC+b7d/ZQpIWMCvx0ETzyPSDDlaq/dYSTirj17IbZ6s
+FS2JCRL7zxnyXWDu9Bsx4TUbmvuBsoRPV4aP5AqGKuh4vfGqTG+xaSocZawbUFFk
+VJuX9ps1xMiYOucZjv8IZyeTzywtSm4FCp8h0oRts6Jzl89BJC2nBCpMp+sYfMKu
+uUkXF3X3El3hJhiP7Y44
+=Pn/T
 -----END PGP SIGNATURE-----
diff --git a/app-admin/pass/pass-1.6.ebuild b/app-admin/pass/pass-1.6.ebuild
new file mode 100644
index 000000000000..f3389ab20f20
--- /dev/null
+++ b/app-admin/pass/pass-1.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-1.6.ebuild,v 1.1 2014/04/24 16:38:48 zx2c4 Exp $
+
+EAPI=4
+
+inherit bash-completion-r1
+
+DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely using gpg, pwgen, and git"
+HOMEPAGE="http://zx2c4.com/projects/password-store/"
+SRC_URI="http://git.zx2c4.com/password-store/snapshot/password-store-1.6.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE="+git X +bash-completion zsh-completion fish-completion dmenu elibc_Darwin"
+
+RDEPEND="
+	app-crypt/gnupg
+	app-admin/pwgen
+	>=app-text/tree-1.7.0
+	git? ( dev-vcs/git )
+	X? ( x11-misc/xclip )
+	elibc_Darwin? ( app-misc/getopt )
+	bash-completion? ( app-shells/bash-completion )
+	zsh-completion? ( app-shells/zsh )
+	fish-completion? ( app-shells/fish )
+	dmenu? ( x11-misc/dmenu )
+"
+
+S="${WORKDIR}/password-store-${PV}"
+
+src_prepare() {
+	use elibc_Darwin || return
+	# use coreutils'
+	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
+	# host getopt isn't cool, and we aren't brew (rip out brew reference)
+	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
+	# make sure we can find "mount"
+	sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	use bash-completion && export FORCE_BASHCOMP=1
+	use zsh-completion && export FORCE_ZSHCOMP=1
+	use fish-completion && export FORCE_FISHCOMP=1
+	default
+	use dmenu && dobin contrib/dmenu/passmenu
+}
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild
index 960ebedcc91b..76020b60d304 100644
--- a/app-admin/pass/pass-9999.ebuild
+++ b/app-admin/pass/pass-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-9999.ebuild,v 1.10 2014/04/24 09:21:50 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-9999.ebuild,v 1.11 2014/04/24 16:38:47 zx2c4 Exp $
 
 EAPI=4
 
@@ -45,10 +45,9 @@ src_compile() {
 }
 
 src_install() {
-	local COMPS=( )
-	use bash-completion && COMPS+=( "FORCE_BASHCOMP=1" )
-	use zsh-completion && COMPS+=( "FORCE_ZSHCOMP=1" )
-	use fish-completion && COMPS+=( "FORCE_FISHCOMP=1" )
-	emake DESTDIR="${D}" "${COMPS[@]}" install
+	use bash-completion && export FORCE_BASHCOMP=1
+	use zsh-completion && export FORCE_ZSHCOMP=1
+	use fish-completion && export FORCE_FISHCOMP=1
+	default
 	use dmenu && dobin contrib/dmenu/passmenu
 }
diff --git a/app-backup/backintime/ChangeLog b/app-backup/backintime/ChangeLog
index 8fb86df41fe3..7e4a3152a8eb 100644
--- a/app-backup/backintime/ChangeLog
+++ b/app-backup/backintime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-backup/backintime
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/ChangeLog,v 1.19 2013/07/28 08:12:45 jcallen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/ChangeLog,v 1.20 2014/04/24 10:11:40 xmw Exp $
+
+*backintime-1.0.34 (24 Apr 2014)
+
+  24 Apr 2014; Michael Weber <xmw@gentoo.org> +backintime-1.0.34.ebuild:
+  Version bump (bug 488350).
 
   28 Jul 2013; Jonathan Callen <jcallen@gentoo.org> backintime-1.0.24-r1.ebuild:
   Fix dependencies, add REQUIRED_USE
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index 87689e47f6a0..3a3b5aa8b9f1 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -7,26 +7,18 @@ AUX backintime-1.0.4-fix-configure-warning.diff 541 SHA256 3984fc7ff00b1de4c0491
 AUX backintime-1.0.4-kde4-root.desktop 275 SHA256 3fbb0c720a33d1aa740c54c3d40448fc8dcf56208e16d91105bdf90149ca791a SHA512 aba498cf0d3dc6f90d39e9b4053498ce48d42e06a4bd6434cad478d5de13c570133cefdbba0669fee07537f012f117102cc79ebaca9b653bce58b50c94f78267 WHIRLPOOL 851c30dc8726c42fcc850499cc5484a8355dd9f4e3b4e760e443776fe20739450b388afe0e25463ec88e94345991ce38a118a4cde51bf5db96973c2542a44090
 AUX backintime-1.0.6-wrapper.patch 1260 SHA256 5e5bb5739447af8368dff03c9c981dbd75dcbea8023851f7ed40db3c4b7ee318 SHA512 b7850a99c27c6f1fb6ce50eeb9322dabe6ad7777d4f42b6c9e72584dbd7a80656475c20de2b270a942fb7eefcb2d383760dd7a06424e6639d5e7bac95f91e746 WHIRLPOOL d240d07e26d78010ccc0015ce0a3510a00bd9bc1a650395f044dffaaa98d8f5acdd5ee06cb5cf8de9a16f1ff815548a42fae7ac25afec2160d708f3c138aa0d5
 DIST backintime-1.0.24.tar.gz 507183 SHA256 5d9bac6fd74dd2258786b3481af260beb0f544d0e3560a0db2c8c0a87973384d SHA512 57469409e101207dd0c90f47ac7a709f5c7faab2cd7c60ff014a431912483b87e677bb7d0d2e25609d318f2a7ceb539bac4cc52bf7284d987200d98f2be670a7 WHIRLPOOL 476c158744918510d26d627f9cb833149ef99af85d3d423de2a2e61bc995032131f86df194825876f81ecb756109b328118be741f92cc98f11f7340c1a1e10ca
+DIST backintime-1.0.34.tar.gz 905704 SHA256 2e1846e32e0649d4c0562c5c3821373354591b1ed22116066f1013c7775ea9d6 SHA512 f9347ed6d872aceea67f61faa3669d5edaf0176a6b4b50fd760d58a0fa087ffe8050a92d573f5ccd3c552428b08ef796daad0ca199c98537db39d2ab822aa861 WHIRLPOOL 63293e3004f81ee44545b33bacf847d27e0d535a6020794d300845c3235169e011a86e8b9cfb9f628c6fae00e5ed7ad43b0c69ff82ab5df2befc66b9ee33fb62
 DIST backintime-1.0.8_src.tar.gz 291473 SHA256 fb83736ae0671b0d63468a9d39a29334320d93df004911cc192b1989df97d931 SHA512 6678420824a509bc12251fdabee83c3ec6c2a1418c3e978d9985817ff8161f5992a7c35a2fc28812bde085d6f1d450283a7dd3f690323479ade699e8fb833977 WHIRLPOOL a6d0d76ba922584321977f677c0f2e9deb654aa907bfdadd190230e101b67c048585c7a729ab732d1f5b2a67f789f47c7e610c232ab72f7c37e72edb6ae69f15
 EBUILD backintime-1.0.24-r1.ebuild 2356 SHA256 5f3f4b4a719d396a3bc843f8cde9f2a33f4548a0821499c431dc09d1a798ff53 SHA512 7ea830251596dd4bbd38384d6c575e282a8d12b1eb44eca4d72d9987e58994f73a6e401cdb58ba5c1a315e0cbd966c47d0c436dd3fb52507d4aec0ea179be899 WHIRLPOOL 5cced4014b8076bb2f97e68fdb9bb8261b729ab5207491b38cc6397ea8f0d6a8211b0a215f391974c3d82eb63362c4b36d909e501126754d00f68f8830c62227
+EBUILD backintime-1.0.34.ebuild 2284 SHA256 86beea08b525032a2e5a9bd8fa7dc04af9a5c2ca4ea427b15b66a629461c6980 SHA512 88059c6de2b85de93577e9f07d32c033c460d9bbe3738388137596c49b09ea01ebc514776cc7a4ed2bcdec96c8022d02bf96fc8ef63f99cabc909ef5c71c2d4e WHIRLPOOL 49b00160b0fec330a74b7459aad8728eb21767b1797bc933bdeaa7c7f86108299de3b7476f77ef9ab19e8f868ef9c2fa69851780c374df2f65e8eb9ff1796a30
 EBUILD backintime-1.0.8-r1.ebuild 2180 SHA256 9f3bf91da4e5f0ea90ad28771b35ecc4d127ba4a3e604115df9d6bdaf61688ea SHA512 cb5a40770dc47a99ffbe0d5eaad9d6016a8a6def5baeb5196f972b41885aa4a1bdb23ec3c2c7f9e490803eaa152c258b24a5d3f01ea3fc1b53f0712819c00072 WHIRLPOOL f371c29ffe0e75046a2de3ea310f8b25892ab8ca6b0f153574c76cfc79066df714e28f30e6ba3faca859aa4d73648891a8abb24fea35edb8a79e6c9129547025
 EBUILD backintime-1.0.8.ebuild 2120 SHA256 0869bf8f756f67b4c5c6ef984bdc6528537ae2f6a4c150132231992f50468647 SHA512 39885bf935b660e16db009d0bd99321c4ba310ab24aba3db4ded661f54c2cf050e4319fa6bf51ab1acba95c42aad9d454f51096b036d548850eefd5e434707ce WHIRLPOOL 004ed5d2fa964b519c25fa202291dfd2243d25ae84d5ecaa6b0abae392872ed685ac30c1f14fd64dba88fbac69241a8c1d63df09c9e3a84dab9148f115d48884
-MISC ChangeLog 3873 SHA256 f2652d7ddea568db914235aa12f03cf99e32e8658f767e2e8fe13012dadd5127 SHA512 5c8024e1634467b35c7ca3ad93f0fce274f859e886e95e74fac71729a70696456e9a5f5e4ec04526d348d6fa772365b7d56182915caa8b553b53e6d747b88f99 WHIRLPOOL 76f184de2aad9d9cef9b0204fa874c312c97f72ead4287df96647896334acc863eb1e50bb49608f82c671ec64a9465d05d7b2dd3c352de89b2b16fc2e72f9026
+MISC ChangeLog 4006 SHA256 4009cc1c55fda0652d561940011c1ca4ecc56c2214d487e83950d05dcfac43cb SHA512 d3ca78bf1b08ba3e3259c9ee8ec41b44137d18ea5aed2bec84f14799de2213bbd17ed4a222ce941b1d2c927663ce200bc7d464171de31e1ecf34448433de4bac WHIRLPOOL 7a32aa6eb57e7052bf0a34be644f61a607f86a912bed39184bc6951689419fc235db33a56555bb3b1e210f27d0852446e504b52f6059b38b7a58a7338ab0d78f
 MISC metadata.xml 689 SHA256 04c9ebd461449ed9643e8be1b61ae390e6caff60f8b7ecd3b1881c9e76868af8 SHA512 3350a2908c5ba2ffd6509e103c770002c1c43cd1eda7ea9bafea26310e1f1fbaf1582322a65554e74ff086fbef57c07a488c7381aa5e8ead9e0c047dadab9e47 WHIRLPOOL b1c162a44336b82e33b5c7aa3e28c5fc65a8e02119fd22b924ac99e651ec1b6650bc029aa6005620e75daae9cb38edc2170e22eb344c08d324ba598c5ded7dd8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR9NKCAAoJELHSF2kinlg4WjQP/3drOTpCh3Wc9pzFIStg0oDY
-2nCv3byRIdkxx+Srn+oWYMmcvcyUTFNoZNC+dZJ/WZS7p899GcC9SlKtJQoPepne
-VWiE4zfS96wYXsOGcBBC+Fz6NoemIGFKWSFt3XrKkeyd0UCY6vzZXDr10fgKSSLG
-daPw+YDDp2LYD7+DA8FgHufUovMu8T2blv2+e97qDgQ7AtkTnJ1GsfzaPzGQ/xOX
-nuI2bNgVJcr6HQx4sla3pO7udUIPQAB4oZpYUwCvuJFWXwJcZimjVd6ZepK0ad7k
-2AJ66Pe0EmVRAZeQdU6813nDgHPipJ4FB+cGJr+f0DeQMAutQ8DTFkiu379A/2Co
-vM9zIBItU+mGa8s0fyJ8eyAPvdg7r/qji4TT78SQ8QGeKneghcQTfqWJ3QFJXb0J
-CSouJuKbextjeDf7FBkKz5yIJU4wK3O9IgAdb1JwiAkNh5NRFtHP2iiyF/ip2EF8
-F7w7lD9o+HxCI/zfa+bHrCdxGc5puMjD5GNbjJeTiFQ/4New4XuqmWDigUo/mdVT
-mO+1Ux/CbLNEV1OE4zNEfizmoaAIrPCrEliXoklLG++x6ISE9WvckIc6Bm0iQSVM
-6hyH9GBagGrhnAPx2lAYUBPcL6ui08WnW3FvBJwCwg2eZY5Woiqp4RktuJeeA2re
-D8r2cV9gY+qSNSzjr2ec
-=lg8E
+iF4EAREIAAYFAlNY410ACgkQknrdDGLu8JChWgD+I8QGHEIVbVjeaSKMVqlb9E17
+rNy2gh/zJ5bN8QGcIKQBAJbdmPo9J5yNUa58rxMpbH17zLy5C729suTCiYXrGNw3
+=pWzy
 -----END PGP SIGNATURE-----
diff --git a/app-backup/backintime/backintime-1.0.34.ebuild b/app-backup/backintime/backintime-1.0.34.ebuild
new file mode 100644
index 000000000000..cd34af68295c
--- /dev/null
+++ b/app-backup/backintime/backintime-1.0.34.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/backintime-1.0.34.ebuild,v 1.1 2014/04/24 10:11:40 xmw Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils python-single-r1
+
+DESCRIPTION="A simple backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
+HOMEPAGE="http://backintime.le-web.org/"
+SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde gnome"
+
+RDEPEND="${PYTHON_DEPEND}
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	net-misc/rsync[xattr,acl]
+	kde? (
+		>=kde-base/kdelibs-4
+		kde-base/pykde4[${PYTHON_USEDEP}]
+		kde-base/kompare
+		kde-base/kdesu
+		)
+	gnome? (
+		gnome-base/libglade
+		dev-util/meld
+		gnome-base/gnome-session
+		dev-python/gnome-vfs-python
+		dev-python/libgnome-python
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		dev-python/pygtk[${PYTHON_USEDEP}]
+		)"
+
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.24-dont-install-license.patch
+
+	#fix doc install location
+	sed -i "s:/doc/kde4/HTML/:/doc/HTML/:g" kde4/Makefile.template || die
+	sed -i "s:/doc/backintime:/doc/${PF}:g" common/Makefile.template || die
+
+	cp "${FILESDIR}"/backintime-1.0.4-kde4-root.desktop \
+		kde4/backintime-kde4-root.desktop || die
+
+	epatch "${FILESDIR}"/${PN}-1.0.6-wrapper.patch
+	sed -e "/ python /s:python:${PYTHON}:" \
+		-e "/^APP_PATH=/s:/usr:${EPREFIX}/usr:" \
+		-i common/backintime \
+		-i gnome/backintime-gnome \
+		-i kde4/backintime-kde4 || die
+
+	backintime_variants="common $(usex gnome gnome "") $(usex kde kde4 '')"
+	backintime_run() {
+		local variant
+		for variant in ${backintime_variants} ; do
+			einfo "$variant: run \"$@\""
+			pushd "${S}"/${variant} || die
+			"${@}" || die
+			popd
+		done
+	}
+
+	if [ -n ${LINGUAS+x} ] ; then
+		cd common/po || die
+		for po in *.po ; do
+			if ! has ${po/.po} ${LINGUAS} ; then
+				rm ${po} || die
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	backintime_run econf
+}
+
+src_compile() {
+	backintime_run emake
+}
+
+src_install() {
+	backintime_run emake DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	python_optimize "${D}"
+}
diff --git a/app-emacs/visual-basic-mode/ChangeLog b/app-emacs/visual-basic-mode/ChangeLog
index 91544aaa497c..a87ecf3f72f9 100644
--- a/app-emacs/visual-basic-mode/ChangeLog
+++ b/app-emacs/visual-basic-mode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/visual-basic-mode
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/visual-basic-mode/ChangeLog,v 1.1 2013/12/07 11:17:58 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/visual-basic-mode/ChangeLog,v 1.2 2014/04/24 09:32:37 nimiux Exp $
+
+  24 Apr 2014; Chema Alonso <nimiux@gentoo.org>
+  visual-basic-mode-1.4.12.ebuild:
+  Stable for amd64 wrt bug #506866
 
 *visual-basic-mode-1.4.12 (07 Dec 2013)
 
diff --git a/app-emacs/visual-basic-mode/Manifest b/app-emacs/visual-basic-mode/Manifest
index 718636814f10..b1d989584d93 100644
--- a/app-emacs/visual-basic-mode/Manifest
+++ b/app-emacs/visual-basic-mode/Manifest
@@ -3,20 +3,17 @@ Hash: SHA256
 
 AUX 50visual-basic-mode-gentoo.el 228 SHA256 40d9b4186a4ac725e468592ade9a496cd3351b62f3ae494e22ebd70c47fab860 SHA512 61a40524cfdd2045fb5fd4022fb5a9c85859741f0eb310c12066f7574243779633f2a436bc9cea4a32883f78e01f256d4da1d649d8910c06ea26b7ae9e2bcd81 WHIRLPOOL cda9ed8b39f2e97ac5b4298e3e27f8ed11dc835f88724fbbca23e698cf5020d18725ab139a524aeaf635464235d665eb7e84da22856991f928e4c6e99b3dd889
 DIST visual-basic-mode-1.4.12.el.xz 16872 SHA256 c25a800f09748359d700acb61c64955474e9d63842193d70f18a54960f816ed3 SHA512 ef8fdb883dbaa957d1d7526e0548611f755a7d3700a62d32790aafc0e25d97b3f6784969b584dcdda39da681b4e59253daff217bde5a783b923257e77e9549ca WHIRLPOOL 92b3f239d6758100b1e2ec4d3a763830a8f5fdb284bd2c8041391c30b5db885f74a09b85de66a4fefe790c4dfc3759d2133d0a5ecb30a4d6a5c1e36a31eaab93
-EBUILD visual-basic-mode-1.4.12.ebuild 566 SHA256 6b443b5500a91d8e33dd0cf0a862e4365f82d1087e593347a71a1b2d1bd494ed SHA512 490b6a48526f6c05281e4f60a39c6904ec42df6e7851f3a53b088a1e669ee5290557b67430beaa34ad418fa33ffc9b58ef410b831e1a67dc991170d705c1a305 WHIRLPOOL 38c4d49031fbc1e5cea16fe10fbe9dd0c0f2ffc28fbb6d72719178fef1dc7b62785d28688a5fa45c41311c6bdb579d014846a8c8095489cc99604fc8de447714
-MISC ChangeLog 514 SHA256 679a904499dffd1c23fd09d84faf3f8a269fde5dc166ae293ae2ee5a7273b460 SHA512 3def40f287a493d2eadeefdf629d0851ab1321742300d93fbb202a11696e9151c63788a3521112f073ac502a85a828d81c53148c9bfe0fe163fd49234e90da61 WHIRLPOOL fd98b8c40bf300c65334e767ff718ee6bb79dba4e2b1a2a1df9ac048e6db778cb75e88bd463778860b043db0acff72a762bb62972ccb8381ac326e9e346424a7
+EBUILD visual-basic-mode-1.4.12.ebuild 568 SHA256 4294a2c0320b1044775141966d5e517735d7208647c868ca9761265e73f7b71a SHA512 a3fa3bedbe597cbbcdd04fca996859a65c30baced898ad48135688a7e126ae40727c579f7fffcf0c1d4fb5ef5e9a78c13e1180ecebb298e6908224bd140f1c6d WHIRLPOOL 745b83b74b139a57d030193930971b4aa0e4dc89d9344662a1e5cb743735239d488f90ce5ee66b09856f3bfc6bf0a684fc4eb6b768b73ff03c601aeba950b06b
+MISC ChangeLog 636 SHA256 7a244312db424711b88a14f568e4ea90f08c9236e16f9399bb62e469f88c0a85 SHA512 1ff9a288c61a21ad95aad552ff164085f6fbde533280fc89f6d0c1e4d65d99963cf86875a55e9b66fcf7588e20be26fd6d4899c4cda1919889058eb9e5423685 WHIRLPOOL bbe646f25da27028d3e0a9c5ee438b9516f166b3bfca4f4be59d7687c8f7b4aaa49d66aab8976f205e5758cd72e98d150b327ca54654bb707976bd2ca27e35a0
 MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJSowSgAAoJEJQzkH1pP7W4RhUMAIDJjUiFCzOGRh5MWK4kB+P7
-JSG1mfPo0/YwKfOqH8KA2ZuyWfzmz2XkVL2Px6Iu7YroHDyWR9e85DxYqdF2QFkE
-8cIMkhijIUQph89IjD/csZVOYoqIZ2S2SbzxBd9KmiOKNjG1gQ1MGUYbNf9yUjLD
-uKpqsSHL1h0lhb+ESIvyF3BS9pA19rC6385gfEBx9QAl30i4wCplB0VdhZ/yuBYX
-MBKxq+/jm0Njk0SHwahz1EXzdpSVhed7fLe3p49SUCF44G+6xUf9/XXmRuecxcJL
-6gH3bgqCrKGZuz6+56UrCrw54Q8DeX1wdfmRMCBsYgohBXbXdPfRrHKVbbOL1CW5
-xZ96L9w9U1hiG/Qy7SIsKUm4jPz2ADMJ77o9ieJ0CD6Y7Ni9GDbw0BlrESXAtx58
-QqHxey4wpWFzlWC0pp4O/sVUgzT55Vgqzo2yYUSvYpASXP6Oj5vWmJc35lU3Kyva
-0NEDOPdzx1KvyAg4mYdNcjKi9DAoGD3psstyTSf6JQ==
-=/Alt
+iQEcBAEBCAAGBQJTWNpuAAoJEA2sAkrWKOU2YUgH/1qqG/2kna5V/aYkGILJCvib
+wQrdH6pfJGhOfCaqLSvYoRiywzg1dMA6e9B89TONXzNpJ7ZidoRyvf90A+U0tmU2
+6tsqqwyJHr94OMXdh979JwYkhCfMt1gqOTUgdFQYPjOgYO4xR1KXg/Ccy5LQ/HxK
+8qexVawwqmMh1vLeJfxTtV/F27WWPYzME5nI/wCb79kakLZ3aG344X7KkSwAUpu/
+6GOMk331GGAGMW85YUfwGJmjIub1FtEAYMD5Hwbad1yb43DCNbQH7/N+IM7TWDkb
+b7kyQfq1PEPIVSXm0PgLb3qojg+oejKR9hlFdavN8LDdfCQN82PSYu/eyWTugXc=
+=uuzR
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild b/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
index 6c2985184b4c..47ef1cf29240 100644
--- a/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
+++ b/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild,v 1.1 2013/12/07 11:17:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild,v 1.2 2014/04/24 09:32:37 nimiux Exp $
 
 EAPI=5
 
@@ -13,6 +13,6 @@ SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-text/tree/ChangeLog b/app-text/tree/ChangeLog
index 854e5c8e15fc..226f46bdc92e 100644
--- a/app-text/tree/ChangeLog
+++ b/app-text/tree/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/tree
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v 1.108 2014/04/23 21:55:27 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v 1.109 2014/04/24 18:01:01 mr_bones_ Exp $
+
+  24 Apr 2014; Michael Sterrett <mr_bones_@gentoo.org> tree-1.7.0.ebuild:
+  EAPI=5
 
 *tree-1.7.0 (23 Apr 2014)
 
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index 2dfc652aeec3..266d6e785268 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,27 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX tree.bashcomp 958 SHA256 38a958c745e76fef4265f22f33504efe356a2b17405abeb22519f94321d4749c SHA512 7d1848cd8aed3d048a63a46334deeb22e7cfd538d24c330cb4623eaaf865fda7b10876f0e798f30ad77bacbd2fc02d7f103a36e16235ca5a077a876ae18daf45 WHIRLPOOL 67a1e3c583a79f398aaa31b3b3a202d569554f7833263012d0a6518e9854e01c03bd478ddc463ae10f582dbd44379eaf8e58b84c53061d716e0df154ab5d31d7
 DIST tree-1.6.0.tgz 42706 SHA256 4dc470a74880338b01da41701d8db90d0fb178877e526d385931a007d68d7591 SHA512 2a72de62b14f194dd4902901facbf44551d6fa6a5f00bb5461ee2c99de277744d8c8032d931513a9f339bfbd98f86bf20acb64b8ea684a1e90544a242272010f WHIRLPOOL df02831a356f361fea0e0c028fdd421bf89ac1388c75451ca720b0ad1a2bf796e06689086d13dd5ac92e1309ca334243a7ea4d1a522ad199936096a85d3e9227
 DIST tree-1.7.0.tgz 47082 SHA256 6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12 SHA512 b234fb1428ba75da72d7e4aeb24bf961e123332342593e441b29a0baa2270d12bb187d889c179d6463c940c8dce9fe9dffeb4ad3f06cf11f057b83234d7b4b4a WHIRLPOOL 2bec275486ef30075fbe34aea9c96ba3455e328f02a1259e88a9227d1cddda543c1f5670f973ce5a7b9ea96fb9d886598d5008f5ed34db90cd0b5c59402ca5d1
 EBUILD tree-1.6.0-r1.ebuild 1192 SHA256 e1a7e57d58a2ff36927148b4e4cde6f899894c8a493275c81a35ed93b2b00d73 SHA512 f34b9d04732ae5531e3d9a3b369ec07d7ad1293f21877b7e18f273b6a6eb5b27b20cc4ca85b6b1d3165d6c975e6755896e91d45a6001f4365b3e70016b5813ab WHIRLPOOL 4161c665960a9c8ae20bac038ae970d5d62feaf29b9c8f198ffac4b9512e83c592ab9ac0e551dbe0f74248e38906fdb9ac0ace2f9261535410d8a7bd067ed5b8
-EBUILD tree-1.7.0.ebuild 1200 SHA256 505fbd80564665e75bb12103c024f4baf8fb38735337e535122b59778f4e9807 SHA512 6c248da4badf1b28276ee3fd54ef8c9f612f0827527f69c21536d6546bca4a8b4d40fc203108b3cb02b3d6c4731327151327c3141c9e4267ebea85b43be1e996 WHIRLPOOL b08758cba78bf202e55c4a07bfe97a3afbc8407957cf84b3a26d96ec7d5e7ca314cc617fe03c29fc755a58d81d747d4f2750ed502002d305d16a13a36e973740
-MISC ChangeLog 11574 SHA256 f34d323292ba2f25b944a091d209d3e1de48dd56760188c35fd2af17adcbe460 SHA512 83fa18c9b3ccc32766fe59a8077273eeab522e88027905bf574d747653e01cf140752670eb4660f3e6b19a60ac94ad5e7f0ecc850af60f3719b75901af3f59c4 WHIRLPOOL affb48b9916427ec9c6c605277ace137f47c0d25063b9132fb3dbcf19804745490e5e93f6f8aa0e7b54c6b4c3da4aed4a54f204695b80f74071c72fb9ffc7b2a
+EBUILD tree-1.7.0.ebuild 1183 SHA256 148142e353807b9e682adf33bdf4a0f190779b66c57bf34da10f6088712333fd SHA512 e7a64d44ad0c7b394139ed3cd675f69703b6b0d841e767cc097c85df5fe89599b98fcbf3e1c4b1aebe5585b365c3d79256b68196ccb8d8e24e9cac4c6e0d51a5 WHIRLPOOL 8adf43bc9c366811f9c5a1724861227e01ca32ab86a5cfa7af0e065941af05874ba9efa438ec8589911ac7030e449049c95cdaf32fc3257a11d06b68c48aa333
+MISC ChangeLog 11662 SHA256 83a2d3dcec5a1367bdce8828cb10a62a541dfe8030498167903db9292cc4085a SHA512 d643b4c94f53c58285a2a0ec2d05833d021cc38bafb577a6e2458291a45c4518755e42769fd53b58c29ea059365a886074a6d4664aa39e2c59cf8abf6adcda61 WHIRLPOOL b39af4db838dd4f5511da3e78d3a1c61c696df709f766f484494c9122d215fc463762b0e6d0c5129a55155496bba484a5506c7d0f1fecfb199653d5c14be3f66
 MISC metadata.xml 244 SHA256 41220ab3f22cf0e50bcb5abb783fe559de379413a148334adab505ea062d1a73 SHA512 4a86b58648cd3625603de28c2c0d75902533a9abc2cf8972a4c4862049869f0048841920bc610fe8a020a776fef1122285dabd94055a145cff710af11a39747a WHIRLPOOL cf153dc9a7c17db8d947b92fbc0e05fb997be1957b4164692d78d02a4e34333ad79f3addfc928eafea551b13bd87576b6409c9e1db0433f25939c4c43be1c16f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTWDcFAAoJEEn8cBKl3gOugcIP/i32n7mDpvbZVtULoSAwpKP/
-AaJ3NjR6eZuj4q29pfnrY0qMG3l2bOnmtSvy400QjjufcjFeqJRD0W50UV/+VNij
-GinPlxE18BSFcy8cdnzXe8IsOnfrC95fjO/qPuPuJlmYlyA5jHTq79lkzUF+mYzW
-YhS5BbBFAKGNkaHU/jOZpmyT6QeEWBoeCaZjXe5xdwzKwmsSeDe4tIhTPVqeqqo6
-7QyJklmPnCgiEZBYHq5P41KVnhg1sbEIA83v3zIsSep11udpzH6MaM1jspxd39k4
-UhDz2Nu/eTvy0itJ9IStdFYGif/KwheKUqEl6y5/VFLiNUJ393DgsczMX4KHI1E9
-Nq7sO6M2qDKrYQG7RWcnAarIXIrcFyIki4L2B6WrYV10P2os3r1kCFK1QpP8vq7V
-trJ+S1k9qhZ6UCIIgCgOu89VrrBi0fT/bEb7qJn1A1XT2PKaNjezvlla+VHG+o11
-IIcdlT2PJC5QCLkIpGpgT+uQ0M/bnkOqoPA8yDcIZNM3fGf1OKrwAHPog3xbLRP0
-NeCm93H/vjgk8YZMadJ8PdXuApn9g1TL/aQ7b2hXc3p+BCBduiRAWkB/sHtr8KWk
-HbirFs46Y7f3PyzbsMvNvbIrgYU9Zu+Nfu/rPV+GtInADgmvP66o+aWt4YsdGAwE
-dks6+DRCRK8EIQ4YLm8v
-=GMFM
------END PGP SIGNATURE-----
diff --git a/app-text/tree/tree-1.7.0.ebuild b/app-text/tree/tree-1.7.0.ebuild
index 9f852df1e594..30ace473c45d 100644
--- a/app-text/tree/tree-1.7.0.ebuild
+++ b/app-text/tree/tree-1.7.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.7.0.ebuild,v 1.1 2014/04/23 21:55:27 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.7.0.ebuild,v 1.2 2014/04/24 18:01:01 mr_bones_ Exp $
 
-EAPI=4
+EAPI=5
 inherit toolchain-funcs flag-o-matic bash-completion-r1
 
 DESCRIPTION="Lists directories recursively, and produces an indented listing of files."
@@ -18,9 +18,7 @@ RDEPEND="!=sci-biology/meme-4.8.1"
 DEPEND=""
 
 src_prepare() {
-	sed -i \
-		-e 's:LINUX:__linux__:' tree.c \
-		|| die "sed failed"
+	sed -i -e 's:LINUX:__linux__:' tree.c || die
 	mv doc/tree.1.fr doc/tree.fr.1
 	if use !elibc_glibc ; then
 		# 433972, also previously done only for elibc_uclibc
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index b90c42686163..70e009758dfc 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.665 2014/03/19 00:52:45 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.666 2014/04/24 13:31:00 jmbsvicetto Exp $
+
+*mysql-5.1.73 (24 Apr 2014)
+
+  24 Apr 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.1.73.ebuild:
+  Add mysql-5.1.73 from the overlay.
 
   19 Mar 2014; Julian Ospald <hasufell@gentoo.org> mysql-5.5.32.ebuild,
   +files/mysql-5.5.32-Werror.patch:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index a1989ec50ffc..a7595c245a81 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -12,38 +12,39 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
+DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.32.tar.gz 24589274 SHA256 babb19a1e58f6b285ff75e876f550a798d37fb72b5a548ffb411e8a4a51f6890 SHA512 78e9f0f47b3732e83e1261e8c021002288c0555b3aed7a51359511b038084eb9c7314a3960aa225eab46868fc4700f0f7a6301d1a0068c0f9ba038d41a5b7488 WHIRLPOOL fcf7291524fd8709eccdcef3deb32d132e9db0182aeb39c70b59f7086f49e09526d1bb055b3771915eb19271d7f2b86c0d0f65101dbd7a9d998fe95605cabdd3
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20130602-1946Z.tar.bz2 1478373 SHA256 843465190319464fdb035f4ddcf8a84ad3161780e3a81c1269c8f498b1524aab SHA512 95fc28f84618e11eeb2de22c12796eca5f8eff7b69ccc44d329d8f81aba4b015c834bad965a909f4e1e90a7f6012db98092ca21f31388ff5ab88268c8c1b60f3 WHIRLPOOL c04b1554663934969ab6b7773c96a5bd2388971dbea1eef138620014ef1e023904b5df326ff3e36538920be7bc50a2962e8f7a33435e42c1b5bdf5787ed2eb3a
 DIST mysql-extras-20130626-0127Z.tar.bz2 1476503 SHA256 a3c791b7b95fe170c4071feed11699146fc8f9de6a9f2ffa67214c2e50644b4f SHA512 4ee19cb5960ba24f2db16e7c5b647d1b7bb9fadbc73bbd8125bbac7e926c569a9a585a4d1d92b851ea6653d9c15eeb00f1592880f104520dc040e5af19943ac7 WHIRLPOOL 739f5762fa24b0feb40848ddb83f2ed95fb650933920b3d9e55c5e90f907d4ac74dfb00e4b9189cda8f9af4317478f3132daf789d7c91196827f645dd3e37d61
+DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256 75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512 d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a WHIRLPOOL 2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
 EBUILD mysql-4.0.27-r1.ebuild 1105 SHA256 eed1ba3bb284d74483c521b410cb2f165db846eb6f6f0f7bb5218dd8e7cad2ce SHA512 2175d66db93d8745d410ca5ec0fbc803dce648f80e8f57d5d1b9ba78ee1fbe5dc5fb4f150e49ffe50f1215f7d0e6c4e3dac515097dac0e659413e3cc39276d89 WHIRLPOOL b932b28dd6dbe96016f86b4e3f6fbbc5197e97fc5a8bb934bbaed2c7a6f418b7970f76b1682b6c1d97e6133a2d179d2062b2f5b911d4caade763ae188f11556e
 EBUILD mysql-4.1.22-r1.ebuild 1343 SHA256 237e821bc7b47d259635f42255e80bc1e6f411341ada6b9014b6443d8ef52f08 SHA512 f66d21e221e9dcc2f7558f360b6d44bbe72c547dec3c1b164e7313e779268c5f11eb51807d6707298dc2547df4dc455174ceb21fe4f6bf6e6f02b377c62940cb WHIRLPOOL 6fdaa7a771dbcf52b2e39470c580f6c887e30a9df01e4f550cdd665b1762095dd37d52ece783c6b25511a57cdb555926399a25cc333a0a53e5ad1f0b162d4afb
 EBUILD mysql-5.0.96.ebuild 7175 SHA256 307fd3e2426b42d05b6793c9f0b90be12387fd5434abcc9b8caca84adcf275a0 SHA512 e7d71bb91dd953ec013d5b10379f97fe649c0a4c678ddead7120660349b8dfb8b7f2ebedb45ca17ec6b522ca5c8ece34cd8e0ec6a66fdb8faf076e5074e1e3cd WHIRLPOOL c9a06e4d0d52af5cbdc2cc56e1003564de4281ada0b951f7c9d2f93b64cecba1a6c48405308ef4b0a646099f0bc3ad3e10ba86a38e7d84519ef223a8927352c1
 EBUILD mysql-5.1.70.ebuild 8874 SHA256 abd74f2cf58e5c8d4544c2dee89c8b30174b038aba91f3b45138cc299d8013b7 SHA512 303ee2ff791852dcab8d72a73e06b7f5e1fe0bd48b6e71730013c601eba412cebacb09cc76d06075f4e63b0eae80947a2bf9eb42da24d412b5c66d69d9aeb4c4 WHIRLPOOL 20d542a938589b3fefc738e64f5d9f9596faa1f1dad0175b144adc096d7354390eb6c4aed873dec9687e08483cba47fac56c786829c2ffbbb22e04ecea2b867a
+EBUILD mysql-5.1.73.ebuild 8892 SHA256 b9d11ccea1c1f699ebacf94d4261beb25fa88c7b351a38034137fb39f4ef9979 SHA512 5c562d8fc17682c8992f17290717b1e5a68d2eda6e9e8d4c960cc316db376e5171e85d16a8695c6cf02b27aab38215cf4e3163adb1641ef3418ba08cc6f53b31 WHIRLPOOL 1cf5de9c01bedd88c976ff16890ff71c695af9af676f13947964d40c33a15401a63ec63403c5076fc56fd00ba343f19f1d84dfb1ebbc1f15cc80253cb2e947ca
 EBUILD mysql-5.5.32.ebuild 4336 SHA256 e0b85387c000151ce4e450c36f70b4e813b607c21d7e3226c038963e0d84a12e SHA512 cbe0a2165054f47c0179cdde1cec176be75d4dc13edce00ec9f8eddbb5ae4dfd8bc55a572cb083cf5c52d9bac4b732c6a0c4a635176d63022f68118acfe7980c WHIRLPOOL 351e194f73bd597d5055735ee9d119343503a42281bec830cc492ae919b101f1cd13db6d7eb061d58ef9a78a7290372fdbc51832c058454c4a8d1eb81248562f
-MISC ChangeLog 16294 SHA256 2eadfed069947e9403c2ccbbb704d212331c789ebad35e9b0e5445eb46cd6fb4 SHA512 b2983b090bf35662313a83238c216dbbd322b0ca7dea174a355f1e3763a552396e9fa868659db7d79b6aa8b998d23d5499e17a931c755f63e7c63b8c00bf45d2 WHIRLPOOL 222f1af66c5520b9d8ecf95446c9dd50caecba6ff47271ff1bb67459635c8ad633df1402bc8883161c1ed6a5c86044e1eab2b026d689a984d51df980c6b61857
+MISC ChangeLog 16455 SHA256 32752fc7ac1154bdba5071314ebfe2e086ee37988268ee92fc4aee658420ff72 SHA512 5b206d62221f9f9c20504d84e3961cdfc494c87d9de65138518ba1a2d0f80587678c3481624be6ce517be6cf9eaf12c28569275dc9a6094d2d06962af492574d WHIRLPOOL db6553442c6f9f8aabcd8888e2d1e05f48b2f43386fb5ca589bc2cf27bef07ead7cd0e31b19d4de582d2bc3817ade0091bb27a6026ccac98b34f20b75329083e
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC metadata.xml 1512 SHA256 2aa7aa3c625242463dcc8fbd52f0c33558507f375dd64c80412372e5d8456b70 SHA512 b9a09711b821ce7a962dcb23a4e249bfa83fd5605a45bc9416e4721a643e8fc740df4e22a7aba8d7245612361f6f3d779647f32c9469662fc2a2598030a2499e WHIRLPOOL 9d553da0a5501afbb99566ba46664f50e871e90a6ae839626f2aea9b7f28e9eadd1b8360483bed9a397082f59518009d1f70fef128399370c4bb1d6e85c2b5dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTKOpgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg0I4P/1WYDO4toc8Oko2Ms12OR5qW
-AhnwDoIKUifh+DFrfHWAoabG8q5K03vWiBso0EohLZ9kzG3bZifqLK6mYtWforPG
-ftUS6YDxzuh1aVQTC5/+rVmcZd3Ac6LUud2Vt0UuH1KeauC3UE+DIyFTcIi12AW/
-NjbQOA9gcp7UxX8QbmydEGNIxB6231zpWDP2G+GvN3AvBN2LpROEtIu1u5RIJgyu
-Wz3P+grK0x48YmrP/ri65KTPUiqqv4KmghQCEYcKoTPYH8A+plpTGv2LuiKi/awF
-J7izdqA9aBcPpDiego6zZGYcbCzkDYb8qbFd7VXaco0vJRHQJ78vidua/z34fP6g
-cdUM+bYQjMwSs2Z+PsXAf73/dB5T/hY63BWPgWosVcrHi3M2XP/N98SEH8PAkpzf
-NcDQS55m8lVM7WJCp/6A0nRIpcCbnRQcVXqi5J2lxwz4LnMeeoerhpnHUHzbUSkh
-xQrblpRi+xWqMttQPLH+p2/MrExoWT+iqm8GRsCXVjXjRlGwRt6MtKk9/F8kXGpQ
-RNF+qm7WrPoGEorH66BWrOArNdkIKlqJJjZDGGghGjL+0p/zdTsBURWQO+k3mrbD
-Q7Z83T59ExzA2rpwo4U0OnHoHP9dF2JHEkouYycaBdR2ih6EE7tgqouVlg6wKeLX
-cjmS1nz5dwkZhEOWW4XE
-=M05N
+iQIcBAEBCAAGBQJTWRGyAAoJEC8ZTXQF1qEPmwkP/0diFXQHzXPULqedgFXbS5pK
+qST0TYIKBiZvrVcbA3geX20JKvW61cVbz+uj5kyvl2GsSyD0CE/Ld6X+iJduPMYy
+F2QDV3eOZy1QuFMEtn8rMmM9njt1IgJ/iUfE5ZcffP0/2s5kCp64phPLFa3dN92d
+hUoEpOn/PvLqeqCwgGHTxSgT/CFZ8UDaWUQTy+IpNnd8oNpT73stgJOuLTTnCNmv
+hZ7Tn8uzpZxHBFUVMTPvdrwFehOA/16p/8f9ah56SZQtf6SUMU84nIfjSGKIJDSr
+slTPK8mmwgpDOOKK7b6s1PqGsU/P0VCrOcYn80t+boBRg8l1V+mkOqHYzj4khuKy
+5Mr6dDx+sXvdexVZHzstx+97wVvUx5S+yitZQWfx8ASeK5xwqbRqRfywiWI5x6SF
+iPsgwAH67IUzYpGdVEDhhQlfA+q+yNvWJq1fnSm4Q3GOc6OmpNmqGHfqQCeAGHcV
+DVw+Nwpw2NlGm19XqwXY98wzKO/K3gmO3Yp763CqSfTAVGKs/Q8c1J5ZBBnr1tWr
+vcu15D8D/tv4xjhQdV4rIK+x2qz/nJhmG508+yKeS1ok+9VJ8lqkavTEwLuiGqmS
+jyAk7rW33KL6ESJKHg6P4En03cgukDR1/ghPG8vzxOwWNrgF//2Be2lRDSAzyS9P
+sq2UMgmOvGahet/cWy8T
+=z4pF
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-5.1.73.ebuild b/dev-db/mysql/mysql-5.1.73.ebuild
new file mode 100644
index 000000000000..42ec53793d95
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.73.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.73.ebuild,v 1.1 2014/04/24 13:31:00 jmbsvicetto Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20140424-1043Z"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		if ! use extraengine ; then
+			# bug 332565
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+			# bug 401673
+			for t in federated.federated_plugin ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-embedded/smdk-dltool/ChangeLog b/dev-embedded/smdk-dltool/ChangeLog
index 2fa9914de77f..ceb6f639d009 100644
--- a/dev-embedded/smdk-dltool/ChangeLog
+++ b/dev-embedded/smdk-dltool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/smdk-dltool
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/ChangeLog,v 1.7 2013/08/05 18:00:31 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/ChangeLog,v 1.8 2014/04/24 17:40:50 ulm Exp $
+
+  24 Apr 2014; Ulrich Müller <ulm@gentoo.org> smdk-dltool-0.20-r3.ebuild,
+  smdk-dltool-0.20-r4.ebuild:
+  Fix LICENSE, add mirror and bindist restrictions, bug 446160.
 
 *smdk-dltool-0.20-r4 (05 Aug 2013)
 
diff --git a/dev-embedded/smdk-dltool/Manifest b/dev-embedded/smdk-dltool/Manifest
index 381e4e597f92..3bc58b86b8bf 100644
--- a/dev-embedded/smdk-dltool/Manifest
+++ b/dev-embedded/smdk-dltool/Manifest
@@ -6,24 +6,21 @@ AUX smdk-dltool-0.20-build.patch 430 SHA256 81e2059d8d6cf5a46b22c2691e122636756f
 AUX smdk-dltool-0.20-libusb-1.0-r1.patch 8859 SHA256 7f5f9a30f6467813d8179ed166a9097fed5f84c65b34673a56f3fa9b4468c69a SHA512 7c1a39c7b6da1e2aecd651be6d78ec30383cd9a7858c40477e84bddd2cb80b8138a6cae55e3f6be71bd8aad03ff31dc3250f1579c63c106953fef2fb62e3e3bf WHIRLPOOL ea13b6b1b5ddf542c67fcaa2166147f9f6d14e7cf11ac1477b111acfd73095614baf789e7594e11a0107a0b667169cab36e243a7ce196c4e605c958213e720dc
 AUX smdk-dltool-0.20-libusb-1.0.patch 8207 SHA256 ad6f6c8719a6cc840ef8ca4c39782bca74cb777d4383e9c1bbdc88211b9a604c SHA512 2c3f47ac0fbf573b8be17721639123607ec4aaf69e1eef602089d75ef614ba761b6f6d0182cbaa0abc57ef0bd5a2c61120b3369c9c73c29cd466fda3f5a99ab4 WHIRLPOOL 34757c6beedb4af6f8f3fd4f2cc5600488f4b855c36388b2ba4629a5f71f8e278851e32ea6017ebc09b54e357a9185eaeff1b38fb7c1df61df8b38475f9c8ea9
 DIST smdk-tools-v0.20.tar.gz 5170 SHA256 fdda1a8ddb8b71a7a74e8efc85bd08ba8cb953a61eb610b846cf291436426e48 SHA512 2b0fd113bc9e6e6c07ad4163d404bffa8044150a2da55a8903192b9dcbead5e31d97a9315b561526f0cb2a65e415f34941bea0db3ac40e73048901fe95ff3a17 WHIRLPOOL d5feafc17e497a955135fa2c9a3e7857a8779c81ba124879a6aa57b495c9ac25452d1b63106abb4120daef0b8c131734da91c94f0400f03eb41688aa7825daba
-EBUILD smdk-dltool-0.20-r3.ebuild 920 SHA256 527443988af2dfe10c1a8a05f6c6120d75279d499e75ab57751545b83553eb77 SHA512 d840acc1967ba0dc44b2f30b8af0b27ba1cacf365bc63bd8c86a79425a5e82f89ac03d48d5dd35a64f2f9400cead7d226dd4dd46e41e0c83ada7fcdc63928918 WHIRLPOOL 6c935786a776fa4f62791331756683e6085532fc29b414aca77a6c843775170e202beab4af481a211bb7a82a69138da8acc0b4898c89042eb4a65b6488e4ba58
-EBUILD smdk-dltool-0.20-r4.ebuild 923 SHA256 49e4210e85221549850d791b80ff1610615a1a3ea417e0dd10e625acf8209d6d SHA512 4c2287948e151dba3379df532391148fcf447ba705fe35f1d2f0c70f1d811dd6f02035353f712aff9071c53855c8ac403e94451463d942824254f3b61946bab3 WHIRLPOOL 14111276f6031d732b9e05bd592098cf1367a85d8eae4364b41c20190fda41837c980e88043bea4efe6d54e8a9f67b7c285b0e4bbd9726e54ffb294d9324931e
-MISC ChangeLog 1679 SHA256 69a78ae21c14e31e4ba0761d62f8c534126a2d3e8040f99711eac4e763c4ec8e SHA512 57572ac3c5c3c06323471340493f053c8e020bb6c8280535cdf53039a2d13ca8dfe19ecc90f46239b745f04deaed0eb222a81fce2042ab9b69fda7fb2ddeca50 WHIRLPOOL d513527fce4d4bfad772231e8e1c99f117b1eacc05064577740dca411453a830936c4b031b32d2ab4b1aec35a4119a9bd54583471dec2faf2c260041031b9731
+EBUILD smdk-dltool-0.20-r3.ebuild 957 SHA256 e8e8413f89e2bc931a4efc50f093ca52dbeea9fdb6af1f713e20ec8dca40fd1b SHA512 2890e065ebeed80572f5cb37de4fc91be664129365ceddec6448324df53aeff2090a2612c5de954b7c613347f12af074195b2849b0637a09f56d0090a382e728 WHIRLPOOL 929e7821b5e49e518eb25722a984d9e260e8df17c2b7387b650e239495db96f829da41979877e38c789bcb7d53adf294abe065fdac85632498250ce0ec4f5ebd
+EBUILD smdk-dltool-0.20-r4.ebuild 960 SHA256 a2fa6768fddf68f87cc6f3d1e231c89b3b19d65098d5334419f9fb87d5c017ba SHA512 9383ba47ec0abb20347aaecc00817af8824a6a861260bd6a02e12c9e48411326436fed1ad3db065cbf5c28010f97e514bcc9c9575273f057650f2d00767c19ed WHIRLPOOL cfcc9c02ed7bed2bbdb6ce0def3c5d4b5343551e406483654156c9423c553110fe26d4662fa360617e8be5b6dc3500bca6ffb4a16d4ea45e8c6e7a0309c21907
+MISC ChangeLog 1846 SHA256 242a4a41ecefd62a4c6706dac29b103527d842de1eaa622eb3e6b6593d622dd7 SHA512 9dde877aaf6f97efc8d81f23e4afc6fb8f09217291c2cfb066d77dce63f9eafe7b48763208453385db3e29e36ab2cc0a10e6c2d0ea28e1672c25e420df1929cb WHIRLPOOL 32f0bf1a5a2cfe1728ca026dc665acbbf447c87a67b15f930065a9a0e01b1fe7a56a237ac1c8a6b95cada2565ec4aa82cb727eefdd115d53968d26653fb2b4d2
 MISC metadata.xml 165 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a SHA512 2be6b57c8e55824d56afbe9ab641639e6e1b4cf73bf2795c2778e373777ad545b5211e06510f13703583e7bb18817f623bc00dddbc8c52ad5f100f085e5dfddf WHIRLPOOL 7fe27fc76b523efadbe65a61c187e78592bc1563423791709914a6263c587a8843c75e19c64f989c7fc8a105c6433a874116ec670df3a27b930634d7e14fb1fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR/+hEAAoJELEHsLL7fEFW2RkP/iIqRVq9bwqagoP1fjOMrAIj
-PY47KXh6EC++qzT0peoOPXNO9VlawSLy3CSy25kC41/JpKQD/CkDqaNkf+wqposC
-2FMq7RatY6hWO9YCcKxOPJAjvBTQibGAT+pMWJrink+1pS7IIowA9qBBDnJUNzPr
-xTjkZ54DQPnInr/Nwt147tKq9pOM+GKtlMB7rY1S1cA7P0zB+sspOW9uTUsSbDgx
-et/ouJhtrJn8FRPRV7WoFGdyekXQ335z/9ac1Pyo2TQz76dnG8kBE3kJ/ug2RDA/
-mRUf/m1XG2ZI3X0/1bH7DV98F85QPrtFkuXfp3oxWbvSWzSLDubLAi/VOjfRzokm
-5lDh5p91NFnlPFU7nnK3x+jWws9PZ4mE6ysEKpZLKP7Fv1miLLhdJ3goJ8j4RXm1
-MxvVJgiqUmXXqpsjTazki17YgLAmsTlfO3GavUrQeDCukkG41ayFbHx5rnWBdlAw
-A/0QPx4ONCPgXxkFgbdeEahcZ4p/wubKuY/3WNGsNzTJ/k87e0Ykvyn87AEiRTqX
-2oJsAfKCjWOwZseTL3xVuYog/cyewk83tnVkkjt37/oRGwJ1muUgMsWoYSpM3fXk
-8lngezL1bAIkddkctPYTAu4jC0J2osYP5bhR7gPqyMiswJzNNm+M4D/MYSnm02FO
-6p4S7eMGkQ13tpOsqTga
-=MOQd
+iQGcBAEBCAAGBQJTWUy/AAoJEJQzkH1pP7W4EbQL/j+OM0nFUBtRbw2dw/BuVP6m
+NiTK9SvqzbQYBI5LBKq8j/1bkbYCIvmZpPED0UjZ0xDMbPLyT/+AgEv6xAJABBdJ
+9uU42OkSlhYyyRI/kx1OFMu/eJzRM7Y3M0egeEgrKzMJOziGevUDrBQpnae+tfah
+8YyCSqmUa8IMse/VMZvCgo+CmxneUnsMHZud2iFTqcIcqt7CVbpOT92DvgLF9EWc
+atEUHCCae1aJkeK8ZAaFnntVRvQWuQlipoozc9f6rmsKeHa1gQgLh6q4Htw30aPX
+A1ca+qQ5kmEwMwoKASufgFhbW7/Vy+n6h6I1dCBNm82l93BeSt7jBTO5qzBwv16p
+SS59edei5LDnxwXkSZyPPRIMl90oxzsVo6Egms1Bd7vlvz7PofeXJo3uZd9Yageb
+yGwwfS6ww9d17ALtlBMsCPD52LCZjM7fknr9c49PJbySR+yNroHue2SJgIRhQAwH
++ioEiTs2LOy41kbsWUc9oGBIhnJMrc3LJhtZ31w1RA==
+=PETn
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild
index 68bfe03daf9c..9099ab0371ef 100644
--- a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild
+++ b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild,v 1.1 2012/05/22 02:23:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild,v 1.2 2014/04/24 17:40:50 ulm Exp $
 
 EAPI="4"
 
@@ -11,10 +11,11 @@ HOMEPAGE="http://www.fluff.org/ben/smdk/tools/"
 SRC_URI="http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v${PV}.tar.gz"
 
 # Email sent to author on 2012-01-18 querying about license
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="mirror bindist"
 
 RDEPEND="virtual/libusb:1"
 DEPEND="${RDEPEND}"
diff --git a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
index b87ec2a45de9..28ba0ba25757 100644
--- a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
+++ b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild,v 1.1 2013/08/05 18:00:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild,v 1.2 2014/04/24 17:40:50 ulm Exp $
 
 EAPI="4"
 
@@ -11,10 +11,11 @@ HOMEPAGE="http://www.fluff.org/ben/smdk/tools/"
 SRC_URI="http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v${PV}.tar.gz"
 
 # Email sent to author on 2012-01-18 querying about license
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="mirror bindist"
 
 RDEPEND="virtual/libusb:1"
 DEPEND="${RDEPEND}"
diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index db1ee403aef3..4da00f581705 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.251 2014/04/21 12:35:11 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.252 2014/04/24 11:34:28 djc Exp $
+
+  24 Apr 2014; Dirkjan Ochtman <djc@gentoo.org> erlang-17.0.ebuild:
+  Remove now-useless elogs for 17.0.
 
 *erlang-17.0 (21 Apr 2014)
 
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 24fc34110a39..af9ea6ff5212 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -20,23 +20,23 @@ DIST otp_src_R16B03-1.tar.gz 66253556 SHA256 17ce53459bc5ceb34fc2da412e15ac8c238
 EBUILD erlang-15.2.3.1.ebuild 5423 SHA256 212dedb4ce233274c9ac98b3a48498a87f42f2b65caaa34547f06401b6e1aeaa SHA512 e8af1f3cb6037bdcff65dff64ec7bf01f3a98006be0d2dda770698128748f47777baf0713f477637121734c7a47f8a6aba66f3465dd0d5217062b6c3de53b216 WHIRLPOOL c0fe8f99cd6e38856e8c22d704e0365ec1b18ce8d489597d1218ca0b0afaf916a90e90d789e6587e3302ad6258456e5bc1caa17657f5e5b3478292ca9616a1d1
 EBUILD erlang-16.2-r1.ebuild 5311 SHA256 f9e8765964eb9b9f48a66df72074a8f5f9bf84121fbd6db2b365f31e92e5a7ca SHA512 0ea35994d0987ba27ddf881d9ba86be06aeeefe8a39a35eb58165e9442275d42293f3ca0c4582a0206406ad94c8ee5098b34ebcea31fa56448d88edf6b8f804a WHIRLPOOL bd245c4d7eef4bee492e5824a219f9730bbc3f1836731e9bd346fba378a3089a81dfff8c7ca92c62678679a52da03faff57a3eae2c12ae9f9d3f138b067a6fab
 EBUILD erlang-16.3.1.ebuild 5203 SHA256 ad122846257ffd841492cc8e07aff5d7d3ec32f872398d1dc695afb0b3a4890a SHA512 9b23635d148e2b0ec3ffea81ffffdacf0e05021e3b545f1dc67872950ac796731b6c842dab9d0820532ffb6b3b3948615af8e1354a2a0e25f7739e8cfd318559 WHIRLPOOL 384319fa90768a9134ab8fa6b4660be7736c31b3db2ed1cb00b7c6638e73ac536957088856b0d27e559d9182e26648ea0c28234de6aa9ec6e9444d1093b465f8
-EBUILD erlang-17.0.ebuild 4953 SHA256 48f91f439af9353bf91175bc44c0eb314495047ed4025f49475c69c8d47befdf SHA512 839933253dfb0a6eb4805a5dc96ffc57e6074f51bef687c5272ad42bdb45e22c3841ad5a1b8597fc0ca73c47a2a2e3e2c39712e97994d2bebe79167641c715ca WHIRLPOOL e0227031c758214cc1cade1511999f2f0a29e99940aa9a5bcfc98785add8aa530e146dd8a5964d7f2de059ec62c908f30c0d7309d73a57298bcef95e20a03441
-MISC ChangeLog 39517 SHA256 f09a8a09357e482d3b4709f00b5e66b0288f65b98033fa9de8ea586384b4ef9f SHA512 bc25e73d1634a104aeb657369385ca70e74d8bfde61dded5cfd35c2c5a2255f675425acd71918ae41a4c14d18238dc0976ae463406491cd6bcb30d7b7dcf968d WHIRLPOOL 91850c21afa02f9b5716e46cb865afbcdf82376d364263eb12ab3cc80f05f22b53fec21d2501f19252e5549ab19072c75f79237923aa07b9d7da05460282e7a8
+EBUILD erlang-17.0.ebuild 4717 SHA256 b6abb2b36cda7b0b204687dcf9ef11a5c6157092b74a6d5c21610ea7febaf42f SHA512 87d688e9a8d7a235823c37c2d3558d956d8eafd8af79dc6cb11eb7a7abb3e7dc70e157226b15ae9ae42c69552fb8d1a3f5df14761377e578d380bc713c274d74 WHIRLPOOL c5bd7d9769c15542ad05fffc3066dc55672548f27cb16ec0b8ddd9c3fe9506243ba0a5c1d994c832d2185426132a579741d7177939bb7f4171a77f8eb7464f8b
+MISC ChangeLog 39623 SHA256 5b0a6f2d690fe8b372a781888c02d0738f7d5c2fbb038473a3f46c2f489004a5 SHA512 d4b2a3413b3f697c721498710acf3053bef39119ea98d9d52be0896a72389296e68eb7d45f7f36b079fb68b30b1ae43421fba0fa54c82034b6282068024f6587 WHIRLPOOL 8666a9d0db2ca5f1912cb2215d2244d76b344dd0308bf80e75328c2a026775d5f1caa5ee01e48220db2fc19d3e4a859a5f94e71ce2df33e4ad2132ed77c49316
 MISC metadata.xml 852 SHA256 5782640d216cf818d9088bd5eb963002210d83e9eb47e98edfd3844fe579dc27 SHA512 1b22c6d550e7ca634694408f000bd99827aa86037db59b1bb3ca7a2b4259c38d69caac14b0a0db6611f7888dfcdc7972ee70e57a716eb2ac7684aa043b9d3208 WHIRLPOOL 748a8b4560773d970987880ef457194437024ee0f72b3ae9972f6033a5fc14da8e2835dab385c559ae0fe22e2bd31e8e4da3dc946e504388588d23baa39208bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTVRCOAAoJEJ+WuSkwOAOBkRAQAJd/KE6Q5sz/P0U6hr2ZAJa8
-TA+d6NgzA0wrgDU0nHeKUSW4svIfkIBRGdQNEG/BYxLSsok85U4WqbnIENYpkLIU
-6eh30FkotYOhoA6qfEstuceuQ6DIjzqAGLDO2SQmo0MkZftj5FLtnzsp43SF4i/G
-9YcUOyBuGle1XicF38qf6EaLW3l3W/rPiP3r6Qn+a6PpoUPzT7cjhvrGFBIyjJVa
-8LpLPY6j0h9pn3cJvp1i8F/H07PSkefPae35uWRp55EIbNgsFTkoUQXNXwO5MIh3
-MzJ+gG/qiMnhbncdgqNmXi157ONmMQ3EkCfzxOC5c8dBtNYoA5CkMYw8/HWgNoux
-P9oEA378lbng9y65IUysOz+kbJTq1fzmUuVyDnS1K+Mr5SLifgGJb4el8N6XdQvO
-TMH6RosxOc70jrcjO/MwzUxf5gyuAv7vbsUynCcgXXd68ijKcFcByd+Kr4r2ROvz
-BIRJlpaRjIapXQuyKf897z2HnrSrmuAtlZAy/CGdYmwNADag4IJef3rCXPhYwQh5
-A/3CvIStLN8FlNvgRyyMMd9vfUWmKX4MX/8g0YAzcK7RxBJbH8aH4BJgPUaWa6xE
-QNQ5BXrZX8OdiP+zhsiPdKFTV+WNydnXIqTcrtbKQx69t/lTT7bS57CPxwDLzU7p
-z0rE/0rv4eliMX8+8hxz
-=md8h
+iQIcBAEBCAAGBQJTWPbRAAoJEJ+WuSkwOAOB0poQAMXWp0jCT7UTyVaU/HcBiGxE
+r9U/ZyPo7oOIaAbZy1hjAKK1z4H6QtPxcGnCbCtzcEp7/oJ0rB8I5iJfuxY9xzKQ
+22o0vmIYPSTAzDgyNGyBIu3a20GciTNtDQZFH6dCInIxZtiXzh8v0HYjRRy5bUQs
+8/vvmYEsHAw21d+2sNEK3JBk+QOzWNfPKqgJwdEanydw08XwLCd5GKlJjdM34zCx
+cAIhtzV/C2gwfSywAVeDs6o5wPc4W6jcMZGQWs0zFfc3R/fJ/oe4tp6w92rFVuI6
+14oezv+H+5CbRbWUrkxXF+Vt8Xt31di70Jo5eHl9aLjfW5bSAXVamryd/HaBq18Q
+jRoalTuiuPJhghAPMrtSRm0p55SN5jg7eZ+PBgvXp1P72NMWd4qxu2pO2hr97F5d
+j/3aQJ4jJdGUScunK0LnQNrzPdBT8OhY8C7yyvA6wHx2Q/5J81Mo68+dnkWyBXij
+VW4yDTO9+qOdvpXGHmLE+efWSZGqPGT9W41mRN1pzl+weU6ITdPfnn+Y+9DhAG2F
+H8ibje9kpFavP2shgeWp0PzOO111a4WacNwhHo+DFBlaR95Zjx8xe5ItIf/loCT2
+2+a8svHKe1IJmupx3NOxh7OvaxIr+Ds5sqe1BGJroXSxNKuv0kPm/FntM/k4zznO
+KoMt38hSHbCTaeQzEwy1
+=Ju94
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-17.0.ebuild b/dev-lang/erlang/erlang-17.0.ebuild
index 57bd8c64f590..fa0824939820 100644
--- a/dev-lang/erlang/erlang-17.0.ebuild
+++ b/dev-lang/erlang/erlang-17.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-17.0.ebuild,v 1.1 2014/04/21 12:35:11 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-17.0.ebuild,v 1.2 2014/04/24 11:34:28 djc Exp $
 
 EAPI=4
 WX_GTK_VER="2.8"
@@ -151,12 +151,6 @@ src_install() {
 
 pkg_postinst() {
 	use emacs && elisp-site-regen
-	elog
-	elog "If you need a symlink to one of Erlang's binaries,"
-	elog "please open a bug on http://bugs.gentoo.org/"
-	elog
-	elog "Gentoo's versioning scheme differs from the author's, so please refer to this version as ${MY_PV}"
-	elog
 }
 
 pkg_postrm() {
diff --git a/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r1.ebuild b/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r1.ebuild
index 688fdea76fc9..9c814e8bb9fc 100644
--- a/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r1.ebuild
+++ b/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r1.ebuild,v 1.1 2013/08/25 06:24:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r1.ebuild,v 1.2 2014/04/24 17:59:47 zlogene Exp $
 # This appears it should really be entitled Audio-CD
 # There are * QA Notice: errors on building however the HOMEPAGE gives no source repo in which to file
 # prob. not worth the trouble for this little script.
@@ -17,7 +17,7 @@ SRC_URI="http://www.vanhemert.co.uk/files/${MY_P}.tar.gz"
 IUSE=""
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 
 DEPEND=">=dev-perl/URI-1.10
 	>=dev-perl/HTML-Parser-3.15
diff --git a/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05.ebuild b/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05.ebuild
deleted file mode 100644
index 6b033fa2858f..000000000000
--- a/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05.ebuild,v 1.23 2013/08/25 06:24:11 idella4 Exp $
-
-inherit perl-module
-
-MY_P=Audio-CD-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Perl Module needed for app-cdr/disc-cover"
-HOMEPAGE="http://www.vanhemert.co.uk/disc-cover.html"
-SRC_URI="http://www.vanhemert.co.uk/files/${MY_P}.tar.gz"
-IUSE=""
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-
-DEPEND=">=dev-perl/URI-1.10
-	>=dev-perl/HTML-Parser-3.15
-	>=virtual/perl-MIME-Base64-2.12
-	>=virtual/perl-Digest-MD5-2.12
-	>=virtual/perl-libnet-1.0703-r1
-	>=dev-perl/libwww-perl-5.50
-	>=media-libs/libcdaudio-0.99.6
-	dev-lang/perl"
diff --git a/dev-perl/Audio-CD-disc-cover/ChangeLog b/dev-perl/Audio-CD-disc-cover/ChangeLog
index 82573668cf49..b542c56a891a 100644
--- a/dev-perl/Audio-CD-disc-cover/ChangeLog
+++ b/dev-perl/Audio-CD-disc-cover/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/Audio-CD-disc-cover
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Audio-CD-disc-cover/ChangeLog,v 1.27 2013/08/25 06:24:11 idella4 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Audio-CD-disc-cover/ChangeLog,v 1.28 2014/04/24 17:59:47 zlogene Exp $
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
+  -Audio-CD-disc-cover-0.05.ebuild, Audio-CD-disc-cover-0.05-r1.ebuild:
+  alpha/amd64/ia64/ppc/sparc/x86 stable; Drop old.
 
 *Audio-CD-disc-cover-0.05-r1 (25 Aug 2013)
 
diff --git a/dev-perl/Audio-CD-disc-cover/Manifest b/dev-perl/Audio-CD-disc-cover/Manifest
index b9cc94c0e5e5..daac819d9e6e 100644
--- a/dev-perl/Audio-CD-disc-cover/Manifest
+++ b/dev-perl/Audio-CD-disc-cover/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA256
 
 DIST Audio-CD-0.05.tar.gz 10417 SHA256 04426156228bd0b4bfbd33241dd2267c2fd644780ab0173d4343f0b5b039485d SHA512 c4d9a6ff57119431315329a92accf9c0f6b4fd52d1fbf9d6c79743b50ac73ebddc6b541a7807344d6eefd12a7681945b4ee3885abfe32acb68b9d17d070d6d09 WHIRLPOOL 858bc2e27629997771969ff817ac426fad11783aec3f4c34899515761342786279e0e8409bc2b23037eee926c1aadcfd2a601271ae56141eb6306380155738d9
-EBUILD Audio-CD-disc-cover-0.05-r1.ebuild 1025 SHA256 2518c22d5c7d1bd3eff0ee3478a4e30cb291c83b9f49301e5bebe77953c062e2 SHA512 f071b0ffed5d2cf20011f6f102c0af96a90d199c76e4f75d38b686e0ce370d7cda6ac5c95bf2b77c6e12bad40f9038e5fe23462602777a66d614e4b1bf181157 WHIRLPOOL 031cd6b60db83f6108c5385c10d6d9fefb16436970087412de3a1a798dff5d65ca3382a288b694f63e9879f214dd21ac3f13ddc2db68f30bac5bccc47c930343
-EBUILD Audio-CD-disc-cover-0.05.ebuild 799 SHA256 8df0114d30f4121b4727ef5ec0587ffdd4bc8bab3787e9b8d179ff6aed260110 SHA512 dc8b537cd91157edb249e76cc1dc72da7745cd13defd12e994ce979f727f7622168b1a0bf2a26ad5e6a3f7d22350ba81b9e1b1b2d3138c098b0de83497a61c5d WHIRLPOOL ee3d886d3a9c1c1ea0c13a163c79c4f71b4afdf6b105a505391d78d965af87a78ee0258cee29f4ba52dec6a51aa51a34a9f43a6c4914f949c94618ffcfc9d54a
-MISC ChangeLog 3294 SHA256 d98e1dc3710632ebb4fee4519c0c347e812ec9ab77197ed9659d0f9f42780692 SHA512 c7d2d2126417953748aa821e1fcf18f26b4119406023998a6df7bf44440ebe9647134cb15e637a768b8dc26cba2560c9b3be978060cec3fedc10e142e1dc943f WHIRLPOOL 774e2f9f96fea8a7396940c3181ded4c9c834cf7aea44469231d2ba09cd5ac1df6692cdf848614432510fa7b1ab739ccdbf76209c161556c377b6378cebe3fdb
+EBUILD Audio-CD-disc-cover-0.05-r1.ebuild 1019 SHA256 d55cecd2b59b6c44ae26cbb7667d3503d44a87a05f8259d96b42d51e4e341bb3 SHA512 87ed7ac85f670587f8b6c950007ad8963600889450b92cf9d273b3b927f34e6e18d22ef48798918bd68993303984ff4e4a901de75ca408e5efad76b6bb011b25 WHIRLPOOL eddc2403c3412278298b7beef72c778053ddc83d5973905718fee391081455a49ac370a6821893a0a5fa85b14ce8aec162f5ed9577e2974bade87880244e8977
+MISC ChangeLog 3468 SHA256 13b555ab3dd00dbec6684710af775c3be932be8a2df9040a384c47e0c59e59d3 SHA512 f859f912315809986d25605dc56e52a517332c0428f4954e693cfd7376644b4d685a8e7bfb865d6d6a2753a97a7775d3a2ef5d09f1ef2e6633a6a369f8d9bda3 WHIRLPOOL 5076e0e308032dc8af150999db1b9a7abda8335e23393573d7ac211475ba10716da31dfedc4c247317b9a20368b23e7fec4fd1bc0d3dd67cc9bd43379a8ed766
 MISC metadata.xml 159 SHA256 9e7c719a784bb48388c9a12217b85baa75f1b04e9bf049d74b740785fa5006dd SHA512 5ff7b5593ea8976b44c7d63c7cd649f56d649b0d7c4fa5a16bf71ecdf36e40afa8fd9c28df0b8f0c7f9577c47b6ee63d3330f9304d545b46657d6a5f2bfa124a WHIRLPOOL 7ca7b971bad6145bdf2215f73d158f190984644554e8f32132c57c22f1209a5684060661c02e181c135c34c8729d491090ff6d4b23614198e19b9e2deda35a0a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIZo5sACgkQso7CE7gHKw0rvwCgmWWfpUxOGM/Ga7cbsO4Fk18S
-S58AnRrR0ZTe9FgIw/HXDhGiXLC9EEKd
-=Z51r
+iJwEAQEIAAYFAlNZUmMACgkQG9wOWsQutdZjOgP/aATa8sMXe6QH9gAcljvOm+Qu
+ZkHTkMaZDfkklr68O6ji3Pt7nM9Uxzju61K85+GkUrdYimWSHUT8ZTryTfKnyYvu
+ra7ZTS3Uy91sG2SuUdz5cTl4G47tHY3vYca4Np2nvoo7pR0PKw74F0frsomthKIh
+vq/TYj63kFDxjuY2wXc=
+=KKtq
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/Number-Format/ChangeLog b/dev-perl/Number-Format/ChangeLog
index 1f66b732cf56..02a0084678a0 100644
--- a/dev-perl/Number-Format/ChangeLog
+++ b/dev-perl/Number-Format/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/Number-Format
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Number-Format/ChangeLog,v 1.32 2012/06/24 12:59:02 tove Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Number-Format/ChangeLog,v 1.33 2014/04/24 17:20:01 zlogene Exp $
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> -Number-Format-1.52.ebuild,
+  Number-Format-1.730.0.ebuild:
+  ia64 stable; Drop old.
 
   24 Jun 2012; Torsten Veller <tove@gentoo.org> metadata.xml:
   Update CPAN upstream info
diff --git a/dev-perl/Number-Format/Manifest b/dev-perl/Number-Format/Manifest
index c85d9849719f..f2e7fcd9b3b4 100644
--- a/dev-perl/Number-Format/Manifest
+++ b/dev-perl/Number-Format/Manifest
@@ -1,6 +1,16 @@
-DIST Number-Format-1.52.tar.gz 16363 SHA256 0c465fc6eade7b8150dde58040c56759e5c3022c2b09c7540a0e273c9fd226f2 SHA512 8d77e4e552f78075ac94f3b4bb0a0734717d77822fc75d4359d14fc501b6d95427204d927a0fc85e57230893cffbd9f79b466465db9db17faa92f3c2c339b62a WHIRLPOOL 7607fde37431e191bc095505b19f4c1c03ee4dfc067724d84c5655ba7dbdfc5091960a78f409ae97057d13b6a6663c5b368a37d2288372140f6d70fbd3f1798d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST Number-Format-1.73.tar.gz 22742 SHA256 84a2b722ef21ab92bd09ee8de9ecf9969cd95a0655815e8c9b0720669986e46c SHA512 52af1a595d9a62c9aabd57407c1807e71c7f2bfc591a835f73428848162fc0ab5aee7e78a8269304d44fceeb2654b8db40686eed8c6ff83e821b905905c75047 WHIRLPOOL 83dbd189322c74fcb3920ebcbf7da9cdb9e7632716e7965f5525ea433e3afa92c6d6fa17e59e906025f65b3caf643a139a8e19fbc9b2d9c04b60fcd9dff34724
-EBUILD Number-Format-1.52.ebuild 557 SHA256 d07ab8b4e50b56c378a67f0970bdd8a2eb54b23582703d3c28ec6b7e13b0018a SHA512 6d640e2c0f6ef616da59cfc1f9c54fbf3dcaadd90600f2ac947a935188bd0ca82e32f17e68ef72c304574187b6920cb2029feefc334d3b85dccb73341f0e56f4 WHIRLPOOL f37652d3828fff5e58133ff972bff59d1e2fc66cf3f1219de84ab9127338b635c165357a507aaa21aef32ab02e757980f4cef4e55f63b62de21438493581b69e
-EBUILD Number-Format-1.730.0.ebuild 420 SHA256 917d0e9ea584eac6154980f7ea390d7270cad3cf616f0497940daa8b917a4620 SHA512 e5e4bb5e2683a73acb694691c8b6643a602e63e8f32c45c3c11c3c956aea8ca96fb3317beabd4f6fa51dd7b8ac9d40a36ca1c4d0aa756f49704b95b9c85bf262 WHIRLPOOL 67424b5db58fd444763a6a9a3b6c1eab5b537dbcb021870ffe9b05dda654e5f73f739ca65ede9410fb3f13e2a64a44d5df79773f78cb8cd76ce2d8a9013e3383
-MISC ChangeLog 4019 SHA256 19c5b5e115cb843de37bc4f3d1f19a95b4d48628cefc65a435be05ee86b6cc04 SHA512 7f608220cad6d146b742b06cf00316588e736c77368cd298cb7531125d1448476ed6332ca58102acb747318f4ff02e821dda0019ecfd5018d8abf09dc0e84434 WHIRLPOOL 02636393989ae66221b89450e62c2e722d246f2fbd692460e5cfbef7c0094ff9cdf0df97231dde173b42a2b4ddf71130adfa09fe5b501f4124abd7bccb95d38c
+EBUILD Number-Format-1.730.0.ebuild 422 SHA256 67b61a29d70d5e98c62d1a48de27e2a4b0f2f1021b533989d2b932b447476da8 SHA512 12a59ca61c80211f01b20dfc5336cf94181df74553091e8860a3f7325fb04506d429070e1b2f4a4bf01267094c3f6f4f074d831c61b896986aea4a3b25c1e721 WHIRLPOOL 1cf0a9f5709e5ede962bf0a7c8e3cb75a8ca29c8300786270861123824962cce5264c15b28977ad01ea69c6be32af9d3d0aaa7473b30423a149a97928961a2cb
+MISC ChangeLog 4158 SHA256 054ffd52c72b044ba52c2366ccde3fe0b8961262ac44c3eba8e98f9c398afc54 SHA512 1600e737e9bcaf803b553a3bced5693405b7e1e7177b54665aa6a23a62b880f509c9227eb229acd25c1eb3802f5d6929ab93b1f2010b667a7b6c74c64e36599c WHIRLPOOL 1d643df9816255c10899384dfb6161e635a291eac6f98ab09f846352a7c3523a6e1e5f7c00c7edec276479941f7946f03dc2e7a895ac2d8c67b4dbf0937757ff
 MISC metadata.xml 300 SHA256 55f22e0f4808689921b709d10c5eeb89b35866e9faa0c6b4ae20acf29aac29f1 SHA512 cb4bc957cc84e7730ec248d172095f804384f5924194410211de549446e6ccebc16e97b14afa0601a5598b45a8f51f592257435503f783ad77c2aadc961364bf WHIRLPOOL 01e8271a3c7b6c6c269b7067f05b5a2140086f65e35fae8c0c733626a35e2ab4d9c8f55c6134e23e8e89e7267aacaf9048f21161393610455dee6822be6133ee
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iJwEAQEIAAYFAlNZSREACgkQG9wOWsQutdbqYwQA15GAOmPZLRYaWR2rEMPzS1Dr
+1IY2x0hI5X04o4RvMIx468ht5wMDXG8B2VD3u8WHJvX6rPpNPDJsOLOcS1M2zy7h
+QZ/e8xZvZkZP1SOlAqEgXr9hywErGqEhHnZlZJxba3FbOILuVyJVNHBdzHtLz7bu
+mo3QBVPOwbae5fShlkc=
+=VDG5
+-----END PGP SIGNATURE-----
diff --git a/dev-perl/Number-Format/Number-Format-1.52.ebuild b/dev-perl/Number-Format/Number-Format-1.52.ebuild
deleted file mode 100644
index 646f94cef65e..000000000000
--- a/dev-perl/Number-Format/Number-Format-1.52.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Number-Format/Number-Format-1.52.ebuild,v 1.5 2007/03/05 12:19:38 ticho Exp $
-
-inherit perl-module
-
-DESCRIPTION="Package for formatting numbers for display"
-SRC_URI="mirror://cpan/authors/id/W/WR/WRW/${P}.tar.gz"
-HOMEPAGE="http://www.cpan.org/modules/by-authors/id/W/WR/WRW/${P}.readme"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="amd64 ia64 ppc x86"
-IUSE=""
-
-SRC_TEST="do"
-
-DEPEND="dev-lang/perl"
diff --git a/dev-perl/Number-Format/Number-Format-1.730.0.ebuild b/dev-perl/Number-Format/Number-Format-1.730.0.ebuild
index e98f00d9ea61..93c1cc36e9c5 100644
--- a/dev-perl/Number-Format/Number-Format-1.730.0.ebuild
+++ b/dev-perl/Number-Format/Number-Format-1.730.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Number-Format/Number-Format-1.730.0.ebuild,v 1.2 2011/09/03 21:04:44 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Number-Format/Number-Format-1.730.0.ebuild,v 1.3 2014/04/24 17:20:01 zlogene Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Package for formatting numbers for display"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
+KEYWORDS="amd64 ia64 ppc x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-python/python-nbxmpp/ChangeLog b/dev-python/python-nbxmpp/ChangeLog
index 1f2dff8ed308..6075f9de0506 100644
--- a/dev-python/python-nbxmpp/ChangeLog
+++ b/dev-python/python-nbxmpp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-nbxmpp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nbxmpp/ChangeLog,v 1.5 2014/03/18 13:27:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nbxmpp/ChangeLog,v 1.6 2014/04/24 14:18:08 jlec Exp $
+
+*python-nbxmpp-0.4-r1 (24 Apr 2014)
+
+  24 Apr 2014; Justin Lecher <jlec@gentoo.org> +python-nbxmpp-0.4-r1.ebuild,
+  +files/python-nbxmpp-0.4-store-certificate-backport.patch:
+  Backport patch, #507334
 
 *python-nbxmpp-0.4 (18 Mar 2014)
 
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 565cc16b26ae..958933a3af9a 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,30 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX python-nbxmpp-0.4-store-certificate-backport.patch 982 SHA256 4c423c167daed26d9a53a39e561b34b025149f53e82b6171e93863dc8691b4e9 SHA512 830a56410ea53c0a26d867ded24b390ad5414ed40296f2d03d3e7a0aae8f8a4f53022361d57d61ef2483ad19f9fbcb5d87963f7f252883401d5c75f66338cb1b WHIRLPOOL 3df26fe9de0cd9eaa3a23d44422820505a651b3fb87545f9cb6d1b00e9b3294a55d21db983d63666f16e1b6dda886bcc9c9651c70a36c44e3d717f80b9eaf2ba
 DIST python-nbxmpp-0.2.tar.gz 1684589 SHA256 be17b4364dcc5f90970e51d045aded4b9f384024af1debbe77f413c2b07c0df8 SHA512 c7bb004c0fd42a6723d808f2be5b5cd9015db810207a8b57157487d771246ca32a955eb5839172d636470c1131c2edea17bcb1512dc7e6e528092a8315efff66 WHIRLPOOL 6895364cb4c80f56ff0360bc8667b2228059708829eb0734cb3e4519e7b895259bb57aace143daaa80997d27285658310c70a96fbad10a19235ad14f0d01a0b6
 DIST python-nbxmpp-0.3.tar.gz 1506998 SHA256 099afec84d49f78598c232bd2521449e2416b39d1951d33aafb4d6a5879ef7d8 SHA512 b381f18a22cd498577a2fb451d88a7ab4d7eb26319fbedd609e5364b557846ed35798aae90e3b93ed3651ecb05f2de185ef44da9b79e13221e0cd6ecd442b6ce WHIRLPOOL 9035f02c7a81d838764f7396603504e3c0dc79437f898fae9882d06b6f0b16b7178b2d8135cae10904fd7a1cc07bedeb69cbc7eedacd2d3ea629653baac18b40
 DIST python-nbxmpp-0.4.tar.gz 1685694 SHA256 d02b5e77302ca90f1e2db69f911785b8239ae30b0049fe6626d5ebb7cd87781c SHA512 9c4b72edb64e6e2e89c9f703c89c545bef1dc450b91a5ba95441c40101089e2bd1e5d5351a7300d52093cf643513b2ef166aa5d10b49d261dc4364b0d7c85fcf WHIRLPOOL 16849217ac9cbd8368c742175391c5056614cfa07806bc3f45d40f71b42dba57e5b09f18f883b9e9535b689e3bf475237e3333a24f614a2087820d4224fce85e
 EBUILD python-nbxmpp-0.2.ebuild 606 SHA256 168f1d1336c17605ad97a84cc5c8623326dbb7d619791c090b41923094b6fcdd SHA512 90f15e7efa7b3e030d95d4eddf6100193894000fa40367fa1b57e5dc60515a15e2dbe0b78a50103717521a948e2014e5bdf56fa4d6f7bc600916c2b0b27ecc7e WHIRLPOOL d1485207cb2296a891a9c962bc2aa384fec4d9b7e67eeb02b7db04cde267da903a3c8670540d7849fd85680d1cf9051687a685507348b3b20bd6461fc2f69d48
 EBUILD python-nbxmpp-0.3.ebuild 604 SHA256 3c0be589f9aebebaf1151751ed2dbe672f6f075735f748a7e4f577930e2399a7 SHA512 4ade817a8bfc39f90cc4d5216d744ac5a22f393951de88872e98a094ca10c7ae3d0de28bdfaa4a598c62bf52ffd2970af9630eaee5b50146254ac9455de4d702 WHIRLPOOL 47d943e2648b4f66d07508c56254050fbf67becf816d8ee2e2c90e8ed7a05b3f000f2228c3977d67960ff3e939eeb242c8be71781885928ad217a309727d98f7
+EBUILD python-nbxmpp-0.4-r1.ebuild 684 SHA256 3cbf19a35190ec6f58a033cd33a34d52b42810ad2eeef6cc967320a06ec4cc7f SHA512 dbe79bb6c848f2d9b0d07638c5e132a83b0f9d5a33d106672f698ca3be622066689a19a70bbfcb5fcf379d859f01ab86297cc45f58d2acfe439562d1ce1b0d3a WHIRLPOOL d27cec760ed071a8af6ee62a41cd28905226468ce05900c20635203ad290ebd094c67d9183aafcbb9b8da5d7e07a6588fb011fcf3d7d3de898abe7a1b9d5e0f2
 EBUILD python-nbxmpp-0.4.ebuild 616 SHA256 ff89855a196024dc388192c7beca32b11062c6fd800d085b4edf51c74e548dc5 SHA512 6d4c363feecac4979738faeabea92c3037e597d2e50fb6156c600de0593208b327ed0bad523e21f6fb3ae2112a18697e7f217ac91e8a138dea6448faaf73b6c6 WHIRLPOOL 17ca4a2bb3def990c9312e9f43799e3b13d7ae209c41f82bd3b8088e7bdb9b1863ee000222575fef205c7f819ff837d3e5cc875e7ff8af1af58c4bfde61596b4
-MISC ChangeLog 825 SHA256 3f5af4f36cf2e89f1c7ecb1ac5a0a7180aca24597a02f71bdb8659e7ecc34709 SHA512 368fb593a834cc4b89e315ff9ae5e8eaa84b62a8ec40eb305363ef491cbf9d9ce07bbcdd309b4a55c37ba359150a4aee824e116f7bbe5be5109c9c1bec968b51 WHIRLPOOL d31ae5c54b5a5cfda160b21f62ecdce319db5f6f8be3ed024bcbd23ffe2303111a94177e9e234b6a0a3195d84616c004c66e308d78a6045cbdce04f6f9013387
+MISC ChangeLog 1027 SHA256 746465d1c71c3d49a414fbe684f2b5a8584eb662caed56d857e73f3e530aec3f SHA512 9f7eda10d221084d6e2ec9396836410d4f993c5a0ed19cf96b8d47877b3dcf214b1d1e26c990a6b975a08fc0807d8520db3a6579851aedcac129f3a160102a75 WHIRLPOOL a14227d9ba2b3d257e671f9f5524bcd070d337b1220f2d8c7a5078d92bdb5cf58cb7d9b56e909d70364c0610c25ee9c4df6895acbef3c30ef7023cfcbeb88c1d
 MISC metadata.xml 227 SHA256 aef43758cae524923aefea72b3a1f2896b3dcca8d0135dc75a08149549388105 SHA512 40677314811b092252949d13d1d07aaf721f7e8ba47da28ac21239f881e7c919bcad9384d2f0bf0eff95e11912443aa1f2bab7e94e1a3029c9aa97a3654795dc WHIRLPOOL 1ce8a3cc4ae9ce91daa6bd030e5be25fdbee0fc29e14b943024c932cff8d6da58c6d152d02fb8703fc285331f3dd010ec832f8a5ddb18c7cd33c9ae97507dd76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ7BAEBCgBmBQJTKEnYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTWR0kXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir99QP90EqsFiyGNrN81gVRrd48AYp
-Bm0pRY9uECJu5uUM8pSTXxOwK+8YaJvM/eGVdMxOblFc4K2dOjjl+oT3S4DpklFG
-B9CKl9i3oAWBnoTlswS0pco4I4IfdAxXZSrfaLV/B95+30L8P6rQdiaqXV1SpxKx
-KRMHeJWqk8KoAb3QyXyYR1ZdgJ2H9qMi4IN6qaW1vyjw8EZPwHiIkhBBw5efnVvj
-8oaJqJ0AJTamZf5VnpxE3ddDFPSx/LjQ9S0zzEBoxDe1QIGWUebw5MvzDsZQ7Uof
-jwwizdw1O9+7+BYmYAADeIurflp4tJBzQU09NgEaCIGfxIuflcNTuJWvuFhlSD9y
-GaCzXgehkAPzHO97yNwjoEOS3PQCCuguMkU3wEw1zMD99oK3nuGHFFMrUkfMjn+i
-jQPztIJx2GsFrTMG7RX4/vRBNgmyRALXx4slEgd0CRRC5kCBarZkmiiaas3MpWZE
-C3wcRgF2COsc257s0hTWWqxvUfvHxbj0A8EiAyRDxCtMhmqZIPEY9EIM6Vw6/2ZY
-ndOz4xgmsbaGTzET618XF8POse0b3Rkx7h0IdRDt+yPINZnx3RVuMwUHz+UWX5s5
-PkR41vWmK4OB9Z+IxZ0JoNUovKQ28R+0lgblC0Cs+P/MBgFCW62JgL90CPRaEovo
-y41cAxK+1HdzonC3Ldk=
-=0chh
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViruPcQAJCSvcTh4zTrXslTt12YvBHB
+EabormArDbgo+AKxJIFKYVFH09bbnw81c2OqkqU/P8kvRlcKc6IFA4vi8HJDoBGT
+Sxf9JhSQY+gJH603Tni6prMypfCH9Cd34F8ccJyTnHDwdqrhmNA5JbA/rRedvjZR
+jEgd9ESt5ZkooCyK5aNuk/TR3HWHdUCBk1vFDaC4znevCRFS7sLBAdSJ9Z1/WS7W
+BMLh0y6crb3mBPhNzheRuAGNFU0cDvkuUa8RkWpsglOJbz4bS/3y5rnHs0/6FIxc
+j4i1shCpxrfi9s94GG4trHYFlpjhfJymESJPa868SJLctELgtj5Y+ZnnKXGT9LhR
+ij2zZVZJCoFukz7K6XoZqUXpQ/CrwJcBYkKBt2P80fVB8G0GUXcfGp3KXlHna0iX
+f33ttDElrFsWmAMZ36wZC+R98e/7pLxfJVf9eLySB5+VHtVYN9++isylTPAOXdw2
+YMe23gb2YcpuWjh2Ysio314Hr1+o5tvqxqqXX07MEJ6w7kvM+1LZm88T6TmTQ1Fq
+Mxh0DWXYuro3d70NP7rzheI9aPaK2RO8Or13iBEfT3lppcP4b2TeJ9SgXVny1A7s
+dDHHEpadEK30etr3RJucmfD85fJX2K3M0TSs7KtQi+NYuxU/nkvs92sjFBmfJGVO
++a8prNbPKdK6CdpcIFdL
+=gWs7
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-nbxmpp/files/python-nbxmpp-0.4-store-certificate-backport.patch b/dev-python/python-nbxmpp/files/python-nbxmpp-0.4-store-certificate-backport.patch
new file mode 100644
index 000000000000..a9212115b902
--- /dev/null
+++ b/dev-python/python-nbxmpp/files/python-nbxmpp-0.4-store-certificate-backport.patch
@@ -0,0 +1,25 @@
+
+# HG changeset patch
+# User Yann Leboulanger <asterix@lagaule.org>
+# Date 1396114108 -3600
+# Node ID cb67945d04385d86f0dff21e89c994b12cf07dc4
+# Parent  46e9c8c80bacac8260245d5d9752ba0c5bddcf89
+always store certificate of server, even if there is no error
+
+diff -r 46e9c8c80bac -r cb67945d0438 nbxmpp/tls_nb.py
+--- a/nbxmpp/tls_nb.py	Sat Mar 15 20:39:59 2014 +0100
++++ b/nbxmpp/tls_nb.py	Sat Mar 29 18:28:28 2014 +0100
+@@ -476,9 +476,10 @@
+     def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok):
+         # Exceptions can't propagate up through this callback, so print them here.
+         try:
+-            if not ok and depth == 0:
++            if depth == 0:
+                 self._owner.ssl_certificate = cert
+-                self._owner.ssl_errnum = errnum
++                if not ok:
++                    self._owner.ssl_errnum = errnum
+             return True
+         except:
+             log.error("Exception caught in _ssl_info_callback:", exc_info=True)
+
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.4-r1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.4-r1.ebuild
new file mode 100644
index 000000000000..7e07d3cc4e4d
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.4-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nbxmpp/python-nbxmpp-0.4-r1.ebuild,v 1.1 2014/04/24 14:18:08 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+TAG=4
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="http://python-nbxmpp.gajim.org/"
+SRC_URI="http://python-nbxmpp.gajim.org/downloads/${TAG} -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"/nbxmpp-${PV}
+
+PATCHES=( "${FILESDIR}"/${P}-store-certificate-backport.patch )
diff --git a/dev-ruby/abstract/ChangeLog b/dev-ruby/abstract/ChangeLog
index a5a31c0e9dc0..9b515ce0dc67 100644
--- a/dev-ruby/abstract/ChangeLog
+++ b/dev-ruby/abstract/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/abstract
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/abstract/ChangeLog,v 1.20 2014/03/12 11:07:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/abstract/ChangeLog,v 1.21 2014/04/24 17:39:58 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> abstract-1.0.0-r2.ebuild,
+  abstract-1.0.0-r3.ebuild:
+  Remove ruby18 support.
 
 *abstract-1.0.0-r3 (12 Mar 2014)
 
diff --git a/dev-ruby/abstract/Manifest b/dev-ruby/abstract/Manifest
index 42fadbf2d636..901786749585 100644
--- a/dev-ruby/abstract/Manifest
+++ b/dev-ruby/abstract/Manifest
@@ -1,5 +1,5 @@
 DIST abstract-1.0.0.gem 12288 SHA256 33c1c1f1928ddfa2114075412a491787a1b450408abb7363376c38fe675a3fbe SHA512 7c6fffc012baf704a27470fecf44dc97e6ca9f5bf9db47c20f23e59376af1262c4618ad70a70faa446339a79f94bbce04c2f5a6c506bd010c60a0fa5f60f346c WHIRLPOOL ca04ab8203b27ed1867f2090479cfae21d66c7c0cebafc4bde737c41fb0cbfad7f835877855c7b95f3fc4474b4d50f8580d84c6f8f052af064b7be90e5f8250a
-EBUILD abstract-1.0.0-r2.ebuild 763 SHA256 3c7dcac1a0b00a5fe22cd196e538c46336665d34587ff314a3b9446bcc7df6a4 SHA512 3cf25ba3cfa3d4f2d7683b53b6ac235c04a5dcad2acbf2517588ac39b381911507734942f00587538cf5ede33dd5a17473060698f2dca93060b14fdc0c351b99 WHIRLPOOL db9f5fcfcc963ff261f242a43988a91eed1a031aee493718686bd4030ad88a569ad3a7a7bceb7c13f180dfc07ac57c88c7ab2021ca3755b878b40a6a29a9510a
-EBUILD abstract-1.0.0-r3.ebuild 774 SHA256 1790b42da970b8cf255dedd37519789fe40246c6f3d65c63becd5962cd0cbabd SHA512 cab2d658ff10c27827cdd0dd4ee63b552ab978c9c23504589bc394c6c5923f535c336b2edb218c2766bddd1743faaf86e5bb7ca68ab7776c6e6c8d5b6732db25 WHIRLPOOL 659417e1a7e4e14fe206910740ab0d81f873c912c81f3bfe63b772079efed2a62a38d9ea0f0b7fb10466e5b06dada759c4f02afd1e12e8da2467450fec906fd4
-MISC ChangeLog 2615 SHA256 5024ccaa771a258cf86b567525aac64ad42ad271fb9e56e8b4852934072005e3 SHA512 506479634c09f69346c1b0a2d6f9285d74040e1df63324129a651d201addcd8211297c33b6ebaa05fbafd8fadd24de31b5d10417d4ce0f0e9389e6dbddc80e0b WHIRLPOOL ffc459b5120cc2fbdcac78ab662127e4e98989ef75134f9f18819a194fa47170dc12c1009c9ed04945d05131390bf4e3883cee8297ae700e13a6006310bbd8bb
+EBUILD abstract-1.0.0-r2.ebuild 758 SHA256 8a700458612503a871c3781f0fd708c0d491b1935ee2c7b251fc90fe88dbf044 SHA512 5c2aa619da029ccede410ff9fcf596921e649cfe86246ee4dbd2570b91f3660b166763fc7cf917b61bb05be4e51aa651a6459b8dbe6dc78ffe5a6612cc680ed0 WHIRLPOOL e0197f6aedf051bd8077844cace43c61f7fda5a57f3c026babf3b1cbe3b06044148c5e1ffbc23a5a9810e4220dde6d4006cbe9c575b3f8ec2da18e1e78a5c702
+EBUILD abstract-1.0.0-r3.ebuild 767 SHA256 0ac5c5c279ed3d08d667a9334b8e02b7fee16e97584a1a12e2b1e5a9a5f732d8 SHA512 29503dd6703cbef6657844f139d71562547496482274af0fdad0c9d71ddf5d0819c2dc7f2d2adc307846f44c81aa90cc1504a68c30532ed3b74f424acbfeb622 WHIRLPOOL 5a5fdc68cea2735f1174b6020f13cd982b65b62252795be3285fe4511002ba1b2c4f2127db7620f1db4db7ff56e6d6a897caa57665be2c5916a60593ed574315
+MISC ChangeLog 2743 SHA256 c733aa12cb14803a8b9f27c9b8ff6054f8d0d8c18195bc61448b47c0b5022e0e SHA512 257e32597e6024d613b58006833a3248b0a834fcfb0c346612bc2a805ab5662ce3a524eeb5034ac790c648cc2db33d0c1d3ece23bd411bee6eb1cf8315a2e597 WHIRLPOOL d81db76b7243769dcf1905b62cc1c7d1034d5827932dbb5abe3e66e53ffd8c7e103da43e1ffc2b4e7316e80c388be05bc3f95631fe9e37b2b8749d37e8f4b2fe
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/abstract/abstract-1.0.0-r2.ebuild b/dev-ruby/abstract/abstract-1.0.0-r2.ebuild
index 43a423897698..5cb7c0977f1b 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r2.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/abstract/abstract-1.0.0-r2.ebuild,v 1.3 2013/12/24 12:44:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/abstract/abstract-1.0.0-r2.ebuild,v 1.4 2014/04/24 17:39:58 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
index 62258ba26095..fc2599fcc18f 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/abstract/abstract-1.0.0-r3.ebuild,v 1.1 2014/03/12 11:07:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/abstract/abstract-1.0.0-r3.ebuild,v 1.2 2014/04/24 17:39:58 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/allison/ChangeLog b/dev-ruby/allison/ChangeLog
index b7a960a0aaf6..8384f9a6415f 100644
--- a/dev-ruby/allison/ChangeLog
+++ b/dev-ruby/allison/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/allison
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/ChangeLog,v 1.29 2014/03/28 03:34:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/ChangeLog,v 1.30 2014/04/24 17:34:08 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> allison-2.0.3-r1.ebuild,
+  allison-2.0.3-r2.ebuild, allison-2.0.3-r3.ebuild:
+  Remove ruby18 support.
 
   28 Mar 2014; Jeroen Roovers <jer@gentoo.org> allison-2.0.3-r2.ebuild:
   Stable for HPPA (bug #503564).
diff --git a/dev-ruby/allison/Manifest b/dev-ruby/allison/Manifest
index 6bd24a89ac15..d3171f9fe405 100644
--- a/dev-ruby/allison/Manifest
+++ b/dev-ruby/allison/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST allison-2.0.3.gem 31232 SHA256 d39167373aa562f5ac54f737aa9ef0e72e62504786b433c713b8ff21b2738bb5 SHA512 988ed7f244c8b4fc9f629ef2b37a0ad851d9587f688e834041624cc92d8549e403545b83eb270b127e634c99f91ff8b53d2642df73dbfafe20aa41718b97ee5d WHIRLPOOL 5d02da3d079f842746eb07695e1c099fd4deb178562fbaf09e6bcf1dfac40bff80d3ebdf88c7324580df1a130c2cc7b5c87854819d899ba00962f5daf7fa947f
-EBUILD allison-2.0.3-r1.ebuild 738 SHA256 5b9e39475783773b1e0fea0c0c821843c7384a49825fb4e1fba33558b6d4f2bb SHA512 fd20dbcb597fcfcf4cc8c4029e8c4167e267e1497a8f98ef668ad73af9b5ba4803ba6842c1a29d1e30c9e52d3b2f74929a349c9fd10b89e2b5bace2ff6202fa6 WHIRLPOOL e92e6ea1e63062aaca718dd093f3ddf34c81a09eb8ad0ac0bea482928e8a90e3f53d6a8f79416e59c6161c88bad1933e1892d5cc68253468aa1e09c7b1c2b38a
-EBUILD allison-2.0.3-r2.ebuild 747 SHA256 5c550ae2193bf9121817951bb15b5b49343386c2ee0ef3258e8b638c5b9571b7 SHA512 f165e8f5086cfbd6fa914066f4e61a926dac922d9d9eecc54a13764ddf81463607c3966f27e69ba3a50cb0789edd9fa078160a07a5cdf850fb8bfa30fee377c1 WHIRLPOOL 762c3cd468f0cf654a53b2d1a770c0df4aa45e4d57bd32c2e2aba371f3999bab62cc60b3036b5fc36885855a1f4dad2dbbcb006c99c5ae18c94e405049664453
-EBUILD allison-2.0.3-r3.ebuild 759 SHA256 eb99c8b00aa6bac32e21abaa47ecdad22b9bd9009fc3eaab97a7d5d2df6f6ae9 SHA512 f4f68085cab3bd98206cf93501f3cf65651791a1a8932119be3e99855c1ca4f9cc4eda43f516a93c283e8fed119785349c01c45a7cc4901d81a4fc2d6be0dd63 WHIRLPOOL 9ddc36cdc48a467f86e767e738f1848e342967337dd10d078837bf0019c8a8b23bfa515d6b206a45e0d537a4e0737bb827ab6273cb85555d63076c5e63a1061b
-MISC ChangeLog 3503 SHA256 f5e99a3001c492f9cece71cd18101588aacb515acd84513b06a6df639e93f1ef SHA512 2235a2273591299d3eadf4ffc906440594a96dd8e87c43e904d3fdf40dec4a7b194c1d4274f5e2032ccdc1f560d1afca4152a2c8de5ba683cc7018a48b8bdf8e WHIRLPOOL f8c904d8ae8271e0026bd23bbfbbfa8631c3c2fc8cc49e72d856b5765c02f9371a66913c908dd00177d74b4a4ded14b51e8c2c67f2542d16c1107659af1a2e0b
+EBUILD allison-2.0.3-r1.ebuild 730 SHA256 1b9beed63aacd652bbf626edd0f8ee14d89b027fdeddcec9188a55a270da360a SHA512 5d06426859f1c895491ab973daad1c66e35e51ce6e6ecbd63b278b2bfb89f7997ea232733b78fe155eaba50eaa6113bd89111682421df8e4292746f7f4473854 WHIRLPOOL 31f34afd4313b1f1ec31faaa48802561be2ca77dd20687b3691b2f748ab416e769310c496778fd5acd452da2ad58209f6d014af856486faa9ca2a723dd63b23f
+EBUILD allison-2.0.3-r2.ebuild 742 SHA256 4eb6a30361070009d1e91f9a794858d09b5a46d2788403cdb2735ebd7000714e SHA512 96ba14b81fe77d36e3719dd2511eb8a099d564e82ceb37312f1923c753d089a2ca887df7c3e4328c012fb7793ed6ea0439a7cdbca7527e280bf9456227706043 WHIRLPOOL d885f765f8af4b1468a89be73225a25d26bcaa0887aa7945e14d30850a024ba1d0633a3b0171bb0431a9e223fc15739bbc7dbb8f0117307806e819f6ee070ea4
+EBUILD allison-2.0.3-r3.ebuild 752 SHA256 c3729a55851edc462550730ad45e17d6423380aaf23e06083197b0476dd30deb SHA512 15624c9c17f5209f49a11cf8ad0687a42f60f19a5e3ce38473d260a480a3f9b8ccf9033ee5602f0a4ed7a6f977a4780a102649ee0ba4be22ba9dff0269f3ec05 WHIRLPOOL 2e89810bcee954e87bf6c42bdc1eaf11fbb669f813cb99161a55c819c6edc7e7b5dd544f9228de9331354c49fd1aac7831381e9990de671b2b003633ad9c4f70
+MISC ChangeLog 3656 SHA256 3f4e521249925da9f567fa307edfca3ff93b823a6cf31abcb15d50f27188952e SHA512 40defb19cff4401cb6a98a9609c371423af1596d4c6296622c3f54e92b4288486e64bc11772a16a106561a72acdee902719707475850a6b568212029eed0d77e WHIRLPOOL 03dd37a10c014ca0077994de91fe136f2f8c93e4bc981f02c93b7d982d2d6bd7f4e4eb53719a9a8f861913a515d608a91e8b8c3ba5a982be00160e61478c3490
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlM07eIACgkQVWmRsqeSphNI0ACeL7bO97goh9A8JWkT60rLNkKy
-0IgAn3YBitI+RXmOj7ZXeoyhy2k/EI+p
-=MZpw
------END PGP SIGNATURE-----
diff --git a/dev-ruby/allison/allison-2.0.3-r1.ebuild b/dev-ruby/allison/allison-2.0.3-r1.ebuild
index 0abfdb6f53c3..15d3e7ce77f6 100644
--- a/dev-ruby/allison/allison-2.0.3-r1.ebuild
+++ b/dev-ruby/allison/allison-2.0.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/allison-2.0.3-r1.ebuild,v 1.12 2014/01/01 08:23:09 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/allison-2.0.3-r1.ebuild,v 1.13 2014/04/24 17:34:08 mrueg Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 jruby"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/allison/allison-2.0.3-r2.ebuild b/dev-ruby/allison/allison-2.0.3-r2.ebuild
index 9eb1d4f77eb5..27655cbd56f7 100644
--- a/dev-ruby/allison/allison-2.0.3-r2.ebuild
+++ b/dev-ruby/allison/allison-2.0.3-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/allison-2.0.3-r2.ebuild,v 1.6 2014/03/28 03:34:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/allison-2.0.3-r2.ebuild,v 1.7 2014/04/24 17:34:08 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/allison/allison-2.0.3-r3.ebuild b/dev-ruby/allison/allison-2.0.3-r3.ebuild
index 71efc2753a87..c4079863ce25 100644
--- a/dev-ruby/allison/allison-2.0.3-r3.ebuild
+++ b/dev-ruby/allison/allison-2.0.3-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/allison-2.0.3-r3.ebuild,v 1.1 2014/03/11 01:45:45 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/allison-2.0.3-r3.ebuild,v 1.2 2014/04/24 17:34:08 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/attic/ChangeLog b/dev-ruby/attic/ChangeLog
index 3247220545cf..bb1f3bfd5ee9 100644
--- a/dev-ruby/attic/ChangeLog
+++ b/dev-ruby/attic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/attic
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/attic/ChangeLog,v 1.11 2014/03/07 01:43:12 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/attic/ChangeLog,v 1.12 2014/04/24 17:36:36 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -files/attic-0.5.2-fixes.patch,
+  attic-0.5.3.ebuild:
+  Remove ruby18 support. Cleanup old.
 
   07 Mar 2014; Manuel Rüger <mrueg@gentoo.org> -attic-0.5.2.ebuild:
   Cleanup old.
diff --git a/dev-ruby/attic/Manifest b/dev-ruby/attic/Manifest
index 7a0cd3d0aa2c..205b20a3ec75 100644
--- a/dev-ruby/attic/Manifest
+++ b/dev-ruby/attic/Manifest
@@ -1,5 +1,4 @@
-AUX attic-0.5.2-fixes.patch 580 SHA256 bd41dfe0ab38a16df6c3f1510d229dedd377b0db9eef14309da4bc9293898b84 SHA512 c0b7cd8311004cdb66a42b88dbc7ca26007e985548760b6222d25fc038810c229ca677d64d8a206ea999f4b7a32a9a40104d4ea2175772819e67cf0bb45a6ac6 WHIRLPOOL 98e7bc41761dda76edc482a3ed427a81c592a0b6eaa7e27d77167498a932ad0f5f87b362a1ffc05a806226896ec95bcbf4bab3038ed4694f57aadb186c91c472
 DIST attic-git-0.5.3.tgz 6697 SHA256 f443d7ecb1a7b8618f852a10482fa629232811e280d8bc680ddc37b0629bc83b SHA512 39d4b2a2733b6d4a8eaeb63b8cd4566eadb7dc9ca97cffbbd3e3b30217d4f3076d57cb9d231c5d3a19c6e2f5e04a6201b3430c38dd25e7dd66873fdf3ff366ff WHIRLPOOL d3bcc965b03e7ad8cb37925fe501a9fb87c6c77a27700ae6872786698275f660f9213b25ea510aec43bd4dcee15dec2c89001100dbaf2a1ce22fd7932908f720
-EBUILD attic-0.5.3.ebuild 1046 SHA256 fbcd98ba36345389dc451f6c54d60c4c1df827ccf910bad5bf909bb45402bee3 SHA512 afef2aef35cfaf3f8f9338b790d47c5bebeec9c5ac433b9f7a8f5ada68bd898cfc42f0465a7ac8fd7e735a89b0f6db8295f81c07107c10a9dac6c750bc6aa46c WHIRLPOOL fb6399da2bc377c33e46f594a567dc821f6a3e40e819570b214ec42cf4379de97197ff27c856513f59ef56eba222170c5dc0f19db62753d5963073609b161850
-MISC ChangeLog 1585 SHA256 3b80a8529ec96d1bc1ead305b157f65f35d6e6191f3a2ed7a79c55cc7f1bbb41 SHA512 0a3bcba7de21e75b76b1c7d26074850aa64926329bd3e0e75ecbdf9ac1fb5ee79a9c1fd69299003580c2cd8354b22c4c9be08d82a95e8705969e076df3b74862 WHIRLPOOL f207e17b6a5e53cc53d80a73460d1dfbb2cab03e7464c0debd1944d4ec2e5c214e640e958eb6586da8b5ccf16e1a95094b4f6c6636b9d4f0b34ff8d112271505
+EBUILD attic-0.5.3.ebuild 782 SHA256 53ec850c36dbb74ad80f8e1dfc8e0256f468d231cccbb7d483638441f18bd6c8 SHA512 91e24a7f0e58a9731c8fba2a34a64718a5eef4544c225865c30667d03ae93eed38462b9ef9b93388146e8e131228212de8858217b6ab00b0af5872d8fa16fd0c WHIRLPOOL ae136a7235bc9e379b2ef62e309ab30e9841a8e40f3b62417adba9db705bac58152a1190733dd7f2cc3582f96a1771c43a0097366f23f5f25d635b980b0bd2c4
+MISC ChangeLog 1726 SHA256 5543e9b570adf75fc75ff35c8ab1a02833c75979c6ca9553512c1cd3f3aa1f88 SHA512 a07f47d38ec3a5a03e2cd3a700d52ac423a63720648ed0bf3ebaac39a130d9e5d56610aa06627a84e2800b6d1b79e3e10cb3b23ddb77617410b8c63a078ebcb0 WHIRLPOOL 343043aabdcdcbf53ea20f5d6b8aedd2edc53bc6f30aa2fca4459d753541aa9cd917e9c0dbf40ad9f08d405323dbd8ce20d5d7dc5b4f9bd2127a0fff118298b8
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/attic/attic-0.5.3.ebuild b/dev-ruby/attic/attic-0.5.3.ebuild
index 915fe665ba3a..1cea8c1443c0 100644
--- a/dev-ruby/attic/attic-0.5.3.ebuild
+++ b/dev-ruby/attic/attic-0.5.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/attic/attic-0.5.3.ebuild,v 1.1 2013/12/25 07:07:28 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/attic/attic-0.5.3.ebuild,v 1.2 2014/04/24 17:36:36 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
 
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="A place for Ruby objects to hide instance variables"
 HOMEPAGE="http://solutious.com/"
@@ -28,16 +28,6 @@ IUSE="test"
 
 ruby_add_bdepend "test? (  dev-ruby/tryouts:2  )"
 
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby18)
-			# Remove tests failing on ruby18 due to string/symbol
-			# differences: https://github.com/delano/attic/issues/1
-			rm try/01_mixins_tryouts.rb try/30_nometaclass_tryouts.rb || die
-			;;
-	esac
-}
-
 each_ruby_test() {
 	${RUBY} -Ilib -S try || die "tests failed"
 }
diff --git a/dev-ruby/attic/files/attic-0.5.2-fixes.patch b/dev-ruby/attic/files/attic-0.5.2-fixes.patch
deleted file mode 100644
index 22875582c11b..000000000000
--- a/dev-ruby/attic/files/attic-0.5.2-fixes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/try/30_nometaclass_tryouts.rb b/try/30_nometaclass_tryouts.rb
-index 0a07843..94f3ea8 100644
---- a/try/30_nometaclass_tryouts.rb
-+++ b/try/30_nometaclass_tryouts.rb
-@@ -30,13 +30,13 @@ tryouts "Basics" do
-     :any.metaclass?
-   end
-   
--  dream [:@___attic_name]
-+  dream ["@___attic_name"]
-   drill "A Symbol's attic vars appear in all_instance_variables" do
-     Symbol.extend Attic
-     Symbol.attic :name
-     a, b = :symbol1, :symbol2
-     a.name = :roger
--    a.all_instance_variables
-+    a.all_instance_variables.collect { |x| x.to_s }
-   end
-   
-   dream []
diff --git a/dev-ruby/chunky_png/ChangeLog b/dev-ruby/chunky_png/ChangeLog
index dcb953a2673a..a63d1258068d 100644
--- a/dev-ruby/chunky_png/ChangeLog
+++ b/dev-ruby/chunky_png/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/chunky_png
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/chunky_png/ChangeLog,v 1.12 2014/02/11 13:05:54 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/chunky_png/ChangeLog,v 1.13 2014/04/24 17:40:29 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -chunky_png-1.2.9.ebuild,
+  chunky_png-1.3.0.ebuild:
+  Remove ruby18 support. Cleanup old.
 
 *chunky_png-1.3.0 (11 Feb 2014)
 
diff --git a/dev-ruby/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest
index 42ed6d889f7c..1a477c24ea52 100644
--- a/dev-ruby/chunky_png/Manifest
+++ b/dev-ruby/chunky_png/Manifest
@@ -1,6 +1,4 @@
-DIST chunky_png-1.2.9.gem 316416 SHA256 d0102bc377642ee12370eb06109d95022792c619ce66d64ee15e2dd58e066748 SHA512 288b1a911516d83dae69708ac00433a354ade80820ebef594cde20e2d793525ffb0a5ea3155787fb47d73f26ba5d6582883103e410d99388cf20c38a20bb3c06 WHIRLPOOL c897b94e2548597f9334c84e23cfebd09744c34266c83562394fc6dfd56e60c26cb437393bd8b247374400674eae0d61799a53648c4dd7cb2ae0a236ecb13e44
 DIST chunky_png-1.3.0.gem 317952 SHA256 b0d94986b6accf3a8a05f9cdf800fd0dcd3a96569f6207e9eea499000a340436 SHA512 b9cc91c9b8525230179859eb307444358d41a9211d125cd5326071085ffa825885dc339dde811644fd5ea86ff934f93db53097e25465029b4524c005c3afe7c6 WHIRLPOOL 0dd6c1988145908f095748eaf513ffcf3736631f1771671763a20805b6bb29522ae23eb4ccebd6294fe9737c228138beda702ee182ab7cfac30656c8d5657870
-EBUILD chunky_png-1.2.9.ebuild 752 SHA256 1ba0c8dc449ac84f67d11047b762b2b4403a0a33ac90d22b477baba9bd0b4639 SHA512 2d7635934a2e6f5034515adaa56bbfdfc12e30a79bfafba16b40f589a01a5481577516d61736c087a2cce0251a87b4be35d287ae3956752b30e5230f75685cae WHIRLPOOL ac1e50aa7a91cfc7a75cfa6f68ed11f73005610f6b0dfae3149c51f84d20d40c4f42a801d1548c53b41fcdc2e1e9ba381003eee2f59cf22fcbe97747673eb7b3
-EBUILD chunky_png-1.3.0.ebuild 752 SHA256 fbb3b682631b719de5a503d10eb0f56bccc98fecf33481268d23da45fe7ce084 SHA512 5c0225ebd1d9884f05aaa3f76d9586341d78ae4f342235313d87f7199dbdb360f69e3cf0ce59917f04433c178a56098a4fb87e19ef1d1e12bee96ba8233365b6 WHIRLPOOL 60f210758ff750c2f3ded277e3835056ebc2e180388b500077ad996eebc5404de81a05d89badbd8f6ce560f2d9bdffcfa5e20984c475054286f3e5919c9145cf
-MISC ChangeLog 1830 SHA256 17bda371c88c3ab07ea9d2b494ca408502f63b4f0b69fbeaaddae66ba2d172e2 SHA512 e49565c6faf817528f509e6c83a4c477c16712c3d3b2781976205113f7b3c790aab87fe7f19dffe4deff3e354986d078b94cc4c0494a914f8d70396475993f4a WHIRLPOOL 1f50fa3fd11409eea4c8491ed16b1763b99a0980541e87f0b508b6ebb7b7bdd50ecbfce04e0825dcd1315b994b231d2e301c3af9303766e0f9a1643fb6c9b819
+EBUILD chunky_png-1.3.0.ebuild 745 SHA256 a83f49b5893c533d3899e0d9c91f9c35837c49cf646b147291a48cddb027a48a SHA512 b6d3388b1e589ca03195e68a81c9968b4274fceb0bd85cbf5f9f1b52ed4974c68dba86aa65f5a0952e62af7dcd2d31d5f7bbd153f054a406dcd5aa683de07331 WHIRLPOOL 8efab10bbdda6a35078859838261ad2d6e969d7e625bfe6d1f9af8827eb9538fd2931c6adb2dcc2429258257ad902b187e1c10b5a4f967d4ec2a3ac7e2faea45
+MISC ChangeLog 1970 SHA256 d172e4d1409e94345e043bfed60737a71bd9ab9ad5e64b05ef8727a822490825 SHA512 85817bbaf2755a8130274042b5e1625c7d417a49aed468fe70282baaf5801e86aa4f6a0464c3eb11512a42957c87ca8d7369abd2a545789434c53047d7d26d4e WHIRLPOOL 3b76038e977c2de342c967632852e6f47c89cdf756039eb1f01e5a27d8fba3bfe344cbd71859496a90590de4aed240f8f03104ce1fe7d026a0eae4d6e4204b75
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/chunky_png/chunky_png-1.2.9.ebuild b/dev-ruby/chunky_png/chunky_png-1.2.9.ebuild
deleted file mode 100644
index f4b6c77d12bb..000000000000
--- a/dev-ruby/chunky_png/chunky_png-1.2.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/chunky_png/chunky_png-1.2.9.ebuild,v 1.1 2013/10/19 05:54:00 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKS.rdoc README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby library that can read and write PNG images"
-HOMEPAGE="http://wiki.github.com/wvanbergen/chunky_png"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
-	rm Gemfile* || die
-}
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.0.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.0.ebuild
index b434bde95beb..c9c8b0132a85 100644
--- a/dev-ruby/chunky_png/chunky_png-1.3.0.ebuild
+++ b/dev-ruby/chunky_png/chunky_png-1.3.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/chunky_png/chunky_png-1.3.0.ebuild,v 1.1 2014/02/11 13:05:54 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/chunky_png/chunky_png-1.3.0.ebuild,v 1.2 2014/04/24 17:40:29 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/database_cleaner/ChangeLog b/dev-ruby/database_cleaner/ChangeLog
index 63fb0e3b842c..d045905bff8d 100644
--- a/dev-ruby/database_cleaner/ChangeLog
+++ b/dev-ruby/database_cleaner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/database_cleaner
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/database_cleaner/ChangeLog,v 1.4 2013/10/11 05:41:44 graaff Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/database_cleaner/ChangeLog,v 1.5 2014/04/24 16:57:50 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org>
+  -database_cleaner-1.1.1-r1.ebuild, -database_cleaner-1.1.1.ebuild,
+  database_cleaner-1.1.1-r2.ebuild, database_cleaner-1.2.0.ebuild:
+  Remove ruby18 support. Cleanup old.
 
 *database_cleaner-1.2.0 (11 Oct 2013)
 
diff --git a/dev-ruby/database_cleaner/Manifest b/dev-ruby/database_cleaner/Manifest
index 56d724202000..c019d56ddcbe 100644
--- a/dev-ruby/database_cleaner/Manifest
+++ b/dev-ruby/database_cleaner/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST database_cleaner-1.1.1.gem 43008 SHA256 cd26e88625aafcecb3f984032798318b100bc8de5bc844235ac33e88bd2034af SHA512 0cc021c8610f56cc76b111b02491c3bd9949042cc5746a43cc377a11041ed667fbdb58e019dcf47d69f5b6c9e4d59f1a22a9fe1ebc93c3c2d96fee6b8b693ff8 WHIRLPOOL e9f5fe32e279153821c215577029d9d3073e2deacca4e1fa2bba12a26207bbd7210559be5ee082d7304525c88dde7c0ddb5179663dffc9ba991d02ab5528fdeb
 DIST database_cleaner-1.2.0.gem 43520 SHA256 6c40cbfbfda67a5975f99cac4c1afbdec5560acca3ea4b0a455d7c994faad04e SHA512 dd06a21bce355878b0ea562b2f1019caa9a763b78a474a943b22715bc65493c0931a294e7c64ef857145674bd3925afbc14092abdf5dac00a0113d7d9dc5dbb8 WHIRLPOOL fd599afdaffb8ab131931dabb32ef3041c26a965a23e3cdee7be10c46456a973e0aefba8073806320f6cc1f2308e489e2dac4ae36d84c2f7856e3f8ba03f9c1b
-EBUILD database_cleaner-1.1.1-r1.ebuild 528 SHA256 13187b2a09b935db260caf6c0cc2e7e4e40bb37898b53ac127342c4402e950c5 SHA512 541f7114f51f5593fd8db8d05d982f9b73ace7e5c8bae255695627e51900c57575dea40bc7dd8674d24f915463b2063f3ef04419529bbde0841f47aaf07f5a88 WHIRLPOOL 2ed72d3921455b23d534c5fe282b034f28918d22f77251354e73df0cffaef5c3e4a2730dba58e6668c6c2925d26679d39522e47801d74add989d95313e88c2b0
-EBUILD database_cleaner-1.1.1-r2.ebuild 689 SHA256 d6ecaf7bc148f819b93ff4dde44534fd972bbeddafc5cb29ee2d667aa08e3bbd SHA512 8c63483dc48144ef2b317a709deee4e6050d5b612badbff385d169c74ecc6108f206b467c12e7197d169ec618fcedb732b99c3a52d2018f3f40fc08a6408184e WHIRLPOOL c176262cb04a2a74db86cb2ace48f740414d84ed79843e724978837e2e3c637754a78fc15717f78e4d6e7ac9ddf44f904dfd357eafd3fffa5815d117d7ea8252
-EBUILD database_cleaner-1.1.1.ebuild 513 SHA256 9c7ae250a8336f554d12eaee06da42c7f65b01785823d3cb165e97928b36a195 SHA512 72e18c68cf2a3317438de4d37bd608c04c3675f5fe5e8480c35288ff0bd212203407ccd9250f6c5c877972db2b9600aa8674daf5a1d15bc3f102328d83a8bf0c WHIRLPOOL 31c810485b39792cdf3de7f0041ea2cfe6974da619db46e5e7658389918f73e39930694b39c05aaa726582538e48cd488f3d0353e815fc9839005502f55d2e6f
-EBUILD database_cleaner-1.2.0.ebuild 693 SHA256 a73b09dda755ffdb50136652c21d011a170ea5f52143a7f793708fe7394bd170 SHA512 020de612e98def4e44c915e154a1d77d9f8925ab4abc8ca781ee2892881c33015a42bd9db87e903c18b0e511eeb092806a357cc7d09957fe31b3ce664e63e55b WHIRLPOOL 13e6b1126695bb2b7d66e3f1f8acaddd795b87d7e9a1a0ce3d50273b97eaa8f074d4811ffc7b9bb95724dd31d3475466dc048e69b044f43bd047bcbe3fdb343a
-MISC ChangeLog 1004 SHA256 de1f044da65110098e9b622915c93fbafb13525b12fb4a5e71c22fa80f1b4414 SHA512 26e0bfc142f35279707482a8116a9083a7e6547b937d92fb2b61c16ff60f7013a886c2ca0dba312549746ff783ceace8b2a0f2d3cbeba5fda8f283e13eaa0b90 WHIRLPOOL 81185ee9592816baa5dd4aafd6f476caf05be584689ad39a749af1ec7299313b1ea0a6e12ef1aecf636d44d7ff4e5d80e22ca54035d8536cd28352c5f5f76e6d
+EBUILD database_cleaner-1.1.1-r2.ebuild 681 SHA256 a7b0859fdf94ac952d7d1b9d49fb41c97b518470b24ba073cf0f4a4473b6d991 SHA512 9e8e01d5af3781b0b2e62abb8c3683ede755874e6ff5e2a75e13c61011861c53e81c91355244edc6efaf8070a31884cc91fabcf279782bd6ec66893530c9578d WHIRLPOOL 5db6d588dc6f22796f88a86af767886fe148ae94298fab637152899b45608d0fe34015a24b8f8077124be3a69902ebd2780d67c7dee3cef8328646987d65175d
+EBUILD database_cleaner-1.2.0.ebuild 685 SHA256 0a2b4348d524e8fad30b9236f0be0324579acbb28d48536e5398021756955d29 SHA512 3068a688bbe28c5a9833c5291e31bfc2d899a2e18cd28b3c6d4d53b07115df732dfc3cdfad8f45859cbfbfcf8cf212e105d0c2d41fddd9a51f7c783108cb153a WHIRLPOOL bf8fe7cb9cf4b229dbd62264915b28739e2be0b4ceeb48dc00fe008b016e3e8bf72a57dba8a50a7bc33a296395d74a180b19e00ed3d3ec601dee7ac207dfb49b
+MISC ChangeLog 1226 SHA256 19258aa99eabcb89616b93b93350e8ee27dcdebd52d76b451a1919ba2523142b SHA512 f02efc9266a4f245e15db0e192dae472afe7d51f12c477752423790dfaf3943dfe1da22eb49375514b225d288c45baf8d62c8e9667398b8440c79423e9a17a51 WHIRLPOOL fdc65708938e96204b953cd542427b37ace2d55a1901cc5c4bdc12f6d10b01fecb381ea1735595ee062ade71d43040fde532c253060e4c1e6c6b804787ae5611
 MISC metadata.xml 293 SHA256 edb76006b32226470cd842cbf6e78aea61f52effe00fb3347929004f8f0494a6 SHA512 3bc2eb3f2945c9cd932dea1e6706108adbda33aac370938575a7b452ae119a02fcf7e30e0081ee658028a37ae24f87ddba31f05b6b8f91753ca70316699896e8 WHIRLPOOL 6feb329b785af95522d4d089e34b5457137c20a592b37fd7dc6bca625ffe88ad743e58f1e60b51de195d7d122b9efe948dd424ce1d172d669afebc8ad2b2e09b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlJXj5kACgkQiIP6VqMIqNc9KQD/dkzDB+EonW3EpJPyEkNc5OXr
-QeSbTI4cWWO+6ODSEJcA/RN/uhCQ/i3a9JSifLSphvxJlNMhUnweF1vxRhMs+XKe
-=+wLO
------END PGP SIGNATURE-----
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.1.1-r1.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.1.1-r1.ebuild
deleted file mode 100644
index e1c55b3cb9aa..000000000000
--- a/dev-ruby/database_cleaner/database_cleaner-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/database_cleaner/database_cleaner-1.1.1-r1.ebuild,v 1.1 2013/08/23 21:53:14 zerochaos Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC="examples"
-
-RUBY_FAKEGEM_RECIPE_TEST="prep"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Strategies for cleaning databases"
-HOMEPAGE="http://github.com/bmabey/database_cleaner"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.1.1-r2.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.1.1-r2.ebuild
index c69542d7ab9f..620cc9f8e263 100644
--- a/dev-ruby/database_cleaner/database_cleaner-1.1.1-r2.ebuild
+++ b/dev-ruby/database_cleaner/database_cleaner-1.1.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/database_cleaner/database_cleaner-1.1.1-r2.ebuild,v 1.1 2013/09/01 12:10:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/database_cleaner/database_cleaner-1.1.1-r2.ebuild,v 1.2 2014/04/24 16:57:50 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_DOC="examples"
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.1.1.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.1.1.ebuild
deleted file mode 100644
index 8227c893695b..000000000000
--- a/dev-ruby/database_cleaner/database_cleaner-1.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/database_cleaner/database_cleaner-1.1.1.ebuild,v 1.1 2013/08/20 03:58:12 zerochaos Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Strategies for cleaning databases"
-HOMEPAGE="http://github.com/bmabey/database_cleaner"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.2.0.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.2.0.ebuild
index b569e367bcea..c0054474a677 100644
--- a/dev-ruby/database_cleaner/database_cleaner-1.2.0.ebuild
+++ b/dev-ruby/database_cleaner/database_cleaner-1.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/database_cleaner/database_cleaner-1.2.0.ebuild,v 1.1 2013/10/11 05:41:44 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/database_cleaner/database_cleaner-1.2.0.ebuild,v 1.2 2014/04/24 16:57:50 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_DOC="examples"
diff --git a/dev-ruby/directory_watcher/ChangeLog b/dev-ruby/directory_watcher/ChangeLog
index 5c1d1e9eb858..93e3a513e195 100644
--- a/dev-ruby/directory_watcher/ChangeLog
+++ b/dev-ruby/directory_watcher/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/directory_watcher
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/directory_watcher/ChangeLog,v 1.1 2013/08/20 00:16:39 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/directory_watcher/ChangeLog,v 1.2 2014/04/24 17:39:29 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> directory_watcher-1.4.1.ebuild:
+  Remove ruby18 support.
 
 *directory_watcher-1.4.1 (20 Aug 2013)
 
diff --git a/dev-ruby/directory_watcher/Manifest b/dev-ruby/directory_watcher/Manifest
index ae7050f9e0e9..36db686b41d1 100644
--- a/dev-ruby/directory_watcher/Manifest
+++ b/dev-ruby/directory_watcher/Manifest
@@ -1,4 +1,4 @@
 DIST directory_watcher-1.4.1.gem 15360 SHA256 c0d054e52b31357bb0d601a8fc3b47c9e940cfce7749093d8664d50065a326fb SHA512 1d4fe83caa5ae0c20899dda7d5fca7454262d560f3679edb3d252ef353e3677d83b6bec19104c589ff1f19fcf7e65a9cb4518567b5f21b67daa39bf41cf9d211 WHIRLPOOL c2e39bbcfc4e230fd590dd7c129e28b323a70cf88b51098d24104f8b1545a1203976d89911473579fbc9d5f27d9ae278c89485067187de57effed6e9f4a6ff46
-EBUILD directory_watcher-1.4.1.ebuild 593 SHA256 c3176b7314c0ad1db21dbfd88172286367c12351d271257484522a15b9ae72f4 SHA512 1d1103355a774ec6797b79ac3d074d07a70ba08b4e36ed130b3e1667e8e8854c5ffdfbc425034407f9c83d4995154cb3926556077f4fae9d54397d962d472d01 WHIRLPOOL 1139ab77fbd2cc30c7495697a67617cb77e26873b098c7014371184d8dedd84ffee8edf149a89b78c47ad2ec24c2b84989b95a4acc26730b0e96d178339969fd
-MISC ChangeLog 380 SHA256 fcd3be1235db89f101a85cf83064d26f4a2025f8a3c1ab2ecac8602898d57734 SHA512 0f585e5bfa6df83d1d2c4ad58a8366583bfd38fa9ebc08dec835496aba49d3ec3d1ab2e353ba6bee29911244a16452abe62659f1f080589b6e6ec44333bf7e96 WHIRLPOOL 01a076c69fa450a4eeb0ab385dafa4077ef1d9a472b17ebae918250146a09f3847ae02e563dee68418ad19e52945adf6612e2ddf64f2609dc5c715fe5ebcdbdf
+EBUILD directory_watcher-1.4.1.ebuild 586 SHA256 fb79b8047522c4a7554b1b3e3039d7d4f6e78068e21570e76cf62c16f5485a22 SHA512 4da0dec4a45d0d8501466a5def15fee44fe61998cf534e8dc2debe40bf1ea0e28e33f6ea0f50999f920ba9ff22b884d952a1b9d607a9d95e245ac6c189b3690e WHIRLPOOL 8bd4c3417c4e2d9298eb7934635d60232b48637842c86ee44da649d5f1494bbc1bd5b548f51a74456eff8a247479452f81ffd5267ec11852e462daeaea0c9fdd
+MISC ChangeLog 486 SHA256 83ef501ce21b04ff4a449f06f9a4430ae458efaec26e225aa16a0f59828d1a14 SHA512 c95e6e0dcaffaae1a07f87c52181a0324020ff4ceae828d7279c2d9a0d375d6ede895ce6f06ead3dfa030ddd260530e7313e0db15e7fc18b1ee2452afe57baf9 WHIRLPOOL 16dfac85604171e810d66800fc815ab462dfcc97aaa8cdaaf3df99f78a102062865df170a030f035194c5498b779ef66119e366bdd8167a7bd004c54fc51ba2b
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/directory_watcher/directory_watcher-1.4.1.ebuild b/dev-ruby/directory_watcher/directory_watcher-1.4.1.ebuild
index 588863165ac9..5191239b0244 100644
--- a/dev-ruby/directory_watcher/directory_watcher-1.4.1.ebuild
+++ b/dev-ruby/directory_watcher/directory_watcher-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/directory_watcher/directory_watcher-1.4.1.ebuild,v 1.1 2013/08/20 00:16:39 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/directory_watcher/directory_watcher-1.4.1.ebuild,v 1.2 2014/04/24 17:39:29 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/fakefs/ChangeLog b/dev-ruby/fakefs/ChangeLog
index 582a4c0cbaf9..2b59ed72ffcd 100644
--- a/dev-ruby/fakefs/ChangeLog
+++ b/dev-ruby/fakefs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/fakefs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/ChangeLog,v 1.46 2014/03/24 06:22:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/ChangeLog,v 1.47 2014/04/24 16:55:54 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -fakefs-0.4.3-r1.ebuild,
+  -fakefs-0.5.0.ebuild, -fakefs-0.5.1.ebuild, fakefs-0.4.2.ebuild,
+  fakefs-0.5.2.ebuild:
+  Remove ruby18 support. Cleanup old.
 
 *fakefs-0.5.2 (24 Mar 2014)
 
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index 4090b43c7770..27dbdccd01c8 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,22 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST fakefs-0.4.2.gem 34304 SHA256 f8cec34ebfc8b756c2174884abe5e97659b0b2ad41395c82f4b0b56292445e34 SHA512 57634e38ee5e5e7b73569405f61dbc5d83036091020bd043cb1d0eb64dc012a3a7a63d6c4111e31c7b4256746c448b707500c51fd4d2512a04d5ad45faf7c7e0 WHIRLPOOL 3b737ea892ea5ea171d4fcb237eb85c57ff2bd627050304571109bb4b73369583abee3a5b0d9da82553fc9da37a1158bcd6714f92ee3c462c8e665afe949437b
-DIST fakefs-0.4.3.gem 36352 SHA256 f306b068c9c5e527d48e163ffe340d2fb091eaef5b21919b179d7defff0b68ee SHA512 e275c7b5785de4e4772ec7eed0895b1e4cbae8a2db6df72324e8dc9a05332f4f532f3d2648cd060667ca8955db95cdb54991a686e48510c1192ef6d01a16f74c WHIRLPOOL fa7435f64bec2290e674e457c912810bde992531774f25fe3f45f8176800bcfa260b48cff0d2322d37ca2640f399c26b0eedf8f6366713a70baeecee97952d94
-DIST fakefs-0.5.0.gem 38912 SHA256 e6d9bb1f81d3087d9d23ba72bd18b7811bea0bb6aaad5beb6445ce0dd745c661 SHA512 d8cc0f004474465f3101ec55bf0c567386c0eb30ce315ae734fe71fbb092727f863aeee0281199244338d2284722749fd8774a3f81d29983c40fcbc596da17da WHIRLPOOL 96fe4217886acd7e03090ae6c08820404767877e4ea873e225228b8cf78584c30a531b109ca92dab96e10d1d479d050f42937a6417c38ff56bbe5d62da56e7c0
-DIST fakefs-0.5.1.gem 39424 SHA256 36c12e7858d6d76cfdf15356c9fdcba2902cc632aa4c6486c664c00a6296fb3b SHA512 4962d1d41380cfaf7d31c222dea1ffcd97992a41f276289c98f153c184636d8535a4e5ab8f1efb5a9befd7bb780b9824d6393992fad2454429fd956b23da02d1 WHIRLPOOL f233ed54f6349228cc925120115eaf832a79902413c1f3e72e682662465fb721bcf2b06a58b1a4589b6693e975632f5fdff2444d3632c2afff77001ba19186fd
 DIST fakefs-0.5.2.gem 39424 SHA256 6489c27f526f72549d3d38604a8963f5b8dec9b1c5741f6f9280a54644dfd743 SHA512 128daf8b22be418d7c8aa9d825f294742c28d3d793ea610318aab00a2332579f0195a6cf62ae97815858b36a970ea3e5fb51e0d0f3e4d1ea5eddece3bfb04837 WHIRLPOOL 57138cc1fa375103f453d861b3eff37b89a4a67095c383591f84f8f1e97baaf730866b23efcb31426d177d0bfa3a393b870c843473337e6896e72b3ef46dc60a
-EBUILD fakefs-0.4.2.ebuild 1138 SHA256 672738e31dd64c9c4ad1d147b1c1a83f0e87b91b200125e786fb5f0a3f1d0a11 SHA512 f1db930e359f37b2f1d9549ca71d948c493ed5baaa892deed8ab9f4137b54790aca169d22de9807956fb917685156c95e2f8d9c89c18236cacff949c41908a9f WHIRLPOOL 0bca54a324ce419aa2e4140c9f9f8d2f5ad3b8d92858677bf6a4e2cb942666078b03d5473c311a6acaeba1ef9a2d178e4378b35f3b80b20a5d9fdf3bb7e2752f
-EBUILD fakefs-0.4.3-r1.ebuild 1155 SHA256 5e3f48dacc0698c0e8ba1141006b3ca1d73a5bf7b6b4ad32e5a4b0cfa2554f03 SHA512 0856e58277c953a9797bc4a1263ea096b7b5803b9c3063c193a061e05f39dad745996e81cb53e97a3060648c57864f518b3757aef2ff4a12e51fd6c9f8844cb4 WHIRLPOOL 1a4104e952b7237a85e679ad464366ee0a8e5b80fb6048749d9f7b4454d710caf66c4baf90c223eb0c483a6e584245c3a842d84e36d5ae8cc378f0906db4764f
-EBUILD fakefs-0.5.0.ebuild 1152 SHA256 0d69b77ef25459103e32660489977f1783120ce350a339c5ec4e278366d0be72 SHA512 33a449e05c065f3a3b5172b9fdca2c8d702945d8ea5e311ad4edd18ef9a53970a66702d9be55ae359b1a5c6be2c412741d02da49ae410e63226caa448568c91b WHIRLPOOL c50aa349455e410adb31329ab7506232b1854afca9307274322ab9e20b04c750fa12abb8b479b9d1fae2c4fc4f3d951a29660d7348be83d515862299ce69d77d
-EBUILD fakefs-0.5.1.ebuild 1152 SHA256 ad4d689af4fc2ba76ed300a79b619aa7995c193cc639e428e0a25d8278ff0818 SHA512 c152f2315ef65b3b94229d470928513aff4a4a64a5d9c83607364e98f4742ffe3c4fd5a735fda9a82f34888b85bf718335f3c6ba14f91d7b207653d77242d45a WHIRLPOOL b6a8436adf5e9d3fb28344a62935d115a6f721cba53cba2df336546a0d89397f234bc0c683c338b2236013039323ba1cc9b742ad783850822be07f6d3bf4226c
-EBUILD fakefs-0.5.2.ebuild 1153 SHA256 19b3829f2547551b6ce8619ef5cb5b60ef4ce55c65c7572cadbf67972eff3f7f SHA512 fdfd2145dd4ee1908381b8f5765f934bc1c047d1b74a7adfe333ca24a09eee7f16be147f860779a4df88f8678fcb0c9ac711969969dcf678dfd0cac69ee745ff WHIRLPOOL 6076f1bbaf73ce1ba15476939b37d61e355211ba4d0b3bc6f9fbbae3085f0e587bc2a458067acd73e55d4c91c525975a43f1192934454cf8be3b7ef94db6d7bf
-MISC ChangeLog 6045 SHA256 98d9ed4a16be9dbb32e635dca8c90e56395249969f063932f19f7b8f108d5661 SHA512 31de697249e438b92ac9dc2970151f807d551fdd0ac7f5e2a0be8015bb5bf3790d4ecbd1cb76711a915a0ca5d9f226ee406bf502448eed330e0a63292416f115 WHIRLPOOL 51c517d5c13b535730e5c60788ffad137a0c6a58275a7742227424cc0a047a4a41c48321555235d2e60d0d500ddd0452fda8d5d149c4817ddedd6448bd3a416c
+EBUILD fakefs-0.4.2.ebuild 1130 SHA256 09963bd7c810b3229da2ec79576b62bbb36d0694ca2edd2f2d9376cf4920464d SHA512 a4db1ece68f79e5ee9624eb1aa047237ea107a6ae324748775c50525417ff8c2663d96522dd3341b76e8be9f3449b3be18c256a5f3e53cfda31bd7a604ecc0f4 WHIRLPOOL c9cf3c0ad0cf58b5de58ce8b1498c15f74fd09ea4a333576704ac9bb68bf6e6dffcceec0bd14a15ce8d570543a4ae6c0712e3d6c2aa6424d1df1c9c623108540
+EBUILD fakefs-0.5.2.ebuild 1145 SHA256 2952bd29d2cb7134cf819d10a511a22cb367c09e77f8b57f3488dbab0a229d30 SHA512 b0e53ed285b84c7b6bd8f14c9b5bd34d460e8153f3b3924cd3b37da26bdfd1131f6f868f0b97dcb4f905e303d9946ed847373b00825c87eda3884a3b0ad331a3 WHIRLPOOL 6e7472c4d43ee033bd3857139f89d2f31dbf166398564dda75ff89e348139489f20614f09171140dc6f56f1b27d76008142a80e421e29d83edc60e12d15bac51
+MISC ChangeLog 6246 SHA256 ec3cbea0c7e8d38276d8d1588682d2ae49107e62a4455c5c51cd946e4491ab9f SHA512 9d5c2281a30011c0491ca0fb242e7a260d4c070d4314c2c5db0fb3b2b680d19a3d6f92da9eb4d6b1a6be644d1c10297f566ec1ac389e0fa34ac14b35fcb3ef20 WHIRLPOOL 71436857ea48492165a44aba284dff66264caa431fab7c8e245210f47d581fffe2786bb65e8ef2580af997e78e488ce105106a004625923e1251e44ad2fbd076
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlMvz0oACgkQiIP6VqMIqNeongD8DmCCCnLVMVXEK2j+OL+AWN34
-2RzPy65wiOxAoInRCPwA+wXLW3g3uaKZh9XZT6LgAdmZh1SiuApz2gtMwXM/p5b+
-=ZlMr
------END PGP SIGNATURE-----
diff --git a/dev-ruby/fakefs/fakefs-0.4.2.ebuild b/dev-ruby/fakefs/fakefs-0.4.2.ebuild
index 0abd616d1c4d..f6602bb306ff 100644
--- a/dev-ruby/fakefs/fakefs-0.4.2.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.4.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/fakefs-0.4.2.ebuild,v 1.12 2013/12/26 14:57:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/fakefs-0.4.2.ebuild,v 1.13 2014/04/24 16:55:54 mrueg Exp $
 
 EAPI=4
 
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 jruby"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/fakefs/fakefs-0.4.3-r1.ebuild b/dev-ruby/fakefs/fakefs-0.4.3-r1.ebuild
deleted file mode 100644
index 739087c70886..000000000000
--- a/dev-ruby/fakefs/fakefs-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/fakefs-0.4.3-r1.ebuild,v 1.1 2013/10/06 12:07:31 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# requires sdoc
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.markdown"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fake filesystem. Use it in your tests."
-HOMEPAGE="http://github.com/defunkt/fakefs"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:2
-		>=dev-ruby/test-unit-2.5.1-r1
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*jruby)
-			# Ignore failing tests: upstream is aware and doing the same
-			# on Travis.
-			rm test/fakefs_test.rb test/file/stat_test.rb || die
-			;;
-		*)
-			;;
-	esac
-}
-
-each_ruby_test() {
-	ruby-ng_rspec
-	ruby-ng_testrb-2 -Ilib:test test/**/*_test.rb
-}
diff --git a/dev-ruby/fakefs/fakefs-0.5.0.ebuild b/dev-ruby/fakefs/fakefs-0.5.0.ebuild
deleted file mode 100644
index be21b91ebe26..000000000000
--- a/dev-ruby/fakefs/fakefs-0.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/fakefs-0.5.0.ebuild,v 1.1 2014/01/13 02:54:17 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# requires sdoc
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.markdown"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fake filesystem. Use it in your tests."
-HOMEPAGE="http://github.com/defunkt/fakefs"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:2
-		>=dev-ruby/test-unit-2.5.1-r1
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*jruby)
-			# Ignore failing tests: upstream is aware and doing the same
-			# on Travis.
-			rm test/fakefs_test.rb test/file/stat_test.rb || die
-			;;
-		*)
-			;;
-	esac
-}
-
-each_ruby_test() {
-	ruby-ng_rspec
-	ruby-ng_testrb-2 -Ilib:test test/**/*_test.rb
-}
diff --git a/dev-ruby/fakefs/fakefs-0.5.1.ebuild b/dev-ruby/fakefs/fakefs-0.5.1.ebuild
deleted file mode 100644
index b7ce54d5d7ea..000000000000
--- a/dev-ruby/fakefs/fakefs-0.5.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/fakefs-0.5.1.ebuild,v 1.1 2014/03/05 22:39:15 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# requires sdoc
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.markdown"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fake filesystem. Use it in your tests."
-HOMEPAGE="http://github.com/defunkt/fakefs"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:2
-		>=dev-ruby/test-unit-2.5.1-r1
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*jruby)
-			# Ignore failing tests: upstream is aware and doing the same
-			# on Travis.
-			rm test/fakefs_test.rb test/file/stat_test.rb || die
-			;;
-		*)
-			;;
-	esac
-}
-
-each_ruby_test() {
-	ruby-ng_rspec
-	ruby-ng_testrb-2 -Ilib:test test/**/*_test.rb
-}
diff --git a/dev-ruby/fakefs/fakefs-0.5.2.ebuild b/dev-ruby/fakefs/fakefs-0.5.2.ebuild
index e87f586d9a9e..0f2c319ef1b9 100644
--- a/dev-ruby/fakefs/fakefs-0.5.2.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.5.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/fakefs-0.5.2.ebuild,v 1.1 2014/03/24 06:22:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/fakefs-0.5.2.ebuild,v 1.2 2014/04/24 16:55:54 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/gherkin/ChangeLog b/dev-ruby/gherkin/ChangeLog
index 4f5e43c67aec..2e746ab6615f 100644
--- a/dev-ruby/gherkin/ChangeLog
+++ b/dev-ruby/gherkin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/gherkin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.61 2014/02/01 05:01:29 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.62 2014/04/24 17:35:33 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -gherkin-2.12.0.ebuild,
+  gherkin-2.11.6.ebuild, gherkin-2.12.0-r1.ebuild:
+  Remove ruby18 support. Cleanup old.
 
   01 Feb 2014; Akinori Hattori <hattya@gentoo.org> gherkin-2.11.6.ebuild:
   ia64 stable wrt bug #493780
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
index 02c5fce2e5aa..53e84a7e64e7 100644
--- a/dev-ruby/gherkin/Manifest
+++ b/dev-ruby/gherkin/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gherkin-2.3.10-no-werror.patch 861 SHA256 f430e369b9e5d2e740c040d7fa5410e7351b135722a8c6f18eaa695ac73017c4 SHA512 da63b941df9de14dede17a5da9951713710cade20341342fedafe11e9d0f571e29d6140d90cdf46851476125f4570e47692ad976c25385b71d9de8a1610d1339 WHIRLPOOL 758b3453db642e72a869ecb673d2d9147efe4a14283c03e62e0f39397e90a8c7fbc0439cc8b8d59673ff4a7abf963e4b8049b2c2454b633a88e6c37faf754ea8
 DIST gherkin-2.11.6-git.tgz 603165 SHA256 a52b0f1909aea52ea5644e0bf91008538d20d46e41a5a940b56b7e8066824a1e SHA512 92409f948d39fe4038016706fb5b8580ed9aeffac2b4b03dceb2759923010c33f4bc51b3dbb31a5108e2892c52276ceb0c3e14b3e6826193d4624c8b72c0845f WHIRLPOOL d1c7d13e4601fe345e13a04dc10eb2b7679f65eb99ed022cbeaa2479d9cbd8b91e1344f15c9c34ada3dcd4777870435663e433906175ef9654ea26d08522e0b1
 DIST gherkin-2.12.0-git.tgz 605964 SHA256 09206d66e437bfa2cb917a251899e3e95479c47d713a2b8de3e7dcbdd9982bfa SHA512 e86c2299bb3b41845bf8a3119b65ff855023510173b04c1e08e1105c03523e0e89ec45db4c7034e85fc20b7a9e1ce5a791aaf3f4793d44c0aa782ffd9fcee83a WHIRLPOOL dcfc5b5a0dcad7e401c2e0afb41e53593d095a44e97df8eadffa634b155ccb5a979f3e719e57c32d18afac0be49d31021276abc20010a6a9259ca041c155a390
-EBUILD gherkin-2.11.6.ebuild 2378 SHA256 77b79f7e75bb53b33420a07edb2e2c5d442ea8b657b292da657cad547761c1a8 SHA512 3660cadc9cdab0324465960e8bd6cde320f0b6d5ce1c88c22f0028d76caacd3baa19099b4b4d48f7e0c6ad03cc029f9f11f03c31df80fdba2b6cf2ced9ebe6bb WHIRLPOOL 1debfe7719854460cbe349b439cd330d1039b1c43ef1390a2445fd24eb848dd584bd421d2dcb0058c932247c6684f5b0e8fdbb50bec0d52d32fe79bfac30f75e
-EBUILD gherkin-2.12.0-r1.ebuild 2661 SHA256 5b7d7b0cf7fd21e3f483362cbea65b261db6c3871a514ca5ebc0b3043a99f928 SHA512 dd041dabfdafd2ce8973fc895babe6e01c731c803ae1d912754294640e47db5b63dda0fcdcf5db764aaa095d5ec4fb0bf2de11d33b439ba801d12a127a33a62b WHIRLPOOL dc1848bd4371c78d19e5992c9a93e8d45ee010dead609ac83c113360a0f507c84b236c3e1de6b79aaef45faa903fc97534fc02d257548ebeda6226d0d16a5733
-EBUILD gherkin-2.12.0.ebuild 2462 SHA256 249ded2c9f7296fe402d05129677a1bf517681cc48ed6f7d951e0c6d4e2ddb76 SHA512 77e16085959b1379182b01bf0c024638ca8d1901616b3cc6457f5d6a2c012fd50d0802486e3498563156d6fae9e47693cbac76a33c87def033f666f983f7674e WHIRLPOOL 37d7bf036238a6553adbf9fad8b3563504c88d7a3002cf07863d08fac94eca6af19415da0b116acedea76e51e02bbdb40dd26032a8378f21b7571503905cede9
-MISC ChangeLog 8326 SHA256 c560b35a75fc22cc834e3775a8d469ac904eaca43bf44282743b1591dc40338c SHA512 3b562111d521c1acd1364171d65f9584e8ea75c4a041c28ecd58ff581be113a9d773e8a8e285fade25a530d95ee0c5f2a32fb4d420d24c42dc674bc98201e8e0 WHIRLPOOL 23b7e11b1c3e223d31ef51bec7dec27cc1a1049bbf1dd142da6016c4450c615d63978781d5d04cd759ab3244dd3f54dfda24e7827c8d4fdfff0ac9625427bb2c
+EBUILD gherkin-2.11.6.ebuild 2371 SHA256 ac042dbcc6ece028bac21da7031ed8e9fed254701353b5dc44fd6900149cc3f6 SHA512 763a4dc5a0c4c0c1a76f94401c504849f7bcced8d5686597a89236589fc8a15034e4c23922894c3a54054851c5f44cec33d9f0547a5779fce253c1bb93ecd2a7 WHIRLPOOL 74032d70f26cc7ff410d06fef9ed638984e139874cde493f783f9eef25afb066348adff78a86c49d4fa4db2ba11be2c629e766d6409f6964b50078242d07e5af
+EBUILD gherkin-2.12.0-r1.ebuild 2653 SHA256 10974475e8131ce98111573a4d5372c80c6c80fa85ab66c7e6d4c6c35a9a6ae8 SHA512 177ed42b1e0bccc34b3d2192f53bb371f03ea26958cf3fd7134de91d42f2539fb8113a533cf16429a541f623042ccda3e604b3a466d223e1f022dcd78d653fd9 WHIRLPOOL f03e776f252f1db203b67cb6a4dc75e2dfc3bcef41bb09c19eb076b67f289a4390127e1e3487539703c0258f5b40abb24051c8c58fb1131f92fc3cb923c8b43f
+MISC ChangeLog 8487 SHA256 9fc4d9318e036f9c38d8ba11e94d225ac415ff345bf659c0aa7d3bdb9760e184 SHA512 011b70a7e71b6a2bf803c47e92967660ceec71a9c6f857c47056ce922321f17672da914ac056d628f62de82345fa71368cf4c582c0d774403dcf8930bc858614 WHIRLPOOL 05ac282470c99aec39d4890b3d3202a9ab7a1bc1d0d01068e700768ef18bd574ce7c71c095a106afffb679c8cfd8e415fb035f85262013741841c6c6ce1bbae4
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlLsf6wACgkQL46suuyRem0w5gCeP73D0xkF9kevQO1iD6oZtggl
-jRAAnjIeMU9d3B/bzHYi/YJyiIvKMzIb
-=rQ7S
------END PGP SIGNATURE-----
diff --git a/dev-ruby/gherkin/gherkin-2.11.6.ebuild b/dev-ruby/gherkin/gherkin-2.11.6.ebuild
index db7f2ea512ee..14e2f400a194 100644
--- a/dev-ruby/gherkin/gherkin-2.11.6.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.11.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.11.6.ebuild,v 1.9 2014/02/01 05:01:29 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.11.6.ebuild,v 1.10 2014/04/24 17:35:33 mrueg Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild b/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild
index aae8258c3f03..053d0d68ff92 100644
--- a/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild,v 1.2 2014/02/01 00:39:47 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild,v 1.3 2014/04/24 17:35:33 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/gherkin/gherkin-2.12.0.ebuild b/dev-ruby/gherkin/gherkin-2.12.0.ebuild
deleted file mode 100644
index 1015586963d7..000000000000
--- a/dev-ruby/gherkin/gherkin-2.12.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.12.0.ebuild,v 1.4 2014/02/01 00:39:47 hattya Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast Gherkin lexer and parser based on Ragel."
-HOMEPAGE="https://github.com/cucumber/gherkin"
-LICENSE="MIT"
-SRC_URI="https://github.com/cucumber/gherkin/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE="doc test"
-
-DEPEND="${DEPEND} dev-util/ragel"
-RDEPEND="${RDEPEND}"
-
-ruby_add_bdepend "
-	dev-ruby/rake-compiler
-	test? (
-		>=dev-ruby/builder-2.1.2
-		>=dev-util/cucumber-1.1.3
-		>=dev-ruby/rspec-2.6.0
-		>=dev-ruby/term-ansicolor-1.0.5
-	)
-	doc? ( >=dev-ruby/yard-0.8.3 )"
-
-ruby_add_rdepend ">=dev-ruby/multi_json-1.3"
-
-all_ruby_prepare() {
-	# Remove Bundler-related things.
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb features/support/env.rb || die
-	rm Gemfile || die
-
-	# Don't use compile dependencies to avoid building again for specs.
-	sed -i -e '/:compile/d' Rakefile
-
-	# Avoid hardcoded optimization levels.
-	sed -ie -e 's/-O0//' tasks/compile.rake || die
-
-	# Remove feature that depends on direct access to the cucumber
-	# source. We could probably set this up by downloading the source
-	# and unpacking it, but skipping this now in the interest of time.
-	rm features/pretty_formatter.feature || die
-
-	# We need to remove these tasks during bootstrapping since it tries
-	# to load cucumber already but we can be sure it isn't installed
-	# yet. Also remove other rake tasks for which we may not yet have
-	# dependencies.
-	if ! use test ; then
-		rm tasks/cucumber.rake tasks/rspec.rake || die "Unable to remove rake tasks."
-	fi
-
-	# Avoid dependency on yard if USE=-doc
-	if ! use doc ; then
-		rm tasks/apidoc.rake || die
-	fi
-
-	# Avoid implicit dependency on git
-	sed -i -e 's/git ls-files/echo/' gherkin.gemspec || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		yard || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -I lib -S rake -rrake/clean -f tasks/compile.rake compile || die
-}
-
-each_ruby_test() {
-	${RUBY} -I lib -S rake spec || die "Specs failed"
-	CUCUMBER_HOME="${HOME}" RUBYLIB=lib ${RUBY} -S cucumber features || die "Cucumber features failed"
-}
diff --git a/dev-ruby/gibbler/ChangeLog b/dev-ruby/gibbler/ChangeLog
index 1e8f6e379eac..38c4dcfe9fa2 100644
--- a/dev-ruby/gibbler/ChangeLog
+++ b/dev-ruby/gibbler/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/gibbler
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gibbler/ChangeLog,v 1.20 2013/11/03 13:29:02 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gibbler/ChangeLog,v 1.21 2014/04/24 17:33:26 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> gibbler-0.9.0.ebuild:
+  Remove ruby18 support.
 
   03 Nov 2013; Manuel Rüger <mrueg@gentoo.org> -gibbler-0.8.10.ebuild:
   Cleanup old.
diff --git a/dev-ruby/gibbler/Manifest b/dev-ruby/gibbler/Manifest
index 7bb55f9567df..5270fa20b512 100644
--- a/dev-ruby/gibbler/Manifest
+++ b/dev-ruby/gibbler/Manifest
@@ -1,4 +1,4 @@
 DIST gibbler-git-0.9.0.tgz 21258 SHA256 975cf27052cea5245d9f897153b48551d53c0ae5d2e35dfcdecff620e3fe7508 SHA512 8837009d2d72b5d2a73ee2b468d288d740be3005d928e5f3b04182a619aeed138514a7f959abde971dca5b88f49f3960efc8b5b368395675c5d7d9904ebc5327 WHIRLPOOL 81b3c7d9c5f5a88272702895471a88d9d4c2713853a278ed2d3eb186a5d0bac06fb0970983886a834461e88ac92476a393698b28e5e8ec198767eff773e70bb8
-EBUILD gibbler-0.9.0.ebuild 848 SHA256 a365d798d99e68b997e974538024fb11d284907b133b40bcd4d1e35c8a6eb53d SHA512 eb5cc4003bfad25017c5f5da297a4010566cc3933bfe5c942483ecf76c450d2a77520badec01fce92f7569142c101d1fe0236a49d514338e248af8a8800f9e9b WHIRLPOOL 179110375ad65ff18755c633d7bcb96a358fd2eb5033b24e46cc8033df5a6f10f8a13153b05ba342bd523261adef9caf9bd093db94df9e4e886e045ed38ffd96
-MISC ChangeLog 2976 SHA256 d131db920601e09918d6c274414ab2f4eb71238f380a51ad74fd2f084cf343a9 SHA512 fde2779d583c0354972d089455beaa974f0fbb0720427197d967d3d8282b08d671aa5ab22c47775569278a71da304c300045355376deecb7d7cb6432b0f767cf WHIRLPOOL 246ecc025fcc2d96b1110220fc84d6e33a50e67c34f8d1109c8fcccf4ed57a47c5bf7128892761c0014d3c4571e6a5533dce262459abadd6a3dac3660e3f946d
+EBUILD gibbler-0.9.0.ebuild 840 SHA256 b7106a1a5c5a432ed79b43a306e36cd7b37f2b4ab694b072d3a799eda55cd171 SHA512 6f231a412f28df4baebf6faaf2efde6ac697b79fe65c2eb25912435b66f0ec05847b21c71284afe3694225f9c094a710af98cb8e72b775db275f01e9b70bd39a WHIRLPOOL 68dc6515e932fba43f897bd63272127ab622b5da5215bdec056de63594660407ac8e81740ca9f9eda382f7aca91272cd9853e98fc75e85342a653fe1c8b0f71b
+MISC ChangeLog 3072 SHA256 2c0456c1cdba3618c8b7f15883af02a85cc6d94324be42cad42ea26d80466f6f SHA512 4f4d170dd2105a0f7a88c5501a1775822723119693a5ee97441ee466f7c3d2e8fe82505c1bce35513d53d950402f1e11961a399e67c1ae92d7154755a806e9d0 WHIRLPOOL cc7aee317774fe323590604e56000fe07290fc8ddf1f683a6e76c243d66a14778f15c7d896d13d4002cdf81bcf746e3926f39a88f382bc11bce23a9ff29a1e2a
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/gibbler/gibbler-0.9.0.ebuild b/dev-ruby/gibbler/gibbler-0.9.0.ebuild
index a1084d3f92ff..e1ef07edf09b 100644
--- a/dev-ruby/gibbler/gibbler-0.9.0.ebuild
+++ b/dev-ruby/gibbler/gibbler-0.9.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gibbler/gibbler-0.9.0.ebuild,v 1.1 2013/03/09 07:03:44 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gibbler/gibbler-0.9.0.ebuild,v 1.2 2014/04/24 17:33:26 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/hexoid/ChangeLog b/dev-ruby/hexoid/ChangeLog
index e07baab44a84..1fe409970a79 100644
--- a/dev-ruby/hexoid/ChangeLog
+++ b/dev-ruby/hexoid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/hexoid
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hexoid/ChangeLog,v 1.5 2014/04/05 23:36:50 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hexoid/ChangeLog,v 1.6 2014/04/24 16:41:26 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> hexoid-0.2.2.ebuild:
+  EAPI bump.
 
   05 Apr 2014; Manuel Rüger <mrueg@gentoo.org> hexoid-0.2.2.ebuild:
   Remove ree18 and ruby18 target.
diff --git a/dev-ruby/hexoid/Manifest b/dev-ruby/hexoid/Manifest
index 455b582024f4..3510c88a25fd 100644
--- a/dev-ruby/hexoid/Manifest
+++ b/dev-ruby/hexoid/Manifest
@@ -1,4 +1,4 @@
 DIST hexoid-0.2.2.gem 6144 SHA256 5b8a9b41b8e6b306c7d2a1a6cea68963dd55042480b5e45f9eae2c081f1a5016 SHA512 bea0334e628a4b5f74c69cb2532c0d116a136a1e6fb4c9f9795661ce1baf37a88589041aea534d92d1a96b909451b7c3bb8739914b85212cf3852753177a92d0 WHIRLPOOL 0b13151095e95be2e2113b59cecc959ec15afb05334d3192b68b731b145e6779e579dd531752889fd559fd66089d8e214b854099f24114516e6d8fd7bc44d3e1
-EBUILD hexoid-0.2.2.ebuild 876 SHA256 54be539a8761bdb50bfe18b3d337f0c3fe85b3238eeaef77843c48376e8a88aa SHA512 1e6c1890c96b4a51bf6a84cd743283c1b75970f2434860500b89c188678520903a4eb6837b93dcf067a09394a6134704e13b28f3367c6f4619e33e541fc85236 WHIRLPOOL 30e65377867c83737304aa8aa165f8cdd343b34f374b1f0d968e979158c4f6adb0697a381bdca143082824270c4083bda048103b1b9325e3af0d02009d4c444e
-MISC ChangeLog 798 SHA256 58b8dc097e30e78bd9697f6cb9759bc6e92694d334d560cbef93cf70a4e07905 SHA512 81342187dc66dfeacbf03bcf6988e49101064afcef94dcd53618c9ec7fb093e8c46f37e00b3a1733eb282a7abc344e778342e72a9438a88d3fe8a97621d28075 WHIRLPOOL 3a6119c4cc1d4898b330a4e1225b0f131cd0d56fd9792892119320231c2f4566ac3614d7460f6ae336f8213f6101c45da9bbea21bc1d5b637a3b8517c2374e36
+EBUILD hexoid-0.2.2.ebuild 876 SHA256 9e77d8e7cd95df74714a9c4f5038de279a85f45bc01fb7972086abc41b20794d SHA512 73c1e88e5f5f9924f4d274be9ca504f4f979ba04b2ef974401d6f5e0cd0e8c677f6b7c2cf3462d2d64c2d75bcaef1e85ba4a7d4322b88cb271a56d7dd38d40e7 WHIRLPOOL 6970780cc4f44ce5b92eec06eede4536ade6e7c00e70b23ace7535bafdfb8a4a12653ae277e9ff011123378fff7437533a1ada2f550aad4a265e93747d20a0d4
+MISC ChangeLog 881 SHA256 37f252264627298ab057c728bfe8232f265a5cb376ce284cde9a6260c6be16c5 SHA512 a223517b93a261be6cbfac551af11bf8f4d236dceea1b5ce2828fe10874d62390735f4c3ae31a0b0ea02e35761e92c0a319c2bb99bfa1382e4288bb343e9810f WHIRLPOOL 8db7aeec342800585568c945692d9d52288a221f7a8a4ac6e7f316445ba166cfb909b7999b0bc59b642e3b679ca243cfdc1af27ec8881d6bf91ed64ee82c34b7
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/hexoid/hexoid-0.2.2.ebuild b/dev-ruby/hexoid/hexoid-0.2.2.ebuild
index 74cc198f866a..01fc9db46569 100644
--- a/dev-ruby/hexoid/hexoid-0.2.2.ebuild
+++ b/dev-ruby/hexoid/hexoid-0.2.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hexoid/hexoid-0.2.2.ebuild,v 1.5 2014/04/05 23:36:50 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hexoid/hexoid-0.2.2.ebuild,v 1.6 2014/04/24 16:41:26 mrueg Exp $
 
-EAPI=2
+EAPI=5
 
 # None of the three actually has working tests, but they should all work
 USE_RUBY="ruby19 jruby"
diff --git a/dev-ruby/jwt/ChangeLog b/dev-ruby/jwt/ChangeLog
index 946e36351136..ad556ceaf358 100644
--- a/dev-ruby/jwt/ChangeLog
+++ b/dev-ruby/jwt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/jwt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jwt/ChangeLog,v 1.7 2014/01/18 07:17:06 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jwt/ChangeLog,v 1.8 2014/04/24 17:39:12 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -jwt-0.1.10.ebuild,
+  -jwt-0.1.8-r1.ebuild, jwt-0.1.11.ebuild:
+  Remove ruby18 support. Cleanup old.
 
 *jwt-0.1.11 (18 Jan 2014)
 
diff --git a/dev-ruby/jwt/Manifest b/dev-ruby/jwt/Manifest
index 3d646c007f6c..d06466e235c8 100644
--- a/dev-ruby/jwt/Manifest
+++ b/dev-ruby/jwt/Manifest
@@ -1,8 +1,4 @@
-DIST jwt-0.1.10.gem 7680 SHA256 6205ac4c97ae0fe371c1140b9e7157574f302c6c7f43c7bce8ab11aeed380aed SHA512 b93411f7083637c0a0db4b5c81d5d953fd4d084a91da4ff8123c2cc03c9454a91f486111a242cc18a1ea1dee1ec75f7eaffac99fbf55dcf70776910f2e08ca89 WHIRLPOOL d59ad2700cc3d3224fd2869b6d92c39d2fb05f8005b025b24461d52e81f95eeabc8c67ecd78b6dabd6c38ce028facc709a2fb10128875734b8cee65eadb1ac87
 DIST jwt-0.1.11.gem 7680 SHA256 9178d3b7af11d54ffdec12ee7cf438946be1da72b28bc58464bad750d4b5fdbd SHA512 409273642bf3d04b7b3a3242c0d7d5aaffe2dee147e86e94ca3acebe45783590f6fee65fe792723ede3f4e3af337b3047e565969091211d5ec9f1ae82b888c5d WHIRLPOOL 663c7e34161f748cba38f85461b397f7210c6b69a25a878bf69b1bf796d45a48fd7d1fe6710e37b6c3512f28e9c76baa845aa975c93243a17de250db2547e661
-DIST jwt-0.1.8.gem 7168 SHA256 b8efe8386c028561b07616753955c5d1a94c2861fbc3075257193bc9aff4f3a9 SHA512 bbc639d3e4a76ff9ae562c8ea0b4660323168aa8c911a44b8d9d972954dce79dd6c02c33b2096c689c4a9536a3a8a6211fcc4a3af0e69c56346c094c11867ddc WHIRLPOOL f66d7fe6767f5eb33df1d66c5a98c17b678a04cf699e4ba041dd1b09ac86d159711f08036634716ab5abce7d5581034da6b4ec84e560b9dbeb3817a0c211c52f
-EBUILD jwt-0.1.10.ebuild 599 SHA256 ba548e15293352faf09e942aa1b8c0b05e25d8182761c425276c9ddb565aba18 SHA512 f9f08eb3e32f90d8852e2c80a4a5d61b16328f0cf75f0d826df43f707bc458a001f2f147d78e176470e80e92c426d3a59c33770751e93742b6c4bda14e270438 WHIRLPOOL 98e04849db272192d5d9538e87dabf5ca84c9bcea24743b60e8e5666ac9c9d566a45c19ef24daf30c90a737aa5455f8ac95dfa3fe5a2752f52f8bbdba15ea921
-EBUILD jwt-0.1.11.ebuild 599 SHA256 6b5507e87f5f4ca524c2527e764180a926604ffd7aaa52b730d12ad44c60322b SHA512 09ce791b00a83d16c959a5403a48bb6102c0cd66e6fa83673b775a12c7da32ea6b643c9ea839fcb2aab0e208c1a1e295f95a142c55633115d97c836d3de743c1 WHIRLPOOL 43a20ed2a49ad9b4b8c6d49edde49af5ba0ba3f1261ae345fd8a9d8ef2b77b0be3c9318c99873da473e443b3ff0abd1be4fc6132e09b4a9052d1c9c85ed5c3a9
-EBUILD jwt-0.1.8-r1.ebuild 601 SHA256 06ff9c70ae4b3c6cdeff4eb9fe6a55cc9eef3f3dac2bf0ab5c0ab96cb070228a SHA512 6bf88849346d0886d0cb923ed1fe509b2966b0a93096095be24d0de4e0fa0a9bfd2b71a2a2a9748e37f89377fe70b38c152cb96af4500a43bcf34a505e197292 WHIRLPOOL a8e8eb56bdadc8b23a5a4e21f38d5c2d7d1a8264e4152fe4dfc676ec11c1f872d574f015e6162032cbfdb9f927caf9131a3bb48d42aca7009c3cf68731318b12
-MISC ChangeLog 1019 SHA256 e9e92e638f5b9ea2c6375fe2490b8015eee849d96fa51d913187be34b4249cf1 SHA512 53effadd106eca456a5d3ffc03874d67efab77cb572d5db3ee1195c811d1ae5bf84acfcb9abf70c081212d1ebd980a7b3a719a3491b9d1d2fcad852d22bb7e50 WHIRLPOOL 19d6c60b7d58918d74117644dcab55097051bd593b8d9889f5f1cfc261ba76c0640f08f5c6c2ede21b066ef0ddcfd5fb326d0c64b8e25223e8bb3384d8151e8e
+EBUILD jwt-0.1.11.ebuild 591 SHA256 4893ca815909845232d2b621b6e2d0a399a89c97619bb167c9c61fc981596bf3 SHA512 643e7804d5854d1ff9117a320e433b369fbcb8758499de32a0c263cbc8cf29a1e11091b291c51950f8f6cb42045ff1f1d950246aad8f136f4307d675bd10771f WHIRLPOOL 0d08e313183ac81069c2ce3b1bcc4572e4bd435ebbf2a47d1ddce97ded4eaef98bafed5e5d92ab324fc16a5fa8fddd092b5a6ff4e023b7bfb36b482554689c85
+MISC ChangeLog 1169 SHA256 8921e1ced10fdca427b37d9b6d567655cb5c57a2e6d36a1006b97fba9824bda9 SHA512 f6df8893d44750c51a53fa281ba2ce771b8b72c68455cf4d14a3dc3f0914a2395b8f1eaf03b5dccfdf2b786288a0a6b6de384348d8fc39b870d1735b6afb7bcb WHIRLPOOL 8ba579b921f59950b3b31f9b281fec972606b422ce36d950af992f04bb195aa8b060da06f5ede6c2fe25f8f791c976663847a624c4d8fac454f70b301a87d614
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/jwt/jwt-0.1.10.ebuild b/dev-ruby/jwt/jwt-0.1.10.ebuild
deleted file mode 100644
index 354a93937fd3..000000000000
--- a/dev-ruby/jwt/jwt-0.1.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jwt/jwt-0.1.10.ebuild,v 1.1 2014/01/13 03:39:34 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06."
-HOMEPAGE="https://github.com/progrium/ruby-jwt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/echoe )"
-ruby_add_rdepend ">=dev-ruby/multi_json-1.5.1"
diff --git a/dev-ruby/jwt/jwt-0.1.11.ebuild b/dev-ruby/jwt/jwt-0.1.11.ebuild
index 619262506692..83b3239280c9 100644
--- a/dev-ruby/jwt/jwt-0.1.11.ebuild
+++ b/dev-ruby/jwt/jwt-0.1.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jwt/jwt-0.1.11.ebuild,v 1.1 2014/01/18 07:17:06 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jwt/jwt-0.1.11.ebuild,v 1.2 2014/04/24 17:39:12 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_DOC=""
 
 inherit ruby-fakegem
 
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06."
+DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
 HOMEPAGE="https://github.com/progrium/ruby-jwt"
 
 LICENSE="MIT"
diff --git a/dev-ruby/jwt/jwt-0.1.8-r1.ebuild b/dev-ruby/jwt/jwt-0.1.8-r1.ebuild
deleted file mode 100644
index a65761ad7782..000000000000
--- a/dev-ruby/jwt/jwt-0.1.8-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jwt/jwt-0.1.8-r1.ebuild,v 1.1 2013/11/11 12:49:10 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06."
-HOMEPAGE="https://github.com/progrium/ruby-jwt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/echoe )"
-ruby_add_rdepend ">=dev-ruby/multi_json-1.5.1"
diff --git a/dev-ruby/libxml/ChangeLog b/dev-ruby/libxml/ChangeLog
index 2b270df60d3d..6c816794b84e 100644
--- a/dev-ruby/libxml/ChangeLog
+++ b/dev-ruby/libxml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/libxml
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/ChangeLog,v 1.91 2013/12/27 02:41:44 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/ChangeLog,v 1.92 2014/04/24 16:36:47 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -libxml-2.6.0.ebuild,
+  -libxml-2.7.0.ebuild, libxml-2.4.0.ebuild, libxml-2.7.0-r1.ebuild,
+  libxml-2.7.0-r2.ebuild:
+  Remove ruby18 support. Cleanup old.
 
 *libxml-2.7.0-r2 (27 Dec 2013)
 
diff --git a/dev-ruby/libxml/Manifest b/dev-ruby/libxml/Manifest
index dedabc811da6..f7384f345a5a 100644
--- a/dev-ruby/libxml/Manifest
+++ b/dev-ruby/libxml/Manifest
@@ -1,11 +1,8 @@
 AUX libxml-2.6.0-fix-test.patch 647 SHA256 85663cbec055f88ceeb902c3610e5007ade47c93e711101e018700ab9ee26b1a SHA512 557f731e7018053ec3dc21dcc36c2d33685bad3b3c71b5886796e825dbd7624b849295d0c41daf380dcb74e71739a62ae9671105a1dbb3feeb48f52bea6c318c WHIRLPOOL 04666a5f8665389d87bddebaf0204d15f943517860788caaa12c120db4c9213aae4ddf405531f70447efc5287b0086dea4123d4f9e7c4e96305354e2ce84dce3
 DIST libxml-ruby-2.4.0.gem 260608 SHA256 5dabf6d9859ede50a6ffb0230f7031741037c1d6ac38988e816a90b208c2467f SHA512 870d72b978cf6b09ee932dff424ca8735d106b6b237a0b0ab963f8b14829adb48e4303ceaa6e382b28bb7b510648467d33a53cb40aa56f3e350227856ba18b99 WHIRLPOOL e73dd0e8a30824516de02a279068dd4a26f5c991bf2558aaaf2deb64089b9bf0d7b08758fe52276335898440f21c755091877b2ce9654f147d566dd5b96ffba6
-DIST libxml-ruby-2.6.0.gem 268800 SHA256 9be18419b128e1806723a0fafec4895555dd7bf08ceda16fdd23f4b7f542061e SHA512 a94c4b7543f4657f0def452d04904ef6b4773099b2d24f52de63f8cf6dc498a2fa849e4322d3be5eee1c8bb4ec1a3eeb908327ab08f29d9832bf5c29afa29ace WHIRLPOOL 75e7ac24df897c58fed0ebc0971daed2d63c4e5d641585e005d35ea5289cbfb4ba3cabf68a80d9e6c56930aa00ab9b64ecdff891dac51d63749a12681c4f1f17
 DIST libxml-ruby-2.7.0.gem 269824 SHA256 f1f8a3538a064923d8f718748f8771bf088a154c2967f1b7a0cd82d6cd15a9d8 SHA512 e41383cb0e31257361c0da27623de8be478a5ae82a4f59233238a66ce098ce2a6dab4b639490d0753ccd3ae8c6cf0edc5989c071cd5fe4ea7b2b9a25fd271dfa WHIRLPOOL 0de7efe2b0f16d95f69e830bfd08153f0039ecbdc49b4fd5201b205b57e2202c0defb70469031adc838734ddfb6e47561b431e15103bb643aa28ab3031eb246d
-EBUILD libxml-2.4.0.ebuild 2167 SHA256 89d7ce1a52041695c1857ee4abc34f0d4e3072402006d7ff65fb8dbd7fc9bbd4 SHA512 8fc62eb687dd12ccdf41c85a9c436dbe96f312c3cb50d90ff3544df7ea88b8c7760a88870080cc32357cc9178d6bb8ae86a6a5718554bbb36778a5976606cdb9 WHIRLPOOL b0bde10bd37ae101b9baf5a8cae449372726a31a9edb0a6e18449f2b30cd30e3c590097fed834ebd55ea744c7b3ce2ea031b8e85e9b71503deb75c3f2557df91
-EBUILD libxml-2.6.0.ebuild 2374 SHA256 83dbcfbe8c37d5d01cf208aa250b6dc254d143431de95b4aeae7d380ce7c7d84 SHA512 b27269281de97dbef8f9cec76285867f6fec426f9acd91fb5af292288d41ee1b894f2446a81586097b97a4ab96e00a6a25ac3bdffc2920c3d8a2009b8e09d449 WHIRLPOOL 17b40d54c4ffe63d79e161ee7a698ba7dbc430a37f6b28c9cd247f277095bd71ab53c3ef0be174b865dd81d232cdbc2c2beb0f0b37d85aa7462c132a1f6506d3
-EBUILD libxml-2.7.0-r1.ebuild 2343 SHA256 caf039f1f23599b6e5cbec13729fa99f8232ff0c71253135b36139d5fb76a74a SHA512 e740b4ff92eb20e763e1c95e054dac491fa6bac9d8c422e724d80fb591e9e4a3f8640646c004003485c0d6c42fc0b1da4869e9fc9c7604c104986b828a98f7de WHIRLPOOL 9354f519f24479a15d049bffec7cab94f3a05be5ace37953a547d2cbc232313600b1ca559ad0f4fa8cf9a8dd06faa39df806bce68db5267224c4b45dac9863a2
-EBUILD libxml-2.7.0-r2.ebuild 2356 SHA256 ca08b75de22b232cee7f7848a2389ebbfd833b56832e3da6d42567a5065cbb21 SHA512 130f646dfce369fdce9b22ccf8da7ba508b0126005e9b8ba8fb05de3fab633c5c6a5e94018447250ee96ac9609143a7843987c6a69a57bc8d995729f852df16c WHIRLPOOL 9a0d0a989922c98b4ed04add8f0932f0c65756e3e9d78c881622bc49ed7f5abaa95790dd849438cc3b78361d16d02ebdb967669cf7772b2b2ec38a327b3bba1d
-EBUILD libxml-2.7.0.ebuild 2335 SHA256 eb552ba8254a81f0bbc27d3b5f36b5482a174df6c7406160fa335a146ef2cb24 SHA512 01923011259ad9d6aceb481e692a6a74c34128a78c844d3efe2f3780b5e68f8df17cc687a3baa8d4d34d2d03194a0877e529f4f433f337e303ddffded13664e4 WHIRLPOOL 90813436b70bcb611c67f8f5e946d9b6fb52d3e3cbb5afa3aaddd499d4376d07e542df47a6f7d14d41e51014747c3baad7b30b3393dfa89a6b80b194fe2d5732
-MISC ChangeLog 11926 SHA256 2e4a4c6b69ab22b4326bea9fb29aa8a173dd1cc192bc3088a76b2f38a0732e7f SHA512 35f7030acf384920606df3de7c972332c2032cbec5a582f0c1b7ffbd11d9738c97a37fdd1c3e7b9b085a6c6a4a74329e36005f5bf5b397c92f654d194453734d WHIRLPOOL c37c9b1ce05fb729bdfa798a67cb3a2b9b7304a8856488a372cab591da0a4ea878774e20dcb008f705ac1a2845ec04b7e1d28c40dab42e2e540069d64243ac7f
+EBUILD libxml-2.4.0.ebuild 2162 SHA256 fa66dfaa2e101e83e44849075754854c585e3848a73898598b7ff45c90b05722 SHA512 c8a028014bc26c0abddbeccc72f902badde99f4f83b337c51cfca794965a35081d37586d7b3bbe0b4362328cc899e25ac6221168e7075567781474066c28c168 WHIRLPOOL 13ef1d7dd291322779d177d4e2cfa3c3622f609913ef43bb5ef2360737cd5e6b67ee0db03b1da9348633ffabe4c2dde2b4b559c777c02f4b5e0d5bd287a7645b
+EBUILD libxml-2.7.0-r1.ebuild 2338 SHA256 061185cb3dfd63515ddbe71c730a34ed38df30a1f40e2d91d7a82fda8baee3c3 SHA512 cc2880d7bea3a5d89cf885af92ce8f55d2d07f418dd6622eac0568a12be82a8dd0fc747edff687e95a572199b4c48f31a31e3448a0e8cda7a5b99cc15cdecfe4 WHIRLPOOL 5e45d4ea5c905d58e5fb448d0f89d6d805c9311589b195cffebb0cea2eab130eade4068c9d2b9c1e6f470975c4955ae9560f90415837f8b632ac09710e52039d
+EBUILD libxml-2.7.0-r2.ebuild 2349 SHA256 42e56b68b1c4f6b6ba8f90def289ee6897a150a0e7b3e9ea30de1a45c848f1b0 SHA512 0056ad88a4b2921486d29da6508a5f8bb93faed09393caca3fe19f68842bd1edc85a787fc55d7a104e24527e3c4edeacd30ffdafd817978060284ee13f5bcf06 WHIRLPOOL 2a9abab610de28ae78db8f99c45a7e1b61854fcebd57c6e83282736a6004a36d08e4c9e99c18486ea5430ad7f9e375787bb34e025398106e0184285e74f26588
+MISC ChangeLog 12130 SHA256 ab27b613421309bcbd6b340734a964122564021d513f407364315bc58bb97ea1 SHA512 ae61da1e2c287f9589acadd1fb61b0d87f40793383632314272dd6cbbe94d109a5fa8988932751ce3795df96eba4bec82d49f8e5b404b5bf088e0a48b3214834 WHIRLPOOL 8450876ceb8039df59836361b64276eff9264b9e3c9210c473f8bbe38d81add0017cba72983692b9c8a0249603ac220620c08ad0484d280650bc890362170fb5
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/libxml/libxml-2.4.0.ebuild b/dev-ruby/libxml/libxml-2.4.0.ebuild
index 33eb95ec3e59..7fdb94b81c30 100644
--- a/dev-ruby/libxml/libxml-2.4.0.ebuild
+++ b/dev-ruby/libxml/libxml-2.4.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.4.0.ebuild,v 1.7 2013/04/23 15:05:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.4.0.ebuild,v 1.8 2014/04/24 16:36:47 mrueg Exp $
 
 EAPI=2
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_NAME="libxml-ruby"
 
diff --git a/dev-ruby/libxml/libxml-2.6.0.ebuild b/dev-ruby/libxml/libxml-2.6.0.ebuild
deleted file mode 100644
index 6285bd52da1a..000000000000
--- a/dev-ruby/libxml/libxml-2.6.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.6.0.ebuild,v 1.1 2013/05/09 07:18:00 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_NAME="libxml-ruby"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc HISTORY"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby libxml with a user friendly API, akin to REXML, but feature complete and significantly faster."
-HOMEPAGE="https://github.com/xml4r/libxml-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND} dev-libs/libxml2"
-DEPEND="${DEPEND} dev-libs/libxml2"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-RUBY_PATCHES=( ${P}-fix-test.patch )
-
-all_ruby_prepare() {
-	# Remove grancher tasks only needed for publishing the website
-	sed -i -e '/grancher/d' -e '/Grancher/,$d' Rakefile || die
-
-	# We don't have the hanna template available.
-	sed -i -e 's/hanna/rake/' Rakefile || die
-
-	# Remove rake-compiler bits since we don't use it
-	sed -i -e '/extensiontask/d' -e '/ExtensionTask/,/end/d' -e '/GemPackageTask/,/end/d' Rakefile || die
-
-	# replace ulimit -n output as it does not work with Ruby 1.9
-	sed -i -e 's:`ulimit -n`:"'`ulimit -n`'":' test/tc_parser.rb || die
-
-	# Avoid test failing due to different semantics in libxml 2.8.
-	# https://github.com/xml4r/libxml-ruby/issues/43
-	sed -i -e '/test_invalid_encoding/,/^  end/ s:^:#:' test/tc_reader.rb || die
-
-	# Ignore two test failures on ruby18 for now given that older
-	# versions no longer compile.
-	sed -i -e '/test_schema_type/,/end/ s:^:#:' \
-		-e '/test_schema_element/,/end/ s:^:#:' test/tc_schema.rb || die
-
-	# Remove the pregenerated extconf.h. It should not be included, but
-	# it also confuses our hardlink-based duplication scheme.
-	rm ext/libxml/extconf.h || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/libxml extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/libxml
-	cp ext/libxml/libxml_ruby.so lib/ || die
-}
-
-each_ruby_test() {
-	# The test suite needs to load its files in alphabetical order but
-	# this is not guaranteed. See bug 370501.
-	${RUBY} -Ilib -r ./test/test_helper.rb test/test_suite.rb || die
-}
diff --git a/dev-ruby/libxml/libxml-2.7.0-r1.ebuild b/dev-ruby/libxml/libxml-2.7.0-r1.ebuild
index 8a096728ce67..441b68c4c3ee 100644
--- a/dev-ruby/libxml/libxml-2.7.0-r1.ebuild
+++ b/dev-ruby/libxml/libxml-2.7.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.7.0-r1.ebuild,v 1.5 2013/12/24 16:57:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.7.0-r1.ebuild,v 1.6 2014/04/24 16:36:47 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_NAME="libxml-ruby"
 
diff --git a/dev-ruby/libxml/libxml-2.7.0-r2.ebuild b/dev-ruby/libxml/libxml-2.7.0-r2.ebuild
index c87093367a57..985db07c0240 100644
--- a/dev-ruby/libxml/libxml-2.7.0-r2.ebuild
+++ b/dev-ruby/libxml/libxml-2.7.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.7.0-r2.ebuild,v 1.1 2013/12/27 02:41:44 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.7.0-r2.ebuild,v 1.2 2014/04/24 16:36:47 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_NAME="libxml-ruby"
 
diff --git a/dev-ruby/libxml/libxml-2.7.0.ebuild b/dev-ruby/libxml/libxml-2.7.0.ebuild
deleted file mode 100644
index f8f4ca5e8160..000000000000
--- a/dev-ruby/libxml/libxml-2.7.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.7.0.ebuild,v 1.1 2013/08/08 15:43:48 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_NAME="libxml-ruby"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc HISTORY"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby libxml with a user friendly API, akin to REXML, but feature complete and significantly faster."
-HOMEPAGE="https://github.com/xml4r/libxml-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND} dev-libs/libxml2"
-DEPEND="${DEPEND} dev-libs/libxml2"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	# Remove grancher tasks only needed for publishing the website
-	sed -i -e '/grancher/d' -e '/Grancher/,$d' Rakefile || die
-
-	# We don't have the hanna template available.
-	sed -i -e 's/hanna/rake/' Rakefile || die
-
-	# Remove rake-compiler bits since we don't use it
-	sed -i -e '/extensiontask/d' -e '/ExtensionTask/,/end/d' -e '/GemPackageTask/,/end/d' Rakefile || die
-
-	# replace ulimit -n output as it does not work with Ruby 1.9
-	sed -i -e 's:`ulimit -n`:"'`ulimit -n`'":' test/tc_parser.rb || die
-
-	# Avoid test failing due to different semantics in libxml 2.8.
-	# https://github.com/xml4r/libxml-ruby/issues/43
-	sed -i -e '/test_invalid_encoding/,/^  end/ s:^:#:' test/tc_reader.rb || die
-
-	# Ignore two test failures on ruby18 for now given that older
-	# versions no longer compile.
-	sed -i -e '/test_schema_type/,/end/ s:^:#:' \
-		-e '/test_schema_element/,/end/ s:^:#:' test/tc_schema.rb || die
-
-	# Remove the pregenerated extconf.h. It should not be included, but
-	# it also confuses our hardlink-based duplication scheme.
-	rm ext/libxml/extconf.h || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/libxml extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/libxml
-	cp ext/libxml/libxml_ruby.so lib/ || die
-}
-
-each_ruby_test() {
-	# The test suite needs to load its files in alphabetical order but
-	# this is not guaranteed. See bug 370501.
-	${RUBY} -Ilib -r ./test/test_helper.rb test/test_suite.rb || die
-}
diff --git a/dev-ruby/log4r/ChangeLog b/dev-ruby/log4r/ChangeLog
index e0e1725d7b1f..25710273db29 100644
--- a/dev-ruby/log4r/ChangeLog
+++ b/dev-ruby/log4r/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/log4r
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/log4r/ChangeLog,v 1.42 2014/01/29 01:54:00 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/log4r/ChangeLog,v 1.43 2014/04/24 17:38:28 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> log4r-1.1.10-r1.ebuild,
+  log4r-1.1.10.ebuild:
+  Remove ruby18 support.
 
 *log4r-1.1.10-r1 (29 Jan 2014)
 
diff --git a/dev-ruby/log4r/Manifest b/dev-ruby/log4r/Manifest
index c9bd2f02f3b9..c5e7c47696f5 100644
--- a/dev-ruby/log4r/Manifest
+++ b/dev-ruby/log4r/Manifest
@@ -1,5 +1,5 @@
 DIST log4r-1.1.10.gem 118272 SHA256 9b452928c964b7c54c09aeb25ff045b5a722b387b16c9ce37cb1baec00062966 SHA512 a3a9e6c9ef5b388106afc4d402455ec480729cb58054794e6ff6c963b4d819776bf5b57ef5ab7499ddc9a6b3c10f299a133f3f5986d94ee0a438b64ede5bc143 WHIRLPOOL b0e2b7d9bc39efe2cf5f6f5999983882f3edfe4160b1ad9fa1452d2fa115d145efc3ac49ceeb243e5f4eee1adc61096c0ab3cf00802b6e1ee9aba570ba4882b1
-EBUILD log4r-1.1.10-r1.ebuild 772 SHA256 9e893c07952f2038220a014f59fc5c060dbde9e026ef086839dd923647dee9e7 SHA512 c64fb0b76d8f4d6dfc7da2105bc184d0fdc5581f797d177f7b4d2b162b09e3b8406b8a129a6eb78ce786016937d22119e61400f603878e202006dbb980fb70d0 WHIRLPOOL 8b54e25d5d3e8f2df15a42e5e07363982daf506a247b84fef1e8a6bd01a29aa6aec1fb83121195f725335607bfd85a5186614d4326c6b603af9d08535b36d42a
-EBUILD log4r-1.1.10.ebuild 762 SHA256 0fe67f306d31a3c7734c9bfe86ef0011f1d8abc972ba839afb35cda65daf2981 SHA512 850a92aa2b3ffd4c2a847282908fd484dc61a7fb707943630bfec048dca046241cfd102dc566efd9a0e099fece0d01739334f7216baa173b0b987fa6c7b21fdc WHIRLPOOL 00181603fd5e4595a30ddf781cabacc98a675ff5d4151e4f7c24579f258223512ed8ca06581517e47e38f5899146154b463502e43842d0f0cf51b5e2d3f9d505
-MISC ChangeLog 4706 SHA256 ed564332a8a1e97c4d81a906349adcbf6f64fc7b661e905cf9d19813d6f6291c SHA512 c8afe562633fcf9e3700891645bbe09274cd1132826e9e56ffe4360d69a3f91e15c60a29a76a0612591fc0e584425dcf33f37019fb163368b05d3ae3aa61bfe8 WHIRLPOOL 53793305d33e93eefaf9bbcc4f6f0861b65c5209a4d22569e3a4d187c3c444da009d08c0f88396d8bcdaafe0b6f129ce89e93e63c4e26f7bdb18c3b5ebc98584
+EBUILD log4r-1.1.10-r1.ebuild 765 SHA256 5a9f75f41fc35aa1104d6e272e8f3b65c2d710c1981d515bd40d654debf3415e SHA512 8736228d173c9f654da59b4cd3943bd7742ad4a257a9d1de98aa346f91ee2c1d9c464f7b0d4aef7af23758a86d03a87fe152e828487bfba6594ef537a4812281 WHIRLPOOL 7cebcd001e6c9a7aa19a405f6c16fc8fdd56e5ea738316507b7478e0eedb979aad76be37aab4a888891189acc4a519c826f92e67bc4cd771bec9c614a253b467
+EBUILD log4r-1.1.10.ebuild 757 SHA256 9ba3269c084eb8d061fb7b470a4787a0db4964318b77efb86e14640de11c5725 SHA512 a492e27a941261a396429798d9c6f88bf3fbc342c1aa3fd031f26e8b11505153a29db7dddc3bef2b2e715f7b88a5555327c02e1c0da9a7474ac12b9157e6e23c WHIRLPOOL 0c997985367eed329c11a66b8a42b010556e1d93bd4ba448213d3a1884569b3a5f7f15d9e9a88e781d95f974b4655ff1a56702b4a19563d4784e91cf9c1a8603
+MISC ChangeLog 4827 SHA256 b0e9f4d668fbcffc31803deacb9ea4c2060a9faf16616f5e90b4c2828e62e353 SHA512 c8012671b96d359ad9306da6016f3a8f58b14d39267f237429f427c8879568aa231dee7f9d09c3b87c8467a3150083b864303120910a5ebeaafb904681c068dc WHIRLPOOL 46f848f829032a4a1bf33f7439278d978fd2de47bb89c1e64c01c463ee9f03e4a11cfb29f1984b078e88534cf2050c21eee11f5ca7b75e1aaff828e756a9e2e3
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/log4r/log4r-1.1.10-r1.ebuild b/dev-ruby/log4r/log4r-1.1.10-r1.ebuild
index a6c8fc5b4ae2..e73ba8aaa97b 100644
--- a/dev-ruby/log4r/log4r-1.1.10-r1.ebuild
+++ b/dev-ruby/log4r/log4r-1.1.10-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/log4r/log4r-1.1.10-r1.ebuild,v 1.1 2014/01/29 01:54:00 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/log4r/log4r-1.1.10-r1.ebuild,v 1.2 2014/04/24 17:38:28 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/log4r/log4r-1.1.10.ebuild b/dev-ruby/log4r/log4r-1.1.10.ebuild
index 6ef2400b344b..d9477d3e51e5 100644
--- a/dev-ruby/log4r/log4r-1.1.10.ebuild
+++ b/dev-ruby/log4r/log4r-1.1.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/log4r/log4r-1.1.10.ebuild,v 1.15 2014/01/15 12:36:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/log4r/log4r-1.1.10.ebuild,v 1.16 2014/04/24 17:38:28 mrueg Exp $
 
 EAPI="2"
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/mab/ChangeLog b/dev-ruby/mab/ChangeLog
index c1a838c11c82..4f1df49e743b 100644
--- a/dev-ruby/mab/ChangeLog
+++ b/dev-ruby/mab/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/mab
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mab/ChangeLog,v 1.6 2013/12/28 07:08:17 graaff Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mab/ChangeLog,v 1.7 2014/04/24 16:51:29 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> mab-0.0.3.ebuild:
+  Remove ruby18 support.
 
   28 Dec 2013; Hans de Graaff <graaff@gentoo.org> mab-0.0.3.ebuild:
   Fix tests for newer minitest versions. Add ruby20, ruby21.
diff --git a/dev-ruby/mab/Manifest b/dev-ruby/mab/Manifest
index 491b02087822..8a2cdd73576f 100644
--- a/dev-ruby/mab/Manifest
+++ b/dev-ruby/mab/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST mab-0.0.3.gem 25088 SHA256 922c12c105af01c3912466a52320afefafcd2cc9ba419a426c10f44be3ea5655 SHA512 0761a8de59243356981555ac5000cd98a0413f75bd9eb84848f8efd77be1895a44cf3b90f1182193f90c63a256ebe4a179e8f94a992a30f30ccaf4183b8d4c67 WHIRLPOOL bb5ca097c84f003766abfcaff37f8e545fa310129945f0efd79ad3e069898ef3418e62564aad077da2fab98461857c403fb43255a716957ecfde1079a864fadb
-EBUILD mab-0.0.3.ebuild 696 SHA256 bd7ab2ccef54452d63b88ad00d76596e8b390da102f923210ab1870a84086ada SHA512 f46d480df5c94b8f4cfc316489763581ae6933be2a22a4869f2067f38fcaa1c586f0e9f8d47f97b390b186cfeb7f5ac85789ab20960ffa5db898627dfa2dc5dc WHIRLPOOL b765ae31643ac7f3e987dcd366736143f7fae5d97c33a2f2f1d6a033cac08832d3a4982e89a08569b1b0d7fb6e26f83f5175af661717826c40c64a80780b2080
-MISC ChangeLog 946 SHA256 fe856416d3d78c7276449eae65dacead2d48c3306247ca75144a3e3437293f8e SHA512 6e2e7f28578756de0d0b968a7fdc23143a6a760b57717f166d432d3a83e6a3397085e994336356b2f55cdc51c651e1acb4839e38c5f7ad0821334b2379a2ec3f WHIRLPOOL ce306fc2e7d3bb9aad58bd649c4b333508d6b3a8ae0fc7c8eeab24ef3078032d3724746bc9f955a505e46942ba1429bcd209e9ae06c816d5caa152d73c0824f1
+EBUILD mab-0.0.3.ebuild 688 SHA256 1e450442748c192d3f22ea16fbdfc49eda4f2499155183a666fc7531eddacab8 SHA512 265b1c6d33af9587bbc74c3c4872603f4dd11c6001d7ba4f94f2df8483660470926c543f9d5b59302eadfb7d542658a85002399e8c0e423c26801d0477146bbd WHIRLPOOL 216e1ae6e1f7ced66f5b0aab3265f294e0ae5c8c2aac83ad57ce11444c7be7596261bd88f8439e03f7458913ab4b4ecb1b71a142f511aa46289bcfbeb73cb405
+MISC ChangeLog 1037 SHA256 7bf6431ebfbe1721e3bd9f5c0982e1cc3342d622852612c6d26bf3dd5d8b55fc SHA512 e7ef320a63f517a9523f049588dee7007f040387918aea6fffb0e28eea709a24c80ada329dc8be31aeccdaac86c37418e18cfbc078c2a0c3a28d761cee0ef823 WHIRLPOOL 85805bbcc4fac4275b6360c3c1a2f8c58aeaaae6f6ccea4311bb7015cbfb1e9ebbfec181af057f62ebb8a4feeee50612622425cd05ea805ce5eab6a9cb659072
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlK+eOYACgkQiIP6VqMIqNcBGgD9FN/xWmkmIdJVqlkh5e4sZV8k
-6GeDVz8OQ1qE9U7V0BoA/2p1S3eDEEjlLnQ87uCylGEbAI1gWcWfK7u+NW23O5D1
-=3dfG
------END PGP SIGNATURE-----
diff --git a/dev-ruby/mab/mab-0.0.3.ebuild b/dev-ruby/mab/mab-0.0.3.ebuild
index e7b11cc1c23b..39a3db4a9355 100644
--- a/dev-ruby/mab/mab-0.0.3.ebuild
+++ b/dev-ruby/mab/mab-0.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mab/mab-0.0.3.ebuild,v 1.4 2013/12/28 07:08:17 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mab/mab-0.0.3.ebuild,v 1.5 2014/04/24 16:51:29 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/net-dns/ChangeLog b/dev-ruby/net-dns/ChangeLog
index d99c1d39a1a4..9b25b268ddff 100644
--- a/dev-ruby/net-dns/ChangeLog
+++ b/dev-ruby/net-dns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/net-dns
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-dns/ChangeLog,v 1.11 2013/05/09 06:58:03 graaff Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-dns/ChangeLog,v 1.12 2014/04/24 16:54:40 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -net-dns-0.7.1.ebuild,
+  net-dns-0.8.0.ebuild:
+  Remove ruby18 support. Cleanup old.
 
 *net-dns-0.8.0 (09 May 2013)
 
diff --git a/dev-ruby/net-dns/Manifest b/dev-ruby/net-dns/Manifest
index f46ebea79875..ce5e43e91308 100644
--- a/dev-ruby/net-dns/Manifest
+++ b/dev-ruby/net-dns/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST net-dns-0.7.1.gem 57856 SHA256 90f2d9c2de1e15e722e5c8edce646a8473c54a7d46804ec1acc062e58ff976b9 SHA512 bcb34502fe941bcef6b4d4f376f1dbf031ea275996949e027e590483b4a9f7b8fea2dd8524afaa02959192b48cdd8cfb54f24320acc7395b569884c7b36b2d56 WHIRLPOOL 99918354f847ca0bedefc370d148a59c9439ed3f2b91a5429fbba863c291abbeb9f1c7bea7ad57dcba913bc5fa91ac67f389437e196d53dda919431800282a49
 DIST net-dns-0.8.0.gem 50688 SHA256 c92df500b1c704bfbfed608f8b196c6fd50353c9b8eb8bd9bae0f906b7a1ca8a SHA512 734fdfaa487ac551acdc9c790560cd19e84886b12b07b932a94473cfa473cfd3d4fd91ea9679ee0082ae772fe6cef2d09a0b3511b842c0f0e9ba858771df726e WHIRLPOOL c71d9db3a207ac52414bfb7f14c9a5c1871ce17b6e3f9877e3418e5119ce95177acb5a439b9a8d187f346adab2307ac6bfa8edf183a64d80cbd23687ca093c9c
-EBUILD net-dns-0.7.1.ebuild 997 SHA256 bdefae955461d7e525ca6dddc38fbcf90722d1d63b06627f5d32a14b1466fcb8 SHA512 0bba2b8fb35fb3e6cf85ebc4060c840e2f47026f5e9029ecb9f58e230e95c66aeb9ab097594ffc9853f0e2aa120dd325599f1bb445164cd2a6913d0c1236c85f WHIRLPOOL 7505cfc735b62c86234e2385de0cd8a796f92ce902ff74e0742cc7e04726d2383a44847e117b68ba0b60a7e89565f7bbf8d167a0322c9b47b4b885ebb931e9d9
-EBUILD net-dns-0.8.0.ebuild 995 SHA256 97e61492b767b071bacf66a55b9c686a41efbc6b0d38270d28b38280fc0885a5 SHA512 5f28ece93c43cdcd005ace02c84560ef7605f90b5d5b5d54567fbbb7ed65a2281b955e344a6010ef0c90afce739a4098b2bcee3d16e9014118dad4a4e321165c WHIRLPOOL e2ffd91944008d26e9d827a1bb79715df67aadce43dfff836c6374936e7939ee5c88b3eb87228a912561dba7653e895ce499ac7c47dd9b6d76ab48db05b551ad
-MISC ChangeLog 1622 SHA256 d2f16ecb60b01896f4cba64fa797981544a908bd7465706846534be0a5754376 SHA512 31b33e9e615edb525567accb684aee72f0da2fb4a22004a5697158654b67fab4bb5e6cc2876b3d537119d02878eef0d36a02f163224ea5ffbe0e0926a43e0bb1 WHIRLPOOL 038e2e53155d3a76b0dc0f07c15ff340cffef35a3fdc19d86563afb41a9fce9174bc6851687b536d6ebda59c3a8aa3b2dd1303748e187281d84ec446fe628e61
+EBUILD net-dns-0.8.0.ebuild 987 SHA256 eca240603da35ab651e20804427b04269b4f5b3e4da8d2dd652db9ecbeb889e9 SHA512 aba48a49722e19f14be4f72860c89abd50c0b3d1c9bddf90b4d4ccf3022bd38f699eae91e05667edeafc34bd1eeb2baf64d5419ac3b0bef95d8be4a56812900f WHIRLPOOL 7ea96e66ce967c427b3a7467909dcefee3762572842d207b182bc4853eedc0d2ce893da058282dcefa189dc54e5f4816f76737eee4a1af178e6be28e13283cf5
+MISC ChangeLog 1755 SHA256 3f2263699adb5c8a51062594f040134a5e4e58f98548194b2adca4165e7b23f7 SHA512 81ec3790aa338e49203cac6c121d2ed55de2a5f80245dc8558f1b30b1fc235232b5672124ec9e55c67f7c326a607cdb3fa5d1f7e728d7a1d50d4855e959c9a13 WHIRLPOOL b9d400509f4a0a124321a1b5bb6966d46e34fc6710f94caea8f2f9abe96faaed86cd150765963a4a4dddaa3ffa8b80c337e7b05f3627ff4df217e332bfb281d0
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EAREIAAYFAlGLSPwACgkQiIP6VqMIqNc9tgD/XJHr8bRT71YB7vVvsBp5TH/C
-1zrRCuFbjf6IQHCTLj8A/0L7pXPlqR5m3uxgTo4a2hEtk23Kgfj0bsXuTDJjueqh
-=V63a
------END PGP SIGNATURE-----
diff --git a/dev-ruby/net-dns/net-dns-0.7.1.ebuild b/dev-ruby/net-dns/net-dns-0.7.1.ebuild
deleted file mode 100644
index 8c4f82f8a594..000000000000
--- a/dev-ruby/net-dns/net-dns-0.7.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-dns/net-dns-0.7.1.ebuild,v 1.1 2012/10/15 06:40:23 graaff Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="yardoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc THANKS.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="DNS resolver in pure Ruby"
-HOMEPAGE="http://net-dns.rubyforge.org/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile || die
-
-	sed -i -e '/git ls-files/d' Rakefile || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*jruby)
-			# Avoid failing test due to a jruby bug
-			# https://github.com/jruby/jruby/issues/310
-			sed -i -e '67 s:^:#:' test/rr/aaaa_test.rb || die
-			;;
-		*)
-			;;
-	esac
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc demo/* || die
-}
diff --git a/dev-ruby/net-dns/net-dns-0.8.0.ebuild b/dev-ruby/net-dns/net-dns-0.8.0.ebuild
index 38a44f9c2d37..5bbd45d8f961 100644
--- a/dev-ruby/net-dns/net-dns-0.8.0.ebuild
+++ b/dev-ruby/net-dns/net-dns-0.8.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-dns/net-dns-0.8.0.ebuild,v 1.1 2013/05/09 06:58:03 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-dns/net-dns-0.8.0.ebuild,v 1.2 2014/04/24 16:54:40 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 jruby"
 
 RUBY_FAKEGEM_TASK_DOC="yardoc"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/net-http-persistent/ChangeLog b/dev-ruby/net-http-persistent/ChangeLog
index fa6fb5de8f57..51c5367e74ec 100644
--- a/dev-ruby/net-http-persistent/ChangeLog
+++ b/dev-ruby/net-http-persistent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/net-http-persistent
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-http-persistent/ChangeLog,v 1.18 2014/02/13 21:25:19 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-http-persistent/ChangeLog,v 1.19 2014/04/24 16:35:00 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org>
+  -net-http-persistent-2.9.1.ebuild, -net-http-persistent-2.9.3.ebuild,
+  net-http-persistent-2.9.4.ebuild, net-http-persistent-2.9.ebuild:
+  Remove ruby18 support. Cleanup old.
 
 *net-http-persistent-2.9.4 (13 Feb 2014)
 
diff --git a/dev-ruby/net-http-persistent/Manifest b/dev-ruby/net-http-persistent/Manifest
index 843e293c9a31..fd68e4755339 100644
--- a/dev-ruby/net-http-persistent/Manifest
+++ b/dev-ruby/net-http-persistent/Manifest
@@ -1,10 +1,6 @@
-DIST net-http-persistent-2.9.1.gem 31232 SHA256 aa7a50025222cbf5e845e17a2efe65f127f4d53daa4a43f313ad94db204629d3 SHA512 d6737308ee66abcfcf8b1a68c013bb3d5b044932940f38435e0ce25863d6eb9606d177ffce2be05c820d5891433ab9a6074f964aaa05c33a2f3dbb6d07593efa WHIRLPOOL 582505d86485a94015c3ba2e3e40a00c2bca91a0c39b20f9262898a81b267ed207227792d498ddc513ef180631f319cdc0595755cc41a9c2f72eef25b638013c
-DIST net-http-persistent-2.9.3.gem 31232 SHA256 8ec9546d29ec7f49f5cba938622ef213a1d7049f9b469ccfee04322df27fc94d SHA512 a41a027c4b81ff500803234d3e5c3e2854c8450d0e24ca5a79109ffffd08e3d8b5e1a3dc8f27d076a5b0c57524f137805157edf4b3659d1940764d21e53ae124 WHIRLPOOL 3dcde8567c599171f1d7eaa8f1225d58864da01a2131a3317d569ea312f04f0bf464f531b85ab9b76882320d045e7b3eb346c03c96a4fc5b74fe3f2140271a83
 DIST net-http-persistent-2.9.4.gem 31232 SHA256 24274d207ffe66222ef70c78a052c7ea6e66b4ff21e2e8a99e3335d095822ef9 SHA512 9251e8422c2f43e7ecd8bc287fa9fff682fac84ed95d143425b0e7e7678a06c9be01db56e6a956588d6c33ddccbd1eff45a6f399f43d452de8e3134e6c50b74e WHIRLPOOL bd3121d130d4b044d3ed9963202d048fd913ab8e8cdecbdf7c3a23396edc71fcc0bf6aa7a58899908d28838e2ebc92cb6951a38afcbaaa537e0ef3505d7f84b8
 DIST net-http-persistent-2.9.gem 30720 SHA256 8bb9f79996977d437789581b3f018c2412e06738d2f1692502096a57f0b92b4d SHA512 dc8be8dd458f33291cef47afc7f20c42578b145e12c6d2da2dc14da56b18684d24e642e9b49f042fb11c14a1bd3a29450aac28e2fad08b83db8665e50051efa2 WHIRLPOOL 1fe5e2a53a98bc5e0eec0954c4cfa0ae43af4e5736774b27b61e60f1f62d167d65dea28defd7bfb25304b57c9b693834ca999314cc7b0d4f6b8140e9cfd7a9cb
-EBUILD net-http-persistent-2.9.1.ebuild 857 SHA256 b64042ec45754a9b4231b94ace83cf5b14323b560c2fee49356e67fce410bf49 SHA512 ea7a084f34fba8241d05b8b33a9ebf927116c45e093c1b5f93e86eda5f155c0b4896004bdbeb0aa78b1d6f37e8b3a0423ba2495ddbcb2f2feb70e7c42419eaba WHIRLPOOL 2dc8309a2fec4b39e227fec49c7437d56c814a01d933f701606de419a18d173b73a805a5e1a2b53d780ff388f78334ec31889d882b72adeac4a9b69903af5987
-EBUILD net-http-persistent-2.9.3.ebuild 857 SHA256 995c79e79c0369b796f7ea3c1904f6998126b4d8db87e9b68a096380030a7e3e SHA512 aa75490762414aae169654ad6e2df3dbc0387bdbfeb17a87304cdc9051ca6f8504b2c53866ffb153352043fc648c082f20f57dbb90b27d30c3f5dbb6fc213eed WHIRLPOOL 802ebed578b6bb75871e686b843855687fa427189dbf9cf43be7a6c7d8067553315fc9ad43e741f4479e351431a31b3ff9c83bf12ffc539e3bf5ec62de5c8891
-EBUILD net-http-persistent-2.9.4.ebuild 857 SHA256 17d3caf63a37cfe5f6a0373adefbeaf84bce77591e5687e8e7653ad8f3e7d659 SHA512 9664d192c1a67e506f24ecb16e050e500b5e5cbd38d95afda3157cb007031265490fbb09e2e84a89ca462dfd38bf08041f14c9e395e94f22a78db6b1b007493a WHIRLPOOL 1e6d908190da5db6bb169922a7b4e4712d537f54156e64a72e78e0aa4671eafaa2cd2ad21da45b4f1734cd03e408818074e57db1c76d78a18b0462a0c30ef7d6
-EBUILD net-http-persistent-2.9.ebuild 766 SHA256 ce780e1ed7b4422d782db2f1f4dfa3475127f4d5c9387468ac75b13f607e7a0f SHA512 1d65b645ff03fe528688a8a155243855e989e82b94605fabfbe035673e4ffb7b7439ad9e76066866a149b8354a21860e7bbb73963e7eef842522a0d17edb0ead WHIRLPOOL 205da85e8c02fd81b0b9d09a4d9b631bfb362bbc6098fb29c0c9c99116ac1397bcde3023370f85464aeeda0d6c20cfbaf400b4d9b7f847ff84c017455076a683
-MISC ChangeLog 2835 SHA256 50f6951a3890b846c7ffed82cac1989ecb5b8779e54e6de33380dc81a0f945dc SHA512 1e1f63ff24b6272c3639e8472b6ccd7095eb957964c5f4b92e74149e3e3eaa9808d0d6c39d7cc8e1925868a747ac514465795c4dc95a0fa04690973953859fef WHIRLPOOL da6cebd4ff056f930629f18a10fbefc1e83de8536c4eab5a20743f54b4bbcad4fb2417358ca36a6b2ef9e78e59d5be11fadc68e01ca5c6efc50817a25d6e02e5
+EBUILD net-http-persistent-2.9.4.ebuild 850 SHA256 f65a65aff8a998135bc79760c9d9ea2f34fb039b75c7e900a5e9af016f5c4fec SHA512 966021c2134b81c89192946163ff87c5422f3db82999d499cee76ac281b7e362db60f53fb88da9ee9be1a9762b7f9870c8072a5ef457838500ed6924d9a694aa WHIRLPOOL 1d7c07f09a45c6241dcd22f332ef4f6070e4a16228344b886e5f51c0d79af99ff21c3cb3148eca6932372da73524f0cb8128f6df6cb9931ce669b4025e1ba518
+EBUILD net-http-persistent-2.9.ebuild 761 SHA256 47cfbf748d6e27a5e030e40a17e2ebd8e308af752d449465e9e3486ad8f02da1 SHA512 635142111f7a19c46c25cd83705c801fa1cdf30865c72bf52c0b2c65435fb613df782399f307d50832dc242d8a037a87e540affb6474399e2a7ba8ccc942df13 WHIRLPOOL 8f7675580b72d7e8e6756e7c700d4edcef2c727d1c7dc94220c60e18e9bc370e3f45366928d205a466dd6d614566afd2b55a50295960e49eb8f0f3232579bc51
+MISC ChangeLog 3062 SHA256 3eaa456fa613aa73e8349b809e6b46ec289113b5132f5380493cf13974521890 SHA512 31b0a95cec6304e980740f195c578ff8577231633b051b5daf669764cee6437bfa6a81f2b52fdfae6a70ee6f69d90d13c8fd77d17fb2160009ac381e1f5467ba WHIRLPOOL 543a629eeb3b8618e47639768dd7c96a821053d0eab652a20455c60afc044621a0d005d58ae0f71e52919ed2f7ff0f8a56690a3f0bfd7f01cb1cf205f2424392
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-2.9.1.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-2.9.1.ebuild
deleted file mode 100644
index ca245bed6ba0..000000000000
--- a/dev-ruby/net-http-persistent/net-http-persistent-2.9.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-http-persistent/net-http-persistent-2.9.1.ebuild,v 1.1 2014/01/24 09:00:07 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8."
-HOMEPAGE="https://github.com/drbrain/net-http-persistent"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_bdepend "doc? ( dev-ruby/hoe )
-	test? ( dev-ruby/hoe dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# due to hoe
-	sed -i -e "/license/d" Rakefile || die
-}
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-2.9.3.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-2.9.3.ebuild
deleted file mode 100644
index 3cc076fb523c..000000000000
--- a/dev-ruby/net-http-persistent/net-http-persistent-2.9.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-http-persistent/net-http-persistent-2.9.3.ebuild,v 1.1 2014/02/10 23:34:18 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8."
-HOMEPAGE="https://github.com/drbrain/net-http-persistent"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_bdepend "doc? ( dev-ruby/hoe )
-	test? ( dev-ruby/hoe dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# due to hoe
-	sed -i -e "/license/d" Rakefile || die
-}
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-2.9.4.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-2.9.4.ebuild
index 97bb79b7f14f..3966cc3ee211 100644
--- a/dev-ruby/net-http-persistent/net-http-persistent-2.9.4.ebuild
+++ b/dev-ruby/net-http-persistent/net-http-persistent-2.9.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-http-persistent/net-http-persistent-2.9.4.ebuild,v 1.1 2014/02/13 21:25:19 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-http-persistent/net-http-persistent-2.9.4.ebuild,v 1.2 2014/04/24 16:35:00 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-2.9.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-2.9.ebuild
index c7e5785b7307..2ea8d9fcac6b 100644
--- a/dev-ruby/net-http-persistent/net-http-persistent-2.9.ebuild
+++ b/dev-ruby/net-http-persistent/net-http-persistent-2.9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-http-persistent/net-http-persistent-2.9.ebuild,v 1.3 2013/09/15 09:30:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-http-persistent/net-http-persistent-2.9.ebuild,v 1.4 2014/04/24 16:35:00 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/ohai/ChangeLog b/dev-ruby/ohai/ChangeLog
index 0c52a3020b1f..3252cc63409c 100644
--- a/dev-ruby/ohai/ChangeLog
+++ b/dev-ruby/ohai/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ohai
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ChangeLog,v 1.19 2013/09/05 13:35:53 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ChangeLog,v 1.20 2014/04/24 17:37:19 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -ohai-6.16.0.ebuild,
+  ohai-6.18.0.ebuild:
+  Remove ruby18 support. Cleanup old.
 
   05 Sep 2013; Manuel Rüger <mrueg@gentoo.org> -ohai-0.6.12.ebuild,
   -ohai-6.14.0-r1.ebuild:
diff --git a/dev-ruby/ohai/Manifest b/dev-ruby/ohai/Manifest
index 25623ca44068..49af836e18d1 100644
--- a/dev-ruby/ohai/Manifest
+++ b/dev-ruby/ohai/Manifest
@@ -1,6 +1,4 @@
-DIST ohai-6.16.0.tgz 373480 SHA256 fcf2a1fef0d635a12be9826ad74008bce9ba74e7cb87415ba62e62f9c67f36d1 SHA512 1c379e5acf457e1d699148d1e6a355349472de2fb1ecf28af51fef36d4b4b47e75972452032f288010c3d3a92c7f1805923fbbbee715f1a3d4a198aa87f953c3 WHIRLPOOL 91e2dbe86bea382ac981365ec3ea8bb80bc04e0aeec8d66ef1c532df0a0a870c78d1add80dcbe151d02d65a7c7dc9c48981752ad35f72ac853330534bb3ee51e
 DIST ohai-6.18.0.tgz 378870 SHA256 27884e0fdd1efb07077c939030d43c361f64b94784cfb14dc5ad6cc2edf33e09 SHA512 270f84fb69474a1bc2fe5355d1343067af02e0a247fcae27df63e744450d231f517bfd7d576cee00fe6b85afd34bf7dc5ee3c938c2199a98494484d4b92381a5 WHIRLPOOL b8d870308c89b5897fcc803b31294e2bc3503e30063011f2d76ab46b43d8d080cc6ceb0b545e7a890e129f1809380a0abfaf186ea081dd4d3dbbd235c4081a70
-EBUILD ohai-6.16.0.ebuild 1335 SHA256 15355066a5913da9bef0ed2f3c8f3c146d3c80f5df7622d5a866c046d8c66f96 SHA512 99cd9c1b63578c237a823d4c8d1cdf6daa2d6b08a0ed9c516c79bae7987ff27df5bf5215bcbdb9ae24499819dbc3c24a4a939aa28455cdc45650e77da4446f98 WHIRLPOOL 9e9702b8d83b6cc9cc744fdbdba7ec24f04fbe25985296ba969e45530b19d9f71be14e1084e9e14dbb28fbd8838aab702b8b5a2cdea4147ac038e469c614b12c
-EBUILD ohai-6.18.0.ebuild 1334 SHA256 411819d15e537dea4c862a8699d998f128cb16abb4c9d4390b1ef5f635d8f106 SHA512 51fb988eb6900b11294ff94ce03ff032d45309d0b08988ea2a1ec869ce4d6ceb4f49e3bdf73c4e9a2026e1755f99cff30939e74968a0abd32a1e97515d1bb1fc WHIRLPOOL d799c37896c9ec8e27067b04517b924abd775ac151e66ee81a4fd2a870c9e41071cd2ec306ecaa92de237904cbcc4c357f5b93ce8856ea6aede8ab76dcc6c103
-MISC ChangeLog 3301 SHA256 b2c37af4daa4525785f942b56a49fd49dae7ebb47ddebc308b04e8169d72d95f SHA512 94ab64160b22f049ee7a1a8d7ffa4455230dd61879f30873d5b2193a2d71813b8a9b4bac9e7dd5364e4cc317df7fa58570b0eaf4f7ddf6b8083cda88f7f787c1 WHIRLPOOL be7239af944dd2e18bb55c95d542cd55d8ca0044e1ca7940e107427d0e60303c005af32e686ca358b36f09197775024f2f2141213666df95e2b9bb919388acb6
+EBUILD ohai-6.18.0.ebuild 1327 SHA256 8936edfb3a394db9b499c77e37ced08e9d0fd7501f64ebc0ef52ad17ba7e1f7e SHA512 cfaa18443c0dfaabf3a19259fc5c2fa2498110a82a36e236fccb173c2721ae93f4686d9960087ee73d19520b91278f1729ee4e2827225efcbf73b51da72679f6 WHIRLPOOL b6e70b12db64ab4bd9f4681ac999bb08733d06e5ae6e12293584ee7ab413527b584b4f903ff6dc6cc893f6c7a9447482e8240ee81bc9258af393057f41e61561
+MISC ChangeLog 3431 SHA256 62c2ddcc8fdf34586cbfe6cf5bcc26a3f2b079e2c0024ab12d0a37a14b954e6c SHA512 5dc8d7bb1412b69a1bcc25ed0096921e370fca47bac6481e7df4b57ca7a5dbe4779129373ca0915948b260e3e1152431d6edcfd4d59e2ff5e357c8116b61e71c WHIRLPOOL 09259407bcd37d377265783223acd12ba141853ac2bfbb2849cec4655dde2c43decbf1a0b5ac927a669f478dd27b3ddb49b9c48770e0d0b3fb8330d95dd8aa6b
 MISC metadata.xml 158 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032 SHA512 a9ab7b665b00f8a0619ffb3cf5260438a6f47fe997bc9cfbd5410d074b92e473dd1484d79a4afd736f52dc1277af42f6439953c696c35a92c75d94f4eb591baa WHIRLPOOL e8e518ad3cc7f0230aa7a43b82e730310527bd3b22033f13563a7c0630668bb0fa935ce64a3345c84b3fa2623fd14697c2ae0289266ae1fbc97bf032133a4aa6
diff --git a/dev-ruby/ohai/ohai-6.16.0.ebuild b/dev-ruby/ohai/ohai-6.16.0.ebuild
deleted file mode 100644
index 1cc5f8793408..000000000000
--- a/dev-ruby/ohai/ohai-6.16.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ohai-6.16.0.ebuild,v 1.1 2013/07/19 07:01:54 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ohai profiles your system and emits JSON"
-HOMEPAGE="http://wiki.opscode.com/display/chef/Ohai"
-SRC_URI="https://github.com/opscode/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/ipaddress
-	dev-ruby/yajl-ruby
-	dev-ruby/mixlib-cli
-	dev-ruby/mixlib-config
-	dev-ruby/mixlib-log
-	dev-ruby/mixlib-shellout
-	>=dev-ruby/systemu-2.2.0"
-
-all_ruby_prepare() {
-	rm Gemfile .rspec || die
-	# Be more lenient to work with versions of systemu that we have in
-	# the tree.
-	sed -i -e 's/~> 2.2.0/>= 2.2.0/' ohai.gemspec || die
-
-	# Remove the Darwin-specific tests that require additional
-	# dependencies.
-	rm -rf spec/unit/plugins/darwin || die
-
-	# Avoid the ruby plugin tests because these always execute the
-	# system ruby, rather than the current ruby.
-	rm -rf spec/unit/plugins/ruby_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman docs/man/man1/ohai.1
-}
diff --git a/dev-ruby/ohai/ohai-6.18.0.ebuild b/dev-ruby/ohai/ohai-6.18.0.ebuild
index ab4e4187c991..a4d9064eb445 100644
--- a/dev-ruby/ohai/ohai-6.18.0.ebuild
+++ b/dev-ruby/ohai/ohai-6.18.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ohai-6.18.0.ebuild,v 1.1 2013/07/29 02:04:25 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ohai-6.18.0.ebuild,v 1.2 2014/04/24 17:37:19 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
diff --git a/dev-ruby/racc/ChangeLog b/dev-ruby/racc/ChangeLog
index 9de0245400fb..4a3724431e42 100644
--- a/dev-ruby/racc/ChangeLog
+++ b/dev-ruby/racc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/racc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/ChangeLog,v 1.109 2014/04/05 22:00:22 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/ChangeLog,v 1.110 2014/04/24 16:39:32 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> racc-1.4.11.ebuild,
+  racc-1.4.9.ebuild:
+  Remove ruby18 bits.
 
   05 Apr 2014; Manuel Rüger <mrueg@gentoo.org>
   -files/racc-1.4.6-test-unit.patch, -racc-1.4.10.ebuild, -racc-1.4.8.ebuild,
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index beae3133415d..1f5ee2b26cbd 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,6 +1,6 @@
 DIST racc-1.4.11.gem 113664 SHA256 1e2e420d5e2e4b9f2b352e9b2828448a2ee13a16fdebf6a7e863252b5054c840 SHA512 147c3c0ade40ec5544397a9dbf8579514d97145c2cc9f4e16508d41265c1b5cd6fc986c09367792592b5ab6b274e271eb7dded02ea9c398eadafb8addda4ef0c WHIRLPOOL e54b553547bf13816033c103a4de79e7e5bd50bf30b58a7525a059ce0556071f01ee6658ad00febbc024314f322ce114b41864d1833ce8bc282519fe5c868f40
 DIST racc-1.4.9.gem 109056 SHA256 f9d53caeb1ff5ac633a270a45478e585e6e054c44f6da28415f3432caf8f61d5 SHA512 84dfe85c7f0054ee6b2895b7ae3d28bebb51183c023457f8006b13b50a10a74e0f97ab92e3724a5c492dae9cebadb6f9e6d78e32add6bb11b07dd25459b7a7c2 WHIRLPOOL 1ab62401c403044d45b292dec12257b25847b7577d11bdd795fb7946720492356ffed43686fca288afad9ddce47cd8735bf0e62c9b297cbcbb2b1680764c805e
-EBUILD racc-1.4.11.ebuild 2558 SHA256 249d2abfbd4fc869cf8eff055535b181f0b91528e5c6054aa288d23a59ee781e SHA512 b7f26051fabdac82d642bad3ead9b7cf5076da32569d0b5c3f1190f10385c9d504c2d258c545f4ad1f2a4feb1ba8f1379207459b0e3a82e75586e8809f16c216 WHIRLPOOL 8f06bd1fb102991534998edfdd725daf583fb57a4df7c689d96d0e13e793b33f02951b7167730c5429d13d9436a2e1ba43fb963233ead55c3128b5e899da9363
-EBUILD racc-1.4.9.ebuild 2335 SHA256 2289bf9302f3ebab13afa17406f0d6cd61ea63d21a3333c73e22bddf27904c9f SHA512 cc77731100a70a1f4575e0a52d89f34ff406f416865df317fd04fce1518b891817ab3e5938b94ee2306a6b75ddccf90aba018fcf55123f7074a5d1739c1d7b44 WHIRLPOOL 593264d6b6903a9c6f66bbc40955c56f5393da43a231490bd14cd28945c5f1f1fa4659bade5e445bbd6c8f7bd47c41be4795914bb71fc9c859c5c0312cf829f6
-MISC ChangeLog 12254 SHA256 6361f49d35c2091a075506ee3ab6f2a4451fcd9e4303b85bd3153ec3b46766c9 SHA512 d35d489d322972352db07dadff3f070b12dc0f59837e4686e28136a374a5f52fb289e691f6df74c21496510daba39ea36b1c26f07803a955320fef401372b49c WHIRLPOOL dcf8f6aeb678da1d2d15f7a00887d861185b45a51622e09b9e097b46f9633b63e671fa4834639a04947761857ac1f1c39e07f6fe0e5637f097095f81d56bb251
+EBUILD racc-1.4.11.ebuild 2424 SHA256 6e1db5cacaa517c31fd4b8ebc68621da5ac37e7c7a44f4f115479a9edc681891 SHA512 2830c883c2d7b041d262a452ed6694b2c4ce60da9df45056d304623be5a222d95d8e03563df7782b67a4e14fa7440c97f6a9d385d62d21ca3f5171ef5248b99a WHIRLPOOL a6b08951e8c407b7f1f852012965e9d896324a38420b527ad1d8942f3b4b74f62b121ff78ad33b622384125c2856b91f37443bb631acb5fd009647298817f206
+EBUILD racc-1.4.9.ebuild 2161 SHA256 a5cf1cd34dbb71195875913b79cd0a2e3dbe63f753b11555b62354cf8af0ae6b SHA512 4eb76f8683b2d52c91a43258ec159488a87b1ffc90d09a5bc445f0ab1eb9c765a0460c0dd4d41f09effa976a0e08a88261c83a31cee9e76eacfa800e268eb63f WHIRLPOOL 2cb0f858a8e816f691e2a28bdde1c45467b096a59bc6764f1fbbef578a3440f7b112a6a71d1b7eafc52956fd2b9c2c2d7606c8c47d3150aeb38644ce99cb2f8f
+MISC ChangeLog 12366 SHA256 222152947ffd0c5f66ee71495986a9634ea1455d889e62a18eb93791bcecdf1a SHA512 4c9d7dc7e6b4ba6d5ab19940a123e8a06412d87a017f995c9f4397712609c441871df8deb8c67cd07a80a4d95a5e178902df25a647cb8dfa607de9437db5dbd2 WHIRLPOOL 9d4484ff939477f0325f90d259dddf8e4adfe2634072baa2378e4cd12364fb418d59a7f50ccbc0bedad801e0c326dfc0ea1c5b0bcd081563b446982f0c3f6161
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/racc/racc-1.4.11.ebuild b/dev-ruby/racc/racc-1.4.11.ebuild
index 7be5eb1f188d..aefbb448fbe9 100644
--- a/dev-ruby/racc/racc-1.4.11.ebuild
+++ b/dev-ruby/racc/racc-1.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.11.ebuild,v 1.2 2014/04/05 22:00:22 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.11.ebuild,v 1.3 2014/04/24 16:39:32 mrueg Exp $
 
 EAPI=5
 
@@ -47,10 +47,6 @@ each_ruby_prepare() {
 			# avoid all tests so this is not a regression for us.
 			rm test/test_racc_command.rb || die
 			;;
-		*ruby18)
-			sed -i -e '/test_norule_y/,/end/ s:^:#:' \
-				-e '/test_unterm_y/,/end/ s:^:#:' test/test_racc_command.rb || die
-			;;
 		*)
 			${RUBY} -Cext/racc extconf.rb || die
 			;;
diff --git a/dev-ruby/racc/racc-1.4.9.ebuild b/dev-ruby/racc/racc-1.4.9.ebuild
index b3c2f462c68d..5d13bb9241f2 100644
--- a/dev-ruby/racc/racc-1.4.9.ebuild
+++ b/dev-ruby/racc/racc-1.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.9.ebuild,v 1.13 2014/04/05 22:00:22 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.9.ebuild,v 1.14 2014/04/24 16:39:32 mrueg Exp $
 
 EAPI=4
 
@@ -39,11 +39,6 @@ each_ruby_prepare() {
 	case ${RUBY} in
 		*jruby)
 			;;
-		*ruby18)
-			sed -i -e '/test_norule_y/,/end/ s:^:#:' \
-				-e '/test_unterm_y/,/end/ s:^:#:' test/test_racc_command.rb || die
-			${RUBY} -Cext/racc extconf.rb || die
-			;;
 		*)
 			${RUBY} -Cext/racc extconf.rb || die
 			;;
diff --git a/dev-ruby/rev/ChangeLog b/dev-ruby/rev/ChangeLog
index 4ec7c2a791f5..8f3d9666e76c 100644
--- a/dev-ruby/rev/ChangeLog
+++ b/dev-ruby/rev/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/rev
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rev/ChangeLog,v 1.5 2013/11/11 12:28:00 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rev/ChangeLog,v 1.6 2014/04/24 17:34:24 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> rev-0.3.2-r1.ebuild:
+  Remove ruby18 support.
 
 *rev-0.3.2-r1 (11 Nov 2013)
 
diff --git a/dev-ruby/rev/Manifest b/dev-ruby/rev/Manifest
index 32ea0850bd24..ec793371333f 100644
--- a/dev-ruby/rev/Manifest
+++ b/dev-ruby/rev/Manifest
@@ -1,4 +1,4 @@
 DIST rev-0.3.2.gem 89088 SHA256 c711d8f7022df8412980a6b3ec2c2be24de640f9d46d6c72addb516d530d68c9 SHA512 dc7dfb00ebea5ded7f516f18dcf85da12a0468353a560972203069a1123f8ebd68f2ccafe69c27a02ba2f36678cf9651446bc36068b480ba0d19141deb5f27d6 WHIRLPOOL 80015fac354eaeb48c85439edc8c236ff42fdde81185b2b266ad2daee88ad9c0e8ad576259dd12ab670a391eff91226e4ee9f6cd268ce922c8942ef6ac59ec7d
-EBUILD rev-0.3.2-r1.ebuild 1563 SHA256 5e8e5c58d5fa4ec4e5856ca6e6932c0c02dae14130bd6280b38d02e5274e51bd SHA512 cd930ced0ef0c1b41b26c9e48402d4096e5b3a395a2553fb609f9fe7ac8ff56dd4605c4a06ef03dfc23e62829e1d3f4c15a00909bd11f95582db44175c3e4206 WHIRLPOOL da42583e5be8f635f56ac5501046fe511f1a5a7c190e36eb1cac4eac034473ce479ba235a5b02d88a92208c95da892db439b82216383f80def7d0adf2c200466
-MISC ChangeLog 833 SHA256 1a1df8e623ee9994381666f5cd21f6250e231b0de1ee8ddbe5ba34c2cc94ae6f SHA512 3cd0e2920a06ee2541c4375590d6e4713e071c493095c93ddcaf0ed8b3b1a6189bdd6542db329bd4796014e21af33af2cb722bd4d9cd32e6aa78f2da7c49543e WHIRLPOOL 756c3337e95f98a23402a32829f969dc8ac15d72bbe6d7bf75fcf2533e2cc3efa06114cca4ede8ee688340c734281d32a2dadbe02e00b27a9bb016e9af0bcf19
+EBUILD rev-0.3.2-r1.ebuild 1556 SHA256 2700a23e8ebbf8e0c46958f802878e1cd61086beb2fc2a6230e701bc442e53f5 SHA512 b39fa9a507a604ed04e2a1c29eb3925d87c5f9fb8d56aa45e4fb2aa631e156e850097b756226c47146698637e4076c4ad42c2b367e02615ef8f556ae7df0d432 WHIRLPOOL f5365e50b686628d4ca99f9a61c3693c3914a7c6d9a9661e6485b825578953192cf6650da7f244f8d8092d1320945c735acdd7151319077f37343a1badc0fcc9
+MISC ChangeLog 928 SHA256 b97279a74f0acbd94dafd9fda0d690a3b27919ad3cc6b4135e8284cc9cf337c0 SHA512 fa2b72c6c7aebb00b42dcba8be17cb1c767d46e6494d5d5d4cb56a22a694e3ae5708cf3ed0dc2cbaed0f21b8fe5cda2c003054305cb50ea3ca6bdffb2e4835b7 WHIRLPOOL e0fad7c1c9f7dbf627271af09d83dd284dd3aacbad85e3a0ec897f2c38e0650a1dd0613713fdd05b251e24b30dd6c59d1f96ad1c6ae618ee6c86e209ee6c5ef5
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/rev/rev-0.3.2-r1.ebuild b/dev-ruby/rev/rev-0.3.2-r1.ebuild
index b6cab1eb2ad1..ac0a4d276a36 100644
--- a/dev-ruby/rev/rev-0.3.2-r1.ebuild
+++ b/dev-ruby/rev/rev-0.3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rev/rev-0.3.2-r1.ebuild,v 1.1 2013/11/11 12:28:00 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rev/rev-0.3.2-r1.ebuild,v 1.2 2014/04/24 17:34:24 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.textile"
 
diff --git a/dev-ruby/ruby-elf/ChangeLog b/dev-ruby/ruby-elf/ChangeLog
index 009eccefdec6..4bc34d67cad7 100644
--- a/dev-ruby/ruby-elf/ChangeLog
+++ b/dev-ruby/ruby-elf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-elf
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-elf/ChangeLog,v 1.9 2013/06/23 11:47:42 graaff Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-elf/ChangeLog,v 1.10 2014/04/24 17:42:32 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> ruby-elf-1.0.8.ebuild,
+  ruby-elf-9999.ebuild:
+  Remove ruby18 support.
 
   23 Jun 2013; Hans de Graaff <graaff@gentoo.org> ruby-elf-1.0.8.ebuild:
   Actually test the new code, rather than what is already installed.
diff --git a/dev-ruby/ruby-elf/Manifest b/dev-ruby/ruby-elf/Manifest
index 8e4a50948d67..15355006f2f8 100644
--- a/dev-ruby/ruby-elf/Manifest
+++ b/dev-ruby/ruby-elf/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST ruby-elf-1.0.8.tar.gz 1958368 SHA256 1ea44976f9ead16acfb28db0f0b64bbbad72f1ddf63a3f17da5ff265611d8a45 SHA512 40eb774b9869948812c56193c46548f5c372a1fbd3892b7e6ecd7865607e0edba81ba7e857b6571acb9abb67e066aed312d48a3d0ddd64c8f51f142eb45f8d8f WHIRLPOOL db63967f4a2a0119121cb556d17fd833c20b62723e8dd517242dc7dfb6e9888bee4087ebcf8062814da94eb66be5fad5e5f60a2299d5e76f01df907d22c493bc
-EBUILD ruby-elf-1.0.8.ebuild 1316 SHA256 22a07ee752ae9dafa18248058c9090ee4a52895cc9df257bc5d6ece6c6a522d4 SHA512 c643bf1a13019ea96540fd876652f9273d8ca70c1c705311c39d4afe86dbbe826540ef78e043106d80ba5cc7a947b445792daa43614ec50a579bd48041cc1438 WHIRLPOOL df9db24bc31b37be8493651e9f00dcfd7cc9a0f0e9431412e86da2f99b2578c9594b08580bb8d3e4134dd9789b9139f0f8632ade9f020127127acba26e87a255
-EBUILD ruby-elf-9999.ebuild 1306 SHA256 caa5b9becbf2c4bd7444784aeb11a51226f73df370224892ed89238d288516c9 SHA512 72e8cf24f0708030f0b7405a2bf26c85d4303215d5092b0f7fc141b4a10d00ca10505755c96911aeda41ae3ff3399692f5d54fb152e1165a31d38ab70b968414 WHIRLPOOL fd65f4e3faccaeb6f6eddb2991b8ed7dbbaf4967595b67b662c16be4ad5466daac33b5a1e33e482019aede7244787748c238398c3ff23aff825c19fdcae6158e
-MISC ChangeLog 1761 SHA256 59bbaef7d1bf0819de9f0a58b39490a897dba9e83cc7b2f15d73e5c418790af2 SHA512 51c79462063752f98bb468505625a3108a0ecc7af4ec768b263501a18d9a224c1e9a49504cfab53f74855deebe7b9def3f2ac2a47eb3e82b74df7f8577bb49c0 WHIRLPOOL 6d1c34db2cdfb7decfa3ea49a066c73169d946732a4e5a3f462572e02a26a8eab454954b394d16a816d20cd1698be601fe1fedd33b3c77cda9bd6fdae11feb57
+EBUILD ruby-elf-1.0.8.ebuild 1308 SHA256 0e7689367cfb1ccd153f2b86f55f94b47d845466c8ac36e8dccf687ba88bcbd5 SHA512 e14dcb4704c619224805119c326dbdbae5060f6f3a4bd2745a9463f06c1732d9ca80b020bfbb80a3fc488f849bdeb19df0498e49606ef009acbfe90f6754cc35 WHIRLPOOL 9d010ab604f9ec32f8bab64e63df113d72b24a2b2952741dac191b19f98a0d439b238da23378ae7d5e45ed6ae3ea2a35e88b0d9f816c917b16f2d4316a3ac28c
+EBUILD ruby-elf-9999.ebuild 1295 SHA256 ef3916aec9cdeae1c77481054b75bb28cee1ad013e6ad73d73292a48261acd32 SHA512 f1f4c5274ec812901b65ff221de1310b73c63378c0b40abd270dc661446d36a8441b32a1b230d5f82ba8e14990bddcad01a0998b14b9b91ef7b85db11fb8a075 WHIRLPOOL 6180b3b9d65ee3ce3017b16eacc206b2ba435168d99311a3e95836374f84ba2138825398fe7b35ed5511f60887140774847eed6a226cb2dbef2abb1042f0f6a6
+MISC ChangeLog 1882 SHA256 ebc83866d2745741d21ceeb92816d81a05069b62ddaf4d73048213050d76df70 SHA512 1e3c27c4d46659c74637cb3c8d053ad82bcc0bd0384c25ae1bba5feaaa7cc5337a6bc0d5ad5f3658967291c10cec45df3946b97353842a69a6a4d860f3fd9585 WHIRLPOOL 39978a5851a6f0e530feba64561906b3b6177150466196318353402aff9935cad93d3d606147afa49603277daab3bf828175e04081478c00f219c54e58a5b93d
 MISC metadata.xml 282 SHA256 5df09b3dfb59d3c4c29285f809095c19d06c093252060a9bec39ca2f902c2836 SHA512 650f2d0f2b41e7161dc63dc33e3b9423b2d0aff1627e7681ad9803c0cf6fdcc8d280268ee95c08f6ee89a32a0a23b3911d38a831442c68e121ec3b513fef2442 WHIRLPOOL b9324d4c2c3db7766d050ffbe1de36efefe9b40105681cb5008e703df8ea919dcf4944a6a5fd9c5049e16319023d0b76548c1b3ee34661727713e9326c83ed39
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iF4EAREIAAYFAlHG4GUACgkQiIP6VqMIqNf5cgEAhXEM/PrjPqFqKpwI9SlUlDAO
-Z2UPitO4A/sQ5j82QgYBAI2Mq2zJ/FwvmnjlUNJtWRfxwDPK86hw4D0cErKm9AS+
-=U0cA
------END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild b/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild
index 8926efe8b5fc..7a75d0e01314 100644
--- a/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild
+++ b/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild,v 1.2 2013/06/23 11:47:42 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild,v 1.3 2014/04/24 17:42:32 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 jruby"
 
 GITHUB_URI="https://github.com/Flameeyes/${PN}"
 
diff --git a/dev-ruby/ruby-elf/ruby-elf-9999.ebuild b/dev-ruby/ruby-elf/ruby-elf-9999.ebuild
index 8ea8b56a1b0d..694d6447cec8 100644
--- a/dev-ruby/ruby-elf/ruby-elf-9999.ebuild
+++ b/dev-ruby/ruby-elf/ruby-elf-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-elf/ruby-elf-9999.ebuild,v 1.1 2013/02/20 16:13:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-elf/ruby-elf-9999.ebuild,v 1.2 2014/04/24 17:42:32 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 jruby"
 
 GITHUB_URI="https://github.com/Flameeyes/${PN}"
 
diff --git a/dev-ruby/ruby-hmac/ChangeLog b/dev-ruby/ruby-hmac/ChangeLog
index 7a210ee598d5..ef2af5649029 100644
--- a/dev-ruby/ruby-hmac/ChangeLog
+++ b/dev-ruby/ruby-hmac/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/ruby-hmac
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-hmac/ChangeLog,v 1.6 2013/11/11 15:37:01 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-hmac/ChangeLog,v 1.7 2014/04/24 17:45:37 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> ruby-hmac-0.4.0-r1.ebuild:
+  Remove ruby18 support.
 
   11 Nov 2013; Manuel Rüger <mrueg@gentoo.org> -ruby-hmac-0.4.0.ebuild:
   Cleanup old.
diff --git a/dev-ruby/ruby-hmac/Manifest b/dev-ruby/ruby-hmac/Manifest
index a33663ccf31b..b02ab0cfac4e 100644
--- a/dev-ruby/ruby-hmac/Manifest
+++ b/dev-ruby/ruby-hmac/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-hmac-0.4.0.gem 7168 SHA256 a4245ecf2cfb2036975b63dc37d41426727d8449617ff45daf0b3be402a9fe07 SHA512 a35cdf8a9bd16f47cd64e304839b83284a0e0ddd6b7963e1b42926ce464a1c5131cadd01ec787ade379aa4ee74a66b14b5179cc9caa93b7d2af89fd982234d53 WHIRLPOOL 0904aee3b88f1402926772e0568befee67db798102c011398a15626f0ba99067942f691478de35b7f71f435ea0d53331f9442f5515f637307ed7ecc6af141c8c
-EBUILD ruby-hmac-0.4.0-r1.ebuild 634 SHA256 86131ac31584c7452c1f4f450e088bd28d9ac94c64e973229c8c678d266b0ca2 SHA512 03949048771fa7114f807408677ea265f1cd3424ad2643b28f17d9bcc0e04d831c41091201a1cdc99d64f46ff8273f1556dcdfe1e6d899083c462a839c137d4a WHIRLPOOL 3fcccf9bdf671d17a965be597417dc82955f61e16ec53be9dad9f17e86dd7c2089a181eb7950d8b37853ace2785ef949d24be0fc61adaa6a1022ab5a70016be3
-MISC ChangeLog 1018 SHA256 d3f8b4d520d77c474c7f499784e69ddb35c98580d964a4cf3ab16d30d32affaf SHA512 bc4139bfd90b9ded3a950379e65b2beb18fed6ada6abe785956c2109847ab81b0361b60a0ce3c193b7d06723bf299a8997fb801195caf07a175bc75137ca3b20 WHIRLPOOL 70f4d9c932dff8054b47d30baa3b9342a551a3b9e435488221a98ed3d82b639e5745728876631269df205166a64c01853b1b093d032e7bae152ecbf883d0c11c
+EBUILD ruby-hmac-0.4.0-r1.ebuild 627 SHA256 6c9f8bfb2053be587834b26728ec945132406701729b1cbd77acc1acd14eee03 SHA512 b040e0f8961746c7bce3b1eb04ce2c81d0326b5cac127aa5e08dc8529d23833c092d9eeed3c64c8c0fb240cad48a1d3e4276bc6a9dee3ec1919689feab26be66 WHIRLPOOL 33bb1365ebf569530fcc84c70e06ead672537d2744f6632bb3174121d3a6eb237555cb69380164c442b30259ee7ff12e87f67bbbbbd8d44fa9f4d550954ad162
+MISC ChangeLog 1119 SHA256 5b313fc3ac764c8d1c401db7adb14074562c2e1c88c7812ef95b45e0822837bb SHA512 f411a46f312cd55e02a8c970beed1b8f6fcf4e1a7ea8325999c43a50ce42a7df795376c3845c0673a5499fdd8ae09808a945ab49636827b4194ddf9608811452 WHIRLPOOL c8a4835db0cec0fd38a6ec6870bc1c034d87cee5880cd4a70a001e8d1e55a61e232d7d92f3ba4137220586cedd8fee7c20cc96202a7e0d8ab4a396078bc12b74
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r1.ebuild b/dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r1.ebuild
index 231b482aa808..a782b0018b8e 100644
--- a/dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r1.ebuild
+++ b/dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r1.ebuild,v 1.1 2013/10/30 04:34:21 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r1.ebuild,v 1.2 2014/04/24 17:45:37 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
diff --git a/dev-ruby/ruby-oci8/ChangeLog b/dev-ruby/ruby-oci8/ChangeLog
index e203810f1aa1..66e19c5edf04 100644
--- a/dev-ruby/ruby-oci8/ChangeLog
+++ b/dev-ruby/ruby-oci8/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/ruby-oci8
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-oci8/ChangeLog,v 1.29 2013/09/05 00:22:17 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-oci8/ChangeLog,v 1.30 2014/04/24 17:45:22 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> ruby-oci8-2.1.3.ebuild:
+  Remove ruby18 support.
 
   05 Sep 2013; Manuel Rüger <mrueg@gentoo.org> -ruby-oci8-2.0.6-r1.ebuild,
   -ruby-oci8-2.0.6.ebuild:
diff --git a/dev-ruby/ruby-oci8/Manifest b/dev-ruby/ruby-oci8/Manifest
index c24f31c5acc6..a53db4eefe8d 100644
--- a/dev-ruby/ruby-oci8/Manifest
+++ b/dev-ruby/ruby-oci8/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-oci8-2.1.3.tar.gz 218704 SHA256 e4df1cf60ef78a2fb377f210ce4e3b16a830bc87fd470bac033a363edfc21708 SHA512 900deb57aaa4732c37914cff2af1954bfb6ad5c346c1f439e4301a01b4a5cda0ceebd02742330cda5235b5445c346058961f8ee119461d7fac06f951f7a0c286 WHIRLPOOL 75be9cfe4c1f2d58db67cac64ce552eacb97035566662f419d1c999781560c7a237c1b90d707249be97eccda86dcb34d5541f027ae3a0c03d779e2392a402872
-EBUILD ruby-oci8-2.1.3.ebuild 1020 SHA256 075a40de6f5bd05cf9161926456f14f6accef3ecdff6ba366e6ea5211345361c SHA512 bc583e211ce3865bf49f31c947e66617ebe5940fed70f25f37b0c5e69c802a65f7b6410e1e7485f2dbd1cb73396a6ffa0484cf1c1bb3fd237c1489214edf1b44 WHIRLPOOL 6b214ba526ea59f7a56766ad5233c2b49a68f427a11ba34e4aedfcb30589b414ef86ac89c5e02bdd6d622fad5c7999fa642fbb4fd69aa568dcc7311b52f72d13
-MISC ChangeLog 4233 SHA256 67a2115aa8ca54807ed9406094daebb602fd82f0d8d89cf1b992b0342988bb3d SHA512 4ddc59b15baedf2f07e5cfcf4d96f3291665783163d41b04d799ad76574a6244246bf99221ee60ee2e84b7ab67ea953c4b87c45df5c9fb45748a556f4962031e WHIRLPOOL 34743d3893a478d1e2e2521dc3ebf8d9505348a191a2197704827743e8fd5a85c7c4ae87eb0b60be608a4d6835552a9b899b78f286f4452fd2229e9513ab6e91
+EBUILD ruby-oci8-2.1.3.ebuild 1015 SHA256 f22b1355011cc9d830bf67696ee212abee51c040497d1a89a0a7fd97266af2db SHA512 5535a1ad4fa9ea2d6d2ddb503f44196bd7b37cae5d369f778ce39fcd09867666de008fad9164efd98df1c4fea0dd423c40f25c338ce089e892cca8b04f7c5b57 WHIRLPOOL c975de4ad937011e4748ffa7fe21430c9922672e413e9f7d285ce3577c8c38e6b6d9831621b0aa76265810bff385e0cb1d15ff3d33e29b2db1add802c86620df
+MISC ChangeLog 4331 SHA256 aec9ad965641bdc2483f21ff75a67fc688905011a4f293ab2d3bbc8647a1cb04 SHA512 11b2948bd53979bb24836d6955ab49825c962e6a97b9d3ae6264d2c8abcc9f57a0ac23528cbfdf8065a7b585ed9138ca8d720d1b6d0b4f3a426cec1aa41cdfe8 WHIRLPOOL fa080fc98792822b4bca78201bb6e1cfaac1d17ef1c02c7c289925f1c16cd9ae8e529dc41c8993d47d70334ecf97c9676dcd349efd4eea9e5566df0e3a1bacaa
 MISC metadata.xml 460 SHA256 1725a8ff2f9b5b09ad81af1143b36d59e9aef43407b38e72993192fc49cd709e SHA512 7d4d2e5f4c0d9b797ab697ee41251ccb59053b6447d2310ab8ba8f0c08614d05fe18e354aa72bfd48add226b19a828b76fa3c15f334d6f00c215549ab25f8131 WHIRLPOOL 33c04f9ddd256f94ca96eed36d6894aad05ec3fd693c2e37d136af80e0eeab9942975efcc3056b8702100f1241f1df9c950bd92c6c6a33a68d36508b3a99344f
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.1.3.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.1.3.ebuild
index 366257e2c38b..afe3cab5ae46 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.1.3.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-oci8/ruby-oci8-2.1.3.ebuild,v 1.3 2013/08/31 09:15:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-oci8/ruby-oci8-2.1.3.ebuild,v 1.4 2014/04/24 17:45:22 mrueg Exp $
 
 EAPI="2"
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 inherit ruby-ng
 
diff --git a/dev-ruby/ruby-rc4/ChangeLog b/dev-ruby/ruby-rc4/ChangeLog
index 3f5c60c80f97..b584763f2f53 100644
--- a/dev-ruby/ruby-rc4/ChangeLog
+++ b/dev-ruby/ruby-rc4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/ruby-rc4
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rc4/ChangeLog,v 1.12 2013/11/11 13:05:27 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rc4/ChangeLog,v 1.13 2014/04/24 16:56:45 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> ruby-rc4-0.1.5-r1.ebuild:
+  Remove ruby18 support.
 
   11 Nov 2013; Manuel Rüger <mrueg@gentoo.org> -ruby-rc4-0.1.5.ebuild:
   Cleanup old.
diff --git a/dev-ruby/ruby-rc4/Manifest b/dev-ruby/ruby-rc4/Manifest
index 87424553ce4d..498ae286cdf3 100644
--- a/dev-ruby/ruby-rc4/Manifest
+++ b/dev-ruby/ruby-rc4/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-rc4-0.1.5.gem 7168 SHA256 00cc40a39d20b53f5459e7ea006a92cf584e9bc275e2a6f7aa1515510e896c03 SHA512 db0fd372a3534f0da6bd1c53c42f12691a54dcc36324819c14d1288aa8ba0fa99a04a3ce739035c11007f47d781f147bc0c0b9746e59bf2c8ed0e5830f2df6f5 WHIRLPOOL c2d49064feb6268136e6af47a13ec03e6ca69fb88df8d2ec4c62b4c02a4ec8a34bc98f310dd79145ea4ced1c9bef01c7e452c4cc7c3ecee755d764666b769d5e
-EBUILD ruby-rc4-0.1.5-r1.ebuild 677 SHA256 a770b76498c3b8ad01a149cf28bb10ef2d5f90c99ed7ff6858c6a6f777cf63b2 SHA512 729fe2ad8f8098b8381b9f65cf44a9adea9ca233071af8f3f4b3f67b6fd61580556dcccf78ef46eaa22af51fa6c829c9afb0571cbb2f7fc59e101d5e4c88b9ec WHIRLPOOL 538f6501a94421ef0bbec33fddd1c8b7b070e061c0293ed8bae0d88e8c0556f8df98ab6c0aa72ab69ae2fc9fd4444426a53a7080a3b27dd6430fbe4f5c4aba1a
-MISC ChangeLog 1614 SHA256 d8a24fd1fd9c7717b3f7ae52abf6305190365ed0546149c87d1a0fc0fabc691a SHA512 98467575b5d6f51be791a6eb03954be5c47e686800f812bf271bb552198f5ed2bc6e2e2679173f124eeeeea2df5d20df88ca17c83ce0eec0ccbec7efa58c4e08 WHIRLPOOL 40eb538d93b0c9897df7503e4734c3e853579f11b655e279c970cee8ac1e06979289f8e4bbadeb8717c02917a1fd6c18d97c3fa673e60e6189c6fc2184a06598
+EBUILD ruby-rc4-0.1.5-r1.ebuild 670 SHA256 c05094cbb51c535c6eba829cb5b4a2029c60284b2a5e1a36b213a4d0c5640f4a SHA512 00e7fb8f1e756897c45033797f810bdbeab7d3c540aef93e840f07bac1d4bb11bb994f504e51258714e7200c2db251849478533c60d07e20545648af8a12f718 WHIRLPOOL 712f940b15be0ead5c856f3980530cc08495ad6990d39c0adb1297ced029ac3ade982ffe96bd8f1146f89e7f1199e68a438584bef2c3da0c16b00adb4f4637d9
+MISC ChangeLog 1714 SHA256 f5218ec0c610eb437d926a0216bffd6efe1972fdaf7b8c2128fcebb61f9412cd SHA512 4935dc3817dffae7658e8f7aa41e1645dff5f743bcd56116b2e579698fa6bf92783296b3bcf4b342418715561b9f8dbea05ac3c984131243ce8891535d0925d6 WHIRLPOOL b0bb2855784cb8f67bf145f2157b3bd021dab58e70dfec13f97262abca591816afa4a12f3326aba6c25decb22c832b7aaad34d57a9977da426d70131c3b4a19a
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r1.ebuild b/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r1.ebuild
index d50525fef13b..3d84b566a9f2 100644
--- a/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r1.ebuild
+++ b/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r1.ebuild,v 1.1 2013/10/29 15:32:04 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r1.ebuild,v 1.2 2014/04/24 16:56:45 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/ruby-sdl/ChangeLog b/dev-ruby/ruby-sdl/ChangeLog
index 0f2d230a060a..54635366a928 100644
--- a/dev-ruby/ruby-sdl/ChangeLog
+++ b/dev-ruby/ruby-sdl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/ruby-sdl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-sdl/ChangeLog,v 1.38 2013/09/05 00:23:03 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-sdl/ChangeLog,v 1.39 2014/04/24 17:42:59 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> ruby-sdl-2.1.2.ebuild:
+  Remove ruby18 support.
 
   05 Sep 2013; Manuel Rüger <mrueg@gentoo.org> -ruby-sdl-2.1.1.1.ebuild:
   Cleanup old.
diff --git a/dev-ruby/ruby-sdl/Manifest b/dev-ruby/ruby-sdl/Manifest
index b49629ade7be..1c0007b5c26e 100644
--- a/dev-ruby/ruby-sdl/Manifest
+++ b/dev-ruby/ruby-sdl/Manifest
@@ -1,4 +1,4 @@
 DIST rubysdl-2.1.2.tar.gz 394125 SHA256 d0f4df467cfa2dd387490fc7673ba5f3fc860fd59f0eabb96848bdc8ef04a36c SHA512 6eccd9aef7ed864683aaa02b227e9786443bb984c4cc89da53d7871f8d07bc33b79dfb50982458df516423c6c4a6d4a8ef3b3ef049aaed9252bcaba952342bbb WHIRLPOOL 819886f272829b2cdcc4a3891457d3d70409127cb98a9227947939b167e8874264a994c14f839ff292ccb1aa060a182f708f0b6a718f70b6f314a66d9bd764a4
-EBUILD ruby-sdl-2.1.2.ebuild 2006 SHA256 32154997b52dada8e3dc40e5189458ee5814a8598bdc9c7d9f74e58124a3e1e3 SHA512 6f8104bbcae60a7307983fe20b9cd2e84d92b3fa6eccdd8cb880d95ec4fd6f3f44e2ab76883cb4232079cbf0df88defc9b3e089fca6f29676e804856504dbe51 WHIRLPOOL 956ce5296bcaf79e9fbaa0ce0aaa5aac63f286a52828220c2fd1f9e8178887ccaf0a852c5cc9567ca254daed9187bb39693695527658265089f549de36bfeeeb
-MISC ChangeLog 4731 SHA256 7daf55308cd8b8d2dfad65132d45b860802098b3972bc439087f78529656a4cd SHA512 9dc0e8439dd2170005ec046cfb152404f78bc745ea22944ff1b0b8d533962f21bf2809b8c346b0039b23484eeca376858bdc74895fc73ff22f1c2c5518f3a6f7 WHIRLPOOL 43af3046ef9fb716e8451eab77dee5dca020c565f20c822174b6c6beab1a9aa572432971193e79b306fdc847c7a574407fa0ea38922ff4a1f2969aa7d7e69905
+EBUILD ruby-sdl-2.1.2.ebuild 2001 SHA256 addc73788e15b9f630b4944959713f70e8c0c949d2cc5eab4bdab86f8e429f7e SHA512 29a8a90df72bcfe130648e8cee9d04d18b08aa611c28b9a2032c2499f78fcbb75e30f1f391ebae476e8feb0f28af570a19ff23cf19483354345bee3f074831ae WHIRLPOOL 8a58d0db0d0c39838c6654bc650bddb54f33af47d53d4121f26d19f618ba7ca15559aa3e7fca6424b31b3a4397e47fa785a8c090093ae0a7588a2b88db087bc3
+MISC ChangeLog 4828 SHA256 2b70d8c1debdae4f3d83743de1c3af315077be3c5b09f3b591340f1003d43927 SHA512 78d506d66229e3024d22ea3cad792b15e55c509893f339fe6837da0770655af53b60ce894aedff50f7de2d057f2874e8a4fb2118361cc38f3061047addbdb881 WHIRLPOOL af92dbd7f7ecf4d13835bbcb822b3acfa20460c87395c5440493597e81957c1e018efb70a2f8314ab00f8aa2d6cb9385ed2d872356daa4acdef22dff4c023b06
 MISC metadata.xml 381 SHA256 0788b473577d08e11c117cc02290027628f93aee0c429b37c1f08ea02470f1ed SHA512 42b98840d9fbef2e0e35e3775b0bef1920df71f56999fa5096b8878b32474e5b2b41d17b7b553c355f324b2409be4dd83a5ea183aac83c4d146ecfb28ea39f54 WHIRLPOOL 832abe97a9b39d5f6dfb6d72479f49380138b16664d77b227572ff8714b73b4c90efc98c41055d883a18af9d9269dc96dde0e60e9deee435bd864937f8381e13
diff --git a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2.ebuild b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2.ebuild
index e5c90ae73cb6..81df709c4c25 100644
--- a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2.ebuild
+++ b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-sdl/ruby-sdl-2.1.2.ebuild,v 1.3 2013/08/28 11:16:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-sdl/ruby-sdl-2.1.2.ebuild,v 1.4 2014/04/24 17:42:59 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 inherit eutils ruby-ng
 
diff --git a/dev-ruby/ruby-shout/ChangeLog b/dev-ruby/ruby-shout/ChangeLog
index 7971935eade0..553b052d4102 100644
--- a/dev-ruby/ruby-shout/ChangeLog
+++ b/dev-ruby/ruby-shout/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-shout
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-shout/ChangeLog,v 1.22 2013/10/30 04:37:56 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-shout/ChangeLog,v 1.23 2014/04/24 16:54:01 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> ruby-shout-2.2.1-r1.ebuild,
+  ruby-shout-2.2.1.ebuild:
+  Remove ruby18 support.
 
 *ruby-shout-2.2.1-r1 (30 Oct 2013)
 
diff --git a/dev-ruby/ruby-shout/Manifest b/dev-ruby/ruby-shout/Manifest
index 2ae3462f7589..8ca9d1d813c2 100644
--- a/dev-ruby/ruby-shout/Manifest
+++ b/dev-ruby/ruby-shout/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-shout-2.2.1.gem 12288 SHA256 459da771249a2c05d82a548fed05b97ee8a230b6018b17779150204d91fb93e3 SHA512 a6dbbc84a4df369f6bdfccac202dfd23212d41fb35d817d6f0f393e9f8a174ee4159e2ebb874304b862e7dd709d3beac70013c568856995740e841f10add82ec WHIRLPOOL 068fe13ddd53e5c06ee68aefb2153ca3b1289b8dff194ce44b5bec7ca997e3e68d07c78597c6644bdfdd0d2e22b21c401d685c0d3242f8b4b9a78d180c059072
-EBUILD ruby-shout-2.2.1-r1.ebuild 874 SHA256 d55f0a9dcef3f579e4ef8996716d1614ac53a3e371123ba8835de739830fa0c5 SHA512 82b2872cd67c3629be44ed1570c628dc1a52cb5e589ce0b1682f8318ee46ebd5bf07c59fa06d4b6b14c56c4269ea1383134f1c879f4d9115546bade957758c36 WHIRLPOOL 3190392ee1226c85f4ffcaa0ad0529d2621cb106e793c406c4d8fbfaf7a6d86a383a7523114e08eb175969c2a8df79ab9425890758f98d421dce2f638abd623d
-EBUILD ruby-shout-2.2.1.ebuild 905 SHA256 03b4c171705d8c0778ca6b4b7f2b71a6248d9ce46a52c036d7388ef57205b40c SHA512 b3199fc260b88fee9c56abc3fd53203d41ff87c8079e611a5b71f962be91f85e77d51f216b8b26444d7b3a7acdaea931a3654113469d2c212e1b9dbeb76f967c WHIRLPOOL 45d5944aebecc4eae8e075171c404acb98ae811960278a1dd2785778856de14b833a7e9e7825a99d4ccb9728f26c2dd789c9e8bfa537527d07d1a3025d76122a
-MISC ChangeLog 3000 SHA256 64a2e76e0268c3e4e45ebbeb1996efb70e68858bfb814ededa16ddbcbc2275a7 SHA512 85968d95a15f075e88fdda9e4dd3939c5c463ffaba81705f682f0a0d3bc948bfdb11e1ddbd63e440d2f7f103ed56ebea98fc1ec54c930ae377ad0be45f6e89c9 WHIRLPOOL 9870ff74655cc2cbc80f0a6e64f144f8ea22c75768712267d9f623cac953b0b7281b8bab1d49597788a7fd97192cd62ce65b7251a0bc0338835313bb4fa50141
+EBUILD ruby-shout-2.2.1-r1.ebuild 867 SHA256 f0f1bff466fc47e69d518b1a05b4cffca25986c92c255d2e6a4dde1c38d475a5 SHA512 31f08a885f83cbb4e8461d4618764136879e9878043b96e1433e0b3149b23598ee2982902876c733aaccdf07a30097e16dc2d4e959111a876b2b8dd8e7100d0a WHIRLPOOL b972e17c6ccf84339b4cd7d93c4b520a77eefe0489b89a498a9f64801e74f3c78afc0a410db8634f5d67b58a48f0163f79e37e59671dde2b79234f4961cbc591
+EBUILD ruby-shout-2.2.1.ebuild 900 SHA256 913e9f8b77b0a6a50806ce3c1b89cbff989dfa26abb4894897cf8c88c5c2487e SHA512 cbb2093097ffede57977580d7a6b02b989ab9de69ba7d66d7332fbc8cbbea2575c21fc7a29dcf20b06b99dc7f52a211140dc0c50465478eff9b1f69eeb961235 WHIRLPOOL 6c049df527e1f405090ba14a5812fc0d0bc2d37bfaf2344beb2c84084c2af64fb4f8ace9820fc74e3d5ed25c656e5448126d997c053c26eec9bd275243d7b869
+MISC ChangeLog 3129 SHA256 2d8662e122f03a198b50fdb49cff293e8ac17b7f72c2d0fbbf368f9cfb4939bb SHA512 7df9829812fdad05f35eca9157b87f969717ce1b309c04f48a298bd6238595d0018409102ee502bbe8bedb2545d6ee9ce122c09df460b0de6d206f1a74152cc2 WHIRLPOOL 0e160abe3d78ec41d5a6486867f23a0468ed8cc52fa3b6a6e8bea09fc0209449252bdc428c43287e8ed0e21eb7af1e47a1f6069616dbb1adc290eadf807414b4
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/ruby-shout/ruby-shout-2.2.1-r1.ebuild b/dev-ruby/ruby-shout/ruby-shout-2.2.1-r1.ebuild
index f0e6f377a45d..e56bc3942371 100644
--- a/dev-ruby/ruby-shout/ruby-shout-2.2.1-r1.ebuild
+++ b/dev-ruby/ruby-shout/ruby-shout-2.2.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-shout/ruby-shout-2.2.1-r1.ebuild,v 1.1 2013/10/30 04:37:56 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-shout/ruby-shout-2.2.1-r1.ebuild,v 1.2 2014/04/24 16:54:01 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/ruby-shout/ruby-shout-2.2.1.ebuild b/dev-ruby/ruby-shout/ruby-shout-2.2.1.ebuild
index 0d6b2eaf22ab..b1bc99d21f88 100644
--- a/dev-ruby/ruby-shout/ruby-shout-2.2.1.ebuild
+++ b/dev-ruby/ruby-shout/ruby-shout-2.2.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-shout/ruby-shout-2.2.1.ebuild,v 1.2 2013/07/07 10:22:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-shout/ruby-shout-2.2.1.ebuild,v 1.3 2014/04/24 16:54:01 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/ruby-termios/ChangeLog b/dev-ruby/ruby-termios/ChangeLog
index cf4b9255429f..916ced6e2990 100644
--- a/dev-ruby/ruby-termios/ChangeLog
+++ b/dev-ruby/ruby-termios/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-termios
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ChangeLog,v 1.37 2013/11/13 19:02:23 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ChangeLog,v 1.38 2014/04/24 17:45:05 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> ruby-termios-0.9.6-r2.ebuild,
+  ruby-termios-1.0.0.ebuild:
+  Remove ruby18 support.
 
 *ruby-termios-1.0.0 (13 Nov 2013)
 
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index 06c89ad17c3f..4995c7a7f980 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,6 +1,6 @@
 DIST ruby-termios-0.9.6.tar.gz 14077 SHA256 c838419d4265ce78be0efdfda6d525d81c231450805ec61c861394929f90181c SHA512 66033dcb2cbe2e76bd114607234c105595a9ab7fe567834ae052aa69c70fa83f95724273efc2d32db48fa853276e0015bde4b4ebebae323858b3ee6dc553e6d8 WHIRLPOOL 665f630eb07ae3cbcc480d195ec4c5ac531c0e2e5ad993157793e34c6294236e04d25f7ca3fb7c1fbbd9d77ca3f445dcf78db5a571112034724aec7e0abc9cd2
 DIST ruby-termios-1.0.0.tar.gz 14738 SHA256 0b6c41fb554acf17d257db8e8a10b283be6a9b45807ef1562151aadfc008ce5f SHA512 16d71a8cf84391da2dc8b138ff381751f5a72d61ce37d2215960d389285dee14862b50cf770d4648b298df093a85005df460ba951c5d7e6fb38e69d8d686599a WHIRLPOOL 34c9ad7fdfb7f72d8311a04345f5aa94050ea5d0fd66d362cd7c9eca55b19b91dd022bf2b3e60714a78c4e80bfc28952d722e8538372a3ed7faed8443baa85e3
-EBUILD ruby-termios-0.9.6-r2.ebuild 1029 SHA256 db45ba1295225f447bd6e34083312b2fc118b43a05051804373addf5c6b111e2 SHA512 b36fa419b21a0bdb029542935464ae3d6fc624aa193903ba7ad32921c001371dde392ea9bd882dbd96fc7e3fcc68a45e43d564f8b0a62ceeac204651bf7210e2 WHIRLPOOL 7539e73113908aab717c6ba3a13110bc8839b6cfee99f269e6fc57f51214d67d7e252888eb54294e3ed647244410281a502f0ecdf91f1a2b0b0ae16ad937fed0
-EBUILD ruby-termios-1.0.0.ebuild 1091 SHA256 683f55b7b77306d80cc8c14929cc045309d951632446f62c2e3c44c0bee41d00 SHA512 001fe33b8520733801e0438cd09cd6717acbd0386250a8f0711ea30cf824c92308a0df7fb953d5dc6631d045951f939d42a09a6c7f73fe30cdef5ab3ae0e2cb3 WHIRLPOOL 1a7d3226f084a451ad81b294fa5a0ac7704daba61b8750aad1e4470fda21da9e900cbdb472abef61ac6166267eb1c8d1b8e858f50bfdc4484d8ed4bc0ad20158
-MISC ChangeLog 4490 SHA256 a7f5082b420bc01948475fe1752a44d1cf8bc539b1fca6dbec3dd688845b5b37 SHA512 97466c00880f77689508c160bdf4ff7e76f85ebe641581e8df7baab55642d3c950b0220bb4964a7de488fc5a6972c3962c977155a9fb0626256a03dc07098d96 WHIRLPOOL 92f501b2fcd6b6317fc13d2bdc4cdfb14af3689d210fcb011bf6afdf15641dab6eba63aba6dd7c7dd743217fd880d6ccb6360aa76c3e7165d406f7f3cb03bf87
+EBUILD ruby-termios-0.9.6-r2.ebuild 1024 SHA256 4657589042c39cf42c72f72a6356dafe72b4c1ab2a7b5989dfdae3b0d5ac9bcf SHA512 e737ef7bb0688d2c37871390cd4d80477fd8fc24b81289b9743f8963df1082ca152d2a0de8766a90e2830f4deb38437064b295dc3f54f77322695016f2845ed3 WHIRLPOOL 5bb11c917179863d17bd797852026a7cd6034f54d36281e5bfb350e790caaff4bc3344cad2f87ce563f732d706f2bb685e6414d6cbb9d79ea07c7c4b6b1ff93d
+EBUILD ruby-termios-1.0.0.ebuild 1084 SHA256 3da6c6e22033d957029fdce8a669752b18ea8b058fc6c54ec9e7b51eab30e7a3 SHA512 d98a0b277cf77c6b7535f185758957e3a941da47125a3474dfd4592c799e721a12719ad76ed535c3181d9b47bde7818e5f033b0d77059c4d6d610edd9100c3f2 WHIRLPOOL a307b0ecd5c1afd4972772304a4c539b016000847f562f3e3bfd7272036756241b3ab14ed3647fea10b65df9f9716ded5189ed1bdd68b67b4fd3d6bf3b303c8c
+MISC ChangeLog 4623 SHA256 7469b9cb3ab8612ff11263bc900ea6e69b2c2c9aa7fa4787d50cbe3270f82c2b SHA512 cfb139faa8876ec7bf21884f6216e7f59d3255717325437f27c94968cfe67ea7d2d407cec8aac3acfc53f8ef8828c925f61cc8e2e3aa6de74e0e0cd070a22a09 WHIRLPOOL 63fdb5917f7c4d1f20c5007642bf112221036c0e8cc974f42c475841d2b6f381841abdecb13a86e65dd9bf837a106486826344f653bc7c3f6fed5fec350b2315
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/ruby-termios/ruby-termios-0.9.6-r2.ebuild b/dev-ruby/ruby-termios/ruby-termios-0.9.6-r2.ebuild
index ba5cf14ae0e0..8c6dfe54dfac 100644
--- a/dev-ruby/ruby-termios/ruby-termios-0.9.6-r2.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-0.9.6-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ruby-termios-0.9.6-r2.ebuild,v 1.3 2013/07/04 09:13:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ruby-termios-0.9.6-r2.ebuild,v 1.4 2014/04/24 17:45:05 mrueg Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 inherit ruby-ng
 
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.0.0.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.0.0.ebuild
index 5cc6d9841b8c..18e29bd9d335 100644
--- a/dev-ruby/ruby-termios/ruby-termios-1.0.0.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ruby-termios-1.0.0.ebuild,v 1.2 2013/11/13 19:03:06 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ruby-termios-1.0.0.ebuild,v 1.3 2014/04/24 17:45:05 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 inherit multilib ruby-ng
 
diff --git a/dev-ruby/ruby-xslt/ChangeLog b/dev-ruby/ruby-xslt/ChangeLog
index 25f9d542edd8..8d6f9bd0bad9 100644
--- a/dev-ruby/ruby-xslt/ChangeLog
+++ b/dev-ruby/ruby-xslt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/ruby-xslt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-xslt/ChangeLog,v 1.39 2014/03/04 10:18:21 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-xslt/ChangeLog,v 1.40 2014/04/24 16:50:56 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> ruby-xslt-0.9.9-r2.ebuild:
+  Remove ruby18 support.
 
   04 Mar 2014; Manuel Rüger <mrueg@gentoo.org> -ruby-xslt-0.9.9-r1.ebuild,
   -ruby-xslt-0.9.9.ebuild:
diff --git a/dev-ruby/ruby-xslt/Manifest b/dev-ruby/ruby-xslt/Manifest
index dbd99cb22f95..9a91f59fbf52 100644
--- a/dev-ruby/ruby-xslt/Manifest
+++ b/dev-ruby/ruby-xslt/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-xslt-0.9.9.gem 34816 SHA256 7dc7565e90719b5971ef9620f64180848a5d9e983e9abc74d76f7cf1b01a2f72 SHA512 8c23bff3406ae2712663f81fb46525df4938aee5bf85f5497ff33108e4fb0f443ca3389dedbbb9eea233e86e51c24938f699eae2bc62cbf291c04a56a9af36ff WHIRLPOOL a01a8a1cfc94de4455fdebd115eb83d5953977a0d57ac50cbdf6d8a874413744aa1a77fe31cfcab628a9d4cf7bdf45423156bb3ea65e904d598762f9ebd23537
-EBUILD ruby-xslt-0.9.9-r2.ebuild 1233 SHA256 c3db1a4ead7d7079dd0241f1d96934c31424bff32aad7e00b680e42d72daeb3f SHA512 be2e4d724b2e1c7f51c0780a0929140fa35e19ccb1f1cfe48adffcbd8e75b85c70947168426323284b3cdafe3cf96a3effeaeabc5addec0d78c7b5816098234f WHIRLPOOL 02d16af04e31d341ebcec8481a8da63505b5b19afd8b68cdb775c25b6491c889408763f086ff0a9944df65d526fec10223405f20740494950c2d37ea51a2ff82
-MISC ChangeLog 4998 SHA256 a96885c16b903659834c989c5a2f43db4d03feca6c8d281b69fc46296e9d223c SHA512 555a1778432386f040cbf9b3f71225c8bbea29b1cfa69b0969db2bdb020fce90021c3fdf85681b42b2b69738b67b27ed49ec38062d142197d17a6e62924f1015 WHIRLPOOL 3428e40fc8ebcbbec982eac38ca7e7aca59523cdc07b612bfc354d62b012eccd124eb4d0d60c9e295d90425b2325876a4175f1692be1d16c5b2ad807af30910c
+EBUILD ruby-xslt-0.9.9-r2.ebuild 1226 SHA256 58b4220d98f7f3fdaace0a91bf60e4c63a4fb35c431be339c12889e9fadfaa77 SHA512 d467db8cdd9a0f0b990376bf3a6197facbd015bd5075fc7b9f9ef4cbaebcb7df6e29fcf5c6670dbc717b762e037198ad4851ccd60c0ff7b58a68cc8bda774b99 WHIRLPOOL 0c2d160209c67ec91ed668e1475cb034c93a7710bcf17a40e47c95becd229bfdd8ff86e1e1e6919f68c12719531c82fc7f3c7bac4a801639e7d8d40890dfb790
+MISC ChangeLog 5099 SHA256 d496a340a4a273f564e0ed9e0020be82263d8966533adc28455f37ec415c344c SHA512 ebec518a46208bd2c19c903314b3f30b626d285a819a957c00297d60d9c1af973f752f6d0cee7d4a2a619e9411687432e86bfed78d0e672d5c0ec00d1d00a814 WHIRLPOOL 3b892c7c3c329743a4eb58bcbd52eb85a90ca36baed0384a9a6eea71846d296eef718c0eb195e9ca72b5aa70ce1a5de38bad66e64b74aed64a456f33ac713a64
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r2.ebuild b/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r2.ebuild
index 855655782522..c51bf02dec57 100644
--- a/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r2.ebuild
+++ b/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r2.ebuild,v 1.4 2014/03/03 23:58:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r2.ebuild,v 1.5 2014/04/24 16:50:56 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/ruby-yadis/ChangeLog b/dev-ruby/ruby-yadis/ChangeLog
index aa165c8feefa..265e6e5a274b 100644
--- a/dev-ruby/ruby-yadis/ChangeLog
+++ b/dev-ruby/ruby-yadis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-yadis
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-yadis/ChangeLog,v 1.7 2013/10/30 04:23:04 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-yadis/ChangeLog,v 1.8 2014/04/24 16:52:06 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -ruby-yadis-0.3.4-r1.ebuild,
+  ruby-yadis-0.3.4-r2.ebuild:
+  Remove ruby18 support. Cleanup old.
 
 *ruby-yadis-0.3.4-r2 (30 Oct 2013)
 
diff --git a/dev-ruby/ruby-yadis/Manifest b/dev-ruby/ruby-yadis/Manifest
index 130a86bcf7ed..2c6ee226daec 100644
--- a/dev-ruby/ruby-yadis/Manifest
+++ b/dev-ruby/ruby-yadis/Manifest
@@ -1,5 +1,4 @@
 DIST ruby-yadis-0.3.4.gem 16896 SHA256 7e367d88e93b0a466ce967b957dacb420bd2c0163a52ae6eb6046f7618f46ceb SHA512 1811fda5421b630c954a493a227d4ea70a6d2722c136c3b668a33c3c94f4bf9229f34c0e807dadb452a6c74f008461ed3bb3fa192bafe4bfd5e8f1d242e6e5c9 WHIRLPOOL e7b4f1e7e3da25da64d493363fb36b28e766769ddf394d91b1987fe4b3302e1954ec6f8e2df8a4249e8396c84cd665cd0198a5d99eaa6ec991eebe8d2f269d88
-EBUILD ruby-yadis-0.3.4-r1.ebuild 902 SHA256 be27e4299e73199ec64ecc60d28ea3a5a9b2f6fa6de048dce270979aeb4c5cff SHA512 15d2f013aa73b848b5da23d0cf46bef7098a528fb9ae91783fb0a3b61ea06ec4a96f10de40dc6896a16c555d275e684c03198c25820bd3154e6bdd9d8a661dbe WHIRLPOOL cab7293f9eb34d67469df9446c4bd3bb70cf5e172c30c743335a45346c0d6f18ec9316183cb40ef7c0fb2f6b2e2171348aba8b292e1e492ccc458f8d1326e562
-EBUILD ruby-yadis-0.3.4-r2.ebuild 908 SHA256 a36806dd95ce96d4986b889fd3409075227b0e220f95b5dc5542a36e57c97689 SHA512 8eac8e6d96be3918bc7bb78ef12ff125fb9099de5d0a61d2ce6e4f4cb17e3ca23fe47e51640900e7697c452cd43c41f756b79d52750a28dd4a6b9f45610fd1fa WHIRLPOOL eee5cb75ee4530974daae1de4ea349db072db543d1fb619a398f49db36ed09de3ab69593861fff73e28eb6083e09415cc3afdc272857d153308982e5b0d21b60
-MISC ChangeLog 1165 SHA256 a3abaf8de2ea59f33d33393405450fae2eca20c72250531b7687dcdd912aefaa SHA512 19e4c9d7196ee9bbbddb31efcc69583280e48d2840d193727bf33e647a97ba0adcc7de2c0d992c9f2b33173d8c3bb54476c57cdab0c9c75c22faf8a13fb93de4 WHIRLPOOL 69898bf5fa8a7f7338ee12633600bb49de8462f50e366dcc22d4537e7707ff38fa9ca8d2510d47d0d05315654200840a2036014a28ab17d51d3bab7072fe94ec
+EBUILD ruby-yadis-0.3.4-r2.ebuild 901 SHA256 72e74a13d5d62d73c5c8c2cdfea8b82122876f2d12ca1be6334db5251a30ffd5 SHA512 917ca9f81cc00bafe78919a51262047ac6677c17398dba9a88c005205152202a7cd3e32312333d18f1eeafdb11b8409da41939c1ac902659cb2fd40587c29f53 WHIRLPOOL 28d31812cd0447b21b776109a27163788da039389d5cf33507524a81bcfc7df6a3b4fae844f405c5909e0fb2809b55bcbdce74434f6f529255bdb127d78dbadd
+MISC ChangeLog 1311 SHA256 49dc4d3d75881aaa747401bf2702069dc3f913d7396f472ea525980f22ff9a26 SHA512 b2a583665760bdd62e2fd3f316a4e2bd5393a04c53ebee136352f4fa885abc7c57856f059895051dae6f66be3ca2e482d5455188c425dd9609ff7a04c744b8ed WHIRLPOOL d727afc0e24f93613dede5c3717d791c95280e1231e33d9124f7cdff2aafe69e26824ea3c4fc8d66fc3eebf23293eef0a5c3f371d526216eb2de0abdd918ae08
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r1.ebuild b/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r1.ebuild
deleted file mode 100644
index afc914d5fab4..000000000000
--- a/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r1.ebuild,v 1.2 2012/09/22 08:06:11 graaff Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby library for performing Yadis service discovery"
-HOMEPAGE="http://yadis.rubyforge.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86 ~amd64"
-IUSE="test"
-
-each_ruby_prepare() {
-	# Remove live tests that require content that is no longer available.
-	rm test/test_discovery.rb || die
-	sed -i -e '/test_discovery/d' test/runtests.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I../lib:lib:test -Ctest runtests.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
diff --git a/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r2.ebuild b/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r2.ebuild
index 464546ef24eb..c4fabe5bed67 100644
--- a/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r2.ebuild
+++ b/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r2.ebuild,v 1.1 2013/10/30 04:23:04 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r2.ebuild,v 1.2 2014/04/24 16:52:06 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/ruby_gntp/ChangeLog b/dev-ruby/ruby_gntp/ChangeLog
index e71feb87d061..f22a6efb2f4f 100644
--- a/dev-ruby/ruby_gntp/ChangeLog
+++ b/dev-ruby/ruby_gntp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/ruby_gntp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_gntp/ChangeLog,v 1.1 2013/11/26 03:20:26 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_gntp/ChangeLog,v 1.2 2014/04/24 16:52:22 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> ruby_gntp-0.3.4.ebuild:
+  Remove ruby18 support.
 
 *ruby_gntp-0.3.4 (26 Nov 2013)
 
diff --git a/dev-ruby/ruby_gntp/Manifest b/dev-ruby/ruby_gntp/Manifest
index 46ab82a35da1..aee632d724e7 100644
--- a/dev-ruby/ruby_gntp/Manifest
+++ b/dev-ruby/ruby_gntp/Manifest
@@ -1,4 +1,4 @@
 DIST ruby_gntp-0.3.4.gem 10240 SHA256 7f427fd1752e8b78cc288088282ef8261b7e6896d8bb401ac047d6fb6b1d142e SHA512 876b728430183b273bf97a7e7b662c0614bcc21a3d1a7c4c07b2af9b1643c9a9bc96e92843e6118903d75d99b21c2faff0f27c22fbc8822db14560937e6a5dd8 WHIRLPOOL 07d1ea12b09c83016374ec7fbf000f2fa3bfdf086265b4c83fc0760df38288a1ed03a04dbd01ed961e55eb03c07b368ffd4f4a024f114552bd9eaed5ffccb0b9
-EBUILD ruby_gntp-0.3.4.ebuild 738 SHA256 574284f55b1c65e012bb5edd4862ddb4e6cb7381b7c031b55e3e943aeeafca5b SHA512 923f72a85aabaa6af65a7add283ceecb7937fe5ca6648a73beaa299a1bd94a3265a5ef88eb1f18af300e7c86bc92c83c8f158805641725742dfad26c0a5496f2 WHIRLPOOL abc9f4440d6ad330370d3fcb2c5e3ae07f8f4c373d654306c582c8b784867e9ab022fbf42343401e2e043a52dbc6e4c9a3a304b2b8421069f4d5917a1ba9057e
-MISC ChangeLog 348 SHA256 5c97512ae37aa1fbed24dec039556f8ca0f2263f03eb491b92575547832b9818 SHA512 813fb80107e5a9099be3b89133ffe67b00b263f8c429c96af975a3c1f32c3bfbfcdb046d0a8c3103bb3b83bfd89e6edc95abdf8bb006fcc2480a9d4549cdc23c WHIRLPOOL ce1cc38de5c5809b54e8373a2ceb5dc8f35444b237fdeffb680f17a79fe91c7ea4a4fa2dec9779dda8f6e47b702b5cfb357db3c9e7ebf4e8dca40f1cb52b671c
+EBUILD ruby_gntp-0.3.4.ebuild 731 SHA256 ae642e41304e7b523f433f0b6ee4b097915bbe658f67b209f1b3c6b347d56d9b SHA512 474cc8a5c60103029c779d2f33133eaf9128f651fa49b820e104b9d76b0627e08db6eae12bf7ebd03f471a78e4f97bb20cea90962a2a280b3d3fffe8aad2f64c WHIRLPOOL 50a66d0a862e0903d24acee10e98e3e6431986f352a585dcc562704b723ae281893d854240edfcf6ee76a367cceb2a40788c89e3a3bd2a8ce220f6b018091706
+MISC ChangeLog 446 SHA256 61d345fd937ff842b903bdef915faf5b87bde600aeef3ea7bdb31abd2082d955 SHA512 9fb8a0a752dd3a9fd28b4d0f82f66af2e1a6870897838c5aa50e084a6dd8ab797439130c36691e13edf395e37db0f3eebba5f242af3f9f9ef2b4e25f79c0d298 WHIRLPOOL 956d64aab601dde72e7b5735a7abd2a32f65c34d4660f624ad659b5b8a31480c79dc0ea1fa77fb2ca78d09ce82ad55b2cb155eff9c0ec730a83b8ce085bf6be0
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/ruby_gntp/ruby_gntp-0.3.4.ebuild b/dev-ruby/ruby_gntp/ruby_gntp-0.3.4.ebuild
index 37511e61150c..467fa597d97c 100644
--- a/dev-ruby/ruby_gntp/ruby_gntp-0.3.4.ebuild
+++ b/dev-ruby/ruby_gntp/ruby_gntp-0.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_gntp/ruby_gntp-0.3.4.ebuild,v 1.1 2013/11/26 03:20:26 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_gntp/ruby_gntp-0.3.4.ebuild,v 1.2 2014/04/24 16:52:22 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/ruby_parser/ChangeLog b/dev-ruby/ruby_parser/ChangeLog
index fc7800967b6c..02a2f6d0ca42 100644
--- a/dev-ruby/ruby_parser/ChangeLog
+++ b/dev-ruby/ruby_parser/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/ruby_parser
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ChangeLog,v 1.58 2014/04/05 14:21:52 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ChangeLog,v 1.59 2014/04/24 16:48:33 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -ruby_parser-3.2.2-r1.ebuild:
+  Cleanup old.
 
   05 Apr 2014; Manuel Rüger <mrueg@gentoo.org> ruby_parser-2.3.1-r1.ebuild,
   ruby_parser-3.1.3.ebuild, ruby_parser-3.4.1.ebuild:
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 576007f32c3c..5c33c01311da 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,10 +1,8 @@
 DIST ruby_parser-2.3.1.gem 80384 SHA256 d9a4daeb41da89db62c6ba4d31facedac7b181fa5c3ba20b4256bad8cb4fc434 SHA512 2451451cc1ba0b0c4c954d3e208b46c952dbbd7f901948084d192af96f04cc4eae8fdac92e035491daecb150a2e50a38a20af00c011f0bc68b1a962e42b95997 WHIRLPOOL 85b4c13fd3bef0ca1fcdbc91cd04692944d7f6efd23370590fe538b1cfbbbe1365d7bf24b7a783d11a8184143fd7fc2fd68eb404df160bef80fdf5e17f234280
 DIST ruby_parser-3.1.3.gem 141824 SHA256 602b23bfde88e1cdcef113fd013ebf3735b06454372b3c9b5a5c14a5b161fa34 SHA512 e7e5649966a3d5e5f29b018b53d36dd8c33b9d5c14daa695995ed153a01cae90854e7bf6a2164b6b40f17e0e52391a9653f204b74ae9cc155b4c6c55a07c9b83 WHIRLPOOL b421a7696dafcdf7dfacd11bc933010190c3d6ce47b3ddbe8c9817c1f0557d0892d6bcd5fc575236eae43c13523e0163766ad6df31f3941874053a3f6296a84a
-DIST ruby_parser-3.2.2.gem 198656 SHA256 117d814b406876a8b6a85a28e2745de524924edefced9233d597bae6fefd7fcb SHA512 267c18848bda160eddabe06c6a8e7d2334523a5ab36ba2cfe6e293e577efaaec552b8b2c2416eaca83762fdfc99920840e6d4be9a35071ccf69731765dbeee67 WHIRLPOOL 39d183a29452a886876986d08d7f370933fa7b8c633debfc237af75fc6ca0e27f904f1901a1f12f65c1f2a8b0a93100d3939966a01200f9e30af1858c76dc854
 DIST ruby_parser-3.4.1.gem 201216 SHA256 b84fba8fea75d83354c9cf35609a3df7d74669e49f05b654577ef85a27d6b8ab SHA512 33352e5fbcaafef3882cf75a22acec3261c29aec6bf476cd0951f56d9de0a99af11102d46a9d4953ff8138df93adcafc5b84f0fbf02ad78283c2b075b071e965 WHIRLPOOL 3dbcd4a2d4a1c484e2a02a4367c1a1c2ca05a2e3bab34800b1d7be4035332e158cae0cfff03f2183bac4b637c571938fccca8c4832f3d600005cfb7f103faf4e
 EBUILD ruby_parser-2.3.1-r1.ebuild 1286 SHA256 c39c025d2afcbd52e908169bce7f32d8e3ed865278bef85485a9e22a4cf3d3cd SHA512 cf303b23723501c8003056ee9b55eb3f0a0f9d69e47631176ebec29101d832dbdc011c6b5960c0914fb0e4716dd192ecbfa320ba3eada73d779ac281943ed8c3 WHIRLPOOL 9a91d92c76260209bd310b40bec25653654323376da6a6ad516dd1da29c6082855bcd5e4a5d0e7c81d87dbac9ac5dc838fab6d1f991640d56412885349ab055c
 EBUILD ruby_parser-3.1.3.ebuild 1327 SHA256 9988a18a87e46ce2ef83a05701117ec8ecdbfadbc3d599ad1c097a243788959e SHA512 52636e15c856caae0ba768c25541ee20731a183f09a2c77d82cf3687d5e7dc357ff00f68a5ab04cedcf3b521c2e7177e7c46c85c96b7133d3b85853319fd240a WHIRLPOOL 0690f0ec6df55cf7f3d83bdab893366745693b5db64339006ff3b3f7aa106d49f3129c10ec41bd35af204958104eb9fd490a1c5756cbe27ff7d11cba56e27b53
-EBUILD ruby_parser-3.2.2-r1.ebuild 1351 SHA256 fd635e64589d18b2702684b007b35b5d55817bc6bab128c1cecf4df19c83c206 SHA512 565be732a43d80444b890a234474a4203b55fad334238ff1619806b3a1d6d8daad26173b2b13182ad8c45550e8fff3c377393f2b8a9eb88c436cbde91cfdb903 WHIRLPOOL 957ead127c4a1ebb077fef394b1e3fa4c6b1c5186f3e5930fcc727cef6060231559fbb8b7ca189faff1d465f574bbebe0601b2c6249a4ed991bd5b3b96fc541e
 EBUILD ruby_parser-3.4.1.ebuild 1380 SHA256 40c600419afb5d6467bddfed36ff1da7d6d3842c7e5b3219aba037443b661d40 SHA512 0721458fa56d2f8ba45ca50ff73ebc294fad520bbf7220931d974b6a3e90a98ff2bb58817d99f2e57daad40ba27dbf0f3135713a2571c0269ef3565c28320626 WHIRLPOOL 82a2cd3ca244ff88bff7afcc44950923f1b40fd44e26f4a6aa0d7b762e69170736bf30df8a71ffac5982154dbd73ba5ea163b1758fcca1121e1c6821fba68d5a
-MISC ChangeLog 7830 SHA256 f54f71f5d8a43e4d8636fad7b93a39cbc5efb891a3b4532f27515bb66dab39c0 SHA512 56ccaa6ce9f3973dc7c18f2bea1c04f1e0d9c703edf41fffb3981859ed14d333115fbe4b23f540616f9b7f7ca111001dee6676474dcf23f82bc4f7247bdd2350 WHIRLPOOL ee53fa24b284e57f7e7c5ddd48a0e1a952d6c12fe725f9dc070b45f5fe5b04b2cad8875758ca7125b4e5eb868ce3ca9454ba1b329a23f3cc744c0915465b11c8
+MISC ChangeLog 7924 SHA256 89426cf17474512076539f7f9d906f5cf9f10e478902852dda8ab05fa1e4a57b SHA512 408ca90ab5a4b1d49e3a7c8d5f201463ce8691160e4654a44f06df0072733f8a4425bfe10cb73a6f58e20d4dd9d07d8891fdd6b2eac0b3963b4b5ef0a5d1e8f3 WHIRLPOOL 227aafb783681e4d4c320c5c37a49a08436f84de0d333decda1c80ec9344ec4b423dd391dfa5969e0093f6ebe120fbfe29710206ff175466bf127925b9c3b391
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.2.2-r1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.2.2-r1.ebuild
deleted file mode 100644
index 2e838258ce7c..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-3.2.2-r1.ebuild,v 1.1 2013/10/29 23:15:25 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby."
-HOMEPAGE="https://github.com/seattlerb/ruby_parser"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.1:4
-	!<dev-ruby/ruby_parser-2.3.1-r1"
-
-ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-4.3 )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	#sed -i -e '/perforce/d' Rakefile || die
-
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*jruby)
-			# Disable tests failing on jruby related to //n regexp
-			# https://github.com/seattlerb/ruby_parser/issues/117
-			rm test/test_ruby_parser.rb || die
-			;;
-	esac
-}
diff --git a/dev-ruby/rubytter/ChangeLog b/dev-ruby/rubytter/ChangeLog
index 8e98d18e5101..2f25f1ca56b7 100644
--- a/dev-ruby/rubytter/ChangeLog
+++ b/dev-ruby/rubytter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/rubytter
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubytter/ChangeLog,v 1.8 2013/11/17 21:00:46 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubytter/ChangeLog,v 1.9 2014/04/24 16:44:23 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> rubytter-1.5.1.ebuild:
+  Remove ruby18 support.
 
   17 Nov 2013; Manuel Rüger <mrueg@gentoo.org> -rubytter-1.4.2.ebuild:
   Cleanup old.
diff --git a/dev-ruby/rubytter/Manifest b/dev-ruby/rubytter/Manifest
index 5fb491e1dc61..8a3d451b94fa 100644
--- a/dev-ruby/rubytter/Manifest
+++ b/dev-ruby/rubytter/Manifest
@@ -1,4 +1,4 @@
 DIST rubytter-1.5.1.gem 15872 SHA256 4444988defc185588194096ddbe313c90937e69111cd4acf4020e4f13372247c SHA512 79be7b7803a53db654a14ff83da657e3e5016d5bda61e8c127dbf6d85231a8c115d38041aba99fdabd50825135b801cc444cca84c13d174004cda8cc4760bd2e WHIRLPOOL 3587ef2c6b3397458a9d3990d635b3b695c50d30ded902689b1f764a927393e09abdccf21d2535cf11bc1f04e7d5e50a33db2f79b6e2d8702f40899c75cec2fb
-EBUILD rubytter-1.5.1.ebuild 699 SHA256 c7a9baf2c6c34434aa5c0ef9731d5188e0f14c23405e616053c0c70c87eb49a2 SHA512 b46eb3b73863d6bc50d362d81a883ad06bce5bed17d3d66b9eeadfb5c764a00ed1cc7ca8d0e57e215295d26b6f31cee7d36396287e7048b1e964b3825c6bbb97 WHIRLPOOL e5489b40eb543e9875323c287d354013a7781da39b5976c0c66ca1f7fb57560b1e6db90b8d5e1633b134bc799716ecd6835bb5a383cbc26e3d793d9504a36518
-MISC ChangeLog 1184 SHA256 d783fec8ace500802b64eae4c08e138b87c1c630f55929a45698eff9f200b90b SHA512 664aeb414fb85da709d443084373545de6c148bc84ea75763d3e90504e199d1f55a8b4118f2d3a2599cedacf15001c0cc6223778f712d7525f9aab43c3a22c7b WHIRLPOOL 311f130b0c31ed3268ccc7be58628ca3400f4b38c7116ed07324546a19f3d32c43a1a2a5119da23aabc6fbd75c3d11dcaa2e2ad6b950d85466f6e67ab6684a5a
+EBUILD rubytter-1.5.1.ebuild 691 SHA256 ebe88aa6984c77983d7a2fda3a83d5b71f952c1450df7a1c5a8984be78fe12ea SHA512 efe5a2e62eeb47072f0e16df1b75b9b7f2b75bac420f7493f147cd005e6f09d072726159655881d05a22794439db3c5def5024ec93ed7a20f65b861717a385f2 WHIRLPOOL c6520c93e1a168a400b38f5d13d16eedfdf8320a8a05a855b32c9e426b25bec8bfdf53eed76bf5c1de5447b32c9ee30deb3e04861899e2b7832f60d1d442dfd6
+MISC ChangeLog 1281 SHA256 a6f07c61217c685ed6343d3a68c2d06c14168ac1ebe2adea5b880a2f0eb0c62b SHA512 baa3f681da01f2d603abe4019c9fb5edb0a040cabf5e2834db4cbaf8f95da650b93b34133d8ac42731b817c679eac35d59857735d300af6ecf67a146f14ccdb7 WHIRLPOOL 6de1125bf24de9966b69ea4ae0798e2ca4f97a44f4b8209f587cdb187a9b1e41f9b20934dcc4cdefc9726f64abb4444b6647f5fcc49ed4480cdb00073346b976
 MISC metadata.xml 220 SHA256 3876bf94339a6b2a36040fdf7eaeb1dcddff46924c02b8135f615c2d4eb1c743 SHA512 66dbb451ba4115e830d33afa73976cbaeba61ea7fece70a40d282ea075a1543bd40e1a6b1b93eb2a4a46f34f0737227c80d7e5011380fb2568a994638ac56776 WHIRLPOOL 0c2761a8fefbec57d963f3c47332454125585f59d2797608a14e9c3961e311de5e02076ff66382972ca6737923d541a7da767a20010822e29340b663b5bf5464
diff --git a/dev-ruby/rubytter/rubytter-1.5.1.ebuild b/dev-ruby/rubytter/rubytter-1.5.1.ebuild
index a70c9b8b24d7..3bfa44fa4896 100644
--- a/dev-ruby/rubytter/rubytter-1.5.1.ebuild
+++ b/dev-ruby/rubytter/rubytter-1.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubytter/rubytter-1.5.1.ebuild,v 1.1 2013/04/18 06:00:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubytter/rubytter-1.5.1.ebuild,v 1.2 2014/04/24 16:44:23 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/rye/ChangeLog b/dev-ruby/rye/ChangeLog
index f3b23037e0f4..858c085088c9 100644
--- a/dev-ruby/rye/ChangeLog
+++ b/dev-ruby/rye/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/rye
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rye/ChangeLog,v 1.23 2013/04/18 06:01:42 graaff Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rye/ChangeLog,v 1.24 2014/04/24 16:48:42 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> rye-0.9.7.ebuild:
+  Remove ruby18 support. EAPI bump.
 
   18 Apr 2013; Hans de Graaff <graaff@gentoo.org> -rye-0.9.6.ebuild:
   Cleanup.
@@ -105,4 +108,3 @@
   14 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org> +rye-0.8.13.ebuild,
   +metadata.xml:
   Initial import of rye, needed for Rudy.
-
diff --git a/dev-ruby/rye/Manifest b/dev-ruby/rye/Manifest
index cc43ad7f7d53..0bdb4a32447e 100644
--- a/dev-ruby/rye/Manifest
+++ b/dev-ruby/rye/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST rye-0.9.7.gem 47616 SHA256 ea98c7dd91a892cea477d55d1d7fff8cf0c4426b96da9e57311a5478ffd0ed3b SHA512 e2da743e27b24d5b03b038bedd3d662daab6acffd8c3a6fe3b672d76c4395c4c91ab65c759384ac53b5ed08d79a04e848154c6490e2074774a76327c522a9e46 WHIRLPOOL 3c300a58de6d0f94c83bd1e77eb75db35f562cdecf85b340a61dc1b2fd8cd471f5af1f67036310f270ab04582e842bafb4f4db667cd13cee62e23ae95a441c31
-EBUILD rye-0.9.7.ebuild 1254 SHA256 5c3a492630e5794c8405aea62e16eebaaa10e2a14d4c5def04310618db0c1571 SHA512 0713ff3fc69c2a2b95ebbb46058e6e426a987cf888aaea56427b312cdcec26eb19d9ce7a54f8587da661d7e6ab67e0cfe4dc884d7bcf41279c808b88e56391b5 WHIRLPOOL 4a06f84950d7e08ca6aed1a52c8814bff28bfb77ca73c671a0d73045e65d457df3c57692e9ff94afd156ef5dc1dca3f68618bf756cf5a0049060c12d09498eb3
-MISC ChangeLog 3027 SHA256 c8d0124c8c7aaa030d89bbc3269439e4ca670b577a68718ec440bb565c39dda8 SHA512 e51cac2bccd7e8065b022c55748676b34e6a7ca5d4b75b0debda21f54d00ba903a859b8d43fee4879a8e944abf775415e094391f23bc19da88b6d2dab035c18b WHIRLPOOL 4e50caed9ba62604459c3774eaf77c7dee2c8d1430d1a7824ae052d814df87726a9574f8e770dde401ef073b985bc545ded411ae6e53d171958b79778ece04a2
+EBUILD rye-0.9.7.ebuild 1246 SHA256 2c151875c4c04d14464684628022581b2afba55ae7c4ce9fb0464636ff1c98fb SHA512 0b920e9eb0bf5c87e42b90638a4fd1ce81eb4116d7e4e9c5cbba912a9b4cd8f3c46d302d290cd9b4d4ec5b4b7880e9c1af94ce559237f44dab5185db09e704d4 WHIRLPOOL 1c3f5826272a46450bb590db1cc32b25002cc555ee7de5c7dd0ebd279c63622afcf50d0a069fc4cbfeee7c0234f64b538309b6690b562a83788ce990165871ba
+MISC ChangeLog 3128 SHA256 4b80a807ac78e9ba0544970923a3593fd1475e9dca84f9ca5e622e61e5c2a07a SHA512 f95a8c9cded6aa1dda65e240278213e7d14b19938e7e618f3a2035617d12ec44868c5bd135745c7398a2c35c92d2ca3b9b3ca53119d4cfa17d4916e35cda03f0 WHIRLPOOL ab32f9905e76c01daffb00684a6168e0110b3ddcd48a0eb045f0073dc35a706cf4a6b20e17cb1ce9842d2463f8afe3714cb438c21c1c97f51ddb4e8de9106044
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EAREIAAYFAlFvjEcACgkQiIP6VqMIqNcBLQD/QkmK/TixeQSFpoopdhVq2PlZ
-y/mdImKc4pBai1ldZoUBAIMq3nxY24CYxfNn13ZhcCOk3PEeITfAAU6vCDy3BRuZ
-=Vn9X
------END PGP SIGNATURE-----
diff --git a/dev-ruby/rye/rye-0.9.7.ebuild b/dev-ruby/rye/rye-0.9.7.ebuild
index c0684408fcae..13c6d6f3e94e 100644
--- a/dev-ruby/rye/rye-0.9.7.ebuild
+++ b/dev-ruby/rye/rye-0.9.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rye/rye-0.9.7.ebuild,v 1.1 2012/09/21 05:51:41 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rye/rye-0.9.7.ebuild,v 1.2 2014/04/24 16:48:42 mrueg Exp $
 
-EAPI=4
+EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/samuel/ChangeLog b/dev-ruby/samuel/ChangeLog
index f58d8d7d340f..fd337c667e62 100644
--- a/dev-ruby/samuel/ChangeLog
+++ b/dev-ruby/samuel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/samuel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/ChangeLog,v 1.21 2014/04/19 07:38:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/ChangeLog,v 1.22 2014/04/24 16:46:21 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> samuel-0.3.3.ebuild:
+  Remove ruby18 support.
 
   19 Apr 2014; Hans de Graaff <graaff@gentoo.org> samuel-0.3.3-r1.ebuild:
   Add jruby test dependency on bouncy-castle-java, fixing bug 349766.
diff --git a/dev-ruby/samuel/Manifest b/dev-ruby/samuel/Manifest
index 881123ae0578..7daf11948d34 100644
--- a/dev-ruby/samuel/Manifest
+++ b/dev-ruby/samuel/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST samuel-0.3.3.gem 12800 SHA256 a0a566e27f654aff0af30f34d80153201619ba9fc5c80ac891c9719d2f84a048 SHA512 3c668a45ac6eb58d236722f1d9f23cfa02d54506309427ad4c6ee2909a6d3def109246c7f7f98a9c26cda0ac74b54c610c4cc0fc18110bf9b45d1aa461f37f57 WHIRLPOOL 9d90f09fd34c48b9213ddc15c1432d400c44e950f717da9ad536477d9bb3d6fddca6c5ab728bacfdc4f9cd0af983c4191cd952c0a5ff0bad403ff15366c6b151
 EBUILD samuel-0.3.3-r1.ebuild 1258 SHA256 b73274f3c809df14c44b84944912c6e4f706f223111c07d60f72bf6c38f16828 SHA512 07d8491f5af8345c0a18230c9eb3c98225bc83bc10dfd73dc77accac70fcd30f8b991f525d42058b30602394f69c8c341484adaa4ad4756adc380a6dce701164 WHIRLPOOL 255eff77ec90e2d1e37a2e7d7443cc8298f462427800865b18b2f213a3671797a19eda4b4bfda7cc3ca64904e53ac416a5e2ed32d554e165b9c1cdbcb05f4f6e
-EBUILD samuel-0.3.3.ebuild 1024 SHA256 73343a68e940d71fb185415b188505a88cda04074b40207d5b7f47a829a63e79 SHA512 6b3875199dafa51eb2ff0a857b0d0aa66304a711c852823ce57ec07f18e3706e352ba79ced9c9c2d2933b84c957aa844faf282d05d0136fd0d63eb114b1b06f9 WHIRLPOOL dbc276107015be9f7afc0fcda59fd99f8a29af64ad3a44a3d441cd1dadef5df1dd18fdf7cc08767bb6362ac2cb71a3c0a051acc03734a23c22b30e103bb99b44
-MISC ChangeLog 2801 SHA256 af59857b38f3735e5c2a7c72a7568a4b6c5aa346699a59aac678e1d0ced26006 SHA512 2134cb3114a7cad0f1c7593fc079f622a1f29346fcc41c264d99eafc8328a962946dfb99efec3058788d6e0a07e12f907e254ecb6a1c6760999ef4a23b84c723 WHIRLPOOL de9e43c1940af2feea8f421943fa4434630c77db7dd4207477fa6c24239e028f61a93c92760b643aa48eb26b6c052b5c18a0d963f2f4d77d21e1205e9507aad1
+EBUILD samuel-0.3.3.ebuild 1017 SHA256 50a98995980baec07398e68290c7b0f6d8057643cd36dd6fed7f26758f5af29d SHA512 ffe668fdb455e2a5609b2e0deebbb3ba07a5d72f44c18dd3fda1067104b2a66ebb8d305a5dad5f890bd5922804b10ad2857608c3f9c3731ac5e9622ca83d0de7 WHIRLPOOL 4ad58a9e861512fda5b59f8f206ef9f6430d183a6a2ff239a4c867092ea4274b71ec50ab286ccb5e597945a061cc9ceddf2661bc611f02457a4fed1c303cd016
+MISC ChangeLog 2895 SHA256 1270eb53627b25459eaefa09fb0d8341b2111c0d00abba97d350d2852da56efb SHA512 a3841ae98c0ff74fbbf0e5c7f93f9ec3cb287e76206f3e002dafc9bc5c2d0b48aadcfd58117c861418724c426fe30833f57cd8d34f3c19ac5dd49b5c19b05ac7 WHIRLPOOL 5634863d857f0cc9b2392981135a06bfca3acb842c3cef9a2e23941e21e88b1406f3d4bf5252a9ea52946f2e2ec598cd5677da3a286423e47bc77eb5b1f83510
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlNSJ/0ACgkQiIP6VqMIqNcvbgEAgiT7hTnVbFs5FjH88xFX6RFg
-LJluZ68NNQWXvH2IPYgA/RVyyqRl9R0yQMEebGUeYI0tjtpFlf/mlaObyBP3OLaa
-=7RkV
------END PGP SIGNATURE-----
diff --git a/dev-ruby/samuel/samuel-0.3.3.ebuild b/dev-ruby/samuel/samuel-0.3.3.ebuild
index d25759fd6c07..9179eb15b0a5 100644
--- a/dev-ruby/samuel/samuel-0.3.3.ebuild
+++ b/dev-ruby/samuel/samuel-0.3.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/samuel-0.3.3.ebuild,v 1.5 2013/11/17 21:08:38 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/samuel-0.3.3.ebuild,v 1.6 2014/04/24 16:46:21 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 jruby"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/sanitize/ChangeLog b/dev-ruby/sanitize/ChangeLog
index b2cb6c4a6d6a..148bc7926c65 100644
--- a/dev-ruby/sanitize/ChangeLog
+++ b/dev-ruby/sanitize/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/sanitize
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sanitize/ChangeLog,v 1.3 2014/03/28 09:19:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sanitize/ChangeLog,v 1.4 2014/04/24 16:46:32 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> sanitize-2.0.6-r1.ebuild:
+  Remove ruby18 support.
 
 *sanitize-2.1.0 (28 Mar 2014)
 
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index 9950d8c875de..12f38e75852b 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST sanitize-2.0.6.tar.gz 78888 SHA256 ecc0526f231d68dd88efd957145f79841f446ba36124e28c91ef275cc88cafb8 SHA512 e086d6963e8506d498266f0642dd70a9151f38760c1cac69cbba08cde9af291989be48770062dfe824be87f59b21f3d8c125579d9db227f8edea0f93a0993893 WHIRLPOOL 6742f6c06f7b1fc750c76c440e6ed6fd0ee384c6b8afefe0cf064d7c4283e4d877ae9347d7fd392cb1cbfc44798d93d0915059d77aacabf3938ec54ed4491d8e
 DIST sanitize-2.1.0.gem 20992 SHA256 c3be075f5b38a1b02404be5778b181e50fba9ab253bac851cb217d9a71375b77 SHA512 29a26e37342a75af2bc7795578edf2c5064263c58d38dfc36e18f1e111271616c026f7d808a05d63185c12f0e52384db84d62bdb796bf1b21d7e902ef0c1d096 WHIRLPOOL f07c3f7c3550b1e47e3189838a8c1c30c7cd856f237dde167516f25e86520fffe7357f87efd4f2fcf03230650fa55da0ff2d7870746c72c9897318f6dc935cc6
-EBUILD sanitize-2.0.6-r1.ebuild 866 SHA256 eb267513461a0e27328d494c096ddc1e549622aa7a023de9617a4a19a56ce971 SHA512 036780f144de5384275619e8dcd7613b3c470d44c2444c57097e9c2bb64705f5f212ad11a4c53c08c7eb6ec2ce0065965f8a1cc83ff83afce84924874cbde76e WHIRLPOOL 75377c4fec6a791ffcc1cc5bc1d36d112b16bada4192fd58e9e653242c2390f6e50e23e943c3ea4ab9c93b1d59bdd6286e1facd69f319a17855d3c2069e126a2
+EBUILD sanitize-2.0.6-r1.ebuild 858 SHA256 8630126db5970a6d40a02fcca0aac7350ea7315b275ca769f4528a68227dc5d7 SHA512 108f9da5fcb0e01bea0c888306f03341efae1dfdfb3535e023b70ce1169b7d844f73503382fd8147e29c7209403e2ee8a1b2fe3471f3948c13bd514f89e2d76d WHIRLPOOL fd13fbd2e864ebde3b58f1bc6da5a40185daee02efaf0d80af45c056221053d7a5c7ee110d290fb73c7763064f04b722088ae13bce1dc89244f87a86168fd64d
 EBUILD sanitize-2.1.0.ebuild 696 SHA256 c922d9621964484ae5f561d25c20354f2145a391dd050f48baae815108c99d6f SHA512 f324976180faa94e6eb5f41fd5228f39e8ca5c741ccb32798c0a91a4b0e4f0f003742705a38c350405f27da656155f6759f58c74bef86314377ba119625da0d5 WHIRLPOOL f482c79504b59545f48ca00abfbc2488f684988c1106d52a3b6566bd910a25d76517817876216783abf56663c3031068ef0dafaae397d54cd5b8a82ddd316da4
-MISC ChangeLog 727 SHA256 2fef238290e13656d69222fc7d39b3fbc1e1b7b6e691d1ed909eaa1aa0e4e288 SHA512 373882cb5d9d5842efc33c3c642b4003da9bf899063fc5b1fbb415be9e8cbe9678d826881b6230ad7eccaf31a6d81ed309b6aec30f4acf75dbdacca7c244c2a5 WHIRLPOOL 570b98da6465874e6ba2058e06762df1d060b3b67a7980ab950b509976bd6e6b6235efd2f4fb774fcb83b053d7aedf775c811bc2ea8aa7eee4c1c158c86526a6
+MISC ChangeLog 826 SHA256 3a10a472235570b6a547b149ee8343644b0ccbb30a357efb2f8f959383e30272 SHA512 26466c923e6a697c5ab2ac8c08db739d1cd1a6b2ed0262db31973fbb7ad1e015d0aed1d126ddb08d370e69e0f57b3819fba9a8ff5fe3f2a363a5cfb9db75b14d WHIRLPOOL e286a538211686fcb38f9a085a2fff7e79b15fc3e694710f0e61a5be4c7671d453890f0361690c9640bc5fd1027f745f4e267a8fff00a0a0601f5aa117474bfe
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlM1PqEACgkQiIP6VqMIqNePvgD/W4Z1xfHxXvGyGtWZV/7Fsp2S
-PfSvfjfIkekxElyUVH4A/1wl5QSinssyOcfcRXua994qnWwNF+iYbC9KwvQS5Qid
-=AgeB
------END PGP SIGNATURE-----
diff --git a/dev-ruby/sanitize/sanitize-2.0.6-r1.ebuild b/dev-ruby/sanitize/sanitize-2.0.6-r1.ebuild
index 68fc47b11e7d..0069cd494355 100644
--- a/dev-ruby/sanitize/sanitize-2.0.6-r1.ebuild
+++ b/dev-ruby/sanitize/sanitize-2.0.6-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sanitize/sanitize-2.0.6-r1.ebuild,v 1.1 2014/03/26 06:47:19 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sanitize/sanitize-2.0.6-r1.ebuild,v 1.2 2014/04/24 16:46:32 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rake"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/sass-rails/ChangeLog b/dev-ruby/sass-rails/ChangeLog
index 817885de2c7d..923b9693013b 100644
--- a/dev-ruby/sass-rails/ChangeLog
+++ b/dev-ruby/sass-rails/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/sass-rails
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass-rails/ChangeLog,v 1.15 2014/04/21 06:22:05 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass-rails/ChangeLog,v 1.16 2014/04/24 16:47:41 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> sass-rails-3.2.5.ebuild,
+  sass-rails-3.2.6.ebuild:
+  Remove ruby18 support. EAPI bump.
 
   21 Apr 2014; Hans de Graaff <graaff@gentoo.org> sass-rails-4.0.1.ebuild:
   Add ruby20, ruby21.
diff --git a/dev-ruby/sass-rails/Manifest b/dev-ruby/sass-rails/Manifest
index 9f6fb07cb322..154e42a9b131 100644
--- a/dev-ruby/sass-rails/Manifest
+++ b/dev-ruby/sass-rails/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST sass-rails-3.2.5.gem 65536 SHA256 ebc9632dc11dba92867540d4329c0c958478714108ed42bd7a91c4b2a717719c SHA512 4c8bf95a672ecd1a2b000f7319230bb3274945d7abe7e211e05f480c708e3cbbe3e770a6bd25cddc9859ba1b4345c931d17e5ebac2964bc9cc3f6b714ee81835 WHIRLPOOL f3364b63df353a226a7dd5886c75bda99c152759e86c6456ec4c85267efb16252440ab79a8247a3dc17ef525df8497aa55a239e98dadd463272a10d789f82376
 DIST sass-rails-3.2.6.gem 88576 SHA256 a8e5618ecbc88b1b1678d3f7ccf5639d70da8e421b599546c3cef5c9627f67ed SHA512 ebbc9b3901176871dce8cdce3f3896fe726bfa7a826420ec6e313d6573119585a70d10cc008aec5e58888f60bc4794c08327c3e2743b11cfe3cd6305cf6e942e WHIRLPOOL 3432ab8c4f02d1a4b1421c04ab90682e4dc5060df67c3d86ee8c30363974a81ea10c98fb56ebacf1e1be505fa466dc5d295fec920908f83f3a8ba721b9344ebd
 DIST sass-rails-4.0.0.gem 91648 SHA256 e4212e52447bbdcacf236f3bbdfe5ebb4652c0529b9c9289bdc5bb0e0e6c90b4 SHA512 28f3e3cb54371ae5743f2e40e20abdb53a0f77bc9645b7a17bcc78c5cf6201200b20e242b3f4a44d6d8c609bd5e514e79e35e27a89b11b737c25e08cdefb20d4 WHIRLPOOL 973814972657485bd5e1b539204a93a5479e4a9ad81d519be684f7d2e6fb963c6ea6cdc89d4e9455ce688bdcdbedb08ab3d1e5eaab4bfe7e94233d4d6eb25e24
 DIST sass-rails-4.0.1.gem 91648 SHA256 01f6aa4d7c889b6a9b78f22ed7e93a4a4a73633479fd9f465387ee77a3654a07 SHA512 dbfe1862e9625dcfd59cba2c05a6b94fed961b961f0ffa7a3a2ed466fca6ec53cb81c7bdd64a0f5737f2e90ace3bfe86e11297119e39f00a43d260bc19465084 WHIRLPOOL 3badd411ccd0982cc0171a19f0671f801cc14ca8cc6b7c808ceaf68fb025fa59149721fcbecd804094533ef44218a3ae70392b0f7c8292e356b5f2d7704a4015
-EBUILD sass-rails-3.2.5.ebuild 1075 SHA256 827bcec95b9b6b9df0f3e8f403fa785d4d9f579c0391e0adeec97c60253d8802 SHA512 06eecac9c9cc0979c01efb3cc8306404427212d0686154aabc6295c2d530b7fb3f270cb28f6c4a681eda4571400ca5a21c7acd7618f90edf317fb5d5f997ebb1 WHIRLPOOL 6964d42a4d393cbf6cceff96e6cffdd3a193784b754a077a920257efc8e54bef680c8907e4fe9d553e035e11ab72b11acc91bba558a1c88c632780130bc4540f
-EBUILD sass-rails-3.2.6.ebuild 1076 SHA256 60ab96671ce0af195459262f5cf1e5ea70e1637616cc18983f78349adc623cfc SHA512 a04cccd3ee53014b7018383ded9a286ce173b5245055a069f971f786bc944df051d9fccd76969ca986a4d478593c1121c0e71a4bfd872c64a9b718e13d9f29c2 WHIRLPOOL e428fccd6152f3b9abc4282ac2ad6fcecd743aa2de5c73e8d28e4be7ce92ed0aeffe9cd913685a0775d76d93fbb7ff517fb58db44dbe4e6bf2474c77af69318f
+EBUILD sass-rails-3.2.5.ebuild 1068 SHA256 cb0ec1dc947369bd65a2293821d2dad3d6afe38fe9f53fa259d3a1621b6bcd9a SHA512 028c40fa00411e3e0fe89288d3a1bb7edd9eee5696494b1a37d08a9d7592a970efc99e471c8060dfca623d4a78f76ac9e613dbe32f2c1b4626616428616ede7b WHIRLPOOL 54ce9a36011c2cc2d1d46623d7952ed683744173fce2b1f695b3ecc9fea29430923567663d6f0fb315677fe0dde26e9cfcf77bd03f249f627a13ff0527f94a3b
+EBUILD sass-rails-3.2.6.ebuild 1069 SHA256 062aeb9da4041be4256aa79870ffb6157869a3a9e8f0236a82ad56bfeb272b87 SHA512 c61aa4de89534489b2f664962ffd8bebd43edceb3748d8b0315e4ba12d104842f7d95c2d6df9ffd9e31fe338491db623bd65572ff2ea257079a14986745da8e6 WHIRLPOOL dc0172ae96658201412d8b3387976814db61ae9e827c81af470c3de98d2f3cbf0ff37d048f59a1d89b38e50ddc4203b6278a69477d5e2e9088b9931134bb20ed
 EBUILD sass-rails-4.0.0.ebuild 942 SHA256 c66ef24698482b80388e084528df570cd5b65631b3aa33aa0f30e26b3d2e5a0d SHA512 ada9f673148c07daf37d0ec28b4b89f4f3324f9c90b0e4a78e57b03852599f5a0f26cd4e67015d5af6e1a115e56e964ab7e4b568589ecf03264d889fd150a5b8 WHIRLPOOL 460664655f6c9bc7ccd1c8689270b251867a6f6de7aefc5d7b325aaaa2759dd2f6235bb36858972f8afb4212f8b7698535bdcb1f2a0e2c225e6d3b92e0659dd6
 EBUILD sass-rails-4.0.1.ebuild 958 SHA256 6d0d896214dbd83336c6d9d35b30ac8ba6c13e812a6358c4f6dd071254a2cc6f SHA512 0d7ac679f06a43b224896c9133f6d5fe02e1778bcbdac115443916c1a56a164e3b96f6258385e0ca6e8cc63bc6fae13d6b62a30e3b82ec8c7e59888458be245a WHIRLPOOL 02b410c97c5dbdb852406602816a8628b5c77da1a7946c427896e41885e33cbc11b26af20c1ddee14f2458f7b8f103d3beb63e9fd978df9ecbf002052bdf7d88
-MISC ChangeLog 2112 SHA256 38846912d9c1627d0bf8e84ede1305d0e380c50c4453290d3e437753d539c7fc SHA512 04756ed02a55b7836d62e5a01cf03dd75210235a0d7770250c6c43c22b5fd4d15abc8c9d7a83a541a2a3aa8f6ce068d999c63049bf9ab7049bf77d965597e337 WHIRLPOOL 60b1d69efac2332fa8e7306d3e0121a4baeba5e5e511e670b63466fe3bca79705e3b3c5ad22abda0445169f2513ec6c6f4ed2c1d664a471f21cc4847fa21223f
+MISC ChangeLog 2248 SHA256 2cefd355b1d4d1e303b5374dffed005a0f73187004612fbda9a2e0277ac3165c SHA512 a46a977d4a4f2f0937aa7cfd8a8a57b0d28717f39652b0d00c642ad66451c4eb7ce094be3b223c4884cf1ca94fb3059990748fa8945162472be420429c8abf10 WHIRLPOOL e9175072a71cb12b0442dca3f8d600fd0adfaa8f2bde2e7dcf78a29a2d85013c182db6e96e600d2f18f9bfeebf6c597cb34b27bb10cbf1dd7cb02f4f2490ec87
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlNUuQ4ACgkQiIP6VqMIqNdcmgD+IuVHs2SAniTZk51SHoQJjpTt
-mDuz0J0lQvkyjFDbqqoA/RG+YULxH6xI+7UP0b8BgLp2U1PjuAQJlLERHQ6SiMJH
-=2aGw
------END PGP SIGNATURE-----
diff --git a/dev-ruby/sass-rails/sass-rails-3.2.5.ebuild b/dev-ruby/sass-rails/sass-rails-3.2.5.ebuild
index b885eeeb98a6..d3a8b83e0738 100644
--- a/dev-ruby/sass-rails/sass-rails-3.2.5.ebuild
+++ b/dev-ruby/sass-rails/sass-rails-3.2.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass-rails/sass-rails-3.2.5.ebuild,v 1.5 2014/03/11 01:16:17 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass-rails/sass-rails-3.2.5.ebuild,v 1.6 2014/04/24 16:47:41 mrueg Exp $
 
-EAPI=4
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.markdown"
diff --git a/dev-ruby/sass-rails/sass-rails-3.2.6.ebuild b/dev-ruby/sass-rails/sass-rails-3.2.6.ebuild
index 8112ffb8eecb..0f8e017492db 100644
--- a/dev-ruby/sass-rails/sass-rails-3.2.6.ebuild
+++ b/dev-ruby/sass-rails/sass-rails-3.2.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass-rails/sass-rails-3.2.6.ebuild,v 1.2 2014/03/11 01:16:17 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass-rails/sass-rails-3.2.6.ebuild,v 1.3 2014/04/24 16:47:41 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.markdown"
diff --git a/dev-ruby/selenium-webdriver/ChangeLog b/dev-ruby/selenium-webdriver/ChangeLog
index f70f46be8676..1d1806e6f765 100644
--- a/dev-ruby/selenium-webdriver/ChangeLog
+++ b/dev-ruby/selenium-webdriver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/selenium-webdriver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/selenium-webdriver/ChangeLog,v 1.58 2014/03/31 01:22:19 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/selenium-webdriver/ChangeLog,v 1.59 2014/04/24 16:58:41 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org>
+  -selenium-webdriver-2.37.0.ebuild, -selenium-webdriver-2.38.0.ebuild,
+  -selenium-webdriver-2.39.0.ebuild:
+  Cleanup old.
 
 *selenium-webdriver-2.41.0 (31 Mar 2014)
 
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 62dd17b3c7d2..af082613fbf2 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,12 +1,6 @@
-DIST selenium-webdriver-2.37.0.gem 2914304 SHA256 564f87ffd70fba9d6059b99a73a72f5c1065f5070440dcd9117ed87032afa3ca SHA512 aeb2b70a4f9d0d80cc6755f0c7847c8d269a37e72b740745975f9db66ad86fccf4f439112b820ced2b0ab70031a43211527795556415ce5b60b404ca3087e5ce WHIRLPOOL 6ad357d01557aa7e66f47bcd717e3b4c2788cfb0f71f33df553bc912e3a4d2c5a8d044145e7cfe501bbf66cd883e0ba1c6d1514e195519520370cfea36916b5a
-DIST selenium-webdriver-2.38.0.gem 2726400 SHA256 742d12a0e0efa7e587b44bb7ee4c22a17d1da3d6128029bef987284eb64aa490 SHA512 6158affa7d8ecbdd5319005183905305be114d1f60a05eb8ea5a3b2dfff26e059224f759584344ae9dcb95f776c7641246b3150b74a5bd16ec9b810dd6757f68 WHIRLPOOL 6db0828aa3170bcdc2a0711e89571dfe916f7fcaee6b7ec4c0921838fdf232a265fe5338b11c2d128f25dc9976dd01d2f5d14a3ae30cfc1bd46842624e791317
-DIST selenium-webdriver-2.39.0.gem 2742272 SHA256 a65d44c3a7a22a8eb92866f93a12932240ae676c78e9ccfd5aeacdff7a385361 SHA512 36b6c3ac252991dab66ab9cd7ca3aa9413169ca342dbde58e8b874989b9022441498b34ba7578d429955b7757c3360a65f9f14252b34c18f903572d29f9d528d WHIRLPOOL ba06fb85efb119afe1eb659a6a2ecbb2b09da44bfd919a9192912886ed41119a157548819fcf1e8ce9dcfb7de00a182bba024e4ed35609b6fa07fe58b99d54ba
 DIST selenium-webdriver-2.40.0.gem 2742784 SHA256 d70da50b3d047389a6c6568c390190d3468dae347694c4f883eabde54e08b7c3 SHA512 b1833b90bbf5c5266065d9dd5bc8cc283a9f965d534c79558aa3ac9aba48a882ac9751135989d2528a4e41489c0d5de88fa3eb6b1678e76c9c1b797ec8049fc6 WHIRLPOOL ef0552f9f3c11a434b4404ff2dafc5f4042119e96840b78acf0268b160d628477da47480519c39a0e085106419be4096cfac042a47e53c59e76d1e84b15cde7d
 DIST selenium-webdriver-2.41.0.gem 2743296 SHA256 bd86dd671327017b33fb9ec7090d1a0f12eef7efb930f8bde91b5399dffe5273 SHA512 252ee9d397a4a194304972a10ecd2d21e41555dbb02c48285690ee4baf8923603fd83722616de4195fc3c1fa71f241d64f8dd6dedd69a6a0bbaa5fe9d31a38b7 WHIRLPOOL e3893c83002cdcb1fab491fdd1d18a769f44f4c88a84ffa7b9442f3fcd1739e836823ba4897b9a6b314f9479ef4e5c7331dd4ca1d84ce5846367e433b54dc87b
-EBUILD selenium-webdriver-2.37.0.ebuild 1301 SHA256 2d145200bca9cc8d09f8553c7d4509888c7af38af19e8613af16d6df7fd016f5 SHA512 2a6d61f76b2a1f3e0893eb7b416b413b40e06f79022b3d83b1997a8f11939b74526d88516dc55c298d15ee304b572fb98f4dfd01b791a9aa5a3c7eca58ae91b8 WHIRLPOOL 7e5f318cfe6d255f657c6d978d2cb3d20f6547f927831ea8da512a12d375390a8c78562dba274ba44c9d5284adcaef7ac84b9018fa0ca8009440eea0bc787c23
-EBUILD selenium-webdriver-2.38.0.ebuild 1294 SHA256 30f908a250ba13c8257e348964e17c21f3b15e8337efd5e4fa19df740274a804 SHA512 e087b1322b561674626747f35b4b2ae8dc0f1dfa1b42b30bf66ab37365f61364baea887c0aa39be09bb8965e5dcebc69e57c96a0edfa7181211e16a495188718 WHIRLPOOL 46207e4ebd39e090ef9baea5339a63c1c4b7de840b5193e0ada90d07997c247539cc478de26475e6b4ebd1cdbc3e5ac479505cb700655a30e6fa404608d522fc
-EBUILD selenium-webdriver-2.39.0.ebuild 1294 SHA256 9c950b36c1c774eadc39e2e44b39fe92a78777e41c469b5290fdfa138931da28 SHA512 0e682dbd3d3515f41683989cba200f0815070864369939158fbe8906f82addd9b451f8fe0f6954be332d22ec5a7938a254b0f148d0cb779a2703b589cdf48523 WHIRLPOOL 23650df6474f5d6b60b9d6dadd45f3066ab7682bc958869cb72bf02b9abd6fd30829b1e1194c911a5fd64e08d2b53e0c49093ad15e2d2fd2d9787dcf32e69301
 EBUILD selenium-webdriver-2.40.0.ebuild 1294 SHA256 f956fab9ae92603dfe3bce40350c76393dec73e27a6875bedfdc6292863303b5 SHA512 740334b5edda5abf83bd6abbe4cc9eba19e12ce314a94825e06b069b3f368e26ea5ff0459b28b50bf2d7504e9a9a92086615237ffc2123b2d9efaa6f0ff77fd9 WHIRLPOOL d07895f34295b5c0c8a1e63535b2870373f81dfdcfaeef42121802146d0f0a8d8a66526f50b12dd608d93fc8c30dfb549d42b862a17d7d126cd3f0f0f15d123d
 EBUILD selenium-webdriver-2.41.0.ebuild 1293 SHA256 fdec25e2fdc869ece76302eb5054272c8419202a04759d69b97be7f7134900e6 SHA512 0f790b59c1c92080db1b5c42a7800af3540ca41d8b5617ac91fb4a408767bdf835af9240ee16ae86338d6f65d04868734bc83ea013c7700e3eac7cadba6a1e89 WHIRLPOOL e9983c16f77983d7b5efe185f2eb1e8c58bdf31b8b21a64b34073a4a5c4c6ce70ef6e9ac2d5dbd5fa1c66799398a0825e945d5d68ff8c00c59f6d2570dbadd13
-MISC ChangeLog 9141 SHA256 da1db10102376534955d81c0541275ad0b0a4e7679912c9c02d5cb838ac37e9f SHA512 b6145d7c45c5dc3ceff551eae064acece6d0aa8c4a18cf60c3380281304b4dbe8ff70e0bc2dfd6913ab36699e72162bb8e579c862d212303bf5d3f689f6050b7 WHIRLPOOL e2d97cf1ed78aa0aa2aae6e4a5b92dc83419cdfcc35d962e464ae3b330375bc845bf161213ff728343ef5408a35deb91b105ed19f0ccd2fdb1bc69dacf74fdd2
+MISC ChangeLog 9314 SHA256 cdb5b6b425de9902dc6b1a74811fcc6736d4039ada43627d86868de879858115 SHA512 9bb51ce98aa180280b0f2929f8b80210bdb2cacc61748e5fab38db420cf8d92386f3ee4d033628af1430cc345d01e336ab93877560f859ebb6de82bde1b6cb59 WHIRLPOOL 6550327624bb9bd9f26c36f8b021c3554879b4c10313e4e7955f455aa8d7ec176a4bb8cb1387084fd049546452a21e0ec8ca3fdc2cbc661ecb1a1913b1eec776
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-2.37.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-2.37.0.ebuild
deleted file mode 100644
index a30df9040cbd..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-2.37.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/selenium-webdriver/selenium-webdriver-2.37.0.ebuild,v 1.2 2013/11/23 08:08:42 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at http://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver."
-HOMEPAGE="http://gemcutter.org/gems/selenium-webdriver"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.2.5
-	>=dev-ruby/multi_json-1.0.4
-	dev-ruby/rubyzip:1"
-
-all_ruby_prepare() {
-	# Make websocket a development dependency since it is only needed
-	# for the safari driver which we don't support on Gentoo.
-	sed -i -e '/websocket/,/version_requirements/ s/runtime/development/' ../metadata || die
-}
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-2.38.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-2.38.0.ebuild
deleted file mode 100644
index e996a303c1bb..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-2.38.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/selenium-webdriver/selenium-webdriver-2.38.0.ebuild,v 1.1 2013/12/06 06:06:46 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at http://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver."
-HOMEPAGE="http://gemcutter.org/gems/selenium-webdriver"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.2.5
-	>=dev-ruby/multi_json-1.0.4
-	dev-ruby/rubyzip:1"
-
-all_ruby_prepare() {
-	# Make websocket a development dependency since it is only needed
-	# for the safari driver which we don't support on Gentoo.
-	sed -i -e '/websocket/,/version_requirements/ s/runtime/development/' ../metadata || die
-}
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-2.39.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-2.39.0.ebuild
deleted file mode 100644
index 9fb2dc48c81e..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-2.39.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/selenium-webdriver/selenium-webdriver-2.39.0.ebuild,v 1.1 2014/01/14 09:06:08 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at http://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver."
-HOMEPAGE="http://gemcutter.org/gems/selenium-webdriver"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.2.5
-	>=dev-ruby/multi_json-1.0.4
-	dev-ruby/rubyzip:1"
-
-all_ruby_prepare() {
-	# Make websocket a development dependency since it is only needed
-	# for the safari driver which we don't support on Gentoo.
-	sed -i -e '/websocket/,/version_requirements/ s/runtime/development/' ../metadata || die
-}
diff --git a/dev-ruby/serialport/ChangeLog b/dev-ruby/serialport/ChangeLog
index b2a26c48dd71..93a96b2080a5 100644
--- a/dev-ruby/serialport/ChangeLog
+++ b/dev-ruby/serialport/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/serialport
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/serialport/ChangeLog,v 1.13 2014/03/12 11:01:20 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/serialport/ChangeLog,v 1.14 2014/04/24 16:45:53 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> serialport-1.3.0.ebuild:
+  Remove ruby18 support.
 
   12 Mar 2014; Manuel Rüger <mrueg@gentoo.org> -serialport-1.1.0.ebuild,
   -serialport-1.2.3.ebuild:
diff --git a/dev-ruby/serialport/Manifest b/dev-ruby/serialport/Manifest
index fc38208a8c70..eff660b96aec 100644
--- a/dev-ruby/serialport/Manifest
+++ b/dev-ruby/serialport/Manifest
@@ -1,4 +1,4 @@
 DIST serialport-1.3.0.gem 25088 SHA256 39bd909a3b159e70070dd24e6948bb7620fcb1fb066d26fc55aab2ae1037f21a SHA512 7555f5125a031de4467c4bf5312e31be021265398ed22d2a6089232faa904aa8de0accd092fbe5f74aeba16d8bf37529014ac148d2fdd45d0e43f11bba7ec94d WHIRLPOOL 5b730cf11263130f222d072354003a16dc83374ffbeedfed8a48f04836447b3fb331eb07d0777f3894bc6f27a9d262af7eaeeb572dc7fb880fcd0304cfcefb42
-EBUILD serialport-1.3.0.ebuild 1202 SHA256 45378870f0813804ce3c600feed9fd7f42f7b7a8f18ad43361c618ee2e4a9b86 SHA512 39e984ef488c5de22ca38a25e5e179f52550551c3191127636846fa23dd3245c0090caa98da0b5e159848d630be20b4300a25e68937afc00d015cb1950ff63ea WHIRLPOOL 514c86d567a957eda969ebb5813528f289a5ad34805a025b609f0d74184f06efb5d3bb6e1a583a870c18080bab7328527e61bb3d08e4ad82d11b5a9d09c5342c
-MISC ChangeLog 4507 SHA256 b43511d4934db1e48b06ab5c1d4e0a5e7cbc05093861ecf3a560837e8ae86ba6 SHA512 5587903f8db919765eabaf4bb805b820ad3629479a75ad787955d7cd610d5bd272219bf45c19cd1feaed6a2c58fd9062494d61149f1b96a748ec5ed351f9b6e1 WHIRLPOOL 70abe5e02c5083acf446cab316e7f8887e9aceeca535d2d132ac41792498035bd9fc084496831cfa676d1dc46bc84bc2c44a52e3b359df3a1c271067f6f567c3
+EBUILD serialport-1.3.0.ebuild 1190 SHA256 7cd0b7b974d0ff37e26cedc685d673e06cda472a784bd4385b954785def2625f SHA512 10b9624ed448364573b94f57f0d2e15fc3ba569b2d018dfd0cf2e13d0706aa08406635a71324d8755ee95d6c1caf2410c5363430dacadc9cd87284d834db927c WHIRLPOOL b27e6c56fc32847c0a8e6b59b947a475b2ae34d73a76112c589bf6801db2fbc2550952eaf47988dd14801b7a8aa9de6e6a73aa2239fa0bac030d8214ecc8292b
+MISC ChangeLog 4606 SHA256 4fba7dfb32f263203874b1d499180e8a243e4d01c9699eb470e1791ad9654b4e SHA512 0ecb92a20874409576eb3fe8481a140a8c02e33aa1945fb248f7f379b13e3c094d53e22b90ad3383c058d6e4fede025cb675fdb326e2d9e6c9ac5465ae456b15 WHIRLPOOL 4fe0802f24f77bd43a12b27ff5bd6d67902b20cec7c72124cc27e5c80ec0767ff68bcae267b6fc2a0594c084e5799dfb56b594739b0fce782d979b8c38c78bd9
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/serialport/serialport-1.3.0.ebuild b/dev-ruby/serialport/serialport-1.3.0.ebuild
index 71d8179c1754..77713e02a5c4 100644
--- a/dev-ruby/serialport/serialport-1.3.0.ebuild
+++ b/dev-ruby/serialport/serialport-1.3.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/serialport/serialport-1.3.0.ebuild,v 1.3 2014/03/12 05:26:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/serialport/serialport-1.3.0.ebuild,v 1.4 2014/04/24 16:45:53 mrueg Exp $
 
 EAPI=5
 
 # jruby → uses native library
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/settingslogic/ChangeLog b/dev-ruby/settingslogic/ChangeLog
index 782bd46a0348..26dd72de19bb 100644
--- a/dev-ruby/settingslogic/ChangeLog
+++ b/dev-ruby/settingslogic/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/settingslogic
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/settingslogic/ChangeLog,v 1.1 2013/12/13 04:36:45 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/settingslogic/ChangeLog,v 1.2 2014/04/24 16:45:29 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> settingslogic-2.0.9.ebuild:
+  Remove ruby18 support.
 
 *settingslogic-2.0.9 (13 Dec 2013)
 
diff --git a/dev-ruby/settingslogic/Manifest b/dev-ruby/settingslogic/Manifest
index d3592b8fa69a..22fd3d00e6ff 100644
--- a/dev-ruby/settingslogic/Manifest
+++ b/dev-ruby/settingslogic/Manifest
@@ -1,4 +1,4 @@
 DIST settingslogic-2.0.9.gem 10752 SHA256 5925a91d0d48dfb59a6e48ae2bb9c9b801fe6fab25a8e8d302ce8699d92f2ae6 SHA512 e9229231815c8d80b7539724cda78c0cfd17bcf8423d0bc2643b3ce2a046e8014f3b398c5314b095aef480a0c7de16e0c93a6592fe8eabfea4ae94742f3dab57 WHIRLPOOL 8b3c2bf36d0719f00edd64578a2c8cff3a322e27708e618846df4ebf13e2e2738d57c4de01efed0099fed0f73ea761a21f473930a3a984426730718f4f1d3186
-EBUILD settingslogic-2.0.9.ebuild 677 SHA256 6c1a777c0d259fdef99ab9ccfb44f93e751a56698a13d0f0c880111dac1b5db9 SHA512 57e32dd4ed4271acc43b4f853e14c84e0bdbcfabcf4592fb5b91cae748fdc9a3ee306e9495b1ed582a08cc1ca2a38f0c7082a759f66f8a92a5bcff5e0153ce2a WHIRLPOOL 95307ebf9340353797f2a6d65f7954232c591aa1ba19771ed977aeb8ca023e4695cb58849be14d3e634948dab88703fb1abd397881321b20b9c4a6143445899f
-MISC ChangeLog 389 SHA256 d53c3400910e71308c9d0f5cb78aa8cf318d07ef7e145602c96962857977c2f3 SHA512 acc174962f34c1fea2eaf45caffb6da61a5a1f86c975c997bee596edd825de531d0d32966066dfe961fc0d8581ba65688a853fcf6675ffd17b6fab50f6b0ae3a WHIRLPOOL 46e5b0ed9f9db1166a457fe661aa0a5859296d944812220a88ac6d96deea25ed563791e07309130fa154fb7389964d247c2c57a0cc108aca2c246b1d3dd77f36
+EBUILD settingslogic-2.0.9.ebuild 670 SHA256 7d5879994d54ab323ea7208838a25075b24bb4c552884b82b43299139d02b2e0 SHA512 930500396ba7b94888c2e4fe12cdaa5466d400d0516964da96b96f550770377cd03a19839e653a1c00bc6826feb5f328e3f5c10c1247466e6217ac34339efc64 WHIRLPOOL 10fd0f1055a7f5613c0cd00f275af3f12ca27efc2a07582434100477dff2fc27eafbc8b4e759c733751a3d32bbcf414653bcb7e2ae5d4eed0103b38f4935ce9a
+MISC ChangeLog 491 SHA256 ddd89c52ccdb0e196934386b0bff4f85358a61b40d86e788aa979d6d6eee8347 SHA512 daeed4dcaa125552a2ce1b4e50a5899a3fd5a073e019d4192def8ef1add4860b672b8b5a3630b48ba7ae204af79406618d7637e1b502ea379b763966a2644f06 WHIRLPOOL 9243376f18377e57000c1f2a62166a06e87ad8d894aea85b60d0f2e8f21804100e43757c90e324f4e2431d04d8b37c34b3c838fe949cd9055a1d802bec3c8eb5
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/settingslogic/settingslogic-2.0.9.ebuild b/dev-ruby/settingslogic/settingslogic-2.0.9.ebuild
index 622b6e0f922e..1b61a61cc1a2 100644
--- a/dev-ruby/settingslogic/settingslogic-2.0.9.ebuild
+++ b/dev-ruby/settingslogic/settingslogic-2.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/settingslogic/settingslogic-2.0.9.ebuild,v 1.1 2013/12/13 04:36:45 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/settingslogic/settingslogic-2.0.9.ebuild,v 1.2 2014/04/24 16:45:29 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
diff --git a/dev-ruby/sfl/ChangeLog b/dev-ruby/sfl/ChangeLog
index 61df14ed2423..8fbeb10b633c 100644
--- a/dev-ruby/sfl/ChangeLog
+++ b/dev-ruby/sfl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/sfl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sfl/ChangeLog,v 1.9 2013/11/11 12:43:18 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sfl/ChangeLog,v 1.10 2014/04/24 16:50:01 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> sfl-2.2-r1.ebuild:
+  Remove ruby18 support.
 
   11 Nov 2013; Manuel Rüger <mrueg@gentoo.org> -sfl-2.2.ebuild:
   Cleanup old.
diff --git a/dev-ruby/sfl/Manifest b/dev-ruby/sfl/Manifest
index 70cdea333b88..a03ca7f6d773 100644
--- a/dev-ruby/sfl/Manifest
+++ b/dev-ruby/sfl/Manifest
@@ -1,4 +1,4 @@
 DIST sfl-2.2.gem 8192 SHA256 323cbf7d9af865dc2bd3fd5f4181798e24a07f02f7b1f935e915f5edd7f4072b SHA512 9b64a966ec4125ae39d273e9ea1529f422dd17bfe2c4696574ab7725c0aad42f974febe7359dafa073c2291b47c6e351e1d549e145d247ed7c2ea6ebc5c73932 WHIRLPOOL f8a6509646c47ccef6aa064f27019fe7113df36f861456e87262665ef54eb240d4b2b1f3eb7ff5d1aa4d3dad849ee413f8e27ce64675b011ab511fa0b33774ce
-EBUILD sfl-2.2-r1.ebuild 717 SHA256 75222ae547329daffd33b3810bb5e6a31ad522b98f6b9693e9fe7130a51a5c5e SHA512 e946a18860273596dd41b4ff289bb8a7c6034890d686d006e40d81fdb02b05cd7e67daedce132fd22f06c30326a0c6fe01109e2801505f94cd865cf6ba5d861e WHIRLPOOL 5afca4ce7405a1dad48effbbae9c431debb839443606300b2cb8808d5add0a395c37aacd6e7a77e806029a90ef28208c35967565be54e83b3ebe42d9a3f962ec
-MISC ChangeLog 1171 SHA256 39f5666fb7728422d5597edfbcdb913fb3bda80e22cbe12e2e13becc2d0c6df8 SHA512 56fa9c2a1f63f9119d5dd808b6fba1ee178538575785130bfef230a0bdae525aa1ed595c2aee98fedf28bf6f6140020bb1676b5d4ffbf13677d5ef1d3f1884ef WHIRLPOOL bb139095fb16edb0375e1940ef8a8e02504a329425c20bdb90c240c7e13eaceb327bf577465663c094e1d9aa1cdc7de36917596815f13584bc13a323500686dc
+EBUILD sfl-2.2-r1.ebuild 710 SHA256 2e8cdf9d488d3d76292b7d0fa7e0ebb79663cd1f220a685795891bbd0e5069b1 SHA512 17a49670ffb98af0b7478b0eb6aa7898fa091720984de24c5d53226e0077449c93b734f12255bdc0755844eebedd6446b68b929d5844ad574d21611a4e824761 WHIRLPOOL 5b155e59284a178b6d92c1c2309f7a0f78637e4c2a489eaca6ef750a9ee43dd92580a7f741811ca6ca7f6f31c07256d43c682f0836253d41ca3fd3973c37834c
+MISC ChangeLog 1265 SHA256 4eb3abb5e1a5792a14a35cc4757110184c49903c2eae96a6a2633efd1e35a443 SHA512 3201086dc7ecab6bd194a2956c37f8c9d1a23f27fe9df8252c0d5f9073a904bcd7a9b0405aceb7c8e497abaf61e05574c7dadf75bd24d497ecf330cbbf56c1c1 WHIRLPOOL a510fd48c2bc12b4ba69f47b4a5c6da1122b02c498782fecad7f7a8b866eefe233a51ca5db3f2f6c1693ae4bd2d5c99f1101497c47b9d41aaa7b6cc6a622d9fe
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/sfl/sfl-2.2-r1.ebuild b/dev-ruby/sfl/sfl-2.2-r1.ebuild
index 0817ac5bdcd6..c36ba1fd2b65 100644
--- a/dev-ruby/sfl/sfl-2.2-r1.ebuild
+++ b/dev-ruby/sfl/sfl-2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sfl/sfl-2.2-r1.ebuild,v 1.1 2013/10/29 15:35:52 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sfl/sfl-2.2-r1.ebuild,v 1.2 2014/04/24 16:50:01 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/shorturl/ChangeLog b/dev-ruby/shorturl/ChangeLog
index be384497bd4c..426b6a4605f5 100644
--- a/dev-ruby/shorturl/ChangeLog
+++ b/dev-ruby/shorturl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/shorturl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shorturl/ChangeLog,v 1.24 2013/10/26 06:13:11 graaff Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shorturl/ChangeLog,v 1.25 2014/04/24 16:38:24 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> shorturl-1.0.0-r1.ebuild,
+  shorturl-1.0.0.ebuild:
+  Remove ruby18 support.
 
   26 Oct 2013; Hans de Graaff <graaff@gentoo.org> shorturl-1.0.0-r1.ebuild:
   Restrict tests since all of them require network connectivity.
diff --git a/dev-ruby/shorturl/Manifest b/dev-ruby/shorturl/Manifest
index e03533997d1d..b2a6853e552a 100644
--- a/dev-ruby/shorturl/Manifest
+++ b/dev-ruby/shorturl/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST shorturl-1.0.0.gem 10752 SHA256 4ce879878999f4e5fe46f03fc8f3f2b16ada1a170f00785638cb1e371f870cd3 SHA512 d2323107449a5a66065dc225fbec101a653cf4bc1c719f18e7e5d78c89aafc8c4863aace08ed2a007e33c72f6986ea56a0307e856fb4bbf4c213206155d22312 WHIRLPOOL 85d78bb1610afa1b31c0557577dde4b33aa76f819d1cd37b2c28b3a01198f8bedf692267d48a5b3f0c58bbb85488e1ede1980bf98d4ecf30dce48ab915fbdbb0
-EBUILD shorturl-1.0.0-r1.ebuild 877 SHA256 8a5c844f211843e3f4a3f374a32a003c7d8d9e1826bfc60bdb18f1547cd99065 SHA512 7e1ec51629c9535d9f875e13335a32ffce774849eb74a34fbc6d63dabc171fbeccb070ca07b0bb541a48d283abbc22455a14a311bfa88f36563955a85d69d102 WHIRLPOOL 6aae75baaf2be04727fb1957f716754e6f4f0940573d973686659e7c63eb1e615edfd837080d619287f60a357411a860415ab6670e5187de78ed5eccb57d2a89
-EBUILD shorturl-1.0.0.ebuild 803 SHA256 8fe991d1b7f2810ab0b7e0e46711ec3ac62f3800f9539f5649a337293c8037bb SHA512 f851c4648f97181bf4f49eea573f839bec9283bf31623452aaf6c6c914555ab12b57abde65bb37b0794fc47c7f83bebb1de44405f90ec48e9da52ced2979d7e0 WHIRLPOOL 5f8cde31a48d0ce62343e99a6eb219f03b0429abd2f6fd324d8d38cd0f02a0ad7eba3d61747d99765ed9b651dc20fb4e7b65c3ec357b3510619c9dff00ad8a6c
-MISC ChangeLog 3357 SHA256 78e5e7240be2abaf07e1a65165971bd80315ed151592568b9cb7aef964ef0412 SHA512 6d7484eeff826c23e591fbfb2beb57f0243aa8be46d2822725cbead050fac7e3a2de1200d2ae92194f35ddf74e68c8700db047eff3cc3347858f0719a9f348c9 WHIRLPOOL 57c2829839af4287abcaedb52f9ae4043e449ec649f26f585d0c7fcba92648eedf35cfa4ca3d64f12248fe36f1e92693827a6629079624709a380d489a0c96c5
+EBUILD shorturl-1.0.0-r1.ebuild 862 SHA256 5865af7b53c1dea7666f6339df63b030ade58bc718735e0a93a53392dd79a09e SHA512 7fa501611a2d88a35fa9a1f9a845c19730f30edf0a2249a22724720abc4425352d54bd6049a74b3dc8bccc157d46b07eaa0996f3bfac7a77e1441cbe97eb490a WHIRLPOOL 2e93909f4aafa76ea92cfafc2ff7b37718039ef8620b34d837a47c509005cc2bf1911930e127f29b7cd9ab4fbf2e41abbd0ec28224a275cbce7a3121eeea1356
+EBUILD shorturl-1.0.0.ebuild 798 SHA256 4593dcc5dddd04d7317253e6c221544d7c3908b67d475c9f79d0fedf33c0a7c1 SHA512 ddcea7d5dc88f6e1f4eab9d5a8b56cf704b195907323defb0b1a754eabbb33f4e8829ae0c53901ca80467bcdaf6dc8e8c62353d832493b596b6265d2d7d7d007 WHIRLPOOL 74fc1defa0dd3acd5376f5b0a10e88600736329a190e8b57e7501b25b683d5336e1ea962d9389a6740dc1a3eb091fe36e179d5b687c9cc8f7df1f8ed6752ab27
+MISC ChangeLog 3481 SHA256 bd0eba0064febffbd543c8dd315c2f601cdeb3c443d73651516bd2230fc648fe SHA512 6dadf4244fb2cf4dca40d2d079454a91594280e5197f2aabf777de479879723bd0fa5161ec132ebdf981f88ab33091c369c13c54588a9d907db2c95eea2ce14a WHIRLPOOL 94b28bad5ded6777186d16707c75328b0d8ea9418d3d423be77f2d9d5b1492d3d48e925d7ffc58ea5cbab56651b03b3ea5d903c8944a25d01989fd2d6ec69ae0
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlJrXX0ACgkQiIP6VqMIqNfXGwD9GB2C5WFY4TXzjqDOepblFYmR
-RJJ/Iy+ArLmYfGj6GfgA/0T9qL8GWTH3d+CruFa9nb72EkabJtWQot2hTEkrD3Y6
-=P1Ye
------END PGP SIGNATURE-----
diff --git a/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild b/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild
index e05013cb7ee0..dccbc746b11f 100644
--- a/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild
+++ b/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild,v 1.2 2013/10/26 06:13:11 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild,v 1.3 2014/04/24 16:38:24 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
@@ -32,6 +32,6 @@ all_ruby_install() {
 	all_fakegem_install
 
 	pushd doc &>/dev/null
-	dohtml -r . || die
+	dohtml -r .
 	popd &>/dev/null
 }
diff --git a/dev-ruby/shorturl/shorturl-1.0.0.ebuild b/dev-ruby/shorturl/shorturl-1.0.0.ebuild
index d1f5148bda72..62c4c82cffdf 100644
--- a/dev-ruby/shorturl/shorturl-1.0.0.ebuild
+++ b/dev-ruby/shorturl/shorturl-1.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shorturl/shorturl-1.0.0.ebuild,v 1.3 2013/09/14 10:06:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shorturl/shorturl-1.0.0.ebuild,v 1.4 2014/04/24 16:38:24 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 jruby"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/shotgun/ChangeLog b/dev-ruby/shotgun/ChangeLog
index 388ee9e4109b..6e6f3e677789 100644
--- a/dev-ruby/shotgun/ChangeLog
+++ b/dev-ruby/shotgun/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/shotgun
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shotgun/ChangeLog,v 1.9 2013/11/11 13:29:06 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shotgun/ChangeLog,v 1.10 2014/04/24 16:43:43 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> shotgun-0.9-r1.ebuild:
+  Remove ruby18 support.
 
   11 Nov 2013; Manuel Rüger <mrueg@gentoo.org> -shotgun-0.9.ebuild:
   Cleanup old.
diff --git a/dev-ruby/shotgun/Manifest b/dev-ruby/shotgun/Manifest
index 2b1ddfab439b..eb59ee9c6e2f 100644
--- a/dev-ruby/shotgun/Manifest
+++ b/dev-ruby/shotgun/Manifest
@@ -1,4 +1,4 @@
 DIST shotgun-0.9.gem 14336 SHA256 5518285ff9494a36841345985857fb848aeab9981bc2c0d964f08c10315045a5 SHA512 55bc886df596606db9324da4441e3b9585355dedeca0e135b50c52a46640efa83dd378b5e86b35d631b51c4ad8839313809d88932282447b30a23a9bf2827196 WHIRLPOOL 15cecfacdb7b2d6fbdb5982915e37f4eeb48fec5b95f05e84464b23f31623658a5da85f2142f671d5312f47e0d67a95e536db2e6ef3ead29b0d005797adf3274
-EBUILD shotgun-0.9-r1.ebuild 797 SHA256 c84251e34b16db2fccf1a60f0e673e15d4fea15ed6fb9df7b4e782bf36c574c8 SHA512 98b7f0a44229016e4321bf08700dc0bb493a7518ea6dc5e1bb98fa4f55df8badd8f41e6e113dcefc31dd512665aaf6414314324e96ecce2985a11e2e29a552e3 WHIRLPOOL 6666bbd2a14b034efae80e32c91d5a01e19064fe53b67d5838d56e751f04cb00e41af509f6322e02b32246e982ce0814e10d05d8fc9126246d7b3dbd252dd946
-MISC ChangeLog 1630 SHA256 53973c65cd84e033bb59538acdc734d27717947167b726e20d6e9451a2853f60 SHA512 ea6210127a8268e6641efb401c6de487f56c8ea322ac6dace455d6770341dcf57d380e0fcb6c48aac862f8e76f6b8cd19992123a09169ce8b5f73867f9124130 WHIRLPOOL bacafc603eeb877e7bf66e13c126852058780d499154c91f35b387a6c739bc477eb8bb6685686acd44718766fbf0c0e6bc073796c106810d74927a4574e9bcf5
+EBUILD shotgun-0.9-r1.ebuild 790 SHA256 bac254e6194eb3c3a3f2cb5f530a8a6eeca8da91557d03e2dd5b0723480284d3 SHA512 4ae060eae295cf4e1f7b10543909c954a1ddf6b857a4a3e1aa9a8d5f56af5692183c2aab8a9e4fb5edd4a72e49d345fb2f77fd7e61044e0532ed4e19a088c91b WHIRLPOOL bb02b978e72c255ff8100b8158fd047c41f3becfcde52d7194bc4c54d2828c3b5bac221c323696301cc96ac29257f8656c29ae031133c60e2290577642c5f3ad
+MISC ChangeLog 1728 SHA256 684375056524c164b37b20f76c7cfd20c7ca08b86ca8e825d88451e115ce68de SHA512 f40b10779d7dccc6506cae9c4321320369334c64c6df2d4e66e3d37138bebeabf69d884a2f196d8af6d8653a4396e65d9be64a81da4f077fbdce545306a36c4e WHIRLPOOL 14d717b852c5c1899b93691aaf20613fc26689ed542e0b3f4cd94c1845c7568e3a75b3c5132ca34a8c08e0336291b7d948e11592dce2f2821f08f5142bd0f7a6
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/shotgun/shotgun-0.9-r1.ebuild b/dev-ruby/shotgun/shotgun-0.9-r1.ebuild
index c3a9af6022ed..9404fb89ce55 100644
--- a/dev-ruby/shotgun/shotgun-0.9-r1.ebuild
+++ b/dev-ruby/shotgun/shotgun-0.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shotgun/shotgun-0.9-r1.ebuild,v 1.1 2013/10/19 06:11:20 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shotgun/shotgun-0.9-r1.ebuild,v 1.2 2014/04/24 16:43:43 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 # No documentation task
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/sigar/ChangeLog b/dev-ruby/sigar/ChangeLog
index 222cd0dc0e87..f246e1f4b994 100644
--- a/dev-ruby/sigar/ChangeLog
+++ b/dev-ruby/sigar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/sigar
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sigar/ChangeLog,v 1.9 2013/11/11 10:46:56 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sigar/ChangeLog,v 1.10 2014/04/24 16:41:54 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> sigar-0.7.2-r1.ebuild:
+  Remove ruby18 support.
 
   11 Nov 2013; Manuel Rüger <mrueg@gentoo.org> -sigar-0.7.2.ebuild:
   Cleanup old.
diff --git a/dev-ruby/sigar/Manifest b/dev-ruby/sigar/Manifest
index 7eef4a6c44ef..3448862c5c7e 100644
--- a/dev-ruby/sigar/Manifest
+++ b/dev-ruby/sigar/Manifest
@@ -1,4 +1,4 @@
 DIST sigar-0.7.2.gem 207872 SHA256 d9030b517b54806bbb6469cc13498f9b082ca82096498118cc58876d01794831 SHA512 c5de29f90ea170b169f110cd5f2bd4e12608cc80bd36bae2838c7f16a33d727d8e88e267605fcbb36c71953391cb76cfeb586bb2c068e08f787f86ffa0f20dfa WHIRLPOOL 8527bd559747348bd9a3eba8f4a05a3ad7593f2dc77cb3b0f61c38ec172f5820d609ebfe5452412385208b636bbf3f186a472ca224c55d6adf2f79678f7f26c6
-EBUILD sigar-0.7.2-r1.ebuild 861 SHA256 1c658dd876f6050bbaa3330786eb0c5ead1454a8898dfb22c00ef66c275c31f2 SHA512 ebc52b8d770954e67a8e46a02b3f2102066261ea85b3c1fd04a574f6fd351b8133b87578602e777d7720762e1782be849b360ff00eb89b5db59480c7a25cc491 WHIRLPOOL ce867399dccc8c86784b8508675ae27cb7c7430d9417015a4ba36ac343c325f335dfcb33f6dac508bf41329b43756c6a897e5b6691f2ec7189637647831c1baa
-MISC ChangeLog 1337 SHA256 5f7c0a48f0125ece560fad78963f8b34041d33ffaa4dfc496d4a3340117bc50c SHA512 8681c5b122eb0078b7223d5949226c12a34946c5911531cf9d4947257b14b4e72c5baf7593250429479b54cbc1eb936dd99a7a24269b997ae33cddd4fca83374 WHIRLPOOL 67925093f414c9b51a567bf56c5e0d31fc7be44de6af684c001900c36132e39479a8d5cf3c0f37540fc3d1fb380a5e5ac7a773aeafbe95af528ed13d3783f9c6
+EBUILD sigar-0.7.2-r1.ebuild 854 SHA256 b0aeaba622c11d7277999fb0441e337754928d9450cc065fd8febcf78f42ee2c SHA512 de9fd94536448a6d6cb58452acce6bdec1ea00628b64c8fdbb0f7896f714e40f5159e68d6bbbf6315d9212bdafe68717861b895a605bde0b9fc8db128bc40eac WHIRLPOOL 50f6930b57dd9fcd8d96de17e2ab011cb43896f8dae050b188c30e2cfafe9e6f4ddd87aacf4baf0fcb07ea3b9811333dd59ea032703c733e7d94e5111d4196a6
+MISC ChangeLog 1435 SHA256 ce46ffc4832accb44ebb5f6a250ab598a513ad9e7ec045dbde5ca354c1fb4667 SHA512 a2cc433bbd89d1500ef6f0a22799dd2aa41c5e32015cee4e2cf37a821138821ace0c225e92be24760dbb67af2fa0069b8d2e034ff34034b7366ae54deb3e5e16 WHIRLPOOL cfc93a6dc68ca93b1c5d1dfaf01a348d55c9449e5d5f60b665d991a7244811d2672ca9fe489db0239c3c68cf508291f3c0d4445c3662bd0cedd449327d178a8b
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/sigar/sigar-0.7.2-r1.ebuild b/dev-ruby/sigar/sigar-0.7.2-r1.ebuild
index 28d697d4c665..d99cc165c5db 100644
--- a/dev-ruby/sigar/sigar-0.7.2-r1.ebuild
+++ b/dev-ruby/sigar/sigar-0.7.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sigar/sigar-0.7.2-r1.ebuild,v 1.1 2013/10/09 00:45:22 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sigar/sigar-0.7.2-r1.ebuild,v 1.2 2014/04/24 16:41:54 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/simple_oauth/ChangeLog b/dev-ruby/simple_oauth/ChangeLog
index c2f12a946f49..6ff012ca67c2 100644
--- a/dev-ruby/simple_oauth/ChangeLog
+++ b/dev-ruby/simple_oauth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/simple_oauth
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/simple_oauth/ChangeLog,v 1.8 2013/11/11 13:28:11 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/simple_oauth/ChangeLog,v 1.9 2014/04/24 16:40:14 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> simple_oauth-0.2.0-r1.ebuild:
+  Remove ruby18 support.
 
   11 Nov 2013; Manuel Rüger <mrueg@gentoo.org> -simple_oauth-0.1.9.ebuild,
   -simple_oauth-0.2.0.ebuild:
diff --git a/dev-ruby/simple_oauth/Manifest b/dev-ruby/simple_oauth/Manifest
index e08f42c7bef6..c6dd4640d653 100644
--- a/dev-ruby/simple_oauth/Manifest
+++ b/dev-ruby/simple_oauth/Manifest
@@ -1,4 +1,4 @@
 DIST simple_oauth-0.2.0.gem 11776 SHA256 2f76cd61c643086db19cbabacbd73b6f4a0c90e31036d2e52839b9b87c8752ef SHA512 86f785e271470fa1f160216f0bb85bbde2358c2e621ca028dcfef2aac01edc03a977a086122ad2bfdb40e385e9989c4f61f19f2a1605c29b40e3bdc8c9d448a2 WHIRLPOOL 061667b32d310b4f64f8a12dcbe33b919ee1ab2399601145a771419858ae6a48a726a5c339bbd5d7431ff6c3fb79e5b96e358f24b90aff2407531e8db119f589
-EBUILD simple_oauth-0.2.0-r1.ebuild 617 SHA256 c88221dbdcde333e06b4ceb7e9670e35809e01b9a68fe75735d6a029d21c81ab SHA512 714d67765a1ed068858c1df196667fb0455b66b1f82f21503b668746e4971591b0fb18af7f0e6d28155e110c9a0f423901feb28c885e54c8dbded5e4efb65f09 WHIRLPOOL ad3214a3aa5ba1c94b0c75f054ac6cfbf72ad6c55537360752d4b93b33d0c5a7f03b979fbb0877c0cc28e106b89876b47fd136b50fc703c9bac5c59fe3db0368
-MISC ChangeLog 1327 SHA256 9daacceb4b16171e9bf04847ba9d4dc63715177d794434cf649b5b099a29c6b0 SHA512 719aa0497d040bcf402657096e1e5ea4ffce2b1dd6987428222afc7c95347e9099ac3087b461f8684bf1070bdb992c3e346dd63d3b8b54b62078371fc34a4678 WHIRLPOOL 30de3cfd927b2e8140ea90239e833a3783d62aeda9a9109986b63f50275168da6c1e3630e37c07170cfd9d26e329a3462f20a031b2c0a8436850f99a1e31a846
+EBUILD simple_oauth-0.2.0-r1.ebuild 610 SHA256 10592d091651b8f097f29dbe3929a0e2082efa9dbfec7b4caa9172406f234794 SHA512 ec88fa12b32af300c60c3bd4a7a4b2628f9679f76d6719f7dd227890c60f0c4178a32750431c9fb109de4b22c63d53f61f58e822ace05d4ecd13e85439290514 WHIRLPOOL b023353ab88b295d7aa466c41fb8d2615fc40bbc7a6a9c5c3f4b5fec6ede516153d7651268c24a21e63426f644f770f891a2d60ecb04e0cc99a025d3c644fa91
+MISC ChangeLog 1431 SHA256 0824d3256101ad8eb9cc8df4cdb15fc6444d65d90ca4ba6a6e0c68e220723a7b SHA512 19e4f8905cf2ca04c6f3910702ce1783f0344c7240e402abb1eae964d8f7eb4ac2ec274fb993cb64d5393a429686775d9f7276c2c262a50eb7551a7a139f3e6c WHIRLPOOL 1d58169bb50cdf680c37d489a6dee42eccd1fc4038f39df4699626217c5604da77edd08a34c4a2b8c01949e7cfe271beb3511b0f5a41bad9462db6387d5bf807
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/simple_oauth/simple_oauth-0.2.0-r1.ebuild b/dev-ruby/simple_oauth/simple_oauth-0.2.0-r1.ebuild
index 850854d02bc8..66f89f91ae8d 100644
--- a/dev-ruby/simple_oauth/simple_oauth-0.2.0-r1.ebuild
+++ b/dev-ruby/simple_oauth/simple_oauth-0.2.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/simple_oauth/simple_oauth-0.2.0-r1.ebuild,v 1.1 2013/10/09 00:13:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/simple_oauth/simple_oauth-0.2.0-r1.ebuild,v 1.2 2014/04/24 16:40:14 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/six/ChangeLog b/dev-ruby/six/ChangeLog
index 566052f1ccf9..c1db92c6eb5a 100644
--- a/dev-ruby/six/ChangeLog
+++ b/dev-ruby/six/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/six
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/six/ChangeLog,v 1.1 2013/11/22 01:59:11 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/six/ChangeLog,v 1.2 2014/04/24 16:49:42 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> six-0.2.0.ebuild:
+  Remove ruby18 support.
 
 *six-0.2.0 (22 Nov 2013)
 
diff --git a/dev-ruby/six/Manifest b/dev-ruby/six/Manifest
index 1849df72d848..12bbf4331d1c 100644
--- a/dev-ruby/six/Manifest
+++ b/dev-ruby/six/Manifest
@@ -1,4 +1,4 @@
 DIST six-0.2.0.tar.gz 6747 SHA256 39e9c62fa1893be103615adbd0bff4a315085fea0297c6f0acd7ebbd29e2f0a7 SHA512 8c3bfbe2b07b5682b696800a9235ebf542c7d292f69728aa9c9707f92fa042fe7bfee6a0b28808dab86f8ec80fec5ba993be5e42f4a098d8cfccbc7611fa2016 WHIRLPOOL a3f64020d0a1c081605f77776c0f876fb6734aa84df5edbfec047c2cc9ca1d6b878d1a687055f4c998061e76e288e03900ed9ac540c444b60e611f0c8aab8063
-EBUILD six-0.2.0.ebuild 697 SHA256 ba8f68be428452488538af8baf484ea38c19e27bf32cf0600c49b00168f80679 SHA512 10c8fd858093162aa757701aa143d69181d953875773e82cbac8c0609614208ac4456bb0db2869a0620eb7d4552aa92a7f757038cefb1923d67e97fee16def53 WHIRLPOOL e48257c0849b6fbe841a1f9ea4fefaef4232cbb5d2026495549971bee8e233e457d0fe07a53ba9dae38a24c6832e296e5a4661ff8b01ace4af542f6ed92b2513
-MISC ChangeLog 352 SHA256 af7565541762fd6452eabc0d7a2b69b4268b18d2beb5895a2aeacb90d9a8804b SHA512 5d3eb4b0b5aa45145f4465208c069d72173bb7f4e742a465540149e89c5a9b2d59c3f54906102296966fb10861859712aa555ed11abbef6a9d6aa1270219427a WHIRLPOOL 90e2fb02f6b9f381844db7ec51c84d2b451de0d6361f443d9f00fab32e4bd39c13ff58a8a118a1b7d1cf7fc2a5c94f5467f2fb31befced29a7add39b52ceb545
+EBUILD six-0.2.0.ebuild 690 SHA256 91b9026608630d00588c0a9b49fb7b8739e79665447d7b02a4bac62c1da2fed4 SHA512 a18db4f7307eb67e3e222f69548c775f2737d8e328b60deca5ac9a4efccdb830b5563db90529cbe00fd7d01b9669b507b84058cbee707cedd749b2f61f646483 WHIRLPOOL 78fd597c68476995115c6822e643ab876e7d2768b605d7e264b44734c3abb47ceaa044dfe7d79c22e4445634426e4ce21ddd1063188b1b2189f0a0b4716492db
+MISC ChangeLog 444 SHA256 bc365f04c9ef3a36909f4354d98f827e31bad85fccd15c25c30d3996252adce2 SHA512 b8e4fce78abdfbbd0f3da0367003b6888af736f7c082fd567d98922c322637b84cf93ab647d096faddb203aa49d1ba91ae7a1c4500f83a49e483ab4f849e0121 WHIRLPOOL 5fafe3fef26b3eb45c311dd643a6ba768f68656cb407523dc8d87bc6ef9d1f2301439003bd62c5a9cb0a72e3c8ec8240164d50f3089ebaeee6bcdc1a7d17cd76
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/six/six-0.2.0.ebuild b/dev-ruby/six/six-0.2.0.ebuild
index fc750eced103..24f6c03a7003 100644
--- a/dev-ruby/six/six-0.2.0.ebuild
+++ b/dev-ruby/six/six-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/six/six-0.2.0.ebuild,v 1.1 2013/11/22 01:59:11 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/six/six-0.2.0.ebuild,v 1.2 2014/04/24 16:49:42 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC=""
diff --git a/dev-ruby/snmplib/ChangeLog b/dev-ruby/snmplib/ChangeLog
index 5eeb2feddba6..a8f518bdf078 100644
--- a/dev-ruby/snmplib/ChangeLog
+++ b/dev-ruby/snmplib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/snmplib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/snmplib/ChangeLog,v 1.49 2014/03/25 14:40:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/snmplib/ChangeLog,v 1.50 2014/04/24 16:51:14 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> snmplib-1.1.1.ebuild:
+  Remove ruby18 support.
 
   25 Mar 2014; Manuel Rüger <mrueg@gentoo.org> -snmplib-1.1.0.ebuild:
   Cleanup old.
diff --git a/dev-ruby/snmplib/Manifest b/dev-ruby/snmplib/Manifest
index 49fca4d96e14..19e6e56883e0 100644
--- a/dev-ruby/snmplib/Manifest
+++ b/dev-ruby/snmplib/Manifest
@@ -1,4 +1,4 @@
 DIST snmp-1.1.1.gem 203776 SHA256 6af90f3d9156d15d78e07a819c5829d70f8d5b26349f679e13735060885ba796 SHA512 4dca33a9e3d1030beae0d6f8c864969b1b725823efc9950c89f0f7d1b4042f032b78ab2d301d87220813fd00cf179997f9c8369e5e9ac83912847103b6ee1e6c WHIRLPOOL c2dc411da0ada24471c73c364c9557c743435fcbb974a083015cb0adf0820176b5d60dd0fab049814dc844cba152ee776224d01c467f6ab6ba21a8ce0f076e1e
-EBUILD snmplib-1.1.1.ebuild 709 SHA256 4b7ae19286ea975aecff3c7ece4ec7ce0a9a2af755ec5c10ddfcac315080cb8e SHA512 8fefc9b3424bc18381320e456183093668aa6200169950cda0e6ee3679b7777060ffc8b9eb7d172a7b110b89a5c9f7da68de29349e2f781cb36549e5aee194f5 WHIRLPOOL 60076b99705f3350362e3746fa21ded48c5e58ca07be7516d9862084af3edb5368494e023ddd06a7ce3dcc50aba518ff0beeeb5a752c675e12c43bd837ffaa74
-MISC ChangeLog 5936 SHA256 f13b7dd1840393ed9ad142ac15c91059fcea7151c842009f5523ddbaa8a8f3b5 SHA512 2a88e7cee0599e1f0c77d896cebe4d704095216efdcb2e052e2a1299da9a173f2da8279232f927cf7a4bc2291d4d8b30ca9ea456803603cc9200c484cd874df6 WHIRLPOOL d0deb0e3859fe76c5c76e3a6d39e98760d34f4e029730ced852e6d02cfd21302a2289c6e97a468ecee1b02e1da163b7804628356365d0609d846a798fd3569f1
+EBUILD snmplib-1.1.1.ebuild 704 SHA256 0d668f2fd369f280ad9d56fee45e2d6dfe90a80bb8b65d1af86c67b914cc27b3 SHA512 b2d24707ea703504ba109beff76b1f4622256cf6d0761630b7c9378b62e3fb6f652ae5c9aa8bb6fda25c7433d96141217dc74101707f95dc895d65334aa8cbd4 WHIRLPOOL fc07f728657b2203d04bfafc20ac3203a27c90e3f43d47877d48b2470d04b5c0e7e796691f98d8592a1b5e2d01c5389b434e4a1396774cc38c83c26b686b3049
+MISC ChangeLog 6032 SHA256 5937ffd52d7a9f302d3f625597c94e595214f892d55ca5b12e403cf04642c5d9 SHA512 2a0d14367e0e3a780d30a996ef5f9f0653bf2e9c5332c979f41103c037ca025bfd9a4a4e9e07f58403bf5515cd9c064b68ae832dfa3eee3b954d91c128d2a924 WHIRLPOOL cc45f445fe088ddd82634c7a264e42398de80815aeb5da2a9f396f0c294e840bf07b376d2dc3485a89aa1f988c6937de5a10b78b893a737f362d7d1ddf8b182f
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/snmplib/snmplib-1.1.1.ebuild b/dev-ruby/snmplib/snmplib-1.1.1.ebuild
index 201cc4bfc8e5..91dfac58bce1 100644
--- a/dev-ruby/snmplib/snmplib-1.1.1.ebuild
+++ b/dev-ruby/snmplib/snmplib-1.1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/snmplib/snmplib-1.1.1.ebuild,v 1.4 2014/03/24 15:12:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/snmplib/snmplib-1.1.1.ebuild,v 1.5 2014/04/24 16:51:14 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_NAME="snmp"
 
diff --git a/dev-ruby/stamp/ChangeLog b/dev-ruby/stamp/ChangeLog
index d5599303ce45..ea511021cf1a 100644
--- a/dev-ruby/stamp/ChangeLog
+++ b/dev-ruby/stamp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/stamp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stamp/ChangeLog,v 1.3 2013/11/22 05:23:01 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stamp/ChangeLog,v 1.4 2014/04/24 16:43:23 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> stamp-0.5.0-r1.ebuild:
+  Remove ruby18 support.
 
   22 Nov 2013; Patrick Lauer <patrick@gentoo.org> stamp-0.5.0-r1.ebuild:
   Whitespace
diff --git a/dev-ruby/stamp/Manifest b/dev-ruby/stamp/Manifest
index 2e079509b256..607909c5b691 100644
--- a/dev-ruby/stamp/Manifest
+++ b/dev-ruby/stamp/Manifest
@@ -1,4 +1,4 @@
 DIST stamp-0.5.0.tar.gz 9022 SHA256 7346d95697a8eabe5d8e769bb098e1ff01bd1746f096176411ceba0c4c007ba0 SHA512 961121e2305d9948b003c12a16737c3a43235fc508bc1d2dd668bb7fc68893251c8575152aa61cea24617c9ce74c99c080b41353f81d9e70ab355e6e9f2365c8 WHIRLPOOL 5688685f0015c055d4830a1ec9b8b88cd81741710ac8e6623b0cfd466877f726beeeb20a6a105adaf25bc6f746083898b3c830e2f7de5de0c7ac305678f7a340
-EBUILD stamp-0.5.0-r1.ebuild 970 SHA256 210d75e0a21dacabaa96ffe3dc5fa2ad9741a683670c450b4dbb0195b8a21e3f SHA512 f412684a65423ba7fe93cccba7f3c111773b603a955431869b056d6d5f6de418d81b2fed1e792a30e94e6ee10135ebdf241cab07179d08232927c1f8a4f5b077 WHIRLPOOL 75738d0c7d90692f3a46c01b8341398496cd10841b45c9e3a958676cf18fa77ff766c3587a891fa3051622e77b242614d15d0261895ddcd521eab9006ace1ff8
-MISC ChangeLog 592 SHA256 9cdaa360397a5f8c40265e12c74806ba77017c621bdc9393fba9e8f8ccd78209 SHA512 adb00a7c030899b03797ec091e341a43f8c9e6f7ff5cd038763694a85216f0cb8ec0926e17e02f0e8c6e779a6159e42211518bbe6facb2ef2d9eb8784942155a WHIRLPOOL 8484566aab446d468ab1cdd5ad54a388b7dbea5a9c1c937d77dfa15e105cece300efab4e57493d7c6832ff7fbb3ae38e8809732d4b81613fe51a243acaa7803f
+EBUILD stamp-0.5.0-r1.ebuild 961 SHA256 a538b820513c5d1089e7d4b513ac96dc4c182c3dc7e90347aad656d4c9a61f84 SHA512 5d4e7576977b6295e91274be89ab5a4e4fdc3a3bf4a873a32e803c8a2a8629e85632f271fbcaa0b87e6f78d69dfc486a69927fac5bbaae30207650bfbf88b124 WHIRLPOOL bd54cff215348d6f3712fa83120a4129eb2d88b3cf9b54b1e242a986b888f08860d76c278118bd4488d4fe2106dee3bc7cde1f4a052e4d601762f1e5ad1dbb37
+MISC ChangeLog 687 SHA256 8402b63fccc61cd6571756da1b0a947933be1e0e6a94c2f5bfd33916799889bc SHA512 d5d948b3ff1d90c5cfcd8ac3f548f78a23048945b548da4b10946ad67569f275d5aefc50b73e29450113a0450389af70310a8339bf960c863be2e7271e22a0c2 WHIRLPOOL 6538a0a5fa03ca6f48133516b2326783a069387de8d2033c882517133a09cff05953d2e413d9bb50cde85a61719883f282664b72d8b55869deb16fd631a13636
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/stamp/stamp-0.5.0-r1.ebuild b/dev-ruby/stamp/stamp-0.5.0-r1.ebuild
index 25e27b0da30f..3a1c01dfb778 100644
--- a/dev-ruby/stamp/stamp-0.5.0-r1.ebuild
+++ b/dev-ruby/stamp/stamp-0.5.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stamp/stamp-0.5.0-r1.ebuild,v 1.2 2013/11/22 05:23:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stamp/stamp-0.5.0-r1.ebuild,v 1.3 2014/04/24 16:43:23 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/state_machine/ChangeLog b/dev-ruby/state_machine/ChangeLog
index 8d3138597bc3..48168a58d52e 100644
--- a/dev-ruby/state_machine/ChangeLog
+++ b/dev-ruby/state_machine/ChangeLog
@@ -1,10 +1,12 @@
 # ChangeLog for dev-ruby/state_machine
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/state_machine/ChangeLog,v 1.1 2013/06/13 05:28:46 graaff Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/state_machine/ChangeLog,v 1.2 2014/04/24 16:42:17 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> state_machine-1.2.0.ebuild:
+  Remove ruby18 support. EAPI bump.
 
 *state_machine-1.2.0 (13 Jun 2013)
 
   13 Jun 2013; Hans de Graaff <graaff@gentoo.org> +state_machine-1.2.0.ebuild,
   +metadata.xml:
   Initial import. New dependency for dev-ruby/adhearsion.
-
diff --git a/dev-ruby/state_machine/Manifest b/dev-ruby/state_machine/Manifest
index fc92e368b87a..f593eb8da69c 100644
--- a/dev-ruby/state_machine/Manifest
+++ b/dev-ruby/state_machine/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST state_machine-1.2.0.gem 604160 SHA256 80fcddc91976baec8713c37c28b5bc0655f5f2e0a1412a1a4a3aac41082cc2ed SHA512 aa26d9cc99b0e873f9b146acddaa53f0332cff403463a5079cab5e00902db7b60e47957fc8b4c7ebc62861894460613a0b075b13548544392432ee564936567f WHIRLPOOL 2e798ab6a0f6eb28fef4d77306fcbccb13f0c5d3f62d6b9689cd5dac1dbfba45b9be3dcc60653772d868074f061714c0e980add5869f9ecd0aeb27eb8b3a6885
-EBUILD state_machine-1.2.0.ebuild 744 SHA256 aad6e4369b522a336c25df16dd19ea9205647cb2cd1017171df8f6a1c281c78a SHA512 67f32b670b46a44f09beb8f3e99027b60151b048693733fedaad48b8af8b87db75a1cd7d5d7513c64f2c7cbdee9de288f873e08b68d2d5b1879632f8b7cf6ae3 WHIRLPOOL f36b534a3952c1a5fc8314a61e4a0375ec7337e2f812fa143f0412cb18e315c5be88968728932e4b7fdb4d6a9c2f9f96685e225a9c694052a40ed9284b504fd1
-MISC ChangeLog 408 SHA256 df0ae9543d91d3f665173da1afebe5c29e69eee9f692a2729ff45f8e059666e1 SHA512 109a7f7cb82893b4321b6d8fdd6f476d6b8bc9054d645541b692e2624f6664bfd770527df43e102cedacc65a3fe68c9673decdf4e2b3a6814e2bdcf982d82444 WHIRLPOOL 77667e683dcf0d717d2e0327148879d62c390ee93584b9e0e8af8b9eb6dc722844cff73763751f1153b8aabd44b972e2c83198699f6527510bc44339c8d52ee5
+EBUILD state_machine-1.2.0.ebuild 736 SHA256 52824f9bb04929265c8bf1960a5eaa0d96adb8b2dca332d0274489002f5dce1f SHA512 f367d4a0ed417031fbddbad6a4e6d90b58e9c46da44b51543502dd83feef7aaf20d80caab3c8d0d65e1cb56275195a3f8157c1e4a248c41a761423cee568f01c WHIRLPOOL 05f56e4876aa433c7968653ea4a4a6c9f7b3a16360802ce51d40d7582c2ae30ba1028e859942dba6b586c78ea1bda9c72f0fcf234e4b4587c1a02b12ac4cfbfc
+MISC ChangeLog 519 SHA256 e8a8d5101e0cd173ed6cf8adc9d0e823a9b1836a3f83ad99811f0f54125f333c SHA512 8f318c18239c12acbc9f6be3f513d137cd1d7e6240789229c7bbb432585ed96d8c93537214ccbf1b06f2431a902fca323ff694ef93d38ddcd295aecda97d76fc WHIRLPOOL d5a54b38f778666cf5049d0db71eefcc78ebec3c22ffa72041f3463552b8046c430deab5163fab3835a6c502f1c24a935f7d1a64825df7bf25a5ea792625a59c
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iF4EAREIAAYFAlG5WJUACgkQiIP6VqMIqNcuTgD9HXHQbKO+xM9fLTsr7qWHFV2/
-wBq9yFbWWSlb4cHWcmMBAIcjI0ZnQO/vwrv1MixFbCrJnkVwokRnM5gAbz2e+A/i
-=Oue+
------END PGP SIGNATURE-----
diff --git a/dev-ruby/state_machine/state_machine-1.2.0.ebuild b/dev-ruby/state_machine/state_machine-1.2.0.ebuild
index 0aa631077040..0cdb94ffc732 100644
--- a/dev-ruby/state_machine/state_machine-1.2.0.ebuild
+++ b/dev-ruby/state_machine/state_machine-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/state_machine/state_machine-1.2.0.ebuild,v 1.1 2013/06/13 05:28:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/state_machine/state_machine-1.2.0.ebuild,v 1.2 2014/04/24 16:42:17 mrueg Exp $
 
-EAPI=4
-USE_RUBY="ruby18 ruby19 jruby"
+EAPI=5
+USE_RUBY="ruby19 jruby"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/storable/ChangeLog b/dev-ruby/storable/ChangeLog
index 2672b1f9c9cd..6dfbb40f1bd0 100644
--- a/dev-ruby/storable/ChangeLog
+++ b/dev-ruby/storable/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/storable
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/storable/ChangeLog,v 1.22 2014/03/25 06:35:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/storable/ChangeLog,v 1.23 2014/04/24 17:40:57 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> storable-0.8.9-r1.ebuild:
+  Remove ruby18 support.
 
   25 Mar 2014; Hans de Graaff <graaff@gentoo.org> storable-0.8.9-r1.ebuild:
   Fix EAPI=5 usage. Avoid rake for documentation generation since it uses
diff --git a/dev-ruby/storable/Manifest b/dev-ruby/storable/Manifest
index a2ca21c24b51..3162346bbcb1 100644
--- a/dev-ruby/storable/Manifest
+++ b/dev-ruby/storable/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST storable-git-0.8.9.tgz 16566 SHA256 7e882229b64626c06da422edcdee8c36368bccb1342eaf9d685e387bcdfc6348 SHA512 b41b4333995ee46c3112799fbcf3a43e0dce65f173b2fbe38808e367c954c14e039e33908961bab47125e488075b4fa6487fb2f24090a45f21fd6e95db3da42e WHIRLPOOL 21c79947d37bbdd3af0b4c8d57478898327d8d2b43495f76bd8f414dca713169f8cf045ea6b2f0e011f1530d5816d39fd472689c4d5435127585060837affc04
-EBUILD storable-0.8.9-r1.ebuild 1228 SHA256 91a74f500bb5a5fdf41a361a1c30629a6edaf18de740c0aa3e0c2aab995d831b SHA512 06585e6958f8c8dcb5fea8ddfd9938054fc6eb8fdcf7f84275d585d8a06a90f14d1044887aafa6c4213546226808408edbb12be556a7122ba82fc3228ef65227 WHIRLPOOL 8cd26073bb6a5c849ce21cb7197013079f1a4d42a8fae554cf859be5d8e853204a74b919dd3c1a3704aa3132ca03911e8a11503c552d6989fd858d7ec78d579f
-MISC ChangeLog 3787 SHA256 f43fdfcec2c6ef8618324b0741eacf05b3c82866851508ed19c50743ea4ba098 SHA512 63b44aa57e12f2dd2ffaa9f8180a7254f591bcd142da3ebdfd31a1eeab12d163f614d8345e5bdc4f9a92c6f2c395229a009701003588129c5287d5ceaaa82452 WHIRLPOOL b0d9557e271a9dcffcd36c79e1b92ce17ce3939afbed4b646dfa6756c78be2bea1212636cc9c4e7d14ce7392d65aa3240d848978ce50668d2abe2696bbab2701
+EBUILD storable-0.8.9-r1.ebuild 1220 SHA256 c2f84417d71a5f8aa2841b2671809c9db222caba2ee497599f69e88c21db2262 SHA512 6314b6f93b07d24b214f3bfef5f2ac64128898778e284af2e32b9fdf4dfcd1cede19ce63f976cdf874503f9a0b4a2c459917f41cad0d49aa74cfd33e41c0683f WHIRLPOOL 9a3d677ee0c88e998c8ae3e610db55498a360cc4a7817ca68f3a0eccbd4636edb3c2f39583a61a672989fb48a5104b80b92e04bed7977124d71adb01701403ff
+MISC ChangeLog 3886 SHA256 9f2fde8ad68556637e3b8a48ca175a7347bd9b782f6ff2022b8b30ed6ec9e936 SHA512 60d724929143eb1902d685ccc2f64a3a46aafda13224f36be8a7ddba50d8d19c474127fc9a1d9366da089d3b2c4339580971f332e07a77f0e57985be5b795d13 WHIRLPOOL 64ff47f1ce311df946ff4c563a14a987e17abc3082d38b04733b1a7db6f2d43a53b3f8a7d48bc47b53685b662354b438f4827647192c92c23fa60fb5b3792239
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlMxI6cACgkQiIP6VqMIqNe0qwD+Ks1h1GSpt4vp+6BUQsFhtRzY
-7jDk3FsTstRoXtMT1pYA/AnPsSlXvygavikS0ZhMC+aXvc5pI2eJXSq0P+AltLgP
-=7mn+
------END PGP SIGNATURE-----
diff --git a/dev-ruby/storable/storable-0.8.9-r1.ebuild b/dev-ruby/storable/storable-0.8.9-r1.ebuild
index e6dff9f76e40..5dcd5b621746 100644
--- a/dev-ruby/storable/storable-0.8.9-r1.ebuild
+++ b/dev-ruby/storable/storable-0.8.9-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/storable/storable-0.8.9-r1.ebuild,v 1.2 2014/03/25 06:35:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/storable/storable-0.8.9-r1.ebuild,v 1.3 2014/04/24 17:40:57 mrueg Exp $
 
 EAPI=5
 
 # jruby → yajl-ruby won't work, as it's compiled extension
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/subexec/ChangeLog b/dev-ruby/subexec/ChangeLog
index e39eeb84875f..0a61c9700080 100644
--- a/dev-ruby/subexec/ChangeLog
+++ b/dev-ruby/subexec/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/subexec
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/subexec/ChangeLog,v 1.12 2013/11/11 10:59:55 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/subexec/ChangeLog,v 1.13 2014/04/24 16:44:51 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> subexec-0.2.3-r1.ebuild:
+  Remove ruby18 support.
 
 *subexec-0.2.3-r1 (11 Nov 2013)
 
diff --git a/dev-ruby/subexec/Manifest b/dev-ruby/subexec/Manifest
index 8781ab6d80f0..35bb7694c7bc 100644
--- a/dev-ruby/subexec/Manifest
+++ b/dev-ruby/subexec/Manifest
@@ -1,4 +1,4 @@
 DIST subexec-0.2.3.tgz 4384 SHA256 c551289af68d4f532e2cddd21466a645c9fd7da55f8c1c3d86c482d63b5d30f8 SHA512 b6fc5ee802906a690a1d1542ada44aba1df5e6861a66f4df58623e366d8d3ab2349d2963817bf07089e1dc15932ca03f0020d16777012ec4b92879280868bb75 WHIRLPOOL 46ec2fb4bb31a66e730aa3fffc048616471495e5730ceb2a5b3077f5b6f388949fedc05576f84dc0961d65945d8087d5c763c7f82695fd3a95b669411f771d49
-EBUILD subexec-0.2.3-r1.ebuild 858 SHA256 b2e8fb2a3364a42176429915736310db715761bf92aa6a55ad3968ce3efab47d SHA512 f2149017500e10c0eac746f9227115ad6b2d35236e585e1462591d47edc59fab01b4bb93a3857ec896d179990641365318f692f13aef1ed622bf8db6e4cb2515 WHIRLPOOL 17c83dcb542b52b9ccf93df0317ae6b6d08a3ed1ec90f83661cf36984312c3e7ed826578d7dd725e6cec699610c17c5d2747fc439e338a48f63017ab7b3cca98
-MISC ChangeLog 1843 SHA256 00d6612a4d83c479c65a21bdcea5dfd04df601855429872ae7a8b59f398f851e SHA512 f1e498d8abbcdcec56c5b228eb39a8b079fe6ba89722f67855aeb3783ecd02b25bae3d3561746d44669df1edf032565295d6b3ee32de2249b62e4b4e4c46e721 WHIRLPOOL a45528cda22c6fd6649c986960d451b52c72e888725fb60cb6be827b5f5df0bca8583a5a47bed2ce9e167a212306062cfebe46dfb30916a1a694641281af1964
+EBUILD subexec-0.2.3-r1.ebuild 851 SHA256 3766bbd210bcc13f26580bdf7e0146d05a6c55837adc75f5392dc6b70f6165b6 SHA512 ebef5aa8e65b742074c6636838870c8049369d8be665fcb929a558914cf131e32708beca5677660aef01afdbb8e6a30b6552e2e84b19495589b08677ec9f3dbc WHIRLPOOL faa0b06062ec9320607b1aa50d2b86bd91a095be352517e597971815e36eb8ff1b6cdf36d34d436f68c5c6168e0787faefaddad5b03a69a188175d6feab74876
+MISC ChangeLog 1942 SHA256 40b4118d5ac3eefbc4d172b16e588e49455c5c8ea2720db86540fd61d964550d SHA512 b9f7f67f13cd834ee9d4133c50d41388a1d617e3ec6600f332bc895dc01447cc4195a142bc9ca72a2c612183d097b8d27e25ca6c24b237b48c79baa5c405fe31 WHIRLPOOL 3f6b224f6aada9e2857b90f5f2ad16d97fbe4dfba6494cc75520a0b5710910d81a95c7d00b887aa17e6b51b0ba8a82778918f1bb516b5ee04d59c66e3a3c865e
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/subexec/subexec-0.2.3-r1.ebuild b/dev-ruby/subexec/subexec-0.2.3-r1.ebuild
index 6ee698ae15f8..e61dbf3b014e 100644
--- a/dev-ruby/subexec/subexec-0.2.3-r1.ebuild
+++ b/dev-ruby/subexec/subexec-0.2.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/subexec/subexec-0.2.3-r1.ebuild,v 1.1 2013/11/11 10:59:55 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/subexec/subexec-0.2.3-r1.ebuild,v 1.2 2014/04/24 16:44:51 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/sysinfo/ChangeLog b/dev-ruby/sysinfo/ChangeLog
index 0389f80d6ad6..e056962c25c1 100644
--- a/dev-ruby/sysinfo/ChangeLog
+++ b/dev-ruby/sysinfo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/sysinfo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sysinfo/ChangeLog,v 1.10 2014/03/10 18:27:25 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sysinfo/ChangeLog,v 1.11 2014/04/24 16:52:44 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> sysinfo-0.8.1-r1.ebuild:
+  Remove ruby18 support.
 
 *sysinfo-0.8.1-r1 (10 Mar 2014)
 
diff --git a/dev-ruby/sysinfo/Manifest b/dev-ruby/sysinfo/Manifest
index 2050c5223b67..e0bd38df85f3 100644
--- a/dev-ruby/sysinfo/Manifest
+++ b/dev-ruby/sysinfo/Manifest
@@ -1,4 +1,4 @@
 DIST sysinfo-0.8.1.gem 11776 SHA256 f4d11551a9a6dd215c34c6092d5c380b5a458119ba0b9d22dd981a79ba025ecf SHA512 7c4c43ae30e91e3eba277eb5ac9a960b1281d9cd9a138cce07e0b1bc364c4b44129e9ad9e38bc446aa222f52dc5290ebc414e55e9f642b57b8730861893f9095 WHIRLPOOL 30ae34a83a07db59660c97e77dec95d65803a1e8284983a1f8403d2167ae7a879ef892ed60ab278b6af01cef8ad83aa397530a9a957003af6693d6fcf80ad5d2
-EBUILD sysinfo-0.8.1-r1.ebuild 659 SHA256 3db7425b2ef07303541b13a60883f7e02efc141b9f57cd23dae0cc8ad668ad5b SHA512 be9e9520db1eae5ab3d63c4b220a9ebafa235d9d4cd28f1a69e972f8f3babd4733987f13e550c7cd648fd97eee062f0b3a66d59766533a285d845e7da90c9956 WHIRLPOOL 912ff48f8786e973b94c60535ee69ac874111c788e9986d139a1b10f054edca18ad2c1fb9fc4ca046c8aca700c4fa51a93770a04e7b329dac1a805513beafd43
-MISC ChangeLog 1593 SHA256 ee3b1be29075ab5f90be456803ceaf84e08e16cd87cf04396d7a4abaa81ee6ce SHA512 63f1b6520b95a7be57c44c72824025093381ec66f8e46fa893d99997554516fd2c1b98bb0a99017b28d1c72352d8805b071b66757ef332bf493547097946e50e WHIRLPOOL 7fc5afc4ba95e447e798b17f9ef9e9703ddc0ddd738e6159110644e78121615742bb21bc44404b1d8247b2d6db3493fbf42205770a87f821cd17aea109218597
+EBUILD sysinfo-0.8.1-r1.ebuild 652 SHA256 2720e1c8e17fafa604c8e266de54ee13bd458428e4bb1f7a66588bea6a678be4 SHA512 5b1ff65b7776484454b891132cb7e023bd141c4a9258f9cf7c2b28df7a3e5646d2abda083f517e91da9a550329e8610aad43c7a07351e6cf099e340a47e1c5ee WHIRLPOOL 7cf7513922d2493458f5d98099a6b4b6bf2ac20586acfd76729240bb037ed2fde27ac1f2517114d0af70edd7e0e5251594a6e60eb9c0329b7fbd0ac7294e7d08
+MISC ChangeLog 1692 SHA256 86ef4fee5fcae148e7f64bcedb5843335a6f69c328cadff109c1f872672f5517 SHA512 96aae39acb887829788738010eca614c5d11ad523e956fc82708401e9f94153305bb3b373bc2826f546cee67d2a57da9e9d73eed6391e25438f7f0b4dddfb0e6 WHIRLPOOL 4b0446c647228b2a2572804b06662a5c66e18303d680d9f67a9280d389930ed483eaa2002d6e973112c560216a6c697657f71d3197eb482602d30c8f1259c4d3
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/sysinfo/sysinfo-0.8.1-r1.ebuild b/dev-ruby/sysinfo/sysinfo-0.8.1-r1.ebuild
index 95ad98ed6abb..b9497b841add 100644
--- a/dev-ruby/sysinfo/sysinfo-0.8.1-r1.ebuild
+++ b/dev-ruby/sysinfo/sysinfo-0.8.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sysinfo/sysinfo-0.8.1-r1.ebuild,v 1.1 2014/03/10 18:27:25 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sysinfo/sysinfo-0.8.1-r1.ebuild,v 1.2 2014/04/24 16:52:44 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/syslogger/ChangeLog b/dev-ruby/syslogger/ChangeLog
index d1238369f7f1..8c689fb57862 100644
--- a/dev-ruby/syslogger/ChangeLog
+++ b/dev-ruby/syslogger/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/syslogger
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/syslogger/ChangeLog,v 1.10 2013/11/05 00:45:13 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/syslogger/ChangeLog,v 1.11 2014/04/24 16:44:01 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> syslogger-1.5.1-r1.ebuild:
+  Remove ruby18 support.
 
 *syslogger-1.5.1-r1 (05 Nov 2013)
 
diff --git a/dev-ruby/syslogger/Manifest b/dev-ruby/syslogger/Manifest
index 7fdd0f7cb85e..62e4be56712c 100644
--- a/dev-ruby/syslogger/Manifest
+++ b/dev-ruby/syslogger/Manifest
@@ -1,4 +1,4 @@
 DIST syslogger-1.5.1.gem 8192 SHA256 f44e3958586902a3bce56b03e31f5c1eea950cfe588bdae5724c5ba9818a3181 SHA512 3530df3f64fb4d9179db2e11be75998318ec36e215b2c4748805001e717726b801ec5650ae6ac68f8fcd97bc352ae751c44af65e30ac253086bbe6b70178aa3b WHIRLPOOL f738ad85c296974337c6e805b701c483f90efdc0ef35887689b83b3b3ef9e625a2d4f168a6af0911fbbac81c9fcf12a12a37aa5faa21a1972f047492f5d085a8
-EBUILD syslogger-1.5.1-r1.ebuild 751 SHA256 468a57c6956675dad2f866933215093283b403b77c1c6cc84bf113cf1a1f9696 SHA512 a9f91c3743922617715dcbf56c90e529e14472c3645e53d295a8c030410615eb492966e3a9d13668649bcf177e84a6ceb82811fe20a6e6d6f756ab681897caa0 WHIRLPOOL be8cee38fee9c37d1a967cd4f30660938b89832804d71a3dc9c35d0b00322e4d9235260c98cf53691c3d691ee0636199f2f0c4bfe54b9b94f5b0051833a7bd51
-MISC ChangeLog 1746 SHA256 d82928c18cbaca7bc09ef0ab6a6dd523914ecd7e287ba176f1571026608f9091 SHA512 4e16219cfbb05b66ab085519a4eb7b944e701df16bedf2131266d4fa6e676f6e4ec9eb0a7b5170e89caed809d00ffcfb9c1c89fea3f8cdaa130f5206cf143460 WHIRLPOOL c608dbd32eea84f8b13836585a5a2070bf37807ced7556ed92f9ce0729ef5916b3ec1f396fc74d3c46a405b3ec2d908db98086213a2f39917155e370c215c950
+EBUILD syslogger-1.5.1-r1.ebuild 744 SHA256 5e1b249611f3ef79d0820cd207881e48bf9a39b65b76be909a67b0aba2d4ecd1 SHA512 337ffd3cf1d2e5573d8469decdbe971d9d468b438081a4e45f57c5c030b565bc3b98a454dc3346dddadc8c77f0389483ad3c84f8ebeeb3bc8598f8d6d225a18e WHIRLPOOL eb45ab41c5dc5c29efae8f8aae2c807dad17d32fba2ba7f3c66f47923c9665fee2fcf4186c131bccf5cdba77796c8862fa17429ce6da697acc8e44cb007b4e98
+MISC ChangeLog 1847 SHA256 77776b5e713836505a4e65a4df6374c538b0854c5931c87e5f313f4cf393aae9 SHA512 e3f97f0430d7592ae8e51efa08ec6f6453ab288cd6e9fefb59aaed327acfb5b104572c32c24ea93d44d022d6f99bd9ddd24b4102df424c339cbec85de8322ef5 WHIRLPOOL 293c7365ec78c73c275617f0e84e05a271c77bae8b9de3d6ff4ee079f92a2a899bf96b5068edc1a47381fd95d6295f85f01a5f36a028a43071d98b5ee1d8254e
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/syslogger/syslogger-1.5.1-r1.ebuild b/dev-ruby/syslogger/syslogger-1.5.1-r1.ebuild
index 2fb4d4080670..05832c7e97ef 100644
--- a/dev-ruby/syslogger/syslogger-1.5.1-r1.ebuild
+++ b/dev-ruby/syslogger/syslogger-1.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/syslogger/syslogger-1.5.1-r1.ebuild,v 1.1 2013/11/05 00:45:13 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/syslogger/syslogger-1.5.1-r1.ebuild,v 1.2 2014/04/24 16:44:01 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/systemu/ChangeLog b/dev-ruby/systemu/ChangeLog
index 60fedf45b6d4..daab55e6b068 100644
--- a/dev-ruby/systemu/ChangeLog
+++ b/dev-ruby/systemu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/systemu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/systemu/ChangeLog,v 1.23 2014/04/05 17:53:36 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/systemu/ChangeLog,v 1.24 2014/04/24 16:50:32 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -systemu-2.6.0.ebuild:
+  Cleanup old.
 
   05 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -systemu-2.5.2-r1.ebuild,
   -systemu-2.6.3.ebuild, systemu-2.5.2.ebuild, systemu-2.6.4.ebuild:
diff --git a/dev-ruby/systemu/Manifest b/dev-ruby/systemu/Manifest
index 1df453fd4248..0798257f6c9e 100644
--- a/dev-ruby/systemu/Manifest
+++ b/dev-ruby/systemu/Manifest
@@ -1,8 +1,6 @@
 DIST systemu-2.5.2.gem 12800 SHA256 19ba2254fad0c4017bb95b7604e243403a7951b22e8c2b63ee84a7d7a4220341 SHA512 8266bb7e6bc64ba0b2aafd0e2a83b60fdbc43c19adc8b3da456d41efc65d6586297331b1f887dd4b5af8a68274709185993c60d999a26a40382b5a02c43db91e WHIRLPOOL 471fa37b9532a0fb68b6cf93178113f3cc042cd25a3d1cae46d5b643f60e2ac5772fd0194d0ce70506cfbd5591dab239fc93ac519a0deaf0c94b962ad7482add
-DIST systemu-2.6.0.gem 13824 SHA256 c217f2642a93a77acf74cc09de1c08440681959727e2729d324eecc9f634bb3d SHA512 94bc82674cc582882af4bc177e2e2f29f520fe6a9f8c4274e4209b57decfc7ac15e1b6bbfdad93acc244bf82d375bd316b4e2976cbdcce8fbb68805712950029 WHIRLPOOL c11c581e92e36f57bcf362f4fe91f51502a0cf00a6042b8bc1708e156af65b5ee08e62d08c6d3fcc76c462615e5f48b2b447304aca569af2e3d14769a0dd9340
 DIST systemu-2.6.4.gem 14336 SHA256 5f8c38d0a483f1999aaacac3022bcea4dc6bf524537b93514939787dbf22699a SHA512 070a01b0d131f5d9d0582dd0ba62e02d1203d7cf01494ba2b8165f6fa07309614d33debbc53573dadb94d20d196d80cbb34d0e0274ec42b07a1bfa9efb08ab00 WHIRLPOOL c903e9b1f6653b4b235a9d306b711443670d7928c8f209fa4ccffe44ca29623b6090def690c8fe758f19c3b5ee3acf066c8455ca88c272cf1b2675beb37df106
 EBUILD systemu-2.5.2.ebuild 636 SHA256 09e36c983d869a7356fecbc1bc6e9d35bb63e96eb435889975f359a31c7efaa1 SHA512 88b58dcd56647422d83fd1820851a64bec65dbc3c3900f12d5d613e16956242a592daf1fe8a5a0d53567d23fba870d44a9ad024d5f66d003086482e22c497e1a WHIRLPOOL 1667ae77d6df3fec9d6efa77bd72bbeb94f919d05cb2896dc1abc2accae472944a313ba577e248e1f3a1b4c44173575cb6dbcc4bd30f048bbd9b15226ce3ea84
-EBUILD systemu-2.6.0.ebuild 653 SHA256 faba873184d4fc1ecc5adc88bc431cff525b82be72105da40f1a65d49f323b0d SHA512 d24843ad5320b0dd4d7dddc88787e1ffbb576c80294442b6336acd94109f33aa2282d84d749a03debfa6a18fc2c1ec8e49a8fc9b0043fad9161385ec7d03000f WHIRLPOOL d8154337fba407232848357a095a1fbbc0ddec346aa7da4623d1f6c679709cc948ff83a9dd0731adcd2cf290e05e4122548dd21d880efca811df10a651d1ffc0
 EBUILD systemu-2.6.4.ebuild 652 SHA256 d6bb283602d6247407e518e4f4326a1dacc2a15ab97f3008fe3e6bdd23573cd7 SHA512 c677bed3a3e3579411f0698c626e46f631534a5af6f4aa193443ef8f3817cd911c41a147a2913e14782812e89184c70e42e3180c1c10a72b8c162a3d533c9faa WHIRLPOOL ba56928245c587cc2b905a39b9e80b5fe25eceda01c0ca4eb5eb767d70c19943435eed8cee8ef8ee57dfe37d39e4d91a2fbaaf67f9e6bbd7b3c84ef7d70eca3c
-MISC ChangeLog 3258 SHA256 e2bf68f7d26eb0583504362a3fe56c6eb9c0e9eb82febc7a5443a3459d473dd0 SHA512 bc4bcbb740291c240f3c51233d12f3aba9d6be6869be32dcad603db3c94b58ff10c6eb63b02dcdf70e4503f2d7371dec784f80b2769c393ee625316f5e37c46f WHIRLPOOL 21e2fc767b394a047e851b743dd1514b2a95e9cc0f48c214b90d9dbc4f0cd8022aa36217611ceaf9d7baeaf9b6d0e833b9193dfe46818cb33f3c77538275a0fe
+MISC ChangeLog 3345 SHA256 9610bbbd0d4ea24cb4b4d2909a17d0401b07a0b96d6f4cb592bb72c52ce0f53a SHA512 45efc062f96d942bbb0e589a0401958c6d637c46f873b61e9225676926ecd8b481e2094fff86b0a013f57ed8f5ffc4cd50d84cb4da0c50f7a45b19bf994e7eac WHIRLPOOL 11cff0e4946916b223944f00e16ffc19e5a1fac88c2eb4eca699374b760c21d8ef019171f855d68f4fd271327b6246a24343b42a8d5c111af0058b5e4712ca61
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/systemu/systemu-2.6.0.ebuild b/dev-ruby/systemu/systemu-2.6.0.ebuild
deleted file mode 100644
index 4cd11e36e8e5..000000000000
--- a/dev-ruby/systemu/systemu-2.6.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/systemu/systemu-2.6.0.ebuild,v 1.1 2013/12/11 07:25:36 graaff Exp $
-
-EAPI=5
-# Test hangs on jruby
-USE_RUBY="ruby18 ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Universal capture of STDOUT and STDERR and handling of child process PID"
-HOMEPAGE="http://codeforpeople.com/lib/ruby/systemu/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r samples
-}
diff --git a/dev-ruby/tdiff/ChangeLog b/dev-ruby/tdiff/ChangeLog
index 1b3bce11a9a9..96d832404f01 100644
--- a/dev-ruby/tdiff/ChangeLog
+++ b/dev-ruby/tdiff/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/tdiff
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tdiff/ChangeLog,v 1.2 2014/01/30 23:15:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tdiff/ChangeLog,v 1.3 2014/04/24 16:44:34 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> tdiff-0.3.3.ebuild:
+  Remove ruby18 support.
 
   30 Jan 2014; Markus Meier <maekke@gentoo.org> tdiff-0.3.3.ebuild:
   add ~arm, bug #497396
@@ -10,4 +13,3 @@
   09 Nov 2013; Hans de Graaff <graaff@gentoo.org> +tdiff-0.3.3.ebuild,
   +metadata.xml:
   Initial import. New dependency for forthcoming nokogiri-diff.
-
diff --git a/dev-ruby/tdiff/Manifest b/dev-ruby/tdiff/Manifest
index cf94f3e1f54b..04da75d44e10 100644
--- a/dev-ruby/tdiff/Manifest
+++ b/dev-ruby/tdiff/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST tdiff-0.3.3.gem 9216 SHA256 06b1db8588fb3326365b97a3684668e1a425c89914da1ef3ab046364f792814c SHA512 18c8ee9025eedfbf78c24280bc318736e13d840a2be8b05257697d2c4de29831ed6a361ecd553fc1bcdf7961483fd0712ecb76dc3681a9549f4d3f7a18bc3d8d WHIRLPOOL 9c5b440efb5e700e6234bc20096b9df791d753cb980145d374caf3ba4041aaef57a7e1cf722e24a4ae1d13bfd7f5c63c6f5c87b22e41a881e229339f26eb9a4a
-EBUILD tdiff-0.3.3.ebuild 574 SHA256 edf7726237e65f31df6fa896afc134e768bbd1005022d1dc49937c79b635b6be SHA512 ee49b88f5fbf241f0b0420a7c3a7a313caf8063e580f87c30d9b048c72747030412a2fe79d68b0bbdc9fbef5c00834d05db903228d92dfd8cf4f476957a9783d WHIRLPOOL 30251869ee79e0b116a2796be0c63af9ac0e288639174d723d775f0abc568a5fc74703639228f318e211e6842ecdab6d46c4c00e30931890a0d4258bf7dd0234
-MISC ChangeLog 475 SHA256 f04a8ab869dcbca9d2730273df900d82384cba3be49043fb3b30610b9dad798c SHA512 ec2d80b31c8dba4d71f76deaef31d4a601d7c92343baf0e3470b22365d0b25dbebb7dcc098db4f8bc0c845a5b6cb26d181dc2fe163e05e0ef7e584c50c08b3f9 WHIRLPOOL fd407ec7248373a6b3be5b4e8ae505b5cb3b50fa0d7515533b1e3ed26c426bcbbaaece2428544665358670ac2f397fb0c446b5528fe208a373260a679c6cd139
+EBUILD tdiff-0.3.3.ebuild 566 SHA256 4e8f616f2d4817cd4e2a613710e97445ab311da84a702ef702314670b0cadb90 SHA512 d0b3ad57a33b5711bb8008f75164edfeeafe6dfcf53debd93ee5420c932a669df1a71626f983024965709410e648582d21b06dd92ae3ba3644e6ddd307314840 WHIRLPOOL d1876baa734314d3e020964b39de42e6e80365c6a306651428cb3d7401906dc4d8141aaebe213e0d20cb49c61e52bf35dc9915da5274b402d9878915183aa92e
+MISC ChangeLog 567 SHA256 9d396720db28d8ee9214a5bc1cffd701222f5ba013cfcb2f0c55c7275da28f06 SHA512 5b0da7f16abd681d32be05d6aee04cd50703d5a1f249902e26f4e903254a2c88bd865428c63efee984e8101f41b3e36ce546cdb0248e50bcef43feef098c11f1 WHIRLPOOL 07b563c7b24f60ec2d294fe7939e635390a3c3991f039e22b3e632c83b2083a3acc1c2541faeaf652501b541af2a6f2c61b88c29dda73aebbf75aed3c14be293
 MISC metadata.xml 159 SHA256 abab7965b1f41e0acf6b54c554945c1c9fa35b5afab848d784dc58c298bc4679 SHA512 39d857a527ff3a066b0fa7a6e57f789e60178ca13c5ddaa93802b58ec8d45f47418c2ce85c389e2eed619216aca72d761651efa5a401d84357df9b24b478b3fb WHIRLPOOL ddb2c776f81935d41c9e81592c1ddbabc4f94422f44bab6e312730aa541994234a2405ea5ba2782818404a730be20dc53c9cc205efbf8f0843bd21cf839b0980
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlLq3rcACgkQkKaRLQcq0GI2OACgjEZ8AOB69eCErwMweUw0Kpi6
-UlkAoIqU3XZnCpz4IUhLjmDdwUIi5kZ9
-=0aAI
------END PGP SIGNATURE-----
diff --git a/dev-ruby/tdiff/tdiff-0.3.3.ebuild b/dev-ruby/tdiff/tdiff-0.3.3.ebuild
index 8958b4240776..2ce70350319e 100644
--- a/dev-ruby/tdiff/tdiff-0.3.3.ebuild
+++ b/dev-ruby/tdiff/tdiff-0.3.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tdiff/tdiff-0.3.3.ebuild,v 1.2 2014/01/30 23:15:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tdiff/tdiff-0.3.3.ebuild,v 1.3 2014/04/24 16:44:34 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/temple/ChangeLog b/dev-ruby/temple/ChangeLog
index 74f756fd3e90..b9a69f592ed8 100644
--- a/dev-ruby/temple/ChangeLog
+++ b/dev-ruby/temple/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/temple
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/temple/ChangeLog,v 1.14 2013/12/13 00:58:33 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/temple/ChangeLog,v 1.15 2014/04/24 16:32:24 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -temple-0.6.7.ebuild,
+  temple-0.6.7-r1.ebuild:
+  Remove ruby18 support. Cleanup old.
 
 *temple-0.6.7-r1 (13 Dec 2013)
 
diff --git a/dev-ruby/temple/Manifest b/dev-ruby/temple/Manifest
index 9f5bccc3f032..a2ae63059a4c 100644
--- a/dev-ruby/temple/Manifest
+++ b/dev-ruby/temple/Manifest
@@ -1,5 +1,4 @@
 DIST temple-0.6.7.gem 35840 SHA256 3374f339c3b54611538b9811c0c46db8e06b48ed212db741cd7f52baf59caa26 SHA512 9979a40b6c71c7c7742b6b513577cce6cc0e5c2888555e51d261381d7c78f19afab89ec966a382fe29afc79cd77af999637ee6c46cf2e93664ca41482eb5ca94 WHIRLPOOL 44264ae6fb916c79c254858acda8eafcf4db2e38de9c42d7c575b88cb8a34fd74787e51d8621a800c82206ee427fb4dc2de50d1c32124f024c4a257473aa358b
-EBUILD temple-0.6.7-r1.ebuild 713 SHA256 3f56d51ecdff3d2f2aebd246dd71dbe57a97380fc2e2aba71c5a81e5da8463a7 SHA512 6a636b7792445b7439a735ed79fd21bd53cb38655cffeee04a5d43e7e449f87a4a27e77659db8becaf70ea27ebdaf8e9d3b95b8fc4ad87239da7685e73d9b2b1 WHIRLPOOL 7cf8026ce8d7a8ae4e1c34f77926ff7739909a9a2fba9576435fb319913f54b05ee2eec6063d45869e360444e663a612fd220b28ff1c32780b96236b2eece319
-EBUILD temple-0.6.7.ebuild 703 SHA256 66f25a0d512adb112c65bccae02ae2ec8eb68970662188cc193d14cc7927986c SHA512 2a2a2fba4fe7cd4f8e00d16dcfb67a1ade3b745def240a192995a47fd07d6b40c796ae95a034fe960c39c160a19553b6b706faefd03e4fecee1643505915b2e7 WHIRLPOOL db5f554cb5e95f3ac4563ca54997c151423e2029a29fbb181e2ef1fd3e7a93707d5cea32c343149ad3275fd7a3a4aa523bacaa67179b116c9526b109ef36c97b
-MISC ChangeLog 1921 SHA256 2836a391bd7302fdc39bd859103122acadfb3890a911881fe1d493eeeb188432 SHA512 a722c351c4bb20dbb18cb134f9b046b9480801a0eec254558209d645249a2dc5f36f392064dfe618bdefcba36729dd7f49aba40cd51d517b0e0f9648aa76a256 WHIRLPOOL 802882c3a471c262610c606c1dc6b0cebfce8aff3160ad10d1078660674a4a728f61d3b1783119030c44252da759845b90d960906464f7beb3851a6ee66ffa2c
+EBUILD temple-0.6.7-r1.ebuild 706 SHA256 f7392372a582069deb3bc3321cbfda91a6d914c31aa1ff1b9cabaab6c971c5b3 SHA512 93131171b07f44b8a9002325b6958c8b27d867f44e8aa24e5217f83e7389a6e327a5f1b8a8ddf1a58280fae912b2531c38fee7adc95d8783122f9cd4549d1270 WHIRLPOOL 1a492c3575a533da4b7e9816c0999084832fc02349e407b7490227b7a76999635e8566dbfb37438cc81671be5dee438b1fdd1eca6d69eb64644c98e2259b7b62
+MISC ChangeLog 2056 SHA256 470d444dd6dfebc3359c84d916e24a208e1ffc4476b48bdb0f6492d6aa83b866 SHA512 f4afa60227269896e681145db0bc19de09978d1206a0b80fa21f897524d97ee6a8e61d6e12d6849805a3ee8c182acb31cacfe2fd30c4d22cf6800507af29f2a8 WHIRLPOOL 81d9cf7badf1bd10ce4247b75d98414ec3080bb1b271900c0df91a2694b84c422836aa09958e013c00d58c4cd73ab8f906b32b360f04684e3b1518b8a6b5688c
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/temple/temple-0.6.7-r1.ebuild b/dev-ruby/temple/temple-0.6.7-r1.ebuild
index 637a6e393c46..ac1dd4c1b945 100644
--- a/dev-ruby/temple/temple-0.6.7-r1.ebuild
+++ b/dev-ruby/temple/temple-0.6.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/temple/temple-0.6.7-r1.ebuild,v 1.1 2013/12/13 00:58:33 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/temple/temple-0.6.7-r1.ebuild,v 1.2 2014/04/24 16:32:24 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
diff --git a/dev-ruby/temple/temple-0.6.7.ebuild b/dev-ruby/temple/temple-0.6.7.ebuild
deleted file mode 100644
index 310c601a5b01..000000000000
--- a/dev-ruby/temple/temple-0.6.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/temple/temple-0.6.7.ebuild,v 1.1 2013/10/05 11:35:22 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="An abstraction and a framework for compiling templates to pure Ruby."
-HOMEPAGE="http://github.com/judofyr/temple"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/tilt )"
-
-each_ruby_test() {
-	${RUBY} -S bacon -Ilib -Itest --automatic --quiet || die
-}
diff --git a/dev-ruby/termcolor/ChangeLog b/dev-ruby/termcolor/ChangeLog
index b7088a105183..c9d8f7953f99 100644
--- a/dev-ruby/termcolor/ChangeLog
+++ b/dev-ruby/termcolor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/termcolor
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/termcolor/ChangeLog,v 1.6 2013/11/11 10:53:26 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/termcolor/ChangeLog,v 1.7 2014/04/24 16:49:24 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> termcolor-1.2.1-r1.ebuild:
+  Remove ruby18 support.
 
 *termcolor-1.2.1-r1 (11 Nov 2013)
 
diff --git a/dev-ruby/termcolor/Manifest b/dev-ruby/termcolor/Manifest
index 71ea93774b4b..a8203caf8d98 100644
--- a/dev-ruby/termcolor/Manifest
+++ b/dev-ruby/termcolor/Manifest
@@ -1,5 +1,5 @@
 AUX termcolor-1.2.1-fix-spec.patch 678 SHA256 7b85a365f1b0b53bf22b06e43e0a9075898c24c685f6a2aa510ca877c8a2eacf SHA512 380d31a11980514eb69d28bdf02b63ba92b656e781b0edbd8cd0e53d48989e016f0ac21269108414f3e27563332ac79781245fe282aedc8a9742800ea6d2a587 WHIRLPOOL 657d114192ee5735c003e0665520ffd3bce3697744ea83b7bd5e4985ec32145443af7aff722626e3826f7585373bd545f7789611e40fde12ce59f73f5a2a9351
 DIST termcolor-1.2.1.gem 6656 SHA256 d5e595a8d29380d76b44e5e3806766198da048095acc51072b388ea5439e1df3 SHA512 986fe5a5a56a83d9a39ce13cfe59a82850780befdbba006d2d0cf532b9bf2f72f1fe70363123c46b8beead5d8add452535189a069f2b2f3cf62f0b7611ec52ff WHIRLPOOL 3d12c46f22b53ec2df15d55673ebe78ad98248deabdb5adc655908774edf30f3ac90f5210bd994dd4997c8017a9e2e11d5a705ab3679ff689c9d3b9df702b865
-EBUILD termcolor-1.2.1-r1.ebuild 753 SHA256 b83a7c67fd4a8ce02ef6e8d2cb38d11cd061e8ffda1316a683c0d59338d6f13f SHA512 2c18d8d02a15493e2dd9249dbfe74b5dfb1fba48ced4108f7b43b5e00af60607f4bedecf91a7e7e49fff3a22178f7becf78c30918c2c01e568353e24a3704599 WHIRLPOOL dcce47e75376a8c407a06aae006942d9f8a224c490cd804d9c6d388547220e79af6c5b498431a4818af641ba41bc5bceccab7c39cbb9c89c44bb104c2b1c48bb
-MISC ChangeLog 1278 SHA256 e9ac707bfa0d46683390dc8703596c1053bd98eb73b42c66945e4dcd83bff1ec SHA512 b5b8f9dcf83f1b0dea5e722aed21359412ae7f6609d7a22236ac12ad41ad020e55b5cd8e0650e88f8fc616bd9f99d58ea4c4ab800d1ad5874bb4747405bd103c WHIRLPOOL a2e3ebae10224152822a993551a155cc2e32364d20ea24a379420449e373c32d07c993554848746b3fa8005ceedbfab40a061d5ead324dcba1e435db3374f3f4
+EBUILD termcolor-1.2.1-r1.ebuild 746 SHA256 eab885ce3ed75910d7f97f54e1ac3c0b4da54441086afaf5be3ae319145774a2 SHA512 715f03ae7a0c45bb9f118eda3a369cc9d598288fd98fc504dc38bed3e71188ba55219125f93886e7147cf296f3898dff1224374010e29d632c6913a69451c3a2 WHIRLPOOL 6a217790940758a7f3fec55726cda3eb50fa3ab67c7e7e0f0748963650d899d2dba4883dbb8e75a0c9ce568bbb75d4e8f386d16c27f76b5973ceaa1417068de9
+MISC ChangeLog 1379 SHA256 b8d3b75b68c423f5c27ff31b861fbe250a3e3102380ac257ca5fc11f50355a23 SHA512 7be39f2b2bdfeee1134e9eb6b5969508b93d314f72d32e38e3c10cdb7abadbfeace809dcbbec391fdd9f6e1bdc8aaa1c0789dc29170334eba819e897628ab1c7 WHIRLPOOL d001008736d9271c3120cfa96545210fcd4c8c6a07e3c85bc34d0168812e75836c5385edd93d4d32dc44de92a9dba0806c1c932aea7d68b3408346197f5602cb
 MISC metadata.xml 220 SHA256 3876bf94339a6b2a36040fdf7eaeb1dcddff46924c02b8135f615c2d4eb1c743 SHA512 66dbb451ba4115e830d33afa73976cbaeba61ea7fece70a40d282ea075a1543bd40e1a6b1b93eb2a4a46f34f0737227c80d7e5011380fb2568a994638ac56776 WHIRLPOOL 0c2761a8fefbec57d963f3c47332454125585f59d2797608a14e9c3961e311de5e02076ff66382972ca6737923d541a7da767a20010822e29340b663b5bf5464
diff --git a/dev-ruby/termcolor/termcolor-1.2.1-r1.ebuild b/dev-ruby/termcolor/termcolor-1.2.1-r1.ebuild
index 2f4845fa0dc7..1638e2919ee3 100644
--- a/dev-ruby/termcolor/termcolor-1.2.1-r1.ebuild
+++ b/dev-ruby/termcolor/termcolor-1.2.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/termcolor/termcolor-1.2.1-r1.ebuild,v 1.1 2013/11/11 10:53:26 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/termcolor/termcolor-1.2.1-r1.ebuild,v 1.2 2014/04/24 16:49:24 mrueg Exp $
 
 EAPI=5
 
 #*** Using highline effectively in JRuby requires manually installing the ffi-ncurses gem.
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/text-hyphen/ChangeLog b/dev-ruby/text-hyphen/ChangeLog
index 989ab04301ff..b47b4d6d3bb4 100644
--- a/dev-ruby/text-hyphen/ChangeLog
+++ b/dev-ruby/text-hyphen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/text-hyphen
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text-hyphen/ChangeLog,v 1.60 2014/03/02 23:01:53 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text-hyphen/ChangeLog,v 1.61 2014/04/24 16:33:25 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> text-hyphen-1.4.1-r1.ebuild,
+  text-hyphen-1.4.1.ebuild:
+  Remove ruby18 support.
 
   02 Mar 2014; Manuel Rüger <mrueg@gentoo.org>
   -files/text-hyphen-1.0.0+ruby-1.9.patch, -text-hyphen-1.2.ebuild,
diff --git a/dev-ruby/text-hyphen/Manifest b/dev-ruby/text-hyphen/Manifest
index 0a1342a155c5..c678c0d99af8 100644
--- a/dev-ruby/text-hyphen/Manifest
+++ b/dev-ruby/text-hyphen/Manifest
@@ -1,5 +1,5 @@
 DIST text-hyphen-1.4.1.gem 751616 SHA256 019fa7d23a458184ae632b73f730e3ae4a2f07795c45508149cee7a4375744be SHA512 4a6667aff01e56afce79302f46d0afdbf9c965ad80dbf9a7266a213143e6b6bc2cb00092d26900286bf72a700e47be6b0860cfdf87fa2856477db02261f9ef3d WHIRLPOOL 46a70896d463dab6ba329ec4091ce06c76a6ea4ad1cf1b8eeeb10a4d4a6f7657eb22ab67ad8e5c3dcc7a9f6cb42555394c409b80d3a87addbf91b64be341dbd8
-EBUILD text-hyphen-1.4.1-r1.ebuild 824 SHA256 db3dcb7f0a61ebed350f64d122b2d64076949a5fb334c2658cc6c9c4e9450ae0 SHA512 783e2d7c4d0dcfae6468c21c9255936d7bb2d58bc71baf18decf6fe8fc8a95e5d41ca22187cb5cc65583fe8f174309f14a9c0212aa9c1c8c8bfd903a80072213 WHIRLPOOL 5888ffd154a7fc146e7bf0341ff87c29de7fb0cbe5ce4daf79921e98d004bdcf2182e8d4e0e8b086a8b29e08afa7739acab6a16e131c610e379d3a995b961f2f
-EBUILD text-hyphen-1.4.1.ebuild 814 SHA256 f26f3ef6f5044782f16fbe03c7bc03c26e652e4db43b0e890e5f04d0b8cc1958 SHA512 5bd78a7a13bdbbbf7572b658c4b1931935b1fb1476253d6b79f8acfdfee25e00875d8296b433357b67c7e44aeca48fff7e27b562c0bd9c50af892e8ccd969f42 WHIRLPOOL 12991ec482a6b18226d0837e3fb6a5bcf40bb3701277fb4fa5f6b127290651f050acd6682bbf52a4849c1d2c2bea06d638f8aa1f57034f742644010979f654a7
-MISC ChangeLog 7687 SHA256 bafea8c7971ceb20b9e1ac8c4a843605e20f0c3d6c1e84ecf76a429b71e327ec SHA512 79325d5586b985d278ed898b16890ac5b99c98041273654d6144620d227c9490f7d556b9da9b8c4a404a6f13247d452ee8ea7e27ff0e3dd791ed56ab76ecb614 WHIRLPOOL 1e4c936817a4419e7713617a61d4de6ec0b64ccb9e476145b0b2bfd9fdae2fdd10e6b65d48125175f216ee450963c7779c79cd2708242936d4967007bf535f0b
+EBUILD text-hyphen-1.4.1-r1.ebuild 817 SHA256 696b9923e70292ef5f68a937c5a404887271b253c649ed87adff401467459113 SHA512 cd8fc4952b1622b757da20789c1955fd17eb89516310674a21ea57f137ca2136d4a0e9eecd91f3899704b81a0ba1cbeb97032ab1f6e1cef9680c2ede868cc455 WHIRLPOOL a099432e9264b24a0dbaf4f8404f84f2f72baad8b7ca25e49fc35efee14db95784ab4479d07a1b5cc47d04b09de12797c963e93c71184eceef39a10bb813c6a5
+EBUILD text-hyphen-1.4.1.ebuild 807 SHA256 1894b1472399ede29300ba91dd3e643bc30ced13ce449c5c8e7add90e2418748 SHA512 01d0ae6afc6361fa3b90069aff10c1a0a40993a37d0971025737a86d675e5addbc0f6de4a9c05db1c9a6ccce7e4661d98d7ef3450abc230543ca3e9434608b69 WHIRLPOOL 233c21751d9e657de7761fd4b8ae1bf58eda6b6a4d74606cd05fa63e6f25b93fc500c58dbd00923e0833c533ce957baf2698d741e74e817892bc7f7aa3002b9d
+MISC ChangeLog 7818 SHA256 b47970dae9e242de3a12f3413d76584f682a4ad95d714506c39aa71a6b6c4de5 SHA512 7edf288490175ed1aaead5825aa6cf187421c67ad37ca3aff4cb4fc654acc2c7b768b84b85ea0c524ce5d4829c40a37e4925ae7bc7fd94a862cfacc0bbe81b8d WHIRLPOOL 52f8b3710106461bf20bf760d7137382f30fa64f6f73305d304ccb373a087b86cb7cfe206e7f17ea9925606518849196eccd1ac816647f164a09e9f0ea0e4cad
 MISC metadata.xml 237 SHA256 bb15ea2f20ebfaaf65026bdbee46d8382df95626006e10b1f89975beec410d41 SHA512 4611dbda96d00f98240e7c82e783eeeb55804789c92241e607804a75548a1a8f66ef4b64df2bd869751a14c94b0b0c7c140411cd17f4bae85037c1f11ba1bb56 WHIRLPOOL b92449c5c35a1daf50ec66cbbba47d65ee5e063bf11db3729837dea4f3c2287df6a4569c51029452b781a6162a3a7d7de8f7a9f1a42ae152abc9c016674ba1b3
diff --git a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild
index 95426fb87a80..a00233ec3d7a 100644
--- a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild
+++ b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild,v 1.1 2013/10/30 03:51:40 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild,v 1.2 2014/04/24 16:33:25 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild
index cc46da8bab87..36c57a65b5a8 100644
--- a/dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild
+++ b/dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild,v 1.10 2014/03/02 23:01:53 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild,v 1.11 2014/04/24 16:33:25 mrueg Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 jruby"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/text/ChangeLog b/dev-ruby/text/ChangeLog
index 27dce9ba6f7c..53dd25c3397b 100644
--- a/dev-ruby/text/ChangeLog
+++ b/dev-ruby/text/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/text
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text/ChangeLog,v 1.6 2014/02/08 13:49:32 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text/ChangeLog,v 1.7 2014/04/24 17:41:36 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -text-1.2.3.ebuild,
+  text-1.2.3-r1.ebuild:
+  Remove ruby18 support. Cleanup old.
 
   08 Feb 2014; Akinori Hattori <hattya@gentoo.org> text-1.2.3-r1.ebuild:
   keyword ~ia64
diff --git a/dev-ruby/text/Manifest b/dev-ruby/text/Manifest
index 53fcad7cc9e2..ee8a5184cf5c 100644
--- a/dev-ruby/text/Manifest
+++ b/dev-ruby/text/Manifest
@@ -1,15 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST text-1.2.3.gem 136192 SHA256 a0e9fb0fa88b6fb5d89e370f898064604f28d0873c342b27235a767dea58e192 SHA512 bc4ad5a00dc8bb7275b5481ce3be1efe1b32a9bb83e818025c0d815c19addf1fa7ed99855ac3188aef5ce54150323a8dc9573bd193e195614731c093fb7fd917 WHIRLPOOL db7d6f2d0472467ee594f05ba8fdbf20159869342d6fba77ff31407428e7eabe6e5b3808cc2aa10d8cf223e544fae10cbe8ab1e28b0621eae85c490eae31141d
-EBUILD text-1.2.3-r1.ebuild 522 SHA256 bef084b17c95f3bce34574e52be9401627d0aba23b74e88f614f7f36e4a03f37 SHA512 8ca699df18c56c5c5d002a4ab772c1a1852802b912bd9e52367dccc03eeb4bb4d0c4c0cfb124aef8b3572c200abe90a3a4696c4b3452627d22a84105c21aa83e WHIRLPOOL 3dfec4d8aa086be7230532230c94d631e36abf525d9893bded1fcee2876b5597e7bbf361ac51e09332a8d0e19b688b5018f8cb51d24c02559f8e93a430413ac9
-EBUILD text-1.2.3.ebuild 495 SHA256 acc27fb80cc2743ac6d373f031c499872937d692772feb2447f35efec660c0c4 SHA512 c0d810d94ca4da7255f1b1af5555d5c0b601bf317b6121489e88701e32dd1fc3f15afa7d99fb7988a3bbe425d325bb1f2773dfab3bcb802b7badb557e2eed082 WHIRLPOOL 232d67a77c882c8dce2484ea1a16cfdcfd4dd7103b01fc070f525a68e71533130fdfe666486d7db4ab93412e63d5f452e1eb2d828ba80596eb5bef014a53e175
-MISC ChangeLog 833 SHA256 0a1534b5fc075640cc703b57d49d9e35841c4d8ae2002dd44a5026c6291b16d3 SHA512 607809cfb59cd1a7d5390fb335015fc1f2888912a9dcb4202b51823777c3bcbcf00430162bbf24d5a39b5173818b5ac2553cf0146a6c65355f4de39252cb3890 WHIRLPOOL ec3e491389bb959ce7d3d56c95215329c5d51e25e34c7ff506ce965e982c8762cd42982688fa9f003fbee8961eea46229be1b2048982e2876be4821e347a6ba6
+EBUILD text-1.2.3-r1.ebuild 514 SHA256 6da2bb98e63511668b077b17eb069642b9924db0e289bc9e5b36614446560eba SHA512 76f35a2fa5627526e64e17c163b8a8a446e00dda9312123712613dfa89cfda2018944fbeef4530f39f8ae4d37cb3ebebef5fc79c529b3eed092c1811a935abbe WHIRLPOOL 5372d49120c0c12157230132e3d39e86adf08e326e968ab7418e72a1ea55ec81fd55d2b48a6349feaba388564ad8351595f3207d49d2fb554deaed6aca354fbe
+MISC ChangeLog 963 SHA256 d8561886e5150703305c4118c2c92c6c2642a3186df6baa0a7ffc40012dbb182 SHA512 77177afd50b41fbc7ce2fcb0099a3495c484dedcff27cef497105a4eb5c47cce9c747077e5818d9d660c514f1a09577ead23b3f6e3db3190b9a816218f513a93 WHIRLPOOL e36b616ae630bc9220a1963fa500c0c2481bd1c30de43b685fdaaeeeeeff3bd3e9646289914bb213e65eead4a5fb2cf723fb8485a7f1e117be9f38adc6f85a9f
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlL2NfcACgkQL46suuyRem3MgQCfaA+7PCumOdYQ/O/Cdp+fZfRh
-InoAoIDXZMmu3ZaBcKcDCy3SKnzngLNg
-=VBHh
------END PGP SIGNATURE-----
diff --git a/dev-ruby/text/text-1.2.3-r1.ebuild b/dev-ruby/text/text-1.2.3-r1.ebuild
index 66609031b23e..3267d6b86c69 100644
--- a/dev-ruby/text/text-1.2.3-r1.ebuild
+++ b/dev-ruby/text/text-1.2.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text/text-1.2.3-r1.ebuild,v 1.4 2014/02/08 13:49:32 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text/text-1.2.3-r1.ebuild,v 1.5 2014/04/24 17:41:36 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
diff --git a/dev-ruby/text/text-1.2.3.ebuild b/dev-ruby/text/text-1.2.3.ebuild
deleted file mode 100644
index 71b7e23dda75..000000000000
--- a/dev-ruby/text/text-1.2.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text/text-1.2.3.ebuild,v 1.2 2013/08/30 19:30:39 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A collection of text algorithms"
-HOMEPAGE="https://github.com/threedaymonk/text"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/timecop/ChangeLog b/dev-ruby/timecop/ChangeLog
index a2c90eca08f8..27d6f979591f 100644
--- a/dev-ruby/timecop/ChangeLog
+++ b/dev-ruby/timecop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/timecop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/timecop/ChangeLog,v 1.15 2014/04/05 11:45:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/timecop/ChangeLog,v 1.16 2014/04/24 16:49:12 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> timecop-0.6.0.ebuild:
+  Remove ruby18 support.
 
   05 Apr 2014; Agostino Sarubbo <ago@gentoo.org> timecop-0.6.0.ebuild:
   Stable for x86, wrt bug #503684
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index 5ef6e738c0a9..dcf0a0c46cc3 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -1,24 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST timecop-0.6.0.gem 14336 SHA256 63d923f738e1a942409c045815477b1e93252f30a3db2abe22c1f4b6cdb518ee SHA512 121406b8c370cd7cc52d1c4a691f461ad1ce4eb3cb37f82f0af0e92335159041a621684188e5e3436b3a85f66c6057d6ed72f3cd6c651195ae2c61b690e78255 WHIRLPOOL e8cb382ee792f0acad788464f53a13380b6a92b85ff658c85279d9066af5bee94ffe7628ab2067da0da0dea838a738eb176c5f5c93960bb9cb05ae0f2e5f3d07
-EBUILD timecop-0.6.0.ebuild 909 SHA256 961090e337d53ae630d9fe8387f3ca1c56968e6a13585fb0c9e60a994f1df0fa SHA512 edfb3f613d18d73dbb4398361456e29ac9b32c088f64377d661a44be903af7ffcdfe178759e262ec761b0ac78d96d36fc15a30d1a68016d9e21f8030508a2d03 WHIRLPOOL be7d070bdeae07fe82f6764dc99b4034a9cc22fa8f2ca9e558213ab1d0c8cd4f1af23c5b9e5f563ab38a76cff3314df9fa82584ee857f84544fe352a6128ecb7
-MISC ChangeLog 1982 SHA256 ff72730e4e21964cc4a20238690134bb51324b8b9fd5d4f189719a9da3e11773 SHA512 d01cd54d1a9567332bb6745657d54bc48acf43a3d9f2ef81f576d517ec8a3180edb2592504ad0325f13961b681c721d393bd739ddd0c0dd198e1d89e56854a36 WHIRLPOOL 807f122fe2c6fad6c1e6c35ce60e2bd73f1a5d466957aaf58e5a87131bd0f8b0321c368f6e17a70b153d080ba15da40eed9f5df1ff881133ba25dadc880f22ef
+EBUILD timecop-0.6.0.ebuild 904 SHA256 0fd8519ee88bdeb158b8bbdde2d20ab5c929f4ced32fed5240e6fe79d2e8665c SHA512 e972545550dc59b749f21de1c92f424d8708c78e19dc1594b05c59f2f4a6c6fba1ab89bcbad9e8453b23f4754ae438a980ddf2601f4756e8ce9efa4e8322cd8f WHIRLPOOL 5052d93bacb65b18d3884a05f769b22651c425466d8f824324e9f8018188688839acb2b55f53439468ec475ca9b0d903739a7078e9e1c9eeeb7f979dbb5b571d
+MISC ChangeLog 2080 SHA256 976dbb52bf6d1beedccc1d3059a7ea68e7ad714a144d620817d7d5df2f994fb0 SHA512 d947220da46855fb5a3717c62ec1d8fefc2bb8de44126cc2d3697a1408773feb131e41146374a87a38e0c3f382b5ae1fa549590715c81bcf53b7a8de4d01e961 WHIRLPOOL 48557a1423ad7672b433268fe1edcc28027893c7ee52da02517d3d18da4d8f2dc66e97e80251583092d8c91fdfc6ebb7fa7e70803885c95a8c6a62d6123d2d9c
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTP+zKAAoJELp701BxlEWffZ0P/ReTZh746/1ZKJg4wnN8ors0
-efJSFv8VjZyOZreko/rASZDFXVa2QUUfU2yt7OdF3NY0A8+e/AtFk92gWJDDvjJs
-cRI+tJmE17GoCrXFbMIUL7fpOiTk3sLF84ga1etLS3li3Fw9Izu/LA13i6Fqnhl8
-hRx3VyxfmsRaYUreoc9BVyZzdHxRNQPiaKyVUrU6I0vko+7ADrasRQbkeh23ZFPq
-1UzvChmNaXDLxHJT5t5tiuq2qwsz3TnmFkogDekN/NUU0kvhFQbD2LBZOxfijYjV
-3oWtZKrZX7Cd5brKeOX5fEd2Q2puExDoMnG2xWgSxF1D22741pJIy2cJbIlIPk5p
-u1tozucSNszcRaZncjfR8EouDVOkXNU068hr/wPofC0+quSK1sSteLGkwUsYFF69
-/DZ86JtfSK2UxH4XB953N1yRNKyoq+RQqqM9tjzMkUj58S+mSeKhnPhm+cFgTTgf
-kz7zWRl6zi5Va7/W5KIp8Tzemb20eJdOVJ6RthR8d81vwc1OZYc1HSIzsgyeO3Tl
-55guapujUZenQwEaWvZ2hfH7FINQuNncOtwawz0icrz7H4bXUwDonvuQV7xp129R
-NZAKTr69Swy6CJ4JObjjoDKGGkqT7WxqsuPzZTfEaKKfKtbCWtYzjaxaOr8gP/Az
-gfpyvOZUjPeRHDPhXSpD
-=VZ+V
------END PGP SIGNATURE-----
diff --git a/dev-ruby/timecop/timecop-0.6.0.ebuild b/dev-ruby/timecop/timecop-0.6.0.ebuild
index 5a39a481a0dd..bacc5c32d5ef 100644
--- a/dev-ruby/timecop/timecop-0.6.0.ebuild
+++ b/dev-ruby/timecop/timecop-0.6.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/timecop/timecop-0.6.0.ebuild,v 1.6 2014/04/05 11:45:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/timecop/timecop-0.6.0.ebuild,v 1.7 2014/04/24 16:49:12 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 jruby"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/tryouts/ChangeLog b/dev-ruby/tryouts/ChangeLog
index ea6d2b3602c0..4bc745f11099 100644
--- a/dev-ruby/tryouts/ChangeLog
+++ b/dev-ruby/tryouts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/tryouts
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tryouts/ChangeLog,v 1.14 2013/02/10 09:54:53 graaff Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tryouts/ChangeLog,v 1.15 2014/04/24 16:31:29 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> tryouts-0.8.8.ebuild,
+  tryouts-2.1.1.ebuild:
+  Remove ruby18 support. EAPI bump.
 
   10 Feb 2013; Hans de Graaff <graaff@gentoo.org> tryouts-2.1.1.ebuild:
   Add missing dependency on sysinfo. Drop jruby support because of this. Fixes
@@ -70,4 +74,3 @@
   14 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   +tryouts-0.8.5.ebuild, +files/tryouts-0.8.5-fixes.patch, +metadata.xml:
   Initial import of tryouts, needed for attic (and other packages') tests.
-
diff --git a/dev-ruby/tryouts/Manifest b/dev-ruby/tryouts/Manifest
index 58dba711f489..f40903a7b059 100644
--- a/dev-ruby/tryouts/Manifest
+++ b/dev-ruby/tryouts/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST tryouts-0.8.8.gem 31744 SHA256 6630d5a1584a1bf5551b23846a60cb515f9b3dbef08e92295195faba709e1394 SHA512 98780d30af283fc3ac7aaddcb1e325b1250831fd99c0caa306cfe4fa5f2f6deed2b155a81455d86e6ff70a0531662907d4349083e4c1664b1be0d481664939a2 WHIRLPOOL 47c0d2ed19534675dd8563a41f799f45c4d5d5791286dc407108dd61f4194fe8babdc897ee11cb7d0fcb92829d74077251f6f81d82f97fef822145450172add3
 DIST tryouts-2.1.1.gem 11776 SHA256 bf6e0a4ff0a455b5772af5ae7db7089362f1be79f568697788fe01bcbcda0b66 SHA512 c9eef92880650004f37ce7f55ce2d8dfc0c1c96ef6e947cc7697f1e87bfe2cdf09b75f21b7b02188cde41f2a8baaa83908a55e8a22d00cc438d9a73b99001916 WHIRLPOOL 7890b05879d3a640be940f8ea8836e99fc6c218385c03ae8a12037e59d631578402be881cc354a9bacc785944f45fed52c9667611023371cf64f29eaf9eb28f5
-EBUILD tryouts-0.8.8.ebuild 755 SHA256 7b954c087a13f1630a71c896303679b8dcf8625bb255afa89707337a68a72012 SHA512 51ed52b65f1af44c16596d1a92ca1ea8479575dffe178ffd05024b1fe2f0f93c34d71eecd40b101be953d8c8472b5afec126d54572308d68de2cf4dc9b25ca27 WHIRLPOOL 5df25d4f0b756cfe00b703b9826675e3870f101bc2a63fefbf97f52efd3934b1a8550b0a467c350c0ca687c97dde6141b529a1e2d0d337634773218db41fda45
-EBUILD tryouts-2.1.1.ebuild 752 SHA256 873f63d9920f73ee3eb96ca4ac43b8ebd8c5b27cb491a34556b94be5b9a0ec06 SHA512 6af72e75234afcd6598728a8aa9d16690adf5d94f8472d7c6b5b8100d40f1d184b5879a62fe7dfd34118270333df3e92ff912277cc22967b1e0889d1665713a8 WHIRLPOOL dcb5445e0a3c18e60ac1e958511a4fbe8e002222ed2acbf92485344b9f9272f53bd97ccc4e52d69515f61c46e45ea6556229158ca87da297c3c22a150f4cefa4
-MISC ChangeLog 2336 SHA256 8d651195d9442d046a298c8b9bb139a8ddcc260718334846e672858c58393b8a SHA512 b235774bcb79a2640f50f987bde2941fd563e1b789b72bc71c9e16588c4048ccdec6eaadb8e4c254af11b3c4a89dc07af0507b670562b372fc804374710efe31 WHIRLPOOL 4166c311dd7306d2f3a9286bb667a7b95c8f16dd52285ee98394ca9a724ee40257b9b753959dac869fe92453e30ac85cc06b113c4c79e87abad13efb1f73343a
+EBUILD tryouts-0.8.8.ebuild 744 SHA256 0d93d98a9830d9c39b025d1b02c3b3e11fc540a3f72086118dfa9ca2465625c4 SHA512 311847788fa8017995b458b682d74600ce84ed1a6b93d56aadbbf87cea67b42265ef097f9bae281e72659b56b9a2bcb6013212d69194ac2d6d919b48c3f66e8d WHIRLPOOL 3080d28205901a6a3eff3301bd66b8feb89b5b45a384e4b068b122ed52096f3c0350cc2dd800341d6e9082603afb589d4ccdd325297cb97d8fbad722eb55788d
+EBUILD tryouts-2.1.1.ebuild 744 SHA256 9d003b6022949ce21dca2cfbfbd1a2151ee093cd1eef5740b90770375de21148 SHA512 b8829f063eb543404d46f278b61517fa12ff55f3bc5a7ca53fd771928698dec99b324a529c5af84353b70083e6298c7aa8be509976996d98b21f2bca1ea659b9 WHIRLPOOL 3d4ba0ff4b81c310af5bfa17e9277ba779f501222665afcce46eaaf0b5e224ffc48ad8eea67fe6a07ed7b7d8ba3198e688d589fa24279ae18898332900f439a1
+MISC ChangeLog 2465 SHA256 6ed0590370ce80d68d5e41849019beef4ca3372da8c99f25d9634d73aaaaf7c1 SHA512 720f27023d9be0f44a68eab566cf0329b69aaa55310cb673239262ba75c436db8ca7734947cde4bc9bdb63919f31dcba16ca1baad5e635dfb3d428d58169f74f WHIRLPOOL b946ad753cb587187f728ec81d4c4b38cc320b876d0e8d7cbc8bb3c95750f0577840d8f7616bc50979c6a2ee6e1d196ed035041d58936127649032b7888668eb
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EAREIAAYFAlEXbm4ACgkQiIP6VqMIqNcZRAD/QfG90w/bxn1mtJFUaMOSy9Ek
-JdO6ngj0RQ33sxfbwnoA/A0Xzod3leCpxgmgPs8TtlyELpu+egY2bsZO/l5IRAfV
-=f789
------END PGP SIGNATURE-----
diff --git a/dev-ruby/tryouts/tryouts-0.8.8.ebuild b/dev-ruby/tryouts/tryouts-0.8.8.ebuild
index a84a546acf65..a2663ba9872f 100644
--- a/dev-ruby/tryouts/tryouts-0.8.8.ebuild
+++ b/dev-ruby/tryouts/tryouts-0.8.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tryouts/tryouts-0.8.8.ebuild,v 1.5 2010/09/09 13:06:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tryouts/tryouts-0.8.8.ebuild,v 1.6 2014/04/24 16:31:29 mrueg Exp $
 
-EAPI=2
+EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/tryouts/tryouts-2.1.1.ebuild b/dev-ruby/tryouts/tryouts-2.1.1.ebuild
index 24bb9b4adf72..6abed8fee8f9 100644
--- a/dev-ruby/tryouts/tryouts-2.1.1.ebuild
+++ b/dev-ruby/tryouts/tryouts-2.1.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tryouts/tryouts-2.1.1.ebuild,v 1.2 2013/02/10 09:54:53 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tryouts/tryouts-2.1.1.ebuild,v 1.3 2014/04/24 16:31:29 mrueg Exp $
 
-EAPI=2
+EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 006d02835c99..3a92536924da 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/nvidia-cuda-toolkit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.81 2014/03/31 20:15:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.82 2014/04/24 13:37:42 jlec Exp $
+
+*nvidia-cuda-toolkit-6.0.37 (24 Apr 2014)
+
+  24 Apr 2014; Justin Lecher <jlec@gentoo.org>
+  +nvidia-cuda-toolkit-6.0.37.ebuild:
+  Version Bump, #507804
 
   31 Mar 2014; Jeroen Roovers <jer@gentoo.org>
   nvidia-cuda-toolkit-4.2.9-r2.ebuild, nvidia-cuda-toolkit-5.5.22.ebuild:
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index cc27bbe32000..eb24109b46c2 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,19 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cuda-config.in 406 SHA256 7271463891ff75dd83f4cb42bb3004d3204243d0e38f9cbd5b4ec4560865496a SHA512 df6d16bd2e800868bdf8401b6f82a387b701ea297ddf6e8feb0daf5222e62a33f156e5f45cf1ee4e1aa51559dfbd56b897c257dae1bb9568e839bf806bfebd5b WHIRLPOOL 4a26ee11d97676827cb01644891fdca495c3373585ddfbb5fab9f988186da384f27482c4be9e27d834036ffa87f7ee19f9ad7da2d8536babe874dda4ff991147
 DIST cuda_5.5.22_linux_32.run 686412076 SHA256 0e7aad303807bb0ede8f6f6e825cfcd0f9ddb677bc8cc898ec38990b8226778d SHA512 e2e4fbc78c2e6373b3f81778d8044b299429459e8e27632e86c0d97e6fe7f4db7cd5652044beb0ce7ee3c7abaa7dcec7d85639a2de4b9cc213ab52a2d204aa6b WHIRLPOOL e5df7de03aaec8488a7fa093e272d64b5d3adaedca1458c550d4ae9c6bf2a0ead71496c8a0c9aac966500aa01401e95cc57a951e3a2554e8d823b97c10336850
 DIST cuda_5.5.22_linux_64.run 849417929 SHA256 b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4 SHA512 25233b34a35fdb5ee3479a87c89484a00dcd760837436c263c3eb8731cbd24a9ed3fb57ce2d4e5bf7cd31abb9b0d990b45720a5f6a376b2488de4506a7c57c20 WHIRLPOOL 550594121a53feae4e74a4dc9ba40c4cd2ac91305f23397cd7ea421fcb801e3ce8fcf90f439c966accca44d586bc51d85ef3e211f35fd751dc9299dd07d65175
+DIST cuda_6.0.37_linux_32.run 779831016 SHA256 54084c2c808b0a4af91b5bb9cf0757f40510d6b259cd84373e7af3c90baec172 SHA512 c2e6e16b780a87c8530853dc63e6c8e000bc122428e474fd99a33c19977082eda0ef93f86a981a36c4f884ddcc2fd0d14b2f4f886cccc7c8a3f2c9441ea3c895 WHIRLPOOL 08d0a7a0eb4f6f3c07a939d949f4fa7f8bef8969224156256430de11abf204c00a0b8d6d1a2e37d4985c4dcb1f440f83380de75386dd53bbfc2aa8392e36e840
+DIST cuda_6.0.37_linux_64.run 1032032789 SHA256 991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40 SHA512 251f87fa797eb0ba40f76d94852c3a8a401057bdc6d921dcaf294d9972755b77b7180bbbfb655aa3fa9be6ea499e558ab02fa122ad225ddb0afdbbf3622483de WHIRLPOOL 88567cf44508cad899ab5591ee22785330b570b1447725ba120c829b9982e4629288a2c6033eb02e091c98b811fe68747d0405eacb6931389eabe05905de4d71
 DIST cudatoolkit_4.2.9_linux_32_ubuntu11.04.run 209998124 SHA256 0c91d51e49c7cabc13fafa75cbf547c6902557cb5c3e19b4cf3c83c26172a03f SHA512 f1ca065e9cbe6273f165388d3579e28868c7b1330b341cabab9fdd6695fd3450dd8c77978a5aa3063617b371c68c37661b4f2d8fcbc4e585bb508254bef064ef WHIRLPOOL 9cbb668a1fba9748c0a42ce9a93ba0e7ff592c48155b0d87c22999f90aea29fc02120febcf4b07b8bd1ded96ca057ca0450261ea30ffdf5076e0991b10474a18
 DIST cudatoolkit_4.2.9_linux_64_ubuntu11.04.run 282394341 SHA256 22d857db6b3831670bc2ca7ed22ac257b6946f68f6e4b6f534ec98b69690ad38 SHA512 3a54c278f486cbc92a7e262f39183c7babca8ab6d04c5f85ff875d3b2bcdd699631049be375fde2a3ba2746bd5ea04ba0149616e245556257c470632b91b4b1c WHIRLPOOL eac55ac70ac986772b4cbd1b76940b41eaca20276ac68e59ccfb5a09eb41de7c023d78dc85392ebfb9e5d36ee7f29e31e0173aeca0b89a510e7c89c087b72f1f
 EBUILD nvidia-cuda-toolkit-4.2.9-r2.ebuild 3269 SHA256 4065c94589e937d15c8317d9abf250b3c98b35641df48a7171c02fb3259b9788 SHA512 b02351596b409dbbd8a6354791005484666c6c3574f10c869a81f8d6ddb600724e55db2cca04be3df77c1d77b6ffca259f206dc343e22eab0df9aa49553b69bc WHIRLPOOL 725b1a92d6df1ee846e680eb62325c27b544fcd5858b28abfbdf2b2e6ad8d807d791860c05f1230de357f670ad340f91a04b13d7be5fcde926ce60bdd31b4375
 EBUILD nvidia-cuda-toolkit-5.5.22.ebuild 3536 SHA256 2ed359ba1bf26f3e902818030c41bac4b2e4a217b5d48f73e4cb6d4250451227 SHA512 54d394a1aeaeb7ca69c981e77e56323a359b10ac295dad50e7f5e36b428768e0b81e1d78e32afe4c919dfa9715e3477728e5b485d87a49151a563823410ea071 WHIRLPOOL f5e0d1382adaf51fdf2556c84c55ff462572cc03051244ff724b98b160dab6e187b655c78966947a8e125c2fda592062b186df1e307d00791b1e4f317d9c9a6f
-MISC ChangeLog 15571 SHA256 b464cd646d906da626bf4fb5b0b0a950745a6f2feffcf56f0f48ee31c027c2ff SHA512 785dedaabdaf3e6608c7d4c0079ac4a5b167f9f7be41c465186a21d9a945560ca73e75207c3fd01da96834ddac49ebb928488b27f7ab2d700e4ae32736aff5bd WHIRLPOOL 972fc24d180e8465ac6c5eb6c30459ef6f324c080f264aa7f6e1fa67b3cefcb00848f6bd3695c8996dea97485bf6b4ac5ecfa5a617fe5c647628e929cf03a345
+EBUILD nvidia-cuda-toolkit-6.0.37.ebuild 3485 SHA256 74318877133e9190c5ff9198f1a0123b058f68174de801ec8bbee64bdfffd029 SHA512 1b9155af584dfb598539078c87a4a66a60031d1a7df5216e0327cb170341f7e81555b3e88c8d1c14372bc483cf4bdff9008dc787b1bf226f5756cb70e6015033 WHIRLPOOL ade9280137c0dd1de6a997f09ed71052f23855f7c395efd4a48c0787fc56612b07cd1c0b4d175053fe4486816f8069d6d10683ac9d33d652f987aba5aeabd185
+MISC ChangeLog 15725 SHA256 16221f11afecaba95708441243e29d486c7f4e03fcb597d0011d6650e506af53 SHA512 a78b6869a4cd3f17043d869dba830278b7b7b6a45af5c1d286c8073e6e12c69dfef020467d3ce7edc97009a7d706b4cb094459554d239d297e51a178b499aa3f WHIRLPOOL f7b3c0bd49c57b6101ed7c0cd1a62b2d7253cb6725a7ce28a5f47f43afa736fa298ea5911ebfb619b42430b4b5ef7e014867a344c86ea823e43f5f00049104f7
 MISC metadata.xml 506 SHA256 16d98da28f74ec82ae271f04e456547db8da2a9c576bf262ad897f4a3259fb56 SHA512 c1be2bc00a75ee9db0339938964d80214648df5a6cc16f3d1250f80d3142a1e511750dba34b54794227457db0d1a0f5ca4f692f34b9566ac3f58fef43196626e WHIRLPOOL 02f0c08cb4ab40b543e23c51ae81a7f04e452f3949808bd29a2790c565c2739d131d4d19fc3d4d279381a5ed05ad0623ba560aba82f7a3b510e44f8cf35c6473
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlM5zPEACgkQVWmRsqeSphO8xwCeJ6LrqDsWKyd+f+3aDgtFgEXz
-M1QAnj9X/mt6s29EZH45jlAWJiAw31fM
-=jnyt
+iQJ8BAEBCgBmBQJTWRPCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirmlgP/RQsx4Tfogsuf026AUJkClgJ
+B3L0y4PXhipwB/aubuCppHzcYqCU8/Ff3eus1t4MHH43Bf5JO75uB6hboSGBdJEH
+eyfJbljvsWwBjr6eDYR/Yj92DurkdKbWFJQX6vh5RYuh/81ks3IpvJHC04z28a/b
+nKaLL0+q00VcsWtIHfX9151aUjw0bq0dJylJmeDN3ZV6T1Uuh3lFstxIgiq1VLWa
+syIve7Nwc/NNLpmtWNqazqCoohmfPl12S2I701JEvutwR4jzXnl2UiWdVbaa9qFJ
+0hUvDEO0lL0Lvbz7OfAsFXcU0Jp4ESx2ufkxZyeThIQtkblbj003iHMrpPSmfKed
+h4v8IJb5wpsYTDVqhDq0NS4QFE3QvBcnnOLtRmEqSDOC+wis2dWJmfNaUurrHIxt
+zeYpgm2QQjkpk+wQ0NCF0leFjH3aCdUmI5MhVBFCIwp32vKN3/iLf4b9ahAm6P7h
+1xI+dU0hocEza9M69mxoqL6l+rZJqK3J9rOpJeA/3Zp+G5PPDlZ+5p3QQAiyN6f7
+qe5KAY8hM9IKcmweBGE9x4TPsFFqJ1XmGtVlES+wa3oXUUvaSUONgzbv0PlsOB0F
+G8s8WMUk1OeSPNJd0NOC2sNkCwwS4S5y82cNYpBR0m4T5n2Z8AqJpusedkLSGc55
+d3EUOpuxwRrLeQV96fKg
+=TRy7
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37.ebuild
new file mode 100644
index 000000000000..ebad07cf1105
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37.ebuild,v 1.1 2014/04/24 13:37:42 jlec Exp $
+
+EAPI=5
+
+inherit check-reqs cuda unpacker versionator
+
+MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
+SRC_URI="
+	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
+	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
+
+SLOT="0/${PV}"
+LICENSE="NVIDIA-CUDA"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	sys-devel/gcc:4.7[cxx]
+	>=x11-drivers/nvidia-drivers-334.16-r7[uvm]
+	debugger? (
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses[tinfo]
+		)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="1500M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpacker
+	unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.7"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+}
+
+src_install() {
+	local i j
+	local remove="doc jre run_files install-linux.pl "
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}"${cudadir}
+
+	# dodoc doc/*txt
+	if use doc; then
+		dodoc doc/pdf/*
+		dohtml -r doc/html/*
+	fi
+
+	doman doc/man/man*/*
+
+	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+	( use profiler || use eclipse ) || remove+=" libnsight"
+	use amd64 || remove+=" cuda-installer.pl"
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for j in nvvp nsight; do
+			cat > bin/${j} <<- EOF
+				#!${EPREFIX}/bin/sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${j}
+		done
+	else
+		use eclipse || remove+=" libnvvp"
+		remove+=" extras/CUPTI"
+	fi
+
+	for i in ${remove}; do
+	ebegin "Cleaning ${i}..."
+		if [[ -e ${i} ]]; then
+			find ${i} -delete || die
+			eend
+		else
+			eend $1
+		fi
+	done
+
+	dodir ${cudadir}
+	mv * "${ED}"${cudadir}
+
+	cat > "${T}"/99cuda <<- EOF
+		PATH=${ecudadir}/bin:${ecudadir}/libnvvp
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
+	EOF
+	doenvd "${T}"/99cuda
+
+	make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
+
+	dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(version_sort $(cuda-config -s))"; a=( $a )
+	# greatest supported version
+	b=${a[${#a[@]}-1]}
+
+	# if gcc and if not gcc-version is at least greatesst supported
+	if [[ $(tc-getCC) == *gcc* ]] && \
+		! version_is_at_least $(gcc-version) ${b}; then
+			echo
+			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			echo
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index 4e05d1c3f659..5e211399c3ea 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/git-cola
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.25 2014/03/16 10:35:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.26 2014/04/24 12:15:55 jlec Exp $
+
+*git-cola-2.0.2 (24 Apr 2014)
+
+  24 Apr 2014; Justin Lecher <jlec@gentoo.org> +git-cola-2.0.2.ebuild:
+  Version Bump
 
 *git-cola-2.0.1 (16 Mar 2014)
 
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 241631ee0107..d7ce832bb3e3 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -11,28 +11,30 @@ DIST git-cola-1.8.2.tar.gz 397346 SHA256 386b29cd70b3c6a14b23790567d2e93168e1eea
 DIST git-cola-1.9.4.tar.gz 434458 SHA256 c7f065bf5557ceba424ee26e5af94d01b37537ef426fffe581efe33526733525 SHA512 aabf1887da1aee2b1ae2c004c8ab29317796c4e21bda7b9937fdf3ad8aa6721e8833b56f143e4cda72bcd631ede3f176592335862e456f69729494332b33264b WHIRLPOOL 2ee639402b2bdab9bc49b11d0bf29696e3607e9218662af72fd6aeafd73da37955ce5dc40ddb03f9664fd15c3ec213681a2ab58b6451ac121a8abaafbb4bc32d
 DIST git-cola-2.0.0.tar.gz 434500 SHA256 a4aeed521f2d5b2a5345656028dacf96e93e4df52a1e7a46dfec8be82d95cb64 SHA512 356c157f2e19f166beb7273555a65e8132aad2c588cc4f89eeb83df2462a417068a3ba33b3b958e465e921b0a79d9e6912447ff630af2ff34aea87634fc3065a WHIRLPOOL 47b583d00cf64fb7cba95aded77a251f101944baac8df6c264cc00d11fbaa55d4dabac0132d5dc5e0c2d8e78f92c382d30f6133f1896ceb7e476d1e95950d3fe
 DIST git-cola-2.0.1.tar.gz 434970 SHA256 e228bf4931e02d18eea4d01ee031f080aa356407419149d4ef76124f308ac1a6 SHA512 dfbc0e0646afd7982c7b4ee05fde92a358d25b0e7824b9fa8fb1353b776876dd3338188fc29694650a9a45aff03a7b89749a3909ada937c3fc808f53b686f1cc WHIRLPOOL c0ba17878f6670a2c8edcad1d8eeba2b859c2a1764b95a0ddcd458d34f79eb2f67e025daefc4dd30f3c153ddf1034efd4ee0da846dd5f3d1cb88a8378d2def02
+DIST git-cola-2.0.2.tar.gz 607589 SHA256 412f53e0032c448d1cb8c4a715296b9daec96fe38b53c8b8e8d4a5679ac8070a SHA512 9f78e476b8bacdebd006bc5753e0c4d8f9b3111f395641ec4bef0c662e2f3e3f999e9010c66d662c832d62b75677c788b702c98adfec54ed5d091634d7d0b096 WHIRLPOOL a370c591cdb07461dee7fddfc6b4ba9fe00e1990cbe34ba682a0611782ef16a90c90270eabf3a6ae63ff367edb8463a37ff74c0e790875d8f3e7ae6f4080e295
 EBUILD git-cola-1.8.2.ebuild 2198 SHA256 ad11298dfad2ed771e138db229315b7e1e9fbc5c3ef47e5fb44f6f1d741da28c SHA512 c8edde9f4c6ed8eece606ac2106a1bc61812a3aba742763e6174fba90bdac611a00c85df30602b7fe52ea4cc07f57eed9d4cd19502e21fc50a7b6a6c3a135dda WHIRLPOOL c6679a20d7c2c99d5f58fd2dd30b2803ae5bdaf0e43224ea7f14c5ae605b7179fad4b22a3f0ec43b6b847474306ab582b2b79d73d8233b7108ec3b055394aaf2
 EBUILD git-cola-1.9.4.ebuild 2421 SHA256 0511ef7e83d8adbcd997a4f6bacdfe0e5580b63581a5e7feea5a6dbdeb258553 SHA512 95255897347c3817dae5d2da5a7e1d23bfb5f1a317cad3764782d4a808bacc83be2e504577a916ff2d1f3d6b448a741d662d37f32e7da2ccdff9018d1d702a28 WHIRLPOOL 4ea73c41178d97cb4b85939430fed8d1b800f3a1200f25d5e5323942a6bf3f0f45386ef23d3fd9544524c053438dec3f3fcc85d3b8b7b871f12d187c0384bf97
 EBUILD git-cola-2.0.0.ebuild 2425 SHA256 cc832e78b25c29613de75afa4595846bc20445673c95927a346a70f64b00dff9 SHA512 e9629dfbd7b2a2e14dc7dfc80993fe668a038f8859401a607bcc63f189358d395111e2e04d0a115e14c9600b39acccf0d62692788684769ff7555a7d61e38155 WHIRLPOOL 22d4f71ea3ec4be400201295f762e7dfbaefca6b4894a3ee4e3bc24fe052c4815c10860ab792f613a2aa35a1ad029d47fbef1fde82a8a418bb7c994cac57fd3e
 EBUILD git-cola-2.0.1.ebuild 2425 SHA256 4184267883675713a6881efc0a94111e2e59e475054518f2040d525116d7b9a6 SHA512 525aefeb7937d679b8234b16c093501af269ea1eb8215f0237f0eaed8b805207e3b4f412a293be8c73e0e8cf6a5d99a5838460fb7789ab692f224fe36eaa63a2 WHIRLPOOL 784c4127cad57996755a69422b3d6364cb99b870b6fe61c90545e4bc5f466f699a5c381a1c503f2dd580dab99659b7b3454da419b2b0b0afa6567d9fedb65cd0
-MISC ChangeLog 7249 SHA256 0d6099c3a0bfe07065aad9cda5c2ed0ef6022fc4b72972c17363abf1055f6abe SHA512 57a2b6c35a6279c941abfe0461299358df01d14a7d24434d24262a64d65cb405141d73aa5b3f91d1cbfd5fdf6e5de51ea7d7a774958fee4ee89195d2fdeb7a0c WHIRLPOOL abfda8f734daacd2aa91e4592a92e23a61d835919300c7bdf08557719f308390bdcac853fe0867da492fcb6eb9575ac1d4d55418d1780f31dd706929707e506d
+EBUILD git-cola-2.0.2.ebuild 2425 SHA256 e2f1362b16ae5966e659c386a1732eaecb231f60de4fd2d6bc09eba0f3848ff9 SHA512 82148a1aa0369597e2da7d50644e91744e50cbd6ea77ad4c03a4f357d1554d495ac8439c17a0464b713ef350039228978c768c31b2219220482ad9cb749ea43e WHIRLPOOL 5aaa5001cc9443bd8e71d0124c5d974e1251ca625cf75e799c410570bdaf498ee7781501e62880de3b720cab6d8718a82cc2dca097244055ea74f84477388cef
+MISC ChangeLog 7367 SHA256 04c2f82c4d7d8ba899e36787e241629959535ab386ea470e291b132f93af0b6e SHA512 8202b530c644864a21170a01da26550a47f34c3b312e4819773538240115d7a348bd46e0579a71049e6fc323c3f5d1ab1bbaebc1afe2507c956be967f49b4bd6 WHIRLPOOL 1c71b0a0ede98238ec9f536e98754ec509cd804edabae6161945b1effb1d9a7551a1f980ac3527f16771851f082822f0bef0780c93a5b2c01fc252b3a4d07825
 MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJTJX6eXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTWQB/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirvzYP/jRRsb/6/p6gH4co8MVzXba3
-9A76fUZL95BS2ksPI0Bj5qhATvC8G2eBC2EVj/RR4F+goFeL1dgj61pERvmFJYlP
-hEn73rRpuM9rsrXHcv/fj3h7elfbHoshGioYuzkdnmAW1TcXD1pZwD8fD2vwcUH6
-bWMZ1IXb+EVAqKI78lQQmtHjWnXIMYHlgAYqHNWw8BF02r/ksrZ2m+JSGf63vbYC
-LzDP1D+uC0LseHLAKfZW8UUaooKvFD8FZB/j/Y7NEolc3z+tIZ1zT5SrSeukJXVN
-61MHLHnpLm5Q5wnTwvn96XrBigOdOARjjx8fgrM118AcgEDyWJbixMTc2aNxXQ1I
-z+PLIqZNfGa3Y7CuwU9zLKjYprT0kwd6eXccs6TXTDr9KdD4s8f3gE5OYlPof2SR
-Y/oCZEwFoeMNJZR86fkzDBZKUhLKQBXE7FMOOe4lr5WvyqQylJ9E56OQkiz3p9HS
-C52vcwzdss56U5JFjR8avy1P36ns7g9lImZVlqhNz8k4lUg9pH0AgUxjJK/PA444
-MeE0Vr9TPg7PBOW0L0Xn2Aht3EDI/n3gJV7YOlsUyQGrQvoPsPaQxPNVC5yHaY+b
-c0Z9RcgO5B7opZ5Pscz5wZTN7w4YCulQyKASvTDlyQrel3WiAtNZyKLTKWCwkTE3
-3s6kEtWa3r6h6P+piRyc
-=61qv
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir5g8QAIzTk484cYi+f2G1JQiPwGK/
+2LLNvQjr37+LMBM9ybUs4GsweEyKA73K5YEy232hagr+Prpx1bPvv0ea7+LPH6Ha
+YbrbO/nX/V26mCuptfihjbhfpxyXwzzrxvDnU/9S8br8ORg1nGKlAIZ5z4CFF2jn
+SMp/uefVBRrAMpdUCL3/0GbW12bg3pMl6VrC3QnO4FOzMv/dPpg61FALvvtJC76a
+fkmwQ3N+UUqZXSWHLlErHHX+aU6X3A/gQi5bfPsHLtZK/bhCDCzhxlbWcP9co5DE
+JI/y+HgqbhYVAh/z9odBaLDgNpaL+NETp++tPEnpJDtz2Ra3NIfiRFTvoNTb2RHg
+eW5bzrV2eFmZQp/+oefEYNBqv6qGhdkAqI9wzjmqqcA+GGZijG+jcDyagMZkNrbH
+EVqECmIycoJ/pg0/PsYWbAIcfFsAbBfzNFaiIqwrJ015D8ch2PnW+fTEJTxLk5qj
+VSw9At2vk/Sr0ZjPko4K3XAOKbRdW7gcsjeyyvF13pB8rmw481yt1Z4vHC0uOUv+
+wmQfGUlfTMK2pkqkhMf4+Zs+hVW99+HeuyyWKZ1qYe3vc7Y9p5FhRkXZhklp8G9l
+KcJrTtgxWPUlwinq67G55xXv3w0dg7yWWmcg67HNkEmtJXGMpK1ofaF/NyBiX1L1
+4eupU9H7WKnpb/1qoSFW
+=HFvh
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/git-cola-2.0.2.ebuild b/dev-vcs/git-cola/git-cola-2.0.2.ebuild
new file mode 100644
index 000000000000..b3aa4354c51d
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-2.0.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.0.2.ebuild,v 1.1 2014/04/24 12:15:55 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_3} )
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="http://git-cola.github.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/jsonpickle[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/PyQt4[${PYTHON_USEDEP}]
+	dev-vcs/git"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	sys-devel/gettext
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		sys-apps/net-tools
+		)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.3-disable-tests.patch
+	"${FILESDIR}"/${PN}-1.9.1-system-ssh-askpass.patch
+	)
+
+pkg_pretend() {
+	if use test && [[ -z "$(hostname -d)" ]] ; then
+		die "Test will fail if no domain is set"
+	fi
+}
+
+python_prepare_all() {
+	rm share/git-cola/bin/*askpass* || die
+
+	# unfinished translate framework
+	rm test/i18n_test.py || die
+
+	# don't install docs into wrong location
+	sed -i \
+		-e '/doc/d' \
+		setup.py || die "sed failed"
+
+	sed -i \
+		-e  "s|'doc', 'git-cola'|'doc', '${PF}'|" \
+		cola/resources.py || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/
+	if use doc ; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-i Makefile || die
+	fi
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	if ! use doc ; then
+		HTML_DOCS=( "${FILESDIR}"/index.html )
+	fi
+
+	distutils-r1_python_install_all
+	docompress /usr/share/doc/${PF}/git-cola.txt
+}
+
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" nosetests \
+		--verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \
+		|| die "running nosetests failed"
+}
+
+pkg_postinst() {
+	elog "Please make sure you have either a SSH key management installed and activated or"
+	elog "installed a SSH askpass app like net-misc/x11-ssh-askpass."
+	elog "Otherwise ${PN} may hang when pushing/pulling from remote git repositories via SSH. "
+}
diff --git a/games-arcade/digger/ChangeLog b/games-arcade/digger/ChangeLog
index 1da347082f0a..724c12c0db13 100644
--- a/games-arcade/digger/ChangeLog
+++ b/games-arcade/digger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/digger
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/digger/ChangeLog,v 1.11 2010/09/22 07:10:10 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/digger/ChangeLog,v 1.12 2014/04/24 18:37:56 mr_bones_ Exp $
+
+*digger-20140423 (24 Apr 2014)
+
+  24 Apr 2014; Michael Sterrett <mr_bones_@gentoo.org> +digger-20140423.ebuild,
+  +files/digger-20140423-ldflags.patch:
+  version bump
 
   22 Sep 2010; Tupone Alfredo <tupone@gentoo.org> digger-20020314.ebuild,
   +files/digger-20020314-ldflags.patch:
diff --git a/games-arcade/digger/Manifest b/games-arcade/digger/Manifest
index b8c564aa68ae..d04292ec0b2a 100644
--- a/games-arcade/digger/Manifest
+++ b/games-arcade/digger/Manifest
@@ -1,5 +1,8 @@
-AUX digger-20020314-ldflags.patch 330 RMD160 44b7c7bf04df3406b316271f71823fed632d7650 SHA1 85264b8dd86dadae1a19939ff1f5e2786a5c18b6 SHA256 9c77fe9711bed96e9b43446f6996dd53a85bdf51f06a8771bf25ce0b6f5d1deb
-DIST digger-20020314.tar.gz 108712 RMD160 ccae7b37c6d7c4bfa438776f8fcb7bfd96087f08 SHA1 a79262ec23e770b2bf78e86170392a790ebd2166 SHA256 e45cb1c5b67fba2fa1b768d1ed75153a64f82e73544c3d98eaf2c37b1dbefdc7
-EBUILD digger-20020314.ebuild 709 RMD160 5b0e9755181651be6270d7b5c8f924efbe233a17 SHA1 c311e685dee7181d18c6fda8431effb5cfa0e4f3 SHA256 393c2e74e897e630a1ec69abd83d57ea522b8b1694a53397423a53f5e3f52dc3
-MISC ChangeLog 1523 RMD160 c3582c640482ab812c58a7d8dc31f961d3016c5f SHA1 dea5b7f70a60f90f7c76a0a9a7ae76ce1881588f SHA256 7343f97b938eb76ca5695f85e813f4230a56e9831c7487fa348e49c56b494fb2
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+AUX digger-20020314-ldflags.patch 330 SHA256 9c77fe9711bed96e9b43446f6996dd53a85bdf51f06a8771bf25ce0b6f5d1deb SHA512 4f45e844d34eee51964f87c4ce8a566a549b0cba10567bc61efc73dd6672391d0b5a0606446e88f7409b03cae14c96bc087854c44feb9e18a66dec758fa40035 WHIRLPOOL 05c08e6b39e2b17973df4d060781ef9a5ffb591333f72324538a2bd373a0eb07f7b15dfe68b42baf4535cb9389d459c1790e830e03f3cd5cd3da58492642ee36
+AUX digger-20140423-ldflags.patch 649 SHA256 f2143b9c4d850aa9e89d7f56657297f936565507cfa86a181e843cf1d7eec454 SHA512 645d7bf7ccc924df32be71eac6fc7f698d2ddc7700aff758664e2d80272d494a1ef5d87df3d0e93a8a29b5fbc440408d7aa830e13dbce86969dd2c77ec7ab4df WHIRLPOOL 476011477b9033ac0e40ddf2af9fbf8e7dcb5cc65e4726d4a40aee24ecd98c0fec863f4ba95872c4a6977dd3d027daf6afd129ffebe42d8559eb8b7773e51603
+DIST digger-20020314.tar.gz 108712 SHA256 e45cb1c5b67fba2fa1b768d1ed75153a64f82e73544c3d98eaf2c37b1dbefdc7
+DIST digger-20140423.tar.gz 117375 SHA256 44a77e1b88409f7427bd2958d1f18648b18a1e9631d0e78fee90957e5ad5cfa0 SHA512 9277c6dc4d7f74aeede379b42aeeef881d8fd927ef0e6f6c0e1a5f76be257244c4353758557209647812b942d215dd992939b190ef11f854b41ee2ceaab7eece WHIRLPOOL 15d08563b32e766f8f18888136c004a263a1951ea56f4d0a666d222cad966d8647f3d4ecebfa2d960fc6b0ae7fdf8538c7bfe432f03baec4352d0a99f676437b
+EBUILD digger-20020314.ebuild 709 SHA256 393c2e74e897e630a1ec69abd83d57ea522b8b1694a53397423a53f5e3f52dc3 SHA512 a75eccd6461b0cae236d436d3f96670187f67bbf4b8590d5211138664b4827ea8f29bd1387cbb13ce318d4fd21148f0f8a85a01b4c1a19e02c1ccee3168fe2fc WHIRLPOOL e00e0547e7cf697691fb5ac36ec04db5ff8abaab86308ab5c59b1bfe130433b238aa1c640dd64e6690d2560e9762712784a627f67c3b3739e31b4c6cb4ad8735
+EBUILD digger-20140423.ebuild 783 SHA256 a22d128b97f20dd3a94ceb27d123c2cabce2f1441142060d3629fe009fea2530 SHA512 efe7a2cf62342ca8ba1ea6e4193e745b6e9d3c8816becba664477d1d6ab59074617745c7d32b2b86c0491651726f4e5ac6f77c2d9d30b8be1fc095106cd80477 WHIRLPOOL 37687419fc0bd709508e5b231f66e103e87e6b071778a2fa5d588c772d8684ef468b05de8ae90476165dee49d74aad2c35dd1950b304c058c141cb4f7563b691
+MISC ChangeLog 1694 SHA256 9460f3d5d43ff26dffc80537ed82aad4d5843378f200ffc95af1b15df34608c5 SHA512 1a7b4892def6b5d9da8d55b281029776c6c089ee5c5805d0594d6a706d3015199980847b378c65194bb85a18508cc7d257cf922b01b107027f6b20e4f28e3add WHIRLPOOL 4ff4b64260315784daf165f49e5b8d59905210572e808766b8bcd0f3b810333be503dc9fbf271053a61813219bdb532f17ec0eb2e4106c02378c5406b2ab3183
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-arcade/digger/digger-20140423.ebuild b/games-arcade/digger/digger-20140423.ebuild
new file mode 100644
index 000000000000..a39a7d0dfd7b
--- /dev/null
+++ b/games-arcade/digger/digger-20140423.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/digger/digger-20140423.ebuild,v 1.1 2014/04/24 18:37:56 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Digger Remastered"
+HOMEPAGE="http://www.digger.org/"
+SRC_URI="https://gitorious.org/digger/digger/archive/8d5769c59d68b37a5b30aa7a9cbfa5a9e15e7ed3.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+DEPEND="media-libs/libsdl[X,video]
+	x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_install() {
+	dogamesbin digger
+	dodoc digger.txt
+	make_desktop_entry digger Digger
+	prepgamesdirs
+}
diff --git a/games-arcade/digger/files/digger-20140423-ldflags.patch b/games-arcade/digger/files/digger-20140423-ldflags.patch
new file mode 100644
index 000000000000..9800ef464b83
--- /dev/null
+++ b/games-arcade/digger/files/digger-20140423-ldflags.patch
@@ -0,0 +1,21 @@
+diff -ru digger-digger.orig/Makefile digger-digger/Makefile
+--- digger-digger.orig/Makefile	2013-10-11 04:56:41.000000000 -0400
++++ digger-digger/Makefile	2014-04-24 13:11:58.749211920 -0400
+@@ -26,7 +26,7 @@
+ ifeq ($(ARCH),"LINUX")
+ OBJS	+= fbsd_sup.o	# strup()
+ RCFLAGS	+= -DLINUX $(shell sdl-config --cflags)
+-LIBS	+= $(shell sdl-config --libs) -lz
++LIBS	+= $(shell sdl-config --libs) -lX11 -lz
+ ESUFFIX	=
+ endif
+ 
+@@ -40,7 +40,7 @@
+ all: digger$(ESUFFIX)
+ 
+ digger$(ESUFFIX): $(OBJS)
+-	$(CC) -o digger$(ESUFFIX) $(OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o digger$(ESUFFIX) $(OBJS) $(LIBS)
+ 
+ $(OBJS): %.o: %.c
+ 	$(CC) -c $(RCFLAGS) $(CFLAGS) $< -o $@
diff --git a/kde-misc/eventlist/ChangeLog b/kde-misc/eventlist/ChangeLog
index 17d8354dfecd..244cf43dd9fa 100644
--- a/kde-misc/eventlist/ChangeLog
+++ b/kde-misc/eventlist/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/eventlist
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/eventlist/ChangeLog,v 1.9 2014/03/20 21:53:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/eventlist/ChangeLog,v 1.10 2014/04/24 14:10:28 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -eventlist-0.6.ebuild,
+  eventlist-0.6-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *eventlist-0.6-r1 (20 Mar 2014)
 
diff --git a/kde-misc/eventlist/Manifest b/kde-misc/eventlist/Manifest
index b43282e131a4..157beb723022 100644
--- a/kde-misc/eventlist/Manifest
+++ b/kde-misc/eventlist/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST 107779-plasmoid-eventlist-0.6.tar.bz2 65220 SHA256 a70fb4d3ff0e475e3df3bde8ef794023f9a018e6fa9b4864714a454857ca39df SHA512 db7a215c0926390fa19dbe604e3820e1e4d068c1cf3562d66cc5edda4a491ced9e3a28d400cbf451cbdfe3961784b80309ecc32f1e0ffea9059e57fad4c5d576 WHIRLPOOL 57b83757c2fd0c536f5c8491d39e7a5ee5266416f5f235f3d4799ffd43ec6db7ee123b276cf32d3fc74470988a7b5291442fb0f53dc7a3fdb06e234848bf336f
-EBUILD eventlist-0.6-r1.ebuild 834 SHA256 e22105e1fbca8f6d67df26153282a6ae76ef8fde2e4ef2f928cbab8c085d7090 SHA512 859c55a7796b20b3980684ed0d27be58aa8aaf3fac2bbc42ecd69cc970d19ad2e47546133762bd89da9feb37d850596be9c24817462aeb9d505cdbc74d4594d7 WHIRLPOOL 51df6d2c271fdf484ffae3a8cd5fab3985200213653f35c689dd1328e2fca47504cda5e1788f5c61c94e8d48f251fe3ccbbb7e99fbd38e3bcea7f98fa725f419
-EBUILD eventlist-0.6.ebuild 829 SHA256 99b81c1ea8bb6dfe4477dd33d7e67c554d45b111b9d62065b8e66fd9a30a8217 SHA512 508868135c85ccad310d73db30cda7be860641fa46b78a397da192be655ca24359524f713f822104856e15bbd96310d5223df5ed8d067d97160ff632496d2807 WHIRLPOOL 8e7d1312ebc7747bbc40ccdf72958afd0dffbd3223b7df608cda8478a6331e9696382c1983ca8d1863cdc65e907d0259c18be7270fc17b956f180fdbae465d02
-MISC ChangeLog 1491 SHA256 a611f80e6a74b8dd1d5f31b16c11eb21c856f885fd5675546e8b0dabf9f9c6ab SHA512 9c02865ccd77a0aa04a27ed9750b404c22809e95d82f390f8b701e307e96bf2579b545afe20d5866fe672f321daf1b42b972868f497d91d31d371b5dce98ed7c WHIRLPOOL 472eeb2c0c7a1a70232fb1790d089ad3222ec8d1d9690216f5348827f8b23c1ad9631dca6433ac5227b7a023e16b81b359cfb98c89dc3b70e7277f7bc02a121e
+EBUILD eventlist-0.6-r1.ebuild 832 SHA256 a69234e41459bf61a24728e9f0517099cc3550b270cd39ec4cc66387a2b5e603 SHA512 75bdf983e94618c0077df086effbf8071f16d93a3f20562939861b174b1a8a7244d5ec90c832883a4d1bf90bb1e5c0abecba0882c51300c6af636d67a3b896a3 WHIRLPOOL 597f377111a6ebe841c39bbdf2429d1849c2f62d2d70de7695ec6734beb29d40d2fce97bc71d18e15bfdb04a4e24badaa0c71cc42844e72e600aea5980630d0a
+MISC ChangeLog 1623 SHA256 4e09e5b4ec493ec0ec5f0dc12d5df30d3616a1a6a4d0ac70c788cf16f4575c02 SHA512 8f2245cc7369a4f00903aec3e69b3fe1504f975bcd87f9c0caafb75fed0feea0a6b8fbc8b4e977bcf6c885ceda565b45de1a340daa4401000157f15de7557ce2 WHIRLPOOL 949b6799ffceeb6ca06f66f0225b00765f8cdcb93a4c5c341a2db17fdf7d1a5d85f825eb8e32a39a2a6cbbb3ea7da7654c8aa975961657c2fe19b0403e289ad3
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTK2NiAAoJEGVpnaTzz9K9jp8P/19pn6GIJ1yOSoOME5fk7wjx
-2WtMyW5acc7P2v4H4LzRed8FtxmoztltSD62dH41u4nqW+bECF61vefS9pzJSogk
-uUe5Cu+K/Dm+SQHTtKwmdqAiz49tvXOxwiIVPmh8bnnfMvLSjhTBxCCXE5+dHPYl
-ilWitDg2JgsEMM9QQDepuwqr2MT6/7lZrqFO5oZih8N9gggt+S3xDGcczQQlm1uc
-5+azZd2oS5vxhHlJ0+/E0y/YzhZXblGmWs9M0dS/a/WLn/v21bXR2oqjSfq7X6Of
-560cc53LWAOmBbkO4lxDQjRaQoAAS8UO9KS+1J/vUXeLEA6G5J+Vfzjw02k8yLRV
-sm15HmgBcxbZksyFecD77EffryC2/0jtFZ4yZN7+rO9CroyObF4Vqmx4M7o0SWnd
-cJWCVhHOvXIseAbBDRbc7hIo10Z2qP3sNjFvcHuHn2FE8+Gg5H4lE0eRvBq2EEWR
-SxgKeqN2D1y1A6t5l2PvMe+bhDMd/Evqzb9Xhl6iHL0b/Gkg1dNip6ceGGKd+RDE
-A4M612cuNTI7dq7XETkMPh5vfDnlVxUiPfe1HT9Dr9K47DC7FIiW5HPrRSBhHlWM
-KDeSVWjlV9PlixSvLCsnIzgAcpk+LIMAYPbu8O++wfhKZeue85Y3yDwMxlgGPxBS
-V5YCYf52gVBSTI+ktiQy
-=B3IL
+iQIcBAEBCAAGBQJTWRtVAAoJEGVpnaTzz9K9EIUP/inUf1TseCILTJcEY60VMprZ
+J3fayf+TZwoWKO1KsjxAiB3yx7yFTQwdDrF+TngQL06ER8ZoNmJhF6tyvq1OJxLl
+apV0gAiQG1Bh4ZvToKnozpIJaJPe8pqNIVPXvzqU3Rvsg7bdmSN3mFmqg9I/PppL
+9KV38oZ+Qmx99k0XuhUc4ufU7gwkPw9DgPw4Hl4WrMkkua5KLsccu2sm5MdrGOe5
+5RF6JDUrugNQ31QpHnzKfL+eB07w2rGuLVyMQx03s3UBvdvGaiSDLoYUUaTCzo9p
+N60uYbcPSByiQoC5T44AymbVGYDe0pvh6x+aq9CWq9wp56evSPDpBVsdS2VPmabj
+knY5SBf++TqZrHSP7Um/l78fot7TWLlwkXhWNw2jexxc4680t6d1hmhJlayMpV8Q
+/6ZPRNn2vuily/g6cMre8XpndZQwv3VP9aySvoa/Jy3pHf07QcENnIDYAv2ayqQt
+OwHrSpdKjqobHlvHzmCmavtorI5xGzIRvdWscdxgDMbOBULlU/dpfeABiIpFsfHR
+Yv0P6tBsea+5PiglDMm2VM0lyE+3trRx9I2HeJJ0U45l0Wb3hXQCh+GmE9ETi1IH
+zdjHVKw46d1wqHvf61l/jNjp5gsT2TafUSFCDSE6RWQ0Eu593pfpobJA+oO8FGyJ
+th6beTzrOWsvatsHH6Gd
+=jg06
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/eventlist/eventlist-0.6-r1.ebuild b/kde-misc/eventlist/eventlist-0.6-r1.ebuild
index 787d7a71519f..a904f834e691 100644
--- a/kde-misc/eventlist/eventlist-0.6-r1.ebuild
+++ b/kde-misc/eventlist/eventlist-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/eventlist/eventlist-0.6-r1.ebuild,v 1.1 2014/03/20 21:53:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/eventlist/eventlist-0.6-r1.ebuild,v 1.2 2014/04/24 14:10:28 johu Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://kde-look.org/CONTENT/content-files/107779-${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-misc/eventlist/eventlist-0.6.ebuild b/kde-misc/eventlist/eventlist-0.6.ebuild
deleted file mode 100644
index f69d257ad7bc..000000000000
--- a/kde-misc/eventlist/eventlist-0.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/eventlist/eventlist-0.6.ebuild,v 1.4 2012/07/16 13:14:53 johu Exp $
-
-EAPI=4
-
-MY_P="plasmoid-${P}"
-KDE_LINGUAS="cs da de el es et fr ga it km nds nl pl pt pt_BR ru sk sv uk"
-inherit kde4-base
-
-DESCRIPTION="Plasmoid showing the events from Akonadi resources"
-HOMEPAGE="http://kde-look.org/content/show.php/Eventlist?content=107779"
-SRC_URI="http://kde-look.org/CONTENT/content-files/107779-${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	|| ( ( $(add_kdebase_dep akonadi) )
-	     ( $(add_kdebase_dep kdepim-common-libs) ) )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS Changelog README TODO )
-
-S=${WORKDIR}/${MY_P}
diff --git a/kde-misc/fancytasks/ChangeLog b/kde-misc/fancytasks/ChangeLog
index 7cc4148f7a59..fd8184288c96 100644
--- a/kde-misc/fancytasks/ChangeLog
+++ b/kde-misc/fancytasks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/fancytasks
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/fancytasks/ChangeLog,v 1.17 2014/03/20 21:55:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/fancytasks/ChangeLog,v 1.18 2014/04/24 14:14:38 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -fancytasks-1.1.2.ebuild,
+  fancytasks-1.1.2-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *fancytasks-1.1.2-r1 (20 Mar 2014)
 
diff --git a/kde-misc/fancytasks/Manifest b/kde-misc/fancytasks/Manifest
index 7fb987e56c79..bc8069974ba5 100644
--- a/kde-misc/fancytasks/Manifest
+++ b/kde-misc/fancytasks/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST 99737-fancytasks-1.1.2.tar.bz2 190910 SHA256 80ecc4956b76da68578544be56e3fdc0315f6d682d1e3404bce84236976c709c SHA512 c595db5f0db5ffcdfd7db3c56b54763e232ab2b5e8c2a5ade6838c1678f56c0a798598d3fbfa518726344e84053e445518d225a58f2651390f630490ea51ab54 WHIRLPOOL 293f4443452f396a6f598e10439d77429d22aa16250f19e699e9d2638919cd09caf8f2acebec5b4003b123c26d2a3f020ac8cc9fb296dad6ea7e14e7a6bc0c2e
-EBUILD fancytasks-1.1.2-r1.ebuild 1068 SHA256 041ebf703d95b52de2f50a05b4de4627a20a717de115077bedb08f9ed8a90d4c SHA512 84643364314c1f29e6bcfc19fa050718072cac0504278d9f80b1eb4609bc252cd73dced342dc6844631de07dabf6931d94779c55cdb9c1f7eb23467a4981fcf3 WHIRLPOOL 2b90006c0a45b8968c6383b5bdc87517bac09ebf37523086d3847435952deb8d26294d3dee222639ee5c88c0d3bf344e0e59e19cd320b55f165c38017dd18d9a
-EBUILD fancytasks-1.1.2.ebuild 1067 SHA256 b3a51e3ab017bd4d5d54dbe0bb8746322231a84167aee5052c1ff2d175f2d025 SHA512 a9427c468f996ed610daece51e1fb499093544b12016a795805ddc11d02df3156abfe2eb3fdeb4e145dc2abc36a9bb1a41547e429e9a65ed179f3b989f3734e9 WHIRLPOOL 667e07133e320a277fb57a74d3cc668b838b4024b9e6916c119946239487710f8601ed719b10148c7c69640a51d375c608eb1f0d60cabafa89d6f9316aa6dc85
-MISC ChangeLog 2612 SHA256 f016a9a64811b412f36c52354506d8fd8bea7c86d9b1a0f901fd37bce1ebacbe SHA512 248f23767a1933960ef0f8ccc54fcb210ce3a3318037d2185a00a6a92536a5a47331b6d7325c7a855ff66a2946ea1d651ac200e226daaf083f5e4093c325d02a WHIRLPOOL a3802164940ea27cce951b1bab6d3f5d609d2600a7253d3a3d02a5f5b1c262aa94446e9fe6c60ab0711beaa5c3cc56c734c6a6f81ef9a71de62f9e481bad36ea
+EBUILD fancytasks-1.1.2-r1.ebuild 1066 SHA256 cbea54159f200d1ffebfac9cd5ced7afd43615cece3911efa9149d24eb456d07 SHA512 b3d51d83f5000fdd00470e21e865f3d23b927f2c3ed88ff59285a662b0ae17280c4c3742ab4f94d4ab54f24af16666efbe280c3dbb3482cca6005877a9a92e42 WHIRLPOOL 18801c99ace61c4238621e211daab28608406ca561fd257e209bb4988a59464fbead5bc412444571a0e66b9cf0202f9d274d04a53e15e7f9d946083441f87e47
+MISC ChangeLog 2749 SHA256 cef74d240ec4b61ed3c0737c615b05adfa24dd3b06c620b4e4b022310b1511f5 SHA512 e7ff586ce2ebf00c997565068c098cf27b65e4cb6753b0b5eaaeb1b9b7ba8c79859a34c49f6ed4f59e2305ee380ba8faa1984ff1bbe28bcc6bfafa2ea2998318 WHIRLPOOL bf0d660a0711b2d0cbe3b6de7d28d053b84796cdd1f778c37aeffea334cc8d6fb8d575f935e103e901b1720253ab1dc5a3d839ef54429b282440f1de09582229
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTK2PoAAoJEGVpnaTzz9K9x/kP/RZSjGwfof/x2A7KUjAn1W7p
-ow1SqljkLqXqJOQ/nQTjz9n6/sLNRav/J69nuVsZak2DwkXj+1zSqRYRm4oQAZ+6
-htxQcLv0nN64f1yRUxKS/jFr6V7PIPs5fptrBl4BNLICum2O1Wz7SzXLt/Os3OLn
-J13O0/uZBrgY6Zcmt/MEPqAiDzkp6zts333h/IyZJFjADUarQjlB669RhbXY78Lt
-JkBwiJ5yl/br9wmuQJ14/gqa+FQuSDGAlOHJM6rrrX9whByzZwKeaPF6NHE4Azrj
-vs9o9BL/Of6nNajCaXXBQjqVzsYReePyInWOnbzwnqhAS9cmGRn6S5Z1bYXxJo61
-s3zUL1hvuHQVtjW5LFZGSGIEA8Tzf7NR93DgdI+5nvJk7szq5ZPcytpY678+Txdt
-6UuYUAXg5Wbnry4nGEzOkBz5LhyU9m0xCw/nlvzdvh3H1vogqSBrNqncGSVXfX+U
-uFzHCgzZeiU+lSFJ6rrGMDEKMG/suoHLr+riFnk2DlWnKfVQ0lzMoKSikeMSjTkw
-LT7cgeNxREfk9hUtvOQ9YPucCMGK4OR+cqSOUfeDuJHNHFrupYJBdL5rI6gqPBWv
-jWY/rPECnV9nxeoSWaMmUwYpYQi3KYuh24TGySmAGWAfxPe71BFQttDtex+4JbT1
-rjPKVLaQFAN84wM3LGry
-=h6lF
+iQIcBAEBCAAGBQJTWRxPAAoJEGVpnaTzz9K9GtEP/iq3PUDNxL5wez9IT/GNm2g+
+QLQamhQMeT+hEwIc8akp3n8Jtl7mKw005tl9ehBR86ZVrdjGdqsIkmCIA4Wt6ddx
+CcVNQlaIBqsIcnU6BkqnRksGguINdO95kj2iy3oP7pTjF6Al3IbZiFzBv4u3ERiS
+pOpi4Ju0NBsd4LxqWfVofg0IIyEJk5vhC7VqCuUgDeVNwbY4cQNVEQizORQ3oqpO
+CNew+WsXVzCAtllKAZDw1q/ah4wPwJQXQRLL+LlQmLcDVNZS4lXdWRxJkM5zhilS
+y647wXL81c8VigsoBVguadPrk5INphrw1XT9XO8tbl/4m5bxCA1WTNalM+riPPPP
+dpguckhvh3DYVJnJJjyRUVOkcl/mmXeR25k+89LceKk+j2J6xmdSE1ukc/g8eF68
+S0c8+bSR9voluLeVtZszClanwKtNU8zfhT7mo9OrRC8jDgl4Pgehoc3o8eBNEbNV
+eKjBqaZUYZM6pzZWwFUgU9VLFxI9XJPheMIgvZBkYEp8F4IQjDj3l3iDaw1sfbce
++LnvJzetCVOYPBfP1gyh1jBkayiCSRZKE6ImoNtaYKRVh/m+nbw+DCcJDda5mjax
+8EwI9DKG5t6QXH6hszcSc2prjlug2qtGDvphLand0Ouhds0JgoK9hnpVffk58ZIC
+5aDi7Lghp080YT+lIpVM
+=OYhB
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/fancytasks/fancytasks-1.1.2-r1.ebuild b/kde-misc/fancytasks/fancytasks-1.1.2-r1.ebuild
index 4216cca4194b..024705416561 100644
--- a/kde-misc/fancytasks/fancytasks-1.1.2-r1.ebuild
+++ b/kde-misc/fancytasks/fancytasks-1.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/fancytasks/fancytasks-1.1.2-r1.ebuild,v 1.1 2014/03/20 21:55:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/fancytasks/fancytasks-1.1.2-r1.ebuild,v 1.2 2014/04/24 14:14:38 johu Exp $
 
 EAPI=5
 KDE_LINGUAS="de en_GB es et fr km nds pl pt ru sv tr uk"
@@ -14,7 +14,7 @@ SRC_URI="http://kde-look.org/CONTENT/content-files/99737-${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-misc/fancytasks/fancytasks-1.1.2.ebuild b/kde-misc/fancytasks/fancytasks-1.1.2.ebuild
deleted file mode 100644
index f81ce6e4801a..000000000000
--- a/kde-misc/fancytasks/fancytasks-1.1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/fancytasks/fancytasks-1.1.2.ebuild,v 1.4 2012/07/22 21:45:41 hwoarang Exp $
-
-EAPI=4
-KDE_LINGUAS="de en_GB es et fr km nds pl pt ru sv tr uk"
-KDE_LINGUAS_DIR=( applet/locale containment/locale )
-KDE_MINIMAL="4.8"
-inherit kde4-base
-
-DESCRIPTION="Task and launch representation plasmoid"
-HOMEPAGE="http://kde-look.org/content/show.php/Fancy+Tasks?content=99737"
-SRC_URI="http://kde-look.org/CONTENT/content-files/99737-${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep plasma-workspace)
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG README TODO )
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	local lang
-	for lang in ${KDE_LINGUAS} ; do
-		if ! use linguas_${lang} ; then
-			local dir
-			for dir in ${KDE_LINGUAS_DIR[@]} ; do
-				if [ -f ${dir}/${lang}.mo ]; then
-					rm ${dir}/${lang}.mo
-				fi
-			done
-		fi
-	done
-}
diff --git a/kde-misc/hdaps_monitor/ChangeLog b/kde-misc/hdaps_monitor/ChangeLog
index dcabd8b3278f..3189a5985343 100644
--- a/kde-misc/hdaps_monitor/ChangeLog
+++ b/kde-misc/hdaps_monitor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/hdaps_monitor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/hdaps_monitor/ChangeLog,v 1.5 2014/03/20 22:00:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/hdaps_monitor/ChangeLog,v 1.6 2014/04/24 14:19:27 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -hdaps_monitor-0.3.ebuild,
+  hdaps_monitor-0.3-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *hdaps_monitor-0.3-r1 (20 Mar 2014)
 
diff --git a/kde-misc/hdaps_monitor/Manifest b/kde-misc/hdaps_monitor/Manifest
index 4be19c927014..873a41b9245d 100644
--- a/kde-misc/hdaps_monitor/Manifest
+++ b/kde-misc/hdaps_monitor/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST 103481-hdaps_monitor-0.3.tar.gz 3159 SHA256 b99b25018666792282814f92f3302f30d2e111dd650400dcca96b74281fa8a53
-EBUILD hdaps_monitor-0.3-r1.ebuild 617 SHA256 59cc2c33a5f3cdb812ee190fa0674d5cde3acf803ae916ecdd424fd6a005b914 SHA512 dce399ee9b64bca37f05e662598bb0ff703a81c5c075f0eac1c6947b6f4f5dd32687ce24aa303ccc8a5695fd93bcfe73595e6fa384f1e96a94897a65d7ee7225 WHIRLPOOL 3164d024caf419ed87e109b8c39a746dcd8c81de49abebddecf94b7f04c52118e8d8d951a7366fde1518b67f44c6ffe74c8614e91e4dbe59e40dbe0b12f7b86a
-EBUILD hdaps_monitor-0.3.ebuild 617 SHA256 eee4240dbaedee184f2ed8c14a88213c7e596c9c4902be12717e9163bbeea00a SHA512 b99d3df35e821363c7d69d84cc5cbacf5326ce008252578c9f3e9da3e1a45323dbb6f740eaf714e3d5d6b5707558f4e0e11dbc5f9a3553f0c04f90a471d88fad WHIRLPOOL 4f8abc0ca80d90e3abc6ffa91b4abde4e3066553ae0960b241304174dc9684d42def7c034ac07393c62dd7586dba3a0065f702d72534d6ea5c241b3267758738
-MISC ChangeLog 904 SHA256 24e9d9c13deb3d264448d04dcdefd5c02c9ac45f44b00dd5d2df33870591dbf8 SHA512 955eebeec8aff2a30617d1c327f3f40c8210bcbde49414e8144139712de4c8d15742ce83f72fa0fa71589660e754b1bf0d0d96e6a73123f955b88a79b3f4ca9c WHIRLPOOL 0ad9966f8470b04f2a9cd252a254df68b19f6cf1a810c5519b5cb1a03e8522188ebd50299ade892a3064b8ce343d97e108885056e3c36156a85028f4fd060163
+EBUILD hdaps_monitor-0.3-r1.ebuild 615 SHA256 7dae421169fbc95e0beec0c6d58270cd7137e49250a4dba6669b8975970df306 SHA512 75014bd6957cacc29350bcd2e8c005bb868faf552fe4b0fdee9f7ff816adbd7f3b4ef37987587a63e8a530c801200bdd40b3bb5b711ee7d9032fe227eb1853a8 WHIRLPOOL b1789bf9183ae212fb2843a6d0454c47449bd3c4a6cc8bb0fc1c885de7f5883e28afee82a83f399832c6c305fa817f7700d19aab7c1758f29f4cde74b08f69a0
+MISC ChangeLog 1043 SHA256 6031a7d580d5ba0f3ca8698538bf2525170806e12593ea4b10be0f783bc96983 SHA512 41bc45f345936e6fbe8e6a729202fde30820b9fa0aeaab94d37506fc7dc04cf8ff0ab9e2f8ae37a8545880af03b852be0e07b91571d1292285c9eed2a2df539f WHIRLPOOL 7ff2827d641a313a31dc458aa0a26f94c41f8fa93ea57ddd4b4685027b9fd92adfbe21bcbd2875e3d61d8bf68a09471e88c891dcbf55d90fa77bb4cde2004730
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTK2UHAAoJEGVpnaTzz9K9Gc0P/iJRdq/8vPP0s+M3BZm0CpSF
-x8zLe6L+K/Bt8HE769OuPwgibnrl8+tD3mP0ApS1a2Wa6aDYuYB9UQdFL0CsWuai
-EXk3F6K1k0qlRm2beFZtYcYPTr08SZJZ+YqpvxyroR8B6/6C80NE51+1ilozCkL4
-+4QavBa79jG8sXgj4V5MxHTwMb231MY+kd9W/LIlKbv6PduoH8CN73fTqLTaiXtK
-prI9GKxLZVo2Cz5DN1QmBS0k90JCxIaZHcIRvEsK5HOF9DQP7ra6waCWgFAEQTMq
-JK37rkmY81yRphSl0UHSzqDoToB2zcDN+GpSiPPohgud4TRFH40vv66wEFWndb01
-fIlX99wJgXL5m0siP0d21aI0SVAY5kfXuaF2XRAa3X5RP6yrL2Up/XZOPhRCzAZR
-xkfLXQ0e9/IZNZhra6vItoqEqBn9pXF8TtgsEo++scL187aBYhCMh731QPPa0SCY
-2B+PSOD9aYm/vrGPKjW15W9PSH5Kmbv+JHohimBl+Yxo80kkWGcSojTzrQ4+hkNa
-vlpt6cmtZ9XlG3MutB6heh9nrJPS3LGJdVhyVE+lyKAA4iWFa0XDJNyUmDPC9gSZ
-7YpEanq1N70CpxiZjw9r2uOkTI0VkB9mZSn9/6aHPjj4o3RVGcy7qchUU1JoNTyI
-uhh1Al5wjdF/nZM5Nv6V
-=cJpc
+iQIcBAEBCAAGBQJTWR1wAAoJEGVpnaTzz9K9zhUP/2056fTyvC7XraZG3Xmww7pR
+pZHYYAwDb+7Z7ZTfY5vmIqnUVxMopNn0gIEouBk7xtyncsd/zHYPuERJIvx/87t7
+A5rn6b3BLqFqwIL/ovIdRxLHnsuhC0cQyqgJVqT91+J0/YjMcLYwtU3k1a6qDFy6
+st18aIiG7+aIPKiOG1QGWcsceK9hUotPhU0/52rlcdHRrSTRaDVINstGbU5grZvz
+9ErFwBTwS839K9yocuggcZ6e4PN4iqHYs7B+61NoR8V8oYWcUlCmxJroayVR+RWr
+WnDbeH92MWkG93pf8K6YUc+/4gL207PBg1GF/5X3Z9zc/YTdQbp/3xjkAHJ/YQt8
+/qK6fAK9jHHS9xnFKtjgWjg3XhXLiYcOYF8seMo2xUNazBDylgFRmHKzEAWVClo+
+4hZBWZc6SxT77NY2saBUoXWjJn6K7Gy+iS+arnr33kqyTqPqfWasEBnj1jVk/VmQ
+mtJPBkozrjBcXzInzXcNdVoni9BJ5smMfWVoVV4/ug7ofu1saiuGEPLHgmkwEsor
+LR6H50UCFHjl1tRD84vFWv56F5NRdfYUzwFngKBajnwcCbFUJ0Lz3TqNBqpDPNKQ
+nDd//XhHa7aMU3vrVJSvUFLw6kIevS62nI52BFhrn2p1UnWc0kzwjHZwVI/Dhra+
+Dg5lDgF3Ix3lD25iPIMf
+=meg5
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/hdaps_monitor/hdaps_monitor-0.3-r1.ebuild b/kde-misc/hdaps_monitor/hdaps_monitor-0.3-r1.ebuild
index 5d7527ab4cbf..0a44a1a5c6b8 100644
--- a/kde-misc/hdaps_monitor/hdaps_monitor-0.3-r1.ebuild
+++ b/kde-misc/hdaps_monitor/hdaps_monitor-0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/hdaps_monitor/hdaps_monitor-0.3-r1.ebuild,v 1.1 2014/03/20 22:00:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/hdaps_monitor/hdaps_monitor-0.3-r1.ebuild,v 1.2 2014/04/24 14:19:27 johu Exp $
 
 EAPI=5
 inherit kde4-base
@@ -11,7 +11,7 @@ SRC_URI="http://www.kde-look.org/CONTENT/content-files/103481-${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep plasma-workspace)"
diff --git a/kde-misc/hdaps_monitor/hdaps_monitor-0.3.ebuild b/kde-misc/hdaps_monitor/hdaps_monitor-0.3.ebuild
deleted file mode 100644
index e721c35369e1..000000000000
--- a/kde-misc/hdaps_monitor/hdaps_monitor-0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/hdaps_monitor/hdaps_monitor-0.3.ebuild,v 1.4 2012/03/26 07:24:43 scarabeus Exp $
-
-EAPI=4
-inherit kde4-base
-
-DESCRIPTION="KDE-based monitor for the IBM HDAPS system"
-HOMEPAGE="http://www.kde-look.org/content/show.php/HDAPS+monitor?content=103481"
-SRC_URI="http://www.kde-look.org/CONTENT/content-files/103481-${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="$(add_kdebase_dep plasma-workspace)"
-RDEPEND="${DEPEND}
-	app-laptop/hdapsd"
diff --git a/kde-misc/kdesudo/ChangeLog b/kde-misc/kdesudo/ChangeLog
index 149c99976e0e..b8112c6192bf 100644
--- a/kde-misc/kdesudo/ChangeLog
+++ b/kde-misc/kdesudo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kdesudo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdesudo/ChangeLog,v 1.8 2014/03/20 22:06:25 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdesudo/ChangeLog,v 1.9 2014/04/24 14:33:22 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -kdesudo-3.4.2.4.ebuild,
+  kdesudo-3.4.2.4-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *kdesudo-3.4.2.4-r1 (20 Mar 2014)
 
diff --git a/kde-misc/kdesudo/Manifest b/kde-misc/kdesudo/Manifest
index dc82b40603df..3007bf75b0fd 100644
--- a/kde-misc/kdesudo/Manifest
+++ b/kde-misc/kdesudo/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST kdesudo-3.4.2.4.tar.gz 53670 SHA256 8fc9ad91c908b27eb1f4173653ba7762f645fc817a9b108d0dd835d8af425584
-EBUILD kdesudo-3.4.2.4-r1.ebuild 811 SHA256 7ce5ea71fe8c06edb718d01edb2e3ea39c1198f59aea8ed33859a3817d4713bd SHA512 c7e7e5e45d2cbd4a5abaddebc1692b33372c28215a575808c2046c8c77e51e667484fe6bddc35f554a53140e83d14201b98d9f4ddd6efaeddb47893e88b5c227 WHIRLPOOL 243b509bdbd507fcc7118c5ce5660bfe76411b075cf42b51d8e80c549253033e1eeccb949462f73b16fe4366f5cfdb04da75388f1bcbefd58b1fd2d4827a8413
-EBUILD kdesudo-3.4.2.4.ebuild 805 SHA256 2d1207ef6f107ffac98668d88ee56ea6d76559b986a40184dda868042cbf1c5c SHA512 971a2edae58d7beca523b410bcbd2121ad794e2c26db9f3bdaec934f7997d41946522d1eab38a34e429aa7b6fa1a43c0fd7295a515aa57f457b3dec69ced6015 WHIRLPOOL a1bd55b8072c928277f8227640ed20bdb1a4f9674f39282044f912d7789792639266f3be4c3f2cdce7208c31c444461b5eea37f23b6ac5bdfe35f83c36326080
-MISC ChangeLog 1210 SHA256 0ccf6a49a0407d0e6fc6ef126cec9f18c9d1c8f8db4819d566ff7f23e346a88f SHA512 6614a73233d8b6dfc2cecee53d7c5f41a76b2a8ac4ba291a477066d977c6ade58cdba709cd64adde57f53ba3706ecdabfb30643024952729b985c58fef3623a7 WHIRLPOOL 2d4cbc98fde535b37fc0e1f3e06bf13566d00268b002988884ad4c639e6a0275cde21bd584877b5c73cb8576f2c6dde0785c428b795c87060605671491d44bcb
+EBUILD kdesudo-3.4.2.4-r1.ebuild 809 SHA256 2f9631f91b2d21425c10f67d9edcf774ef607a82cb677a937b526272affc92ac SHA512 af1e76b364464ffdf3add1447d0bf5d55e16cb29bf93d9558e43cc0e45b0fecb8f8c21f264fc39858c216ad8b5b03f0b02d52414b1ecd896f9d14ed080001c35 WHIRLPOOL 0621f94c9b257d29911b0a6192df16bfad11a55fcbdffebf9925d755dd37bad1bcb46e71d894c8ae5be06295b660a9c4569b0cc017097c89701a581eb2d44bf8
+MISC ChangeLog 1345 SHA256 42bab36b22d31c14cb2cf8312e34df67fa5a4fa537d43052c0e8f750da68c6c7 SHA512 635610025f58ff7459c5293515744b1c7fb3c6bf525cc106360bdfcde07c8c8b0a9eaa64c0e209abc7b55957fffc920e63ef29d6e647e44cf30231c3cc2f903e WHIRLPOOL d21da0a085633c41196ca23c11fd4af7d8361778bccc10e72be3590ea199aa81433615528c071ca819a836f93399d63fcad8d1fda78a7f0db14e1d3d073eed0c
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTK2ZiAAoJEGVpnaTzz9K9ZWoP/3mUVoXR2dn4Mb0GoO4QzvIh
-Pg3w1+ePpjhPUBn1dI6eRacugpP0Y7FLkmZdJL62cMH9AyVwE/Sh4kgeQs+05Z9o
-rGwnAEm4l5gxOdtFehAJLzwAVH7E9BlAkGbn/Ktd44uTnB/1LZlFCGCyOwBmWF6i
-s+JtXbg6cy/93eXU/dwFxVaQFt9Jm816yFiAR4VXKpJ7MdxNj4SJ1o8acXbaNhKz
-CAMfVPXQLMWY1DTmsNCsjUYhMUSF2Y0lfaoMMIgmkbAXPBsPxaVcd9F5OxXhy+iX
-gGCt+ti1AUihnpFs6OHk113D0tHwkmspEUyfqSYLETmRHrrOkkFe7AjFfrl+93Np
-7ilNeNFXdOuDmP29wag34pXfR8O6VNdfw8KlyJxgT6N8T2jz0qHttrvvRtPPkMkK
-GCkRihc/foRtd0nCItB91AH9l3x5xP1VD90h7EzqlYwg7dOS/3eNgHkz/Ajngdqb
-1nWRikVnB4/3ZVA3FUELgrsbOSp4QYzURZLA9vWgMC3erb4c5qCrC3g5ajxsNIbm
-jN56zHvUOOJCueF26Iw1UnFTzyHNo8D2xvwvyYJHq2QSZdINrZtSSPDm9yZv6aBc
-4jkS20tk7AY+pWxXgufKavv1Guw/RqF0kCJEY13mq6W0/HjWgfN/ZPWRHSj9oOCu
-tEvnaAI+9B7/sz3pVQQ1
-=J2hJ
+iQIcBAEBCAAGBQJTWSCzAAoJEGVpnaTzz9K96pkP/RZmlq3zKzp7IO/4L0ui1ToZ
+jq0H/jPH4t173brmJPyL/M20GyeDqOG+cRhNxn0C1ryDgpt+syu+oDMZpKdpyQki
+UWZ/J2ciSKlbKO5t8HkAcdEqNpC6Ihf6UfBD/bpzjpBZ/B4PWvGAteidX77yQ9LF
+S1B0/6oVRITRbijrH7UCyNz9JyxdCe81oBk4fb16OaN8B+lmWSsCFMz7xk7XsVnY
+iUz2K2BCHrM6OdaLzMR3hoxF6ct1HTtOE3rePggAtzcDHKHyWrt8c/a5rBrhPGnW
+09VJhVj1nc9SW7WrLZN2TPRXybVoj2BjgIwtYdHyhpPEsyNmabngjc57W5oWe57W
+oGHqsH2QsjeVuGqZLlh10Vtqspv3tL2LEKUvcHhmg7/kjaKQJz8qucsS+Bg5RysH
+Ng0KAuNheNSYqSqMz4vjximHEUvH0WVDlaZ36QCDp1pNWdIerky9nzlh8+Tv0QBA
+auFAP58O1deX/bHAXxETIeOvJ6N9/2sWrO1a4BEmpk5L7ctUrzWXyET+QqUgFfnP
+URRqv//ra1vt9kz4fdtOkLk4N4ByzQa2r+Pm4yEkOg/KBswhIkpPfbCIi7d0dRx9
+t1drKKP6V4N3aTLIHHXbYiieG97ZBETdvrB00FaAbBRQqVCe1lFzjxcz6PVK/OdN
+nYRS2yE/yhSUEZ7Ox/kg
+=j7gf
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdesudo/kdesudo-3.4.2.4-r1.ebuild b/kde-misc/kdesudo/kdesudo-3.4.2.4-r1.ebuild
index 99d0d16564e6..4abc9671aeba 100644
--- a/kde-misc/kdesudo/kdesudo-3.4.2.4-r1.ebuild
+++ b/kde-misc/kdesudo/kdesudo-3.4.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdesudo/kdesudo-3.4.2.4-r1.ebuild,v 1.1 2014/03/20 22:06:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdesudo/kdesudo-3.4.2.4-r1.ebuild,v 1.2 2014/04/24 14:33:22 johu Exp $
 
 EAPI=5
 # FIXME. What is linguas_jv, different Japanese translation?
@@ -15,7 +15,7 @@ SRC_URI="http://launchpad.net/${PN}/3.x/${PV}/+download/${P}.tar.gz"
 
 LICENSE="FDL-1.2 GPL-2 LGPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-misc/kdesudo/kdesudo-3.4.2.4.ebuild b/kde-misc/kdesudo/kdesudo-3.4.2.4.ebuild
deleted file mode 100644
index 0ad31654012d..000000000000
--- a/kde-misc/kdesudo/kdesudo-3.4.2.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdesudo/kdesudo-3.4.2.4.ebuild,v 1.5 2013/06/11 15:52:29 ago Exp $
-
-EAPI=4
-# FIXME. What is linguas_jv, different Japanese translation?
-KDE_LINGUAS="ar cs da de el en_GB es et fa fi fr gl he hr hu id is it ja kk ko
-lt lv ms nb nl oc pl pt pt_BR ro ru sk sv tl tr uk zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="A frontend for sudo. Unlike kdesu, it uses directly sudo as backend."
-HOMEPAGE="http://launchpad.net/kdesudo/"
-SRC_URI="http://launchpad.net/${PN}/3.x/${PV}/+download/${P}.tar.gz"
-
-LICENSE="FDL-1.2 GPL-2 LGPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="
-	app-admin/sudo
-"
-
-DOCS=( AUTHORS ChangeLog README )
diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 27b7851a41d4..f99510d067db 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.70 2014/03/20 22:08:32 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.71 2014/04/24 14:38:17 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -kdiff3-0.9.97-r1.ebuild,
+  kdiff3-0.9.97-r2.ebuild:
+  amd64/x86 stable, remove old.
 
 *kdiff3-0.9.97-r2 (20 Mar 2014)
 
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 4c1202bc2805..2efaf6454619 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -3,24 +3,23 @@ Hash: SHA256
 
 AUX kdiff3-0.9.97-relativepath.patch 2542 SHA256 affa8b351b96109748a1909d83d89e32c9ff51308f7cce438c314486793035e7 SHA512 dfff58aa2bd277eb771fbfd09270532a03ec9d534d28b199499b626ea6467aba3bd116dd5a74e0709f7c24a98cc4a2c2ab807a4762b1a547af706ce01961e19b WHIRLPOOL fe4fcd896df8d9a64e24bbe1aad73aa6a79d241dba8327b07d2781cf17f63029b170645537523d846e81383d31967b709a2b1992252146cdbee03f794d518eba
 DIST kdiff3-0.9.97.tar.gz 1803769 SHA256 e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a SHA512 8f4e89e594894a3fbfaa2e5c9cc345ab16e6787c4efc4324fffe55fbe45b94c2ff10ba411279d2b433a0a5fa752653f7b3e663577cc0d658dfc4d5b797a22fab WHIRLPOOL 190590f3c4290afee73672a77ec4f16a923d156f097bcbb4dce1893f57b1199d1f7ed19166a8173292a7bedda5e54f792474f169a50ed8eb47a92b24f7b1c57c
-EBUILD kdiff3-0.9.97-r1.ebuild 1878 SHA256 bfa1d311a8d14043178b160f6111bd8edfceeff45659488c26c777336106a21c SHA512 ee21d7c239a6631650d7a3cc8ea232b0a8407f9341320db174ce7e191c175072cc326fc8080f9ffb1b233e14a705c482684e051552b869db3ad969620b1af1f4 WHIRLPOOL e550e58a82f2e35ff5b913e9426015f4656ecf5857431aa3b71654e9aa7f6a265800b1403abc689ba541fe3f7aa0b20c97bbb815476c235f855368fb9141a950
-EBUILD kdiff3-0.9.97-r2.ebuild 1876 SHA256 3266467294dcdf19e2b360417f350a632b68ba17872866bbb6b08d33d302b4c9 SHA512 040e4eeadcdd8df49d5fb4032e2eb45137d9c96d8d9a806ed4086ecf494c425e3a0f1ea90572ba97cf57a4e4d47e7c32339e1051112b71682e1ddf92bbd43bb8 WHIRLPOOL 2f3e161e4c5a2b68228036ad78548d6b2cc981e18a47a732040df065bf4bdaa52c6a834ff2a51246ca6697bbec842ecdae2f77ac7e6177208368a9204c7684fa
-MISC ChangeLog 11189 SHA256 bc6658bec1d3889fe950922be363e63bf97ed413f10a73ebe41d92860f2c3394 SHA512 d50c0c9a30ed4e6d44758f7bbcb1a3755b1edcd1930506a2ace9c6b34434d779c5f73d445b75cfd0dc4e181a83aa15598520a39f1d014b583ac9387396dfccf6 WHIRLPOOL 006b4c31fb566240ea46b94bcb03746dd1f8a71419b7d092c671dffbfeae4f875b9dbf422df1ccb458e7bee93942bf2934d5fa16fff647630d5e7166fd925597
+EBUILD kdiff3-0.9.97-r2.ebuild 1874 SHA256 78417498662123f23902a58128bbcb64069c305e11a2d34ddeed4a39ca04713f SHA512 5f0b4ce38c28f2bfb7d0e43d09a4674a84d6ccfe6d8f121d8b2d488c5585ccabc1fc63a093c3c3218dd7d468a7e1555e9eeaa8ac32bb196c0fee6d802ba1fa88 WHIRLPOOL 502e516e358b1e99a0731c7c97623f41a0b16f0333e36af52c96d226956d5eef7b6046fe2ad196fd5533cc3d71d41eb0e609b8a8bc203fcd6d698f8b235de892
+MISC ChangeLog 11323 SHA256 5282857814b96e5ce187dc375c2d37679298d07117f6c6eaffd5db299233fc50 SHA512 1ef97b56f7b72e8d9ca360c10683d26f864aeb6a9dc6b1397363e65a931c77385fec8b5919e2829430c1341f79dfbbb0156cc0e188ae949aaf16dca213327bb2 WHIRLPOOL 9b4466404e2b5ad4fd97a4165789d6361d81093c1df9181498b72018e467e0d267214e4082f6ae06c96676cae196c555134989399f780c9a796cfca8a774fb4e
 MISC metadata.xml 256 SHA256 53ee238b560db384f60c055e935009dc11608a62ad34f0aab2657ece46d75839 SHA512 9fde5d60815147e6baff866eec6908cad7a6b1eda5b93daaae21b2aaa8db5e7257276476d46d7bf1164d44afe81cf9c6d20526b2a0b2d2cf65596f550d026c2b WHIRLPOOL 2cd0b5ee996efd9f0d19e77361e7fd354e698aec9547280cdc7ec6e5a2904dfa9e983cddb75b23bac157bed152b331da0dce42908e61d441ef94829b70317a61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTK2bhAAoJEGVpnaTzz9K9etoQALtbmx3KNRJtSzEJnfiBHxnf
-5DgVtAb6MxVcwJekOMg5gWGVHfgZSmckdVPp36bKCkSaB5XWCHPEb3NUj6pL+yRG
-ogu/NVcx7kqHo9m3NPGpWV14JC1dq20ZUG3pa3KaebDqMn8Loi0PoSK9ih3Ahlvr
-xiDUCNRboBqx1ANFaQIVDi0LPFFk0//uAOiCVXsU1zdmKicZsWV7VFvNgMNNSsef
-q25luRRAA9LUR/3I4ImfVwfNezafRZ0W7Y9mvmfqzseC2+1qhbYdU8zHOHTuVffl
-utrpgBZAxR9X7bye4Gjpp1C+SBdXwZi93sktFtoP1auk1WWtRc5x3x9MxAh/3w1N
-Y7EnjNqM/vgYxGcyiXJjTruOAHQtX4dzJD2vNZMuh07DDQQNceWpstYBHjcL03/6
-KbMP1D14K2hgjYW7zw63oaFubj0QArltHDhDTNuxa1f6LZOJznk/K59V7jql6aWp
-eBEJ86uuroe6ObA3I4Jr3I/1KWbuyXmRzOlUB9wOftQgkNRQggOClHuqVwWjK9XA
-NDGyamxrVfCDwDT5/OmFhczW5P6EWIPyg3zoMfDwT/+b13IxV5Fck3Xk7F73ivNl
-jbSBNCwKDmVC2oBnKvC6blNo4OpF3KUURbr/uaFb6VQZyqs+2KJ+Kd25KqNTk8xJ
-Lwq65/P/9rCPEMBat7OX
-=DshB
+iQIcBAEBCAAGBQJTWSHaAAoJEGVpnaTzz9K9654QALJDooNO6H4ShTda7/feovAD
+GJxu3nQpAKN9oIWZZXzUk50jzhRMA20HRXZsYNbRaU8eIJhh+ZcgDOkQasTtFHca
+hGLJv7iPGRKGZj6EA+e+jgMLwfcvo06ZcZMYPxgfxMeH1kRIwOgFkCjfti7mLmGp
+kzxiL4JYfCs1cjqzvirYIqo/ehL0o4jePIljktqo8Y4pE1oi/clu26dKafOQxz0b
+MzqB2JeUL0/kQlpI82p8g1BQ+0boW1ms8fwjxxdsOB8yXCZF1YWvdR/ct1dmmhTE
+JI+H2IyAzHa1e7SbYernQvkCUOoL8YpvFaGNoawS4L4o6SO3AJg8FieTiizwjEHS
+zfZRG8KzTPX3QfLAucIhGiGnt+JN0u22UI8jLeU25mPxkVdl8eLCAw0TxeXgmNHK
+7LZ0HWgmHzxFs5L8EAH1389Y1077SKkbpimScwV6reNzHFDmANdSk6jZAgh0KQ5r
+6JfETS5FDjzYb9sSJbrr8B1v/WGcNeEbX6OrA4uKpiliwYd8Z9Dk4tndrONUTAjt
+0W5GdMhg5Ebbez/153WuJBpVOdgZM1ZAmCUiMqXfJzq3Zi1iWfwqwLPFxlVBTJQf
+83NpyMRP3NZsv7YcLtfsCVvVYlvLahTgPRljxudLRbawQjTQt2cf9R6q+v2OKcW2
+/l31evuNCurIfykcZRAb
+=VzAg
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild
deleted file mode 100644
index 243db1ddc948..000000000000
--- a/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild,v 1.5 2013/03/02 21:29:51 hwoarang Exp $
-
-EAPI=4
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et fr ga
-	gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw sk
-	sv ta tg tr ug uk zh_CN zh_TW"
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
-	KDE_HANDBOOK="optional"
-else
-	ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
-	KEYWORDS=""
-fi
-
-KDE_REQUIRED="optional"
-inherit kde4-base qt4-r2
-
-DESCRIPTION="Qt/KDE based frontend to diff3"
-HOMEPAGE="http://kdiff3.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug kde"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	kde? ( $(add_kdebase_dep kdelibs) )
-"
-RDEPEND="${DEPEND}
-	sys-apps/diffutils
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.97-relativepath.patch"
-)
-
-RESTRICT="!kde? ( test )"
-
-src_unpack(){
-	if [[ ${PV} == *9999* ]]; then
-		subversion_src_unpack
-	elif use kde; then
-		kde4-base_src_unpack
-	else
-		qt4-r2_src_unpack
-	fi
-}
-
-src_prepare() {
-	if ! use kde; then
-		# adapt to Gentoo paths
-		sed -e s,documentation.path.*$,documentation.path\ =\ "${EPREFIX}"/usr/share/doc/"${PF}", \
-		-e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, \
-		"${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
-	else
-		kde4-base_src_prepare
-	fi
-}
-
-src_configure() {
-	if use kde; then
-		kde4-base_src_configure
-	else
-		eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro
-	fi
-}
-
-src_compile() {
-	if use kde; then
-		kde4-base_src_compile
-	else
-		qt4-r2_src_compile
-	fi
-}
-
-src_install() {
-	if use kde; then
-		kde4-base_src_install
-	else
-		qt4-r2_src_install
-	fi
-}
-
-src_test() {
-	if use kde; then
-		kde4-base_src_test
-	fi
-}
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
index 09e05ef59848..c20bf81d156f 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild,v 1.1 2014/03/20 22:08:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild,v 1.2 2014/04/24 14:38:17 johu Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ if [[ ${PV} != *9999* ]]; then
 	gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw sk
 	sv ta tg tr ug uk zh_CN zh_TW"
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
 	KDE_HANDBOOK="optional"
 else
 	ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
diff --git a/kde-misc/krusader/ChangeLog b/kde-misc/krusader/ChangeLog
index 43bb6638de44..da1708b8838c 100644
--- a/kde-misc/krusader/ChangeLog
+++ b/kde-misc/krusader/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/krusader
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.112 2014/03/21 18:39:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.113 2014/04/24 15:02:24 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -krusader-2.4.0_beta3.ebuild,
+  krusader-2.4.0_beta3-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *krusader-2.4.0_beta3-r1 (21 Mar 2014)
 
diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest
index 8a66f73cac20..03cae4b14065 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST krusader-2.4.0-beta3.tar.bz2 4305463 SHA256 ca43ddeef91e2821142b723d13c0be4bf0d138a9718cccd914cecb675cc97dae SHA512 a0288b0a5d37ade197120f6d96054b5eb9da9bae746969b041f6692a1377e6732a46cf3a672d2a24a5b1eb514ec74ba98695255af39057c4dabe1d935a6f720a WHIRLPOOL 08184cb69dd66ab6738bded5d2c7b470d2659110cb406a9779b61a0dbc28d41b334f86525e6d1a5570c82e751b9bfe3a135d0c35943837a814a3e6746464a4dd
-EBUILD krusader-2.4.0_beta3-r1.ebuild 930 SHA256 d40b4b88047393674c9b505b6e05b9ce03726cdca6e33eb531d7130ba3612911 SHA512 a9e75801a68c6363762120b8b22b0666b4d35e5341f2a3d93f06e39175b62cd7744785befb1500497365f475303d52da1b55ef453ce3ef55e17cb944009dabc6 WHIRLPOOL f19b8607ea581a7fa955e8eb9ebd397bb51b7afe980a1025216b1fd4bfc588e7fa8852535ecbcb7b9c4a7aa441031221578a78db57ed16a185cb21fc90df89d2
-EBUILD krusader-2.4.0_beta3.ebuild 925 SHA256 9a000fc8ba430daa0f9649cf6329a66cbaac09dde3da063deb7a371c35603226 SHA512 29cda30271c1e7b056b44f3e984ae2640a069b2f237a1e51f96998aa3f07b2faa268880ac05263e3c3d26a24584a6c960bc27300a9132f1ba9c54457605f4064 WHIRLPOOL f79ff3248fada21c8476bfb203d7ec1d8cec998423386734b0153e17321c7991e91d86091ab32b382bf45025f0f234b56b184879d8f973ac9a7c8986270cd2d9
-MISC ChangeLog 9926 SHA256 26f08e2b4283b29ce262fca6e1ce3ed66797e7b9bba321371c8611dac3a7542b SHA512 fbe0aded8742f2924f7b7107361b0e7787ce15c7199046d31f3026c410bd79a8f3b13ba96d429333f1c36c44dd0d2516f8ee091a9e4e70fa3d34ca3a915548af WHIRLPOOL 0af020a635c0f076074c9a34db33ffd752843973f6cee5dc197c68628eeecf9ac6533a43a40e4182fba86d8c16c7768435123556def8aaffe4c3bbc79bfa8809
+EBUILD krusader-2.4.0_beta3-r1.ebuild 928 SHA256 7b45fb619c5d9f339739194b29c1972249eca3a2dd0028f4ad8f9bece9f3bd92 SHA512 f77a90aac5e7f67379c9bdb17523d3a23080444dd84e0acf0ec7d02a5f3346c49a6ff1e62064b8269ed7fc9cc8054c84656ef004ab92ec2d17c499311d69d5b1 WHIRLPOOL dffd518a91ae33b2f332511416d5135983c1794adaf0fc3cdb4fbf720723467d6dd67f1aa9bba47e16f08cb7bd3dc6c7dbc71f04438f6afa7e28dab4d2f63084
+MISC ChangeLog 10071 SHA256 cdefabe4b0be1e1f461cd8ac94643f2865b0494befcbb24227c400d051d16557 SHA512 4588f2485f6b52ded800ca02052c6c8111fe96b07d08bc906b91acc3028a2b0fdeec4bb867c277208e91fbb547c3a4c15e903b5e29f2c8445f87076fb3b69e16 WHIRLPOOL 6925fa07014bcd0db1404ea0d8fed195d768006fe0cc9d603cb0e55c2793f7047d44f9f1f5ccd5374a82c0f6f6dc972a67420efc654f275ce53066aec46457ac
 MISC metadata.xml 240 SHA256 3940acd26451de238b92c9602337472a3343be5d392bf7c3e72abddbf8b7ecd5 SHA512 d026b15c9e065629d39d0d595856f6ab43bc6c6d1957ae3d76431026e83cb956acb09ff40b57e40474e839f6cf005bdcc331e0adf40b733a6aa6bec17a14148b WHIRLPOOL ff98af2213775171dee0634ff26b026a798b5900d44bc90e40b1a9c9990dcfb8bd979bc7195ab185269bccf4550abee8daeeb3de2f6bfb41ed2ca0355e9b6507
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLIdTAAoJEGVpnaTzz9K97WYQALsRnsSwcbZVk0owTRpwcp45
-48MkBQLAlx2Neg4cnhTtp0NBa9kNQpY+ray2ql4Mc2r2dYs40NC70+06d3VIGbk0
-byD9H3vYcxcLeyEt5mdrIHy+VtOULtdRqIRU92sREWgcEh2PIIDGGNGLVUv2Rqux
-9TZiZ4ck7Uzb96rRmQ3iWRZyArR9GQpceuxyCaWkVuKUmNi4wyU7HDD/Szk1JMSE
-pc+i1wwlUx3uLBUlywM/AtThn6GwZNFPFFJmFJ3/XjUX+k7sILvYpRU8kVNeJ0dy
-RHzx3vlNAxifpQPU8XL2uLrkLXWRgO7+D7hB9+id5coxLhT02Fd+sLATiHF4iqin
-DSi/ZBUG9TiPD2/srk+zneqPl/mY0DIg4r4t0AJfqGmiSZbDtDGMGWoRpqwvh7Bk
-f2tKjkBOUp6BOXvcXxsvMp8o0F1mBMeWCusczHLS8ZJbP8lxsd6MEe7C+2iEfMi2
-9H6WVOy9YEvOQoKxF2GR0td2Bunphn7Ms4xuPO/ObqMmTQTGSoM+guoKRbMXBCjD
-lFHpkZY7sraewDmKLU2l6cGRX32qq0cxLTEzbRvb4Ip3RLPwM0k+3cvj4fSJKY2i
-sHcBYHnvAo55grg1ndTXWOcwziUxe+d7+dBcpSiKUryRN5gjkPKtsIWBDZ83Jf4O
-viSXYXz2m3DcOae6Z4Ze
-=5yl2
+iQIcBAEBCAAGBQJTWSeBAAoJEGVpnaTzz9K9hWgP/0b/A+StmIy7HyWAD580BQ69
+Xgq1xHRsZmoPvucu4xQkHsg3A2NSpFOQeWvVrO3FEY1/0Uk0J1jGIQrZRYwwxOrq
+fw/vvnuExU9Yfjgn+cFrJ1DWmVlfSsNku58PyIdx3eFp3ZWPFO5N+US2O0CkI7EU
+o1dECO5xzK5RDluKgQZKOnMzuMy7hXmW1dyNJBwokvjlVz7cbw2R0sdRz8a7cKwX
+yo3hRXqsWAiQiRgaKStVjGJ8EwQ9elG9nlGnm79MZkSZQ3L8LcbFZD3pXnX4Cxmp
+Gdj7kxptsbNj7Vft7QmlOU4ySluk4n0fzext5yq5JL8rlaTThpVdP/a3z/Zh89MU
+XE0lRC8MuqLi6TxOuOb5me3EIyAH21nik79aLtGTWPIKBQvpwmoPTEEyo7YKdvBe
+4FaFMY6VWsL1Yq4DUeTGdiJZVd5USJyw8+6V8mnIAa3QzXI/4BTIsDmeyI1Gj5LK
+8Jksp6O0bkeD7CjzysXJ9AveSsZZQhHp6db9C/u20pi+TnNCAUay1y6XwVGXK8Hz
+2A13qw35PZT4unnvYGyBXph5m/LJc49CeuG7Z60FTnZutaOQ7Mzh3rAWg6OACePi
+U+N4+c4WdadQYRBIvn9uIbhBhmKNj1RflQ8kjslqOOa/5RjvkQptdGKRoHAs2w8N
+j/WDbzwGmDcc++Oby9ht
+=MSy7
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild b/kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild
index 267aa28ff382..ee92e8f3794f 100644
--- a/kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild
+++ b/kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild,v 1.1 2014/03/21 18:39:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild,v 1.2 2014/04/24 15:02:24 johu Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+bookmarks debug"
 
 RDEPEND="
diff --git a/kde-misc/krusader/krusader-2.4.0_beta3.ebuild b/kde-misc/krusader/krusader-2.4.0_beta3.ebuild
deleted file mode 100644
index 239adbdef5e7..000000000000
--- a/kde-misc/krusader/krusader-2.4.0_beta3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-2.4.0_beta3.ebuild,v 1.4 2013/01/11 13:04:03 ago Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga
-gl hr hu it ja ko lt mai nb nds nl pa pl pt pt_BR ro ru sk sl sr
-sr@ijekavian sr@ijekavianlatin sr@latin sv tr ug uk zh_CN zh_TW"
-inherit kde4-base
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="An advanced twin-panel (commander-style) file-manager for KDE with many extras."
-HOMEPAGE="http://www.krusader.org/"
-SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="4"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+bookmarks debug"
-
-RDEPEND="
-	$(add_kdebase_dep libkonq)
-	sys-libs/zlib
-	bookmarks? ( $(add_kdebase_dep keditbookmarks) )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/kde-misc/kvkbd/ChangeLog b/kde-misc/kvkbd/ChangeLog
index ab8d323c9612..814456dfc39b 100644
--- a/kde-misc/kvkbd/ChangeLog
+++ b/kde-misc/kvkbd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kvkbd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/ChangeLog,v 1.10 2014/03/21 18:41:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/ChangeLog,v 1.11 2014/04/24 15:05:37 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -kvkbd-0.6.ebuild,
+  kvkbd-0.6-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *kvkbd-0.6-r1 (21 Mar 2014)
 
diff --git a/kde-misc/kvkbd/Manifest b/kde-misc/kvkbd/Manifest
index 606ffda15c83..6f802cf6944e 100644
--- a/kde-misc/kvkbd/Manifest
+++ b/kde-misc/kvkbd/Manifest
@@ -3,24 +3,23 @@ Hash: SHA256
 
 AUX kvkbd-0.6-underlinking.patch 507 SHA256 8843cf49fc61f7ea547b2cdd6cf4e313b1c6dc61ac1a2b2185a2407ccc1114f8 SHA512 d88bfd0ab88a3c30d081a456c0d32b63708855391e87b0601b432c33e0a9cf9f9f336dbb1d0099f23b9d1d6b21ace35b8a49783e03d11dea3284e784281834e6 WHIRLPOOL f63d369267d4e1c1e1fe0e6ec3008671b71ee4d8d9e2d7320d70211686a274ef8fbee4eb24db59cd71baf3a9260e7efadc0d902700ff09c931c22bb6718a4822
 DIST 94374-kvkbd-0.6.tar.bz2 76990 SHA256 a4406db59ffcaa5858486adaa67873250c6074b45ce7c8151ac10464372c52fa
-EBUILD kvkbd-0.6-r1.ebuild 566 SHA256 c6b5d9a0fc73e376169dd2969a931693c203789f2391a4cf5f81962515f4fd4c SHA512 1bba4ffa8b6dca27c52899b030c50d4548fdd57d8a70cf3c52ab8a323bfd58b5193087fe82a508764563cfa5b4feaf88316f2c38963c6a8e48e5fb3f7d771d03 WHIRLPOOL f679e0e61ef6872c962728437f6098ad9f6ee0de5dc7649eb348eefeae1af71aca6120d95b1e8c87ea973537019bccb33ffc9ebeba0da87f28e2700d6e5f8703
-EBUILD kvkbd-0.6.ebuild 555 SHA256 adca0994376b71495574065384c2d959d2681cb37336d8466ad1861bea1e12c1 SHA512 5e3177cb43e4b052200bda7b2fbee10d039a922cf547b1a0a0c41846b4e567cbd617ee4a7f7267006086e731cacb62b3a139f11c671b90ff06a5a37cedc64880 WHIRLPOOL 25380acc62acd686bbd6c5fd08b7d6508cf520e580512352e57f66cca607811c7e40a954b46e897f4eac6d073697a48ec9134187a7372dee8c4cd183fa321ea8
-MISC ChangeLog 1428 SHA256 fd17939e5fbfdf1d34fd55e8a59fcd97c1c57de8db894449e7bf177f2e4c7d30 SHA512 626567b1c52495e2b863cc257940772978b5ae05a6864dd805e369a3ff5546c965ab235636dfd2d803379472a6bf373e128dc5e6247d95669be6d23c41f9e14d WHIRLPOOL f88a0ee402e9e0b5394ad99c8088fbb147cda5bfe06000d5878dd22cdd302e4fa7023569acabbaf4c0315c954e03b00e258580e9c522ce64029a2404d5117da4
+EBUILD kvkbd-0.6-r1.ebuild 564 SHA256 ccbbf8a5d0ab40e99f31f0e3842383762b03d41a579a2e808d8579ed3fa214ef SHA512 c98be707bb6d0156e9151ce8f2d5c13da56587b8f6670326b0cdce81536d0d7c8e16583b7c60597f9dff2c766f5945eecca2e4851891d7ef34cff630908b9a6b WHIRLPOOL d6d335a2731501f7ba6ad9e8b38e095dec3ce1f6c99c20c8edfc37b4f015d4a24e7ce68a24a7f49fb790779dc164d1d7aa1fc1b7f0d58dae12cf7f9f2078aac2
+MISC ChangeLog 1551 SHA256 a94ed59f8dae58add2c776a69d6dae65b825b63090de1d3ee36745df12023d59 SHA512 0b1d08da9bb5fe6531e1404fafc3ddedfee11793c3dc1e3c25413c35dc4e1671e576acb028bde2705c16975edab1dfd4eacc126f4f41532062a73b501a42b5d3 WHIRLPOOL 7baf0d78c41c35c3df458abba910c1e7dff8bf1811890c2e5111eb944a371ee7b230295e032aeae5fb7b51e7568954543df60b5d41a526750d70c20f1a7385ab
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLIf1AAoJEGVpnaTzz9K90q0QAK4+oo3FrOA/wJI0iScrBH8u
-d6T2uMWMIveQEbLC4KALI4v9sNyalbXo98ZaNqBmHmydf9JKHbIN8qjMNk/qBdcc
-0waZbwMjOPg0QuGpi/tU3lQlXyllMDXPswuiCJNgOu1UPQlNOij33aiH/3UoREas
-JqPYNy8FL+jfjQ+hASRKV2YrM37PwnLKTcr/2boVLFYlUNtOwxLKwDnwjzAc0mjD
-/80YIetjL56gmmfVM3sAAtDCYH/J8AzIgLWobvcAhsHZAGOMzIw09fyoHtULprMg
-PsU+CvUxpv+lGfXXu6YlgD6PBKYRMxCNVAvF0mc/cQQmeujp5D9x4OOlI+1tPHGJ
-U7rQ4JHIFDjq/CNLLQFKyykUlTp4bVwimPjHtBZ+D/3DkJ430A07pdNED5HpIijj
-eBcdqT53QFbGoXzUHrPrFFVV1lNtp28Ry63VvobJa8TQ4g/QPJpBiY0u7CgDpfwO
-+qs7oNpMTyaGvzSlk8vxXf1+7z9MMwZpdRnfvUFFrCKPgYdmP4+rkHyZiBD3jgzf
-6rB2Yg9ueBAuBpdxP5VkFPYKyPuta+ZFT7EzV0lQxtbQUJvwauCMALq9aCM3KxR7
-+B6uSGWuTL90tDZmuplPRzaIqaA+WqWo2gbEQU5sjCU3U+CRGJKCS6yIekPvqZKs
-ZLPgDX8PGUJkRiKMZLbr
-=cMDQ
+iQIcBAEBCAAGBQJTWShCAAoJEGVpnaTzz9K9z5oP/3XQj2/QsU4g/1CEQR6KY0xl
+zu1EL01HUoWL0j4Zjg7pMwPh+XDudQsqRkVxGdtjxuVk9Adf8d9sxYUrNQ/TvLTa
+QXJfuWZRgfY20H0R6QQbdMB3dX+RJ3Q6rcL8aJ5xBIUtWQOfSZUWDpyOFRF1YTiQ
+HleYB7K4TWvNvj/weEzQtSbDvyHh7SzPXsLz86/o+01NI+7AhLKJEWaPUYxeGYxM
+T/F+I3JfZwcGisF7XI30a+0Gi3f7nP2dQ5yL3dgSDlXYVtlrl99vNJF67ke8kCF4
+635DlQhsofGvInvJuZaR5tE+7JR7M9pk0seVTvw/00LLPzrmj6nTgInnsqBjBzC7
++W1kSk83MQaOo5Bb6MWlQUblFGJs+Qy/pjIVBHeGfEiaje0+xHDnC5+aPozmRTx2
+mf0SadLciy0QmwYXsd+ZGF5NIxYMK+adBczyYz01GLtssK+ZIJUwHI3kSm6CE7D3
+xGl93lg8qVvKFlGSlABdneYsL1gQa5A7T5gMLdldYG/EPl1T/ClJy61zbN+fa4Do
+s7ZjeuAM1d7UyS2prCM+Un3ClgLkwAXgAiYmpoQLSBDbOQTFGcyRAe3a30H2ZINL
+1iZa56xAJ6wqBHD8f9hboLosOHn7mIV+yUv/SMOMDFn+ksC2ijyIO97O7hd42gxf
+IkqeNP/ynHIBJvDlni/a
+=y/Nj
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kvkbd/kvkbd-0.6-r1.ebuild b/kde-misc/kvkbd/kvkbd-0.6-r1.ebuild
index 2cbbbaa37fc5..4d0e83cedbca 100644
--- a/kde-misc/kvkbd/kvkbd-0.6-r1.ebuild
+++ b/kde-misc/kvkbd/kvkbd-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/kvkbd-0.6-r1.ebuild,v 1.1 2014/03/21 18:41:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/kvkbd-0.6-r1.ebuild,v 1.2 2014/04/24 15:05:37 johu Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.kde-apps.org/CONTENT/content-files/${KDEAPPS_ID}-${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 PATCHES=(
diff --git a/kde-misc/kvkbd/kvkbd-0.6.ebuild b/kde-misc/kvkbd/kvkbd-0.6.ebuild
deleted file mode 100644
index 72f14a65c542..000000000000
--- a/kde-misc/kvkbd/kvkbd-0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/kvkbd-0.6.ebuild,v 1.6 2013/06/11 15:52:33 ago Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-KDEAPPS_ID="94374"
-
-DESCRIPTION="A virtual keyboard for KDE"
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=94374"
-SRC_URI="http://www.kde-apps.org/CONTENT/content-files/${KDEAPPS_ID}-${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-underlinking.patch"
-)
diff --git a/kde-misc/miniplayer/ChangeLog b/kde-misc/miniplayer/ChangeLog
index 3be130fd541f..c1a15f81ece6 100644
--- a/kde-misc/miniplayer/ChangeLog
+++ b/kde-misc/miniplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/miniplayer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/miniplayer/ChangeLog,v 1.12 2014/03/21 18:44:17 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/miniplayer/ChangeLog,v 1.13 2014/04/24 15:08:32 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -miniplayer-2.5.ebuild,
+  miniplayer-2.5-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *miniplayer-2.5-r1 (21 Mar 2014)
 
diff --git a/kde-misc/miniplayer/Manifest b/kde-misc/miniplayer/Manifest
index f860a92323db..a6976e56bd7d 100644
--- a/kde-misc/miniplayer/Manifest
+++ b/kde-misc/miniplayer/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST 95501-miniplayer-2.5.tar.bz2 49453 SHA256 84b19fcb6c01c03d857431e2f39eceed756d8e4026b0cc3860b2aaf31b4c1705 SHA512 b3678e32ec141479386f8185dcdbd88bb6b84f9e7fbe9277e0ec85f12d7802c932e0b8ac525abcb1817afa1c11a201372f154333ece90bcc9666d28755af8180 WHIRLPOOL 2b2f5db1f196877085306ae3eb39625dc24fca1c1b6350f243f0b66bd13e36033d0fbf30695eb8a6550006e20279d96ea1a279b0c776d1cc1f2591e7e7a14e94
-EBUILD miniplayer-2.5-r1.ebuild 815 SHA256 f0e02050b8934f3a91be085f172ec6f1dc6e8f03572cba428603cc3edcc09611 SHA512 a822d5cf72f63ca2bc10b0b4dab827da283a6b5edec01f89f4211bb4aa2e261a2bdaa3e118dde6d5f19ceda16b35721631a0e1dca60804f87f52abcaa26af25a WHIRLPOOL 5f69c1f31a0462d1df0072110a1fc79f2a688347f13c4567f6517bb83e7a094353cf42396b652000f091cf879ba41b0c90df096aef8cc751e2dc24f1546545a4
-EBUILD miniplayer-2.5.ebuild 810 SHA256 ad44b8b4a9820b1a244555cca42ee8bbf1f45e50abdcebffe243cbf85a7b53d6 SHA512 e9e194fd751bf070fb43b9cae3739a246a2855696c3b5d3af2d2f577e46eb6b90904c0c31ebf5ee2fc5604988ac6f92dd9a72f19af2f6afdefc2e15ef49aa8e2 WHIRLPOOL 2f66db13f18df99795b727943aa407afbcd8fbd203034a70f3f63cbe95b896079e7b575aff1a3770e0b76945655656d69dbdfaab0b14b75608520e225c1151d1
-MISC ChangeLog 1728 SHA256 8f92a07da6a30bd63947ed5a2ace3f4c4b00cbac2e96d15fd7350c4ed45f8029 SHA512 87b6b956bd3270a7c54135e19cd0064960130bf369c39156bec4a7aeb30cc20031e1a02e2d57a1dd9bf8dce17d62525f8e273e0514a3082188454656661636ad WHIRLPOOL 78a9d30eec8780b460a2cca578981b085e4a2ea38bb171cdbeb034375b512ea88d465fbde00dfb680bcca0577d94cf58a89ec3fb341b3f58df4f88406f62d70a
+EBUILD miniplayer-2.5-r1.ebuild 813 SHA256 e1b4122d82065dc7cbece6614f0c32ea76a3658932f11f59b13bd3d3b810a420 SHA512 2cf908f219707e2cf8de34e7207b6cffdd41f4a29ea0c64f0116edc62cfc0effaf97097cc4ce5965286e5e9a7b194a60816d0435d591daef2e3d3ef1100e8c06 WHIRLPOOL b44e4cee6a47099c0b6a36a3b39480a024dcfa1860b8a86ca257de1c46ca8b8530611da2c329b256973de7836f89fd2c2a1ce36e2aa52ded00a3de61c26af795
+MISC ChangeLog 1861 SHA256 055700214815140daf2ceb6ad4f90ce430c56b1f9ac4b88bc50390d6f6abed59 SHA512 5add8134599bb3b1e8b3508ff5f3ef8b929b2b4b87e34a920e0a0e410b058f60553bfadca51528113adf0f1cbd98ff886a8e0f436c077b95aea62c044e0a9865 WHIRLPOOL be756e4c103c8a9e6772147fec7a3c73c6258d12f62c872d2942bf3a22f06d8ea9278fd40c932f78170803208a97fea8492f5ae16ef9c23f6febf7c85b73dfb8
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLIiCAAoJEGVpnaTzz9K9FzIP+wYeHeipTEbvufOZwAvMtO5g
-qzQiuRgiNycbyvyTQY/IkaZ+aHX/rvR8shN9q1dd7lYNzoPBNl6YOgOVtXck12GK
-c+XwcZ/Cmar9bV55A63gAmjqukGtuy4QKMH/ZusQLcRQSrOH1ePDdvqPqnnxCKvt
-tqNPCGameC1KkR2+F0cON3CuYDTvwkNyZVNiHSgjiccLxV7CB+xUr8BGzaoL7MfF
-IxlVQdvIQ7ambxxn3H0pJWhIgfFRDEYPPuMlzZFy32m6mvWwlOi7277pjsXb0HQh
-PlMYAlPlcGmn5kPGmoQJIySKns7MJo5ormkNiuqGzFsutKm6/bjGR3sx7yVkW0lN
-FJXTJYq405h89c2jB07i9veevAv7BqSzyxN1zJGMlXQG/Q7SqfWZJAQ/em4P6eUY
-Qwpngj+vjKZn7O4S/ZkhdvNd0LxmNFzlVeUTdj2iB1M0JvxeiHKbAk8yOV7yq8TE
-SIv+s3ChMZ45mU9m89Ps624J9xE6JItQx38U5tPMmWFVUr9NK0gURhdFPqIGJuCF
-cON2TkodoBpORoq7cuMKOsMMJ29hmHfzspjkPZBStv1iln0PULMK6O2mXZwZseRF
-HYtVY0ti0kG9hcZM+j79A49yrnehGZmxt33tO0yMOT8bGx6FzWIQFlpLwdZAflBr
-JVC1tsUNKHjX5WqMGczM
-=y4Zm
+iQIcBAEBCAAGBQJTWSjyAAoJEGVpnaTzz9K9qGgQAKY48qQUv9k8N2Fwwu/epXOr
+89hIwKO7VUUX6GTMlRx+1ebieevqou1t0p5jdXGf4VlsUGT9mBue35gEf159bVxe
+O1JGQetFBcuimqlp43U/gu+1RKcdgQqTaUPGyreKzjIKObjMxD6ShFRvXJV0elQB
++UP9+G/oLRc4jwsOu8qH+dTYYT/Cqpg6VBz46Qbk/YPF4J/6j65NDZxOkkAjoHLB
+qpy/CJI+JxXQD9UXaabffRHjaNQU58EB5DEuyzr3GGx9au0A1EZh9yguZjmmNi9b
+HC+Fms/PBUGJi5BQIA5EK6Ajb/NeeQPLdGr60KDoaClAcZE/2PvC75xMKe/+5cNP
+9amL0VM0k1oQGBnO1wyfZ99rNVYmkF6ydPVoHt0Uq1eMBkg9rkEell0tuYOxyy40
+kFVhsbwL1HA5xMAj/ChBvyyLlQPDKc1oqPeXvsN+PicpRV5/7wBkisQh4TDdzkRS
+5D3RLAIhxOIZ3Yn+h0iuhFcdeUvMUFv9UfPuZb4ocVQKXHDircwtKs3fZVN3vItp
+i6WIGG6UADYCq8WQCyXFiTvv2VbRbbu7IJ3GYFKQzdOJUJG7etodwnQst2Cv9VCI
+8b7EQp4l8ym95V5/Ddxgu3CFuSyVqHxfuSTnzdS8shaA24cxYbz/fdOHXePau6RQ
+duk1PpWyQtGjz4+dzl2E
+=Lp9p
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild b/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild
index 3624e4d7d796..69f14afbac9c 100644
--- a/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild
+++ b/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild,v 1.1 2014/03/21 18:44:17 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild,v 1.2 2014/04/24 15:08:32 johu Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://kde-look.org/content/show.php?content=95501"
 SRC_URI="http://kde-look.org/CONTENT/content-files/95501-${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="4"
 IUSE="debug"
 
diff --git a/kde-misc/miniplayer/miniplayer-2.5.ebuild b/kde-misc/miniplayer/miniplayer-2.5.ebuild
deleted file mode 100644
index 14310d136c57..000000000000
--- a/kde-misc/miniplayer/miniplayer-2.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/miniplayer/miniplayer-2.5.ebuild,v 1.3 2012/11/14 20:13:48 johu Exp $
-
-EAPI=4
-
-KDE_LINGUAS_DIR="applet/locale"
-KDE_LINGUAS="de et pl pt ru sv uk"
-inherit kde4-base
-
-DESCRIPTION="Multimedia player plasmoid"
-HOMEPAGE="http://kde-look.org/content/show.php?content=95501"
-SRC_URI="http://kde-look.org/CONTENT/content-files/95501-${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	media-libs/phonon
-"
-RDEPEND="
-	${DEPEND}
-	$(add_kdebase_dep plasma-workspace)
-"
-
-src_prepare() {
-	local lang
-	for lang in ${KDE_LINGUAS} ; do
-		if ! use linguas_${lang} ; then
-			rm ${KDE_LINGUAS_DIR}/${lang}.mo
-		fi
-	done
-
-	kde4-base_src_prepare
-}
diff --git a/kde-misc/nightmode/ChangeLog b/kde-misc/nightmode/ChangeLog
index b845eb63ee3b..2a2dabbf6880 100644
--- a/kde-misc/nightmode/ChangeLog
+++ b/kde-misc/nightmode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/nightmode
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/nightmode/ChangeLog,v 1.8 2014/03/21 18:45:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/nightmode/ChangeLog,v 1.9 2014/04/24 15:13:55 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -nightmode-0.3.ebuild,
+  nightmode-0.3-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *nightmode-0.3-r1 (21 Mar 2014)
 
diff --git a/kde-misc/nightmode/Manifest b/kde-misc/nightmode/Manifest
index 4e3322b27925..e14967f0cb87 100644
--- a/kde-misc/nightmode/Manifest
+++ b/kde-misc/nightmode/Manifest
@@ -3,24 +3,23 @@ Hash: SHA256
 
 AUX nightmode-0.3-kde-4.10.patch 472 SHA256 17c3bc4bfef8845c658cad1c82bc71b944b1abd63173f57ce8e99215695cd6c9 SHA512 5f8d32c27c8c04778cf24d825c46f4eb7d11b5579320ebb3db165593ba9d5a94bffa751ab524cff4fb4691d55c78af638f0679fea61b5449e46eae742423d322 WHIRLPOOL ee1844c2e49a1c9a2c399143f227260cd5c430be8c6bbd85623bc1765b21677bcc57569aaa6c7392ebc58948676b8c7a4ca63aa6ed3a3552196d3c5af6d1b953
 DIST nightmode_0.3.tar.gz 15190 SHA256 5aea1373041cde344b573794f95a70e2bcb7380e00d1919b6474add2e18d32eb SHA512 61b9673c81a4a4413860366def9d36277e01513f8706699aae2dca6b9219e3f31cc47c071994750dd9d7e16152438a21e59c3d5d0b029f94baa7e09d7d8da21f WHIRLPOOL 82487201e4c601701211b1906a29eb22867c9369b5833f564321a2cc0724a66db09d9930c8a1dcdb72fc398d5edbd5a4ededc914e85358f5eb2b063045e5f28b
-EBUILD nightmode-0.3-r1.ebuild 644 SHA256 209569b443cf881911041c3fe414920c6e7de775d22d0179d8e4192f1abb36a3 SHA512 ac195fda6e5c5879efeb66c869b1aadf16f7450858d08a85b4df346f499182ba2865379daaf4b341f5f248471b41197f33ef6f5627913c0ea1852545e5d646a5 WHIRLPOOL 9bc58c3d48b3c79cc8bd13a60dcab126fa05b188e89e1f074eda6773f7d59217b5e87dcc6c0f9482e8f3b7d285a50ab0aae4fe18813e8b5776979c3ec3bd16ad
-EBUILD nightmode-0.3.ebuild 640 SHA256 54a3a47380d60cbcc048b601fa5401be3d94d009cb32a9fa603678b279fc51d1 SHA512 aebec664d747b7a9ee65d1f6752001d2a12bce45c7ee35003b143dbde4f42363fef979ee05f0ff37ab5d4136d621f8f568d61ab6bcbcb11c5872e167d309f9ad WHIRLPOOL 7dfa0d87aae66a732b5bf048cd612122b161c0f4d4773ec3dd37a8e31b9dd312e5710701ec23c04a432af5ae1977e0a4b8a71633536cba2eb1e855e3eefecc81
-MISC ChangeLog 1306 SHA256 6e32f0d14155135880a62fa423629301216f3a568e5c073178b10f4f317574c5 SHA512 a4cd46d6f4d8afc77194c5a5596fb6a91fdd2bced7bc3a69862dade752a87b78636a66d3241828b067a46868530d5c6bdf580fe382d0df317aad703df28dcc23 WHIRLPOOL 0f3c929250b80cf2730e01f0c091883bf742e8e78405a944010537160b13fc0254ab5bc09c3b9f93257d4841410b8b47a782771045619a4d249ee40768354699
+EBUILD nightmode-0.3-r1.ebuild 642 SHA256 354cef585550d54ae26a5dd70f5345e51d567e7c0b89372094db29be8983bd2f SHA512 7c3a8f60bb45a399bf461de8ec8f96dabe2e7cdf2f3147a6f928b661471e45b7dabbcdf8bd461cce2cba3b468b237e955e56fbf3a29be49f114ae6303a594eb7 WHIRLPOOL f6f8ae8643f9a1a5e7b01a08a3281805adbaa5e94203082bb82c57c53ccfd0f2b4180301081479926cc56d120749dadbd0e5897df2bae6dbb6a7f226c417b96e
+MISC ChangeLog 1437 SHA256 b569ae3a80cd9a7290b0ece6cf6d5730dcd0cee0d4e4cd8ead3c71eaede71e30 SHA512 0a95d81389c16fc78e917a5c4a6b0aaedbd0a26845ce7f228dd06d066d52945fee2e3ab2d287dc2983c065baabfd7829b0cc4c2d9a9901a091132ff6c844e6aa WHIRLPOOL 9e7e032d71c6791835fd4f31b17c8202d79306154f9be2170a9eee6e09e24256aeb7e184ce56e7b1f883778f1e80799795ef78725fa0e743288fc3b4e526c706
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLIjTAAoJEGVpnaTzz9K9+fgP/3HVPV3ilEG4ohEXY/o6tywO
-E/qggVtE9jqmNvLC90IdjaVZnAx6RhVzkKcEgrGbPFdyYCJsOv8DR/lAOyzh80lO
-S5rPeMAr1vTDJfzq0EvwZrIRGGHq5QAmhBVO4lQ3R9Jh9dHiRGwId5NjGnmAylNA
-/wqNRJ4VUgQXdApmdMYSXidZp5qp4SPdw+1Y6LcEAN06RfsmTEmyZY6Pt5b4QZgn
-h1cxO9PfHKPXERRktFM+uvLrjuZ+kZ8WousypbI1NnTT/52KAU/WTnISbzRLEQUk
-UZqalE00c0kwcotqoxkBug0R98FAKyLY48G6Eh/3SzdV4R0JOj6gyEo10uMcsKxZ
-2IKQkEddZigtYTizi2+Oyfd5fU62xsPt8jFPMHXr0c3tDGTcusLvDwB6Rm2Q6De7
-KafQmkl18fRFpHMRk0dvaiGMgfDBae/9AX6+8YJwva6GFLWtC++B++9m6JojdVwX
-zdAyiJt2aJn7JL2Rl/LdDmvS8eQ9N1BZqNeuEe4Gn5B40jK31wZbagaleESUvNdE
-H9MYQzTiBfjuflEvJM3CxISRBRTn1J6IYdR+xu+i0Cc6aOb22I5ZTe+8U+eOUSY5
-T59YN/lFtyIP1WBF3HBaELGyb+z1MQDgylIohIaj1OxdhYfH68FqNyj2WoVdzia4
-UyJ+coo7mpZifW673JF5
-=2ic/
+iQIcBAEBCAAGBQJTWSo0AAoJEGVpnaTzz9K9y+8P/3QIGKBpSzceyotoYjwqBEYe
+GT3/MlmfXRJsWoaiIpj3f8IF/Jh+Po/GxIFFhbISraK3X9MjHvAiavc47fnWXwHa
+iaVvXoJegzZ4U5paxpSG1V71NzXKBOSNXdLbxfTQfhDhJwkazpiSIgUuN2vqab8F
+Zhsc7CzinUqupHj8x5DyUaLrijP6Y5WeYy09NF+lkAARrTiBZKg+7SKasyl1oDTz
+1cYOcUGENBVmPhMbHA2KiyjaN2ZgUHXV4ZWcuyfTGwx+B+7oGgjOoW8AqZGyaDEL
+vrZ6by0kVZDZnFkc+kbbJtHTt7W9G9hgmNnqEXHBBTOFSwEN2f8TMF1HWrj8ZyGn
+dXbtMFeZq8FuM3E+zWwjtE3n6aQUHgUk0BKGk9SZaf6Omdo0Ubh7WghXk14fP2d3
+3KGepW3C+GfRWqvcNmeM+1xhCx4jtd1VrdBscLKqX3VKwdceJ136s1IK0LjZEoSQ
+pwJda2amFZL4+OMUpw28L3UXbNL4rsBAY06nNB8616HLpAQln4B0XDFjaO1L416x
+FXBf1hcptfPe+Z0QjDXroPOi6xKZzkDXNxlwd9jxA7FJVIOi360WkYbY/PII2303
+WkxC0gRVJRvlLekqEGHrPz754ZsAopjNwqxZUllm1xt+FgN8U+z4IVKfxD+qDxe9
+WJvEcmE0XEZYeRp6GjRR
+=QWnh
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/nightmode/nightmode-0.3-r1.ebuild b/kde-misc/nightmode/nightmode-0.3-r1.ebuild
index e8138b24599c..b03e9768d225 100644
--- a/kde-misc/nightmode/nightmode-0.3-r1.ebuild
+++ b/kde-misc/nightmode/nightmode-0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/nightmode/nightmode-0.3-r1.ebuild,v 1.1 2014/03/21 18:45:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/nightmode/nightmode-0.3-r1.ebuild,v 1.2 2014/04/24 15:13:55 johu Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://static.davidedmundson.co.uk/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep kwin)"
diff --git a/kde-misc/nightmode/nightmode-0.3.ebuild b/kde-misc/nightmode/nightmode-0.3.ebuild
deleted file mode 100644
index b0e01c6ba644..000000000000
--- a/kde-misc/nightmode/nightmode-0.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/nightmode/nightmode-0.3.ebuild,v 1.4 2013/09/08 13:45:42 kensington Exp $
-
-EAPI=4
-
-KDE_MINIMAL="4.8"
-inherit kde4-base
-
-DESCRIPTION="kwin plugin that makes the entire screen darker"
-HOMEPAGE="http://kde-apps.org/content/show.php/Nightmode?content=123805"
-SRC_URI="http://static.davidedmundson.co.uk/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="$(add_kdebase_dep kwin)"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-PATCHES=( "${FILESDIR}/${P}-kde-4.10.patch" )
diff --git a/kde-misc/plasma-applet-daisy/ChangeLog b/kde-misc/plasma-applet-daisy/ChangeLog
index 8dd95cbb3a6d..a858b7645f98 100644
--- a/kde-misc/plasma-applet-daisy/ChangeLog
+++ b/kde-misc/plasma-applet-daisy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/plasma-applet-daisy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/ChangeLog,v 1.11 2014/03/21 18:48:40 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/ChangeLog,v 1.12 2014/04/24 15:19:23 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org>
+  -plasma-applet-daisy-0.0.4.26.ebuild, plasma-applet-daisy-0.0.4.26-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *plasma-applet-daisy-0.0.4.26-r1 (21 Mar 2014)
 
diff --git a/kde-misc/plasma-applet-daisy/Manifest b/kde-misc/plasma-applet-daisy/Manifest
index 72d46ca35dc4..ed8701294991 100644
--- a/kde-misc/plasma-applet-daisy/Manifest
+++ b/kde-misc/plasma-applet-daisy/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST plasma-applet-daisy-0.0.4.26.tar.gz 261536 SHA256 fcac965ab6bf7d2639efae5fc0e9de2e9cff5028d6d0240c88e6cd3d3b98daed SHA512 e7392baf0dd9bc47a10f2c9d272cfeed2663aa9db608d7e8f4a018a8bf4d028666b3db0a8e89e73f6384e961f06c408a436d6b0121cb1599da6830ec02b5bac9 WHIRLPOOL fbc8fba56442c2321a1ffb9a54d4c1271beccefc13874e2a6d1a9072243eb733cf749707c171824025c80f6627b42b99169082e08b12850f71c001f3763b1f59
-EBUILD plasma-applet-daisy-0.0.4.26-r1.ebuild 643 SHA256 fa2ed1c94928ba654426863a9466cbf9ac26160af87ccc37f378b2183455670e SHA512 d47105dde5bf690e1442ad362ac10b8a6afee51f15d8ad3a607944dedbfca1db8537cb45ea5cdd69dbd051d38855263a0271511bfd617260efa03f66d5cca3f8 WHIRLPOOL 793a9d4e1abad0fcc7a8da90555a4ffac04fec04c8c7297bc47929b4b3de88857e194afe984cc1a1e16f5fae5ca4a80c31b1c70236307329321b218d2b34fc9b
-EBUILD plasma-applet-daisy-0.0.4.26.ebuild 637 SHA256 e148e38d18e318003772888e09738056c1048de535be0644adb75c75e070b1ea SHA512 0c78720eda49816baf4bd11bcf02aed5112fecf8a2af5358e2feb11832b7424a70f9ae65a4a0452541c09dd5083b76603b3e2584baab9603c642095bf395c08d WHIRLPOOL 058f585bab14cb2cfc134d0b92012729ada5245ced74dfd5258e3cdbf9c2702b09c13c459af0be587ac5e81257bf16f56117968cd290776e2a2f6c208c1acded
-MISC ChangeLog 2364 SHA256 ecfbe9c51d2d8533cde559b9e2821412efde6aa424edbce0770073cb00dd1197 SHA512 adf61374092957905fa5b69d31cc496996944ba29ff498eb8a8d01714e7f8e8d297b3dfc28096c7db1bb8ed0ac4fd131ba92d6db30e86c1db582cf61d7022449 WHIRLPOOL 1608d54cd19d2e8d81b620579bf1822d095dccec05c086183a305bb615ada73c11c83c89db3d2ae6d8dd10e747a94061e96d29e93675c7acca3d771bb01a3fb5
+EBUILD plasma-applet-daisy-0.0.4.26-r1.ebuild 641 SHA256 6bf2500a4e21b5b1be1fa0ed7298abd43a63238ef317fe8cc3b123d6dd4ba8e2 SHA512 5a09776c7f41aeccb90d49af4c836227235984f8ec534a2382c162d5ab152e60450e7d67312077189ed45f1368be05ca36e735a8886fbe514ee3cea1d5720910 WHIRLPOOL 4240c6d8640aa64e5c2c4e5b2503826113627aae5b7afa78cb3e8582ba3d388118677b390b6229bc4cd914642fcc94f19a1ea5860e0166082762bccf5fa06b9f
+MISC ChangeLog 2525 SHA256 de7621d99ffa80941244e59cbf429caec062164656b54540f8b27e9de09758e5 SHA512 9b6b8b26cfa6e5d6fb01f40f43fd82d8cbe1e463bf3d6e1e1c44c4bda6e7541e19de968b0ff45bece62d77f25283c16e26e0f18b0c2a0b1093f63a475aa0b54d WHIRLPOOL a025693ead7c583f8af7a6f2e7d85269ebe6af32194fa838f86e5b3ca7e9794467ef7f7f9e2d298fe1cd0746245b3ca21bca50ee0ccd4cdf0754ab7c92a38c8c
 MISC metadata.xml 158 SHA256 b1f2af69cc9a002750dfc0abd0f1dc63431290bebbabd4a17169dd3d4dbe89a2 SHA512 4210fc46453c5cae68335853dddf2bb18eaed5d151e0a5a860fc962a7657bc0a0555cf10dcff1ca7776ad40cc2112e098f1a1976629b831ad4acff6ab530d028 WHIRLPOOL b0760df8063b3b6c908f89997a605278b91ba53f9bea95c0a3f307783af8693aa8ee824b59380044b3cf3f51b5f6afc25a0f0b210d958ceef9763b6c81ec63c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLImJAAoJEGVpnaTzz9K9H9oP/0WxLBmKWHfa6TbHIhj9qnK8
-VE+d6oMrVLTYRcVO85cMZjaJpdIEtlhxB5sp9dSc969rL76cbKvbtz86tyGrNBwo
-YDVX0zMNQmqDUToUnRDw+OwHR/Fb0fnUU34MHcHjIg3AB8IzBW4zFKPTBbROQJzA
-2sU0s7YyHXsRwFpUF1w+jGQVYyrgehoGSTSFQjA4q2UUsGqnfRlTXbYNMUIIW2UN
-a2tqTT/v1d9AV0eRcs/Mfa+oslDrFIih5bFv8fClMsoveIqerdKK7BMzrb+uBCDW
-KiLH8ATM/ibz1NbR7uXR1gJQYqtYO/HTZKR/bUMaFsZB00X9lzy5ZABi9/eY4lzi
-W01Oi5smp62tPJwnDaaU/eTV7V9dWWbuD68kvbOFsjCeXUWcE0fAbLY2aHZBytZE
-9sm66+W57VOXsrQ7/ZtaeJ36us88OQgv9L5KkJ+xNFUhser73bNQNQ3LUf39gkyS
-LGOiiX4sFJ+ijFM+2FRgY0WzeWWB1x4f7lGIIV6V2v+gl9wU6EcKBTBduAJ5Vffh
-LyemhcNhN3qAufVYBwKoJ52KuQQwrvf5KzTSI+mdFeo5Zxly42oO8udCE4mQO7tv
-bTFjINlmuXwprdYqe6x/vG/BRRwWBrMo9Ej60FP62J1ZT1KUnL0K9wtFSxW8wEMX
-QMkgzjywiAt/ezG9pool
-=F3s6
+iQIcBAEBCAAGBQJTWSt8AAoJEGVpnaTzz9K9wgoP/jO8wTvSTl08f68gjLGpjOG0
+ZZMqHVvbf3md2YkfZ4O2EVpSIkz7miX8SdzTtjT0yaqAyuXJ1rSjYpI8vnYiPgWc
+PhBc8sxPvPetgD3dr5bbmTCY7PoKT3JA/U4H08i01DbROENlaxtRgnrawqodYI4P
+5TlK/A5qQBDRkIG0p7d5w9HGLFBWFoKtkTndnOV6V4viaQTudr05mN6L4BPn+MLH
+eNT7oBfOiuudroPmJ0GNyCz3i8zicaVNJlPGaydy0kqNE9mu7Qp9u0Rivxuq4rqv
+2Cm/kgP9ouwzcA5hSQ5kNZwXCr0CVWHr9O2vRDvmXJaC4HvX730/bBhttWnIaTIr
+oyLqC2QMN0LnRI6m/1hilSi2gzL7CIyRXBAz+RbTUwPn7k8sBm/ACukFUJdmlUCZ
+47EfFVLjYykrjamE8hJW8L2VkE16OGKWWPLq+6Fwv8ZU2cc8qtyAuyh+7gRixSeF
+I3lUJtNLfz1K1+oN0r3EXH5cF/tMpX16nUIhhRoPuJRhPC+P01KSC3uoUCTCP8SH
+lqPK1PztG2fkrXLaizq7SynAhvgzBvrDJ8wsjZ539LpQ6asAiyjRKadcvNh5cVJl
+dL/RFgYyXTp7S/5RxziOaldbf7HN8jSeVJfeopFegIj77awhHVrX+c3hA2q9oRQZ
+u4uHP3kOCmJtkjIi9mbC
+=CS9p
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26-r1.ebuild b/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26-r1.ebuild
index 2a9a34665f40..c02e961e54a7 100644
--- a/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26-r1.ebuild
+++ b/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26-r1.ebuild,v 1.1 2014/03/21 18:48:40 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26-r1.ebuild,v 1.2 2014/04/24 15:19:23 johu Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://cdlszm.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libtaskmanager)"
diff --git a/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26.ebuild b/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26.ebuild
deleted file mode 100644
index e2afb7abf11a..000000000000
--- a/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26.ebuild,v 1.3 2012/11/23 19:38:53 ago Exp $
-
-EAPI=4
-
-KDE_MINIMAL="4.8"
-KDE_LINGUAS_DIR="applet/po"
-KDE_LINGUAS="bs de el fr hu it pl pt ru sr tr"
-inherit kde4-base
-
-DESCRIPTION="Simple application launcher for KDE 4's plasma desktop"
-HOMEPAGE="http://cdlszm.org/"
-SRC_URI="http://cdlszm.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="$(add_kdebase_dep libtaskmanager)"
-RDEPEND="${DEPEND}"
diff --git a/kde-misc/rsibreak/ChangeLog b/kde-misc/rsibreak/ChangeLog
index 028db7475391..02c54231ad26 100644
--- a/kde-misc/rsibreak/ChangeLog
+++ b/kde-misc/rsibreak/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/rsibreak
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/rsibreak/ChangeLog,v 1.42 2014/03/21 19:04:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/rsibreak/ChangeLog,v 1.43 2014/04/24 15:29:07 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -rsibreak-0.11.ebuild,
+  rsibreak-0.11-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *rsibreak-0.11-r1 (21 Mar 2014)
 
diff --git a/kde-misc/rsibreak/Manifest b/kde-misc/rsibreak/Manifest
index 1cd70f0ff2f6..e632c5eb7f9c 100644
--- a/kde-misc/rsibreak/Manifest
+++ b/kde-misc/rsibreak/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST rsibreak-0.11.tar.bz2 463748 SHA256 bc224812c4554209a9cbba830078cee727ed1a5a3c8cb2109cbac78af2382efb SHA512 50e15f45b93c79e4b7785a25dc41c60e40d52a0a777fbb01b57acacfb3c623b6d84cb11c75482c3ab75621644130e508618aaf354b2c526d6a4feda1aa80f2ff WHIRLPOOL 6a8ec8a047e31fdbec73712c2d4e457d447523246c0cecc313468a666ade52a81feb6515adcef93e6e30410df55e30b41a57b85c5b4eedd4bd122815ed1b3af1
-EBUILD rsibreak-0.11-r1.ebuild 762 SHA256 d3828eff7fdc4f513e540f71a44313efdc3a03ef424a386323402b428cf6dc2a SHA512 c9588269128185aad8e2184191c6d8b662d297391dfaccf657e11460dc7017845cc0e6f2c8aece9cfe862309a293dda2e9494514fd25eb042c578a7e1723a88a WHIRLPOOL d6967356a03c172bfc2b7721561e385fba5d128b8c2d68fb553b31016af48898df6da116b111dfd4d6d20ceb65db800e880e122a98514ad48a1176becbc2fc30
-EBUILD rsibreak-0.11.ebuild 765 SHA256 7402e1b7883872b2a7c73b70ae9085afbe3ed73c5652d19f487d1420dfe268bd SHA512 0a58f77b707e320b972574526897ef8d66d91bf8af847b26fe4506e18f469b653ce1e2ba23239cb58f491b6d5ed70bea574e11f1f38f547625f8831352c6a3de WHIRLPOOL 07989ab2a6eb5aa645535b36f3b34443562685ac269c8ee5b97c2cea35f35dd4ee2b42fcc455ffd2b8cc57f7f1c3f0320f9597205a0cc361159dc8d254bcbfbd
-MISC ChangeLog 5849 SHA256 e73c57ee2b0650e35f41ef0982dd680a60b1ba7527452038fbc4e2f216d79fe7 SHA512 485136b2576dce21c4486574a7f34743199c382a497196cea0357e368a67f32466bd712a578f0fe2e2a99ac62888e3b0ec39345d9ad6736adaa1a978e15250b1 WHIRLPOOL cd71bf7a4fcfa450754cf9de4ca40384c3027607ef77d98e8511b7d737e8cf6b35d81a196000e6f90bddc99e8978d624887f40511707a4ad89cd1b30601ae81b
+EBUILD rsibreak-0.11-r1.ebuild 760 SHA256 0f7212680cb9905844dffc4a2bc31174625fb2f93ff2d810c58f5c6d150c1ddc SHA512 df9433bd04f4ba12834458295ee978a253f672643afed9ff5042c9aa44dfc73d07c348c1f622afe214451ec9e599d1a8669096a2a85beee07ca18dd10df79061 WHIRLPOOL 79de62ef64abaa78be25f2838a755c3cafe05a2804b96cb3e96e3ff2c129197203a54ddcf69d2d20bda43f3ca5276c1e445b7d89c3ea95dd1070ca7fa2286550
+MISC ChangeLog 5980 SHA256 1d4fbcb3c006a00b681209b5d4ef4d1920908c117667bb16832850443796715c SHA512 cdfbde75092e63934edad0ff0fd797adc0ad87ba57fdfb7acc25626557cc8c21da57136d4a8e59970324e501fc8a6a6969238ad0a926bf6ce20930576659a7b6 WHIRLPOOL 045017c8f0e7f1c64d6d018c2b00fba0d11cda5c4ee1f17ddc2f28614b61ed981b7ea1d6ca9c08a59d5d8d92c109ba7ab84afe5880526e5696d0a8020cb6bdab
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLI04AAoJEGVpnaTzz9K9uB8P/jQzXXb1pQOdNbz5xZ6nzekY
-CA/METPGC0qCesTUz9jL1m70YfuML62wGWAOWYJsN24P4iQjMQgYPnUF9Ffy1SWg
-yGsHNlnX/XgzGQ2geXZ3v0PeeoaCLpKto62d1gkI8eJN+0Z7CGx5cuX7iDof+yJN
-8d7bpX/VidYnJHCjVnU7aPyZIeFB2nEJodAxHQyaQjWa/iTxf3z55IKmbJ8CpBdQ
-Pv9uWmpxFT5nWwZoMMuHWEC12cZ2IV7GjypHoBEo3m/BJHgb/nWmDGBmTvmmLy10
-/L92zltWVCFEKlluc8Kg4+lUWXuio7v/K76Pgzsp/ZPPW9ku1DnZnHHPg6W1deS5
-pl4VtAxkJaqiY8gejRavT6AfNp1WZ835/uQ/eblhgW2eHSbT2lRk3cHEGR55NDC/
-XZzwPD342ia0fRBMGWHpuIcZ4eJoCQr9xT4FpdlGG5Na8UeGkRuztat2bUqUBprk
-82Cd5nXyWkkVVmMi6h7Cjm0QeudXkmMBbNAniE5JFEblUNpfApbV19VDAkluYG6X
-PwF0lmWC6LNFCb2eWlCWkI0fazt4dY6VXYVmJSFEBTBIO5//dQR3rWP4gRyv3D5a
-cUID9eMbbOp8BsGmiA3r1d2mua+fRUXN7jAeG8u3K+Hc4uDkh+RccZAkMHyTPHOh
-oAh3y+BRj7S7/S0Q2Dwp
-=WNx3
+iQIcBAEBCAAGBQJTWS3EAAoJEGVpnaTzz9K9ea8P/36ii+ffylcdWLNtwDZY6JNU
+6qGmLxUHRrG0FQ3qEs+C/oqV3I4Y7xekdZxgT/lsn+pm/umMA3r4c9OhwoxS54Ss
+07VI6Wjm6Z41xj2i7QUXij2B1Li6DW5DUXFLuAzikxCMpHDgaXFtwelJjnMMclmo
+6mNnzkbrk/bKk1hlBUBm6Gk7jd/J/vHywrDdGwFmqmVnJGuDeU0eIgj4s9srFBKh
+qH8VQzB3BhSybnN7hyXLPGyAruCM1PRMyFZnT7Rky6E1lJUxPOmTAUv9EQZhG1xs
+XgCCtbzPp1XnkY17K2ueBmPZG2Chrb8vA0Yy3CoZqCShFbsuZ9MIxHTNdAeeC69+
+BM1fZUpecqsNtfl1FAwe8LGwwUCk/JHntEW7162f12KtEIxF59OrlXDGudOPw/qd
+K35gTfqlQEvJElNITZYUbJ/xfvXxtWwLOGkGuf++13cRgix8EsHU1rlWTQfY/yN9
++VDTd9hmSfPfGbcZpyQr5pcBWKLSStsx26+PctqDme7iDwK0Xw7S254Cuu/ry942
+SKfqDLHFAoVw5TLgs2I4avpfLKV1F9FauSr5LA/l3yH4RylgDFYTh/tnm42IgG/O
+kcV4tjxEe4FXpVW+8yx6lSAvADGnvfw1uiACYQTC0hAeVGL9mFqpJDJvtdBgenxq
+0Hsq0hUwaAmIe2sBWJoY
+=0KKs
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/rsibreak/rsibreak-0.11-r1.ebuild b/kde-misc/rsibreak/rsibreak-0.11-r1.ebuild
index 8143f7ea0f5c..069e4de4bfcc 100644
--- a/kde-misc/rsibreak/rsibreak-0.11-r1.ebuild
+++ b/kde-misc/rsibreak/rsibreak-0.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/rsibreak/rsibreak-0.11-r1.ebuild,v 1.1 2014/03/21 19:04:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/rsibreak/rsibreak-0.11-r1.ebuild,v 1.2 2014/04/24 15:29:07 johu Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-misc/rsibreak/rsibreak-0.11.ebuild b/kde-misc/rsibreak/rsibreak-0.11.ebuild
deleted file mode 100644
index fd3bc83aa3fc..000000000000
--- a/kde-misc/rsibreak/rsibreak-0.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/rsibreak/rsibreak-0.11.ebuild,v 1.5 2012/11/15 15:21:59 kensington Exp $
-
-EAPI=4
-KDE_LINGUAS="ar be ca cs da de el en_GB es et fr ga gl hi hne is it ja km ko lt
-ml nb nds nl nn oc pl pt pt_BR ro ru se sk sv tr uk zh_CN zh_TW"
-KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
-KDE_HANDBOOK="optional"
-
-inherit kde4-base
-
-DESCRIPTION="A small utility which bothers you at certain intervals"
-HOMEPAGE="http://userbase.kde.org/RSIBreak"
-SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-misc/steamcompanion/ChangeLog b/kde-misc/steamcompanion/ChangeLog
index 81c112810f99..a766ff3acf3d 100644
--- a/kde-misc/steamcompanion/ChangeLog
+++ b/kde-misc/steamcompanion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/steamcompanion
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/steamcompanion/ChangeLog,v 1.12 2014/03/21 19:09:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/steamcompanion/ChangeLog,v 1.13 2014/04/24 15:32:24 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -steamcompanion-0.5.4.ebuild,
+  steamcompanion-0.5.4-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *steamcompanion-0.5.4-r1 (21 Mar 2014)
 
diff --git a/kde-misc/steamcompanion/Manifest b/kde-misc/steamcompanion/Manifest
index 35005ddc5e84..b086f811ef14 100644
--- a/kde-misc/steamcompanion/Manifest
+++ b/kde-misc/steamcompanion/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST steamcompanion-0.5.4.tar.gz 54259 SHA256 030dc1726b1788ed2ba3f68e5c87cc2dc0a78d6857032aeb679cf2c88c07d5ae
-EBUILD steamcompanion-0.5.4-r1.ebuild 616 SHA256 207241c3b047a44b7c3dcb14ed10833b32102b4fb05b735acd70739051b3cabd SHA512 56e0127ee229d3a2e7a1bdd47c38ceae03184c8b35d1574f40d9016f536f7a6fb2e298ded52a2774021f62358b417b3a9863008039756690d871f9d28b76ac6e WHIRLPOOL f2c6dbe72458c4f976c7c1cf219f1a4480eb5a1d13d54538c7ebc470c1ab73607091f8d417935f7227b0a037c67ece24601c184dc5d971a0afc08b038739e178
-EBUILD steamcompanion-0.5.4.ebuild 613 SHA256 95d85a172d1521ff41fa23bd822e955d4543bc0590ade1d8d3c12d70e6322a4f SHA512 d9a8a0f27149ca33216f4a261fffd2209daf3ae6e87abe19a6c37348cea51e48fc0dc001fcb350c9da8b45d5c1642bef8515ac0afdf962498c35cb9181ee1a66 WHIRLPOOL 9e4e80a5922c6267dfb5a72f40aefa780ba237f584cdde00476c51333d1a482b61932616edefe2aa7b975d36fa151fd00ffb45aadee15cfb138008327425758d
-MISC ChangeLog 1999 SHA256 aaa42779cb3fc858110109eed9fff45ddbbcf9608bda839e6d36159a946446c3 SHA512 f7a6603381144a8c6270bbbaff52f0fe49290599f871ced40af18eac9c14807b15b72ee501d95423f87946e1a7e95005fab67be36a043d17df22e37964307cfe WHIRLPOOL c20b243a351374d1987256c6843ba75a753e23cea1f2e5ae71c2212d5bd354fab6eaf55858e322d6bd89cd25d9a16f500d788f29b76635a3fe91418de09faf5b
+EBUILD steamcompanion-0.5.4-r1.ebuild 614 SHA256 b869002d4fc7127c0cf0d328feb63cde0cf43e8439a771ffe88a8617efc17b78 SHA512 17b7bea43c7935a68ab879a81f3c115862285cd22030527c67f6c6531f565f450f8b9cc56fbe353fe4d9632b4829234063bc29d59bc35f7703fb9965d4bc18ab WHIRLPOOL ecd945ff4f5f9c0f71864f0e073c590757e7a0bf202086ea4846feed13f6d358257627c9bfc9b9950d6b2d06cb15dfa00f70e07b2455245661a75c1d8362827f
+MISC ChangeLog 2144 SHA256 6ac27a266553d456efab8d6d724f48b31dae46f493dc627149c381d073702fe1 SHA512 6c7170aa2d6cb0f53f64ff2ff19a1c5ec0aa88e5946f6d6661b2bc6d03e5e69724a824e7b877239346f9dce4fb21befaed5952e620e01e3a8e63a2132b1cb323 WHIRLPOOL 21b657e018d560c628a50afa5084494b7a63ac932b47acd958af006c5997ac16a042f8d4f7e12ebcf0e146c0c6e96b3280fd3b92c098c4838b784e1124dd04b6
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLI5lAAoJEGVpnaTzz9K9xKAP/RCe6/Eqsm0sKcdRLxvLb2Hf
-XnvzICNGRFelw1E7wrt32URYd9/j9Xj3aHM7QJiQACf1vE/pPrcSG7rnxIGkIUYf
-tQxTM1CRSDrFLb+5RsI+z24ryxWYpXDjLGHXjUu27LUTXbzqgIRCL7nE+WjpMvGZ
-0T9uegdgO4uJYnBlUonPwS1MUSh7pdS//l2mxqcsS5q3JwbCJvOtNEtCYjbM+4J7
-QJI1/hMRjuvHqgadVd0TV2XuB5JVui7kdU7t9Q/6vmRQ1HXwy4H9Q0FXs2mCOovD
-+qqGNujIdIsbUEgBQsvm6ipjpDz0aXIYzoZOb3VEdsniY6BKjSE1cMIFqEH+MUkl
-QaW1ZuA2h4moXFrmgPBMTz7MN+QVnU38HAiv/wHvmYGeuMLSs2uCToKIxJ3YeKya
-5KkIGTfqsEN0D8PJYB8BM2Ryy/Ew1Ar6rC7+LfcGWYaMaX7EXMWqIEvcJCHWSqtm
-5iBNMzGuaBph0W8WZ60ALQycCK2L+EwQ2LC3kpfz5LpD/jzEjWzUTjcHWoB8KddC
-wHDm2apnzCgq8luJXAzoeq5ksesj+pcFUUDe+778oqnChxAFONP1Gum+RTNo9suF
-2O9FShfsu+zwF9J6nnqIF7oFrC6dJyNm7+PTVeMIY9hz3KubDI4vX484YTu61Wd9
-GpKWg1IitjGg2ac2pqsp
-=ZXt3
+iQIcBAEBCAAGBQJTWS6JAAoJEGVpnaTzz9K9UqAP+wZI/QxCYePMEw/hGacban6P
+loEbu3TJZS2vd+LQgawya4kRIWfKaM1+z/NfiE+6pN/kMDtOB5Iux6Uorn56e/5e
+/Tv+M3MkjvOA0FmqSJ7Sve9F6ogOaYIT47SE/eVvvJmbt1CNQGhuu44F34jF3/Aw
+BoXRhpyAa2zIen5ZpJNsC5+hNiUU/G9iAOtZt3RHxBLANuOth6dqxx6IoxkG40Or
+g6IrP8cGaGejhDAtrjBbBOInXv3z/NSE8H+1rPnWR9gbBTT3HqRTl7wudEczcZ32
+InAryDWnc+kY9HGrvGtru33g51bQqAFcTunleMWU8fNL6Rtsdh4SHdEqKOc6O9p6
+jPHbSsHb49BwFiQyq1EuFzypdy1z0WUOg0SUv3heEkNQ3SxN/9de1orns+2Zj20w
+733iYl1qKgCJLA3FQSVe/K+4heA9O7t0gJkLwwj6FAh6brooPD00a9MCT+U0qrpf
+L4Q4OCnwXtT1b+dXlBDae3bB7PTlVLV0Ukmbnz0JJ6rnB01MYb12GyTq6WtKqHDA
+q2g+N3Bg9HUvejmQDSXD2ciU/dZX/B7Ny/FjDKfew3f3NzK2ajiW08gBzYuxi0rZ
+lKXOlYL/VnHJWsqNVDFphF99PUVvrn7SQeovnM6cXpNmxfbdTkUdLqUSCQg2Ab1I
+L0EqCloUus2yYJsA1R+1
+=5Y7e
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/steamcompanion/steamcompanion-0.5.4-r1.ebuild b/kde-misc/steamcompanion/steamcompanion-0.5.4-r1.ebuild
index 7a2670e31185..6351d746fa1a 100644
--- a/kde-misc/steamcompanion/steamcompanion-0.5.4-r1.ebuild
+++ b/kde-misc/steamcompanion/steamcompanion-0.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/steamcompanion/steamcompanion-0.5.4-r1.ebuild,v 1.1 2014/03/21 19:09:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/steamcompanion/steamcompanion-0.5.4-r1.ebuild,v 1.2 2014/04/24 15:32:24 johu Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://kde-look.org/CONTENT/content-files/141713-${PN}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 S=${WORKDIR}/${PN}
diff --git a/kde-misc/steamcompanion/steamcompanion-0.5.4.ebuild b/kde-misc/steamcompanion/steamcompanion-0.5.4.ebuild
deleted file mode 100644
index 93c579b8c8cf..000000000000
--- a/kde-misc/steamcompanion/steamcompanion-0.5.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/steamcompanion/steamcompanion-0.5.4.ebuild,v 1.3 2012/04/18 20:43:55 maekke Exp $
-
-EAPI=4
-
-KDE_LINGUAS="it"
-KDE_LINGUAS_DIR="translations"
-inherit kde4-base
-
-DESCRIPTION="Connector for web Steam service from Valve."
-HOMEPAGE="http://kde-look.org/content/show.php/Steam+Companion?content=141713"
-SRC_URI="http://kde-look.org/CONTENT/content-files/141713-${PN}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-S=${WORKDIR}/${PN}
diff --git a/kde-misc/stock-quote/ChangeLog b/kde-misc/stock-quote/ChangeLog
index 70dc267e78df..e6dafa8a4e68 100644
--- a/kde-misc/stock-quote/ChangeLog
+++ b/kde-misc/stock-quote/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/stock-quote
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/stock-quote/ChangeLog,v 1.10 2014/03/21 19:12:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/stock-quote/ChangeLog,v 1.11 2014/04/24 15:58:27 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -stock-quote-2.1-r1.ebuild,
+  stock-quote-2.1-r2.ebuild:
+  amd64/x86 stable, remove old.
 
 *stock-quote-2.1-r2 (21 Mar 2014)
 
diff --git a/kde-misc/stock-quote/Manifest b/kde-misc/stock-quote/Manifest
index e976ea1ac9c0..fa05b4767e18 100644
--- a/kde-misc/stock-quote/Manifest
+++ b/kde-misc/stock-quote/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST 90695-plasma_stock_quote-2.1.tar.bz2 13043 SHA256 1f19def33d9c4ef80e0e25d204c05fa427b7dd25168b9b410009a6e86fd39dd7 SHA512 f11c432d4d033d1eb5a03bf372b306a90bed82c64382d30d6a45ffd474f46273dff1434f9ce7fa85007e44ed5dc5852c14fbffd7b112508f39af752c1b922782 WHIRLPOOL d1ec0603fdc2fce55e64ff36ae3d6a59b4038aee9f36edb9a2c6dcbcae26f68ec8978d20476e2870a434ad40b65d3e0051786b1a48706412414d4c9cc6c1e02f
-EBUILD stock-quote-2.1-r1.ebuild 921 SHA256 b9023e64a3ac04ff24cdd30358aeed9bad6006a53c3f61b6cd8a5af4ae76f9ae SHA512 472ce09665a1c4b2b51e6f450d6d54d73001ebdf67e90cc4a3cfdfeedd860acb1deeefc744a7aec0781ec4f71ec8f4a65fe8336517405b8a4a454137bdda7cc6 WHIRLPOOL 8d4709b61506fc73d9af396739fadf60c38b08f844c57f84812f35d266e76f1324c8fee440a9c022a8e6a270918494dc1536f790811076fdcb9a887e5bcf9d14
-EBUILD stock-quote-2.1-r2.ebuild 929 SHA256 729817467f7ec7e66c1ea4d65ae7670b18760ae42593a07956181a41376b0968 SHA512 7f2c92ef4517467a307748ccf0c1fa36adfb22815e4c6e804abfdad3afe9ee30a3aa444a59ae51648945b59c431385f98645388dc76223807694fd1c6535c08c WHIRLPOOL 15df01c8bdc4a747ff66895911b95f9965fa741ce779fef9cc793258e670adf9dcdb4c3912a14aa3e38410d08b903116aad65fb9005aabcc0b33a6379f32e5ef
-MISC ChangeLog 1420 SHA256 d01dd2654a8744b007842cf470e0182c451d9dd8568c2a69053dff6c912d9d57 SHA512 42e66806aff19680b08e0431de0fb1e898ed4e2dc517b02391855f979e96fe7b67cbc190908810c43d7d61726afc191316e52ce4b6fea6b521fd18176e01061c WHIRLPOOL c89fc2ca607111387fdc6fe2ec316e14b34657cb84b336785ebcbb43b4b4982a1b330fafe3917d6ab6e0d387e3c717fcc1168a51e62a62c7d50b98f779705925
+EBUILD stock-quote-2.1-r2.ebuild 927 SHA256 8d41b4fc17ca5a9deab236f3b4476ed09c86f70655dde143950a66ac4c54d96c SHA512 54f58bf9de5d1696a13a2fc6bc6715fe3715c994189aa8fd7e4a9d1474a17c73a999fd9f1aa7b996f92def1a55e6610d8995b491257c863caacf0519d056989c WHIRLPOOL 82c216e3da063466eafe5509f9939239f97e79d4f97178474f38353068e7169b08436732580e80d78b30598470e1ca131175620428e7c2694076ef56d7d239a5
+MISC ChangeLog 1558 SHA256 1f2f66e9874421be2f8717e190289a5209ee858d392d8c24418a89b866dd039f SHA512 9fb0d2c184b4749061c32cd04eeaffb7d51eb57982c5c2969ac48a6895f98f74d306958853efede7ef3f7ef39f037d6fbd2cba81ad642891184dba3b2a4ae66a WHIRLPOOL a01256529e5cfc29cada09649970b2df38f6f9aceeb0e8b0d4d817885269b80043bbac0656b09bfac22b2f7aa7a6b827ebafe0e17f0a1e8e094eab5f6e608af8
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLI8FAAoJEGVpnaTzz9K90xEQAJkVC9gPVz38OsFJpcWHwJeO
-06cGPDbg38M+4lb+tBL2H/HY/dU3UrBhhvfW/zc8zYvEiplwQoGp+08kwXDcvN+f
-y8+FTn7joW8kQ6qwk4b8Xp6qsCfDlRHmcbwxquFEnuRKuo/NYXpm/ERYnLjlJ8jB
-0z+HQWP8+5aDycaMKcquGM82iOcVHGwbwBevPTtaImMXx6XSwlcbzoyi/Nx9R2OQ
-o2SivvK0rZ+/zu51Q8Tsa051Y3ESqEzXTvqigzxJDwiLatWhWl/2TRXnFQAN+8XF
-0jisaKTBi4ConYcqoSMmi/H4YmnydnrV7Cqwz5AA55DIxtlxLcgoDU2LkOiwBfgr
-v3wEKe6g59dG0OwQy4CnPLdi1dKHuaapM8OOupN3yt/v0MvpOvgffMKM3G6rADxX
-M+h96iAa/h9U9npmAnaPfu3t4Ib6qiZCZJthUc/tNnKj+GI4dC4xs4fKoWLjgRw+
-MURs/Dy2eatEE9w0jac2ikqMcd2Ix3niBGB4OHAK0Jdcgc29q1Qsi1j6sT44jC80
-yXEe8zXs2GgZinP4mHdQRtuExMNv+p4tqF6jmNueH3E0SiNfUUwVp7+ou0xHj6+9
-AVJO0oBsAM8d/8ffrD1cHJkj8fKpznKWAgfLD9bjDbE3lHy2TWT/Rb8ywZfWgFx3
-E8jlQ5kVAn96ar5turjR
-=BQbi
+iQIcBAEBCAAGBQJTWTSkAAoJEGVpnaTzz9K9YGoQAIoS/ajanSBeOCn+Qe6qq3rt
+UZEr4Ha3TT77uxB+28HLlJkaXMskT0NdqFeoxcR/gUn2mq90nO5utpzg+fW3vdTe
+oBwobYhE4Naq80omTh07JMLHGmasReOl38VxxZAwna9PHd4VF1G9OiYxDw61JP1I
++ugn1Hnk+m8VTP9M/mP5dRTPM3Sxq9C33cKw19QrcUSEfHH9d6JgZLVnh/1hnMB4
+SF+6I/wgKqr2at7WO8IVRcPjVh539OecIaJcs/PGfIavgr1UOAGeTO8zpvWNHogg
+l6suLQ3rjjl8oFN1f8NjrmjizYlEGA8B6T2RN7tGjXFg/oU58SjQ+6/SUEXFqxHf
+g7j+XvbnEUodyGt9wqrUPsyq07XtwbJvpiJDERL+QRtFaAL52EGk0srJ327IBaFS
+TFbaKeR6iMWqB0Gux1oM+Uji2gh7A9MzWlZpYmsriODYfXjbvhbdV3dWOuvdpAH5
+JC/PuMpj0KZfxYVNYutDs4guFwClwmSqrHMw71++e0eYVngEhGk3pbMILi5fnlaG
+A/2PJ5kxlmX+jTrgflXgeGgj5Fp2t2ss7/RQ19UGFOeMlZmmITiAdV4bl/1+9eEJ
+5YYGsuEMq0ikGUo5eHtz9ilOlV/nzL79W2nMVyPEBA633l/txzsecZL3kofj0PVd
+H+a/pfv3PTugjsti0m0M
+=hipc
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/stock-quote/stock-quote-2.1-r1.ebuild b/kde-misc/stock-quote/stock-quote-2.1-r1.ebuild
deleted file mode 100644
index 104d02f7f2c4..000000000000
--- a/kde-misc/stock-quote/stock-quote-2.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/stock-quote/stock-quote-2.1-r1.ebuild,v 1.5 2014/03/21 19:12:04 johu Exp $
-
-EAPI=4
-inherit kde4-base
-
-MY_P=plasma_${PN/-/_}-${PV}
-
-DESCRIPTION="Displays stock quotes pulled from the Yahoo! servers"
-HOMEPAGE="http://www.kde-look.org/content/show.php/Stock+Quote?content=90695"
-SRC_URI="http://www.kde-look.org/CONTENT/content-files/90695-${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep plasma-workspace)
-"
-S=${WORKDIR}/${MY_P}
-
-DOCS=( CHANGELOG README )
-
-src_prepare() {
-	sed -e 's:^[ \t]*::' \
-		-i applet/plasma-applet-stock-quote.desktop || die "fixing .desktop file failed"
-	sed -e 's:^[ \t]*::' \
-		-i dataengine/plasma-dataengine-stockquote.desktop || die "fixing .desktop file failed"
-	kde4-base_src_prepare
-}
diff --git a/kde-misc/stock-quote/stock-quote-2.1-r2.ebuild b/kde-misc/stock-quote/stock-quote-2.1-r2.ebuild
index 53f9610e8e59..e2e6d841d8dd 100644
--- a/kde-misc/stock-quote/stock-quote-2.1-r2.ebuild
+++ b/kde-misc/stock-quote/stock-quote-2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/stock-quote/stock-quote-2.1-r2.ebuild,v 1.1 2014/03/21 19:12:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/stock-quote/stock-quote-2.1-r2.ebuild,v 1.2 2014/04/24 15:58:27 johu Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.kde-look.org/CONTENT/content-files/90695-${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/licenses/NVIDIA-CUDA b/licenses/NVIDIA-CUDA
index e26fc7c8521e..309815fb953a 100644
--- a/licenses/NVIDIA-CUDA
+++ b/licenses/NVIDIA-CUDA
@@ -6,9 +6,9 @@ Preface
 -------
 
 The following contains specific license terms and conditions
-for four separate products included in this installer. By
-accepting this agreement, you agree to comply with all the
-terms and conditions applicable to each product as specified
+for four separate NVIDIA products. By accepting this
+agreement, you agree to comply with all the terms and
+conditions applicable to the specific product(s) included
 herein.
 
 
@@ -78,7 +78,9 @@ Description
 
 This package contains the operating system driver and
 fundamental system software components for NVIDIA GPUs. The
-NVIDIA Driver License is available in Chapter 3.
+NVIDIA Driver License for the Windows platform is available in
+Chapter 3, and the NVIDIA Driver License for the Linux and Mac
+OSX platforms is available in Chapter 4.
 
 
 NVIDIA Nsight Visual Studio Edition (Windows only)
@@ -91,7 +93,7 @@ development environment integrated into Microsoft Visual
 Studio that provides tools for debugging, profiling, analyzing
 and optimizing your GPU computing and graphics applications.
 The NVIDIA Nsight Visual Studio Edition License Agreement is
-available in Chapter 4.
+available in Chapter 5.
 
 
 Default Install Location of Nsight Visual Studio Edition
@@ -107,7 +109,7 @@ NVIDIA CUDA General Terms
 Description
 
 General terms that apply to all of the software components are
-available in Chapter 5.
+available in Chapter 6.
 
 
 1. NVIDIA CUDA Toolkit License Agreement
@@ -163,7 +165,8 @@ libraries referenced in Attachment A of this Agreement.
 1.1.3. Software
 
 "SOFTWARE" shall mean the deliverables provided pursuant to
-this Agreement.
+this Agreement. SOFTWARE may be provided in either source or
+binary form, at NVIDIA's discretion.
 
 
 1.2. Grant of License
@@ -176,8 +179,9 @@ Agreement, NVIDIA hereby grants Licensee the following
 limited, non-exclusive, non-transferable, non-sublicensable
 (except as expressly permitted otherwise for Redistributable
 Software in Section 1.2.1.1 and Section 1.2.1.3 of this
-Agreement) right to use the SOFTWARE, with the following
-limitations:
+Agreement) right to use the SOFTWARE -- and, if the SOFTWARE
+is provided in source form, to compile the SOFTWARE -- with
+the following limitations:
 
 
 1.2.1.1. Redistribution Rights
@@ -252,9 +256,9 @@ referenced in Attachment B of this Agreement.
 
 No Reverse Engineering
 
-Licensee may not reverse engineer, decompile, or disassemble
-the SOFTWARE, nor attempt in any other manner to obtain the
-source code.
+If the SOFTWARE is provided in binary form, Licensee may not
+reverse engineer, decompile, or disassemble the SOFTWARE, nor
+attempt in any other manner to obtain the source code.
 
 No Separation of Components
 
@@ -267,6 +271,11 @@ No Rental
 
 Licensee may not rent or lease the SOFTWARE to someone else.
 
+No Modifications
+
+If the SOFTWARE is provided in source form, Licensee may not
+modify or create derivative works of the SOFTWARE.
+
 
 1.3. Term and Termination
 
@@ -505,51 +514,57 @@ following files may be redistributed with software
 applications developed by Licensee, including certain
 variations of these files that have version number or
 architecture specific information embedded in the file name -
-as an example only, for release version 5.5 of the 64-bit
-Windows software, the file cudart64_55.dll is redistributable.
+as an example only, for release version 6.0 of the 64-bit
+Windows software, the file cudart64_60.dll is redistributable.
 
 Component : CUDA Runtime
   Windows : cudart.dll, cudart_static.lib
   MacOS   : libcudart.dylib, libcudart_static.a
   Linux   : libcudart.so, libcudart_static.a
+  Android : libcudart.so, libcudart_static.a
 
 Component : CUDA FFT Library
   Windows : cufft.dll
   MacOS   : libcufft.dylib
   Linux   : libcufft.so
+  Android : libcufft.so
 
 Component : CUDA BLAS Library
   Windows : cublas.dll
   MacOS   : libcublas.dylib
   Linux   : libcublas.so
+  Android : libcublas.so
 
-Component : CUDA Sparse Matrix Library                 
+Component : CUDA Sparse Matrix Library
   Windows : cusparse.dll
   MacOs   : libcusparse.dylib
   Linux   : libcusparse.so
+  Android : libcusparse.so
 
-Component : CUDA Random Number Generation Library      
+Component : CUDA Random Number Generation Library
   Windows : curand.dll
   MacOs   : libcurand.dylib
   Linux   : libcurand.so
+  Android : libcurand.so
 
-Component : NVIDIA Performance Primitives Library      
+Component : NVIDIA Performance Primitives Library
   Windows : nppc.dll, nppi.dll, npps.dll
   MacOs   : libnppc.dylib, libnppi.dylib, libnpps.dylib
   Linux   : libnppc.so, libnppi.so, libnpps.so
+  Android : libnppc.so, libnppi.so, libnpps.so
 
 Component : NVIDIA Optimizing Compiler Library
   Windows : nvvm.dll
-  MacOs   : libnvvm.so
-  Linux   : libnvvm.dylib
+  MacOs   : libnvvm.dylib
+  Linux   : libnvvm.so
 
 Component : NVIDIA Common Device Math Functions Library
   Windows : libdevice.compute_20.bc, libdevice.compute_30.bc, libdevice.compute_35.bc
   MacOs   : libdevice.compute_20.bc, libdevice.compute_30.bc, libdevice.compute_35.bc
   Linux   : libdevice.compute_20.bc, libdevice.compute_30.bc, libdevice.compute_35.bc
 
-Component : NVIDIA Internal Library
-  MacOs   : libtlshook.dylib
+Component : CUDA Occupancy Calculation Header Library
+  All     : cuda_occupancy.h
       
 
 
@@ -759,7 +774,7 @@ conditions:
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
     POSSIBILITY OF SUCH DAMAGE.  
 
-  7. Some of the CUBLAS library routines were written by or
+  7. Some of the cuBLAS library routines were written by or
     derived from code written by Vasily Volkov and are subject
     to the Modified Berkeley Software Distribution License as
     follows:
@@ -794,7 +809,7 @@ conditions:
     IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.  
 
-  8. Some of the CUBLAS library routines were written by or
+  8. Some of the cuBLAS library routines were written by or
     derived from code written by Davide Barbieri and are
     subject to the Modified Berkeley Software Distribution
     License as follows:
@@ -828,7 +843,7 @@ conditions:
     IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.  
 
-  9. Some of the CUBLAS library routines were derived from
+  9. Some of the cuBLAS library routines were derived from
     code developed by the University of Tennessee and are
     subject to the Modified Berkeley Software Distribution
     License as follows:
@@ -862,7 +877,7 @@ conditions:
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
 
-  10. Some of the CUBLAS library routines were written by or
+  10. Some of the cuBLAS library routines were written by or
     derived from code written by Jonathan Hogg and are subject
     to the Modified Berkeley Software Distribution License as
     follows:
@@ -896,7 +911,25 @@ conditions:
     OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
 
-  11. Some of the CUSPARSE library routines were written by or
+  11. Some of the cuBLAS library routines were written by or
+    derived from code written by Ahmad M. Abdelfattah, David
+    Keyes, and Hatem Ltaief, and are subject to the Apache
+    License, Version 2.0, as follows:
+
+    Copyright 2013 King Abdullah University of Science and Technology-- Ahmad M. Abdelfattah, David Keyes, and Hatem Ltaief
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.  
+
+  12. Some of the cuSPARSE library routines were written by or
     derived from code written by Li-Wen Chang and are subject
     to the NCSA Open Source License as follows:
 
@@ -933,7 +966,7 @@ conditions:
     IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
     SOFTWARE.  
 
-  12. Some of the CURAND library routines were written by or
+  13. Some of the cuRAND library routines were written by or
     derived from code written by Mutsuo Saito and Makoto
     Matsumoto and are subject to the following license:
 
@@ -969,7 +1002,7 @@ conditions:
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
 
-  13. Some of the CURAND library routines were derived from
+  14. Some of the cuRAND library routines were derived from
     code developed by D. E. Shaw Research and are subject to
     the following license:
 
@@ -1290,6 +1323,7 @@ laws, restrictions or regulations.
 
 
 3. NVIDIA Driver License for Customer Use of NVIDIA Software
+on Windows
 ------------------------------------------------------------
 
 
@@ -1411,7 +1445,7 @@ make one copy of the SOFTWARE solely for backup or archive
 purposes.
 
 
-Applicable Law
+3.5. Applicable Law
 
 This LICENSE shall be deemed to have been made in, and shall
 be construed pursuant to, the laws of the State of Delaware.
@@ -1437,7 +1471,7 @@ appropriate version for your model of graphics controller
 board, operating system, and computer hardware.
 
 
-No Liability for Consequential Damages
+3.6.2. No Liability for Consequential Damages
 
 TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT
 SHALL EITHER PARTY OR ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL,
@@ -1449,7 +1483,7 @@ INABILITY TO USE THE FEEDBACK, EVEN IF THE OTHER PARTY HAS
 BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
 
-3.7. System Updates
+3.7. System Updates (for the Windows platform only)
 
 Customer hereby agrees and acknowledges that the SOFTWARE may
 access, collect non-personally identifiable information about,
@@ -1509,7 +1543,180 @@ United States Bureau of Industry and Security or any export
 laws, restrictions or regulations.
 
 
-4. NVIDIA Nsight Development Platform, Visual Studio Edition
+4. NVIDIA Driver License for Customer Use of NVIDIA Software
+on Linux and Mac OSX
+------------------------------------------------------------
+
+
+IMPORTANT NOTICE -- READ CAREFULLY:
+-----------------------------------
+
+This License For Customer Use of NVIDIA Software ("LICENSE")
+is the agreement which governs use of the software of NVIDIA
+Corporation and its subsidiaries ("NVIDIA") downloadable
+herefrom, including computer software and associated printed
+materials ("SOFTWARE"). By downloading, installing, copying,
+or otherwise using the SOFTWARE, you agree to be bound by the
+terms of this LICENSE. If you do not agree to the terms of
+this LICENSE, do not download the SOFTWARE.
+
+
+RECITALS:
+---------
+
+Use of NVIDIA's products requires three elements: the
+SOFTWARE, the hardware on a graphics controller board, and a
+personal computer. The SOFTWARE is protected by copyright laws
+and international copyright treaties, as well as other
+intellectual property laws and treaties. The SOFTWARE is not
+sold, and instead is only licensed for use, strictly in
+accordance with this document. The hardware is protected by
+various patents, and is sold, but this agreement does not
+cover that sale, since it may not necessarily be sold as a
+package with the SOFTWARE. This agreement sets forth the terms
+and conditions of the SOFTWARE LICENSE only.
+
+
+4.1. DEFINITIONS
+
+
+4.1.1. Customer
+
+Customer means the entity or individual that downloads the
+SOFTWARE.
+
+
+4.2. GRANT OF LICENSE
+
+
+4.2.1. Rights and Limitations of Grant
+
+NVIDIA hereby grants Customer the following non-exclusive,
+non-transferable right to use the SOFTWARE, with the following
+limitations:
+
+
+4.2.1.1. Rights
+
+Customer may install and use multiple copies of the SOFTWARE
+on a shared computer or concurrently on different computers,
+and make multiple back-up copies of the SOFTWARE, solely for
+Customer's use within Customer's Enterprise. "Enterprise"
+shall mean individual use by Customer or any legal entity
+(such as a corporation or university) and the subsidiaries it
+owns by more than fifty percent (50%).
+
+
+4.2.1.2. Linux/FreeBSD Exception
+
+Notwithstanding the foregoing terms of Section 4.2.1.1,
+SOFTWARE designed exclusively for use on the Linux or FreeBSD
+operating systems, or other operating systems derived from the
+source code to these operating systems, may be copied and
+redistributed, provided that the binary files thereof are not
+modified in any way (except for unzipping of compressed
+files).
+
+
+4.2.1.3. Limitations
+
+No Reverse Engineering
+
+Customer may not reverse engineer, decompile, or disassemble
+the SOFTWARE, nor attempt in any other manner to obtain the
+source code.
+
+No Separation of Components
+
+The SOFTWARE is licensed as a single product. Its component
+parts may not be separated for use on more than one computer,
+nor otherwise used separately from the other parts.
+
+No Rental
+
+Customer may not rent or lease the SOFTWARE to someone else.
+
+
+4.3. TERMINATION
+
+This LICENSE will automatically terminate if Customer fails to
+comply with any of the terms and conditions hereof. In such
+event, Customer must destroy all copies of the SOFTWARE and
+all of its component parts.
+
+Defensive Suspension. If Customer commences or participates in
+any legal proceeding against NVIDIA, then NVIDIA may, in its
+sole discretion, suspend or terminate all license grants and
+any other rights provided under this LICENSE during the
+pendency of such legal proceedings.
+
+
+4.4. COPYRIGHT
+
+All title and copyrights in and to the SOFTWARE (including but
+not limited to all images, photographs, animations, video,
+audio, music, text, and other information incorporated into
+the SOFTWARE), the accompanying printed materials, and any
+copies of the SOFTWARE, are owned by NVIDIA, or its suppliers.
+The SOFTWARE is protected by copyright laws and international
+treaty provisions. Accordingly, Customer is required to treat
+the SOFTWARE like any other copyrighted material, except as
+otherwise allowed pursuant to this LICENSE and that it may
+make one copy of the SOFTWARE solely for backup or archive
+purposes.
+
+
+4.5. APPLICABLE LAW
+
+This agreement shall be deemed to have been made in, and shall
+be construed pursuant to, the laws of the State of California.
+
+
+4.6. DISCLAIMER OF WARRANTIES AND LIMITATION ON LIABILITY
+
+
+4.6.1. No Warranties
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE
+SOFTWARE IS PROVIDED "AS IS" AND NVIDIA AND ITS SUPPLIERS
+DISCLAIM ALL WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING,
+BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.
+
+
+4.6.2. No Liability for Consequential Damages
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT
+SHALL NVIDIA OR ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL,
+INCIDENTAL, INDIRECT, OR CONSEQUENTIAL DAMAGES WHATSOEVER
+(INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS
+PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION,
+OR ANY OTHER PECUNIARY LOSS) ARISING OUT OF THE USE OF OR
+INABILITY TO USE THE SOFTWARE, EVEN IF NVIDIA HAS BEEN ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+4.7. MISCELLANEOUS
+
+The United Nations Convention on Contracts for the
+International Sale of Goods is specifically disclaimed. If any
+provision of this LICENSE is inconsistent with, or cannot be
+fully enforced under, the law, such provision will be
+construed as limited to the extent necessary to be consistent
+with and fully enforceable under the law. This agreement is
+the final, complete and exclusive agreement between the
+parties relating to the subject matter hereof, and supersedes
+all prior or contemporaneous understandings and agreements
+relating to such subject matter, whether oral or written.
+Customer agrees that it will not ship, transfer or export the
+SOFTWARE into any country, or use the SOFTWARE in any manner,
+prohibited by the United States Bureau of Export
+Administration or any export laws, restrictions or
+regulations. This LICENSE may only be modified in writing
+signed by an authorized officer of NVIDIA.
+
+
+5. NVIDIA Nsight Development Platform, Visual Studio Edition
 Software License Agreement (Windows only)
 ------------------------------------------------------------
 
@@ -1543,7 +1750,7 @@ applications and registrations thereto, and any other similar
 protected rights in any country.
 
 
-4.1. Grant of License
+5.1. Grant of License
 
 NVIDIA agrees to provide the Software and any associated
 materials pursuant to this Agreement. Subject to the terms of
@@ -1570,7 +1777,7 @@ relevant records to verify Your compliance with the terms and
 conditions of this Agreement.
 
 
-4.2. Confidentiality
+5.2. Confidentiality
 
 If applicable, any exchange of Confidential Information (as
 defined in the NDA) shall be made pursuant to the terms and
@@ -1596,7 +1803,7 @@ this Agreement, You do not have any rights to use any NVIDIA
 trademarks or logos.
 
 
-4.3. Ownership of Software and Intellectual Property Rights
+5.3. Ownership of Software and Intellectual Property Rights
 
 All rights, title and interest to all copies of the Software
 remain with NVIDIA, subsidiaries, licensors, or its suppliers.
@@ -1624,7 +1831,7 @@ data and target device information that shall be sent to
 NVIDIA, solely for use by NVIDIA in improving the Software.
 
 
-4.4. No Warranties
+5.4. No Warranties
 
 THE SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY EXPRESS OR
 IMPLIED WARRANTY OF ANY KIND, INCLUDING WARRANTIES OF
@@ -1636,7 +1843,7 @@ NVIDIA does not represent that errors or other defects will be
 identified or corrected.
 
 
-4.5. Limitation of Liability
+5.5. Limitation of Liability
 
 EXCEPT WITH RESPECT TO THE MISUSE OF THE OTHER PARTY'S
 INTELLECTUAL PROPERTY OR DISCLOSURE OF THE OTHER PARTY'S
@@ -1656,7 +1863,7 @@ ARISING OUT OF THIS AGREEMENT SHALL NOT EXCEED ONE HUNDRED
 UNITED STATES DOLLARS (USD$100).
 
 
-4.6. Term
+5.6. Term
 
 This Agreement and the licenses granted hereunder shall be
 effective as of the date You install/download the Software
@@ -1665,7 +1872,7 @@ earlier in accordance with the "Termination" provision of this
 Agreement.
 
 
-4.7. Termination
+5.7. Termination
 
 NVIDIA may terminate this Agreement at any time if You violate
 its terms. Upon termination, You will immediately destroy the
@@ -1674,19 +1881,19 @@ certify to NVIDIA in writing that such actions have been
 completed.
 
 
-4.8. Miscellaneous
+5.8. Miscellaneous
 
 
-4.8.1. Survival
+5.8.1. Survival
 
 Those provisions in this Agreement, which by their nature need
 to survive the termination or expiration of this Agreement,
 shall survive termination or expiration of the Agreement,
-including but not limited to Section  4.2, Section 4.3,
-Section 4.4, Section 4.5, Section 4.7, and Section 4.8.
+including but not limited to Section  5.2, Section 5.3,
+Section 5.4, Section 5.5, Section 5.7, and Section 5.8.
 
 
-4.8.2. Applicable Laws
+5.8.2. Applicable Laws
 
 Claims arising under this Agreement shall be governed by the
 laws of Delaware, excluding its principles of conflict of laws
@@ -1698,7 +1905,7 @@ export the Software in violation of applicable export laws and
 regulations.
 
 
-4.8.3. Amendment
+5.8.3. Amendment
 
 The Agreement shall not be modified except by a written
 agreement that names this Agreement and any provision to be
@@ -1706,7 +1913,7 @@ modified, is dated subsequent to the Effective Date, and is
 signed by duly authorized representatives of both parties.
 
 
-4.8.4. No Waiver
+5.8.4. No Waiver
 
 No failure or delay on the part of either party in the
 exercise of any right, power or remedy under this Agreement or
@@ -1719,7 +1926,7 @@ any other right, power or remedy; rather the provision, right,
 or remedy shall be and remain in full force and effect.
 
 
-4.8.5. No Assignment
+5.8.5. No Assignment
 
 This Agreement and Licensee's rights and obligations herein,
 may not be assigned, subcontracted, delegated, or otherwise
@@ -1730,7 +1937,7 @@ null and void. The terms of this Agreement shall be binding
 upon Licensee's assignees.
 
 
-4.8.6. Government Restricted Rights
+5.8.6. Government Restricted Rights
 
 The parties acknowledge that the Software is subject to U.S.
 export control laws and regulations. The parties agree to
@@ -1753,7 +1960,7 @@ by the Government constitutes acknowledgment of NVIDIA's
 proprietary rights therein.
 
 
-4.8.7. Independent Contractors
+5.8.7. Independent Contractors
 
 Licensee's relationship to NVIDIA is that of an independent
 contractor, and neither party is an agent or partner of the
@@ -1762,7 +1969,7 @@ third party that it has, any authority to act on behalf of
 NVIDIA.
 
 
-4.8.8. Severability
+5.8.8. Severability
 
 If for any reason a court of competent jurisdiction finds any
 provision of this Agreement, or portion thereof, to be
@@ -1776,7 +1983,7 @@ and without any strict construction in favor of or against
 either party.
 
 
-4.8.9. Entire Agreement
+5.8.9. Entire Agreement
 
 This Agreement and NDA constitute the entire agreement between
 the parties with respect to the subject matter contemplated
@@ -1905,16 +2112,16 @@ NVIDIA DirectX SDK can be found at:
 http://developer.nvidia.com/object/sdk_home.html
 
 
-NVIDIA CUDA General Terms
--------------------------
-
-The Software may collect non-personally identifiable
-information for the purposes of customizing information
-delivered to you and improving future versions of the
-Software. Such information, including IP address and system
-configuration, will only be collected on an anonymous basis
-and cannot be linked to any personally identifiable
-information. Personally identifiable information such as your
-username or hostname is not collected.
+6. NVIDIA CUDA General Terms
+----------------------------
+
+The Software, on the Windows platform, may collect
+non-personally identifiable information for the purposes of
+customizing information delivered to you and improving future
+versions of the Software. Such information, including IP
+address and system configuration, will only be collected on an
+anonymous basis and cannot be linked to any personally
+identifiable information. Personally identifiable information
+such as your username or hostname is not collected.
 
 -------------------------------------------------------------
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 1722d1a22a1b..4521d8a0ebfc 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.264 2014/04/18 22:00:34 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.265 2014/04/24 11:34:21 hasufell Exp $
+
+*blender-2.70a-r2 (24 Apr 2014)
+
+  24 Apr 2014; Julian Ospald <hasufell@gentoo.org> -blender-2.70a.ebuild,
+  -blender-2.70a-r1.ebuild, +blender-2.70a-r2.ebuild:
+  fix nls USE flag wrt #508550
 
   18 Apr 2014; Julian Ospald <hasufell@gentoo.org> blender-2.70a-r1.ebuild,
   +files/blender-2.70a-openmp.patch:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 26c8e608090f..d65dd12a476c 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -40,26 +40,25 @@ EBUILD blender-2.69-r1.ebuild 7381 SHA256 725864b979ab1dc26e8f03e13194e3fc6dc1c3
 EBUILD blender-2.69.ebuild 7578 SHA256 464f47a278cc1a07ad078c7ff177a03a9dbfb6959e10603fb2dc8135a24c2a54 SHA512 f9d997af90eb430d6ab9558c63c797fc9750934908a6d0d51540c00584191dc8f5de4271ff51914b598cc7d40a80cd2ca33e3ac875ef6ec6996d9bd74773a175 WHIRLPOOL d36c49133d6a7867938f1b1d1a7aaa8b5e8598ec4ce910841485908d2dc1fe91fd71c53c4c187a761dcb0667e660e0cb9a897a0ff1ce9407a89d2c60db27d82b
 EBUILD blender-2.70-r1.ebuild 7575 SHA256 099b5aadace8abb51a9c6e0a5685760c2912e00cb55dbaeae486c72b2a6c7d86 SHA512 324d1946eea6702a45da5a832af95c633afe895bf1447edeeac3ddafa43a7a274244b5f752a94aec16e2046b20277de3fc89d8dd27e460f22f8af1778f5bd8af WHIRLPOOL c5f64cecb1f1556fa46f6cedac15f837cb4957969cc53e7ef563ce39b06665bc0a3e53d74e18ff0b2259e97dc1686d8acd0c3900c5eafe8f429dc6ed4a0f2118
 EBUILD blender-2.70.ebuild 7772 SHA256 17a4c2f16b1a96e3fe38fcd397beda94bf67922018769a370c8253eec32df6c2 SHA512 ccb51d409481078924c431359bf58fa06deaed336b7b5538c2910d20a82ac62d08151fbab3a14f49555834e395d1fbd4cf7e929978153a975fcb64cf98eeded6 WHIRLPOOL 6e5fce7efeafd28e05b427045077875335f69ef3b4e003e9b1f956979ad22dfaf3b14d46205270898e883f4c3fa9df6df856085e2a116478b2591130aca85ce7
-EBUILD blender-2.70a-r1.ebuild 7656 SHA256 e0be5f10f84faa615d8047082b42a3a1785ab78b9100554fef22ff0e6169b038 SHA512 e710ba26ce304c36ce2ee74619396b44070f5189bd815e751a23b2ba1cc286201c0c6932a9cc1d99e848af6790602101aba374f57911b3d31a47f197dc22bcbb WHIRLPOOL 460a463e18f3fb2d8dc8e8d944dbbb2dcd169adaf9d5a3e1151b5b327ed5342fbfe2bcabe44ff6f4b34ecbf0c361f5a691ed548189e1bfaa9a3cf5f943024830
-EBUILD blender-2.70a.ebuild 7810 SHA256 7bce4cfabcaa12b5d937deb4c85fb1eff4adfab504cf90c80e95046c89234ba8 SHA512 1013059ec00e75aca05a577c9786361108bd196b8c054d47dc1df48f157a9cfd5b1afc6785d3d72ec4263520a7c170e350efeb6b7e7d833a1fa8fec9baa787ba WHIRLPOOL 292c34aa159fbdb8b9eb9fbf983e592f33e2fb67caf04cc478855cd181fb25177b15892ec7b0131e6cf31099337ab3fbe4083ce565140f48a4431edae7d063f1
-MISC ChangeLog 46357 SHA256 d200955e2151ff1a37df27a5ba4a384f079f2c687c86d749c3aefa8be8682beb SHA512 6edf55a7285f7c7a833d49106640d03658164cc41f8cbecd34c4ca72b243d62de890f64f80474579a0e4fede3f568c4a23cff3317749de7fc89b2eb2cb0130d7 WHIRLPOOL 1a7416b3e90bdc9731c3e2d61ada870230f4c49e0ae3d9fc93bd250b6934a3925b6abccc7affccd4f0e1bdd30909691cfba6a3cabfa93ec4c4677677457069d8
+EBUILD blender-2.70a-r2.ebuild 7659 SHA256 29df3851446d47b5be3136c5e54eccf81914974715e088344251114f10697664 SHA512 cfc556a439834ef2b493d3f7ce7727d0e1e686d8c67a6f3fe21215a8eb630e20059ca32a13b45f69cfc2257c8c2c765fa080aed03cf27d2ec48545d7e6d611f1 WHIRLPOOL 73bc4c9567e07b5ecd9199b381a2cf918790c88701abeb5032dd1a1ce887431bfd3e51176ef362b76d3ff6750a8341f66a5ec826092a350a38b1ab64d7ff98c7
+MISC ChangeLog 46550 SHA256 2375c7d6dae48ae2593fc6e8a90fbafd01613308b9afc44253da8652d6dcc946 SHA512 942c3080d57e249b53bb2a32c090780e80873af9d5a5f21fd635f9b016ef0808c60394516149398c663f848a5fd7c0447b078b1748c07a85ddf9e28f2671ce23 WHIRLPOOL d9ae5cfdbaed8c863a624acea2ed9a6daae0824aecf924a168f9eff0a5378888156c0309a48e3c33ea3e522dc8a1594c166e5b4818a6367b7edd08eb92ccdbe2
 MISC metadata.xml 2420 SHA256 da8715c8e1b7319223b0e3b48a88ec7ce307efda73f98824fa2defb8b951c52b SHA512 720927dbf1abc75da95b9dacf20ca0553bd167341ef6fbc182c7fcb145d05702e2875ea7d43531140f82d0618e24ae68bae42d9a400ef73945a4d203c1ccbebc WHIRLPOOL 364cdd61304fa0645a6a0a0e293a89050e575a8d8d8f2e9d9862cb38073ab40d4c31f81fa8b27b4a84e20a0137dc8eedc2ac9e1a4e54b1a6f6432166d319601e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTUaCCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTWPa/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgsMYP/2MmT0gRMzpejF7+h5o82P7w
-EDVSOSOwxHvcqez3FU2BMLNcVVwjTElqnIIQ6T3OI8YRhO15QMKkZ2nIxofKxj7P
-I54QLDRqZgtz8Mj6bFlEBQzPNzeCn8l0uY4eRfz4vRrdc9mufLJJOv/vtZvGlqkT
-6XASThxv5hLYKA2bV4dSoy0ac3Ugu5Iwdb52z49iccdlY14eaLSoQ4XhlOZQQKnz
-1nBH6l1022Yjwuk+5CDKEgkNOOwGnOLujGv2Ly/SkPPl1XVfgW/BZu1R++3eKEyt
-soLubmHrHzziogYEiREEe0+24t2cbuN1YR3mb0G0WcSiaV5qC0kc+05OrqSFk8nf
-jdRbqjOvn2Mrbhr03ghifinxbNMlQFgLUTqsdNnjzAZfJdS/BHUAyIfRIl3KGXlJ
-bO0phpkCutW0zpu1vj4gNqpomcQfeBrDv+Ik6E2VH/PF1+yDchDO1nkTrMFDyWfo
-vnu+sQchY6u062bSBkmocerJh21wQcXkdQXnOzwOMQNkHP9Ackvb0KW3l3f/IDIy
-eHQWxtPb4NKtBv/xljOnp1J5HIJhVQPfFr9BAKK2cqZxDsyEx2VMqckuQedZ0+UJ
-P6atQt1KklNByEd1KjOAnnt17uCg1TZq+SKyn7KGOniinuhbFENnI7tw1Qrej590
-I04khXgMGwyfelDgV0fL
-=rZZH
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgwaAP/3Btd8FF5/gW+0jI4Qhmvdba
+w7ldHPMgup1KrJFu5/WsrREDiadywVjO2oju0hGkGHyHTMRZKrqIQ05ZKHLOp0Sq
+AnDK7whUsS/31luqopYRvcXpeSll6bNPaPCZlOvSPBJaKs+yI2Pi1o3ta2OidSdZ
+mH2ZQpQFJfO8hI+IZgudyS+ocSuRcL0kGLseUYbCuxGobJAEYzhEx0QHnm29oC3c
+XgST82EhePFwpquhs2M/I8fm/VIiEqOjwr8iTjBFQOe/q/9nigb2doVYHPGOPtKi
+GWqcBI5Lws9bKQWpYPEMDxlHxVYF9ZL0KJAzF+q6vqLem9ZEnINPwDv7/u8YBbSv
+Clz6ozCXRLaRDwz/h4x1VIA5lAf+/YKh+X2BlkAjR9nIVfK9d0pJdlqInMN2XKq3
+7choykEDGry7DRB3vklEjLXviJXuocUPuriKuCYsu2sQSICmUoiXWJFcZeT1gjLG
+JDLRLhQvX0ueCZ+upBCd2QW1uUXTVtmv3xWaP7Mm1tFKe3DSexqXRd0LnDh+qLJX
+iDukJb9g4vVOcPtkmBBA/dE3M8dXffr1uNy/1h+f0WI6Ybg+HzxA1VNqettZKSMG
+wSPnd8uZo0PbHjZdwBdER/aP9RwGUB6RZT3ZgSEejjz8CF+8jPShaizkF44lzsJ0
+hYqCsySFMvpRXq65xaIU
+=c0wq
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.70a-r1.ebuild b/media-gfx/blender/blender-2.70a-r2.ebuild
similarity index 98%
rename from media-gfx/blender/blender-2.70a-r1.ebuild
rename to media-gfx/blender/blender-2.70a-r2.ebuild
index 6b9d10576718..00f64c62c1ea 100644
--- a/media-gfx/blender/blender-2.70a-r1.ebuild
+++ b/media-gfx/blender/blender-2.70a-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.70a-r1.ebuild,v 1.2 2014/04/18 22:00:34 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.70a-r2.ebuild,v 1.1 2014/04/24 11:34:21 hasufell Exp $
 
 # TODO:
 #   bundled-deps: bullet is modified
@@ -142,7 +142,7 @@ src_prepare() {
 		rm -r "${S}"/release/datafiles/locale || die
 	else
 		if [[ -n "${LINGUAS+x}" ]] ; then
-			for i in "${S}"/release/datafiles/locale/* ; do
+			for i in "${S}"/release/datafiles/locale/po/* ; do
 				mylang=${i##*/}
 				has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; }
 			done
diff --git a/media-gfx/blender/blender-2.70a.ebuild b/media-gfx/blender/blender-2.70a.ebuild
deleted file mode 100644
index cfa842477d73..000000000000
--- a/media-gfx/blender/blender-2.70a.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.70a.ebuild,v 1.2 2014/04/14 17:40:03 hasufell Exp $
-
-# TODO:
-#   bundled-deps: bullet is modified
-#   multiple python abi?
-
-EAPI=5
-PYTHON_COMPAT=( python3_3 python3_4 )
-#PATCHSET="1"
-
-inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-
-case ${PV} in
-	*_p*)
-		SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;;
-	*)
-		SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;;
-esac
-
-if [[ -n ${PATCHSET} ]]; then
-	SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
-fi
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	player? ( game-engine )
-	redcode? ( jpeg2k ffmpeg )
-	cycles? ( boost openexr tiff )
-	nls? ( boost )
-	game-engine? ( boost )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-cpp/gflags
-	dev-cpp/glog[gflags]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=media-libs/freetype-2.0
-	media-libs/glew
-	media-libs/libpng:0
-	media-libs/libsamplerate
-	sci-libs/colamd
-	sci-libs/ldl
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg
-	virtual/libintl
-	virtual/opengl
-	x11-libs/libXi
-	x11-libs/libX11
-	boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] )
-	collada? ( media-libs/opencollada )
-	colorio? ( media-libs/opencolorio )
-	cycles? (
-		media-libs/openimageio
-	)
-	ffmpeg? (
-		|| (
-			>=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?]
-			>=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?]
-		)
-	)
-	fftw? ( sci-libs/fftw:3.0 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ndof? (
-		app-misc/spacenavd
-		dev-libs/libspnav
-	)
-	nls? ( virtual/libiconv )
-	openal? ( >=media-libs/openal-1.6.372 )
-	openimageio? ( media-libs/openimageio )
-	openexr? ( media-libs/openexr )
-	sdl? ( media-libs/libsdl[audio,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}
-	>=dev-cpp/eigen-3.1.3:3
-	doc? (
-		app-doc/doxygen[-nodot(-),dot(+)]
-		dev-python/sphinx
-	)
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-v${PV}
-
-pkg_pretend() {
-	if use openmp && ! tc-has-openmp; then
-		eerror "You are using gcc built without 'openmp' USE."
-		eerror "Switch CXX to an OpenMP capable compiler."
-		die "Need openmp"
-	fi
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \
-		"${FILESDIR}"/02-${PN}-2.68-unbundle-colamd.patch \
-		"${FILESDIR}"/03-${PN}-2.68-remove-binreloc.patch \
-		"${FILESDIR}"/04-${PN}-2.70-unbundle-glog.patch \
-		"${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \
-		"${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \
-		"${FILESDIR}"/07-${PN}-2.70-sse2.patch
-
-	# remove some bundled deps
-	rm -r \
-		extern/Eigen3 \
-		extern/libopenjpeg \
-		extern/glew \
-		extern/colamd \
-		extern/binreloc \
-		extern/libmv/third_party/{glog,gflags} \
-		|| die
-
-	# turn off binreloc (not cached)
-	sed -i \
-		-e 's#set(WITH_BINRELOC ON)#set(WITH_BINRELOC OFF)#' \
-		CMakeLists.txt || die
-
-	# we don't want static glew, but it's scattered across
-	# thousand files
-	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
-	sed -i \
-		-e '/-DGLEW_STATIC/d' \
-		$(find . -type f -name "CMakeLists.txt") || die
-
-	ewarn "$(echo "Remaining bundled dependencies:";
-			( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')"
-
-	# linguas cleanup
-	local i
-	if ! use nls; then
-		rm -r "${S}"/release/datafiles/locale || die
-	else
-		if [[ -n "${LINGUAS+x}" ]] ; then
-			for i in "${S}"/release/datafiles/locale/* ; do
-				mylang=${i##*/}
-				has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; }
-			done
-		fi
-	fi
-}
-
-src_configure() {
-	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
-	# shadows, see bug #276338 for reference
-	append-flags -funsigned-char
-	append-lfs-flags
-
-	# WITH_PYTHON_SECURITY
-	# WITH_PYTHON_SAFETY
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DWITH_INSTALL_PORTABLE=OFF
-		$(cmake-utils_use_with boost BOOST)
-		$(cmake-utils_use_with cycles CYCLES)
-		$(cmake-utils_use_with collada OPENCOLLADA)
-		$(cmake-utils_use_with dds IMAGE_DDS)
-		$(cmake-utils_use_with elbeem MOD_FLUID)
-		$(cmake-utils_use_with ffmpeg CODEC_FFMPEG)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fftw MOD_OCEANSIM)
-		$(cmake-utils_use_with game-engine GAMEENGINE)
-		$(cmake-utils_use_with nls INTERNATIONAL)
-		$(cmake-utils_use_with jack JACK)
-		$(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG)
-		$(cmake-utils_use_with openimageio OPENIMAGEIO)
-		$(cmake-utils_use_with openal OPENAL)
-		$(cmake-utils_use_with openexr IMAGE_OPENEXR)
-		$(cmake-utils_use_with openmp OPENMP)
-		$(cmake-utils_use_with opennl OPENNL)
-		$(cmake-utils_use_with player PLAYER)
-		$(cmake-utils_use_with redcode IMAGE_REDCODE)
-		$(cmake-utils_use_with sdl SDL)
-		$(cmake-utils_use_with sndfile CODEC_SNDFILE)
-		$(cmake-utils_use_with sse RAYOPTIMIZATION)
-		$(cmake-utils_use_with sse2 SSE2)
-		$(cmake-utils_use_with bullet BULLET)
-		$(cmake-utils_use_with tiff IMAGE_TIFF)
-		$(cmake-utils_use_with colorio OPENCOLORIO)
-		$(cmake-utils_use_with ndof INPUT_NDOF)
-		-DWITH_PYTHON_INSTALL=OFF
-		-DWITH_PYTHON_INSTALL_NUMPY=OFF
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_OPENJPEG=ON
-		-DWITH_SYSTEM_BULLET=OFF
-		-DPYTHON_VERSION="${EPYTHON/python/}"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	local i
-
-	# Pax mark blender for hardened support.
-	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
-
-	if use doc; then
-		docinto "API/python"
-		dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/*
-
-		docinto "API/blender"
-		dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/*
-	fi
-
-	# fucked up cmake will relink binary for no reason
-	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast
-
-	# fix doc installdir
-	dohtml "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -rf "${ED%/}"/usr/share/doc/blender
-
-	python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py
-	python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog
-	elog "Blender uses python integration. As such, may have some"
-	elog "inherit risks with running unknown python scripting."
-	elog
-	elog "It is recommended to change your blender temp directory"
-	elog "from /tmp to /home/user/tmp or another tmp file under your"
-	elog "home directory. This can be done by starting blender, then"
-	elog "dragging the main menu down do display all paths."
-	elog
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/freecad/ChangeLog b/media-gfx/freecad/ChangeLog
index 59332a6f9427..50ef385f5b4b 100644
--- a/media-gfx/freecad/ChangeLog
+++ b/media-gfx/freecad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/freecad
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.18 2014/04/24 04:48:12 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.19 2014/04/24 13:33:44 xmw Exp $
+
+  24 Apr 2014; Michael Weber <xmw@gentoo.org> -freecad-0.12.5284-r2.ebuild,
+  -freecad-0.12.5284-r3.ebuild, -freecad-0.13.1830.ebuild,
+  freecad-0.13.1830-r1.ebuild:
+  Drop broken ebuild revisions, re-add keywords on 0.13.
 
 *freecad-0.13.1830-r1 (24 Apr 2014)
 
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 41c46571447a..67dbba30167a 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -23,17 +23,14 @@ AUX freecad-0.13.1830-remove-qt3-support.patch 1165 SHA256 dab93f53d16aa2b22a4c9
 AUX freecad-0.13.1830-startpage-links.patch 5549 SHA256 14913231fd7f0314bc4c4c7be0c3b9ee689aea98ded2269a40b8e855c15da225 SHA512 1365d2099121a4aa186f6efbb9ff2345d8cec698226ea04ca81ee5b4da6759fb9944382eccafadc622969910c410f3afc07e8387287ad765518c49130fc75f9e WHIRLPOOL f26f73b76ce1734b5cc973f726a723dd23f0e6968b7a246b3ae3fbadcaf6e08d087c45aa99e472597bb5b9e8a297b36dcfc8e0ff6e33a56408b467216bdacffe
 DIST freecad-0.12.5284.tar.gz 48399004 SHA256 45486c6cc3ae212fd3eba994c603fd97962c7f505bf2a807d1533f9ee6d6026d SHA512 f1fee73ae7b43e7b3a136847f0dbb0b3f3e8f62ad3a9063f759efd8b9ed5a0dfff54961870465f37c0563161c4c5e2821f1f3379ead72dbdeddae36702e2ec0a WHIRLPOOL 7a46119d86a5d43ae8eaec6b5532e4739d54b0443769381630e644aa16c3f4185b63b513e4350c7562beacd86d56a7edbb3b506d10cb54190cbeaab48a504d5f
 DIST freecad-0.13.1830.tar.gz 70168706 SHA256 550ed16225e4cd67a463ae9b826f3a64edf7d2819cc8d235b15a89e10be72f13 SHA512 3e8d4eed8cace38da9615965f79a2b0da21d31a6df793ceaf3f732e0abd5666e9715ec9eb162e6ff998718e8d609a7dff2d0993b28f493200b734318a2322160 WHIRLPOOL 6d41565423edf8a0c67901a8559600ff1088f645c3ecb4aad8d7597490522f80d6475af3e7f5a623fc30b4d1571187bf6e6a132e6c480825798b957bea90bb83
-EBUILD freecad-0.12.5284-r2.ebuild 2097 SHA256 419b512d16428711c64a8c46f8b3d0ddde058d6cf95de09d5be2af793426df70 SHA512 0d6fee89ff0430d5dac2ed4222cc40f4c1777e1658fea642d04423f096b5c032137428508c308ad3f7fa4155240e9ed8752f07d5947514b7386afe777b37a15d WHIRLPOOL 6a5717f4e476c53586e85b6515bb91927568a379d15a218e3197c7b6e0fae5770ddf2c302cf575337f3d29effdbad8782f543577b578b0a1103490943657d2e4
-EBUILD freecad-0.12.5284-r3.ebuild 3608 SHA256 bbc6fd370e9380669946cbb34d4719e89c3473ee0ddcd3c04b38a6810b7301b6 SHA512 d3f37013ae47e8fb5a8d376ba328b56dc56c76756531e22cffa0e31753a3ba44779b3df92b61e8ecdb19066ca99d21f9b84e2b9ccde2f389032b7f5ffe059ddd WHIRLPOOL d8c68f0b1b99f4bad9b3dd0aa0a9657f72e7af7bcd371a511c6c2d27cc8c5933266cfef11fe5530a8e7796f7b1611bd93ff8181aad1c3d8f7df8e72c91eec341
 EBUILD freecad-0.12.5284-r4.ebuild 3713 SHA256 37dc7913965f3a0b686b70c1f66b47f248a188b3294ac5b892b8f13d98d91c71 SHA512 91efeaedc89df00c3d1495720915a46c63eb856ff343871a5dbe179d5e96e5d6f1326e4b101fb12d2386f93cbafa456ccc7157bd849822c7b8aead53c9ccc3b7 WHIRLPOOL 7722d4698937a98f75516352790bbd9efade325325152a0f74712d414fa8d38f6f5dba6670a12538185a81aa9b5fbc793fb7efa44531cec204aa597b9952bc0d
-EBUILD freecad-0.13.1830-r1.ebuild 4591 SHA256 f5a3a8896fc53a5f76cd903865951b1d08761bb9f79a74d1fc29fe05f0762421 SHA512 f13e2ef3ab9e09d37717920a6e2cb66c7ecc90ec254174acb9d629345639174b385e3f5b04778ad289ebdb9917fc63993b400f11714e6723e9512ebde3bc55c2 WHIRLPOOL add039a109515ca4b8660af9ab35c7e8af4cf605f38fabb22aef077a1f0cb6874479e14ff2ad49007da2928d34802a09ed5a28583044d6f5b6bd234f54d3b806
-EBUILD freecad-0.13.1830.ebuild 2209 SHA256 856b8f575926dbc9f8da985e4e97d622dc5e464a3e86871e48efb7a704a2c796 SHA512 aa8c174b800911b3db2ec5d05c5df3bd4b6edce65fc0253ccc7cd9cc3aee47d96b1e58ad94ed9097b716817d3d0460873b5a66ab072c062d1d5ff505c64921f2 WHIRLPOOL 3cb896e16c8ee161ec1b0f63853d2d69c04bcbfaa734b007bdf069dff01601d0b49971d582b044102a06aaa3a43a2a4ba94ee4c20eaaa8222fb15aba857426ff
-MISC ChangeLog 4249 SHA256 937513af8d0e9616bfcb1c8d07a4b47e7876359e873efcd1b596de02f5c4dfb7 SHA512 8183f6d3ffff2fbdfb8899b36df7684359d83457e2122b5a6183942780e7858aacecf5045307128fa8bbd3131f21d3bbdedb1592d246d86879ac3db928a5576b WHIRLPOOL 23790accc48c623eca940992bffe7a50dd1331cc09a6e268a8bd080d9cee483aca05ff7e0e7f90bcf26f0eb0aa67c6e5d0d0ad5ce3fe3beffb4ed144aa8684c3
+EBUILD freecad-0.13.1830-r1.ebuild 4563 SHA256 2cd26ec82f5e08f23500995dd68523ce988dabda6d8c109c0327b44728111b2c SHA512 8cc404edb0e0da0cd08450dd4aaa50c82eeb8c5f9b55edb3a521fd1c9b0e70d7f3631d9f6a1e680235e9a860698a50c84e014bf019b22e0c2c9e5126b8e30a93 WHIRLPOOL f61232ce00dc2766ec7982e222c88427e819e7ee59215c98e1122081252d5e831aaac4ad0970e924e39145a05a72ce6c59b44355a75dd9dca2420792bd026f4f
+MISC ChangeLog 4473 SHA256 f42d4fd291d33c8107aa0727a090d7bc41be2c892d2fa20ff3ce69a129c9df41 SHA512 2575e5cd322d7f52704cf46e16bf731c4a938eac43821ede779b0db0f94c8ceb0c90e5d837fb9de5086790a683e03e01423aeb0202985962c083876e4217ee9d WHIRLPOOL f799c9ff26e8dc8a02eb06bcc9f84d63698c5b53215902a96fd8402465dfd7f347cd525471a4a052bdc63a42229fb5ff336ce2c4af6addc606adff5970a2f6de
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF0EAREIAAYFAlNYl40ACgkQknrdDGLu8JCeIQD3YarNjquK1jNdbxxO8aATITHj
-8d6/eZReXJ5SlHBVngEAj6hossZF8KeX1RAklhu2c3c08Ns7hkcwsE1H3eAt518=
-=UmZF
+iF4EAREIAAYFAlNZErkACgkQknrdDGLu8JC25wEAhoEwusx8r8ifo01o4NEwTJn3
+WNg+v4njABac0vPEdf4A/1Ylha7U7lGrFoekelcjCB1rELFn3Txl7ioEx+aCULDS
+=sSvo
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/freecad/freecad-0.12.5284-r2.ebuild b/media-gfx/freecad/freecad-0.12.5284-r2.ebuild
deleted file mode 100644
index dc7ea5b04cb3..000000000000
--- a/media-gfx/freecad/freecad-0.12.5284-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r2.ebuild,v 1.7 2013/03/07 15:54:35 axs Exp $
-
-EAPI=4
-PYTHON_DEPEND=2
-
-inherit base multilib fortran-2 flag-o-matic python cmake-utils
-
-MY_P="freecad-${PV}"
-MY_PD="FreeCAD-${PV}"
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="http://sourceforge.net/apps/mediawiki/free-cad/"
-SRC_URI="mirror://sourceforge/free-cad/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-games/ode
-	dev-libs/boost
-	dev-libs/libf2c
-	dev-libs/xerces-c[icu]
-	dev-python/pivy
-	dev-python/PyQt4[svg]
-	media-libs/coin
-	media-libs/SoQt
-	>=sci-libs/opencascade-6.3-r3
-	sci-libs/gts
-	sys-libs/zlib
-	virtual/glu
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsvg:4
-	dev-qt/qtwebkit:4
-	dev-qt/qtxmlpatterns:4"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.4-r1"
-
-RESTRICT="bindist mirror"
-# http://bugs.gentoo.org/show_bug.cgi?id=352435
-# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-
-S="${WORKDIR}/${MY_PD}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc46.patch"
-	"${FILESDIR}/${P}-removeoldswig.patch"
-	"${FILESDIR}/${P}-glu.patch"
-	"${FILESDIR}/${P}-nodir.patch"
-	"${FILESDIR}/${P}-nopivy.patch"
-	"${FILESDIR}/${P}-qt3support.patch"
-	"${FILESDIR}/${P}-boost148.patch"
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	base_src_prepare
-	append-cxxflags -fpermissive
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DOCC_INCLUDE_DIR=${CASROOT}/inc
-		-DOCC_INCLUDE_PATH=${CASROOT}/inc
-		-DOCC_LIBRARY=${CASROOT}/lib/libTKernel.so
-		-DOCC_LIBRARY_DIR=${CASROOT}/lib
-		-DOCC_LIB_PATH=${CASROOT}/lib
-		-DCOIN3D_INCLUDE_DIR=/usr/include/coin
-		-DCOIN3D_LIBRARY=/usr/$(get_libdir)/libCoin.so
-		-DSOQT_LIBRARY=/usr/$(get_libdir)/libSoQt.so
-		-DSOQT_INCLUDE_PATH=/usr/include/coin
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	find "${D}" -name "*.la" -exec rm {} +
-
-	dodoc README.Linux ChangeLog.txt
-}
diff --git a/media-gfx/freecad/freecad-0.12.5284-r3.ebuild b/media-gfx/freecad/freecad-0.12.5284-r3.ebuild
deleted file mode 100644
index 694692857a4d..000000000000
--- a/media-gfx/freecad/freecad-0.12.5284-r3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r3.ebuild,v 1.2 2014/04/23 22:49:07 xmw Exp $
-
-EAPI=5
-
-PYTHON_DEPEND=2
-
-inherit eutils multilib fortran-2 python cmake-utils
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="http://sourceforge.net/apps/mediawiki/free-cad/"
-SRC_URI="mirror://sourceforge/free-cad/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-cpp/eigen:3
-	dev-games/ode
-	dev-libs/boost
-	dev-libs/libf2c
-	dev-libs/libspnav[X]
-	dev-libs/xerces-c[icu]
-	dev-python/PyQt4[svg]
-	dev-python/pivy
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsvg:4
-	dev-qt/qtwebkit:4
-	dev-qt/qtxmlpatterns:4
-	media-libs/SoQt
-	media-libs/coin[doc]
-	sci-libs/gts
-	sci-libs/opencascade
-	sys-libs/zlib
-	virtual/glu"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.4-r1:0"
-
-# http://bugs.gentoo.org/show_bug.cgi?id=352435
-# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/FreeCAD-${PV}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	einfo remove bundled libs
-	rm -rf src/3rdParty/{Pivy{,-0.5},boost}
-	einfo cleanup build system
-	find . -name "configure*" -print -delete
-
-	epatch \
-		"${FILESDIR}"/${P}-gcc46.patch \
-		"${FILESDIR}"/${P}-removeoldswig.patch \
-		"${FILESDIR}"/${P}-glu.patch \
-		"${FILESDIR}"/${P}-nodir.patch \
-		"${FILESDIR}"/${P}-qt3support.patch \
-		"${FILESDIR}"/${P}-boost148.patch \
-		"${FILESDIR}"/${P}-nopivy.patch \
-		"${FILESDIR}"/${P}-no-permissive.patch
-
-	local my_cas_version=$(eselect opencascade show 2>/dev/null || echo 6.5)
-	if [ "${my_cas_version}" > "6.5.0" ] ; then
-		epatch  "${FILESDIR}"/${P}-occ-6.5.5.patch
-		epatch  "${FILESDIR}"/${P}-salomesmesh-occ-6.5.5.patch
-	fi
-
-	local my_coin_version=$(best_version media-libs/coin)
-	local my_coin_path="${EROOT}"usr/share/doc/${my_coin_version##*/}/html
-	sed -e "s:/usr/share/doc/libcoin60-doc/html:${my_coin_path}:" \
-		-i cMake/FindCoin3DDoc.cmake || die
-
-	sed -e '/FREECAD_BUILD_FEM/s: ON): OFF):' \
-		-i CMakeLists.txt || die
-	#sed -e '/add_subdirectory(Fem)/d' \
-	#	-e '/add_subdirectory(MeshPart)/d' \
-	#	-i src/Mod/CMakeLists.txt || die
-}
-
-src_configure() {
-	local my_occ_env=${EROOT}etc/env.d/50opencascade
-	if [ -e "${EROOT}etc//env.d/51opencascade" ] ; then
-		my_occ_env=${EROOT}etc/env.d/51opencascade
-	fi
-	export CASROOT=$(sed -ne '/^CASROOT=/{s:.*=:: ; p}' $my_occ_env)
-
-	local mycmakeargs=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/inc
-		-DOCC_INCLUDE_PATH="${CASROOT}"/inc
-		-DOCC_LIBRARY="${CASROOT}"/lib/libTKernel.so
-		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
-		-DOCC_LIB_PATH="${CASROOT}"/lib
-		-DCOIN3D_INCLUDE_DIR="${EROOT}"usr/include/coin
-		-DCOIN3D_LIBRARY="${EROOT}"usr/$(get_libdir)/libCoin.so
-		-DSOQT_LIBRARY="${EROOT}"usr/$(get_libdir)/libSoQt.so
-		-DSOQT_INCLUDE_PATH="${EROOT}"usr/include/coin
-		-DCMAKE_INSTALL_PREFIX="${EROOT}"usr/$(get_libdir)/${P}
-	)
-	cmake-utils_src_configure
-	ewarn "${P} will be built against opencascade version ${CASROOT}"
-}
-
-src_install() {
-	cmake-utils_src_install
-	insinto /usr/$(get_libdir)/${P}/Mod/Start
-	doins -r src/Mod/Start/StartPage
-
-	prune_libtool_files
-
-	make_wrapper FreeCAD \
-		"${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCAD \
-		"" "${EROOT}"usr/$(get_libdir)/${P}/lib
-	make_wrapper FreeCADCmd \
-		"${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCADCmd \
-		"" "${EROOT}"usr/$(get_libdir)/${P}/lib
-
-	newicon src/Main/icon.ico ${PN}.ico
-	make_desktop_entry FreeCAD
-
-	dodoc README.Linux ChangeLog.txt
-}
diff --git a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
index 3e648613f660..e467a23187bc 100644
--- a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild,v 1.1 2014/04/24 04:48:11 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild,v 1.2 2014/04/24 13:33:44 xmw Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/free-cad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="dev-cpp/eigen:3
@@ -69,7 +69,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-CMakefile.patch
 	epatch "${FILESDIR}"/${P}-avoid-include-salome.patch
 	epatch "${FILESDIR}"/${P}-startpage-links.patch
-	#epatch "${FILESDIR}"/startpage.patch
 
 	# disable Machining Distortion workbench because FEM will be disabled in src_configure()
 	# and also because the same module has been removed upstream (commit c0e2c9)
diff --git a/media-gfx/freecad/freecad-0.13.1830.ebuild b/media-gfx/freecad/freecad-0.13.1830.ebuild
deleted file mode 100644
index 6dfc820a387e..000000000000
--- a/media-gfx/freecad/freecad-0.13.1830.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830.ebuild,v 1.2 2013/05/09 08:36:38 xmw Exp $
-
-EAPI=5
-
-PYTHON_DEPEND=2
-
-inherit eutils multilib fortran-2 python cmake-utils
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="http://www.freecadweb.org/"
-SRC_URI="mirror://sourceforge/free-cad/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="dev-cpp/eigen:3
-	dev-games/ode
-	dev-libs/boost
-	dev-libs/libf2c
-	dev-libs/libspnav[X]
-	dev-libs/xerces-c[icu]
-	dev-python/PyQt4[svg]
-	dev-python/pivy
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsvg:4
-	dev-qt/qtwebkit:4
-	dev-qt/qtxmlpatterns:4
-	media-libs/SoQt
-	media-libs/coin[doc]
-	sci-libs/gts
-	sci-libs/opencascade
-	sys-libs/zlib
-	virtual/glu"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.4-r1:0"
-
-# http://bugs.gentoo.org/show_bug.cgi?id=352435
-# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="bindist mirror"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	einfo remove bundled libs
-	rm -rf src/3rdParty
-
-	epatch "${FILESDIR}"/${P}-remove-qt3-support.patch
-}
-
-src_configure() {
-	local my_occ_env=${EROOT}etc/env.d/50opencascade
-	if [ -e "${EROOT}etc//env.d/51opencascade" ] ; then
-		my_occ_env=${EROOT}etc/env.d/51opencascade
-	fi
-	export CASROOT=$(sed -ne '/^CASROOT=/{s:.*=:: ; p}' $my_occ_env)
-
-	local mycmakeargs=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/inc
-		-DOCC_INCLUDE_PATH="${CASROOT}"/inc
-		-DOCC_LIBRARY="${CASROOT}"/lib/libTKernel.so
-		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
-		-DOCC_LIB_PATH="${CASROOT}"/lib
-		-DCOIN3D_INCLUDE_DIR="${EROOT}"usr/include/coin
-		-DCOIN3D_LIBRARY="${EROOT}"usr/$(get_libdir)/libCoin.so
-		-DSOQT_LIBRARY="${EROOT}"usr/$(get_libdir)/libSoQt.so
-		-DSOQT_INCLUDE_PATH="${EROOT}"usr/include/coin
-		-DCMAKE_BINARY_DIR="${EROOT}"usr/bin
-		-DCMAKE_INSTALL_PREFIX="${EROOT}"usr/$(get_libdir)/${P}
-	)
-	cmake-utils_src_configure
-	ewarn "${P} will be built against opencascade version ${CASROOT}"
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	prune_libtool_files
-
-	dodoc README.Linux ChangeLog.txt
-}
diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index c4d179384d9e..481054b92480 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/shotwell
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.68 2014/02/21 14:24:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.69 2014/04/24 12:37:09 jlec Exp $
+
+*shotwell-0.18.0 (24 Apr 2014)
+
+  24 Apr 2014; Justin Lecher <jlec@gentoo.org> +shotwell-0.18.0.ebuild:
+  Version BUmp, #507918
 
   21 Feb 2014; Justin Lecher <jlec@gentoo.org> -shotwell-0.13.1-r2.ebuild,
   -shotwell-0.14.0-r1.ebuild, -shotwell-0.14.1.ebuild, -shotwell-0.15.0.ebuild:
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 17ad96f478e2..f7f67eee98c8 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -5,25 +5,27 @@ AUX shotwell-0.13.1-gst-1.0.patch 10251 SHA256 6f8ba6762f9e6d353881896b61a9ef2a6
 AUX shotwell-0.13.1-ldflags.patch 1142 SHA256 d7fe75551807d7998c9494c9c065c611f98dbfd8db2b09bed8a1430048063b12 SHA512 036a99134afb69ab8f7ded853aec427f5c3289cab753c1796be71e75544ae18fdd628a82c628c1f6939c852c6abaf3b2841b4155fdb4831a8c091bdc5761d5c3 WHIRLPOOL 088c4fa519c32d36f663411468daa0b5547855d3d744f148282ea86c5743a4601669f2b82a9d5581a1dc34dfce3b001ee55810a96515e1db6316985857a1ed3b
 AUX shotwell-0.14.1-libraw.patch 1896 SHA256 f6bb9be6b5b03adcc2aab4d8cf1d7cdc564efec1ccd012283740ef3fd9f7d959 SHA512 bd0cfffefe61d46c341f97564e98fe7af306a345765098ec7410eec86e2985f00b355e13fcb2824051a371876705ef30a1f0ef862293725f6c2764cd19f86649 WHIRLPOOL fbab77a21df7c5689c1c8840b8a1f8a9d5694a9f0cb0c1fd712e0a2259db95ba701c3aa382a15ed6765a3b1a1edbc865f034cfc2c18066835e847f815e88d1b9
 DIST shotwell-0.15.1.tar.xz 1676428 SHA256 eb48a0398774f172feaa4461146cc81a99540147bd8751c1e2091b21d4c20b8b SHA512 e660e6afe49e8fe51e4021899b8a56bc81a2e606769f4a7720146220cea1007960574dd6f1890d0decb9da79ed4d9b29b6f70ad7b2be0169d44689324fcc647a WHIRLPOOL 749b4e9505fcd6ad196d4a60873e1a80cf40c6b770f99d9df6303a63231fa407d86efed7710d8f42afc3fc131b5804b696f58a6c582a1b9194ebe8ef822efaaa
+DIST shotwell-0.18.0.tar.xz 1727216 SHA256 6717b73cb243918ae71d251fddae27d0967a1d26727b43beefc40d3782fe0033 SHA512 42fbb0840bb64b07512381695b2b0b076b5fd574e3c23cfed9b8722d49b87574ee2d1edc7c10cefbbda3da01f80a2e5162ea9e7d1b48d6f6c416a84f2b3d6fca WHIRLPOOL cc05498afb05d5d1e15a120f2a943aaa868efca0af4ece7597c6299eb02f32005c363f4abe8ace09abee213f595a4f5eea3aeb95f9998fe24bd3e734d66e8d5b
 EBUILD shotwell-0.15.1.ebuild 2802 SHA256 680d0dba406afb768b43df310e9ecbbf4f0db0bada6a30b4df0cbcf19f533dd6 SHA512 e2480847e9e6ebe10a94dff8858072db1d1896f42443ba7f4114bca17a6dbfef85fcc7dc4370ed5b2d4d6f48acd9952d212c0ae86e455c345110af8864ef6440 WHIRLPOOL c8916bedf02e87f457ed69a0d4556040983c4f2e5342197ec67906c877e7fd87c5587e0acbfa968066014785748f7ff2416d879e61c0033ccdcf94fb4038ddf0
-MISC ChangeLog 10633 SHA256 a579cbdf3647cbd9dfcb6839c8d2914deff1983c55cf8cda3224e1c1687412b5 SHA512 f878cad9f154320713eed3310d8faeb8dfbdb2a6ae27c1aa6d06addf503adf3593500224b6f916490242b3ac339914b4a88cf0b8fd7e73908fc75b1402376ac3 WHIRLPOOL b491f843b3b6061b31658e5554ccda6b4ea1e69bb726f5db7f6bd5e5baf41c0a7e7e6a94d80a65ea5629aef21e8a1a33eb7351c5593e2e72fb2f02a1035ba263
+EBUILD shotwell-0.18.0.ebuild 2573 SHA256 f4891833b6a9da4550a297c496192b63dc26f1e0b9ee85484a65517601ce4cdc SHA512 2dce8d709856258e9c17736ea41249f94cdad3e90c10d2d35cedfe912dda1b115de78800ae94b345bd08c72843f3e031363b4df26bc1cb301328a1e1688639fd WHIRLPOOL 3f849fa66af1836cc31954f087ab3b3be1fbc9860250e407808daf56059d473370d6a525c49e46af9bd027218dd47fdda02c44c3115a6ecfc5ca9946052bf8c4
+MISC ChangeLog 10762 SHA256 050bb7c93629d867a0c7a4ea5baee6e21026f7908f956d3de60c9ceda537029b SHA512 00dd56a203e67817acba3f239c696d2666e6ff829105f51d80a9df620af52d5dfdb4c9a4f0f479203523069eaa5d1ed325f8e3732f7f58d8d685be5701dd09e2 WHIRLPOOL 536de20529cdd6caaabe5a536b9e51b96d9b53002fe23d9bced63637e66c8c0328b969510ece2871ab6960965e54160980da52ab095177abb472512c94cc918a
 MISC metadata.xml 665 SHA256 d7ed9e0a0af566d5e6891e77c0b69c49df16b5d291f0126243892a3ec36aaedf SHA512 4bc0078d47452551bc043e9fb6d1774db44b9b2cf67ee581e9cdeeffb86b198c13753c7595638e1feedc9c876457d1d5393d064d6535f1b2283bcec43c861300 WHIRLPOOL e3bd5f1dc118225520d15e289e901c686478707b39e4aff702ae0d33ad7005f158874686d7d49ce2e5f18faeb920e612a109c0c9e6f4bd737a24b58578e7c088
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJTB2G4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTWQV5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirQJ8P/AooRuHiPY+QbFx4iKCt2cl2
-uhiwD1oE6ERK8/fF58rtD+C9XazischT/RlZak2hopNKGx3G2b4e9CgeEZ53z1KK
-UKeM3v37WHxmtaUwUtvhlyb8Ty4Le8DlpmB0L3e/Z/Lw3w3aRI6zrmQxCumsHDu8
-4MMYIspqRST54hLX3N7vQymwvJU8M5xKsReWmVdILOh2gb5URTl1X1uZOU1fI0B2
-7m35S0o8s+tb1XnMEOH5HjErNAH6BtqQNFq82yo3P5fPjmI1jipGhJ9DJSJV60Zx
-H4LqUvNpcyAKRNUXunYLIltlE2Te+/LYbsfnNwv9qzEr/5hAn7dMVX71pmUEcdma
-NHcqTeAcyqfJnu+t75Q5sUeR8+VqRdUYQDJyAsgf/8+0jQlvD4W7FBx9E+3V545B
-tUWrbrYIxM1cPUeywKF8v9gDkIIxHHSkOJ1SDe6m2j5ZXxVkWkJk1S2fWeCdHXLq
-0O+fpf/xsQaVcPnmYg/JnFiDoumF5+uhcf7523zxiCmMlX99LTc6wqfQYc0RLA75
-Eyjlck/zRIWpkQcz0mVIdhxmXEx29J4pwQsO+9rPGe9NE43y3td5F3NA6JaTUiHA
-KpehRAI42BPyJ/iTITDgeMDZFcZgj+o8VOn213/au9C7lEw+PnlhjdZNHGpnq25J
-ihu1aEBHgE5spfBr6SMI
-=kqfE
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirfFQP/0OAisfsZVJItfKFKVrqmQ0j
+Cf5dh1Rrk/b/TPTe8Zle1zdL7w5JyIkZVue7ZjJ9LMa8xic1gF/LcjkyG1fh6Q/a
+WzOZiQqJ0YHETAiEKIoHDy+9drT7uQM8Tf30jzk2SCk1yVFs5Tm7ZEhayhTlDvrc
+AnLzD6vVzTLbgkcpLcqBm3OhUVt6xeQDhvYgJLL7E8wYovJljxCy8mnOiHX/epUo
+R4cNp1jkjQS7VjwzA3EFyMqSaMAjlC1b9VO6n66MgWOkkxnup44MBYmpknSMkumi
++EgPtKhgsLONEA/G43YgoIwQeTPRevXojz1TNTLbnzbxadcomNyV6FS0jbP0f8mu
+Nm5OuD7gnL7ojCTe/0R+JrRVlpn88CBEuVdZDWZR9LH4RCfNpLOlFxtIkOrbzKSR
+E8oxugV0UuVyzCnrLMW4gMo54Vm7Nx33kq3yGarb1zBMdhSH2FToNgIydhsOaMzj
+byfqKdkF+HUGpB+Dn+dBO9BjX+d6etbbWPSsrfDVz8UxJDZXiHZEYFw2p44y8XLg
+PXern07Ku1q7RizEEtoeO6ry9Q+ZLV+mzTtdi4PJbDoCJzVrhw/Lycvgm/fh/pdc
+DvSPNQtchakcn+oErI+sCKxORhZm3c8DfuXw8BiprFzC9dgiDOHb6lIBevWNe4/Z
+7qkPU7W7cxjKDnNzNmwq
+=Sj8v
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/shotwell/shotwell-0.18.0.ebuild b/media-gfx/shotwell/shotwell-0.18.0.ebuild
new file mode 100644
index 000000000000..732b6e269fcd
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.18.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.18.0.ebuild,v 1.1 2014/04/24 12:37:09 jlec Exp $
+
+EAPI=5
+
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.20"
+VALA_MAX_API_VERSION="0.22"
+
+inherit eutils gnome2 multilib toolchain-funcs vala versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="http://yorba.org/shotwell/"
+SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+CORE_SUPPORTED_LANGUAGES="
+	af ar as ast bg bn bn_IN ca cs da de el en_GB eo es et eu fi fr gl gu he hi
+	hr hu ia id it ja kk km kn ko ky lt lv mk ml mr nb nl nn or pa pl pt pt_BR
+	ro ru sk sl sr sv ta te th tr uk vi zh_CN zh_HK zh_TW"
+
+for x in ${CORE_SUPPORTED_LANGUAGES}; do
+	IUSE+="linguas_${x} "
+done
+
+RDEPEND="
+	app-text/gnome-doc-utils
+	>=dev-db/sqlite-3.5.9:3
+	>=dev-libs/dbus-glib-0.80
+	>=dev-libs/glib-2.30.0:2
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libgee-0.8.5:0.8
+	>=dev-libs/libxml2-2.6.32:2
+	>=dev-util/desktop-file-utils-0.13
+	gnome-base/dconf
+	>=media-libs/gexiv2-0.4.90
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-libs/lcms:2
+	>=media-libs/libexif-0.6.16:=
+	>=media-libs/libgphoto2-2.4.2:=
+	>=media-libs/libraw-0.13.2:=
+	>=net-libs/libsoup-2.26.0:2.4
+	>=net-libs/rest-0.7:0.7
+	>=net-libs/webkit-gtk-1.4:3
+	>=virtual/udev-145[gudev]
+	>=x11-libs/gtk+-3.6.0:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=sys-devel/m4-1.4.13"
+
+DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )
+
+# This probably comes from libraries that
+# shotwell-video-thumbnailer links to.
+# Nothing we can do at the moment. #435048
+QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
+
+pkg_setup() {
+	tc-export CC
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
+		--disable-desktop-update
+		--disable-icon-update
+		--prefix=/usr
+		--lib=$(get_libdir)"
+}
+
+src_prepare() {
+	vala_src_prepare
+	sed \
+		-e 's|CFLAGS :|CFLAGS +|g' \
+		-i plugins/Makefile.plugin.mk || die
+	epatch \
+		"${FILESDIR}"/${PN}-0.13.1-ldflags.patch
+}
+
+src_configure() {
+	./configure \
+		${G2CONF} \
+		|| die
+}
+
+src_compile() {
+	local valaver="$(vala_best_api_version)"
+	emake VALAC="$(type -p valac-${valaver})"
+}
+
+src_install() {
+	gnome2_src_install
+	for x in ${LANGS}; do
+		if ! has ${x} ${LINGUAS}; then
+			find "${D}"/usr/share/locale/${x} -type f -exec rm {} \;
+		fi
+	done
+}
diff --git a/media-libs/ladspa-cmt/ChangeLog b/media-libs/ladspa-cmt/ChangeLog
index 1e1358688986..47ee95afcd1f 100644
--- a/media-libs/ladspa-cmt/ChangeLog
+++ b/media-libs/ladspa-cmt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/ladspa-cmt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ChangeLog,v 1.53 2014/04/18 22:18:09 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ChangeLog,v 1.54 2014/04/24 13:30:26 hasufell Exp $
+
+  24 Apr 2014; Julian Ospald <hasufell@gentoo.org> ladspa-cmt-1.16-r3.ebuild:
+  fix deps
 
 *ladspa-cmt-1.16-r3 (18 Apr 2014)
 
diff --git a/media-libs/ladspa-cmt/Manifest b/media-libs/ladspa-cmt/Manifest
index c36aa4cc3178..af73930c4f04 100644
--- a/media-libs/ladspa-cmt/Manifest
+++ b/media-libs/ladspa-cmt/Manifest
@@ -9,26 +9,26 @@ AUX ladspa-cmt-1.16-sa.patch 666 SHA256 77e9b19bcd4ea40438995b7553edbaf051300406
 DIST cmt_src_1.16.tgz 63909 SHA256 512a1d7e698b9e0e7c692202c29f4bd70846d52241ec254e1a324abaef405635 SHA512 be4aaa064183b6121b4ca8d7d2535cb9a3bcb557e3a2f22b45ec9775b0e296f70a9a7edf697b78095d6ef1564bb5459bb742649082ac724d1774c0790379af21 WHIRLPOOL 7daeaf8dfc30c1acb6b9387fe96ac55121f136c355c7cb0d48d402ac8c9ea2fcabf6f3d436ed009c65d9cafcedab2ed705204ef34e7f4a24dbcdca0054cbc0d8
 EBUILD ladspa-cmt-1.16-r1.ebuild 1372 SHA256 137ccd853a67566a2cf0f8fa81c928416feb0e1bed607107ff726093f47bae13 SHA512 61d9d883af6f3d5366d963c20c885a797ae988f52f950351e6c439d33da9e037000bf18b93c9a83e4eaa8ef4bb8cd9418856cb113c73836700d89ae2bfe0b39f WHIRLPOOL 2af7da7d035c6cff482374b443af834f4d9c6243b65e3b2640d1e2d1eea13ef70a83b5a56d32579bab6755c38f228e4dec0dc853b00d93f440acf610368fc3b6
 EBUILD ladspa-cmt-1.16-r2.ebuild 1396 SHA256 d22ca08ed3bbd38cb726e5294120a9f04111d0e5bc29a3d28200ada56cf02778 SHA512 45ddad9e40e9faafa63df03c49319a664b667c4cc31354b7929069e62fa8297207f4f60bf38c570490e484a75e687fba6cbfe1717490ba44134df9d21f5c9683 WHIRLPOOL 092a710e3a2689f41165bb542ca2a373c0db2909185ba337d1febc8303c5f4d486622576e9a3afd93ce9d49c7e3217a1dc67abb1f10ea43efd62eb079b541eb6
-EBUILD ladspa-cmt-1.16-r3.ebuild 1504 SHA256 250f80674ed47ebdf0d8d06bdc561751082c8b5b419b08de486575a9a3be4adb SHA512 8f7d830c3b7f03799a25d9efd47346bb9d960e90ad59f7c4569ec5e5a877ad56376987eb1bcbf723736e101a284285c1e25d44621d76abf41ce6ff856cf5fbf4 WHIRLPOOL 091b83b91332041732257ee53b59249c2683f374d3ec5797af418a693228f2058a376c4a62ab0740c4d3b025945edb00305f38866bf0bb6b14c3a1acd90a8ff6
+EBUILD ladspa-cmt-1.16-r3.ebuild 1484 SHA256 d115794aa9a81f646c62401594e5f30072c0c927725608a3ee5f1a05140bcb33 SHA512 c5f477e7d22c196d68c2947e3e91ed05cd0540cfa6b191e91052b24f28e1867e801ab9867e87fe1903426f3df79ae4fbfffbf2dff1b6d2d6fac98cb81823c684 WHIRLPOOL 2c25bd95ca172cfacc92c890932f40aca0850dd17d0af4a2e2e13505552eafb25a8e32e509c0de5bbb3f1de0218b67472667cc8b7dc673fa845d798665610039
 EBUILD ladspa-cmt-1.16.ebuild 1407 SHA256 42d004cf8cb85052f5e5709de20e9c12d607ce5426182f415a1683d16d03ceff SHA512 5a3c0014a1f79c61d810abb6338d91f576cb1805465ba52a3362cf441179e5c376081cef005e5f6dc3bd1668c12eb0b6eeef477c1097b5ccc701dd99882ec054 WHIRLPOOL d6fba353e1a0bc2e1497a9582f7d3200d9b6a03ad0bdf8ba472ea8be200ba88303dcde212073a77c7ca5f7d4bbed8eee251fb6109166f77697edf62282255f4b
-MISC ChangeLog 6619 SHA256 7aa04881f613b6900dcded509af1c75f38c22d8666799f07709c0b617325aa05 SHA512 43d2f13730bd4e3d863ebbb3573545f9db6e0bd142aea5869ac934bf73dfcbbdf9f1f58057cd4aa164e0d7a4b841e15fb9723b6f3d68682f1c34ba218a49d9a2 WHIRLPOOL aed498fa7d2c2765dbbafc48904e66bb61d082dd64187c07268deb341413d243915a755a97185f5f2e192f59b713a4f9ae1a8d866ae045a5c0f1eaf9bd2e433f
+MISC ChangeLog 6709 SHA256 57668cd402d3a653e446a07375c26539c4896a8ac5a3a0e89ea21657de836dc3 SHA512 83b7d5c57ac84070b576d82328f3a24e8fa5727d42edabdf220e8b0f09d421ead795d0e57b494898759303c99826c735a923825a09316c1b4e13687de81c0161 WHIRLPOOL a3e814e81a9176746230bb340b0bf0edea60db260081666a40b51d0853e6d5160ba52d0f732739dca3d017826a3e309df98216b87ad9b13f56831f9c06b0c1a5
 MISC metadata.xml 161 SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e SHA512 e9f8695c64d7b6aa86b9b6186490d50b5a75d593ac1c86b9698265c6345899c64fa712acdde3bdbfb2464139e44623efdae29b67b73c1c85bcbedfbd10e874fd WHIRLPOOL c01ec8b583f907a3a62da7d5bf74d09809244709021f437dc3f0064b2d52baa3dd4386369b46a9fd74020146017cf6117ad04b147e8538b1a2c7202e1b4a2dd5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTUaSiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTWRH2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg9tMP/jeGLV7FXQirWXnYM5chATNz
-pg4yL7ZMh4pTd/zzWcDIJcs5vTfJyriTp1Ts54iT6/tUiqmoXGS4DHfsxXfQcPGg
-HGjn4NSXvtSkVP1L4uA5BGHTgW2sajmfTEEujoDIitfUFHECx7dEF6RUygcJ1LJo
-Qi/p1q1Vz5VR+t/jBeuQXYriIhgUvgnujWu+Vrp8Wg3uNhyTMn4vXiU/kVbwI40V
-rTHstG0QuurgR67bc+uEXwGEqaaUYq4BIKwH5uCcH/nLupGDl5eemykphW6y1H/2
-Ls5LeEPiLeRht8ADWHSjb5Di38Xrt5hA5eey0Un1t9V/PmlQMoGg9KBlxACnwH/g
-XtI1h2HA4EhddxTMrrw36WxejbNRxvegMqsSVVYUlKX3ONEMSfuExYXPxkxCWTXo
-cROKGslXHwyAeE+vb8RajOk2K0Z0aVgGgEYa4olZ6nGnAZqwWW3qfRuCszkGsZjj
-PcBwjpE1KT3cNkKNDyaMOooQDDOYhG6JPbq1w66M/ujugFglfnFf9FyqUC1vcA2w
-12EgX6J7ePwRDrFyDARz99ktkaPlykq/kwX8hTFeP9caHJPruaPKoPM5LKWe1XCW
-3xBsEmRKhYOAeiGC587/6QSWe19X0FGC96LJUpr4VTjvTSG/U7zNu9ZoA/uhMVbK
-5eh5PQbgTa3kxSUg0nt+
-=WGh2
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg8SIQALzbPWSKIqpQrgEizo3O4P72
+iom/D683VdV83lGPrICL1GQy+5Xa/ExF08kbB85jgyuASEolFz0q/fvlXOxqZEFQ
+0QUMCATknEQygvNjTUz/hmqD8m5WvTiDZt6k19MF0RkpJIh8sbDwLCiGDNq8XBYT
+4qTf49fUB8F5IHcQdI2lQVo3CRvanLiN98iFhDjggQoMKvoXY1TTVnLcLkZklslU
+TVbb+qwgaxvdXw7YDbkEr9uOsVxyQ5m4Z2bb0QNn0uYm53EmL4V3uhJdC9Fwy3ty
+vJpqiJn/7+U9JLy/OHPg2JYMbAyvfP+Msknk89OoTEkftio6VvQKk75lT9zk662D
+KG3G7FyJ4pOuyDY0WES3iA8VjHcNBa4FCj19VlSR21DOv2tlwz9C+PNFjG1DzVkw
+6/sdaunJmciNDMI9HZHQpeNH32uypF2JSLBdFbv1DiJ/tzU0tt2ag2gfixT1Ilhu
+ET/CMhHRC1Yi8xubElIsQHDhtn33jz7Gf47QjuaCYtdBDgn4wqy/ZX6mOxxC4SYX
+NyLU0bU3AMEpdpwXp92Z+0W9mfDjl/cIhV14z4iDjXOx/S/viwTkK/3gtdQs5Qcq
+0hD2ZUUwyBqeNblPJYYDUQnG/LzYNeEMuFVls+fO61QGrRupuZJb/4DNXCxjHVPo
+YSL8NZAsGfKar9sIagQJ
+=7lC1
 -----END PGP SIGNATURE-----
diff --git a/media-libs/ladspa-cmt/ladspa-cmt-1.16-r3.ebuild b/media-libs/ladspa-cmt/ladspa-cmt-1.16-r3.ebuild
index e872479dfd58..340520ae5b51 100644
--- a/media-libs/ladspa-cmt/ladspa-cmt-1.16-r3.ebuild
+++ b/media-libs/ladspa-cmt/ladspa-cmt-1.16-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ladspa-cmt-1.16-r3.ebuild,v 1.1 2014/04/18 22:18:09 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ladspa-cmt-1.16-r3.ebuild,v 1.2 2014/04/24 13:30:26 hasufell Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-DEPEND="media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+DEPEND="media-libs/ladspa-sdk
 	>=sys-apps/sed-4"
 RDEPEND=""
 
diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog
index 76f1de8c78c7..583f378cd047 100644
--- a/media-libs/libcaca/ChangeLog
+++ b/media-libs/libcaca/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libcaca
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.113 2014/04/19 07:32:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.114 2014/04/24 18:52:35 hasufell Exp $
+
+  24 Apr 2014; Julian Ospald <hasufell@gentoo.org>
+  libcaca-0.99_beta18-r2.ebuild:
+  convert to multilib-minimal instead and fix bug #508564
 
   19 Apr 2014; Patrick Lauer <patrick@gentoo.org> libcaca-0.99_beta18-r2.ebuild:
   Whitespace
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 55d7dd698dd7..cff5283325c5 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,9 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libcaca-0.99_beta18-fix-tests.patch 2222 SHA256 7bc472675e640633ff83cd104ede5caada5307064c021e692686f6b0d296df06 SHA512 bd007e9cdc73aec6cd0df3d66fea60cfe63f51a274ecabea52d7658114f8155fc5d0b2888896e39813ff856423064265fa50733312ce3988add5f096866bd60a WHIRLPOOL 380d486ec4ecd5a96195e28f0c418ccb363f6cfebc580c3937f9e2b179f9f2401ced8f9ab6cfa771262a7f0719f3a690b4dbbbcc1f4c33acd9616cb95cfd234d
 AUX libcaca-0.99_beta18-latex_hacks.patch 720 SHA256 1320f0a27bd6338882e36b18b024022464488b20a802680aa7150880ca24818a SHA512 1b9a475926c966c4cc64b76ae38550ccdddc1001fbbf722bbd32e450c88ec6be9e1fbe88818f71d8d0a1ea3c213d487ec3b26d0e52760bad54f3cccca3160f0b WHIRLPOOL 916ed33a2ce7b7bac3a9b32dc2d138a0ca6464d00242eba1484671b807e4124f7aad19c6ac169ad0be9a42906b75347a818a284486814b083562744966102ae1
 DIST libcaca-0.99.beta17.tar.gz 1110516 SHA256 6355ae9e3961e983ef66057a232d25f1fba2e7fa615d7591aba011d78764f1d6 SHA512 1d08a45a742cbda2c80810e753b49588cb9073ef545a1d47537745c4e62dc79748a25907903ffee58676d9aa5b75c5e0658666429cf028e10c09157d418c8d19 WHIRLPOOL bb241f90a36e2b73e2b50dcf15260153385ac2521bbe43a120c55ce5f2560ab9078ca40cf90a799646e6736461a876e33203abdd39f4ab794e6b509f8622b2d4
 DIST libcaca-0.99.beta18.tar.gz 1168552 SHA256 77ea06633f4a6022dccd4f76c1823e167a40cb05308fc1c7ea0fa1f80f6c33a1 SHA512 b2a8264ec36b74a01ff415a1fd7cb1806c76e28795b73607d4f8fa5ed5cc776b215f2817f45f06c672688f010622ee5c5e2f9dc4d0c43417dedbff545d575ca5 WHIRLPOOL 3e6404f0d16ca5718022a919c1568b0e8afaa40d58ca4a1e3271c437bebd3cde40ac63f45c6bbfea00a4936a673c24bdd21ecc0070f4814464d787dab33c183b
 EBUILD libcaca-0.99_beta17.ebuild 2650 SHA256 b2874ad822ccab2f25af40b987f18bbf88b16685025afa92923848ca242b87dd SHA512 1f1cf2887ab542cbf9590b7e2f869fbf4f5c8b7723e2c357b8c29c77be385a2553d02f4417608885f1b840bb2c1845a0158a46863fe3698105e5f37fe6daefde WHIRLPOOL 64f7b9fda46b5e8f4c1e425aa4e357557b50a359d1f169fe024cf8315c9eea93d2e31636fdbf8330ac35b72fae42202e59af4cc6527f68935d7218889e1ccf3e
 EBUILD libcaca-0.99_beta18-r1.ebuild 3238 SHA256 ab62162f3ee1f5ac083804a5711eb50849c928b09759d554c0b2af4ed5377784 SHA512 9591b98eea13391e3654c7e986f405ecaf39230e33761f0ca3efe4d953adda651f0aedaaa24a1e246d2945495912ad0f91d99a9323ca25a5a91b42d61987dd3a WHIRLPOOL 1ff3d383d9d91fa0e5f1b3d8d3a1ca40ec5f173fa2f7cf82278a2cdb8415e07f1c162556a971b019ec5bb2c258473a6d06e9b5e71f580b0f291699c1dbe34a74
-EBUILD libcaca-0.99_beta18-r2.ebuild 3757 SHA256 b73ab61971d6c24ea0b96051f3ccde207199a508e499476d8418bde3431064bd SHA512 7dbc84d1b42c0cd94df55d1351a5ce28337dc394b462b92b8bea3ead8d6b4932a39a5a8f220fca5f8656a58d7935ab47f1616b5e1fa9ac55fb9097e5692f6d44 WHIRLPOOL 40921174825417b29c09077d27e7a2e0ff7956c180b4d85f845896a3be93c97cd44fe274eb5601d1d8f6f521ae9168a775f7277f6636da0e6fde5688e96324d3
-MISC ChangeLog 16730 SHA256 4bb9ad8dd8a8e8f7cefd8e604714f19dd0b431186e9c53aee43257b852bfdb24 SHA512 c3ed4bba724e400d6493e73870692a30de48157e184bbaf38502468b70b823e878a3b4250c379d1087d5a57b9ee83bdbf6c4baa65b5294f6806d669b97b5acfb WHIRLPOOL b97e5df800b58b768aa9d442fcea1c6cd911ba931f3b829fee6da28f98e9a136728d171499aa5fe42b94933dcf93f854e3df28da350729739134ab8559d1ace1
+EBUILD libcaca-0.99_beta18-r2.ebuild 3775 SHA256 934b3e5d8cdb9edd9ac4ab88707a5df95be25a647a972bc31be737e861e7dc58 SHA512 3114f396312d066179a899d8ceabaf97eb11114a67dde96b74405006923cd5f47a348179e590d56eb93045d8a6ecc1ee80ea9cbf3030d481d95d3875ca4dfa7a WHIRLPOOL 7253625ff705da4607ee799a8d1f77181d8584ab6d61230495006dfbc42c7729250e2f97e3d82e40cea8e996f8954f0a812830e10d4a1deabee0da550b171192
+MISC ChangeLog 16874 SHA256 3f9db5099bfe3010ae75e4e65940bc5a16a3b84f1822852189b67139393dcc29 SHA512 e19eb55bbd75c7b773800370b7b3a09c12daceb7d4e33128a4709e42b3837cb643dad06258e6780e9f025c0fbbe30188892fa01c8707caa96887c1c147799d6c WHIRLPOOL 6587e37d759c88e683b105f48f882fe6fcd6dd5e6e4d129f777f74d4442ef97cb91239e434cdcd6876a5b9e7a6eba7a390db81088f333e9567b0b0a4b012c6d4
 MISC metadata.xml 223 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 SHA512 cacba929b8688a7270637f34d348216fdeb89e725cdee4b40e5577ca3f626c5f72e73c1c125605a284506aff47265f41e3fedaa76ed4074c540fc1f200e6d494 WHIRLPOOL dcd04d57abcfe2704036097ed68500917f74b7024b46580e9054e1c933d55678992c350fe07ff0efd590b9345fbcdd81665b8ce546f786dd31f5a0f4eb654da3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQJ8BAEBCABmBQJTWV12XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgYXsQAPVUImRigIyiEuNsIq+HvZUv
+w5wqKa/HXVtCpR+KgUV0q1hE4ygGGgalk5fLZzKoD8scOW+Jy+gWgna/TeBxfFiW
+cfymTfwwHzalF0JuGHiHHhu4BpWT0M5Rb2REsw5QxsM/Yp+lEDQ6IQLQULFz7M8u
+z+M/Fl4I0lENbXCjnCZaBQWSDMOtvkJkdrKuvAamKTzBRQ7PuYIoGelcdDcLQA4N
+HggHGDHJyLqCjIqvfCvODctYiVxw+DH/eYYmQ9EUyWIRQS+r09gpIwtFYq5wRKcX
+gEVxR31gGsxOKew36hnIE+BHhDfUJS767MtvIKQ1fOt4/Uj5ezBpKb2XrudNpamd
+PtoIX28oD54WSPd7Hwqf5DLiC6Zz8a4/GuQAJykCwzdKXTkPZ4Acnd/R7V+pbQKt
+52+IpFP1KPtJj48nQlL8PjLq9izxZJ4IUoo0wFDgS/XgOATDjyCsvroaxevCJ0O0
+wCrNaUsbc/RXqJc6ulNAlmbaFm0nYugmLZc0wH7YZNZcitX9lF5ZDG3VBy7ljMOq
+ff1683qIQ5AmgAz5wRtqyd8XyYi3IqlgN2GeaDK6ZKFj7gNFlaPozRXEG4sEyPPR
+XcWRSIR8Nl8oiN5rk96QGNtuwD5I8+supL/xpT4u99FcoaurMfRllD0c1PFFRTNh
+tKeH9rHBqQwdferOwmlz
+=VqSg
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild b/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
index 2ac51d8fd94c..809cf798e0c6 100644
--- a/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild,v 1.2 2014/04/19 07:32:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild,v 1.3 2014/04/24 18:52:35 hasufell Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
-inherit autotools-multilib eutils flag-o-matic mono multilib java-pkg-opt-2 python-single-r1
+inherit autotools eutils flag-o-matic mono multilib java-pkg-opt-2 python-single-r1 multilib-minimal
 
 MY_P=${P/_/.}
 DESCRIPTION="A library that creates colored ASCII-art graphics"
@@ -84,17 +84,6 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable slang)
-		$(use_enable ncurses)
-		$(use_enable X x11) $(use_with X x) --x-libraries=/usr/$(get_libdir)
-		$(use_enable opengl gl)
-		$(use_enable cxx)
-		$(use_enable imlib imlib2)
-		$(use_enable test cppunit)
-	)
-
 	if multilib_build_binaries; then
 		if use java; then
 			export JAVACFLAGS="$(java-pkg_javac-args)"
@@ -103,45 +92,45 @@ multilib_src_configure() {
 
 		use mono && export CSC="$(type -P gmcs)" #329651
 		export VARTEXFONTS="${T}/fonts" #44128
-
-		myeconfargs+=(
-			$(use_enable java)
-			$(use_enable ruby)
-			$(use_enable python)
-			$(use_enable mono csharp)
-			$(use_enable doc)
-		)
-	else
-		myeconfargs+=(
-			--disable-java
-			--disable-ruby
-			--disable-python
-			--disable-csharp
-			--disable-doc
-		)
 	fi
 
-	autotools-utils_src_configure
+	ECONF_SOURCE="${S}" \
+		econf \
+			$(use_enable static-libs static) \
+			$(use_enable slang) \
+			$(use_enable ncurses) \
+			$(use_enable X x11) $(use_with X x) --x-libraries=/usr/$(get_libdir) \
+			$(use_enable opengl gl) \
+			$(use_enable cxx) \
+			$(use_enable imlib imlib2) \
+			$(use_enable test cppunit) \
+			$(multilib_native_use_enable java) \
+			$(multilib_native_use_enable ruby) \
+			$(multilib_native_use_enable python) \
+			$(multilib_native_use_enable mono csharp) \
+			$(multilib_native_use_enable doc)
 }
 
-src_compile() {
+multilib_src_compile() {
 	local _java_makeopts
 	use java && _java_makeopts="-j1" #480864
-	autotools-multilib_src_compile ${_java_makeopts}
+	emake ${_java_makeopts}
 }
 
 multilib_src_test() {
 	emake -j1 check
 }
 
-src_install() {
-	autotools-multilib_src_install
+multilib_src_install() {
+	emake DESTDIR="${D}" install
 
-	if use java; then
+	if multilib_build_binaries && use java; then
 		java-pkg_newjar java/libjava.jar
 	fi
+}
 
+multilib_src_install_all() {
+	einstalldocs
 	rm -rf "${D}"/usr/share/java
-
 	prune_libtool_files --modules
 }
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d44fc046b806..3d06331b3210 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 24 Apr 2014 09:37:02 +0000
+Thu, 24 Apr 2014 19:07:02 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d44fc046b806..3d06331b3210 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 24 Apr 2014 09:37:02 +0000
+Thu, 24 Apr 2014 19:07:02 +0000
diff --git a/metadata/md5-cache/app-admin/pass-1.6 b/metadata/md5-cache/app-admin/pass-1.6
new file mode 100644
index 000000000000..be85d6ae2471
--- /dev/null
+++ b/metadata/md5-cache/app-admin/pass-1.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely using gpg, pwgen, and git
+EAPI=4
+HOMEPAGE=http://zx2c4.com/projects/password-store/
+IUSE=+git X +bash-completion zsh-completion fish-completion dmenu elibc_Darwin
+KEYWORDS=~amd64 ~x86 ~x86-macos
+LICENSE=GPL-2
+RDEPEND=app-crypt/gnupg app-admin/pwgen >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) bash-completion? ( app-shells/bash-completion ) zsh-completion? ( app-shells/zsh ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu )
+SLOT=0
+SRC_URI=http://git.zx2c4.com/password-store/snapshot/password-store-1.6.tar.xz
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=a7abc343156796b6fc488c51dbab6749
diff --git a/metadata/md5-cache/app-admin/pass-9999 b/metadata/md5-cache/app-admin/pass-9999
index 4aaa04b515dc..adaf6e0af6d6 100644
--- a/metadata/md5-cache/app-admin/pass-9999
+++ b/metadata/md5-cache/app-admin/pass-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg app-admin/pwgen >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) bash-completion? ( app-shells/bash-completion ) zsh-completion? ( app-shells/zsh ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu )
 SLOT=0
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	af81d52c25ec93fbdff71e0efb0de7b7	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d370ffad4edecd53f14c1d0ae363f43a
+_md5_=5401de15c471f9ec1734020b73de4f67
diff --git a/metadata/md5-cache/app-backup/backintime-1.0.34 b/metadata/md5-cache/app-backup/backintime-1.0.34
new file mode 100644
index 000000000000..f8fc61974dea
--- /dev/null
+++ b/metadata/md5-cache/app-backup/backintime-1.0.34
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-python/keyring[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/notify-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] net-misc/rsync[xattr,acl] kde? ( >=kde-base/kdelibs-4 kde-base/pykde4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] kde-base/kompare kde-base/kdesu ) gnome? ( gnome-base/libglade dev-util/meld gnome-base/gnome-session dev-python/gnome-vfs-python dev-python/libgnome-python dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pygtk[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+DESCRIPTION=A simple backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4
+EAPI=5
+HOMEPAGE=http://backintime.le-web.org/
+IUSE=kde gnome python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/keyring[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/notify-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] net-misc/rsync[xattr,acl] kde? ( >=kde-base/kdelibs-4 kde-base/pykde4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] kde-base/kompare kde-base/kdesu ) gnome? ( gnome-base/libglade dev-util/meld gnome-base/gnome-session dev-python/gnome-vfs-python dev-python/libgnome-python dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pygtk[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://backintime.le-web.org/download/backintime/backintime-1.0.34.tar.gz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=9554587e71caf3c245c3f2460c60fc02
diff --git a/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12 b/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
index 84ba5d11eacf..081b40df03d2 100644
--- a/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
+++ b/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-21
 DESCRIPTION=A mode for editing Visual Basic programs
 EAPI=5
 HOMEPAGE=http://www.emacswiki.org/emacs/VisualBasicMode
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-21
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ulm/distfiles/visual-basic-mode-1.4.12.el.xz
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=45e2eb26c219bef7759ee6876f848a72
+_md5_=64308077cc9d14eee33017002949da7b
diff --git a/metadata/md5-cache/app-text/tree-1.7.0 b/metadata/md5-cache/app-text/tree-1.7.0
index 999edac43e2d..19aa9fe50176 100644
--- a/metadata/md5-cache/app-text/tree-1.7.0
+++ b/metadata/md5-cache/app-text/tree-1.7.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Lists directories recursively, and produces an indented listing of files.
-EAPI=4
+EAPI=5
 HOMEPAGE=http://mama.indstate.edu/users/ice/tree/
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
@@ -8,4 +8,4 @@ RDEPEND=!=sci-biology/meme-4.8.1
 SLOT=0
 SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.7.0.tgz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7985886f3605d315bd6ea80bef4bd412
+_md5_=2d725d5989fca2da8d232a5219fa62cc
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.73 b/metadata/md5-cache/dev-db/mysql-5.1.73
new file mode 100644
index 000000000000..abb1ccbde830
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-5.1.73
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 >=sys-libs/readline-4.1 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server.
+EAPI=4
+HOMEPAGE=http://www.mysql.com/
+IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling pbxt xtradb
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.1
+RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 >=sys-libs/readline-4.1 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
+REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded )
+SLOT=0
+SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.73.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.73.tar.gz mirror://gentoo/mysql-extras-20140424-1043Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20140424-1043Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20140424-1043Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20140424-1043Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	mysql-autotools	a8fb1b6cc04b4818cad19ef1777e7c5a	mysql-v2	c13c6248e9c40715e51beba83d73537f	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=761c28df4f4e15c7e2257a01b9e399ba
diff --git a/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r3 b/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r3
index 2fb10c5ba854..c7f20b3e0b53 100644
--- a/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r3
+++ b/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r3
@@ -4,9 +4,10 @@ DESCRIPTION=Tool to communicate with Samsung SMDK boards
 EAPI=4
 HOMEPAGE=http://www.fluff.org/ben/smdk/tools/
 KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=all-rights-reserved
 RDEPEND=virtual/libusb:1
+RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v0.20.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5e8ec5d79907ff15a0d832cbbb8ada80
+_md5_=f3bfc32f9f93be9e7d644f42b1e709f4
diff --git a/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4 b/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
index 5f455edede47..bf7ba52c8cb2 100644
--- a/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
+++ b/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
@@ -4,9 +4,10 @@ DESCRIPTION=Tool to communicate with Samsung SMDK boards
 EAPI=4
 HOMEPAGE=http://www.fluff.org/ben/smdk/tools/
 KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=all-rights-reserved
 RDEPEND=virtual/libusb:1
+RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v0.20.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=96d5d99bc18e8361b935ebac2ad0ca09
+_md5_=e9e36943c5c2b04fee165c5e9548072b
diff --git a/metadata/md5-cache/dev-lang/erlang-17.0 b/metadata/md5-cache/dev-lang/erlang-17.0
index bbba44d3c94e..99a35db82c66 100644
--- a/metadata/md5-cache/dev-lang/erlang-17.0
+++ b/metadata/md5-cache/dev-lang/erlang-17.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/perl-5.6.1 ssl? ( >=dev-libs/openssl-0.9.7d ) emacs? ( virtua
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_17.0.tar.gz http://erlang.org/download/otp_doc_man_17.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_17.0.tar.gz )
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=00eeb70bcc8336c1197e4821a3ab7117
+_md5_=6d1d8abb5d3d731268e14501bdf8b33c
diff --git a/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05 b/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05
deleted file mode 100644
index acd60a7b7bcc..000000000000
--- a/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=>=dev-perl/URI-1.10 >=dev-perl/HTML-Parser-3.15 >=virtual/perl-MIME-Base64-2.12 >=virtual/perl-Digest-MD5-2.12 >=virtual/perl-libnet-1.0703-r1 >=dev-perl/libwww-perl-5.50 >=media-libs/libcdaudio-0.99.6 dev-lang/perl
-DESCRIPTION=Perl Module needed for app-cdr/disc-cover
-HOMEPAGE=http://www.vanhemert.co.uk/disc-cover.html
-KEYWORDS=alpha amd64 ia64 ppc sparc x86
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=>=dev-perl/URI-1.10 >=dev-perl/HTML-Parser-3.15 >=virtual/perl-MIME-Base64-2.12 >=virtual/perl-Digest-MD5-2.12 >=virtual/perl-libnet-1.0703-r1 >=dev-perl/libwww-perl-5.50 >=media-libs/libcdaudio-0.99.6 dev-lang/perl
-SLOT=0
-SRC_URI=http://www.vanhemert.co.uk/files/Audio-CD-0.05.tar.gz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	60422068bae2b3406a8a40db45ab5b95
-_md5_=187f87a192ef1631b91db8a35a983bb9
diff --git a/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r1 b/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r1
index 98df58c337cc..81241df9dd83 100644
--- a/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r1
+++ b/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/URI-1.10 >=dev-perl/HTML-Parser-3.15 >=virtual/perl-MIME-Base6
 DESCRIPTION=Perl Module needed for app-cdr/disc-cover
 EAPI=5
 HOMEPAGE=http://www.vanhemert.co.uk/disc-cover.html
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=alpha amd64 ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.vanhemert.co.uk/files/Audio-CD-0.05.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	60422068bae2b3406a8a40db45ab5b95
-_md5_=1cde86b96b97792f11ff70408eb392e2
+_md5_=79c18eee5ce5c002a409761b58ed77eb
diff --git a/metadata/md5-cache/dev-perl/Number-Format-1.52 b/metadata/md5-cache/dev-perl/Number-Format-1.52
deleted file mode 100644
index 91104dd528bf..000000000000
--- a/metadata/md5-cache/dev-perl/Number-Format-1.52
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=dev-lang/perl
-DESCRIPTION=Package for formatting numbers for display
-HOMEPAGE=http://www.cpan.org/modules/by-authors/id/W/WR/WRW/Number-Format-1.52.readme
-KEYWORDS=amd64 ia64 ppc x86
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.52.tar.gz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	60422068bae2b3406a8a40db45ab5b95
-_md5_=fa736a817447e8e447c41a1882541dd0
diff --git a/metadata/md5-cache/dev-perl/Number-Format-1.730.0 b/metadata/md5-cache/dev-perl/Number-Format-1.730.0
index 8c3e248bece2..516af35cec5f 100644
--- a/metadata/md5-cache/dev-perl/Number-Format-1.730.0
+++ b/metadata/md5-cache/dev-perl/Number-Format-1.730.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Package for formatting numbers for display
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Number-Format/
-KEYWORDS=amd64 ~ia64 ppc x86
+KEYWORDS=amd64 ia64 ppc x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.73.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	60422068bae2b3406a8a40db45ab5b95
-_md5_=17f6adce8b457c9de6b904192e09f564
+_md5_=0161ffb42deaea98f720348c8bbaa712
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-0.4-r1 b/metadata/md5-cache/dev-python/python-nbxmpp-0.4-r1
new file mode 100644
index 000000000000..3405a9340e85
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-0.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
+EAPI=5
+HOMEPAGE=http://python-nbxmpp.gajim.org/
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://python-nbxmpp.gajim.org/downloads/4 -> python-nbxmpp-0.4.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=0e44997c32bcb5b6942b49928cc706aa
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
index 45debddc6269..25d9c663fbd8 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=Library which enable you to define abstract method in Ruby.
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/abstract
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/abstract-1.0.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=bcea0a49ebb410ca8539609e028c59e8
+_md5_=ff931633d696324532698ad80f08c404
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
index 19e002222dac..6a16bad3dacf 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=Library which enable you to define abstract method in Ruby.
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/abstract
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/abstract-1.0.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1f80d7570de4f80833ab58298cfb4161
+_md5_=c623d44e4567487d04a9c5975ad1ebe6
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r1 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r1
index 963bb19545b2..c8c9525bb7db 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=A modern, pretty RDoc template.
 EAPI=2
 HOMEPAGE=http://fauna.github.com/fauna/allison/files/README.html
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-solaris
 LICENSE=AFL-3.0
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 SLOT=0
 SRC_URI=mirror://rubygems/allison-2.0.3.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b36614c5b0f8e22f22d69330c2b21d08
+_md5_=e105da1e9a18222a72ce58a452b7271b
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r2 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r2
index fcbd373f852d..84a2675c1cdc 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r2
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=A modern, pretty RDoc template.
 EAPI=5
 HOMEPAGE=http://fauna.github.com/fauna/allison/files/README.html
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-solaris
 LICENSE=AFL-3.0
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/allison-2.0.3.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=527c6fd76343d1c83d29dbc32b6b778a
+_md5_=85c7b331082fb6cb60706a3432d195e1
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
index 9148b5c307bd..cebfb8d1efb0 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=A modern, pretty RDoc template.
 EAPI=5
 HOMEPAGE=http://fauna.github.com/fauna/allison/files/README.html
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-solaris
 LICENSE=AFL-3.0
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/allison-2.0.3.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e7639f20afd58030c17d6c05c6768c3a
+_md5_=d2c2195eedbb5eddacd81bddb276f88b
diff --git a/metadata/md5-cache/dev-ruby/attic-0.5.3 b/metadata/md5-cache/dev-ruby/attic-0.5.3
index 126fd2677793..af6c4f758a0a 100644
--- a/metadata/md5-cache/dev-ruby/attic-0.5.3
+++ b/metadata/md5-cache/dev-ruby/attic-0.5.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/tryouts:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/tryouts:2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/tryouts:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A place for Ruby objects to hide instance variables
 EAPI=5
 HOMEPAGE=http://solutious.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/delano/attic/archive/0.5.3.tar.gz -> attic-git-0.5.3.tgz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=49ce2eed4dd32ebc5f6a8849ac1ca74e
+_md5_=c59f886ec90309bd4bef65a2039132dc
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.2.9 b/metadata/md5-cache/dev-ruby/chunky_png-1.2.9
deleted file mode 100644
index 06c5d2a09313..000000000000
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=Pure Ruby library that can read and write PNG images
-EAPI=5
-HOMEPAGE=http://wiki.github.com/wvanbergen/chunky_png
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/chunky_png-1.2.9.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=942141a0b43b6037d61382400a7e9629
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.0 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.0
index af862976f189..5e87b48222f0 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.0
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=Pure Ruby library that can read and write PNG images
 EAPI=5
 HOMEPAGE=http://wiki.github.com/wvanbergen/chunky_png
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/chunky_png-1.3.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f010659a4440d4cf4e84b0440424df84
+_md5_=4edfd6ffb76213b29a47e0b634154301
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.1.1 b/metadata/md5-cache/dev-ruby/database_cleaner-1.1.1
deleted file mode 100644
index 1ba30bf44b69..000000000000
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=Strategies for cleaning databases
-EAPI=5
-HOMEPAGE=http://github.com/bmabey/database_cleaner
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=mirror://rubygems/database_cleaner-1.1.1.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ce1a5f931cd1fca946dd4088b0700ce1
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.1.1-r1 b/metadata/md5-cache/dev-ruby/database_cleaner-1.1.1-r1
deleted file mode 100644
index 325e37fe65c3..000000000000
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=Strategies for cleaning databases
-EAPI=5
-HOMEPAGE=http://github.com/bmabey/database_cleaner
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=mirror://rubygems/database_cleaner-1.1.1.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b816014afc9f029352e68f142904ce2a
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.1.1-r2 b/metadata/md5-cache/dev-ruby/database_cleaner-1.1.1-r2
index 450ef3439e1e..8a64cc51f490 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.1.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Strategies for cleaning databases
 EAPI=5
 HOMEPAGE=http://github.com/bmabey/database_cleaner
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/database_cleaner-1.1.1.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=83748d46369111bd24cc2197e5f13778
+_md5_=3ccc80441b0339c934fea5a0a9b1403e
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.2.0 b/metadata/md5-cache/dev-ruby/database_cleaner-1.2.0
index d1447e24c612..7bb30948577c 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.2.0
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Strategies for cleaning databases
 EAPI=5
 HOMEPAGE=http://github.com/bmabey/database_cleaner
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/database_cleaner-1.2.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c3a33b8a6c3355aace69b35e365f1287
+_md5_=2aada55fd594fcc15a1e48fe77ed30fa
diff --git a/metadata/md5-cache/dev-ruby/directory_watcher-1.4.1 b/metadata/md5-cache/dev-ruby/directory_watcher-1.4.1
index 00403f3b61ca..ad6e6405e6b6 100644
--- a/metadata/md5-cache/dev-ruby/directory_watcher-1.4.1
+++ b/metadata/md5-cache/dev-ruby/directory_watcher-1.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Monitors directories for changes
 EAPI=5
 HOMEPAGE=http://gemcutter.org/gems/directory_watcher https://github.com/TwP/directory_watcher/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/directory_watcher-1.4.1.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ec86eb9487ef744713323a762c6d2420
+_md5_=b6bbf00adc930217492b9dddb42365f8
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.4.2 b/metadata/md5-cache/dev-ruby/fakefs-0.4.2
index 2df40e489afb..dbf5fddd6ae5 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.4.2
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=A fake filesystem. Use it in your tests.
 EAPI=4
 HOMEPAGE=http://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.4.2.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b4609b4285dbee858943b5754ddaf3e6
+_md5_=1116b01ed398217caeef17b1f454ad39
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.4.3-r1 b/metadata/md5-cache/dev-ruby/fakefs-0.4.3-r1
deleted file mode 100644
index 83c86e63b8ca..000000000000
--- a/metadata/md5-cache/dev-ruby/fakefs-0.4.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A fake filesystem. Use it in your tests.
-EAPI=5
-HOMEPAGE=http://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/fakefs-0.4.3.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ae06dd88da551f9f1b0206c9a839c13d
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.5.0 b/metadata/md5-cache/dev-ruby/fakefs-0.5.0
deleted file mode 100644
index 0450bb72e949..000000000000
--- a/metadata/md5-cache/dev-ruby/fakefs-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A fake filesystem. Use it in your tests.
-EAPI=5
-HOMEPAGE=http://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/fakefs-0.5.0.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=145f797811dbf3848f5961f8b7e2df54
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.5.1 b/metadata/md5-cache/dev-ruby/fakefs-0.5.1
deleted file mode 100644
index 7d07416c02cb..000000000000
--- a/metadata/md5-cache/dev-ruby/fakefs-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A fake filesystem. Use it in your tests.
-EAPI=5
-HOMEPAGE=http://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/fakefs-0.5.1.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e17956c2b267ab9fe8693be27da8c5ae
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.5.2 b/metadata/md5-cache/dev-ruby/fakefs-0.5.2
index ddf9cb8c4909..7dfb3d6062cd 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.5.2
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.5.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=A fake filesystem. Use it in your tests.
 EAPI=5
 HOMEPAGE=http://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.5.2.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1137b30054cb99ade2661457e4b8ce43
+_md5_=96f5798d9efb02232e33e3d6510d97c6
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.11.6 b/metadata/md5-cache/dev-ruby/gherkin-2.11.6
index f2721ad21811..a2a45460afff 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.11.6
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.11.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby18? ( dev-ruby/rake-compiler[ruby_targets_ruby18] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-util/cucumber-1.1.3[ruby_targets_ruby18] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby18] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby18] ) doc? ( >=dev-ruby/yard-0.7.4[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-util/cucumber-1.1.3[ruby_targets_ruby19] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby19] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby19] ) doc? ( >=dev-ruby/yard-0.7.4[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/json-1.7.6[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/json-1.7.6[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=dev-util/ragel ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-util/cucumber-1.1.3[ruby_targets_ruby19] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby19] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby19] ) doc? ( >=dev-ruby/yard-0.7.4[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/json-1.7.6[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Fast Gherkin lexer and parser based on Ragel.
 EAPI=4
 HOMEPAGE=https://github.com/cucumber/gherkin
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 doc test
 KEYWORDS=~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/json-1.7.6[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/json-1.7.6[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/json-1.7.6[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/gherkin/archive/v2.11.6.tar.gz -> gherkin-2.11.6-git.tgz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=9b0ed5d02c128cd70115c785341aa6eb
+_md5_=0099538bc983df2a5d6d9edcaf1dddfd
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.0 b/metadata/md5-cache/dev-ruby/gherkin-2.12.0
deleted file mode 100644
index 33e28e5eafd6..000000000000
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby18? ( dev-ruby/rake-compiler[ruby_targets_ruby18] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-util/cucumber-1.1.3[ruby_targets_ruby18] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby18] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby18] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-util/cucumber-1.1.3[ruby_targets_ruby19] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby19] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby19] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=Fast Gherkin lexer and parser based on Ragel.
-EAPI=5
-HOMEPAGE=https://github.com/cucumber/gherkin
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=https://github.com/cucumber/gherkin/archive/v2.12.0.tar.gz -> gherkin-2.12.0-git.tgz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1df191232c33f387db3c97731ba59d1c
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r1 b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r1
index c3cab120b48a..606a3c284166 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r1
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby18? ( dev-ruby/rake-compiler[ruby_targets_ruby18] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-util/cucumber-1.1.3[ruby_targets_ruby18] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby18] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby18] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-util/cucumber-1.1.3[ruby_targets_ruby19] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby19] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby19] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=dev-util/ragel ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-util/cucumber-1.1.3[ruby_targets_ruby19] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby19] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby19] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Fast Gherkin lexer and parser based on Ragel.
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/gherkin
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 doc test
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/gherkin/archive/v2.12.0.tar.gz -> gherkin-2.12.0-git.tgz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=2404aabb7ab426cf17c3d02b45d4432e
+_md5_=5f04ace021a02165921192c24963a00e
diff --git a/metadata/md5-cache/dev-ruby/gibbler-0.9.0 b/metadata/md5-cache/dev-ruby/gibbler-0.9.0
index 811779494188..2a99ce00af40 100644
--- a/metadata/md5-cache/dev-ruby/gibbler-0.9.0
+++ b/metadata/md5-cache/dev-ruby/gibbler-0.9.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/attic-0.4.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/attic-0.4.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/tryouts:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/tryouts:2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/attic-0.4.0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/tryouts:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Git-like hashes for Ruby objects
 EAPI=5
 HOMEPAGE=http://solutious.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/attic-0.4.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/attic-0.4.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/attic-0.4.0[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/delano/gibbler/archive/v0.9.0.tar.gz -> gibbler-git-0.9.0.tgz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6aa640c8a3c68cb403e7f1f5c7a3d3b2
+_md5_=555b505813bc33dee6f4254d03f258d1
diff --git a/metadata/md5-cache/dev-ruby/hexoid-0.2.2 b/metadata/md5-cache/dev-ruby/hexoid-0.2.2
index 5b253d20020c..c7286f738dcc 100644
--- a/metadata/md5-cache/dev-ruby/hexoid-0.2.2
+++ b/metadata/md5-cache/dev-ruby/hexoid-0.2.2
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=Generate Ruby style object ids
-EAPI=2
+EAPI=5
 HOMEPAGE=http://solutious.com/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/hexoid-0.2.2.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0a8ed8860901e5bde1376aa8d590e9be
+_md5_=0aee76861763403814c921d0a008c17b
diff --git a/metadata/md5-cache/dev-ruby/jwt-0.1.10 b/metadata/md5-cache/dev-ruby/jwt-0.1.10
deleted file mode 100644
index b9fafa5afbcd..000000000000
--- a/metadata/md5-cache/dev-ruby/jwt-0.1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/echoe[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/echoe[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/echoe[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/echoe[ruby_targets_jruby] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A Ruby implementation of JSON Web Token draft 06.
-EAPI=5
-HOMEPAGE=https://github.com/progrium/ruby-jwt
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/jwt-0.1.10.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=02a5ea6920a1d6d90e31ef243cecafe7
diff --git a/metadata/md5-cache/dev-ruby/jwt-0.1.11 b/metadata/md5-cache/dev-ruby/jwt-0.1.11
index dec8eb06d71f..d244c2096364 100644
--- a/metadata/md5-cache/dev-ruby/jwt-0.1.11
+++ b/metadata/md5-cache/dev-ruby/jwt-0.1.11
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/echoe[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/echoe[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/echoe[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/echoe[ruby_targets_jruby] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A Ruby implementation of JSON Web Token draft 06.
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/echoe[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/echoe[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/echoe[ruby_targets_jruby] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=A Ruby implementation of JSON Web Token draft 06
 EAPI=5
 HOMEPAGE=https://github.com/progrium/ruby-jwt
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/jwt-0.1.11.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=91d25cd9471ee9dee7eb5991878a096b
+_md5_=ed1e45e51dba2fec3f8c945cdc984090
diff --git a/metadata/md5-cache/dev-ruby/jwt-0.1.8-r1 b/metadata/md5-cache/dev-ruby/jwt-0.1.8-r1
deleted file mode 100644
index 0770b36dffcb..000000000000
--- a/metadata/md5-cache/dev-ruby/jwt-0.1.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/echoe[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/echoe[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/echoe[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/echoe[ruby_targets_jruby] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A Ruby implementation of JSON Web Token draft 06.
-EAPI=5
-HOMEPAGE=https://github.com/progrium/ruby-jwt
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/jwt-0.1.8.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e0ecae7c59d8118dfb86b6a315c09347
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.4.0 b/metadata/md5-cache/dev-ruby/libxml-2.4.0
index e84f1dc943a9..33694c596883 100644
--- a/metadata/md5-cache/dev-ruby/libxml-2.4.0
+++ b/metadata/md5-cache/dev-ruby/libxml-2.4.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libxml2 ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=dev-libs/libxml2 ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Ruby libxml with a user friendly API, akin to REXML, but feature complete and significantly faster.
 EAPI=2
 HOMEPAGE=https://github.com/xml4r/libxml-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-libs/libxml2 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+RDEPEND=dev-libs/libxml2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 SLOT=0
 SRC_URI=mirror://rubygems/libxml-ruby-2.4.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=af6867b7d730de48292cc38a1c761a64
+_md5_=1166294de337511dfd54fe41bb8660f4
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.6.0 b/metadata/md5-cache/dev-ruby/libxml-2.6.0
deleted file mode 100644
index b75914818253..000000000000
--- a/metadata/md5-cache/dev-ruby/libxml-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libxml2 ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=Ruby libxml with a user friendly API, akin to REXML, but feature complete and significantly faster.
-EAPI=5
-HOMEPAGE=https://github.com/xml4r/libxml-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-libs/libxml2 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=mirror://rubygems/libxml-ruby-2.6.0.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=9d1873b06f27fe1350277f4555faee18
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.7.0 b/metadata/md5-cache/dev-ruby/libxml-2.7.0
deleted file mode 100644
index 72742b276e79..000000000000
--- a/metadata/md5-cache/dev-ruby/libxml-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libxml2 ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=Ruby libxml with a user friendly API, akin to REXML, but feature complete and significantly faster.
-EAPI=5
-HOMEPAGE=https://github.com/xml4r/libxml-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-libs/libxml2 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=mirror://rubygems/libxml-ruby-2.7.0.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=def3af9976aac639f7e98a21fc297989
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.7.0-r1 b/metadata/md5-cache/dev-ruby/libxml-2.7.0-r1
index c1b256972fcd..a11cc8e749d6 100644
--- a/metadata/md5-cache/dev-ruby/libxml-2.7.0-r1
+++ b/metadata/md5-cache/dev-ruby/libxml-2.7.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libxml2 ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=dev-libs/libxml2 ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Ruby libxml with a user friendly API, akin to REXML, but feature complete and significantly faster.
 EAPI=5
 HOMEPAGE=https://github.com/xml4r/libxml-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
 KEYWORDS=amd64 ~arm hppa ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-libs/libxml2 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=dev-libs/libxml2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/libxml-ruby-2.7.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=79d76d555f122452dde230eb544ddc28
+_md5_=deb840ecd68657d943bc00d953669589
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.7.0-r2 b/metadata/md5-cache/dev-ruby/libxml-2.7.0-r2
index 29ebd0322151..0fea03c5f5fd 100644
--- a/metadata/md5-cache/dev-ruby/libxml-2.7.0-r2
+++ b/metadata/md5-cache/dev-ruby/libxml-2.7.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libxml2 ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=dev-libs/libxml2 ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=Ruby libxml with a user friendly API, akin to REXML, but feature complete and significantly faster.
 EAPI=5
 HOMEPAGE=https://github.com/xml4r/libxml-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-libs/libxml2 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=dev-libs/libxml2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/libxml-ruby-2.7.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=efdcac407d374a610b3ea9752bed3983
+_md5_=a6fd834b3648a3531422d652e21a9336
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10 b/metadata/md5-cache/dev-ruby/log4r-1.1.10
index f8e72164fe9a..1ec3a2a98599 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Log4r is a comprehensive and flexible logging library written in Ruby for use in Ruby programs.
 EAPI=2
 HOMEPAGE=http://log4r.sourceforge.net/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 doc test
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-3
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 SLOT=0
 SRC_URI=mirror://rubygems/log4r-1.1.10.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=9c08b797a8285de364461d270c5ece63
+_md5_=d3046f7479da0ad8e0d8a3c7e0aecd55
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
index 1ba3971dca1d..fd6da3dfc7a2 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Log4r is a comprehensive and flexible logging library written in Ruby for use in Ruby programs.
 EAPI=5
 HOMEPAGE=http://log4r.sourceforge.net/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-3
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/log4r-1.1.10.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ae0edea4c74acd03e15d8d5c15f3a357
+_md5_=a87ff0beaf80e8462b3bcbecdb5da3fa
diff --git a/metadata/md5-cache/dev-ruby/mab-0.0.3 b/metadata/md5-cache/dev-ruby/mab-0.0.3
index cab7fdf09296..a773f460bb35 100644
--- a/metadata/md5-cache/dev-ruby/mab-0.0.3
+++ b/metadata/md5-cache/dev-ruby/mab-0.0.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=Markup as Ruby
 EAPI=5
 HOMEPAGE=http://github.com/camping/mab
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/mab-0.0.3.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1a3ce6ac705d4f64fafddf5f0a4dfbc8
+_md5_=864612f52677ee7dbdc7ce98eb666214
diff --git a/metadata/md5-cache/dev-ruby/net-dns-0.7.1 b/metadata/md5-cache/dev-ruby/net-dns-0.7.1
deleted file mode 100644
index d16d96676c70..000000000000
--- a/metadata/md5-cache/dev-ruby/net-dns-0.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=DNS resolver in pure Ruby
-EAPI=4
-HOMEPAGE=http://net-dns.rubyforge.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/net-dns-0.7.1.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ed68d59bf90551928b54400c7961ea00
diff --git a/metadata/md5-cache/dev-ruby/net-dns-0.8.0 b/metadata/md5-cache/dev-ruby/net-dns-0.8.0
index 68ac68785e6e..a07e75234c15 100644
--- a/metadata/md5-cache/dev-ruby/net-dns-0.8.0
+++ b/metadata/md5-cache/dev-ruby/net-dns-0.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=DNS resolver in pure Ruby
 EAPI=5
 HOMEPAGE=http://net-dns.rubyforge.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/net-dns-0.8.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=855eb70aa86ae673627471213c0fee75
+_md5_=a47a1dd93dde41797acbf5ca98e46e4d
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9 b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9
index b068e93757b0..caa4ae2bace9 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( dev-ruby/hoe[ruby_targets_ruby18] ) test? ( dev-ruby/hoe[ruby_targets_ruby18] dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8.
 EAPI=5
 HOMEPAGE=https://github.com/drbrain/net-http-persistent
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-persistent-2.9.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f0999b6a89430b944507edabcce438ba
+_md5_=67b807b14bac17ebf1c5deed28a81093
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.1 b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.1
deleted file mode 100644
index 4b5bf7ef8107..000000000000
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( dev-ruby/hoe[ruby_targets_ruby18] ) test? ( dev-ruby/hoe[ruby_targets_ruby18] dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] ) test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8.
-EAPI=5
-HOMEPAGE=https://github.com/drbrain/net-http-persistent
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=0
-SRC_URI=mirror://rubygems/net-http-persistent-2.9.1.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3e2e9d41e3150374644bcca237d6cf65
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.3 b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.3
deleted file mode 100644
index 1bffff277a34..000000000000
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( dev-ruby/hoe[ruby_targets_ruby18] ) test? ( dev-ruby/hoe[ruby_targets_ruby18] dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] ) test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8.
-EAPI=5
-HOMEPAGE=https://github.com/drbrain/net-http-persistent
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=0
-SRC_URI=mirror://rubygems/net-http-persistent-2.9.3.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e55af85004054b6e8317b2be29a45689
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4 b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4
index a0c57750c309..51f972467715 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( dev-ruby/hoe[ruby_targets_ruby18] ) test? ( dev-ruby/hoe[ruby_targets_ruby18] dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] ) test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] ) test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8.
 EAPI=5
 HOMEPAGE=https://github.com/drbrain/net-http-persistent
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-persistent-2.9.4.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7a142ea189211df0eadb259943860529
+_md5_=ed1ffa9345aa09f6565ebca01566807d
diff --git a/metadata/md5-cache/dev-ruby/ohai-6.16.0 b/metadata/md5-cache/dev-ruby/ohai-6.16.0
deleted file mode 100644
index 9cfaacb070d5..000000000000
--- a/metadata/md5-cache/dev-ruby/ohai-6.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/ipaddress[ruby_targets_ruby18] dev-ruby/yajl-ruby[ruby_targets_ruby18] dev-ruby/mixlib-cli[ruby_targets_ruby18] dev-ruby/mixlib-config[ruby_targets_ruby18] dev-ruby/mixlib-log[ruby_targets_ruby18] dev-ruby/mixlib-shellout[ruby_targets_ruby18] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ipaddress[ruby_targets_ruby19] dev-ruby/yajl-ruby[ruby_targets_ruby19] dev-ruby/mixlib-cli[ruby_targets_ruby19] dev-ruby/mixlib-config[ruby_targets_ruby19] dev-ruby/mixlib-log[ruby_targets_ruby19] dev-ruby/mixlib-shellout[ruby_targets_ruby19] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=Ohai profiles your system and emits JSON
-EAPI=5
-HOMEPAGE=http://wiki.opscode.com/display/chef/Ohai
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/ipaddress[ruby_targets_ruby18] dev-ruby/yajl-ruby[ruby_targets_ruby18] dev-ruby/mixlib-cli[ruby_targets_ruby18] dev-ruby/mixlib-config[ruby_targets_ruby18] dev-ruby/mixlib-log[ruby_targets_ruby18] dev-ruby/mixlib-shellout[ruby_targets_ruby18] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ipaddress[ruby_targets_ruby19] dev-ruby/yajl-ruby[ruby_targets_ruby19] dev-ruby/mixlib-cli[ruby_targets_ruby19] dev-ruby/mixlib-config[ruby_targets_ruby19] dev-ruby/mixlib-log[ruby_targets_ruby19] dev-ruby/mixlib-shellout[ruby_targets_ruby19] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=https://github.com/opscode/ohai/archive/6.16.0.tar.gz -> ohai-6.16.0.tgz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=860fc4d9381498dc44efeedcee2bf1ca
diff --git a/metadata/md5-cache/dev-ruby/ohai-6.18.0 b/metadata/md5-cache/dev-ruby/ohai-6.18.0
index 07c591937e72..f5bb215e5b31 100644
--- a/metadata/md5-cache/dev-ruby/ohai-6.18.0
+++ b/metadata/md5-cache/dev-ruby/ohai-6.18.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/ipaddress[ruby_targets_ruby18] dev-ruby/yajl-ruby[ruby_targets_ruby18] dev-ruby/mixlib-cli[ruby_targets_ruby18] dev-ruby/mixlib-config[ruby_targets_ruby18] dev-ruby/mixlib-log[ruby_targets_ruby18] dev-ruby/mixlib-shellout[ruby_targets_ruby18] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ipaddress[ruby_targets_ruby19] dev-ruby/yajl-ruby[ruby_targets_ruby19] dev-ruby/mixlib-cli[ruby_targets_ruby19] dev-ruby/mixlib-config[ruby_targets_ruby19] dev-ruby/mixlib-log[ruby_targets_ruby19] dev-ruby/mixlib-shellout[ruby_targets_ruby19] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/ipaddress[ruby_targets_ruby19] dev-ruby/yajl-ruby[ruby_targets_ruby19] dev-ruby/mixlib-cli[ruby_targets_ruby19] dev-ruby/mixlib-config[ruby_targets_ruby19] dev-ruby/mixlib-log[ruby_targets_ruby19] dev-ruby/mixlib-shellout[ruby_targets_ruby19] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Ohai profiles your system and emits JSON
 EAPI=5
 HOMEPAGE=http://wiki.opscode.com/display/chef/Ohai
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/ipaddress[ruby_targets_ruby18] dev-ruby/yajl-ruby[ruby_targets_ruby18] dev-ruby/mixlib-cli[ruby_targets_ruby18] dev-ruby/mixlib-config[ruby_targets_ruby18] dev-ruby/mixlib-log[ruby_targets_ruby18] dev-ruby/mixlib-shellout[ruby_targets_ruby18] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ipaddress[ruby_targets_ruby19] dev-ruby/yajl-ruby[ruby_targets_ruby19] dev-ruby/mixlib-cli[ruby_targets_ruby19] dev-ruby/mixlib-config[ruby_targets_ruby19] dev-ruby/mixlib-log[ruby_targets_ruby19] dev-ruby/mixlib-shellout[ruby_targets_ruby19] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/ipaddress[ruby_targets_ruby19] dev-ruby/yajl-ruby[ruby_targets_ruby19] dev-ruby/mixlib-cli[ruby_targets_ruby19] dev-ruby/mixlib-config[ruby_targets_ruby19] dev-ruby/mixlib-log[ruby_targets_ruby19] dev-ruby/mixlib-shellout[ruby_targets_ruby19] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/opscode/ohai/archive/6.18.0.tar.gz -> ohai-6.18.0.tgz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=807de10672b814ffa9d92c55f95cf7b6
+_md5_=8632dab0a9d151e0f96bec8727b866d5
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.11 b/metadata/md5-cache/dev-ruby/racc-1.4.11
index 6f957589044a..bb22f7632424 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.11
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.11
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.11.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0df071b8743d2f4ef22478bb2318bbf2
+_md5_=fb64727c1b0dcce239aa525b22dec4df
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.9 b/metadata/md5-cache/dev-ruby/racc-1.4.9
index 3c8bcaa8cfb1..c19cc62008af 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.9
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.9
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.9.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c684cb02253bf9e2a6cde7321459f567
+_md5_=0fe580bca5ae781a0a47c0e80e651ddd
diff --git a/metadata/md5-cache/dev-ruby/rev-0.3.2-r1 b/metadata/md5-cache/dev-ruby/rev-0.3.2-r1
index eafad1d6b969..4c3197979804 100644
--- a/metadata/md5-cache/dev-ruby/rev-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rev-0.3.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Rev is an event library for Ruby, built on the libev event library.
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rev
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby20] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rev-0.3.2.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=93e343c1ca349eb14f17e9732eed8027
+_md5_=475cc225a16babecc99b8cf99ed0d85e
diff --git a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8 b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
index 436bcb63376d..6f508ff2e752 100644
--- a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] ) dev-ruby/rake[ruby_targets_ruby18] ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] ) dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] ) dev-ruby/rake[ruby_targets_jruby] ) dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] ) dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] ) dev-ruby/rake[ruby_targets_jruby] ) dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=Ruby library to access ELF files information
 EAPI=5
 HOMEPAGE=http://www.flameeyes.eu/projects/ruby-elf
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=virtual/man ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=virtual/man ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/Flameeyes/ruby-elf/archive/1.0.8.tar.gz -> ruby-elf-1.0.8.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=30f8061c4a0897f42cb46cd524e2181e
+_md5_=b84a551d8be7a732734670e469cb0f7a
diff --git a/metadata/md5-cache/dev-ruby/ruby-elf-9999 b/metadata/md5-cache/dev-ruby/ruby-elf-9999
index 2c265d3964a5..bc92ec14fd65 100644
--- a/metadata/md5-cache/dev-ruby/ruby-elf-9999
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] ) dev-ruby/rake[ruby_targets_ruby18] ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] ) dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] ) dev-ruby/rake[ruby_targets_jruby] ) dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ) dev-vcs/git
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] ) dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] ) dev-ruby/rake[ruby_targets_jruby] ) dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ) dev-vcs/git
 DESCRIPTION=Ruby library to access ELF files information
 EAPI=5
 HOMEPAGE=http://www.flameeyes.eu/projects/ruby-elf
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test
 LICENSE=GPL-2+
-RDEPEND=virtual/man ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=virtual/man ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ab297c1707088b39bd0a6b07667aa364
+_md5_=addb7fe3f5f832e59a0b2d6dae2f5fda
diff --git a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1 b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
index 8b0172ee4781..5386933c141a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby18] ) test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby20] ) test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.5.0[ruby_targets_jruby] ) test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby20] ) test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.5.0[ruby_targets_jruby] ) test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=A common interface to HMAC functionality as documented in RFC2104.
 EAPI=5
 HOMEPAGE=http://ruby-hmac.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-hmac-0.4.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=4da6af7e4c6a1e60d07a586ae6e37036
+_md5_=6ce1d8bd1a9d0937694ccf72ee5a9e66
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.3 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.3
index 1ce9b1447a54..0daf321368e2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.3
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 DESCRIPTION=A Ruby library for Oracle
 EAPI=2
 HOMEPAGE=http://rubyforge.org/projects/ruby-oci8/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19
+IUSE=elibc_FreeBSD ruby_targets_ruby19
 KEYWORDS=amd64 x86
 LICENSE=Ruby
-RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 SLOT=0
 SRC_URI=mirror://rubyforge/ruby-oci8/ruby-oci8-2.1.3.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=bd403f84e0b916ddc13d1af6013139d1
+_md5_=0f470c56cc5997cd3c8fa073f4064ac4
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-pango-2.0.2
index 488f011de315..bedeb35bd8e6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-2.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.2.0 test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.0.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.0.2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
+DEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.12.0 test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.0.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.0.2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
 DESCRIPTION=Ruby Pango bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.0.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.0.2[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+RDEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.12.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.0.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.0.2[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	ruby-ng-gnome2	e4cff284a3481220aed757f422ae56c7	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=30306da3412a896d68c67d5478abce40
+_md5_=65636f435c15469c5df8eb3d408367cb
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-pango-2.1.0
index 75e1d23dca4c..ea297067373f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-2.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.2.0 test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.1.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.1.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
+DEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.12.0 test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.1.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.1.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
 DESCRIPTION=Ruby Pango bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.1.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.1.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+RDEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.12.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.1.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.1.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	ruby-ng-gnome2	e4cff284a3481220aed757f422ae56c7	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0ffeffa41b17d05145fe0a5c9bd09758
+_md5_=67df006f778170204af2d07776e93f3b
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.0
index aa5307ee608f..688c551102fb 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.2.0 test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
+DEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.12.0 test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
 DESCRIPTION=Ruby Pango bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+RDEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.12.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	ruby-ng-gnome2	e4cff284a3481220aed757f422ae56c7	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=20d488711e715c7d5c05f6b6bb06eef3
+_md5_=49e39a93ff7c9a0f996b5131a94aafc6
diff --git a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1 b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1
index 1b1b9b6c9f00..2bc935f7382e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=A pure Ruby implementation of the Rc4 algorithm.
 EAPI=5
 HOMEPAGE=https://github.com/caiges/Ruby-RC4
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-rc4-0.1.5.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d749e0fd616d08ed2254a1746c4d1478
+_md5_=96da07e29ed38fb993f234dc45038896
diff --git a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2 b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2
index 39dcd1c6459d..4c43a2f7692e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2
+++ b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+DEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 DESCRIPTION=Ruby/SDL: Ruby bindings for SDL
 EAPI=5
 HOMEPAGE=http://www.kmc.gr.jp/~ohai/rubysdl.en.html
-IUSE=image mixer truetype mpeg sge elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19
+IUSE=image mixer truetype mpeg sge elibc_FreeBSD ruby_targets_ruby19
 KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
-RDEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubyforge/rubysdl/rubysdl-2.1.2.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c2377712246f490ad9cd9f2f4d5855c5
+_md5_=5fc4d170d57a6befc71c68138b205485
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1
index 6faaec210e61..e6414d06af9b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A Ruby interface to libshout2
 EAPI=5
 HOMEPAGE=http://ruby-shout.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 test
 KEYWORDS=~amd64 ~ppc x86
 LICENSE=Ruby
-RDEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-shout-2.2.1.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=70868dae81363b27bb51409bf30150b3
+_md5_=e99101f30be51df6df24fff14f59902d
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1
index e24b15ecd7ea..a4687b1172db 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A Ruby interface to libshout2
 EAPI=5
 HOMEPAGE=http://ruby-shout.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-shout-2.2.1.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a2dad3c6cf8cdb2e0d7449d838f1960f
+_md5_=3949dd888da7306d25a47eae5f4e044f
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-0.9.6-r2 b/metadata/md5-cache/dev-ruby/ruby-termios-0.9.6-r2
index 3426dc43c87c..05c9dc80c2fe 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-0.9.6-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-0.9.6-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 DESCRIPTION=A Ruby interface to termios
 EAPI=4
 HOMEPAGE=http://arika.org/ruby/termios
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19
+IUSE=elibc_FreeBSD ruby_targets_ruby19
 KEYWORDS=amd64 ~hppa ~mips ~ppc x86 ~x86-macos
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://github.com/arika/ruby-termios/tarball/version_0_9_6 -> ruby-termios-0.9.6.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=fd470903c18fdcc882fb4f4106d5e255
+_md5_=13e033abe6b1f35199dd82ce4826d59e
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0
index e07fc3d41f87..e58870a4cb68 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 DESCRIPTION=A Ruby interface to termios
 EAPI=5
 HOMEPAGE=http://arika.org/ruby/termios
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20
 KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86 ~x86-macos
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/arika/ruby-termios/archive/version_1_0_0.tar.gz -> ruby-termios-1.0.0.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c779658287c7a52ee18ea8ac8cab54d2
+_md5_=9fcf4e28653a21b978a75d94c2c262fb
diff --git a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r2 b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r2
index 3f0f9fb9d5fe..3985eb138c55 100644
--- a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libxslt-1.1.12 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=>=dev-libs/libxslt-1.1.12 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A Ruby class for processing XSLT
 EAPI=5
 HOMEPAGE=http://www.rubyfr.net/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxslt-1.1.12 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=>=dev-libs/libxslt-1.1.12 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-xslt-0.9.9.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7c923a645c24ef4c307c8b1e06ce2928
+_md5_=5d7874fbdd7454239f3eb3ec47078474
diff --git a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r1 b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r1
deleted file mode 100644
index a32a0bdff321..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A ruby library for performing Yadis service discovery
-EAPI=4
-HOMEPAGE=http://yadis.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
-KEYWORDS=~ppc ~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/ruby-yadis-0.3.4.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=2f4120dff8dda5e88e0055138f303222
diff --git a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2 b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
index 65eca062ad6f..5cc005880f5a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=A ruby library for performing Yadis service discovery
 EAPI=5
 HOMEPAGE=http://yadis.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-yadis-0.3.4.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=591f7f33ff1ff81e6492fc00b1a02992
+_md5_=76bbba8d613ff84573b50a5964f17170
diff --git a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4 b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
index 1b94c454ff93..792d3cbdd425 100644
--- a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
+++ b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/rr[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rr[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/rr[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Ruby library for GNTP(Growl Notification Transport Protocol)
 EAPI=5
 HOMEPAGE=https://github.com/snaka/ruby_gntp
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby_gntp-0.3.4.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=abf023b9a777a95361c7279b568d7ca5
+_md5_=ececfe6b1b7ac1ea023090520fefe2a2
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.2.2-r1 b/metadata/md5-cache/dev-ruby/ruby_parser-3.2.2-r1
deleted file mode 100644
index 2df8b7c5a90e..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.2.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby18] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby19] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby20] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_jruby] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/minitest-4.3[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-4.3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-4.3[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/minitest-4.3[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A ruby parser written in pure ruby.
-EAPI=5
-HOMEPAGE=https://github.com/seattlerb/ruby_parser
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby18] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby19] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby20] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_jruby] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
-SLOT=3
-SRC_URI=mirror://rubygems/ruby_parser-3.2.2.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=780c256668ffe36f49c0b751c44feb21
diff --git a/metadata/md5-cache/dev-ruby/rubytter-1.5.1 b/metadata/md5-cache/dev-ruby/rubytter-1.5.1
index c68effcb4f9f..dad5d13da78b 100644
--- a/metadata/md5-cache/dev-ruby/rubytter-1.5.1
+++ b/metadata/md5-cache/dev-ruby/rubytter-1.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby18] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby19] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby19] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Rubytter is a simple twitter library
 EAPI=5
 HOMEPAGE=http://wiki.github.com/jugyo/rubytter
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby18] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby19] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby19] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubytter-1.5.1.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=17d2295e1fe3a0f3e21ee6415d8d259e
+_md5_=7e1e1aa4c16d59fd583328b79979212e
diff --git a/metadata/md5-cache/dev-ruby/rye-0.9.7 b/metadata/md5-cache/dev-ruby/rye-0.9.7
index ecba8d813a7b..f020c8f51657 100644
--- a/metadata/md5-cache/dev-ruby/rye-0.9.7
+++ b/metadata/md5-cache/dev-ruby/rye-0.9.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby18] >=dev-ruby/net-ssh-2.0.13[ruby_targets_ruby18] >=dev-ruby/highline-1.5.1[ruby_targets_ruby18] >=dev-ruby/sysinfo-0.7.3[ruby_targets_ruby18] dev-ruby/annoy[ruby_targets_ruby18] dev-ruby/storable[ruby_targets_ruby18] virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby19] >=dev-ruby/net-ssh-2.0.13[ruby_targets_ruby19] >=dev-ruby/highline-1.5.1[ruby_targets_ruby19] >=dev-ruby/sysinfo-0.7.3[ruby_targets_ruby19] dev-ruby/annoy[ruby_targets_ruby19] dev-ruby/storable[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby19] >=dev-ruby/net-ssh-2.0.13[ruby_targets_ruby19] >=dev-ruby/highline-1.5.1[ruby_targets_ruby19] >=dev-ruby/sysinfo-0.7.3[ruby_targets_ruby19] dev-ruby/annoy[ruby_targets_ruby19] dev-ruby/storable[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Safely run SSH commands on a bunch of machines at the same time
-EAPI=4
+EAPI=5
 HOMEPAGE=http://solutious.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby18] >=dev-ruby/net-ssh-2.0.13[ruby_targets_ruby18] >=dev-ruby/highline-1.5.1[ruby_targets_ruby18] >=dev-ruby/sysinfo-0.7.3[ruby_targets_ruby18] dev-ruby/annoy[ruby_targets_ruby18] dev-ruby/storable[ruby_targets_ruby18] virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby19] >=dev-ruby/net-ssh-2.0.13[ruby_targets_ruby19] >=dev-ruby/highline-1.5.1[ruby_targets_ruby19] >=dev-ruby/sysinfo-0.7.3[ruby_targets_ruby19] dev-ruby/annoy[ruby_targets_ruby19] dev-ruby/storable[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby19] >=dev-ruby/net-ssh-2.0.13[ruby_targets_ruby19] >=dev-ruby/highline-1.5.1[ruby_targets_ruby19] >=dev-ruby/sysinfo-0.7.3[ruby_targets_ruby19] dev-ruby/annoy[ruby_targets_ruby19] dev-ruby/storable[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rye-0.9.7.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a991e6f12a9b244e2d98404440744cd7
+_md5_=f1b42033171c49694209424f2f2f22a9
diff --git a/metadata/md5-cache/dev-ruby/samuel-0.3.3 b/metadata/md5-cache/dev-ruby/samuel-0.3.3
index 716f09598ecf..e2ccc8f451c4 100644
--- a/metadata/md5-cache/dev-ruby/samuel-0.3.3
+++ b/metadata/md5-cache/dev-ruby/samuel-0.3.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/shoulda-2.11.3[ruby_targets_ruby18] >=dev-ruby/fakeweb-1.3[ruby_targets_ruby18] >=dev-ruby/httpclient-2.2.3[ruby_targets_ruby18] dev-ruby/mocha:0.12[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/shoulda-2.11.3[ruby_targets_ruby19] >=dev-ruby/fakeweb-1.3[ruby_targets_ruby19] >=dev-ruby/httpclient-2.2.3[ruby_targets_ruby19] dev-ruby/mocha:0.12[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/shoulda-2.11.3[ruby_targets_jruby] >=dev-ruby/fakeweb-1.3[ruby_targets_jruby] >=dev-ruby/httpclient-2.2.3[ruby_targets_jruby] dev-ruby/mocha:0.12[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/shoulda-2.11.3[ruby_targets_ruby19] >=dev-ruby/fakeweb-1.3[ruby_targets_ruby19] >=dev-ruby/httpclient-2.2.3[ruby_targets_ruby19] dev-ruby/mocha:0.12[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/shoulda-2.11.3[ruby_targets_jruby] >=dev-ruby/fakeweb-1.3[ruby_targets_jruby] >=dev-ruby/httpclient-2.2.3[ruby_targets_jruby] dev-ruby/mocha:0.12[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=An automatic logger for HTTP requests in Ruby.
 EAPI=5
 HOMEPAGE=http://github.com/chrisk/samuel
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/samuel-0.3.3.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c2eb23811ab36fd7f3adc75fe4befa88
+_md5_=46494323e2a86021a4cf4bb677c57570
diff --git a/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1 b/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1
index 29321978f943..c432fddbc44a 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/nokogiri[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=Sanitize is a whitelist-based HTML sanitizer
 EAPI=5
 HOMEPAGE=https://github.com/rgrove/sanitize
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/nokogiri[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/rgrove/sanitize/archive/v2.0.6.tar.gz -> sanitize-2.0.6.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=186a7fcd041be053baed660ea9ade193
+_md5_=c63ca8db83c8475c9e5b4786bb5b4882
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-3.2.5 b/metadata/md5-cache/dev-ruby/sass-rails-3.2.5
index 5e7536d025e3..4f0bde41eb80 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-3.2.5
+++ b/metadata/md5-cache/dev-ruby/sass-rails-3.2.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/sfl[ruby_targets_ruby18] dev-ruby/bundler[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/sfl[ruby_targets_ruby19] dev-ruby/bundler[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/sass-3.1.10[ruby_targets_ruby18] dev-ruby/railties:3.2[ruby_targets_ruby18] dev-ruby/actionpack:3.2[ruby_targets_ruby18] >=dev-ruby/tilt-1.3.2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/sass-3.1.10[ruby_targets_ruby19] dev-ruby/railties:3.2[ruby_targets_ruby19] dev-ruby/actionpack:3.2[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/sfl[ruby_targets_ruby19] dev-ruby/bundler[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/sass-3.1.10[ruby_targets_ruby19] dev-ruby/railties:3.2[ruby_targets_ruby19] dev-ruby/actionpack:3.2[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Official Ruby-on-Rails Integration with Sass
-EAPI=4
+EAPI=5
 HOMEPAGE=https://github.com/rails/sass-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
 KEYWORDS=~amd64 ~arm ~x86 ~x64-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/sass-3.1.10[ruby_targets_ruby18] dev-ruby/railties:3.2[ruby_targets_ruby18] dev-ruby/actionpack:3.2[ruby_targets_ruby18] >=dev-ruby/tilt-1.3.2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/sass-3.1.10[ruby_targets_ruby19] dev-ruby/railties:3.2[ruby_targets_ruby19] dev-ruby/actionpack:3.2[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.2[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sass-3.1.10[ruby_targets_ruby19] dev-ruby/railties:3.2[ruby_targets_ruby19] dev-ruby/actionpack:3.2[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.2[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=3.2
 SRC_URI=mirror://rubygems/sass-rails-3.2.5.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b4127b47313320a4cc507848335265b7
+_md5_=0a4ed09970a4139ad2f99dce06460900
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-3.2.6 b/metadata/md5-cache/dev-ruby/sass-rails-3.2.6
index ed4a38a09786..b333d8ae6b6b 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-3.2.6
+++ b/metadata/md5-cache/dev-ruby/sass-rails-3.2.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/sass-3.1.10[ruby_targets_ruby18] dev-ruby/railties:3.2[ruby_targets_ruby18] dev-ruby/actionpack:3.2[ruby_targets_ruby18] >=dev-ruby/tilt-1.3.2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/sass-3.1.10[ruby_targets_ruby19] dev-ruby/railties:3.2[ruby_targets_ruby19] dev-ruby/actionpack:3.2[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/sass-3.1.10[ruby_targets_ruby19] dev-ruby/railties:3.2[ruby_targets_ruby19] dev-ruby/actionpack:3.2[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Official Ruby-on-Rails Integration with Sass
 EAPI=5
 HOMEPAGE=https://github.com/rails/sass-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
 KEYWORDS=~amd64 ~arm ~x86 ~x64-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/sass-3.1.10[ruby_targets_ruby18] dev-ruby/railties:3.2[ruby_targets_ruby18] dev-ruby/actionpack:3.2[ruby_targets_ruby18] >=dev-ruby/tilt-1.3.2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/sass-3.1.10[ruby_targets_ruby19] dev-ruby/railties:3.2[ruby_targets_ruby19] dev-ruby/actionpack:3.2[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.2[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sass-3.1.10[ruby_targets_ruby19] dev-ruby/railties:3.2[ruby_targets_ruby19] dev-ruby/actionpack:3.2[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.2[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=3.2
 SRC_URI=mirror://rubygems/sass-rails-3.2.6.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ef8905a0294b069562d747b1ef4dd42f
+_md5_=1113ade6979148c528acf08cda04e858
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.37.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.37.0
deleted file mode 100644
index bc3e48d62b85..000000000000
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.37.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby18] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby18] dev-ruby/rubyzip:1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=This gem provides Ruby bindings for WebDriver.
-EAPI=5
-HOMEPAGE=http://gemcutter.org/gems/selenium-webdriver
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby18] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby18] dev-ruby/rubyzip:1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=0
-SRC_URI=mirror://rubygems/selenium-webdriver-2.37.0.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=29c8b652266c1d4f248a3b0fd3bdaa39
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.38.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.38.0
deleted file mode 100644
index c6c68d4c641c..000000000000
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.38.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=This gem provides Ruby bindings for WebDriver.
-EAPI=5
-HOMEPAGE=http://gemcutter.org/gems/selenium-webdriver
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=0
-SRC_URI=mirror://rubygems/selenium-webdriver-2.38.0.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=46c07a6aecac580e1f83616d7ea51757
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.39.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.39.0
deleted file mode 100644
index 8222bc5f1fbb..000000000000
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.39.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=This gem provides Ruby bindings for WebDriver.
-EAPI=5
-HOMEPAGE=http://gemcutter.org/gems/selenium-webdriver
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=0
-SRC_URI=mirror://rubygems/selenium-webdriver-2.39.0.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=805e11ef9bfd04c6074ae7aae5082da9
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.0 b/metadata/md5-cache/dev-ruby/serialport-1.3.0
index 2839e45a26b9..1e27e4c5bcc4 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.0
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=a library for serial port (rs232) access in ruby
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/ruby-serialport/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/serialport-1.3.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0df4c1468f8b23c7f9c6a1fdab633deb
+_md5_=c658c790dc4d6882e1253539bd9cb998
diff --git a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9 b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
index d986ae8fffaa..edd170b9156f 100644
--- a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
+++ b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A simple configuration / settings solution that uses an ERB enabled YAML file
 EAPI=5
 HOMEPAGE=http://github.com/binarylogic/settingslogic
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/settingslogic-2.0.9.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=fa8ce26f8a69570ade907f19bbb7a267
+_md5_=0124798ac05b6f1b2a9e78662fab4e35
diff --git a/metadata/md5-cache/dev-ruby/sfl-2.2-r1 b/metadata/md5-cache/dev-ruby/sfl-2.2-r1
index bb14d8924fd5..67d3d4ac7133 100644
--- a/metadata/md5-cache/dev-ruby/sfl-2.2-r1
+++ b/metadata/md5-cache/dev-ruby/sfl-2.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=This library provides spawn() which is almost perfectly compatible with ruby 1.9's.
 EAPI=5
 HOMEPAGE=https://github.com/ujihisa/spawn-for-legacy
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( Ruby BSD-2 )
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/sfl-2.2.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=2733567c70ab3610eedd33ca50ff2c40
+_md5_=4d718853a27dbc0990c70d2cc35fbb22
diff --git a/metadata/md5-cache/dev-ruby/shorturl-1.0.0 b/metadata/md5-cache/dev-ruby/shorturl-1.0.0
index 3251367e2bef..c62a90fd260c 100644
--- a/metadata/md5-cache/dev-ruby/shorturl-1.0.0
+++ b/metadata/md5-cache/dev-ruby/shorturl-1.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=A very simple library to use URL shortening services such as TinyURL or RubyURL.
 EAPI=5
 HOMEPAGE=http://shorturl.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test
 KEYWORDS=amd64 ~ppc x86 ~x86-fbsd ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/shorturl-1.0.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f9dea9a403c64de17006b696b64b472c
+_md5_=12cc37125aab73b3674cb8400ac91633
diff --git a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1 b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
index d53d29ae5312..b6921c7d52ca 100644
--- a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=A very simple library to use URL shortening services such as TinyURL or RubyURL.
 EAPI=5
 HOMEPAGE=http://shorturl.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/shorturl-1.0.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d4eb5f0b6c809bc4b55bfa93981ce52d
+_md5_=7b8fcd52502bcc547b778b7807c9577e
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9-r1 b/metadata/md5-cache/dev-ruby/shotgun-0.9-r1
index e4a2583e107f..97b5ec20db19 100644
--- a/metadata/md5-cache/dev-ruby/shotgun-0.9-r1
+++ b/metadata/md5-cache/dev-ruby/shotgun-0.9-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/rack[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rack[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/bacon[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bacon[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rack[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bacon[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Forking implementation of rackup
 EAPI=5
 HOMEPAGE=http://rtomayko.github.com/shotgun/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/rack[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rack[ruby_targets_ruby20] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rack[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/shotgun-0.9.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=69c7a6a9fba769d0de5fea940fe5c4ee
+_md5_=d705e725c80dacebc52329802594b63e
diff --git a/metadata/md5-cache/dev-ruby/sigar-0.7.2-r1 b/metadata/md5-cache/dev-ruby/sigar-0.7.2-r1
index ade956368f7a..6486da6c5735 100644
--- a/metadata/md5-cache/dev-ruby/sigar-0.7.2-r1
+++ b/metadata/md5-cache/dev-ruby/sigar-0.7.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=System Information Gatherer And Reporter
 EAPI=5
 HOMEPAGE=http://sigar.hyperic.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/sigar-0.7.2.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d46c90dbf7d4a0b3ae89b8a98f61043f
+_md5_=7da19381792b45e8233386e1507815bb
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1 b/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
index 60f4ea5ae61e..e8a3139065a5 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=Simply builds and verifies OAuth headers.
 EAPI=5
 HOMEPAGE=https://github.com/laserlemon/simple_oauth
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/simple_oauth-0.2.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c973616c4ab2c2a36c6251e60c3f1f42
+_md5_=88ae6b921e0503f2c07ae332a93a9773
diff --git a/metadata/md5-cache/dev-ruby/six-0.2.0 b/metadata/md5-cache/dev-ruby/six-0.2.0
index 23b32e0149da..eca6ca65a924 100644
--- a/metadata/md5-cache/dev-ruby/six-0.2.0
+++ b/metadata/md5-cache/dev-ruby/six-0.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=An ultra lite authorization library
 EAPI=5
 HOMEPAGE=https://github.com/randx/six
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/randx/six/archive/v0.2.0.tar.gz -> six-0.2.0.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=73019e6be90035956004fba10bd9585f
+_md5_=7c9620674b609ef137ed06aebd4ba96a
diff --git a/metadata/md5-cache/dev-ruby/snmplib-1.1.1 b/metadata/md5-cache/dev-ruby/snmplib-1.1.1
index 4f62233f07a3..68ec8f1dc952 100644
--- a/metadata/md5-cache/dev-ruby/snmplib-1.1.1
+++ b/metadata/md5-cache/dev-ruby/snmplib-1.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=SNMP library implemented in pure Ruby
 EAPI=5
 HOMEPAGE=http://snmplib.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 test test
 KEYWORDS=amd64 ppc x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/snmp-1.1.1.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=51b5bea6faa93423ec903c77ac3ebb80
+_md5_=7a9e80ce3c55dfbe91993349d94518b9
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.5.0-r1 b/metadata/md5-cache/dev-ruby/stamp-0.5.0-r1
index 46462e9bba4e..9025c31e9e3f 100644
--- a/metadata/md5-cache/dev-ruby/stamp-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/stamp-0.5.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] dev-ruby/redcarpet[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] dev-ruby/redcarpet[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-util/cucumber[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-util/cucumber[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] dev-ruby/redcarpet[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-util/cucumber[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Date and time formatting for humans
 EAPI=5
 HOMEPAGE=https://github.com/jeremyw/stamp
-IUSE=doc elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/jeremyw/stamp/archive/v0.5.0.tar.gz -> stamp-0.5.0.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f790f802af1edbafa82356527e9d2110
+_md5_=ec8632d3cedbbfd210a1b4a55c5c6822
diff --git a/metadata/md5-cache/dev-ruby/state_machine-1.2.0 b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
index 6e79a5024021..9d67ec54daa8 100644
--- a/metadata/md5-cache/dev-ruby/state_machine-1.2.0
+++ b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=Adds support for creating state machines for attributes on any Ruby class
-EAPI=4
+EAPI=5
 HOMEPAGE=http://www.pluginaweek.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/state_machine-1.2.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=8e7f08202ee825b7f6f1de87fd6a7c34
+_md5_=b96e94ea17dc44839bbcc5c8834fe7f5
diff --git a/metadata/md5-cache/dev-ruby/storable-0.8.9-r1 b/metadata/md5-cache/dev-ruby/storable-0.8.9-r1
index e27e8f914859..247fa9bd8dac 100644
--- a/metadata/md5-cache/dev-ruby/storable-0.8.9-r1
+++ b/metadata/md5-cache/dev-ruby/storable-0.8.9-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/yajl-ruby[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/yajl-ruby[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/tryouts:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/tryouts:2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/yajl-ruby[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/tryouts:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Marshal Ruby classes into and out of multiple formats
 EAPI=5
 HOMEPAGE=http://solutious.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/yajl-ruby[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/yajl-ruby[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/yajl-ruby[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://github.com/delano/storable/tarball/v0.8.9 -> storable-git-0.8.9.tgz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c4d9441c6f895dbf80f3e368e65be002
+_md5_=32c7117840012ea34836a74864a974ce
diff --git a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1 b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
index b918d647dfa9..5643f6b95531 100644
--- a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/shoulda[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/shoulda[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/shoulda[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/shoulda[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/shoulda[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/shoulda[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/shoulda[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=Subexec spawns an external command with a timeout
 EAPI=5
 HOMEPAGE=http://github.com/nulayer/subexec
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=http://github.com/nulayer/subexec/archive/v0.2.3.tar.gz -> subexec-0.2.3.tgz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c63316caa940de111fb8cecfa9a0847b
+_md5_=5dea284a36d023935cf453955f0133a2
diff --git a/metadata/md5-cache/dev-ruby/sysinfo-0.8.1-r1 b/metadata/md5-cache/dev-ruby/sysinfo-0.8.1-r1
index 425d2e54f4d2..1a29438d5154 100644
--- a/metadata/md5-cache/dev-ruby/sysinfo-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/sysinfo-0.8.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/storable[ruby_targets_ruby18] dev-ruby/drydock[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/storable[ruby_targets_ruby19] dev-ruby/drydock[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/storable[ruby_targets_ruby19] dev-ruby/drydock[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=All your system-independent info in one handy class
 EAPI=5
 HOMEPAGE=http://solutious.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=!!dev-util/hxtools ruby_targets_ruby18? ( dev-ruby/storable[ruby_targets_ruby18] dev-ruby/drydock[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/storable[ruby_targets_ruby19] dev-ruby/drydock[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=!!dev-util/hxtools ruby_targets_ruby19? ( dev-ruby/storable[ruby_targets_ruby19] dev-ruby/drydock[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/sysinfo-0.8.1.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ee98cec5d1bde353cc5e9ed7bad2c0af
+_md5_=7e0dde2b9bc2be6e46b9a37c037aec23
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.5.1-r1 b/metadata/md5-cache/dev-ruby/syslogger-1.5.1-r1
index 30cbeecad5d7..185075c8c41e 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=Drop-in replacement for the standard Logger, that logs to the syslog
 EAPI=5
 HOMEPAGE=https://github.com/crohr/syslogger
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/syslogger-1.5.1.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=498be8783980ee9023149c0ddf0941d9
+_md5_=347f49efcab557e59f12976606de336c
diff --git a/metadata/md5-cache/dev-ruby/systemu-2.6.0 b/metadata/md5-cache/dev-ruby/systemu-2.6.0
deleted file mode 100644
index f91eb85220f4..000000000000
--- a/metadata/md5-cache/dev-ruby/systemu-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=Universal capture of STDOUT and STDERR and handling of child process PID
-EAPI=5
-HOMEPAGE=http://codeforpeople.com/lib/ruby/systemu/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=0
-SRC_URI=mirror://rubygems/systemu-2.6.0.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=300cf98648b0079e319a1f0e8bedb434
diff --git a/metadata/md5-cache/dev-ruby/tdiff-0.3.3 b/metadata/md5-cache/dev-ruby/tdiff-0.3.3
index c83fd21e3bb8..6deb3b0deae0 100644
--- a/metadata/md5-cache/dev-ruby/tdiff-0.3.3
+++ b/metadata/md5-cache/dev-ruby/tdiff-0.3.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=Calculates the differences between two tree-like structures
 EAPI=5
 HOMEPAGE=https://github.com/postmodern/tdiff
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/tdiff-0.3.3.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=77f2a5f2387e006e192fed90c8dd4f75
+_md5_=89fdcf193486cb780b56636f72b94191
diff --git a/metadata/md5-cache/dev-ruby/temple-0.6.7 b/metadata/md5-cache/dev-ruby/temple-0.6.7
deleted file mode 100644
index 5800387d888a..000000000000
--- a/metadata/md5-cache/dev-ruby/temple-0.6.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/bacon[ruby_targets_ruby18] dev-ruby/tilt[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bacon[ruby_targets_ruby19] dev-ruby/tilt[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=An abstraction and a framework for compiling templates to pure Ruby.
-EAPI=5
-HOMEPAGE=http://github.com/judofyr/temple
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=mirror://rubygems/temple-0.6.7.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a57ce1ecc0e8708b2d16314299591fa7
diff --git a/metadata/md5-cache/dev-ruby/temple-0.6.7-r1 b/metadata/md5-cache/dev-ruby/temple-0.6.7-r1
index cece59eec704..ac91910d6842 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.6.7-r1
+++ b/metadata/md5-cache/dev-ruby/temple-0.6.7-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/bacon[ruby_targets_ruby18] dev-ruby/tilt[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bacon[ruby_targets_ruby19] dev-ruby/tilt[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] dev-ruby/tilt[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/bacon[ruby_targets_ruby19] dev-ruby/tilt[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] dev-ruby/tilt[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=An abstraction and a framework for compiling templates to pure Ruby.
 EAPI=5
 HOMEPAGE=http://github.com/judofyr/temple
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/temple-0.6.7.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=18c2adb3ceaf84d1dc672fbce7ad7aee
+_md5_=286ed676db63427afc1bde55949aba1c
diff --git a/metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1 b/metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1
index d8ebe816becb..2169548b6ecb 100644
--- a/metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=a library for ANSI color formatting like HTML for output in terminal
 EAPI=5
 HOMEPAGE=http://termcolor.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby20] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/termcolor-1.2.1.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ef9128159577eb714b8822e124168fad
+_md5_=8ddade9be349aac9a0c8dc2bc10a55ab
diff --git a/metadata/md5-cache/dev-ruby/text-1.2.3 b/metadata/md5-cache/dev-ruby/text-1.2.3
deleted file mode 100644
index 8a07c17ae17c..000000000000
--- a/metadata/md5-cache/dev-ruby/text-1.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A collection of text algorithms
-EAPI=5
-HOMEPAGE=https://github.com/threedaymonk/text
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/text-1.2.3.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6d1338fae4b91a9435688d1bd698ead1
diff --git a/metadata/md5-cache/dev-ruby/text-1.2.3-r1 b/metadata/md5-cache/dev-ruby/text-1.2.3-r1
index 94978419be18..656d64b32200 100644
--- a/metadata/md5-cache/dev-ruby/text-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/text-1.2.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=A collection of text algorithms
 EAPI=5
 HOMEPAGE=https://github.com/threedaymonk/text
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
 KEYWORDS=~amd64 ~arm ~hppa ~ia64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.2.3.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=60419d8f81a2c1d9e596240b6173b3e6
+_md5_=dabd37bfb49e7a67bb1b03e4d4be0038
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1
index a944d026a697..c2ec3d59aa24 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby18] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=Hyphenates various words according to the rules of the language the word is written in.
 EAPI=4
 HOMEPAGE=http://rubyforge.org/projects/text-format
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/text-hyphen-1.4.1.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3debe09a21282b42ac69c09bd08ee92d
+_md5_=3e30dbfd34ff4bbda1bcc7140a50d8e6
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
index 6e7790d0590d..5a229efb5ee8 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby18] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby20] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby20] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=Hyphenates various words according to the rules of the language the word is written in.
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/text-format
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/text-hyphen-1.4.1.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d8e57f0e40843e549277314c7bee2e7e
+_md5_=2c3a4c22e38b6fd5e38171c3ee36d0ea
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.6.0 b/metadata/md5-cache/dev-ruby/timecop-0.6.0
index f3ec06b1ee6a..bacecbb791ec 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.6.0
+++ b/metadata/md5-cache/dev-ruby/timecop-0.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/mocha[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/mocha[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/mocha[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
 EAPI=5
 HOMEPAGE=http://github.com/jtrupiano/timecop
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
 KEYWORDS=amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.6.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=225f16f11530adaaa64d932a0dd7b087
+_md5_=c925666911ab2ef9be7c96cd6cb09682
diff --git a/metadata/md5-cache/dev-ruby/tryouts-0.8.8 b/metadata/md5-cache/dev-ruby/tryouts-0.8.8
index ec82990c0bd4..46f3dceaa935 100644
--- a/metadata/md5-cache/dev-ruby/tryouts-0.8.8
+++ b/metadata/md5-cache/dev-ruby/tryouts-0.8.8
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/sysinfo[ruby_targets_ruby18] dev-ruby/drydock[ruby_targets_ruby18] dev-ruby/attic[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/sysinfo[ruby_targets_ruby19] dev-ruby/drydock[ruby_targets_ruby19] dev-ruby/attic[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/sysinfo[ruby_targets_ruby19] dev-ruby/drydock[ruby_targets_ruby19] dev-ruby/attic[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=High-level testing library (DSL) for Ruby codes and command-line applications
-EAPI=2
+EAPI=5
 HOMEPAGE=http://solutious.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/sysinfo[ruby_targets_ruby18] dev-ruby/drydock[ruby_targets_ruby18] dev-ruby/attic[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/sysinfo[ruby_targets_ruby19] dev-ruby/drydock[ruby_targets_ruby19] dev-ruby/attic[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/sysinfo[ruby_targets_ruby19] dev-ruby/drydock[ruby_targets_ruby19] dev-ruby/attic[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/tryouts-0.8.8.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=195896f527d27fb1eefb54c5275954aa
+_md5_=b873eeb02fdcc0ab696c79cfa41e9abc
diff --git a/metadata/md5-cache/dev-ruby/tryouts-2.1.1 b/metadata/md5-cache/dev-ruby/tryouts-2.1.1
index 0d6a0d15b0f9..6bfc3012d69a 100644
--- a/metadata/md5-cache/dev-ruby/tryouts-2.1.1
+++ b/metadata/md5-cache/dev-ruby/tryouts-2.1.1
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/sysinfo-0.7.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/sysinfo-0.7.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/hexoid[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hexoid[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/sysinfo-0.7.3[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hexoid[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=High-level testing library (DSL) for Ruby codes and command-line applications
-EAPI=2
+EAPI=5
 HOMEPAGE=http://solutious.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/sysinfo-0.7.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/sysinfo-0.7.3[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sysinfo-0.7.3[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=2
 SRC_URI=mirror://rubygems/tryouts-2.1.1.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=80b27ae0ba49bc6246a4c7dac3ef8b00
+_md5_=4440531dcd7388881cfb495d3723cb3c
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.0.37 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.0.37
new file mode 100644
index 000000000000..3fb675389f76
--- /dev/null
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.0.37
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=5
+HOMEPAGE=http://developer.nvidia.com/cuda
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=sys-devel/gcc:4.7[cxx] >=x11-drivers/nvidia-drivers-334.16-r7[uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
+SLOT=0/6.0.37
+SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_32.run )
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	cuda	9be39ddb95b9b07ec931f30628d40757	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	60422068bae2b3406a8a40db45ab5b95	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=be470b280a379bcc24d7700676479fb4
diff --git a/metadata/md5-cache/dev-vcs/git-cola-2.0.2 b/metadata/md5-cache/dev-vcs/git-cola-2.0.2
new file mode 100644
index 000000000000..95ff6b3738b6
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-cola-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-python/jsonpickle[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] dev-python/pyinotify[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] dev-python/PyQt4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] dev-vcs/git app-text/asciidoc app-text/xmlto sys-devel/gettext doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] sys-apps/net-tools ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?]
+DESCRIPTION=The highly caffeinated git GUI
+EAPI=5
+HOMEPAGE=http://git-cola.github.com/
+IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_3
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-python/jsonpickle[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] dev-python/pyinotify[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] dev-python/PyQt4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] dev-vcs/git python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?]
+REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_3 )
+SLOT=0
+SRC_URI=https://github.com/git-cola/git-cola/archive/v2.0.2.tar.gz -> git-cola-2.0.2.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=15e98d9b9e563d9bc040c5ad7355d17b
diff --git a/metadata/md5-cache/games-arcade/digger-20140423 b/metadata/md5-cache/games-arcade/digger-20140423
new file mode 100644
index 000000000000..07f75e7b3f79
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/digger-20140423
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[X,video] x11-libs/libX11
+DESCRIPTION=Digger Remastered
+EAPI=5
+HOMEPAGE=http://www.digger.org/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[X,video] x11-libs/libX11 games-misc/games-envd
+SLOT=0
+SRC_URI=https://gitorious.org/digger/digger/archive/8d5769c59d68b37a5b30aa7a9cbfa5a9e15e7ed3.tar.gz -> digger-20140423.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e44a0431d3998c2c9b03e1deeb2f313c
diff --git a/metadata/md5-cache/games-fps/quake2-textures-0_beta8 b/metadata/md5-cache/games-fps/quake2-textures-0_beta8
index e1c1842c8401..a7058af51df4 100644
--- a/metadata/md5-cache/games-fps/quake2-textures-0_beta8
+++ b/metadata/md5-cache/games-fps/quake2-textures-0_beta8
@@ -1,11 +1,12 @@
 DEFINED_PHASES=compile install postinst preinst setup unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=High-resolution textures for Quake 2
-HOMEPAGE=http://jdolan.dyndns.org/trac/wiki/Retexture
+HOMEPAGE=http://jdolan.tastyspleen.net/
 KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=all-rights-reserved
 RDEPEND=games-misc/games-envd
+RESTRICT=mirror bindist
 SLOT=0
-SRC_URI=http://jdolan.dyndns.org/jaydolan/tmp/retexture/pak8.zip
+SRC_URI=http://jdolan.tastyspleen.net/pak8.zip
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6ab45bb3596fae360a21eb452cb754e2
+_md5_=ca4e69d1b58b1954aa3b71726b4c537b
diff --git a/metadata/md5-cache/kde-misc/eventlist-0.6 b/metadata/md5-cache/kde-misc/eventlist-0.6
deleted file mode 100644
index ffd8a67ea0ec..000000000000
--- a/metadata/md5-cache/kde-misc/eventlist-0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=] || ( ( >=kde-base/akonadi-4.4:4[aqua=] ) ( >=kde-base/kdepim-common-libs-4.4:4[aqua=] ) ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=Plasmoid showing the events from Akonadi resources
-EAPI=4
-HOMEPAGE=http://kde-look.org/content/show.php/Eventlist?content=107779
-IUSE=debug linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fr linguas_ga linguas_it linguas_km linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=] || ( ( >=kde-base/akonadi-4.4:4[aqua=] ) ( >=kde-base/kdepim-common-libs-4.4:4[aqua=] ) ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.tar.bz2
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0ec064adb26d8d6996f2f034f7d2311d
diff --git a/metadata/md5-cache/kde-misc/eventlist-0.6-r1 b/metadata/md5-cache/kde-misc/eventlist-0.6-r1
index 0d886c4ccaf0..9c2e99a2cb3e 100644
--- a/metadata/md5-cache/kde-misc/eventlist-0.6-r1
+++ b/metadata/md5-cache/kde-misc/eventlist-0.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Plasmoid showing the events from Akonadi resources
 EAPI=5
 HOMEPAGE=http://kde-look.org/content/show.php/Eventlist?content=107779
 IUSE=debug linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fr linguas_ga linguas_it linguas_km linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=] || ( ( >=kde-base/akonadi-4.4:4[aqua=] ) ( >=kde-base/kdepim-common-libs-4.4:4[aqua=] ) ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.tar.bz2
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=48aba2a18a67488f936607869b00a5e7
+_md5_=36ab54385d09054188a8d29c0bd68ab4
diff --git a/metadata/md5-cache/kde-misc/fancytasks-1.1.2 b/metadata/md5-cache/kde-misc/fancytasks-1.1.2
deleted file mode 100644
index 0a24e3a89bf1..000000000000
--- a/metadata/md5-cache/kde-misc/fancytasks-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/plasma-workspace-4.8:4[aqua=] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.8:4[aqua=]
-DESCRIPTION=Task and launch representation plasmoid
-EAPI=4
-HOMEPAGE=http://kde-look.org/content/show.php/Fancy+Tasks?content=99737
-IUSE=debug linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_km linguas_nds linguas_pl linguas_pt linguas_ru linguas_sv linguas_tr linguas_uk aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/plasma-workspace-4.8:4[aqua=] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext >=kde-base/oxygen-icons-4.8:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_de(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_fr(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_km(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_nds(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pt(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_ru(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.8:4[aqua=]
-SLOT=4
-SRC_URI=http://kde-look.org/CONTENT/content-files/99737-fancytasks-1.1.2.tar.bz2
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9222566cca49498a2a5a4fe378a62bfd
diff --git a/metadata/md5-cache/kde-misc/fancytasks-1.1.2-r1 b/metadata/md5-cache/kde-misc/fancytasks-1.1.2-r1
index 1b5e4d91c755..9e910724157b 100644
--- a/metadata/md5-cache/kde-misc/fancytasks-1.1.2-r1
+++ b/metadata/md5-cache/kde-misc/fancytasks-1.1.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Task and launch representation plasmoid
 EAPI=5
 HOMEPAGE=http://kde-look.org/content/show.php/Fancy+Tasks?content=99737
 IUSE=debug linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_km linguas_nds linguas_pl linguas_pt linguas_ru linguas_sv linguas_tr linguas_uk aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/plasma-workspace-4.8:4[aqua=] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext >=kde-base/oxygen-icons-4.8:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_de(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_fr(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_km(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_nds(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pt(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_ru(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/99737-fancytasks-1.1.2.tar.bz2
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2ec99f72934c221f59e725ae86ba0aa6
+_md5_=2ce515436461fb1d54bb720934aa68e3
diff --git a/metadata/md5-cache/kde-misc/hdaps_monitor-0.3 b/metadata/md5-cache/kde-misc/hdaps_monitor-0.3
deleted file mode 100644
index 3854d2f8c29f..000000000000
--- a/metadata/md5-cache/kde-misc/hdaps_monitor-0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=KDE-based monitor for the IBM HDAPS system
-EAPI=4
-HOMEPAGE=http://www.kde-look.org/content/show.php/HDAPS+monitor?content=103481
-IUSE=debug aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] app-laptop/hdapsd >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=http://www.kde-look.org/CONTENT/content-files/103481-hdaps_monitor-0.3.tar.gz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=47f724c066ca71df1c2f603c67781f83
diff --git a/metadata/md5-cache/kde-misc/hdaps_monitor-0.3-r1 b/metadata/md5-cache/kde-misc/hdaps_monitor-0.3-r1
index 97cc59e20416..596befd7ce09 100644
--- a/metadata/md5-cache/kde-misc/hdaps_monitor-0.3-r1
+++ b/metadata/md5-cache/kde-misc/hdaps_monitor-0.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=KDE-based monitor for the IBM HDAPS system
 EAPI=5
 HOMEPAGE=http://www.kde-look.org/content/show.php/HDAPS+monitor?content=103481
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] app-laptop/hdapsd >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/103481-hdaps_monitor-0.3.tar.gz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=bf0f830472e5ea0d6e0df73b75b3121f
+_md5_=6066d8387b6f10a098502f467165634b
diff --git a/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4 b/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4
deleted file mode 100644
index 3f562851fb05..000000000000
--- a/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=A frontend for sudo. Unlike kdesu, it uses directly sudo as backend.
-EAPI=4
-HOMEPAGE=http://launchpad.net/kdesudo/
-IUSE=debug linguas_ar linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fa linguas_fi linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_ko linguas_lt linguas_lv linguas_ms linguas_nb linguas_nl linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tl linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=amd64 x86
-LICENSE=FDL-1.2 GPL-2 LGPL-2
-RDEPEND=app-admin/sudo >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_id? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_id(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tl(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=http://launchpad.net/kdesudo/3.x/3.4.2.4/+download/kdesudo-3.4.2.4.tar.gz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9eaa967083ee3640f7e71e42fcd9a3b2
diff --git a/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1 b/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1
index 813c3f1d97d9..a3e4b4db8aa6 100644
--- a/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1
+++ b/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A frontend for sudo. Unlike kdesu, it uses directly sudo as backend.
 EAPI=5
 HOMEPAGE=http://launchpad.net/kdesudo/
 IUSE=debug linguas_ar linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fa linguas_fi linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_ko linguas_lt linguas_lv linguas_ms linguas_nb linguas_nl linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tl linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=FDL-1.2 GPL-2 LGPL-2
 RDEPEND=app-admin/sudo >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_id? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_id(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tl(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://launchpad.net/kdesudo/3.x/3.4.2.4/+download/kdesudo-3.4.2.4.tar.gz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a71477f5ae5bfa3b7b03a119b580c8ba
+_md5_=7243deff44b1152db98b7ecdbd60129b
diff --git a/metadata/md5-cache/kde-misc/kdiff3-0.9.97-r1 b/metadata/md5-cache/kde-misc/kdiff3-0.9.97-r1
deleted file mode 100644
index f31e346f7f2c..000000000000
--- a/metadata/md5-cache/kde-misc/kdiff3-0.9.97-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 kde? ( >=kde-base/kdelibs-4.4:4[aqua=] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] )
-DESCRIPTION=Qt/KDE based frontend to diff3
-EAPI=4
-HOMEPAGE=http://kdiff3.sourceforge.net/
-IUSE=debug kde linguas_ar linguas_bg linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_ka linguas_lt linguas_mai linguas_ml linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sk linguas_sv linguas_ta linguas_tg linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kde
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 kde? ( >=kde-base/kdelibs-4.4:4[aqua=] ) sys-apps/diffutils kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ka(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_ml? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ml(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_rw? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_rw(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ta(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tg(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] )
-RESTRICT=!kde? ( test )
-SLOT=4
-SRC_URI=mirror://sourceforge/kdiff3/kdiff3-0.9.97.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	qmake-utils	6f4ff01a55830f6d86647dc56dfaf3a7	qt4-r2	25e4f17ed047d9242cb40b70acfb2943	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e1720f4d8743532512ae408e54a392a0
diff --git a/metadata/md5-cache/kde-misc/kdiff3-0.9.97-r2 b/metadata/md5-cache/kde-misc/kdiff3-0.9.97-r2
index 131d37b81b71..c6cc3cb29766 100644
--- a/metadata/md5-cache/kde-misc/kdiff3-0.9.97-r2
+++ b/metadata/md5-cache/kde-misc/kdiff3-0.9.97-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Qt/KDE based frontend to diff3
 EAPI=5
 HOMEPAGE=http://kdiff3.sourceforge.net/
 IUSE=debug kde linguas_ar linguas_bg linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_ka linguas_lt linguas_mai linguas_ml linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sk linguas_sv linguas_ta linguas_tg linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kde
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 kde? ( >=kde-base/kdelibs-4.4:4[aqua=] ) sys-apps/diffutils kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ka(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_ml? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ml(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_rw? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_rw(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ta(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tg(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] )
 RESTRICT=!kde? ( test )
 SLOT=4
 SRC_URI=mirror://sourceforge/kdiff3/kdiff3-0.9.97.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	qmake-utils	6f4ff01a55830f6d86647dc56dfaf3a7	qt4-r2	25e4f17ed047d9242cb40b70acfb2943	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7ab612e58d9a9b0ea30f2b3d763e9f47
+_md5_=8bfcc9499df6b7e210b2557e1d6c4e7c
diff --git a/metadata/md5-cache/kde-misc/krusader-2.4.0_beta3 b/metadata/md5-cache/kde-misc/krusader-2.4.0_beta3
deleted file mode 100644
index 4873a578eb5c..000000000000
--- a/metadata/md5-cache/kde-misc/krusader-2.4.0_beta3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/libkonq-4.4:4[aqua=] sys-libs/zlib bookmarks? ( >=kde-base/keditbookmarks-4.4:4[aqua=] ) sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=An advanced twin-panel (commander-style) file-manager for KDE with many extras.
-EAPI=4
-HOMEPAGE=http://www.krusader.org/
-IUSE=+bookmarks debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/libkonq-4.4:4[aqua=] sys-libs/zlib bookmarks? ( >=kde-base/keditbookmarks-4.4:4[aqua=] ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=mirror://sourceforge/krusader/krusader-2.4.0-beta3.tar.bz2
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7fd9bdf8c8f0f1869ddd11b29ff8a6c5
diff --git a/metadata/md5-cache/kde-misc/krusader-2.4.0_beta3-r1 b/metadata/md5-cache/kde-misc/krusader-2.4.0_beta3-r1
index fe132096d784..190269b12d13 100644
--- a/metadata/md5-cache/kde-misc/krusader-2.4.0_beta3-r1
+++ b/metadata/md5-cache/kde-misc/krusader-2.4.0_beta3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An advanced twin-panel (commander-style) file-manager for KDE with m
 EAPI=5
 HOMEPAGE=http://www.krusader.org/
 IUSE=+bookmarks debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.4:4[aqua=] sys-libs/zlib bookmarks? ( >=kde-base/keditbookmarks-4.4:4[aqua=] ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/krusader/krusader-2.4.0-beta3.tar.bz2
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e1d2e968625d11187cc1ea55b5c43c47
+_md5_=356c1fb4a930c15e48e7704ebdeb0b5b
diff --git a/metadata/md5-cache/kde-misc/kvkbd-0.6 b/metadata/md5-cache/kde-misc/kvkbd-0.6
deleted file mode 100644
index 97b3ab19dbc9..000000000000
--- a/metadata/md5-cache/kde-misc/kvkbd-0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=A virtual keyboard for KDE
-EAPI=4
-HOMEPAGE=http://www.kde-apps.org/content/show.php?content=94374
-IUSE=aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=http://www.kde-apps.org/CONTENT/content-files/94374-kvkbd-0.6.tar.bz2
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6e2bb0e90162c1027146c029c6bd3cac
diff --git a/metadata/md5-cache/kde-misc/kvkbd-0.6-r1 b/metadata/md5-cache/kde-misc/kvkbd-0.6-r1
index 95cbe1716724..ecb8c5dfb64e 100644
--- a/metadata/md5-cache/kde-misc/kvkbd-0.6-r1
+++ b/metadata/md5-cache/kde-misc/kvkbd-0.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A virtual keyboard for KDE
 EAPI=5
 HOMEPAGE=http://www.kde-apps.org/content/show.php?content=94374
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/94374-kvkbd-0.6.tar.bz2
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=09f636b4a7293639bed8bbcc45912baa
+_md5_=18bf0f5195c63d7536e47d41709ae464
diff --git a/metadata/md5-cache/kde-misc/miniplayer-2.5 b/metadata/md5-cache/kde-misc/miniplayer-2.5
deleted file mode 100644
index 5afaf96f9f4d..000000000000
--- a/metadata/md5-cache/kde-misc/miniplayer-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/phonon >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=Multimedia player plasmoid
-EAPI=4
-HOMEPAGE=http://kde-look.org/content/show.php?content=95501
-IUSE=debug linguas_de linguas_et linguas_pl linguas_pt linguas_ru linguas_sv linguas_uk aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/phonon >=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=http://kde-look.org/CONTENT/content-files/95501-miniplayer-2.5.tar.bz2
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3305685688075f818aea0504f58aeb4d
diff --git a/metadata/md5-cache/kde-misc/miniplayer-2.5-r1 b/metadata/md5-cache/kde-misc/miniplayer-2.5-r1
index 515b26add7a8..c4abbbe4145c 100644
--- a/metadata/md5-cache/kde-misc/miniplayer-2.5-r1
+++ b/metadata/md5-cache/kde-misc/miniplayer-2.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Multimedia player plasmoid
 EAPI=5
 HOMEPAGE=http://kde-look.org/content/show.php?content=95501
 IUSE=debug linguas_de linguas_et linguas_pl linguas_pt linguas_ru linguas_sv linguas_uk aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/phonon >=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/95501-miniplayer-2.5.tar.bz2
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=110af14c6a252430258a1aa95b1b1bb9
+_md5_=fef443bc457f94b9fa9260e415106752
diff --git a/metadata/md5-cache/kde-misc/nightmode-0.3 b/metadata/md5-cache/kde-misc/nightmode-0.3
deleted file mode 100644
index 1876bdd7b00f..000000000000
--- a/metadata/md5-cache/kde-misc/nightmode-0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kwin-4.8:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.8:4[aqua=]
-DESCRIPTION=kwin plugin that makes the entire screen darker
-EAPI=4
-HOMEPAGE=http://kde-apps.org/content/show.php/Nightmode?content=123805
-IUSE=aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kwin-4.8:4[aqua=] >=kde-base/oxygen-icons-4.8:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.8:4[aqua=]
-SLOT=4
-SRC_URI=http://static.davidedmundson.co.uk/nightmode_0.3.tar.gz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5c39051197afd781c1d5d226adb0b024
diff --git a/metadata/md5-cache/kde-misc/nightmode-0.3-r1 b/metadata/md5-cache/kde-misc/nightmode-0.3-r1
index b2ff6679fa9e..2dce708c90ed 100644
--- a/metadata/md5-cache/kde-misc/nightmode-0.3-r1
+++ b/metadata/md5-cache/kde-misc/nightmode-0.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=kwin plugin that makes the entire screen darker
 EAPI=5
 HOMEPAGE=http://kde-apps.org/content/show.php/Nightmode?content=123805
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kwin-4.8:4[aqua=] >=kde-base/oxygen-icons-4.8:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=http://static.davidedmundson.co.uk/nightmode_0.3.tar.gz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=061d8343d2ac1a5fa2599c44d33a00e4
+_md5_=4530e36a7d680d20fcf30345baad3933
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26 b/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26
deleted file mode 100644
index 91af27ec12bc..000000000000
--- a/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/libtaskmanager-4.8:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.8:4[aqua=]
-DESCRIPTION=Simple application launcher for KDE 4's plasma desktop
-EAPI=4
-HOMEPAGE=http://cdlszm.org/
-IUSE=debug linguas_bs linguas_de linguas_el linguas_fr linguas_hu linguas_it linguas_pl linguas_pt linguas_ru linguas_sr linguas_tr aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=kde-base/libtaskmanager-4.8:4[aqua=] >=kde-base/oxygen-icons-4.8:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_bs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_el(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_it(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pt(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_ru(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_sr(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_tr(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.8:4[aqua=]
-SLOT=4
-SRC_URI=http://cdlszm.org/downloads/plasma-applet-daisy-0.0.4.26.tar.gz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b7c1377538414a8ebaf5d3cbad47c5b2
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26-r1 b/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26-r1
index 6d79f2f1dc49..5670fc9858d2 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26-r1
+++ b/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple application launcher for KDE 4's plasma desktop
 EAPI=5
 HOMEPAGE=http://cdlszm.org/
 IUSE=debug linguas_bs linguas_de linguas_el linguas_fr linguas_hu linguas_it linguas_pl linguas_pt linguas_ru linguas_sr linguas_tr aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=kde-base/libtaskmanager-4.8:4[aqua=] >=kde-base/oxygen-icons-4.8:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_bs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_el(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_it(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pt(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_ru(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_sr(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_tr(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=http://cdlszm.org/downloads/plasma-applet-daisy-0.0.4.26.tar.gz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=26f12baec4baa0d90c9bd146a4dd228d
+_md5_=a8c98e111a0b3debbfffec804883116c
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.11 b/metadata/md5-cache/kde-misc/rsibreak-0.11
deleted file mode 100644
index ed11e12c3569..000000000000
--- a/metadata/md5-cache/kde-misc/rsibreak-0.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=A small utility which bothers you at certain intervals
-EAPI=4
-HOMEPAGE=http://userbase.kde.org/RSIBreak
-IUSE=debug linguas_ar linguas_be linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_ml linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=kde-base/knotify-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_ml? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ml(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=http://dev.gentoo.org/~kensington/distfiles/rsibreak-0.11.tar.bz2
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=69381eef62e7c54adc928541fa945e56
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.11-r1 b/metadata/md5-cache/kde-misc/rsibreak-0.11-r1
index 508867e6558c..a24b348d1967 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.11-r1
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Small utility which bothers you at certain intervals
 EAPI=5
 HOMEPAGE=http://userbase.kde.org/RSIBreak
 IUSE=debug linguas_ar linguas_be linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_ml linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-base/knotify-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_ml? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ml(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~kensington/distfiles/rsibreak-0.11.tar.bz2
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0c73c2793d076b49d6a876089af0f4c5
+_md5_=666787934b9d63874622bc242896c2f3
diff --git a/metadata/md5-cache/kde-misc/steamcompanion-0.5.4 b/metadata/md5-cache/kde-misc/steamcompanion-0.5.4
deleted file mode 100644
index 894e86dc7fba..000000000000
--- a/metadata/md5-cache/kde-misc/steamcompanion-0.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=Connector for web Steam service from Valve.
-EAPI=4
-HOMEPAGE=http://kde-look.org/content/show.php/Steam+Companion?content=141713
-IUSE=debug linguas_it aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=http://kde-look.org/CONTENT/content-files/141713-steamcompanion.tar.gz -> steamcompanion-0.5.4.tar.gz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d7467df9a1ab7ec0afc8a031500022df
diff --git a/metadata/md5-cache/kde-misc/steamcompanion-0.5.4-r1 b/metadata/md5-cache/kde-misc/steamcompanion-0.5.4-r1
index 89f557f4a1ba..81969c48d871 100644
--- a/metadata/md5-cache/kde-misc/steamcompanion-0.5.4-r1
+++ b/metadata/md5-cache/kde-misc/steamcompanion-0.5.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Connector for web Steam service from Valve.
 EAPI=5
 HOMEPAGE=http://kde-look.org/content/show.php/Steam+Companion?content=141713
 IUSE=debug linguas_it aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/141713-steamcompanion.tar.gz -> steamcompanion-0.5.4.tar.gz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4fa9bbf7aa72b9726ba369fd891eed29
+_md5_=d8dbe38ab55af546d86d24d0d9c532be
diff --git a/metadata/md5-cache/kde-misc/stock-quote-2.1-r1 b/metadata/md5-cache/kde-misc/stock-quote-2.1-r1
deleted file mode 100644
index 2a291019e8b5..000000000000
--- a/metadata/md5-cache/kde-misc/stock-quote-2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=Displays stock quotes pulled from the Yahoo! servers
-EAPI=4
-HOMEPAGE=http://www.kde-look.org/content/show.php/Stock+Quote?content=90695
-IUSE=aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=http://www.kde-look.org/CONTENT/content-files/90695-plasma_stock_quote-2.1.tar.bz2
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3b06e4135b40df39462da67b4b964b1e
diff --git a/metadata/md5-cache/kde-misc/stock-quote-2.1-r2 b/metadata/md5-cache/kde-misc/stock-quote-2.1-r2
index 2b904951404b..9bbe6ae88dc7 100644
--- a/metadata/md5-cache/kde-misc/stock-quote-2.1-r2
+++ b/metadata/md5-cache/kde-misc/stock-quote-2.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Displays stock quotes pulled from the Yahoo! servers
 EAPI=5
 HOMEPAGE=http://www.kde-look.org/content/show.php/Stock+Quote?content=90695
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/90695-plasma_stock_quote-2.1.tar.bz2
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	7bb17d423f1c69e530a27ac752260711	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cfcdee28466242da54d3eb269b555f51
+_md5_=2c9aaaa0fb014622750f64e6f7709d55
diff --git a/metadata/md5-cache/media-gfx/blender-2.70a-r1 b/metadata/md5-cache/media-gfx/blender-2.70a-r1
deleted file mode 100644
index 23ca283ceb0d..000000000000
--- a/metadata/md5-cache/media-gfx/blender-2.70a-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-cpp/gflags dev-cpp/glog[gflags] dev-python/numpy[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/requests[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] >=media-libs/freetype-2.0 media-libs/glew media-libs/libpng:0 media-libs/libsamplerate sci-libs/colamd sci-libs/ldl sys-libs/zlib virtual/glu virtual/jpeg virtual/libintl virtual/opengl x11-libs/libXi x11-libs/libX11 boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) collada? ( media-libs/opencollada ) colorio? ( media-libs/opencolorio ) cycles? ( media-libs/openimageio ) ffmpeg? ( || ( >=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?] >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] ) ) fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( media-libs/openjpeg:0 ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( >=media-libs/openal-1.6.372 ) openimageio? ( media-libs/openimageio ) openexr? ( media-libs/openexr ) sdl? ( media-libs/libsdl[audio,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) >=dev-cpp/eigen-3.1.3:3 doc? ( app-doc/doxygen[-nodot(-),dot(+)] dev-python/sphinx ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=3D Creation/Animation/Publishing System
-EAPI=5
-HOMEPAGE=http://www.blender.org
-IUSE=+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff python_targets_python3_3 python_targets_python3_4 python_single_target_python3_3 python_single_target_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 BL )
-RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-cpp/gflags dev-cpp/glog[gflags] dev-python/numpy[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/requests[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] >=media-libs/freetype-2.0 media-libs/glew media-libs/libpng:0 media-libs/libsamplerate sci-libs/colamd sci-libs/ldl sys-libs/zlib virtual/glu virtual/jpeg virtual/libintl virtual/opengl x11-libs/libXi x11-libs/libX11 boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) collada? ( media-libs/opencollada ) colorio? ( media-libs/opencolorio ) cycles? ( media-libs/openimageio ) ffmpeg? ( || ( >=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?] >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] ) ) fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( media-libs/openjpeg:0 ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( >=media-libs/openal-1.6.372 ) openimageio? ( media-libs/openimageio ) openexr? ( media-libs/openexr ) sdl? ( media-libs/libsdl[audio,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 )
-REQUIRED_USE=python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) ^^ ( python_single_target_python3_3 python_single_target_python3_4 ) player? ( game-engine ) redcode? ( jpeg2k ffmpeg ) cycles? ( boost openexr tiff ) nls? ( boost ) game-engine? ( boost )
-SLOT=0
-SRC_URI=http://download.blender.org/source/blender-2.70a.tar.gz
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e03ceff077ccd418d3a4871e5f4b428d
diff --git a/metadata/md5-cache/media-gfx/blender-2.70a b/metadata/md5-cache/media-gfx/blender-2.70a-r2
similarity index 99%
rename from metadata/md5-cache/media-gfx/blender-2.70a
rename to metadata/md5-cache/media-gfx/blender-2.70a-r2
index c4688dcec897..cf37c321ad52 100644
--- a/metadata/md5-cache/media-gfx/blender-2.70a
+++ b/metadata/md5-cache/media-gfx/blender-2.70a-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python3_3? ( python_targets_python3_3 ) python
 SLOT=0
 SRC_URI=http://download.blender.org/source/blender-2.70a.tar.gz
 _eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=de9b44d4f31d39299f79db42ef13fd11
+_md5_=2075077fcd3f877e308cbe38dc8be84f
diff --git a/metadata/md5-cache/media-gfx/freecad-0.12.5284-r2 b/metadata/md5-cache/media-gfx/freecad-0.12.5284-r2
deleted file mode 100644
index 8b8d26af6812..000000000000
--- a/metadata/md5-cache/media-gfx/freecad-0.12.5284-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-cpp/eigen:3 dev-games/ode dev-libs/boost dev-libs/libf2c dev-libs/xerces-c[icu] dev-python/pivy dev-python/PyQt4[svg] media-libs/coin media-libs/SoQt >=sci-libs/opencascade-6.3-r3 sci-libs/gts sys-libs/zlib virtual/glu dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 dev-qt/qtxmlpatterns:4 >=dev-lang/swig-2.0.4-r1 virtual/fortran =dev-lang/python-2* sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=QT based Computer Aided Design application
-EAPI=4
-HOMEPAGE=http://sourceforge.net/apps/mediawiki/free-cad/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/eigen:3 dev-games/ode dev-libs/boost dev-libs/libf2c dev-libs/xerces-c[icu] dev-python/pivy dev-python/PyQt4[svg] media-libs/coin media-libs/SoQt >=sci-libs/opencascade-6.3-r3 sci-libs/gts sys-libs/zlib virtual/glu dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 dev-qt/qtxmlpatterns:4 virtual/fortran =dev-lang/python-2*
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=mirror://sourceforge/free-cad/freecad-0.12.5284.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f11d0b49db11e4ca6a93ed765f126e16
diff --git a/metadata/md5-cache/media-gfx/freecad-0.12.5284-r3 b/metadata/md5-cache/media-gfx/freecad-0.12.5284-r3
deleted file mode 100644
index eef67ae77442..000000000000
--- a/metadata/md5-cache/media-gfx/freecad-0.12.5284-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/eigen:3 dev-games/ode dev-libs/boost dev-libs/libf2c dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-python/PyQt4[svg] dev-python/pivy dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 dev-qt/qtxmlpatterns:4 media-libs/SoQt media-libs/coin[doc] sci-libs/gts sci-libs/opencascade sys-libs/zlib virtual/glu >=dev-lang/swig-2.0.4-r1:0 virtual/fortran =dev-lang/python-2* sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=QT based Computer Aided Design application
-EAPI=5
-HOMEPAGE=http://sourceforge.net/apps/mediawiki/free-cad/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/eigen:3 dev-games/ode dev-libs/boost dev-libs/libf2c dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-python/PyQt4[svg] dev-python/pivy dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 dev-qt/qtxmlpatterns:4 media-libs/SoQt media-libs/coin[doc] sci-libs/gts sci-libs/opencascade sys-libs/zlib virtual/glu virtual/fortran =dev-lang/python-2*
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=mirror://sourceforge/free-cad/freecad-0.12.5284.tar.gz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f05a71734cb285f60168cd1b8fd11224
diff --git a/metadata/md5-cache/media-gfx/freecad-0.13.1830 b/metadata/md5-cache/media-gfx/freecad-0.13.1830
deleted file mode 100644
index 590185310471..000000000000
--- a/metadata/md5-cache/media-gfx/freecad-0.13.1830
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/eigen:3 dev-games/ode dev-libs/boost dev-libs/libf2c dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-python/PyQt4[svg] dev-python/pivy dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 dev-qt/qtxmlpatterns:4 media-libs/SoQt media-libs/coin[doc] sci-libs/gts sci-libs/opencascade sys-libs/zlib virtual/glu >=dev-lang/swig-2.0.4-r1:0 virtual/fortran =dev-lang/python-2* sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=QT based Computer Aided Design application
-EAPI=5
-HOMEPAGE=http://www.freecadweb.org/
-LICENSE=GPL-2
-RDEPEND=dev-cpp/eigen:3 dev-games/ode dev-libs/boost dev-libs/libf2c dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-python/PyQt4[svg] dev-python/pivy dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 dev-qt/qtxmlpatterns:4 media-libs/SoQt media-libs/coin[doc] sci-libs/gts sci-libs/opencascade sys-libs/zlib virtual/glu virtual/fortran =dev-lang/python-2*
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=mirror://sourceforge/free-cad/freecad-0.13.1830.tar.gz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4f8e03228856fc0ab069c02050580963
diff --git a/metadata/md5-cache/media-gfx/freecad-0.13.1830-r1 b/metadata/md5-cache/media-gfx/freecad-0.13.1830-r1
index 47f46fc9cdd8..d61b92d5e316 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.13.1830-r1
+++ b/metadata/md5-cache/media-gfx/freecad-0.13.1830-r1
@@ -4,10 +4,11 @@ DESCRIPTION=QT based Computer Aided Design application
 EAPI=5
 HOMEPAGE=http://www.freecadweb.org/
 IUSE=python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:3 dev-games/ode dev-libs/boost dev-libs/libf2c dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-python/matplotlib dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 dev-qt/qtxmlpatterns:4 media-libs/SoQt media-libs/coin[doc] sci-libs/gts sci-libs/opencascade sys-libs/zlib virtual/glu python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-qt/assistant:4 dev-python/pycollada dev-python/pivy dev-python/PyQt4[svg] dev-python/pyopencl dev-python/numpy virtual/fortran
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/free-cad/freecad-0.13.1830.tar.gz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c533f397e7cdba546ab10cde1c2c3c0a
+_md5_=06ab5c972ecfaefa8e1def7fc9d9719f
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.18.0 b/metadata/md5-cache/media-gfx/shotwell-0.18.0
new file mode 100644
index 000000000000..f0d59aad5d15
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/shotwell-0.18.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=app-text/gnome-doc-utils >=dev-db/sqlite-3.5.9:3 >=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.30.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 >=dev-util/desktop-file-utils-0.13 gnome-base/dconf >=media-libs/gexiv2-0.4.90 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.4.2:= >=media-libs/libraw-0.13.2:= >=net-libs/libsoup-2.26.0:2.4 >=net-libs/rest-0.7:0.7 >=net-libs/webkit-gtk-1.4:3 >=virtual/udev-145[gudev] >=x11-libs/gtk+-3.6.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 ) >=sys-devel/m4-1.4.13 app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Open source photo manager for GNOME
+EAPI=5
+HOMEPAGE=http://yorba.org/shotwell/
+IUSE=linguas_af linguas_ar linguas_as linguas_ast linguas_bg linguas_bn linguas_bn_IN linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_ia linguas_id linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_ky linguas_lt linguas_lv linguas_mk linguas_ml linguas_mr linguas_nb linguas_nl linguas_nn linguas_or linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_HK linguas_zh_TW
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-text/gnome-doc-utils >=dev-db/sqlite-3.5.9:3 >=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.30.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 >=dev-util/desktop-file-utils-0.13 gnome-base/dconf >=media-libs/gexiv2-0.4.90 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.4.2:= >=media-libs/libraw-0.13.2:= >=net-libs/libsoup-2.26.0:2.4 >=net-libs/rest-0.7:0.7 >=net-libs/webkit-gtk-1.4:3 >=virtual/udev-145[gudev] >=x11-libs/gtk+-3.6.0:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/shotwell/0.18/shotwell-0.18.0.tar.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=e55fb4dcaf74d03bb4a8a1dc8ac7c5b8
diff --git a/metadata/md5-cache/media-libs/ladspa-cmt-1.16-r3 b/metadata/md5-cache/media-libs/ladspa-cmt-1.16-r3
index 7aa429472986..3f95527f0cb6 100644
--- a/metadata/md5-cache/media-libs/ladspa-cmt-1.16-r3
+++ b/metadata/md5-cache/media-libs/ladspa-cmt-1.16-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=media-libs/ladspa-sdk >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=CMT (computer music toolkit) Lasdpa library plugins
 EAPI=4
 HOMEPAGE=http://www.ladspa.org/
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.ladspa.org/download/cmt_src_1.16.tgz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	7634926e988215ce3539862586497cab	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a38fec3e5f85738c056be8fddcbf3fe1
+_md5_=3239a32b56e9a35ee075a0530941c1b3
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2 b/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
index 103e7f2b9205..a393305ef289 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=imlib? ( media-libs/imlib2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/freeglut[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) ruby? ( =dev-lang/ruby-1.8* ) slang? ( >=sys-libs/slang-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base >=dev-texlive/texlive-fontsrecommended-2012 >=dev-texlive/texlive-latexextra-2012 dev-tex/xcolor ) java? ( >=virtual/jdk-1.5 ) test? ( dev-util/cppunit ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=imlib? ( media-libs/imlib2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/freeglut[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) ruby? ( =dev-lang/ruby-1.8* ) slang? ( >=sys-libs/slang-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base >=dev-texlive/texlive-fontsrecommended-2012 >=dev-texlive/texlive-latexextra-2012 dev-tex/xcolor ) java? ( >=virtual/jdk-1.5 ) test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=A library that creates colored ASCII-art graphics
 EAPI=5
 HOMEPAGE=http://libcaca.zoy.org/
-IUSE=cxx doc imlib java mono ncurses opengl python ruby slang static-libs test truetype X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 elibc_FreeBSD java python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+IUSE=cxx doc imlib java mono ncurses opengl python ruby slang static-libs test truetype X elibc_FreeBSD java python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 ISC LGPL-2.1 WTFPL-2
 RDEPEND=imlib? ( media-libs/imlib2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/freeglut[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) ruby? ( =dev-lang/ruby-1.8* ) slang? ( >=sys-libs/slang-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta18.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-multilib	38fea5a140f8cf02ab0409e75a364d34	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	7634926e988215ce3539862586497cab	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b9dc86a7998c13156b9b66a5e77f74bf
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	7634926e988215ce3539862586497cab	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=e2fea58f1e78f1030af2dc7f5a9daf80
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.69 b/metadata/md5-cache/net-dns/dnsmasq-2.70
similarity index 93%
rename from metadata/md5-cache/net-dns/dnsmasq-2.69
rename to metadata/md5-cache/net-dns/dnsmasq-2.70
index 53ff4372bc1d..10908fdc05da 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.69
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.70
@@ -9,6 +9,6 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua ) conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) ) nls? ( sys-devel/gettext net-dns/libidn ) selinux? ( sec-policy/selinux-dnsmasq ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) )
 REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) s390? ( !conntrack )
 SLOT=0
-SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.69.tar.xz
+SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.70.tar.xz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ccbef933851fa2907c40a2c94d3261ae
+_md5_=41b7873fd6714198335094ac10067b6f
diff --git a/metadata/md5-cache/net-libs/czmq-1.1.0 b/metadata/md5-cache/net-libs/czmq-1.1.0
deleted file mode 100644
index 6d2acb75aab1..000000000000
--- a/metadata/md5-cache/net-libs/czmq-1.1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=doc? ( app-text/asciidoc app-text/xmlto ) >=net-libs/zeromq-2.1 <net-libs/zeromq-4
-DESCRIPTION=CZMQ - High-level C Binding for ZeroMQ
-HOMEPAGE=http://czmq.zeromq.org
-IUSE=doc static-libs
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-3
-SLOT=0
-SRC_URI=http://download.zeromq.org/czmq-1.1.0.tar.gz
-_md5_=bac7b2d2cb34f46119241ce09421965c
diff --git a/metadata/md5-cache/net-libs/czmq-1.2.0 b/metadata/md5-cache/net-libs/czmq-1.2.0
index 67eb58726a70..df174caa5754 100644
--- a/metadata/md5-cache/net-libs/czmq-1.2.0
+++ b/metadata/md5-cache/net-libs/czmq-1.2.0
@@ -1,10 +1,11 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=configure install
 DEPEND=doc? ( app-text/asciidoc app-text/xmlto ) >=net-libs/zeromq-2.1 <net-libs/zeromq-4
-DESCRIPTION=CZMQ - High-level C Binding for ZeroMQ
+DESCRIPTION=High-level C Binding for ZeroMQ
+EAPI=2
 HOMEPAGE=http://czmq.zeromq.org
 IUSE=doc static-libs
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://download.zeromq.org/czmq-1.2.0.tar.gz
-_md5_=387d225051f0ba2143b5bb345b8f658f
+_md5_=efa8ccdbd64ee2b2d1bdae6c1bb2b432
diff --git a/metadata/md5-cache/net-libs/czmq-1.2.0-r1 b/metadata/md5-cache/net-libs/czmq-1.2.0-r1
index 41f419f299d5..4354855e75b5 100644
--- a/metadata/md5-cache/net-libs/czmq-1.2.0-r1
+++ b/metadata/md5-cache/net-libs/czmq-1.2.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=doc? ( app-text/asciidoc app-text/xmlto ) >=net-libs/zeromq-2.1 <net-libs/zeromq-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=CZMQ - High-level C Binding for ZeroMQ
+DESCRIPTION=High-level C Binding for ZeroMQ
 EAPI=5
 HOMEPAGE=http://czmq.zeromq.org
 IUSE=doc static-libs
@@ -9,4 +9,4 @@ LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://download.zeromq.org/czmq-1.2.0.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=628465359ad529509bacd62a23fa06f3
+_md5_=0d82d78b23d42fb03ee17bc413c30d40
diff --git a/metadata/md5-cache/net-libs/czmq-1.4.1 b/metadata/md5-cache/net-libs/czmq-1.4.1
index 91d220e15ffd..ea9d12309d41 100644
--- a/metadata/md5-cache/net-libs/czmq-1.4.1
+++ b/metadata/md5-cache/net-libs/czmq-1.4.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=doc? ( app-text/asciidoc app-text/xmlto ) <net-libs/zeromq-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=CZMQ - High-level C Binding for ZeroMQ
+DESCRIPTION=High-level C Binding for ZeroMQ
 EAPI=5
 HOMEPAGE=http://czmq.zeromq.org
 IUSE=doc static-libs
@@ -9,4 +9,4 @@ LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://download.zeromq.org/czmq-1.4.1.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1a63e24b94b1967eadc65df547ddfddf
+_md5_=e106a50845fa471c7c16724d382cfddd
diff --git a/metadata/md5-cache/net-libs/czmq-2.0.3 b/metadata/md5-cache/net-libs/czmq-2.0.3
index 98ddffe1ea5e..8cb5d4e2ef8f 100644
--- a/metadata/md5-cache/net-libs/czmq-2.0.3
+++ b/metadata/md5-cache/net-libs/czmq-2.0.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=net-libs/zeromq-2.1 doc? ( app-text/asciidoc app-text/xmlto ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=CZMQ - High-level C Binding for ZeroMQ
+DESCRIPTION=High-level C Binding for ZeroMQ
 EAPI=5
 HOMEPAGE=http://czmq.zeromq.org
 IUSE=doc static-libs
@@ -9,4 +9,4 @@ LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://download.zeromq.org/czmq-2.0.3.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=195728b51929431a1822fe6a8127fb90
+_md5_=2f7be8e91dea4a3586e31716696a39b8
diff --git a/metadata/md5-cache/net-libs/czmq-2.1.0 b/metadata/md5-cache/net-libs/czmq-2.1.0
new file mode 100644
index 000000000000..9e29c31c74b2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/czmq-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-apps/util-linux >=net-libs/zeromq-2.1 doc? ( app-text/asciidoc app-text/xmlto ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=High-level C Binding for ZeroMQ
+EAPI=5
+HOMEPAGE=http://czmq.zeromq.org
+IUSE=doc static-libs
+KEYWORDS=~amd64 ~arm ~hppa ~x86
+LICENSE=LGPL-3
+RDEPEND=sys-apps/util-linux >=net-libs/zeromq-2.1
+SLOT=0
+SRC_URI=http://download.zeromq.org/czmq-2.1.0.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=3be049214d32cec53b702c9775f420b6
diff --git a/metadata/md5-cache/net-mail/courier-imap-4.15 b/metadata/md5-cache/net-mail/courier-imap-4.15-r1
similarity index 97%
rename from metadata/md5-cache/net-mail/courier-imap-4.15
rename to metadata/md5-cache/net-mail/courier-imap-4.15-r1
index 778fee8108f8..553c3871e579 100644
--- a/metadata/md5-cache/net-mail/courier-imap-4.15
+++ b/metadata/md5-cache/net-mail/courier-imap-4.15-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( berkdb gdbm )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-4.15.tar.bz2
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=555949cc8a0c028c90ac5f3d8cf5ae55
+_md5_=432b4121e1fc6ec1ccef29ee4126d41a
diff --git a/metadata/md5-cache/perl-core/CPAN-2.0.0 b/metadata/md5-cache/perl-core/CPAN-2.0.0
index ab36e4990632..6dbedf0c0f54 100644
--- a/metadata/md5-cache/perl-core/CPAN-2.0.0
+++ b/metadata/md5-cache/perl-core/CPAN-2.0.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=query, download and build perl modules from CPAN sites
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/CPAN/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.00.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	60422068bae2b3406a8a40db45ab5b95
-_md5_=81a302399db6436f36bd3d33d20fe657
+_md5_=d8b8c16f2b3a2c6ac4bb5c87ccfc3e1a
diff --git a/metadata/md5-cache/perl-core/Devel-PPPort-3.200.0 b/metadata/md5-cache/perl-core/Devel-PPPort-3.200.0
index 8ad3e9943abb..78b904b06b78 100644
--- a/metadata/md5-cache/perl-core/Devel-PPPort-3.200.0
+++ b/metadata/md5-cache/perl-core/Devel-PPPort-3.200.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Perl/Pollution/Portability
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Devel-PPPort/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MH/MHX/Devel-PPPort-3.20.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	60422068bae2b3406a8a40db45ab5b95
-_md5_=19d247765906d8b1e7b345724a8aaecc
+_md5_=5736a84225ec6a733287e84c465641fb
diff --git a/metadata/md5-cache/perl-core/Dumpvalue-1.170.0 b/metadata/md5-cache/perl-core/Dumpvalue-1.170.0
index 129b21eb9a77..37116bc29e3f 100644
--- a/metadata/md5-cache/perl-core/Dumpvalue-1.170.0
+++ b/metadata/md5-cache/perl-core/Dumpvalue-1.170.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=provides screen dump of Perl data
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Dumpvalue/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/Dumpvalue-1.17.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	60422068bae2b3406a8a40db45ab5b95
-_md5_=9ea38943d751e116feab0318e20f629a
+_md5_=4e2c0c36eae72c4e628eb92f719671e0
diff --git a/metadata/md5-cache/perl-core/Math-Complex-1.590.0 b/metadata/md5-cache/perl-core/Math-Complex-1.590.0
index 67ad627457de..7a06f95e6ee9 100644
--- a/metadata/md5-cache/perl-core/Math-Complex-1.590.0
+++ b/metadata/md5-cache/perl-core/Math-Complex-1.590.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=complex numbers and associated mathematical functions
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Math-Complex/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Math-Complex-1.59.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	60422068bae2b3406a8a40db45ab5b95
-_md5_=1cd94f8bf8b4a9a9996fe5ec9b6458ee
+_md5_=6ea60172decf4297cc738911a3ec6c5b
diff --git a/metadata/md5-cache/sci-biology/profphd-1.0.39 b/metadata/md5-cache/sci-biology/profphd-1.0.39
index 3e1b47a36807..768656aca26a 100644
--- a/metadata/md5-cache/sci-biology/profphd-1.0.39
+++ b/metadata/md5-cache/sci-biology/profphd-1.0.39
@@ -8,4 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/librg-utils-perl sci-libs/profnet sci-libs/profphd-utils
 SLOT=0
 SRC_URI=ftp://rostlab.org/profphd/profphd-1.0.39.tar.xz
-_md5_=38bfec66cbe05da613364421f19135bb
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=03138996a848855b588a7550c59878e0
diff --git a/metadata/md5-cache/sci-biology/profphd-1.0.40 b/metadata/md5-cache/sci-biology/profphd-1.0.40
new file mode 100644
index 000000000000..872ecbf6e0f5
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/profphd-1.0.40
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-lang/perl
+DESCRIPTION=Secondary structure and solvent accessibility predictor
+EAPI=5
+HOMEPAGE=https://rostlab.org/owiki/index.php/PROFphd_-_Secondary_Structure,_Solvent_Accessibility_and_Transmembrane_Helices_Prediction
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/librg-utils-perl sci-libs/profnet sci-libs/profphd-utils
+SLOT=0
+SRC_URI=ftp://rostlab.org/profphd/profphd-1.0.40.tar.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=5ce6ff7a532861b08d52913a95251c30
diff --git a/metadata/md5-cache/sci-chemistry/gabedit-2.4.8 b/metadata/md5-cache/sci-chemistry/gabedit-2.4.8
new file mode 100644
index 000000000000..7fe612e07f25
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gabedit-2.4.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/gl2ps x11-libs/pango virtual/opengl virtual/glu virtual/pkgconfig
+DESCRIPTION=GUI for computational chemistry packages
+EAPI=5
+HOMEPAGE=http://gabedit.sourceforge.net/
+IUSE=openmp
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/gl2ps x11-libs/pango virtual/opengl virtual/glu
+SLOT=0
+SRC_URI=mirror://sourceforge/gabedit/GabeditSrc248.tar.gz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=5341f110cc3334fd0ee0040380a176bb
diff --git a/metadata/md5-cache/sys-apps/kmod-17 b/metadata/md5-cache/sys-apps/kmod-17
index fe4f2362d3ea..f21ddb412eb6 100644
--- a/metadata/md5-cache/sys-apps/kmod-17
+++ b/metadata/md5-cache/sys-apps/kmod-17
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-17.tar.xz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=607f7860b60f9d4d1e5383f085e4487a
+_md5_=a1136f7400ace1a684033de96cece91e
diff --git a/metadata/md5-cache/sys-apps/kmod-9999 b/metadata/md5-cache/sys-apps/kmod-9999
index 8f67ca11dde3..8f528529ce24 100644
--- a/metadata/md5-cache/sys-apps/kmod-9999
+++ b/metadata/md5-cache/sys-apps/kmod-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_2 py
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	af81d52c25ec93fbdff71e0efb0de7b7	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0016b04de898f465260401f1a40405bf
+_md5_=b154f39c257904748005b08accd795e5
diff --git a/metadata/md5-cache/sys-fs/aufs-headers-3.13_p20140420 b/metadata/md5-cache/sys-fs/aufs-headers-3.13_p20140420
new file mode 100644
index 000000000000..14f90b30078c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/aufs-headers-3.13_p20140420
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=User space headers for aufs3
+EAPI=5
+HOMEPAGE=http://aufs.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs-headers-3.13_p20140420.tar.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=db2440653171a8d5c32e8b6afb17a278
diff --git a/metadata/md5-cache/sys-fs/aufs-util-3.13_p20140420 b/metadata/md5-cache/sys-fs/aufs-util-3.13_p20140420
new file mode 100644
index 000000000000..a751fb6845dc
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/aufs-util-3.13_p20140420
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare setup
+DEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318 >=sys-fs/aufs-headers-3.13_p20130826
+DESCRIPTION=Utilities are always necessary for aufs
+EAPI=5
+HOMEPAGE=http://aufs.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs-util-3.13_p20140420.tar.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=4d82db93d181e70f200c27e1ee544772
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20140420 b/metadata/md5-cache/sys-fs/aufs3-3_p20140420
new file mode 100644
index 000000000000..8eef49071af0
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20140420
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=An entirely re-designed and re-implemented Unionfs
+EAPI=5
+HOMEPAGE=http://aufs.sourceforge.net/
+IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20140420.tar.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	linux-info	90944ede7e9761bd7ef07602acdef9e3	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=98b4859afbc5722d366db2421758ca82
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.33 b/metadata/md5-cache/sys-kernel/aufs-sources-3.10.33
deleted file mode 100644
index 29ae91741aa1..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.33
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.10 kernel tree and aufs3 support
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.33
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.10.x_p20140310.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.10-40.base.tar.xz mirror://gentoo/genpatches-3.10-40.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-40.experimental.tar.xz ) )
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3cf26dc88185ef5096ed1855c6fa82c1
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.34 b/metadata/md5-cache/sys-kernel/aufs-sources-3.10.34
deleted file mode 100644
index abadb9e7e294..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.34
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.10 kernel tree and aufs3 support
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.34
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.10.x_p20140310.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.10-41.base.tar.xz mirror://gentoo/genpatches-3.10-41.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-41.experimental.tar.xz ) )
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=54e37d9fc21c3f4412f3870f773954c7
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.35 b/metadata/md5-cache/sys-kernel/aufs-sources-3.10.37
similarity index 83%
rename from metadata/md5-cache/sys-kernel/aufs-sources-3.10.35
rename to metadata/md5-cache/sys-kernel/aufs-sources-3.10.37
index a05435a931c4..7b90ae31de10 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.35
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.10.37
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.10.35
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.10.x_p20140310.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.10-42.base.tar.xz mirror://gentoo/genpatches-3.10-42.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-42.experimental.tar.xz ) )
+SLOT=3.10.37
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.10.x_p20140420.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.10-44.base.tar.xz mirror://gentoo/genpatches-3.10-44.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-44.experimental.tar.xz ) )
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=431387457c6a3fdca47e6aedcbb29504
+_md5_=0d004e73b855782980e6f02a9e7fc902
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.12.15 b/metadata/md5-cache/sys-kernel/aufs-sources-3.12.17
similarity index 83%
rename from metadata/md5-cache/sys-kernel/aufs-sources-3.12.15
rename to metadata/md5-cache/sys-kernel/aufs-sources-3.12.17
index 55a28ba30ddf..464ab3426866 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.12.15
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.12.17
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.12.15
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-3.12 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-check -> deblob-check-3.12 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.12.x_p20140310.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.12-16.base.tar.xz mirror://gentoo/genpatches-3.12-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-16.experimental.tar.xz ) )
+SLOT=3.12.17
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-3.12 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-check -> deblob-check-3.12 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.12.x_p20140420.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.12-18.base.tar.xz mirror://gentoo/genpatches-3.12-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-18.experimental.tar.xz ) )
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=788eaf05d43bed05791aa28f3c522913
+_md5_=0c6cae281de8205208d168e8d3e97d96
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.13.7 b/metadata/md5-cache/sys-kernel/aufs-sources-3.13.11
similarity index 87%
rename from metadata/md5-cache/sys-kernel/aufs-sources-3.13.7
rename to metadata/md5-cache/sys-kernel/aufs-sources-3.13.11
index 3372a91f8d78..7cea218dfcdb 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.13.7
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.13.11
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.13.7
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-3.13 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-check -> deblob-check-3.13 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.13_p20140310.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.13-10.base.tar.xz mirror://gentoo/genpatches-3.13-10.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.13-10.experimental.tar.xz ) )
+SLOT=3.13.11
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-3.13 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-check -> deblob-check-3.13 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.13_p20140420.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.13-14.base.tar.xz mirror://gentoo/genpatches-3.13-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.13-14.experimental.tar.xz ) )
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0cced419b99122d2cdcf6445ea8f67ee
+_md5_=2831d32cd0bf09e1995baa3147348066
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.13.6 b/metadata/md5-cache/sys-kernel/aufs-sources-3.13.6
deleted file mode 100644
index df116367ab02..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.13.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.13 kernel tree and aufs3 support
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.13.6
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-3.13 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-check -> deblob-check-3.13 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.13_p20140310.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.13-9.base.tar.xz mirror://gentoo/genpatches-3.13-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.13-9.experimental.tar.xz ) )
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=db5780bbaa3e85446574fc4404dcffb2
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.13.8 b/metadata/md5-cache/sys-kernel/aufs-sources-3.13.8
deleted file mode 100644
index fcf3a916701f..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.13.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.13 kernel tree and aufs3 support
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.13.8
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-3.13 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-check -> deblob-check-3.13 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.13_p20140310.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.13-11.base.tar.xz mirror://gentoo/genpatches-3.13-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.13-11.experimental.tar.xz ) )
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0f5bc7ad8967651e1206689d4b34639f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.13.5 b/metadata/md5-cache/sys-kernel/aufs-sources-3.14.1
similarity index 66%
rename from metadata/md5-cache/sys-kernel/aufs-sources-3.13.5
rename to metadata/md5-cache/sys-kernel/aufs-sources-3.14.1
index 0e630cea9b6b..44777177fa04 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.13.5
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.14.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.13 kernel tree and aufs3 support
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.14 kernel tree and aufs3 support
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=deblob experimental module vanilla symlink build deblob
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.13.5
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-3.13 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-check -> deblob-check-3.13 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.13_p20140224.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.13-8.base.tar.xz mirror://gentoo/genpatches-3.13-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.13-8.experimental.tar.xz ) )
+SLOT=3.14.1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-3.14 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.14_p20140420.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.14-4.base.tar.xz mirror://gentoo/genpatches-3.14-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-4.experimental.tar.xz ) )
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=104bd035b376428ec43d092ff742138f
+_md5_=33439a1e73b500996436928cf048223a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.12.14 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.18
similarity index 58%
rename from metadata/md5-cache/sys-kernel/aufs-sources-3.12.14
rename to metadata/md5-cache/sys-kernel/gentoo-sources-3.12.18
index c5e754921e7c..07f51179b8f4 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.12.14
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.18
@@ -1,15 +1,15 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.12 kernel tree and aufs3 support
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.12 kernel tree
 EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build deblob
-KEYWORDS=~amd64 ~x86
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob experimental symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
+PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.12.14
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-3.12 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-check -> deblob-check-3.12 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.12.x_p20140310.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.12-15.base.tar.xz mirror://gentoo/genpatches-3.12-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-15.experimental.tar.xz ) )
+SLOT=3.12.18
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-3.12 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-check -> deblob-check-3.12 ) mirror://gentoo/genpatches-3.12-19.base.tar.xz mirror://gentoo/genpatches-3.12-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-19.experimental.tar.xz )
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=16c48bb8e35c4c46397286ca5c2127e8
+_md5_=713127c00bb3345d8f40a6a3fda6bbb5
diff --git a/metadata/md5-cache/sys-process/parallel-20140422 b/metadata/md5-cache/sys-process/parallel-20140422
new file mode 100644
index 000000000000..1c84db1a7316
--- /dev/null
+++ b/metadata/md5-cache/sys-process/parallel-20140422
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO !<sys-apps/moreutils-0.45-r1 !<sci-geosciences/grass-6.4.1-r1
+DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
+EAPI=5
+HOMEPAGE=http://www.gnu.org/software/parallel/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+SLOT=0
+SRC_URI=mirror://gnu/parallel/parallel-20140422.tar.bz2
+_md5_=23de6971b5c879870f06ca7615944d85
diff --git a/metadata/md5-cache/virtual/perl-CPAN-2.0.0 b/metadata/md5-cache/virtual/perl-CPAN-2.0.0
index f8b3b136af27..bd9b6cd2be96 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-2.0.0
+++ b/metadata/md5-cache/virtual/perl-CPAN-2.0.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/CPAN-2.0.0 )
 SLOT=0
-_md5_=da4a546b6972cb5d6c5d72f324e9d8d2
+_md5_=5d34af164e7b2f455977849a8e089963
diff --git a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.200.0-r2 b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.200.0-r2
index dfcd6df4511b..b8ac522d1bb6 100644
--- a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.200.0-r2
+++ b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.200.0-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Devel-PPPort
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/Devel-PPPort-3.200.0 )
 SLOT=0
-_md5_=324a90f76c275680c225b857311f0c50
+_md5_=81eeb1ef53b32a35ad1f47ef1abc552b
diff --git a/metadata/md5-cache/virtual/perl-Dumpvalue-1.170.0-r1 b/metadata/md5-cache/virtual/perl-Dumpvalue-1.170.0-r1
index 046e74920a86..afee06062f09 100644
--- a/metadata/md5-cache/virtual/perl-Dumpvalue-1.170.0-r1
+++ b/metadata/md5-cache/virtual/perl-Dumpvalue-1.170.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for perl-core/Dumpvalue
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/Dumpvalue-1.170.0 )
 SLOT=0
-_md5_=5c10ed96434b3c9d8560f1c6301b1259
+_md5_=41a57e30d685cf53802b74ecffaacd15
diff --git a/metadata/md5-cache/virtual/perl-Math-Complex-1.590.0-r2 b/metadata/md5-cache/virtual/perl-Math-Complex-1.590.0-r2
index 2ada63c83ca8..da2e06a22f49 100644
--- a/metadata/md5-cache/virtual/perl-Math-Complex-1.590.0-r2
+++ b/metadata/md5-cache/virtual/perl-Math-Complex-1.590.0-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for perl-core/Math-Complex
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/Math-Complex-1.590.0 )
 SLOT=0
-_md5_=43a2fcb8c3c7caf1d77424a318cb2a8d
+_md5_=3873d2238c5f1e3410cd7ea2c7a8d9a5
diff --git a/metadata/md5-cache/www-apache/passenger-3.0.21-r1 b/metadata/md5-cache/www-apache/passenger-3.0.21-r1
index be0622352362..e47f18884a3d 100644
--- a/metadata/md5-cache/www-apache/passenger-3.0.21-r1
+++ b/metadata/md5-cache/www-apache/passenger-3.0.21-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-ruby/rake[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( >=dev-ruby/daemon_controller-1.0.0[ruby_targets_ruby18] >=dev-ruby/rack-1.0.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.0.0[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/fastthread-1.0.1[ruby_targets_ruby18] ) ) >=dev-libs/libev-3.90 net-misc/curl[ssl] doc? ( >=app-text/asciidoc-8.6.5[highlight] ) =www-servers/apache-2* ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+DEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.0.0[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) ) >=dev-libs/libev-3.90 net-misc/curl[ssl] doc? ( >=app-text/asciidoc-8.6.5[highlight] ) =www-servers/apache-2* ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 DESCRIPTION=Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze
 EAPI=5
 HOMEPAGE=http://modrails.com/
-IUSE=debug doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19
+IUSE=debug doc test elibc_FreeBSD ruby_targets_ruby19
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/daemon_controller-1.0.0[ruby_targets_ruby18] >=dev-ruby/rack-1.0.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.0.0[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( >=dev-ruby/fastthread-1.0.1[ruby_targets_ruby18] ) >=dev-libs/libev-3.90 net-misc/curl[ssl] =www-servers/apache-2* ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
-REQUIRED_USE=ruby_targets_ruby18? ( !ruby_targets_ruby19 ) ruby_targets_ruby19? ( !ruby_targets_ruby18 ) || ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.0.0[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) >=dev-libs/libev-3.90 net-misc/curl[ssl] =www-servers/apache-2* ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubyforge/passenger/passenger-3.0.21.tar.gz
 _eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3a1f3b0317ee8d1fd267f9d66112b690
+_md5_=cf8dc0984f4912df2c0ef570cc8b19e0
diff --git a/metadata/md5-cache/www-client/chromium-35.0.1916.27 b/metadata/md5-cache/www-client/chromium-35.0.1916.69
similarity index 97%
rename from metadata/md5-cache/www-client/chromium-35.0.1916.27
rename to metadata/md5-cache/www-client/chromium-35.0.1916.69
index acabef3467e5..974a1f1643d9 100644
--- a/metadata/md5-cache/www-client/chromium-35.0.1916.27
+++ b/metadata/md5-cache/www-client/chromium-35.0.1916.69
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( dev-libs/libgcrypt:0= >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/harfbuzz:=[icu(+)] >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/gtk+:2= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-35.0.1916.27.tar.xz test? ( https://commondatastorage.googleapis.com/chromium-browser-official/chromium-35.0.1916.27-testdata.tar.xz )
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-35.0.1916.69.tar.xz test? ( https://commondatastorage.googleapis.com/chromium-browser-official/chromium-35.0.1916.69-testdata.tar.xz )
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=813cc97a3265d190bee7aa32b29fff9e
+_md5_=d780f98af0cd1af63a03582a114e61b9
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ea5949de7e70..0d612fa03ca6 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 24 Apr 2014 09:37:05 +0000
+Thu, 24 Apr 2014 19:37:15 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 967b9f32b831..feef7c77c544 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Apr 24 09:37:02 UTC 2014
+Thu Apr 24 19:07:02 UTC 2014
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 6c29802e60e9..1bf2bd42fd74 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -2032,21 +2032,16 @@
 1308201952 ./sys-kernel/rsbac-sources/rsbac-sources-3.10.7.ebuild
 1303100131 ./sys-kernel/vserver-sources/vserver-sources-2.3.0.36.32.ebuild
 1308021122 ./sys-kernel/vserver-sources/vserver-sources-2.3.6.5.ebuild
-1403101806 ./sys-kernel/aufs-sources/aufs-sources-3.13.6.ebuild
-1403281209 ./sys-kernel/aufs-sources/aufs-sources-3.12.15.ebuild
-1403250000 ./sys-kernel/aufs-sources/aufs-sources-3.10.34.ebuild
 1401182301 ./sys-kernel/aufs-sources/aufs-sources-3.10.25.ebuild
-1404011856 ./sys-kernel/aufs-sources/aufs-sources-3.13.8.ebuild
+1404241608 ./sys-kernel/aufs-sources/aufs-sources-3.14.1.ebuild
+1404241608 ./sys-kernel/aufs-sources/aufs-sources-3.12.17.ebuild
 1404051359 ./sys-kernel/aufs-sources/aufs-sources-3.10.36.ebuild
-1402251122 ./sys-kernel/aufs-sources/aufs-sources-3.13.5.ebuild
-1403161438 ./sys-kernel/aufs-sources/aufs-sources-3.12.14.ebuild
-1403101806 ./sys-kernel/aufs-sources/aufs-sources-3.10.33.ebuild
-1403250000 ./sys-kernel/aufs-sources/aufs-sources-3.13.7.ebuild
+1404241608 ./sys-kernel/aufs-sources/aufs-sources-3.13.11.ebuild
 1404072012 ./sys-kernel/aufs-sources/aufs-sources-3.14.0.ebuild
 1404051359 ./sys-kernel/aufs-sources/aufs-sources-3.12.16.ebuild
-1404011856 ./sys-kernel/aufs-sources/aufs-sources-3.10.35.ebuild
 1404051359 ./sys-kernel/aufs-sources/aufs-sources-3.13.9.ebuild
 1402251122 ./sys-kernel/aufs-sources/aufs-sources-3.12.13.ebuild
+1404241608 ./sys-kernel/aufs-sources/aufs-sources-3.10.37.ebuild
 1402251122 ./sys-kernel/aufs-sources/aufs-sources-3.10.32.ebuild
 1401170731 ./sys-kernel/linux-headers/linux-headers-3.12.ebuild
 1303100131 ./sys-kernel/linux-headers/linux-headers-2.4.33.3.ebuild
@@ -2135,6 +2130,7 @@
 1401072331 ./sys-kernel/gentoo-sources/gentoo-sources-3.12.9999.ebuild
 1403312329 ./sys-kernel/gentoo-sources/gentoo-sources-3.4.85.ebuild
 1404151901 ./sys-kernel/gentoo-sources/gentoo-sources-3.13.10.ebuild
+1404241712 ./sys-kernel/gentoo-sources/gentoo-sources-3.12.18.ebuild
 1404021631 ./sys-kernel/gentoo-sources/gentoo-sources-3.12.13.ebuild
 1401072331 ./sys-kernel/gentoo-sources/gentoo-sources-3.4.9999.ebuild
 1404161647 ./sys-kernel/gentoo-sources/gentoo-sources-3.10.37.ebuild
@@ -2981,6 +2977,7 @@
 1403161435 ./dev-vcs/git-cola/git-cola-2.0.1.ebuild
 1402241313 ./dev-vcs/git-cola/git-cola-2.0.0.ebuild
 1306251931 ./dev-vcs/git-cola/git-cola-1.8.2.ebuild
+1404241615 ./dev-vcs/git-cola/git-cola-2.0.2.ebuild
 1403221949 ./dev-vcs/git-flow/git-flow-0.4.1.ebuild
 1211211531 ./dev-vcs/cssc/cssc-1.3.0-r1.ebuild
 1206080201 ./dev-vcs/cvsd/cvsd-1.0.7.ebuild
@@ -3447,7 +3444,8 @@
 1302142127 ./sci-biology/primer3/primer3-2.3.5.ebuild
 1212121731 ./sci-biology/primer3/primer3-2.3.4.ebuild
 1212170001 ./sci-biology/primer3/primer3-2.3.1.ebuild
-1304241831 ./sci-biology/profphd/profphd-1.0.39.ebuild
+1404241601 ./sci-biology/profphd/profphd-1.0.39.ebuild
+1404241538 ./sci-biology/profphd/profphd-1.0.40.ebuild
 1108091936 ./sci-biology/prosite/prosite-19.36.ebuild
 1112052156 ./sci-biology/prosite/prosite-20.52.ebuild
 1112140320 ./sci-biology/prosite/prosite-20.72.ebuild
@@ -4223,7 +4221,7 @@
 1302212031 ./www-apache/modsecurity-crs/modsecurity-crs-2.2.7.ebuild
 1311060631 ./www-apache/mod-auth-mysql/mod-auth-mysql-4.3.9.ebuild
 1404090953 ./www-apache/passenger/passenger-4.0.41.ebuild
-1310061201 ./www-apache/passenger/passenger-3.0.21-r1.ebuild
+1404242001 ./www-apache/passenger/passenger-3.0.21-r1.ebuild
 1209082301 ./www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild
 1204051331 ./www-apache/mod_xsendfile/mod_xsendfile-0.12.ebuild
 1005212254 ./www-apache/mod_xsendfile/mod_xsendfile-0.9.ebuild
@@ -5475,8 +5473,8 @@
 1304211201 ./www-client/netsurf/netsurf-2.9.ebuild
 1308222050 ./www-client/netsurf/netsurf-3.0-r1.ebuild
 1404180301 ./www-client/chromium/chromium-36.0.1941.0.ebuild
-1404130040 ./www-client/chromium/chromium-35.0.1916.27.ebuild
 1404181731 ./www-client/chromium/chromium-35.0.1916.47.ebuild
+1404241709 ./www-client/chromium/chromium-35.0.1916.69.ebuild
 1404121401 ./www-client/chromium/chromium-34.0.1847.116.ebuild
 1403120704 ./www-client/epiphany-extensions/epiphany-extensions-2.32.0-r1.ebuild
 1404071931 ./www-client/midori/midori-0.5.8.ebuild
@@ -6568,7 +6566,8 @@
 1402050603 ./app-admin/r10k/r10k-1.1.3.ebuild
 1311152101 ./app-admin/r10k/r10k-1.1.0.ebuild
 1202170001 ./app-admin/lsat/lsat-0.9.7.1-r1.ebuild
-1404241331 ./app-admin/pass/pass-9999.ebuild
+1404242101 ./app-admin/pass/pass-9999.ebuild
+1404242038 ./app-admin/pass/pass-1.6.ebuild
 1310281101 ./app-admin/pass/pass-1.4.2.ebuild
 1404131944 ./app-admin/pass/pass-1.5.ebuild
 1208262131 ./app-admin/pydf/pydf-9.ebuild
@@ -7809,7 +7808,7 @@
 1108151522 ./app-emacs/identica-mode/identica-mode-1.1-r1.ebuild
 1402162101 ./app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild
 1403061431 ./app-emacs/typing/typing-1.1.4.ebuild
-1312071517 ./app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
+1404241401 ./app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
 1402141950 ./app-emacs/volume/volume-1.0-r1.ebuild
 1401012031 ./app-emacs/volume/volume-1.0.ebuild
 1403241931 ./app-emacs/develock/develock-0.45.ebuild
@@ -8072,7 +8071,7 @@
 1305221531 ./x11-themes/murrine-themes/murrine-themes-0.98.0.ebuild
 1401200131 ./perl-core/IO/IO-1.25.ebuild
 1401210401 ./perl-core/CGI/CGI-3.630.0.ebuild
-1404071701 ./perl-core/CPAN/CPAN-2.0.0.ebuild
+1404242201 ./perl-core/CPAN/CPAN-2.0.0.ebuild
 1112112311 ./perl-core/Safe/Safe-2.300.0.ebuild
 1302231301 ./perl-core/Safe/Safe-2.330.0.ebuild
 1007190518 ./perl-core/Safe/Safe-2.27.ebuild
@@ -8126,7 +8125,7 @@
 1104242330 ./perl-core/Filter/Filter-1.380.0.ebuild
 1308141105 ./perl-core/Text-Tabs+Wrap/Text-Tabs+Wrap-2013.52.300.ebuild
 1302231301 ./perl-core/Text-Tabs+Wrap/Text-Tabs+Wrap-2012.81.800.ebuild
-1404071701 ./perl-core/Dumpvalue/Dumpvalue-1.170.0.ebuild
+1404242201 ./perl-core/Dumpvalue/Dumpvalue-1.170.0.ebuild
 1301072131 ./perl-core/Version-Requirements/Version-Requirements-0.101.21.ebuild
 1301072131 ./perl-core/Version-Requirements/Version-Requirements-0.101.20.ebuild
 1403101951 ./perl-core/Perl-OSType/Perl-OSType-1.3.0.ebuild
@@ -8343,7 +8342,7 @@
 1401210101 ./perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.33.ebuild
 1401210101 ./perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.52.0.ebuild
 1401210101 ./perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.49.0.ebuild
-1404071701 ./perl-core/Math-Complex/Math-Complex-1.590.0.ebuild
+1404242201 ./perl-core/Math-Complex/Math-Complex-1.590.0.ebuild
 1401210101 ./perl-core/IPC-Cmd/IPC-Cmd-0.780.0.ebuild
 1401210101 ./perl-core/IPC-Cmd/IPC-Cmd-0.700.0.ebuild
 1401210101 ./perl-core/IPC-Cmd/IPC-Cmd-0.840.0.ebuild
@@ -8379,7 +8378,7 @@
 1401210101 ./perl-core/Module-Load-Conditional/Module-Load-Conditional-0.440.0.ebuild
 1401210101 ./perl-core/Module-Load-Conditional/Module-Load-Conditional-0.580.0.ebuild
 1401210101 ./perl-core/Module-Load-Conditional/Module-Load-Conditional-0.540.0.ebuild
-1404071701 ./perl-core/Devel-PPPort/Devel-PPPort-3.200.0.ebuild
+1404242201 ./perl-core/Devel-PPPort/Devel-PPPort-3.200.0.ebuild
 1309180625 ./perl-core/autodie/autodie-2.210.0.ebuild
 1308141123 ./perl-core/autodie/autodie-2.200.0.ebuild
 1303021238 ./perl-core/autodie/autodie-2.160.0.ebuild
@@ -9884,7 +9883,7 @@
 0910301247 ./app-text/sdcv/sdcv-0.4.2.ebuild
 1402010901 ./app-text/ronn/ronn-0.7.3-r1.ebuild
 1404201131 ./app-text/ronn/ronn-0.7.3-r2.ebuild
-1404240155 ./app-text/tree/tree-1.7.0.ebuild
+1404242201 ./app-text/tree/tree-1.7.0.ebuild
 1401180931 ./app-text/tree/tree-1.6.0-r1.ebuild
 1307230731 ./app-text/unac/unac-1.8.0.ebuild
 1205092131 ./app-text/vlna/vlna-1.5.ebuild
@@ -11354,6 +11353,7 @@
 1212110231 ./dev-db/db-je/db-je-3.3.75.ebuild
 1403012257 ./dev-db/derby/derby-10.10.1.1.ebuild
 1311070731 ./dev-db/odbtp/odbtp-1.1.4.ebuild
+1404241731 ./dev-db/mysql/mysql-5.1.73.ebuild
 1403190501 ./dev-db/mysql/mysql-5.5.32.ebuild
 1301200601 ./dev-db/mysql/mysql-5.0.96.ebuild
 1308061701 ./dev-db/mysql/mysql-5.1.70.ebuild
@@ -13061,8 +13061,7 @@
 1402171017 ./sys-power/pmtools/pmtools-20110323-r1.ebuild
 1206170801 ./sys-power/pmtools/pmtools-20071116.ebuild
 1302100301 ./sys-power/powermgmt-base/powermgmt-base-1.31.ebuild
-1403210155 ./kde-misc/fancytasks/fancytasks-1.1.2-r1.ebuild
-1207230201 ./kde-misc/fancytasks/fancytasks-1.1.2.ebuild
+1404241831 ./kde-misc/fancytasks/fancytasks-1.1.2-r1.ebuild
 1403210231 ./kde-misc/kgtk/kgtk-0.11.0.ebuild
 1401060201 ./kde-misc/kim4/kim4-0.9.5.ebuild
 1403212231 ./kde-misc/kosd/kosd-0.8.1.ebuild
@@ -13071,14 +13070,11 @@
 1306291631 ./kde-misc/kolor-manager/kolor-manager-1.0.1.ebuild
 1306230156 ./kde-misc/eyesaver/eyesaver-0.4.ebuild
 1403210231 ./kde-misc/kcaldav/kcaldav-1.2.0.ebuild
-1211150031 ./kde-misc/miniplayer/miniplayer-2.5.ebuild
-1403212244 ./kde-misc/miniplayer/miniplayer-2.5-r1.ebuild
+1404241931 ./kde-misc/miniplayer/miniplayer-2.5-r1.ebuild
 1309052301 ./kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild
 1307041631 ./kde-misc/colibri/colibri-0.3.0.ebuild
-1403210206 ./kde-misc/kdesudo/kdesudo-3.4.2.4-r1.ebuild
-1306112001 ./kde-misc/kdesudo/kdesudo-3.4.2.4.ebuild
-1403212304 ./kde-misc/rsibreak/rsibreak-0.11-r1.ebuild
-1211151931 ./kde-misc/rsibreak/rsibreak-0.11.ebuild
+1404241901 ./kde-misc/kdesudo/kdesudo-3.4.2.4-r1.ebuild
+1404241931 ./kde-misc/rsibreak/rsibreak-0.11-r1.ebuild
 1305201701 ./kde-misc/yakuake/yakuake-2.9.9-r2.ebuild
 1306180237 ./kde-misc/commandwatch/commandwatch-0.1.1.ebuild
 1306180243 ./kde-misc/cpuload/cpuload-0.3.2.ebuild
@@ -13090,10 +13086,8 @@
 1306112001 ./kde-misc/kbiff/kbiff-4.0.ebuild
 1306180352 ./kde-misc/kepas/kepas-0.9.3.ebuild
 1301190624 ./kde-misc/kover/kover-6.ebuild
-1203261131 ./kde-misc/hdaps_monitor/hdaps_monitor-0.3.ebuild
-1403210200 ./kde-misc/hdaps_monitor/hdaps_monitor-0.3-r1.ebuild
-1306112001 ./kde-misc/kvkbd/kvkbd-0.6.ebuild
-1403212241 ./kde-misc/kvkbd/kvkbd-0.6-r1.ebuild
+1404241831 ./kde-misc/hdaps_monitor/hdaps_monitor-0.3-r1.ebuild
+1404241931 ./kde-misc/kvkbd/kvkbd-0.6-r1.ebuild
 1306200314 ./kde-misc/pgame/pgame-0.4.ebuild
 1301291103 ./kde-misc/pyrad/pyrad-0.6.2.ebuild
 1306190520 ./kde-misc/nepomukshell/nepomukshell-0.8.0.ebuild
@@ -13134,8 +13128,7 @@
 1312152101 ./kde-misc/synaptiks/synaptiks-0.8.1-r2.ebuild
 1306112001 ./kde-misc/basket/basket-1.81.ebuild
 1403110727 ./kde-misc/kdeconnect/kdeconnect-0.5.1.ebuild
-1207161731 ./kde-misc/eventlist/eventlist-0.6.ebuild
-1403210153 ./kde-misc/eventlist/eventlist-0.6-r1.ebuild
+1404241831 ./kde-misc/eventlist/eventlist-0.6-r1.ebuild
 1401191431 ./kde-misc/kwebkitpart/kwebkitpart-1.3.3.ebuild
 1306180224 ./kde-misc/chromi/chromi-0.2.ebuild
 1312010101 ./kde-misc/customizable-weather/customizable-weather-1.8.3.ebuild
@@ -13146,8 +13139,7 @@
 1403212301 ./kde-misc/plasma-widget-message-indicator/plasma-widget-message-indicator-0.5.8.ebuild
 1403212301 ./kde-misc/ktrafficanalyzer/ktrafficanalyzer-0.5.4.1.ebuild
 1306180303 ./kde-misc/drop2ftp/drop2ftp-0.6.ebuild
-1403210208 ./kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
-1303030131 ./kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild
+1404241901 ./kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
 1306190512 ./kde-misc/kimtoy/kimtoy-1.8.ebuild
 1403210231 ./kde-misc/kio_gopher/kio_gopher-0.1.4.ebuild
 1403210231 ./kde-misc/kookie/kookie-0.1.1.ebuild
@@ -13167,8 +13159,7 @@
 1312230358 ./kde-misc/semantik/semantik-0.9.0.ebuild
 1308192109 ./kde-misc/semantik/semantik-0.8.4.ebuild
 1401181103 ./kde-misc/semantik/semantik-0.9.1.ebuild
-1403212309 ./kde-misc/steamcompanion/steamcompanion-0.5.4-r1.ebuild
-1204190101 ./kde-misc/steamcompanion/steamcompanion-0.5.4.ebuild
+1404242001 ./kde-misc/steamcompanion/steamcompanion-0.5.4-r1.ebuild
 1306222035 ./kde-misc/plasma-emergelog/plasma-emergelog-0.0.2-r1.ebuild
 1312301531 ./kde-misc/akonadi-google/akonadi-google-20131213.ebuild
 1306182031 ./kde-misc/katelatexplugin/katelatexplugin-0.5.ebuild
@@ -13179,10 +13170,8 @@
 1403241428 ./kde-misc/homerun/homerun-1.2.2.ebuild
 1404130119 ./kde-misc/homerun/homerun-1.2.3.ebuild
 1403212301 ./kde-misc/plasma-widget-menubar/plasma-widget-menubar-0.2.0.ebuild
-1301111731 ./kde-misc/krusader/krusader-2.4.0_beta3.ebuild
-1403212239 ./kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild
-1211240001 ./kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26.ebuild
-1403212248 ./kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26-r1.ebuild
+1404241931 ./kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild
+1404241931 ./kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26-r1.ebuild
 1303312101 ./kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r2.ebuild
 1403210231 ./kde-misc/kcollectd/kcollectd-0.9-r1.ebuild
 1404101531 ./kde-misc/emerging-plasmoid/emerging-plasmoid-1.0.3.ebuild
@@ -13194,15 +13183,13 @@
 1306180530 ./kde-misc/ksoprano/ksoprano-0.2.ebuild
 1403212301 ./kde-misc/plasma-network-status/plasma-network-status-0.1.1.ebuild
 1404240301 ./kde-misc/kfilebox/kfilebox-0.4.9.ebuild
-1403212245 ./kde-misc/nightmode/nightmode-0.3-r1.ebuild
-1309081801 ./kde-misc/nightmode/nightmode-0.3.ebuild
+1404241931 ./kde-misc/nightmode/nightmode-0.3-r1.ebuild
 1306180326 ./kde-misc/fsrunner/fsrunner-0.7.5.ebuild
 1403210231 ./kde-misc/kopete-thinklight/kopete-thinklight-0.50.ebuild
 1312180909 ./kde-misc/magneto-kde/magneto-kde-254.ebuild
 1403212301 ./kde-misc/nvdevmon/nvdevmon-0.1.2.ebuild
 1403210231 ./kde-misc/kgrubeditor/kgrubeditor-0.8.5.ebuild
-1403212331 ./kde-misc/stock-quote/stock-quote-2.1-r1.ebuild
-1403212312 ./kde-misc/stock-quote/stock-quote-2.1-r2.ebuild
+1404242001 ./kde-misc/stock-quote/stock-quote-2.1-r2.ebuild
 1403210201 ./kde-misc/gx-mail-notify/gx-mail-notify-0.4.4.ebuild
 1403212302 ./kde-misc/quickaccess/quickaccess-0.8.2-r1.ebuild
 1306112001 ./kde-misc/quickaccess/quickaccess-0.8.2.ebuild
@@ -13254,6 +13241,7 @@
 1307281231 ./app-backup/backintime/backintime-1.0.24-r1.ebuild
 1110240139 ./app-backup/backintime/backintime-1.0.8.ebuild
 1111110353 ./app-backup/backintime/backintime-1.0.8-r1.ebuild
+1404241411 ./app-backup/backintime/backintime-1.0.34.ebuild
 1305201831 ./app-backup/bacula/bacula-5.2.12.ebuild
 1305201831 ./app-backup/bacula/bacula-5.0.3-r3.ebuild
 1404051101 ./app-backup/bacula/bacula-5.2.13-r2.ebuild
@@ -13598,6 +13586,7 @@
 1202070001 ./media-gfx/llgal/llgal-0.13.15.ebuild
 1309021817 ./media-gfx/llgal/llgal-0.13.17-r1.ebuild
 1402210101 ./media-gfx/shotwell/shotwell-0.15.1.ebuild
+1404241637 ./media-gfx/shotwell/shotwell-0.18.0.ebuild
 1303030201 ./media-gfx/photo/photo-0.8.ebuild
 1303030201 ./media-gfx/photo/photo-0.7.1.1.ebuild
 1302080231 ./media-gfx/pinta/pinta-1.3.ebuild
@@ -13723,11 +13712,8 @@
 1312241701 ./media-gfx/fotoxx/fotoxx-13.11.1.ebuild
 1304111731 ./media-gfx/freepv/freepv-0.3.0-r4.ebuild
 1106161944 ./media-gfx/freepv/freepv-0.3.0-r3.ebuild
-1303072001 ./media-gfx/freecad/freecad-0.12.5284-r2.ebuild
-1305091301 ./media-gfx/freecad/freecad-0.13.1830.ebuild
-1404240848 ./media-gfx/freecad/freecad-0.13.1830-r1.ebuild
+1404241801 ./media-gfx/freecad/freecad-0.13.1830-r1.ebuild
 1404240249 ./media-gfx/freecad/freecad-0.12.5284-r4.ebuild
-1404240301 ./media-gfx/freecad/freecad-0.12.5284-r3.ebuild
 1404222331 ./media-gfx/freewrl/freewrl-9999.ebuild
 1404222322 ./media-gfx/freewrl/freewrl-2.3.3.ebuild
 1403141801 ./media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
@@ -13883,17 +13869,16 @@
 1401081101 ./media-gfx/replicatorg/replicatorg-37-r2.ebuild
 1401081101 ./media-gfx/replicatorg/replicatorg-40-r1.ebuild
 1103290944 ./media-gfx/truevision/truevision-0.5.5.2.ebuild
-1404142201 ./media-gfx/blender/blender-2.70a.ebuild
 1403202101 ./media-gfx/blender/blender-2.69.ebuild
 1212312031 ./media-gfx/blender/blender-2.64a.ebuild
 1403202056 ./media-gfx/blender/blender-2.70.ebuild
 1404161831 ./media-gfx/blender/blender-2.70-r1.ebuild
-1404190201 ./media-gfx/blender/blender-2.70a-r1.ebuild
 1308120201 ./media-gfx/blender/blender-2.68a.ebuild
 1308120201 ./media-gfx/blender/blender-2.68.ebuild
 1306212201 ./media-gfx/blender/blender-2.67b-r1.ebuild
 1306211913 ./media-gfx/blender/blender-2.66-r1.ebuild
 1404161831 ./media-gfx/blender/blender-2.69-r1.ebuild
+1404241534 ./media-gfx/blender/blender-2.70a-r2.ebuild
 1205051101 ./media-gfx/icon-slicer/icon-slicer-0.3.ebuild
 1311172239 ./media-gfx/photivo/photivo-0_pre20131115.ebuild
 1312180131 ./media-gfx/photivo/photivo-9999.ebuild
@@ -13986,10 +13971,10 @@
 1401190001 ./net-dns/pdnsd/pdnsd-1.2.9a.ebuild
 0912031439 ./net-dns/valtz/valtz-0.7.ebuild
 1211210031 ./net-dns/odsclient/odsclient-1.03-r1.ebuild
+1404242218 ./net-dns/dnsmasq/dnsmasq-2.70.ebuild
 1308162001 ./net-dns/dnsmasq/dnsmasq-2.66.ebuild
 1312102355 ./net-dns/dnsmasq/dnsmasq-2.68.ebuild
 1310252223 ./net-dns/dnsmasq/dnsmasq-2.67.ebuild
-1404102205 ./net-dns/dnsmasq/dnsmasq-2.69.ebuild
 1304082201 ./net-dns/dnswalk/dnswalk-2.0.2.ebuild
 1105021953 ./net-dns/dnssec-root/dnssec-root-20100715.ebuild
 1212192231 ./net-dns/dnssec-root/dnssec-root-20110630.ebuild
@@ -14812,7 +14797,7 @@
 1403020301 ./media-libs/libaacs/libaacs-0.7.0.ebuild
 1308142301 ./media-libs/libcaca/libcaca-0.99_beta18-r1.ebuild
 1308130401 ./media-libs/libcaca/libcaca-0.99_beta17.ebuild
-1404191201 ./media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
+1404242301 ./media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
 1403050101 ./media-libs/libbs2b/libbs2b-3.1.0.ebuild
 1308110101 ./media-libs/libcddb/libcddb-1.3.2-r1.ebuild
 1205151801 ./media-libs/libcddb/libcddb-1.3.2.ebuild
@@ -15203,7 +15188,7 @@
 1304021531 ./media-libs/ladspa-cmt/ladspa-cmt-1.16-r2.ebuild
 1211271601 ./media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild
 1211271558 ./media-libs/ladspa-cmt/ladspa-cmt-1.16-r1.ebuild
-1404190218 ./media-libs/ladspa-cmt/ladspa-cmt-1.16-r3.ebuild
+1404241731 ./media-libs/ladspa-cmt/ladspa-cmt-1.16-r3.ebuild
 1401261631 ./media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
 1206090401 ./media-libs/ladspa-sdk/ladspa-sdk-1.13-r1.ebuild
 1307300231 ./media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild
@@ -15651,6 +15636,7 @@
 1205030901 ./sys-process/latencytop/latencytop-0.4.ebuild
 1003241815 ./sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild
 1311262141 ./sys-process/parallel/parallel-20131122.ebuild
+1404242215 ./sys-process/parallel/parallel-20140422.ebuild
 1312230453 ./sys-process/parallel/parallel-20131222.ebuild
 1306251701 ./sys-process/parallel/parallel-20130522.ebuild
 1401230328 ./sys-process/parallel/parallel-20140122.ebuild
@@ -15877,8 +15863,8 @@
 1003180457 ./dev-embedded/avr-libc/avr-libc-1.6.8.ebuild
 1204132231 ./dev-embedded/avr-libc/avr-libc-1.7.1.ebuild
 0902160240 ./dev-embedded/avr-libc/avr-libc-1.6.2.ebuild
-1308052200 ./dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
-1205220623 ./dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild
+1404242201 ./dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
+1404242201 ./dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild
 1312261231 ./dev-embedded/u-boot-tools/u-boot-tools-2013.07.ebuild
 1404012301 ./dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild
 1005070535 ./dev-embedded/tavrasm/tavrasm-1.22-r1.ebuild
@@ -16072,8 +16058,8 @@
 1402251307 ./sys-apps/grep/grep-2.18.ebuild
 1402181105 ./sys-apps/grep/grep-2.17.ebuild
 1404051531 ./sys-apps/kmod/kmod-16.ebuild
-1404232301 ./sys-apps/kmod/kmod-9999.ebuild
-1404232301 ./sys-apps/kmod/kmod-17.ebuild
+1404241831 ./sys-apps/kmod/kmod-9999.ebuild
+1404241831 ./sys-apps/kmod/kmod-17.ebuild
 1305120301 ./sys-apps/less/less-445-r1.ebuild
 1305120301 ./sys-apps/less/less-450.ebuild
 1305120301 ./sys-apps/less/less-441.ebuild
@@ -17662,6 +17648,7 @@
 1304241421 ./sci-chemistry/theseus/theseus-2.0.1-r1.ebuild
 1308191653 ./sci-chemistry/gabedit/gabedit-2.4.7.ebuild
 1309141431 ./sci-chemistry/gabedit/gabedit-2.4.6.ebuild
+1404241646 ./sci-chemistry/gabedit/gabedit-2.4.8.ebuild
 1210191401 ./sci-chemistry/balbes/balbes-1.0.0_p100317-r2.ebuild
 1401061931 ./sci-chemistry/gamessq/gamessq-1.2.ebuild
 1007112058 ./sci-chemistry/bkchem/bkchem-0.14.0_pre1-r2.ebuild
@@ -18220,11 +18207,11 @@
 1309141431 ./net-libs/qmf/qmf-4.0.3.ebuild
 1002122307 ./net-libs/adns/adns-1.4.ebuild
 1205092101 ./net-libs/adns/adns-1.4-r1.ebuild
-1312241501 ./net-libs/czmq/czmq-1.2.0.ebuild
-1312241450 ./net-libs/czmq/czmq-1.4.1.ebuild
-1312241601 ./net-libs/czmq/czmq-2.0.3.ebuild
-1312241501 ./net-libs/czmq/czmq-1.2.0-r1.ebuild
-1312241501 ./net-libs/czmq/czmq-1.1.0.ebuild
+1404241701 ./net-libs/czmq/czmq-1.2.0.ebuild
+1404241701 ./net-libs/czmq/czmq-1.4.1.ebuild
+1404241701 ./net-libs/czmq/czmq-2.0.3.ebuild
+1404241701 ./net-libs/czmq/czmq-1.2.0-r1.ebuild
+1404241658 ./net-libs/czmq/czmq-2.1.0.ebuild
 1302172201 ./net-libs/enet/enet-1.3.6.ebuild
 1207061001 ./net-libs/enet/enet-1.2.2.ebuild
 1210151020 ./net-libs/enet/enet-1.3.5.ebuild
@@ -18783,7 +18770,7 @@
 1206092301 ./net-mail/nmzmail/nmzmail-1.1.ebuild
 1302160301 ./net-mail/popa3d/popa3d-1.0.2-r1.ebuild
 1311060801 ./net-mail/popick/popick-0.1.ebuild
-1404240304 ./net-mail/courier-imap/courier-imap-4.15.ebuild
+1404241801 ./net-mail/courier-imap/courier-imap-4.15-r1.ebuild
 1309262131 ./net-mail/courier-imap/courier-imap-4.8.0-r1.ebuild
 1210240331 ./net-mail/qprint/qprint-1.0.ebuild
 1402261331 ./net-mail/notmuch/notmuch-0.16-r1.ebuild
@@ -22095,7 +22082,7 @@
 0911112118 ./dev-lang/falcon/falcon-0.9.4.4.ebuild
 1005250944 ./dev-lang/falcon/falcon-0.9.6.4.ebuild
 1303141801 ./dev-lang/ferite/ferite-1.1.17-r1.ebuild
-1404211635 ./dev-lang/erlang/erlang-17.0.ebuild
+1404241601 ./dev-lang/erlang/erlang-17.0.ebuild
 1402090053 ./dev-lang/erlang/erlang-16.2-r1.ebuild
 1311161301 ./dev-lang/erlang/erlang-15.2.3.1.ebuild
 1404051939 ./dev-lang/erlang/erlang-16.3.1.ebuild
@@ -23716,8 +23703,7 @@
 1209011601 ./dev-perl/Net-IP/Net-IP-1.250.0.ebuild
 1402020401 ./dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.130.0.ebuild
 1108291524 ./dev-perl/NetxAP/NetxAP-0.20.0.ebuild
-1109040104 ./dev-perl/Number-Format/Number-Format-1.730.0.ebuild
-0703051519 ./dev-perl/Number-Format/Number-Format-1.52.ebuild
+1404242131 ./dev-perl/Number-Format/Number-Format-1.730.0.ebuild
 1108311412 ./dev-perl/Feed-Find/Feed-Find-0.70.0.ebuild
 1312081501 ./dev-perl/IMAP-Admin/IMAP-Admin-1.6.7-r1.ebuild
 1109040104 ./dev-perl/Cgi-Simple/Cgi-Simple-1.113.0.ebuild
@@ -24853,8 +24839,7 @@
 1109040104 ./dev-perl/String-Approx/String-Approx-3.260.0.ebuild
 1308091801 ./dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.210.0.ebuild
 1212251552 ./dev-perl/Test-Unit-Lite/Test-Unit-Lite-0.120.200.ebuild
-1308251024 ./dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r1.ebuild
-1308251031 ./dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05.ebuild
+1404242201 ./dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r1.ebuild
 1309041728 ./dev-perl/Emacs-PDE/Emacs-PDE-0.2.16-r1.ebuild
 1108280028 ./dev-perl/constant-boolean/constant-boolean-0.20.0.ebuild
 1205060501 ./dev-perl/File-DesktopEntry/File-DesktopEntry-0.40.0.ebuild
@@ -25092,20 +25077,18 @@
 1404060401 ./dev-ruby/hoe/hoe-2.12.5.ebuild
 1404210958 ./dev-ruby/hoe/hoe-3.11.0.ebuild
 1404181824 ./dev-ruby/hoe/hoe-3.9.0-r1.ebuild
-1401130739 ./dev-ruby/jwt/jwt-0.1.10.ebuild
-1311111649 ./dev-ruby/jwt/jwt-0.1.8-r1.ebuild
-1401181117 ./dev-ruby/jwt/jwt-0.1.11.ebuild
-1312281131 ./dev-ruby/mab/mab-0.0.3.ebuild
+1404242201 ./dev-ruby/jwt/jwt-0.1.11.ebuild
+1404242101 ./dev-ruby/mab/mab-0.0.3.ebuild
 1404060331 ./dev-ruby/map/map-6.5.3.ebuild
 1404060331 ./dev-ruby/png/png-1.2.0-r1.ebuild
 1403100501 ./dev-ruby/pry/pry-0.9.11.4.ebuild
 1403100437 ./dev-ruby/pry/pry-0.9.12.6.ebuild
-1311111628 ./dev-ruby/rev/rev-0.3.2-r1.ebuild
+1404242201 ./dev-ruby/rev/rev-0.3.2-r1.ebuild
 1312221942 ./dev-ruby/rjb/rjb-1.4.8.ebuild
 1312152041 ./dev-ruby/rjb/rjb-1.4.5.ebuild
-1310291935 ./dev-ruby/sfl/sfl-2.2-r1.ebuild
-1311220559 ./dev-ruby/six/six-0.2.0.ebuild
-1209210951 ./dev-ruby/rye/rye-0.9.7.ebuild
+1404242101 ./dev-ruby/sfl/sfl-2.2-r1.ebuild
+1404242101 ./dev-ruby/six/six-0.2.0.ebuild
+1404242101 ./dev-ruby/rye/rye-0.9.7.ebuild
 1404071019 ./dev-ruby/unf/unf-0.1.4.ebuild
 1404190801 ./dev-ruby/unf/unf-0.1.3-r1.ebuild
 1404190801 ./dev-ruby/unf/unf-0.1.1.ebuild
@@ -25149,10 +25132,9 @@
 1404202301 ./dev-ruby/mail/mail-2.5.4.ebuild
 1404051831 ./dev-ruby/mail/mail-2.4.4.ebuild
 1310191015 ./dev-ruby/mash/mash-0.1.1-r2.ebuild
-1307290604 ./dev-ruby/ohai/ohai-6.18.0.ebuild
-1307191101 ./dev-ruby/ohai/ohai-6.16.0.ebuild
-1404060201 ./dev-ruby/racc/racc-1.4.11.ebuild
-1404060201 ./dev-ruby/racc/racc-1.4.9.ebuild
+1404242201 ./dev-ruby/ohai/ohai-6.18.0.ebuild
+1404242101 ./dev-ruby/racc/racc-1.4.11.ebuild
+1404242101 ./dev-ruby/racc/racc-1.4.9.ebuild
 1404051631 ./dev-ruby/rack/rack-1.4.5-r1.ebuild
 1404051631 ./dev-ruby/rack/rack-1.4.5.ebuild
 1404051631 ./dev-ruby/rack/rack-1.5.2-r1.ebuild
@@ -25183,8 +25165,7 @@
 1312130635 ./dev-ruby/slim/slim-2.0.2.ebuild
 1404190731 ./dev-ruby/slop/slop-2.4.4-r1.ebuild
 1403271614 ./dev-ruby/slop/slop-3.5.0.ebuild
-1402081801 ./dev-ruby/text/text-1.2.3-r1.ebuild
-1308302331 ./dev-ruby/text/text-1.2.3.ebuild
+1404242201 ./dev-ruby/text/text-1.2.3-r1.ebuild
 1404191241 ./dev-ruby/thor/thor-0.19.1.ebuild
 1404051901 ./dev-ruby/thor/thor-0.15.2.ebuild
 1404051901 ./dev-ruby/thor/thor-0.14.6.ebuild
@@ -25200,7 +25181,7 @@
 1404012329 ./dev-ruby/yard/yard-0.8.7.3-r1.ebuild
 1404130401 ./dev-ruby/yard/yard-0.8.7.2.ebuild
 1404130401 ./dev-ruby/yard/yard-0.8.7.3.ebuild
-1311260720 ./dev-ruby/ruby_gntp/ruby_gntp-0.3.4.ebuild
+1404242101 ./dev-ruby/ruby_gntp/ruby_gntp-0.3.4.ebuild
 1310152316 ./dev-ruby/amazon-ec2/amazon-ec2-0.9.17-r1.ebuild
 1308201936 ./dev-ruby/network_interface/network_interface-0.0.1-r1.ebuild
 1404051901 ./dev-ruby/rubyforge/rubyforge-2.0.4-r2.ebuild
@@ -25234,13 +25215,13 @@
 1404071801 ./dev-ruby/cmdparse/cmdparse-2.0.5-r2.ebuild
 1404071732 ./dev-ruby/cmdparse/cmdparse-2.0.6.ebuild
 1404071801 ./dev-ruby/cmdparse/cmdparse-2.0.5-r1.ebuild
-1308200416 ./dev-ruby/directory_watcher/directory_watcher-1.4.1.ebuild
+1404242201 ./dev-ruby/directory_watcher/directory_watcher-1.4.1.ebuild
 1404060331 ./dev-ruby/journey/journey-1.0.4.ebuild
 1404181201 ./dev-ruby/test_declarative/test_declarative-0.0.5-r2.ebuild
 1312252057 ./dev-ruby/permutation/permutation-0.1.8.ebuild
 1311030752 ./dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5-r1.ebuild
-1403030331 ./dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild
-1310300751 ./dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild
+1404242101 ./dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild
+1404242101 ./dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild
 1404051901 ./dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r1.ebuild
 1404051901 ./dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r2.ebuild
 1404060301 ./dev-ruby/diff-lcs/diff-lcs-1.1.3.ebuild
@@ -25248,7 +25229,7 @@
 1404060301 ./dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
 1404051801 ./dev-ruby/archive-tar-minitar/archive-tar-minitar-0.5.4.ebuild
 1404051801 ./dev-ruby/archive-tar-minitar/archive-tar-minitar-0.5.4-r1.ebuild
-1403261047 ./dev-ruby/sanitize/sanitize-2.0.6-r1.ebuild
+1404242101 ./dev-ruby/sanitize/sanitize-2.0.6-r1.ebuild
 1403281319 ./dev-ruby/sanitize/sanitize-2.1.0.ebuild
 1404051901 ./dev-ruby/net-ssh-multi/net-ssh-multi-1.1.ebuild
 1404051901 ./dev-ruby/net-ssh-multi/net-ssh-multi-1.2.0-r1.ebuild
@@ -25258,8 +25239,8 @@
 1401161127 ./dev-ruby/rack-protection/rack-protection-1.5.2.ebuild
 1311211201 ./dev-ruby/rack-protection/rack-protection-1.5.1.ebuild
 1404201031 ./dev-ruby/rack-protection/rack-protection-1.5.3.ebuild
-1307041331 ./dev-ruby/ruby-termios/ruby-termios-0.9.6-r2.ebuild
-1311132303 ./dev-ruby/ruby-termios/ruby-termios-1.0.0.ebuild
+1404242201 ./dev-ruby/ruby-termios/ruby-termios-0.9.6-r2.ebuild
+1404242201 ./dev-ruby/ruby-termios/ruby-termios-1.0.0.ebuild
 1404221031 ./dev-ruby/http_parser_rb/http_parser_rb-0.6.0.ebuild
 1404051901 ./dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild
 1404051901 ./dev-ruby/eventmachine/eventmachine-1.0.3-r1.ebuild
@@ -25267,7 +25248,7 @@
 1401091015 ./dev-ruby/bacon/bacon-1.2.0-r2.ebuild
 1310201052 ./dev-ruby/barby/barby-0.5.0-r3.ebuild
 1310300807 ./dev-ruby/annoy/annoy-0.5.6-r1.ebuild
-1312251107 ./dev-ruby/attic/attic-0.5.3.ebuild
+1404242201 ./dev-ruby/attic/attic-0.5.3.ebuild
 1312141803 ./dev-ruby/bones/bones-3.8.1.ebuild
 1402051116 ./dev-ruby/bunny/bunny-1.1.2.ebuild
 1402171048 ./dev-ruby/bunny/bunny-1.1.3.ebuild
@@ -25303,12 +25284,12 @@
 1404052201 ./dev-ruby/hiera/hiera-1.2.1.ebuild
 1404052201 ./dev-ruby/hiera/hiera-1.2.1-r1.ebuild
 1401261126 ./dev-ruby/hiera/hiera-1.3.1.ebuild
-1309141431 ./dev-ruby/shorturl/shorturl-1.0.0.ebuild
-1310261031 ./dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild
+1404242101 ./dev-ruby/shorturl/shorturl-1.0.0.ebuild
+1404242101 ./dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild
 1404110631 ./dev-ruby/rkelly-remix/rkelly-remix-0.0.6.ebuild
 1403070342 ./dev-ruby/magic/magic-0.2.6_p20130813.ebuild
-1401151701 ./dev-ruby/log4r/log4r-1.1.10.ebuild
-1401290554 ./dev-ruby/log4r/log4r-1.1.10-r1.ebuild
+1404242201 ./dev-ruby/log4r/log4r-1.1.10.ebuild
+1404242201 ./dev-ruby/log4r/log4r-1.1.10-r1.ebuild
 1404041831 ./dev-ruby/logue/logue-1.0.1.ebuild
 1304130957 ./dev-ruby/net-ssh-gateway/net-ssh-gateway-1.2.0.ebuild
 1404060331 ./dev-ruby/net-ssh-gateway/net-ssh-gateway-1.1.0-r1.ebuild
@@ -25344,11 +25325,11 @@
 1404060331 ./dev-ruby/rspec/rspec-1.3.2.ebuild
 1404060301 ./dev-ruby/rspec/rspec-2.13.0.ebuild
 1404012332 ./dev-ruby/rspec/rspec-2.14.1-r1.ebuild
-1310090445 ./dev-ruby/sigar/sigar-0.7.2-r1.ebuild
-1401310331 ./dev-ruby/tdiff/tdiff-0.3.3.ebuild
+1404242101 ./dev-ruby/sigar/sigar-0.7.2-r1.ebuild
+1404242101 ./dev-ruby/tdiff/tdiff-0.3.3.ebuild
 1404052201 ./dev-ruby/spork/spork-0.9.2.ebuild
 1404052201 ./dev-ruby/spork/spork-0.9.2-r1.ebuild
-1311220931 ./dev-ruby/stamp/stamp-0.5.0-r1.ebuild
+1404242101 ./dev-ruby/stamp/stamp-0.5.0-r1.ebuild
 1404190731 ./dev-ruby/stomp/stomp-1.2.16.ebuild
 1404190731 ./dev-ruby/stomp/stomp-1.3.2.ebuild
 1404051931 ./dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild
@@ -25382,7 +25363,7 @@
 1403270015 ./dev-ruby/dep_selector/dep_selector-0.1.1.ebuild
 1310042223 ./dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r1.ebuild
 1312270619 ./dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r2.ebuild
-1312130836 ./dev-ruby/settingslogic/settingslogic-2.0.9.ebuild
+1404242101 ./dev-ruby/settingslogic/settingslogic-2.0.9.ebuild
 1310051444 ./dev-ruby/gem_plugin/gem_plugin-0.2.3-r3.ebuild
 1402010831 ./dev-ruby/gem_plugin/gem_plugin-0.2.3-r2.ebuild
 1404060331 ./dev-ruby/log_buddy/log_buddy-0.7.0.ebuild
@@ -25433,10 +25414,10 @@
 1312051427 ./dev-ruby/ruby-atk/ruby-atk-2.0.2.ebuild
 1401152225 ./dev-ruby/ruby-atk/ruby-atk-2.1.0.ebuild
 1403171812 ./dev-ruby/ruby-atk/ruby-atk-2.2.0.ebuild
-1306231601 ./dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild
-1302202013 ./dev-ruby/ruby-elf/ruby-elf-9999.ebuild
-1310291932 ./dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r1.ebuild
-1308281531 ./dev-ruby/ruby-sdl/ruby-sdl-2.1.2.ebuild
+1404242201 ./dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild
+1404242201 ./dev-ruby/ruby-elf/ruby-elf-9999.ebuild
+1404242101 ./dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r1.ebuild
+1404242201 ./dev-ruby/ruby-sdl/ruby-sdl-2.1.2.ebuild
 1312092002 ./dev-ruby/ruby-vte/ruby-vte-2.0.2.ebuild
 1401161212 ./dev-ruby/ruby-vte/ruby-vte-2.1.0.ebuild
 1403180310 ./dev-ruby/ruby-vte/ruby-vte-2.2.0.ebuild
@@ -25449,7 +25430,7 @@
 1309102221 ./dev-ruby/rubygems/rubygems-2.0.8.ebuild
 1401261731 ./dev-ruby/rubygems/rubygems-2.0.3.ebuild
 1310030932 ./dev-ruby/rubygems/rubygems-2.0.10.ebuild
-1304181000 ./dev-ruby/rubytter/rubytter-1.5.1.ebuild
+1404242101 ./dev-ruby/rubytter/rubytter-1.5.1.ebuild
 1303082149 ./dev-ruby/metasploit_data_models/metasploit_data_models-0.6.1.ebuild
 1308192207 ./dev-ruby/metasploit_data_models/metasploit_data_models-0.16.6.ebuild
 1306220034 ./dev-ruby/metasploit_data_models/metasploit_data_models-0.16.1.ebuild
@@ -25470,7 +25451,7 @@
 1311201900 ./dev-ruby/niceogiri/niceogiri-1.1.2.ebuild
 1404060331 ./dev-ruby/ntlm-http/ntlm-http-0.1.1.ebuild
 1404060331 ./dev-ruby/ntlm-http/ntlm-http-0.1.1-r1.ebuild
-1310191011 ./dev-ruby/shotgun/shotgun-0.9-r1.ebuild
+1404242101 ./dev-ruby/shotgun/shotgun-0.9-r1.ebuild
 1403060131 ./dev-ruby/shoulda/shoulda-3.5.0-r1.ebuild
 1401101542 ./dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
 1403060131 ./dev-ruby/shoulda/shoulda-3.5.0.ebuild
@@ -25490,7 +25471,7 @@
 1404060331 ./dev-ruby/rubyzip/rubyzip-0.9.9.ebuild
 1403160431 ./dev-ruby/faraday/faraday-0.9.0.ebuild
 1403160431 ./dev-ruby/faraday/faraday-0.8.8.ebuild
-1311050445 ./dev-ruby/syslogger/syslogger-1.5.1-r1.ebuild
+1404242101 ./dev-ruby/syslogger/syslogger-1.5.1-r1.ebuild
 1308220953 ./dev-ruby/acts_as_list/acts_as_list-0.3.0.ebuild
 1402241048 ./dev-ruby/acts_as_list/acts_as_list-0.4.0.ebuild
 1404051831 ./dev-ruby/fast_xs/fast_xs-0.8.0-r1.ebuild
@@ -25529,7 +25510,7 @@
 1403120031 ./dev-ruby/activemodel/activemodel-4.0.3.ebuild
 1404211031 ./dev-ruby/activemodel/activemodel-4.0.4.ebuild
 1402191118 ./dev-ruby/activemodel/activemodel-3.2.17.ebuild
-1403241931 ./dev-ruby/snmplib/snmplib-1.1.1.ebuild
+1404242101 ./dev-ruby/snmplib/snmplib-1.1.1.ebuild
 1310300826 ./dev-ruby/memoize/memoize-1.3.1-r1.ebuild
 1404060401 ./dev-ruby/gettext_i18n_rails/gettext_i18n_rails-0.10.0.ebuild
 1404060401 ./dev-ruby/gettext_i18n_rails/gettext_i18n_rails-0.9.2.ebuild
@@ -25566,7 +25547,6 @@
 1404051831 ./dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild
 1404051831 ./dev-ruby/ruby_parser/ruby_parser-3.4.1.ebuild
 1404051831 ./dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild
-1310300315 ./dev-ruby/ruby_parser/ruby_parser-3.2.2-r1.ebuild
 1307160947 ./dev-ruby/fast_gettext/fast_gettext-0.7.1.ebuild
 1404081045 ./dev-ruby/amatch/amatch-0.3.0.ebuild
 1311030001 ./dev-ruby/amatch/amatch-0.2.11-r1.ebuild
@@ -25578,11 +25558,11 @@
 1312082031 ./dev-ruby/atomic/atomic-1.1.14.ebuild
 1312270624 ./dev-ruby/atomic/atomic-1.1.14-r1.ebuild
 1403221103 ./dev-ruby/atomic/atomic-1.1.16.ebuild
-1404051601 ./dev-ruby/timecop/timecop-0.6.0.ebuild
+1404242101 ./dev-ruby/timecop/timecop-0.6.0.ebuild
 1404211031 ./dev-ruby/railties/railties-4.0.4.ebuild
 1402191127 ./dev-ruby/railties/railties-3.2.17.ebuild
 1403120031 ./dev-ruby/railties/railties-4.0.3.ebuild
-1311111459 ./dev-ruby/subexec/subexec-0.2.3-r1.ebuild
+1404242101 ./dev-ruby/subexec/subexec-0.2.3-r1.ebuild
 1404051831 ./dev-ruby/aws-s3/aws-s3-0.6.3.ebuild
 1312131323 ./dev-ruby/http-cookie/http-cookie-1.0.2.ebuild
 1311112013 ./dev-ruby/bourne/bourne-1.5.0-r1.ebuild
@@ -25609,8 +25589,8 @@
 1403251846 ./dev-ruby/mercenary/mercenary-0.3.2.ebuild
 1312291442 ./dev-ruby/mercenary/mercenary-0.2.1.ebuild
 1402221412 ./dev-ruby/mercenary/mercenary-0.3.1.ebuild
-1312241701 ./dev-ruby/abstract/abstract-1.0.0-r2.ebuild
-1403121507 ./dev-ruby/abstract/abstract-1.0.0-r3.ebuild
+1404242201 ./dev-ruby/abstract/abstract-1.0.0-r2.ebuild
+1404242201 ./dev-ruby/abstract/abstract-1.0.0-r3.ebuild
 1311210331 ./dev-ruby/multi_xml/multi_xml-0.5.4-r1.ebuild
 1402141110 ./dev-ruby/facter/facter-1.7.5.ebuild
 1403110601 ./dev-ruby/facter/facter-1.6.18.ebuild
@@ -25619,11 +25599,8 @@
 1312200121 ./dev-ruby/facter/facter-1.7.4.ebuild
 1309160954 ./dev-ruby/facter/facter-1.7.3.ebuild
 1403110601 ./dev-ruby/facter/facter-1.6.16.ebuild
-1312261901 ./dev-ruby/fakefs/fakefs-0.4.2.ebuild
-1401130654 ./dev-ruby/fakefs/fakefs-0.5.0.ebuild
-1403241022 ./dev-ruby/fakefs/fakefs-0.5.2.ebuild
-1403060239 ./dev-ruby/fakefs/fakefs-0.5.1.ebuild
-1310061607 ./dev-ruby/fakefs/fakefs-0.4.3-r1.ebuild
+1404242101 ./dev-ruby/fakefs/fakefs-0.4.2.ebuild
+1404242101 ./dev-ruby/fakefs/fakefs-0.5.2.ebuild
 1404221702 ./dev-ruby/forgery/forgery-0.6.0.ebuild
 1312131746 ./dev-ruby/ffaker/ffaker-1.22.1.ebuild
 1401290433 ./dev-ruby/ffaker/ffaker-1.23.0.ebuild
@@ -25667,8 +25644,7 @@
 1404182129 ./dev-ruby/ruby-net-ldap/ruby-net-ldap-0.6.1.ebuild
 1404141024 ./dev-ruby/ruby-net-ldap/ruby-net-ldap-0.6.0.ebuild
 1310062058 ./dev-ruby/hashie/hashie-2.0.5-r1.ebuild
-1305091058 ./dev-ruby/net-dns/net-dns-0.8.0.ebuild
-1210151040 ./dev-ruby/net-dns/net-dns-0.7.1.ebuild
+1404242101 ./dev-ruby/net-dns/net-dns-0.8.0.ebuild
 1312222301 ./dev-ruby/net-scp/net-scp-1.1.2-r1.ebuild
 1404051831 ./dev-ruby/net-scp/net-scp-1.0.4-r1.ebuild
 1402050421 ./dev-ruby/net-ssh/net-ssh-2.8.0.ebuild
@@ -25676,24 +25652,22 @@
 1312222301 ./dev-ruby/net-ssh/net-ssh-2.7.0-r1.ebuild
 1312251401 ./dev-ruby/fxruby/fxruby-1.6.28.ebuild
 1312251401 ./dev-ruby/fxruby/fxruby-1.6.25.ebuild
-1404060401 ./dev-ruby/hexoid/hexoid-0.2.2.ebuild
+1404242101 ./dev-ruby/hexoid/hexoid-0.2.2.ebuild
 1403171808 ./dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-2.2.0.ebuild
 1305041708 ./dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-1.2.6.ebuild
 1312091820 ./dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-2.0.2.ebuild
 1401160012 ./dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-2.1.0.ebuild
-1403102227 ./dev-ruby/sysinfo/sysinfo-0.8.1-r1.ebuild
+1404242101 ./dev-ruby/sysinfo/sysinfo-0.8.1-r1.ebuild
 1401131001 ./dev-ruby/pdf-reader/pdf-reader-1.1.1-r1.ebuild
-1312111125 ./dev-ruby/systemu/systemu-2.6.0.ebuild
 1404052201 ./dev-ruby/systemu/systemu-2.6.4.ebuild
 1404052201 ./dev-ruby/systemu/systemu-2.5.2.ebuild
-1402010931 ./dev-ruby/gherkin/gherkin-2.11.6.ebuild
-1402010501 ./dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild
-1402010501 ./dev-ruby/gherkin/gherkin-2.12.0.ebuild
+1404242201 ./dev-ruby/gherkin/gherkin-2.11.6.ebuild
+1404242201 ./dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild
 1310251646 ./dev-ruby/jquery-ui-rails/jquery-ui-rails-3.0.1.ebuild
 1402211059 ./dev-ruby/jquery-ui-rails/jquery-ui-rails-4.2.0.ebuild
 1312161110 ./dev-ruby/jquery-ui-rails/jquery-ui-rails-4.1.1.ebuild
 1404180955 ./dev-ruby/jquery-ui-rails/jquery-ui-rails-4.2.1.ebuild
-1303091103 ./dev-ruby/gibbler/gibbler-0.9.0.ebuild
+1404242201 ./dev-ruby/gibbler/gibbler-0.9.0.ebuild
 1404091831 ./dev-ruby/kramdown/kramdown-0.14.2.ebuild
 1404191701 ./dev-ruby/kramdown/kramdown-1.2.0-r1.ebuild
 1305101722 ./dev-ruby/ruby-webkit-gtk2/ruby-webkit-gtk2-1.2.6.ebuild
@@ -25725,18 +25699,15 @@
 1312051534 ./dev-ruby/ruby-pango/ruby-pango-2.0.2.ebuild
 1401152317 ./dev-ruby/ruby-pango/ruby-pango-2.1.0.ebuild
 1403160254 ./dev-ruby/ruby-pango/ruby-pango-2.2.0.ebuild
-1310300837 ./dev-ruby/ruby-shout/ruby-shout-2.2.1-r1.ebuild
-1307071431 ./dev-ruby/ruby-shout/ruby-shout-2.2.1.ebuild
+1404242101 ./dev-ruby/ruby-shout/ruby-shout-2.2.1-r1.ebuild
+1404242101 ./dev-ruby/ruby-shout/ruby-shout-2.2.1.ebuild
 1404051831 ./dev-ruby/trollop/trollop-2.0.ebuild
 1404051831 ./dev-ruby/trollop/trollop-1.16.2-r3.ebuild
 1404051831 ./dev-ruby/trollop/trollop-1.16.2-r4.ebuild
-1209221231 ./dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r1.ebuild
-1310300823 ./dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r2.ebuild
-1312242101 ./dev-ruby/libxml/libxml-2.7.0-r1.ebuild
-1308081943 ./dev-ruby/libxml/libxml-2.7.0.ebuild
-1304231931 ./dev-ruby/libxml/libxml-2.4.0.ebuild
-1312270641 ./dev-ruby/libxml/libxml-2.7.0-r2.ebuild
-1305091118 ./dev-ruby/libxml/libxml-2.6.0.ebuild
+1404242101 ./dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r2.ebuild
+1404242101 ./dev-ruby/libxml/libxml-2.7.0-r1.ebuild
+1404242101 ./dev-ruby/libxml/libxml-2.4.0.ebuild
+1404242101 ./dev-ruby/libxml/libxml-2.7.0-r2.ebuild
 1401130652 ./dev-ruby/liquid/liquid-2.6.1.ebuild
 1402140542 ./dev-ruby/liquid/liquid-2.5.5.ebuild
 1404201234 ./dev-ruby/listen/listen-0.7.3-r1.ebuild
@@ -25747,8 +25718,8 @@
 1404051831 ./dev-ruby/maruku/maruku-0.7.0.ebuild
 1404052031 ./dev-ruby/matchy/matchy-0.5.2-r1.ebuild
 1404052031 ./dev-ruby/matchy/matchy-0.5.2.ebuild
-1302101401 ./dev-ruby/tryouts/tryouts-2.1.1.ebuild
-1009091706 ./dev-ruby/tryouts/tryouts-0.8.8.ebuild
+1404242101 ./dev-ruby/tryouts/tryouts-2.1.1.ebuild
+1404242101 ./dev-ruby/tryouts/tryouts-0.8.8.ebuild
 1312131934 ./dev-ruby/letter_opener/letter_opener-1.2.0.ebuild
 1404051831 ./dev-ruby/locale/locale-2.0.5-r3.ebuild
 1404051831 ./dev-ruby/locale/locale-2.1.0.ebuild
@@ -25799,7 +25770,7 @@
 1402222321 ./dev-ruby/twitter/twitter-5.7.1.ebuild
 1403160431 ./dev-ruby/twitter/twitter-4.8.1.ebuild
 1404010952 ./dev-ruby/twitter/twitter-5.8.0.ebuild
-1403120931 ./dev-ruby/serialport/serialport-1.3.0.ebuild
+1404242101 ./dev-ruby/serialport/serialport-1.3.0.ebuild
 1310061539 ./dev-ruby/loquacious/loquacious-1.9.1-r1.ebuild
 1401130803 ./dev-ruby/rb-gsl/rb-gsl-1.15.3.1.ebuild
 1403310555 ./dev-ruby/rb-gsl/rb-gsl-1.16.0.ebuild
@@ -25813,10 +25784,8 @@
 1311050430 ./dev-ruby/rbtree/rbtree-0.4.1-r1.ebuild
 1401040216 ./dev-ruby/rbtree/rbtree-0.4.2.ebuild
 1404060301 ./dev-ruby/rdtool/rdtool-0.6.38.ebuild
-1309151331 ./dev-ruby/net-http-persistent/net-http-persistent-2.9.ebuild
-1402110334 ./dev-ruby/net-http-persistent/net-http-persistent-2.9.3.ebuild
-1402140125 ./dev-ruby/net-http-persistent/net-http-persistent-2.9.4.ebuild
-1401241300 ./dev-ruby/net-http-persistent/net-http-persistent-2.9.1.ebuild
+1404242101 ./dev-ruby/net-http-persistent/net-http-persistent-2.9.ebuild
+1404242101 ./dev-ruby/net-http-persistent/net-http-persistent-2.9.4.ebuild
 1404060301 ./dev-ruby/rspec-mocks/rspec-mocks-2.14.6.ebuild
 1404060301 ./dev-ruby/rspec-mocks/rspec-mocks-2.12.2.ebuild
 1404060301 ./dev-ruby/rspec-mocks/rspec-mocks-2.12.1.ebuild
@@ -25827,7 +25796,7 @@
 1404051631 ./dev-ruby/rspec-rails/rspec-rails-2.13.2.ebuild
 1404051631 ./dev-ruby/rspec-rails/rspec-rails-2.14.0.ebuild
 1311092342 ./dev-ruby/configliere/configliere-0.4.18-r1.ebuild
-1311180131 ./dev-ruby/samuel/samuel-0.3.3.ebuild
+1404242101 ./dev-ruby/samuel/samuel-0.3.3.ebuild
 1404191201 ./dev-ruby/samuel/samuel-0.3.3-r1.ebuild
 1311111731 ./dev-ruby/robots/robots-0.10.1-r2.ebuild
 1305041406 ./dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-1.2.6.ebuild
@@ -25842,13 +25811,12 @@
 1401310331 ./dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0.ebuild
 1402191118 ./dev-ruby/activeresource/activeresource-3.2.17.ebuild
 1312241945 ./dev-ruby/activeresource/activeresource-4.0.0.ebuild
-1310051535 ./dev-ruby/temple/temple-0.6.7.ebuild
-1312130458 ./dev-ruby/temple/temple-0.6.7-r1.ebuild
+1404242101 ./dev-ruby/temple/temple-0.6.7-r1.ebuild
 1404051801 ./dev-ruby/httpclient/httpclient-2.3.4.1.ebuild
 1404051801 ./dev-ruby/httpclient/httpclient-2.2.5.ebuild
 1404181631 ./dev-ruby/httpclient/httpclient-2.3.4.1-r1.ebuild
 1310090534 ./dev-ruby/timers/timers-1.1.0-r1.ebuild
-1311111453 ./dev-ruby/termcolor/termcolor-1.2.1-r1.ebuild
+1404242101 ./dev-ruby/termcolor/termcolor-1.2.1-r1.ebuild
 1404051901 ./dev-ruby/syntax/syntax-1.0.0-r4.ebuild
 1404051901 ./dev-ruby/syntax/syntax-1.0.0-r3.ebuild
 1404051901 ./dev-ruby/syntax/syntax-1.0.0-r5.ebuild
@@ -25872,23 +25840,21 @@
 1311201925 ./dev-ruby/warden/warden-1.2.3.ebuild
 1402232021 ./dev-ruby/lockfile/lockfile-2.1.2.ebuild
 1403070349 ./dev-ruby/lockfile/lockfile-2.1.3.ebuild
-1403280801 ./dev-ruby/allison/allison-2.0.3-r2.ebuild
-1401011231 ./dev-ruby/allison/allison-2.0.3-r1.ebuild
-1403110545 ./dev-ruby/allison/allison-2.0.3-r3.ebuild
+1404242201 ./dev-ruby/allison/allison-2.0.3-r2.ebuild
+1404242201 ./dev-ruby/allison/allison-2.0.3-r1.ebuild
+1404242201 ./dev-ruby/allison/allison-2.0.3-r3.ebuild
 1404060331 ./dev-ruby/rdiscount/rdiscount-2.1.7.ebuild
 1404060331 ./dev-ruby/rdiscount/rdiscount-1.6.8-r2.ebuild
 1404201131 ./dev-ruby/rdiscount/rdiscount-2.1.7.1.ebuild
 1404060331 ./dev-ruby/rdiscount/rdiscount-1.6.8-r1.ebuild
 1404190731 ./dev-ruby/wirble/wirble-0.1.3-r2.ebuild
-1309011610 ./dev-ruby/database_cleaner/database_cleaner-1.1.1-r2.ebuild
-1308240153 ./dev-ruby/database_cleaner/database_cleaner-1.1.1-r1.ebuild
-1310110941 ./dev-ruby/database_cleaner/database_cleaner-1.2.0.ebuild
-1308200758 ./dev-ruby/database_cleaner/database_cleaner-1.1.1.ebuild
+1404242101 ./dev-ruby/database_cleaner/database_cleaner-1.1.1-r2.ebuild
+1404242101 ./dev-ruby/database_cleaner/database_cleaner-1.2.0.ebuild
 1306190909 ./dev-ruby/ammeter/ammeter-0.2.9.ebuild
 1404211031 ./dev-ruby/sass-rails/sass-rails-4.0.1.ebuild
-1403110531 ./dev-ruby/sass-rails/sass-rails-3.2.6.ebuild
+1404242101 ./dev-ruby/sass-rails/sass-rails-3.2.6.ebuild
 1403120031 ./dev-ruby/sass-rails/sass-rails-4.0.0.ebuild
-1403110531 ./dev-ruby/sass-rails/sass-rails-3.2.5.ebuild
+1404242101 ./dev-ruby/sass-rails/sass-rails-3.2.5.ebuild
 1401291901 ./dev-ruby/levenshtein/levenshtein-0.2.2-r1.ebuild
 1403151917 ./dev-ruby/ruby-clutter/ruby-clutter-2.2.0.ebuild
 1305101801 ./dev-ruby/ruby-clutter/ruby-clutter-1.2.6.ebuild
@@ -25918,7 +25884,7 @@
 1312092031 ./dev-ruby/ruby-webkit-gtk/ruby-webkit-gtk-2.0.2.ebuild
 1401161239 ./dev-ruby/ruby-webkit-gtk/ruby-webkit-gtk-2.1.0.ebuild
 1403190337 ./dev-ruby/ruby-webkit-gtk/ruby-webkit-gtk-2.2.0.ebuild
-1306130928 ./dev-ruby/state_machine/state_machine-1.2.0.ebuild
+1404242101 ./dev-ruby/state_machine/state_machine-1.2.0.ebuild
 1401101131 ./dev-ruby/connection_pool/connection_pool-1.2.0.ebuild
 1404201101 ./dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild
 1404052231 ./dev-ruby/hpricot/hpricot-0.8.6-r1.ebuild
@@ -25977,9 +25943,9 @@
 1404051831 ./dev-ruby/yajl-ruby/yajl-ruby-1.2.0.ebuild
 1401231535 ./dev-ruby/simplecov-html/simplecov-html-0.8.0.ebuild
 1304301752 ./dev-ruby/simplecov-html/simplecov-html-0.7.1.ebuild
-1310090413 ./dev-ruby/simple_oauth/simple_oauth-0.2.0-r1.ebuild
+1404242101 ./dev-ruby/simple_oauth/simple_oauth-0.2.0-r1.ebuild
 1312241741 ./dev-ruby/rails-observers/rails-observers-0.1.2.ebuild
-1403251101 ./dev-ruby/storable/storable-0.8.9-r1.ebuild
+1404242201 ./dev-ruby/storable/storable-0.8.9-r1.ebuild
 1404182213 ./dev-ruby/awesome_nested_set/awesome_nested_set-2.1.6.ebuild
 1310300328 ./dev-ruby/inifile/inifile-2.0.2-r1.ebuild
 1403050031 ./dev-ruby/weakling/weakling-0.0.4.ebuild
@@ -26007,8 +25973,7 @@
 1312270513 ./dev-ruby/json_pure/json_pure-1.8.1.ebuild
 1401290503 ./dev-ruby/podcast/podcast-0.0.4-r2.ebuild
 1404061039 ./dev-ruby/mini_magick/mini_magick-3.7.0-r1.ebuild
-1402111705 ./dev-ruby/chunky_png/chunky_png-1.3.0.ebuild
-1310190954 ./dev-ruby/chunky_png/chunky_png-1.2.9.ebuild
+1404242201 ./dev-ruby/chunky_png/chunky_png-1.3.0.ebuild
 1404060401 ./dev-ruby/jeweler/jeweler-1.8.4.ebuild
 1404060401 ./dev-ruby/jeweler/jeweler-1.8.6.ebuild
 1303031701 ./dev-ruby/rails_autolink/rails_autolink-1.0.9.ebuild
@@ -26031,10 +25996,7 @@
 1401221042 ./dev-ruby/deep_merge/deep_merge-1.0.1.ebuild
 1310090437 ./dev-ruby/chronic/chronic-0.10.2.ebuild
 1402201531 ./dev-ruby/selenium-webdriver/selenium-webdriver-2.40.0.ebuild
-1311231231 ./dev-ruby/selenium-webdriver/selenium-webdriver-2.37.0.ebuild
 1403310522 ./dev-ruby/selenium-webdriver/selenium-webdriver-2.41.0.ebuild
-1312061006 ./dev-ruby/selenium-webdriver/selenium-webdriver-2.38.0.ebuild
-1401141306 ./dev-ruby/selenium-webdriver/selenium-webdriver-2.39.0.ebuild
 1404051901 ./dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r1.ebuild
 1404051901 ./dev-ruby/ruby-augeas/ruby-augeas-0.5.0.ebuild
 1404051901 ./dev-ruby/ruby-augeas/ruby-augeas-0.4.1.ebuild
@@ -26057,10 +26019,10 @@
 1401160007 ./dev-ruby/ruby-gtk3/ruby-gtk3-2.1.0.ebuild
 1403170603 ./dev-ruby/ruby-gtk3/ruby-gtk3-2.2.0.ebuild
 1305040934 ./dev-ruby/ruby-gtk3/ruby-gtk3-1.2.6.ebuild
-1310300834 ./dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r1.ebuild
+1404242201 ./dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r1.ebuild
 1404060331 ./dev-ruby/ruby-ldap/ruby-ldap-0.9.12.ebuild
 1404060331 ./dev-ruby/ruby-ldap/ruby-ldap-0.9.16.ebuild
-1308311331 ./dev-ruby/ruby-oci8/ruby-oci8-2.1.3.ebuild
+1404242201 ./dev-ruby/ruby-oci8/ruby-oci8-2.1.3.ebuild
 1307041731 ./dev-ruby/ruby-odbc/ruby-odbc-0.99995.ebuild
 1304171014 ./dev-ruby/ruby-prof/ruby-prof-0.12.2.ebuild
 1312091953 ./dev-ruby/ruby-rsvg/ruby-rsvg-2.0.2.ebuild
@@ -26072,7 +26034,7 @@
 1305042045 ./dev-ruby/ruby-vte3/ruby-vte3-1.2.6.ebuild
 1312092009 ./dev-ruby/ruby-vte3/ruby-vte3-2.0.2.ebuild
 1401161223 ./dev-ruby/ruby-vte3/ruby-vte3-2.1.0.ebuild
-1403040401 ./dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r2.ebuild
+1404242101 ./dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r2.ebuild
 1403102031 ./dev-ruby/ruby-gstreamer/ruby-gstreamer-1.1.8.ebuild
 1403102031 ./dev-ruby/ruby-gstreamer/ruby-gstreamer-1.2.6.ebuild
 1312051515 ./dev-ruby/ruby-gstreamer/ruby-gstreamer-2.0.2.ebuild
@@ -26572,6 +26534,7 @@
 1403140031 ./dev-util/cwdiff/cwdiff-0.2.6.ebuild
 1309070245 ./dev-util/cwdiff/cwdiff-0.2.5.ebuild
 1211011331 ./dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
+1404241737 ./dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37.ebuild
 1404010031 ./dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild
 1404010031 ./dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
 1401021333 ./dev-util/dwdiff/dwdiff-2.0.7.ebuild
@@ -29367,6 +29330,7 @@
 1304270101 ./dev-python/pygraphviz/pygraphviz-1.1-r2.ebuild
 1310131501 ./dev-python/python-nbxmpp/python-nbxmpp-0.2.ebuild
 1403181727 ./dev-python/python-nbxmpp/python-nbxmpp-0.4.ebuild
+1404241818 ./dev-python/python-nbxmpp/python-nbxmpp-0.4-r1.ebuild
 1401091127 ./dev-python/python-nbxmpp/python-nbxmpp-0.3.ebuild
 1401272034 ./dev-python/wsaccel/wsaccel-0.6.2.ebuild
 1404010101 ./dev-python/py-amqp/py-amqp-1.4.2.ebuild
@@ -29879,6 +29843,7 @@
 1310221731 ./sys-fs/aufs3/aufs3-3_p20131007.ebuild
 1402241315 ./sys-fs/aufs3/aufs3-3_p20140224.ebuild
 1312261857 ./sys-fs/aufs3/aufs3-3_p20131223.ebuild
+1404241600 ./sys-fs/aufs3/aufs3-3_p20140420.ebuild
 1401201128 ./sys-fs/aufs3/aufs3-3_p20140119.ebuild
 1402042131 ./sys-fs/aufs3/aufs3-3_p20140127-r1.ebuild
 1401131116 ./sys-fs/aufs3/aufs3-3_p20140114.ebuild
@@ -30018,6 +29983,7 @@
 1112132230 ./sys-fs/e2tools/e2tools-0.0.16.ebuild
 1401131231 ./sys-fs/aufs-headers/aufs-headers-3.12_p20140114.ebuild
 1401141801 ./sys-fs/aufs-headers/aufs-headers-3.11_p20130915.ebuild
+1404241553 ./sys-fs/aufs-headers/aufs-headers-3.13_p20140420.ebuild
 1403160103 ./sys-fs/f2fs-tools/f2fs-tools-1.3.0.ebuild
 1309051731 ./sys-fs/f2fs-tools/f2fs-tools-1.1.0-r1.ebuild
 1401310105 ./sys-fs/f2fs-tools/f2fs-tools-1.2.0.ebuild
@@ -30066,6 +30032,7 @@
 1304271401 ./sys-fs/static-dev/static-dev-0.1.ebuild
 1401131233 ./sys-fs/aufs-util/aufs-util-3.12_p20140114.ebuild
 1402240501 ./sys-fs/aufs-util/aufs-util-3.9_p20130915.ebuild
+1404241556 ./sys-fs/aufs-util/aufs-util-3.13_p20140420.ebuild
 1306171318 ./sys-fs/rdiff-backup-fs/rdiff-backup-fs-1.0.0.ebuild
 1404181001 ./sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild
 1404051501 ./sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -32219,7 +32186,7 @@
 1308240808 ./virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.290.0.ebuild
 1303131204 ./virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.280.0.ebuild
 1308140927 ./virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.280.0-r1.ebuild
-1404071701 ./virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r2.ebuild
+1404242201 ./virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r2.ebuild
 1401210331 ./virtual/perl-Storable/perl-Storable-2.390.0.ebuild
 1401210331 ./virtual/perl-Storable/perl-Storable-2.450.0.ebuild
 1401210101 ./virtual/perl-digest-base/perl-digest-base-1.170.0-r1.ebuild
@@ -32360,7 +32327,7 @@
 1103141007 ./virtual/perl-DB_File/perl-DB_File-1.822.0.ebuild
 1101131342 ./virtual/perl-DB_File/perl-DB_File-1.821.ebuild
 1401131031 ./virtual/skkserv/skkserv-0.ebuild
-1404071701 ./virtual/perl-CPAN/perl-CPAN-2.0.0.ebuild
+1404242201 ./virtual/perl-CPAN/perl-CPAN-2.0.0.ebuild
 1309051131 ./virtual/perl-Carp/perl-Carp-1.290.0.ebuild
 1204011716 ./virtual/perl-Safe/perl-Safe-2.320.0.ebuild
 1303131201 ./virtual/perl-Safe/perl-Safe-2.350.0.ebuild
@@ -32466,7 +32433,7 @@
 1401171001 ./virtual/fortran/fortran-0.ebuild
 1308120131 ./virtual/ffmpeg/ffmpeg-0.10.3.ebuild
 1402240001 ./virtual/ffmpeg/ffmpeg-9.ebuild
-1404071701 ./virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r1.ebuild
+1404242201 ./virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r1.ebuild
 1303091131 ./virtual/leechcraft-trayarea/leechcraft-trayarea-0.5.90.ebuild
 1303091131 ./virtual/leechcraft-trayarea/leechcraft-trayarea-9999.ebuild
 1404102207 ./virtual/leechcraft-trayarea/leechcraft-trayarea-0.6.65.ebuild
@@ -32691,7 +32658,7 @@
 1404102206 ./virtual/leechcraft-browser/leechcraft-browser-0.6.65.ebuild
 1309081801 ./virtual/perl-File-Path/perl-File-Path-2.90.0.ebuild
 1212222231 ./virtual/perl-File-Path/perl-File-Path-2.08.ebuild
-1404071701 ./virtual/perl-Math-Complex/perl-Math-Complex-1.590.0-r2.ebuild
+1404242201 ./virtual/perl-Math-Complex/perl-Math-Complex-1.590.0-r2.ebuild
 1401200031 ./virtual/perl-File-Spec/perl-File-Spec-3.400.0.ebuild
 1401200131 ./virtual/perl-File-Temp/perl-File-Temp-0.230.400.ebuild
 1401200131 ./virtual/perl-File-Temp/perl-File-Temp-0.230.100.ebuild
@@ -37092,6 +37059,7 @@
 1302080231 ./games-arcade/bloboats/bloboats-1.0.2.ebuild
 1302080231 ./games-arcade/blobwars/blobwars-1.19.ebuild
 1009221110 ./games-arcade/digger/digger-20020314.ebuild
+1404242237 ./games-arcade/digger/digger-20140423.ebuild
 1105241053 ./games-arcade/pacmanarena/pacmanarena-0.15.ebuild
 1307051531 ./games-arcade/notpacman/notpacman-1.0.4.ebuild
 1306022301 ./games-arcade/dynamitejack/dynamitejack-1.0.23.ebuild
@@ -39530,14 +39498,12 @@
 1404210436 metadata/md5-cache/sys-kernel/zen-sources-3.9.9999
 1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.10.25
 1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.10.32
-1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.10.33
-1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.10.34
-1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.10.35
 1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.10.36
+1404241636 metadata/md5-cache/sys-kernel/aufs-sources-3.10.37
 1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.12.13
-1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.12.14
-1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.12.15
 1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.12.16
+1404241636 metadata/md5-cache/sys-kernel/aufs-sources-3.12.17
+1404241636 metadata/md5-cache/sys-kernel/aufs-sources-3.13.11
 1404141836 metadata/md5-cache/sys-kernel/linux-docs-3.10.32
 1404141836 metadata/md5-cache/sys-kernel/linux-docs-3.12.16
 1403220237 metadata/md5-cache/sys-kernel/dracut-037
@@ -39578,12 +39544,9 @@
 1404212308 metadata/md5-cache/sys-kernel/hardened-sources-3.14.1
 1404210436 metadata/md5-cache/sys-kernel/hardened-sources-3.2.57
 1404180037 metadata/md5-cache/sys-kernel/linux-firmware-99999999
-1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.13.5
-1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.13.6
-1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.13.7
-1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.13.8
 1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.13.9
 1404210436 metadata/md5-cache/sys-kernel/aufs-sources-3.14.0
+1404241636 metadata/md5-cache/sys-kernel/aufs-sources-3.14.1
 1404210436 metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5
 1404210436 metadata/md5-cache/sys-kernel/rt-sources-3.4.57_p72
 1404210436 metadata/md5-cache/sys-kernel/ck-sources-3.5.7-r2
@@ -39630,6 +39593,7 @@
 1404210436 metadata/md5-cache/sys-kernel/gentoo-sources-3.12.13
 1404210436 metadata/md5-cache/sys-kernel/gentoo-sources-3.12.16
 1404210436 metadata/md5-cache/sys-kernel/gentoo-sources-3.12.17
+1404241736 metadata/md5-cache/sys-kernel/gentoo-sources-3.12.18
 1404210436 metadata/md5-cache/sys-kernel/gentoo-sources-3.13.10
 1404231636 metadata/md5-cache/sys-kernel/gentoo-sources-3.13.11
 1404210436 metadata/md5-cache/sys-kernel/raspberrypi-sources-3.9.10_pre-r20130715
@@ -40514,6 +40478,7 @@
 1404082038 metadata/md5-cache/dev-vcs/git-cola-1.9.4
 1404082038 metadata/md5-cache/dev-vcs/git-cola-2.0.0
 1404082038 metadata/md5-cache/dev-vcs/git-cola-2.0.1
+1404241636 metadata/md5-cache/dev-vcs/git-cola-2.0.2
 1401230006 metadata/md5-cache/dev-vcs/tig-1.2.1
 1403150517 metadata/md5-cache/dev-vcs/colorcvs-1.4-r1
 1403222006 metadata/md5-cache/dev-vcs/git-flow-0.4.1
@@ -40782,7 +40747,8 @@
 1403150525 metadata/md5-cache/sci-biology/infernal-1.0.2-r1
 1403150525 metadata/md5-cache/sci-biology/yass-1.14-r1
 1403150525 metadata/md5-cache/sci-biology/maq-0.7.1-r1
-1304241836 metadata/md5-cache/sci-biology/profphd-1.0.39
+1404241606 metadata/md5-cache/sci-biology/profphd-1.0.39
+1404241606 metadata/md5-cache/sci-biology/profphd-1.0.40
 1403150525 metadata/md5-cache/sci-biology/dialign-tx-1.0.2-r1
 1403150525 metadata/md5-cache/sci-biology/flower-0.7.2
 1403150525 metadata/md5-cache/sci-biology/bowtie-0.12.8
@@ -41684,7 +41650,7 @@
 1403150529 metadata/md5-cache/www-apache/mod_backtrace-0.0.1-r1
 1403150529 metadata/md5-cache/www-apache/mod_depends-0.7.0_p200702041
 1401171230 metadata/md5-cache/www-apache/mod_ftpd-0.14-r1
-1404100211 metadata/md5-cache/www-apache/passenger-3.0.21-r1
+1404242006 metadata/md5-cache/www-apache/passenger-3.0.21-r1
 1403210006 metadata/md5-cache/www-apache/mod_gnutls-0.5.9
 1404100211 metadata/md5-cache/www-apache/mod_jk-1.2.30
 1404100211 metadata/md5-cache/www-apache/mod_jk-1.2.32
@@ -42945,8 +42911,8 @@
 1403150530 metadata/md5-cache/www-client/w3m-0.5.3-r4
 1403150530 metadata/md5-cache/www-client/w3m-0.5.3-r5
 1311060136 metadata/md5-cache/www-client/uget-1.10.3
-1404130106 metadata/md5-cache/www-client/chromium-35.0.1916.27
 1404181736 metadata/md5-cache/www-client/chromium-35.0.1916.47
+1404241736 metadata/md5-cache/www-client/chromium-35.0.1916.69
 1404180037 metadata/md5-cache/www-client/surf-9999
 1403170806 metadata/md5-cache/www-client/dwb-2014.03.07
 1402061008 metadata/md5-cache/www-client/pybugz-0.9.3
@@ -44079,7 +44045,7 @@
 1211091733 metadata/md5-cache/app-admin/makepasswd-1.10
 1404230036 metadata/md5-cache/app-admin/elektra-0.8.3-r1
 1404230036 metadata/md5-cache/app-admin/elektra-0.8.3-r2
-1404241336 metadata/md5-cache/app-admin/pass-9999
+1404242106 metadata/md5-cache/app-admin/pass-9999
 1401171206 metadata/md5-cache/app-admin/fetchlog-1.0
 1401171206 metadata/md5-cache/app-admin/fetchlog-1.4
 1403150506 metadata/md5-cache/app-admin/eselect-lib-bin-symlink-0.1.1
@@ -44171,6 +44137,7 @@
 1403150506 metadata/md5-cache/app-admin/eselect-vi-1.1.7-r1
 1404191436 metadata/md5-cache/app-admin/glance-2013.2.3-r1
 1404132006 metadata/md5-cache/app-admin/pass-1.5
+1404242106 metadata/md5-cache/app-admin/pass-1.6
 1404191436 metadata/md5-cache/app-admin/glance-2013.2.9999
 1403150506 metadata/md5-cache/app-admin/procinfo-ng-2.0.304
 1403150506 metadata/md5-cache/app-admin/sysrqd-14
@@ -45117,7 +45084,7 @@
 1403150507 metadata/md5-cache/app-emacs/httpd-1.1
 1403150507 metadata/md5-cache/app-emacs/typing-1.1.4
 1403150507 metadata/md5-cache/app-emacs/delicious-0.3-r1
-1403150507 metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
+1404241406 metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
 1403150507 metadata/md5-cache/app-emacs/qwerty-1.1
 1403241906 metadata/md5-cache/app-emacs/circe-1.3
 1403150507 metadata/md5-cache/app-emacs/ddskk-14.1
@@ -45530,7 +45497,7 @@
 1403302338 metadata/md5-cache/perl-core/File-Temp-0.230.400
 1403302338 metadata/md5-cache/perl-core/digest-base-1.170.0
 1403302338 metadata/md5-cache/perl-core/Test-1.260.0
-1404071706 metadata/md5-cache/perl-core/Dumpvalue-1.170.0
+1404242206 metadata/md5-cache/perl-core/Dumpvalue-1.170.0
 1403302338 metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0
 1403302338 metadata/md5-cache/perl-core/parent-0.225.0
 1403302338 metadata/md5-cache/perl-core/Module-CoreList-3.0.0
@@ -45543,7 +45510,7 @@
 1403302338 metadata/md5-cache/perl-core/threads-shared-1.32
 1403302338 metadata/md5-cache/perl-core/threads-shared-1.33
 1403302338 metadata/md5-cache/perl-core/threads-shared-1.34
-1404071706 metadata/md5-cache/perl-core/Devel-PPPort-3.200.0
+1404242206 metadata/md5-cache/perl-core/Devel-PPPort-3.200.0
 1403302338 metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.33
 1403302338 metadata/md5-cache/perl-core/JSON-PP-2.271.40
 1403302338 metadata/md5-cache/perl-core/JSON-PP-2.271.50
@@ -45553,7 +45520,7 @@
 1403302338 metadata/md5-cache/perl-core/Params-Check-0.360.0
 1403302338 metadata/md5-cache/perl-core/Params-Check-0.380.0
 1403302337 metadata/md5-cache/perl-core/Attribute-Handlers-0.88
-1404071706 metadata/md5-cache/perl-core/CPAN-2.0.0
+1404242206 metadata/md5-cache/perl-core/CPAN-2.0.0
 1403302338 metadata/md5-cache/perl-core/ExtUtils-CBuilder-0.280.205
 1403302338 metadata/md5-cache/perl-core/ExtUtils-CBuilder-0.280.210
 1403302338 metadata/md5-cache/perl-core/Module-CoreList-2.800.0
@@ -45663,7 +45630,7 @@
 1403302337 metadata/md5-cache/perl-core/Attribute-Handlers-0.930.0
 1403302338 metadata/md5-cache/perl-core/Sys-Syslog-0.320.0
 1403302338 metadata/md5-cache/perl-core/Sys-Syslog-0.330.0
-1404071706 metadata/md5-cache/perl-core/Math-Complex-1.590.0
+1404242206 metadata/md5-cache/perl-core/Math-Complex-1.590.0
 1403302338 metadata/md5-cache/perl-core/Package-Constants-0.20.0
 1403302338 metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.620.0-r1
 1403302338 metadata/md5-cache/perl-core/JSON-PP-2.272.0
@@ -47371,7 +47338,7 @@
 1404231336 metadata/md5-cache/app-text/xdvik-22.87
 1404241336 metadata/md5-cache/app-text/migemo-0.40_p2
 1403150509 metadata/md5-cache/app-text/htp-1.16
-1404240206 metadata/md5-cache/app-text/tree-1.7.0
+1404242236 metadata/md5-cache/app-text/tree-1.7.0
 1403150509 metadata/md5-cache/app-text/pandoc-1.12
 1403182106 metadata/md5-cache/app-text/active-dvi-1.10.2-r1
 1401171208 metadata/md5-cache/app-text/mathtex-1.04
@@ -48975,6 +48942,7 @@
 1403261736 metadata/md5-cache/dev-db/mysql-connector-c++-1.1.1
 1403150509 metadata/md5-cache/dev-db/mysql-5.0.96
 1404240706 metadata/md5-cache/dev-db/mysql-5.1.70
+1404241806 metadata/md5-cache/dev-db/mysql-5.1.73
 1404240706 metadata/md5-cache/dev-db/mysql-5.5.32
 1404180036 metadata/md5-cache/dev-db/postgresql-base-9999
 1404100206 metadata/md5-cache/dev-db/derby-10.10.1.1
@@ -50517,7 +50485,7 @@
 1404180037 metadata/md5-cache/sys-power/powertop-9999
 1211091752 metadata/md5-cache/sys-power/powerman-2.3.4-r1
 1403261836 metadata/md5-cache/sys-power/iasl-20090123
-1403301337 metadata/md5-cache/kde-misc/krusader-2.4.0_beta3-r1
+1404241936 metadata/md5-cache/kde-misc/krusader-2.4.0_beta3-r1
 1403301337 metadata/md5-cache/kde-misc/kte-collaborative-0.2.0
 1403301337 metadata/md5-cache/kde-misc/katelatexplugin-0.5
 1403301337 metadata/md5-cache/kde-misc/zanshin-0.2.1-r1
@@ -50542,11 +50510,10 @@
 1403301337 metadata/md5-cache/kde-misc/bkodama-0.3.1
 1403301337 metadata/md5-cache/kde-misc/kio-slp-0_p20120621
 1403301337 metadata/md5-cache/kde-misc/plasma-lionmail-0_p20121020
-1403301337 metadata/md5-cache/kde-misc/eventlist-0.6
 1403301337 metadata/md5-cache/kde-misc/quickaccess-0.8.2-r1
-1403301337 metadata/md5-cache/kde-misc/rsibreak-0.11-r1
-1403301337 metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26-r1
-1403301337 metadata/md5-cache/kde-misc/miniplayer-2.5-r1
+1404241936 metadata/md5-cache/kde-misc/rsibreak-0.11-r1
+1404241936 metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26-r1
+1404241936 metadata/md5-cache/kde-misc/miniplayer-2.5-r1
 1403301337 metadata/md5-cache/kde-misc/plasma-photooftheday-2.1.1
 1404240306 metadata/md5-cache/kde-misc/kfilebox-0.4.9
 1403301337 metadata/md5-cache/kde-misc/kio_gopher-0.1.4
@@ -50555,23 +50522,21 @@
 1403301337 metadata/md5-cache/kde-misc/about-distro-1.0.1
 1403301337 metadata/md5-cache/kde-misc/drop2ftp-0.6
 1403301337 metadata/md5-cache/kde-misc/tellico-2.3.8
-1403301337 metadata/md5-cache/kde-misc/rsibreak-0.11
 1404131306 metadata/md5-cache/kde-misc/plasma-nm-0.9.3.3
 1403301337 metadata/md5-cache/kde-misc/plasma-widget-message-indicator-0.5.8
 1403150520 metadata/md5-cache/kde-misc/kim4-0.9.5
 1403301337 metadata/md5-cache/kde-misc/plasmatvgr-0.47
 1403301337 metadata/md5-cache/kde-misc/krecipes-2.0_beta2-r1
 1403301337 metadata/md5-cache/kde-misc/kbiff-4.0
-1403301337 metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1
+1404241906 metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1
 1403301337 metadata/md5-cache/kde-misc/akonadi-social-utils-0_p20120827
 1403301337 metadata/md5-cache/kde-misc/chromi-0.2
 1403301337 metadata/md5-cache/kde-misc/plasmoid-workflow-0.4.1
-1403301337 metadata/md5-cache/kde-misc/steamcompanion-0.5.4-r1
+1404242006 metadata/md5-cache/kde-misc/steamcompanion-0.5.4-r1
 1403301337 metadata/md5-cache/kde-misc/yakuake-2.9.9-r2
 1403301337 metadata/md5-cache/kde-misc/krename-4.0.9-r1
 1403301337 metadata/md5-cache/kde-misc/kraidmonitor-0.5
 1403301337 metadata/md5-cache/kde-misc/kio-ftps-0.2
-1403301337 metadata/md5-cache/kde-misc/krusader-2.4.0_beta3
 1403301337 metadata/md5-cache/kde-misc/krename-4.0.9
 1403301337 metadata/md5-cache/kde-misc/wacomtablet-2.0
 1403301337 metadata/md5-cache/kde-misc/kosd-0.8.1
@@ -50592,25 +50557,21 @@
 1404191438 metadata/md5-cache/kde-misc/kanyremote-6.2
 1403301337 metadata/md5-cache/kde-misc/kshutdown-3.0
 1403301337 metadata/md5-cache/kde-misc/kshutdown-3.2
-1403301337 metadata/md5-cache/kde-misc/fancytasks-1.1.2-r1
+1404241836 metadata/md5-cache/kde-misc/fancytasks-1.1.2-r1
 1403301337 metadata/md5-cache/kde-misc/kgtk-0.11.0
 1403301337 metadata/md5-cache/kde-misc/kde-gtk-config-2.2.1
-1403301337 metadata/md5-cache/kde-misc/nightmode-0.3-r1
+1404241936 metadata/md5-cache/kde-misc/nightmode-0.3-r1
 1403301337 metadata/md5-cache/kde-misc/colord-kde-0.3.0
 1403301337 metadata/md5-cache/kde-misc/kio-locate-0.5.3
-1403301337 metadata/md5-cache/kde-misc/kvkbd-0.6
 1403301337 metadata/md5-cache/kde-misc/kimtoy-1.8
 1403301337 metadata/md5-cache/kde-misc/kopete-thinklight-0.50
 1403301337 metadata/md5-cache/kde-misc/kcollectd-0.9-r1
 1403301337 metadata/md5-cache/kde-misc/ksoprano-0.2
-1403301337 metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26
 1403301337 metadata/md5-cache/kde-misc/serverstatuswidget-1.5.1
-1403301337 metadata/md5-cache/kde-misc/fancytasks-1.1.2
-1403301337 metadata/md5-cache/kde-misc/hdaps_monitor-0.3-r1
+1404241836 metadata/md5-cache/kde-misc/hdaps_monitor-0.3-r1
 1403301337 metadata/md5-cache/kde-misc/redshift-plasmoid-0.6.2
 1403301337 metadata/md5-cache/kde-misc/kcm-grub2-0.6.4
-1403301337 metadata/md5-cache/kde-misc/stock-quote-2.1-r1
-1403301337 metadata/md5-cache/kde-misc/stock-quote-2.1-r2
+1404242006 metadata/md5-cache/kde-misc/stock-quote-2.1-r2
 1403301337 metadata/md5-cache/kde-misc/kbstateapplet-0_p1268845
 1403301337 metadata/md5-cache/kde-misc/kcm_touchpad-0.3.1-r1
 1403301337 metadata/md5-cache/kde-misc/skanlite-1.1-r1
@@ -50623,16 +50584,12 @@
 1403301337 metadata/md5-cache/kde-misc/customizable-weather-1.10.1
 1403301337 metadata/md5-cache/kde-misc/customizable-weather-1.10.2
 1403301337 metadata/md5-cache/kde-misc/nepomukshell-0.8.0
-1403301337 metadata/md5-cache/kde-misc/nightmode-0.3
 1404101536 metadata/md5-cache/kde-misc/emerging-plasmoid-1.0.3
 1403301337 metadata/md5-cache/kde-misc/kcaldav-1.2.0
 1403301337 metadata/md5-cache/kde-misc/kio-mtp-0.75_p20131020
-1403301337 metadata/md5-cache/kde-misc/steamcompanion-0.5.4
-1403301337 metadata/md5-cache/kde-misc/kdesudo-3.4.2.4
 1404082038 metadata/md5-cache/kde-misc/ksplasher-2.0_beta2-r2
-1403301337 metadata/md5-cache/kde-misc/hdaps_monitor-0.3
 1403301337 metadata/md5-cache/kde-misc/plasma-network-status-0.1.1
-1403301337 metadata/md5-cache/kde-misc/kvkbd-0.6-r1
+1404241936 metadata/md5-cache/kde-misc/kvkbd-0.6-r1
 1404240207 metadata/md5-cache/kde-misc/networkmanagement-0.9.0.10-r1
 1403301337 metadata/md5-cache/kde-misc/kscreen-1.0.2.1
 1403301337 metadata/md5-cache/kde-misc/fsrunner-0.7.5
@@ -50646,7 +50603,6 @@
 1403301337 metadata/md5-cache/kde-misc/kgrubeditor-0.8.5
 1403301337 metadata/md5-cache/kde-misc/kdeconnect-0.5.1
 1403301337 metadata/md5-cache/kde-misc/customizable-weather-1.8.3
-1403301337 metadata/md5-cache/kde-misc/miniplayer-2.5
 1403301337 metadata/md5-cache/kde-misc/cpuload-0.3.2
 1403301337 metadata/md5-cache/kde-misc/kolor-manager-1.0.1
 1403301337 metadata/md5-cache/kde-misc/gx-mail-notify-0.4.4
@@ -50657,13 +50613,12 @@
 1404241136 metadata/md5-cache/kde-misc/networkmanagement-0.9.0.11
 1403301337 metadata/md5-cache/kde-misc/ktrafficanalyzer-0.5.4.1
 1403301337 metadata/md5-cache/kde-misc/kopete-antispam-0.5
-1403301337 metadata/md5-cache/kde-misc/kdiff3-0.9.97-r1
-1403301337 metadata/md5-cache/kde-misc/kdiff3-0.9.97-r2
+1404241906 metadata/md5-cache/kde-misc/kdiff3-0.9.97-r2
 1403301337 metadata/md5-cache/kde-misc/konstruktor-0.9_beta1
 1403301337 metadata/md5-cache/kde-misc/skanlite-1.0
 1403301337 metadata/md5-cache/kde-misc/skanlite-1.1
 1403301337 metadata/md5-cache/kde-misc/kookie-0.1.1
-1403301337 metadata/md5-cache/kde-misc/eventlist-0.6-r1
+1404241836 metadata/md5-cache/kde-misc/eventlist-0.6-r1
 1401171206 metadata/md5-cache/app-backup/cdbackup-0.7.0
 1401171206 metadata/md5-cache/app-backup/cdbackup-0.7.1
 1403171236 metadata/md5-cache/app-backup/tsm-7.1.0.0
@@ -50717,6 +50672,7 @@
 1211091733 metadata/md5-cache/app-backup/pdumpfs-1.3-r1
 1403150506 metadata/md5-cache/app-backup/backup-manager-0.7.10.1-r1
 1403150506 metadata/md5-cache/app-backup/luckybackup-0.4.7
+1404241436 metadata/md5-cache/app-backup/backintime-1.0.34
 1211091733 metadata/md5-cache/app-backup/reoback-1.0_p3
 1403150506 metadata/md5-cache/app-backup/cdbkup-1.0-r1
 1403301336 metadata/md5-cache/app-backup/kbackup-0.8
@@ -51147,7 +51103,6 @@
 1211091745 metadata/md5-cache/media-gfx/qingy-themes-20050816
 1403150520 metadata/md5-cache/media-gfx/fbv-1.0b
 1312081506 metadata/md5-cache/media-gfx/gimp-arrow-brushes-20120122
-1403261738 metadata/md5-cache/media-gfx/freecad-0.13.1830
 1404220208 metadata/md5-cache/media-gfx/hugin-9999
 1403150520 metadata/md5-cache/media-gfx/aewan-1.0.01-r1
 1401171221 metadata/md5-cache/media-gfx/dpic-20090713
@@ -51160,7 +51115,7 @@
 1404082038 metadata/md5-cache/media-gfx/blender-2.67b-r1
 1403150520 metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r1
 1211091744 metadata/md5-cache/media-gfx/figurine-1.0.5
-1404190206 metadata/md5-cache/media-gfx/blender-2.70a-r1
+1404241606 metadata/md5-cache/media-gfx/blender-2.70a-r2
 1403150520 metadata/md5-cache/media-gfx/pixie-2.2.6-r1
 1403220236 metadata/md5-cache/media-gfx/pqiv-2.1.1
 1403261738 metadata/md5-cache/media-gfx/autopano-sift-C-2.5.1
@@ -51201,6 +51156,7 @@
 1403150520 metadata/md5-cache/media-gfx/autotrace-0.31.1-r6
 1403150520 metadata/md5-cache/media-gfx/smile-1.0
 1403150520 metadata/md5-cache/media-gfx/shotwell-0.15.1
+1404241706 metadata/md5-cache/media-gfx/shotwell-0.18.0
 1404220208 metadata/md5-cache/media-gfx/hugin-2014.0.0_rc1
 1211091744 metadata/md5-cache/media-gfx/bootsplash-themes-20060913
 1404220208 metadata/md5-cache/media-gfx/tintii-2.8.0
@@ -51254,8 +51210,6 @@
 1403150520 metadata/md5-cache/media-gfx/argyllcms-1.4.0-r2
 1403150520 metadata/md5-cache/media-gfx/nip2-7.26.3
 1403150520 metadata/md5-cache/media-gfx/nip2-7.26.4
-1403261738 metadata/md5-cache/media-gfx/freecad-0.12.5284-r2
-1404240306 metadata/md5-cache/media-gfx/freecad-0.12.5284-r3
 1404240306 metadata/md5-cache/media-gfx/freecad-0.12.5284-r4
 1301221136 metadata/md5-cache/media-gfx/shared-color-profiles-0.1.5
 1403301337 metadata/md5-cache/media-gfx/wally-2.4.4
@@ -51284,7 +51238,7 @@
 1403150520 metadata/md5-cache/media-gfx/xli-1.17.0-r4
 1404040036 metadata/md5-cache/media-gfx/xli-1.17.0-r5
 1403150520 metadata/md5-cache/media-gfx/rawstudio-2.0-r1
-1404240906 metadata/md5-cache/media-gfx/freecad-0.13.1830-r1
+1404241806 metadata/md5-cache/media-gfx/freecad-0.13.1830-r1
 1403261738 metadata/md5-cache/media-gfx/k3d-0.7.11.0-r1
 1404082038 metadata/md5-cache/media-gfx/blender-2.66-r1
 1404161836 metadata/md5-cache/media-gfx/blender-2.69-r1
@@ -51294,7 +51248,6 @@
 1403150520 metadata/md5-cache/media-gfx/drqueue-0.64.4
 1403292036 metadata/md5-cache/media-gfx/blender-2.64a
 1404082038 metadata/md5-cache/media-gfx/blender-2.68a
-1404142206 metadata/md5-cache/media-gfx/blender-2.70a
 1404222337 metadata/md5-cache/media-gfx/freewrl-9999
 1403150520 metadata/md5-cache/media-gfx/icoutils-0.29.1-r2
 1211091745 metadata/md5-cache/media-gfx/springgraph-79
@@ -51500,7 +51453,7 @@
 1403150523 metadata/md5-cache/net-dns/dnsmasq-2.66
 1403150523 metadata/md5-cache/net-dns/dnsmasq-2.67
 1403150523 metadata/md5-cache/net-dns/dnsmasq-2.68
-1404102236 metadata/md5-cache/net-dns/dnsmasq-2.69
+1404242236 metadata/md5-cache/net-dns/dnsmasq-2.70
 1403150523 metadata/md5-cache/net-dns/avahi-0.6.30-r3
 1404191438 metadata/md5-cache/net-dns/avahi-0.6.31-r2
 1404191438 metadata/md5-cache/net-dns/avahi-0.6.31-r3
@@ -52212,7 +52165,7 @@
 1403150521 metadata/md5-cache/media-libs/giflib-4.1.6-r2
 1403150521 metadata/md5-cache/media-libs/plotutils-2.6-r1
 1404100211 metadata/md5-cache/media-libs/libcaca-0.99_beta18-r1
-1404230036 metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
+1404242306 metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
 1403150521 metadata/md5-cache/media-libs/freeverb3-2.5.13-r2
 1403261738 metadata/md5-cache/media-libs/chromaprint-0.6
 1403261738 metadata/md5-cache/media-libs/chromaprint-0.7
@@ -52439,7 +52392,7 @@
 1401171221 metadata/md5-cache/media-libs/portaudio-19_pre20111121
 1403150521 metadata/md5-cache/media-libs/ladspa-cmt-1.16-r1
 1403150521 metadata/md5-cache/media-libs/ladspa-cmt-1.16-r2
-1404230036 metadata/md5-cache/media-libs/ladspa-cmt-1.16-r3
+1404241736 metadata/md5-cache/media-libs/ladspa-cmt-1.16-r3
 1404230036 metadata/md5-cache/media-libs/portaudio-19_pre20140130
 1212041236 metadata/md5-cache/media-libs/opengl-apple-3
 1212041236 metadata/md5-cache/media-libs/opengl-apple-4
@@ -53142,6 +53095,7 @@
 1401230336 metadata/md5-cache/sys-process/parallel-20140122
 1402222336 metadata/md5-cache/sys-process/parallel-20140222
 1403230136 metadata/md5-cache/sys-process/parallel-20140322
+1404242236 metadata/md5-cache/sys-process/parallel-20140422
 1403150529 metadata/md5-cache/sys-process/supervise-scripts-3.5
 1211091752 metadata/md5-cache/sys-process/supervise-scripts-4.0
 1403220237 metadata/md5-cache/sys-process/numad-0.5
@@ -53321,8 +53275,8 @@
 1211091736 metadata/md5-cache/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8-1.0.17
 1211091736 metadata/md5-cache/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8-1.0.19
 1403150509 metadata/md5-cache/dev-embedded/pk2cmd-1.12.0-r1
-1403150509 metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r3
-1403150509 metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
+1404242206 metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r3
+1404242206 metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
 1404180036 metadata/md5-cache/dev-embedded/openocd-9999
 1211091736 metadata/md5-cache/dev-embedded/pista-0.70
 1312152306 metadata/md5-cache/dev-embedded/gputils-1.2.0
@@ -53589,7 +53543,7 @@
 1403150527 metadata/md5-cache/sys-apps/debianutils-4.3.3
 1403150527 metadata/md5-cache/sys-apps/debianutils-4.3.4
 1404051536 metadata/md5-cache/sys-apps/kmod-16
-1404232306 metadata/md5-cache/sys-apps/kmod-17
+1404241836 metadata/md5-cache/sys-apps/kmod-17
 1403150528 metadata/md5-cache/sys-apps/tomoyo-tools-2.5.0_p20120414
 1403150528 metadata/md5-cache/sys-apps/pcsc-tools-1.4.21
 1403150528 metadata/md5-cache/sys-apps/pcsc-tools-1.4.22
@@ -53863,7 +53817,7 @@
 1403261406 metadata/md5-cache/sys-apps/man-db-2.6.6
 1403150528 metadata/md5-cache/sys-apps/man-db-2.6.3-r1
 1403150528 metadata/md5-cache/sys-apps/vbetool-1.1
-1404232306 metadata/md5-cache/sys-apps/kmod-9999
+1404241836 metadata/md5-cache/sys-apps/kmod-9999
 1403150528 metadata/md5-cache/sys-apps/powerpc-utils-1.1.3.18-r2
 1211091750 metadata/md5-cache/sys-apps/blktool-4
 1403150527 metadata/md5-cache/sys-apps/baselayout-prefix-1.12.14-r1
@@ -55235,6 +55189,7 @@
 1403261738 metadata/md5-cache/sci-chemistry/tm-align-20120707
 1403150525 metadata/md5-cache/sci-chemistry/gabedit-2.4.6
 1403150525 metadata/md5-cache/sci-chemistry/gabedit-2.4.7
+1404241706 metadata/md5-cache/sci-chemistry/gabedit-2.4.8
 1403261738 metadata/md5-cache/sci-chemistry/massxpert-3.4.0
 1403261738 metadata/md5-cache/sci-chemistry/tm-align-20130511
 1404191439 metadata/md5-cache/sys-cluster/cinder-2013.2.3
@@ -56044,13 +55999,13 @@
 1404082039 metadata/md5-cache/net-libs/farstream-0.2.3
 1403150523 metadata/md5-cache/net-libs/libprotoident-2.0.6
 1403150523 metadata/md5-cache/net-libs/libprotoident-2.0.7
-1312241506 metadata/md5-cache/net-libs/czmq-1.1.0
-1312241506 metadata/md5-cache/net-libs/czmq-1.2.0
-1403011609 metadata/md5-cache/net-libs/czmq-1.4.1
+1404241706 metadata/md5-cache/net-libs/czmq-1.2.0
+1404241706 metadata/md5-cache/net-libs/czmq-1.4.1
 1403150523 metadata/md5-cache/net-libs/libqmi-1.0.0
 1401171224 metadata/md5-cache/net-libs/libqmi-1.4.0
 1403090236 metadata/md5-cache/net-libs/libqmi-1.8.0
-1403150523 metadata/md5-cache/net-libs/czmq-2.0.3
+1404241706 metadata/md5-cache/net-libs/czmq-2.0.3
+1404241706 metadata/md5-cache/net-libs/czmq-2.1.0
 1403150523 metadata/md5-cache/net-libs/libtirpc-0.2.1-r1
 1403150523 metadata/md5-cache/net-libs/libtirpc-0.2.2-r1
 1402021206 metadata/md5-cache/net-libs/libtirpc-0.2.4-r1
@@ -56061,7 +56016,7 @@
 1404191438 metadata/md5-cache/net-libs/gupnp-0.20.10
 1403150523 metadata/md5-cache/net-libs/libnet-1.1.6
 1403150523 metadata/md5-cache/net-libs/libircclient-1.7
-1403011609 metadata/md5-cache/net-libs/czmq-1.2.0-r1
+1404241706 metadata/md5-cache/net-libs/czmq-1.2.0-r1
 1403261738 metadata/md5-cache/net-libs/libmsn-4.2.1
 1403150523 metadata/md5-cache/net-libs/libeXosip-3.5.0
 1404230037 metadata/md5-cache/net-libs/nacl-0_p20110221
@@ -56130,6 +56085,7 @@
 1403150523 metadata/md5-cache/net-mail/hotwayd-0.8.4
 1402041006 metadata/md5-cache/net-mail/tnef-1.4.10
 1403210006 metadata/md5-cache/net-mail/qpopper-4.1.0
+1404241806 metadata/md5-cache/net-mail/courier-imap-4.15-r1
 1211091747 metadata/md5-cache/net-mail/pop-before-smtp-1.42
 1403150523 metadata/md5-cache/net-mail/gnubiff-2.2.13-r2
 1403150523 metadata/md5-cache/net-mail/gnubiff-2.2.13-r3
@@ -56147,7 +56103,6 @@
 1403150523 metadata/md5-cache/net-mail/checkpassword-0.90-r3
 1403150523 metadata/md5-cache/net-mail/altermime-0.3.10
 1403150523 metadata/md5-cache/net-mail/altermime-0.3.11
-1404240336 metadata/md5-cache/net-mail/courier-imap-4.15
 1404191438 metadata/md5-cache/net-mail/notmuch-0.16-r1
 1403150523 metadata/md5-cache/net-mail/bincimap-1.2.13
 1403150523 metadata/md5-cache/net-mail/fastforward-0.51-r1
@@ -59464,7 +59419,7 @@
 1403150512 metadata/md5-cache/dev-lang/gnat-gcc-4.5.4
 1403150512 metadata/md5-cache/dev-lang/gnat-gcc-4.6.4
 1404211706 metadata/md5-cache/dev-lang/ruby-2.1.1-r1
-1404220207 metadata/md5-cache/dev-lang/erlang-17.0
+1404241606 metadata/md5-cache/dev-lang/erlang-17.0
 1404082036 metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r1
 1404191436 metadata/md5-cache/dev-lang/python-exec-0.9999
 1403150512 metadata/md5-cache/dev-lang/orc-0.4.17
@@ -61409,7 +61364,7 @@
 1403302337 metadata/md5-cache/dev-perl/MooseX-ConfigFromFile-0.110.0
 1403302337 metadata/md5-cache/dev-perl/p5-Palm-1.12.0
 1403302337 metadata/md5-cache/dev-perl/TimeDate-2.300.0
-1403302336 metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r1
+1404242206 metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r1
 1403302337 metadata/md5-cache/dev-perl/boolean-0.280.0
 1403302337 metadata/md5-cache/dev-perl/boolean-0.300.0
 1403302337 metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0
@@ -61437,7 +61392,6 @@
 1403302336 metadata/md5-cache/dev-perl/Bio-Das-1.170.0
 1403302336 metadata/md5-cache/dev-perl/CPAN-Mini-1.111.9
 1403302337 metadata/md5-cache/dev-perl/Module-Signature-0.730.0
-1403302336 metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05
 1403302336 metadata/md5-cache/dev-perl/IO-Util-1.500.0
 1403302336 metadata/md5-cache/dev-perl/Email-Sender-0.120.2
 1403302336 metadata/md5-cache/dev-perl/DateTime-Event-Recurrence-0.160.0
@@ -62061,7 +62015,7 @@
 1403302336 metadata/md5-cache/dev-perl/HTML-RewriteAttributes-0.50.0
 1403302336 metadata/md5-cache/dev-perl/File-MimeInfo-0.210.0
 1403302337 metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.10.0
-1403302337 metadata/md5-cache/dev-perl/Number-Format-1.730.0
+1404242136 metadata/md5-cache/dev-perl/Number-Format-1.730.0
 1403302337 metadata/md5-cache/dev-perl/Package-Variant-1.1.2
 1403302337 metadata/md5-cache/dev-perl/Lexical-Persistence-1.20.0
 1403302336 metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
@@ -62167,7 +62121,6 @@
 1403302336 metadata/md5-cache/dev-perl/Class-Adapter-1.80.0
 1403302336 metadata/md5-cache/dev-perl/Clone-0.350.0
 1403302336 metadata/md5-cache/dev-perl/Clone-0.360.0
-1403302337 metadata/md5-cache/dev-perl/Number-Format-1.52
 1403302337 metadata/md5-cache/dev-perl/Lab-Measurement-3.310.0
 1403302337 metadata/md5-cache/dev-perl/crypt-idea-1.100.0
 1403302336 metadata/md5-cache/dev-perl/DBIx-Migration-0.70.0
@@ -62533,7 +62486,7 @@
 1404211207 metadata/md5-cache/dev-ruby/ruby-vte-2.0.2
 1404211207 metadata/md5-cache/dev-ruby/ruby-vte-2.1.0
 1404211207 metadata/md5-cache/dev-ruby/ruby-vte-2.2.0
-1404211207 metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
+1404242106 metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
 1404211206 metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
 1404211207 metadata/md5-cache/dev-ruby/maruku-0.6.1
 1404211207 metadata/md5-cache/dev-ruby/maruku-0.7.0
@@ -62546,7 +62499,7 @@
 1404211206 metadata/md5-cache/dev-ruby/builder-2.1.2-r3
 1404211207 metadata/md5-cache/dev-ruby/net-ssh-2.4.0
 1404211207 metadata/md5-cache/dev-ruby/net-ssh-2.8.0
-1404211206 metadata/md5-cache/dev-ruby/gibbler-0.9.0
+1404242206 metadata/md5-cache/dev-ruby/gibbler-0.9.0
 1404211207 metadata/md5-cache/dev-ruby/ox-2.1.0
 1404211207 metadata/md5-cache/dev-ruby/ox-2.1.1
 1404211207 metadata/md5-cache/dev-ruby/merb-helpers-1.1.3
@@ -62554,8 +62507,7 @@
 1404211207 metadata/md5-cache/dev-ruby/niceogiri-1.1.2
 1404211207 metadata/md5-cache/dev-ruby/rack-test-0.6.2-r1
 1404211207 metadata/md5-cache/dev-ruby/net-scp-1.0.4-r1
-1404211207 metadata/md5-cache/dev-ruby/jwt-0.1.8-r1
-1404100210 metadata/md5-cache/dev-ruby/ruby-termios-0.9.6-r2
+1404242206 metadata/md5-cache/dev-ruby/ruby-termios-0.9.6-r2
 1404211206 metadata/md5-cache/dev-ruby/facter-1.6.16
 1404211206 metadata/md5-cache/dev-ruby/facter-1.6.18
 1404211207 metadata/md5-cache/dev-ruby/log_buddy-0.7.0
@@ -62576,13 +62528,12 @@
 1404211206 metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.2-r2
 1404190736 metadata/md5-cache/dev-ruby/uconv-0.6.1-r1
 1404211207 metadata/md5-cache/dev-ruby/origin-1.1.0
-1404211206 metadata/md5-cache/dev-ruby/database_cleaner-1.1.1
-1404211206 metadata/md5-cache/dev-ruby/database_cleaner-1.2.0
-1404211207 metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1
+1404242106 metadata/md5-cache/dev-ruby/database_cleaner-1.2.0
+1404242106 metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1
 1404211207 metadata/md5-cache/dev-ruby/xpath-1.0.0-r1
 1404211207 metadata/md5-cache/dev-ruby/polyglot-0.3.3-r1
 1404211206 metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
-1404211207 metadata/md5-cache/dev-ruby/sfl-2.2-r1
+1404242106 metadata/md5-cache/dev-ruby/sfl-2.2-r1
 1404222336 metadata/md5-cache/dev-ruby/coffee-script-2.2.0-r1
 1404222336 metadata/md5-cache/dev-ruby/coffee-script-2.2.0-r2
 1404211206 metadata/md5-cache/dev-ruby/coderay-1.0.9
@@ -62595,16 +62546,16 @@
 1404211207 metadata/md5-cache/dev-ruby/treetop-1.4.15-r1
 1404211206 metadata/md5-cache/dev-ruby/bundler-1.3.5-r1
 1404211207 metadata/md5-cache/dev-ruby/ragol-1.0.1
-1404211206 metadata/md5-cache/dev-ruby/attic-0.5.3
+1404242206 metadata/md5-cache/dev-ruby/attic-0.5.3
 1404211207 metadata/md5-cache/dev-ruby/rexical-1.0.5-r1
 1404211207 metadata/md5-cache/dev-ruby/rexical-1.0.5-r2
 1404211207 metadata/md5-cache/dev-ruby/rexical-1.0.5-r3
 1404211206 metadata/md5-cache/dev-ruby/akismet-1.0.0
 1404211207 metadata/md5-cache/dev-ruby/kramdown-1.2.0-r1
-1404211207 metadata/md5-cache/dev-ruby/tryouts-0.8.8
+1404242106 metadata/md5-cache/dev-ruby/tryouts-0.8.8
 1404211206 metadata/md5-cache/dev-ruby/ipaddress-0.8.0
 1404100209 metadata/md5-cache/dev-ruby/mecab-ruby-0.996
-1404211207 metadata/md5-cache/dev-ruby/tryouts-2.1.1
+1404242106 metadata/md5-cache/dev-ruby/tryouts-2.1.1
 1404211206 metadata/md5-cache/dev-ruby/coolio-1.2.1
 1404211207 metadata/md5-cache/dev-ruby/rdoc-3.12.2
 1404211206 metadata/md5-cache/dev-ruby/async_sinatra-1.1.0
@@ -62627,7 +62578,7 @@
 1404211206 metadata/md5-cache/dev-ruby/factory_girl-4.2.0-r1
 1404211206 metadata/md5-cache/dev-ruby/haml-4.0.3
 1404211207 metadata/md5-cache/dev-ruby/merb-haml-1.1.3
-1404211207 metadata/md5-cache/dev-ruby/net-http-persistent-2.9
+1404242106 metadata/md5-cache/dev-ruby/net-http-persistent-2.9
 1404211207 metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r1
 1404211207 metadata/md5-cache/dev-ruby/ruby-clutter-1.2.6
 1404211207 metadata/md5-cache/dev-ruby/mustache-0.99.5
@@ -62643,7 +62594,7 @@
 1404211206 metadata/md5-cache/dev-ruby/hpricot-0.8.6-r1
 1404211206 metadata/md5-cache/dev-ruby/hpricot-0.8.6-r2
 1404211207 metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
-1404211207 metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
+1404242106 metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
 1404211206 metadata/md5-cache/dev-ruby/flexmock-1.3.2-r1
 1404211207 metadata/md5-cache/dev-ruby/mustache-0.99.4-r1
 1404211207 metadata/md5-cache/dev-ruby/mustache-0.99.4-r2
@@ -62663,12 +62614,12 @@
 1404211206 metadata/md5-cache/dev-ruby/colored-1.2
 1404211207 metadata/md5-cache/dev-ruby/ruby-rsvg-1.1.8
 1404211207 metadata/md5-cache/dev-ruby/ruby-rsvg-1.2.6
-1404211207 metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
+1404242106 metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
 1404211206 metadata/md5-cache/dev-ruby/dep_selector-0.0.8-r1
 1404211207 metadata/md5-cache/dev-ruby/ruby-rsvg-2.0.2
 1404211207 metadata/md5-cache/dev-ruby/ruby-rsvg-2.1.0
 1404211207 metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.0
-1404211207 metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1
+1404242106 metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1
 1404211206 metadata/md5-cache/dev-ruby/cmdparse-2.0.6
 1404211206 metadata/md5-cache/dev-ruby/bsearch-1.5.0
 1404211207 metadata/md5-cache/dev-ruby/redcloth-4.2.9-r1
@@ -62686,7 +62637,7 @@
 1404211207 metadata/md5-cache/dev-ruby/stomp-1.2.16
 1404211207 metadata/md5-cache/dev-ruby/uglifier-2.5.0
 1404211206 metadata/md5-cache/dev-ruby/gettext_i18n_rails-0.10.0
-1404211207 metadata/md5-cache/dev-ruby/tdiff-0.3.3
+1404242106 metadata/md5-cache/dev-ruby/tdiff-0.3.3
 1404211206 metadata/md5-cache/dev-ruby/hoe-3.11.0
 1404211207 metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r1
 1404211207 metadata/md5-cache/dev-ruby/rspec-core-2.12.2
@@ -62702,13 +62653,13 @@
 1404211207 metadata/md5-cache/dev-ruby/thread_safe-0.3.3
 1404211207 metadata/md5-cache/dev-ruby/sprockets-rails-2.0.0
 1404211207 metadata/md5-cache/dev-ruby/sprockets-rails-2.1.1
-1404100210 metadata/md5-cache/dev-ruby/ruby-termios-1.0.0
+1404242206 metadata/md5-cache/dev-ruby/ruby-termios-1.0.0
 1404211207 metadata/md5-cache/dev-ruby/tidy-ext-0.1.14
 1404211207 metadata/md5-cache/dev-ruby/prawn-core-0.8.4-r2
 1404211206 metadata/md5-cache/dev-ruby/css_parser-1.3.5-r1
 1404211206 metadata/md5-cache/dev-ruby/RubyInline-3.12.2-r1
 1404211206 metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0147
-1404211207 metadata/md5-cache/dev-ruby/snmplib-1.1.1
+1404242106 metadata/md5-cache/dev-ruby/snmplib-1.1.1
 1404211206 metadata/md5-cache/dev-ruby/RubyInline-3.12.2
 1404211207 metadata/md5-cache/dev-ruby/ruby_parser-3.1.3
 1404211207 metadata/md5-cache/dev-ruby/ruby_parser-3.4.1
@@ -62734,9 +62685,9 @@
 1404211636 metadata/md5-cache/dev-ruby/actionpack-3.2.17
 1404211207 metadata/md5-cache/dev-ruby/test-unit-1.2.3
 1404211207 metadata/md5-cache/dev-ruby/test-unit-2.5.3
-1404211207 metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1
+1404242106 metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1
 1404211207 metadata/md5-cache/dev-ruby/session-3.1.0-r1
-1404211207 metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
+1404242206 metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
 1404211206 metadata/md5-cache/dev-ruby/eventmachine-0.12.10-r2
 1404211207 metadata/md5-cache/dev-ruby/warden-1.2.3
 1404211207 metadata/md5-cache/dev-ruby/rspec-rails-2.12.2
@@ -62750,7 +62701,7 @@
 1404211206 metadata/md5-cache/dev-ruby/facter-1.7.5-r1
 1404211207 metadata/md5-cache/dev-ruby/rake-0.9.6-r1
 1404211207 metadata/md5-cache/dev-ruby/nokogiri-1.5.10
-1404211207 metadata/md5-cache/dev-ruby/shorturl-1.0.0
+1404242106 metadata/md5-cache/dev-ruby/shorturl-1.0.0
 1404211207 metadata/md5-cache/dev-ruby/shoulda-matchers-2.5.0
 1404211207 metadata/md5-cache/dev-ruby/shoulda-matchers-2.6.0
 1404211207 metadata/md5-cache/dev-ruby/rake-10.2.2
@@ -62779,13 +62730,13 @@
 1404100210 metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r1
 1404100210 metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r2
 1404211207 metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r1
-1404211207 metadata/md5-cache/dev-ruby/libxml-2.7.0-r1
-1404211207 metadata/md5-cache/dev-ruby/libxml-2.7.0-r2
+1404242106 metadata/md5-cache/dev-ruby/libxml-2.7.0-r1
+1404242106 metadata/md5-cache/dev-ruby/libxml-2.7.0-r2
 1404211206 metadata/md5-cache/dev-ruby/date_validator-0.7.0
 1404211207 metadata/md5-cache/dev-ruby/ox-2.0.12
 1404211206 metadata/md5-cache/dev-ruby/amqp-1.0.2
 1404211206 metadata/md5-cache/dev-ruby/amqp-1.1.8
-1404211207 metadata/md5-cache/dev-ruby/sysinfo-0.8.1-r1
+1404242106 metadata/md5-cache/dev-ruby/sysinfo-0.8.1-r1
 1404211206 metadata/md5-cache/dev-ruby/hike-1.2.3-r1
 1404211206 metadata/md5-cache/dev-ruby/deep_merge-1.0.0-r1
 1404211207 metadata/md5-cache/dev-ruby/ruby-poppler-1.1.8
@@ -62804,20 +62755,15 @@
 1404220738 metadata/md5-cache/dev-ruby/tzinfo-1.1.0
 1404211207 metadata/md5-cache/dev-ruby/nokogiri-1.5.5
 1404211207 metadata/md5-cache/dev-ruby/nokogiri-1.6.0
-1404211207 metadata/md5-cache/dev-ruby/text-1.2.3
 1404222336 metadata/md5-cache/dev-ruby/coffee-script-source-1.7.0
 1404211206 metadata/md5-cache/dev-ruby/awesome_print-1.2.0-r1
 1404211207 metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r1
 1404211207 metadata/md5-cache/dev-ruby/tilt-1.3.3
 1404222337 metadata/md5-cache/dev-ruby/tilt-1.4.1
-1404211207 metadata/md5-cache/dev-ruby/temple-0.6.7
 1404211207 metadata/md5-cache/dev-ruby/rdoc-4.0.1-r1
 1404211207 metadata/md5-cache/dev-ruby/rdoc-4.0.1-r2
 1404211207 metadata/md5-cache/dev-ruby/net-ssh-2.7.0-r1
 1404221037 metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0
-1404211207 metadata/md5-cache/dev-ruby/selenium-webdriver-2.37.0
-1404211207 metadata/md5-cache/dev-ruby/selenium-webdriver-2.38.0
-1404211207 metadata/md5-cache/dev-ruby/selenium-webdriver-2.39.0
 1404211207 metadata/md5-cache/dev-ruby/selenium-webdriver-2.40.0
 1404211207 metadata/md5-cache/dev-ruby/selenium-webdriver-2.41.0
 1404211207 metadata/md5-cache/dev-ruby/paint-0.8.7
@@ -62827,9 +62773,7 @@
 1404211207 metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r2
 1404211207 metadata/md5-cache/dev-ruby/rdtool-0.6.38
 1404211206 metadata/md5-cache/dev-ruby/deep_merge-1.0.1
-1404211207 metadata/md5-cache/dev-ruby/libxml-2.4.0
-1404211207 metadata/md5-cache/dev-ruby/libxml-2.6.0
-1404211207 metadata/md5-cache/dev-ruby/libxml-2.7.0
+1404242106 metadata/md5-cache/dev-ruby/libxml-2.4.0
 1404211206 metadata/md5-cache/dev-ruby/deprecated-3.0.0
 1404211207 metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
 1404211206 metadata/md5-cache/dev-ruby/barby-0.5.0-r3
@@ -62840,7 +62784,7 @@
 1404211206 metadata/md5-cache/dev-ruby/hipchat-1.1.0
 1404211206 metadata/md5-cache/dev-ruby/activeldap-3.2.2
 1404211207 metadata/md5-cache/dev-ruby/locale-2.0.5-r3
-1404211207 metadata/md5-cache/dev-ruby/settingslogic-2.0.9
+1404242106 metadata/md5-cache/dev-ruby/settingslogic-2.0.9
 1404211206 metadata/md5-cache/dev-ruby/activeldap-4.0.1
 1404211206 metadata/md5-cache/dev-ruby/inifile-2.0.2-r1
 1404211207 metadata/md5-cache/dev-ruby/polyglot-0.3.4
@@ -62853,8 +62797,7 @@
 1404211207 metadata/md5-cache/dev-ruby/ruby-shadow-2.3.3
 1404211206 metadata/md5-cache/dev-ruby/activemodel-4.0.3
 1404211206 metadata/md5-cache/dev-ruby/activemodel-4.0.4
-1404211207 metadata/md5-cache/dev-ruby/jwt-0.1.10
-1404211207 metadata/md5-cache/dev-ruby/jwt-0.1.11
+1404242206 metadata/md5-cache/dev-ruby/jwt-0.1.11
 1404211207 metadata/md5-cache/dev-ruby/ruby-gtksourceview3-1.2.6
 1404211207 metadata/md5-cache/dev-ruby/mongoid-2.4.9
 1404211207 metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.0.2
@@ -62875,7 +62818,6 @@
 1404211206 metadata/md5-cache/dev-ruby/faraday-0.8.8
 1404211206 metadata/md5-cache/dev-ruby/faraday-0.9.0
 1404211207 metadata/md5-cache/dev-ruby/systemu-2.5.2
-1404211207 metadata/md5-cache/dev-ruby/systemu-2.6.0
 1404211207 metadata/md5-cache/dev-ruby/systemu-2.6.4
 1404211206 metadata/md5-cache/dev-ruby/arel-4.0.1
 1404211206 metadata/md5-cache/dev-ruby/arel-4.0.2
@@ -62884,8 +62826,7 @@
 1404211207 metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3
 1404211207 metadata/md5-cache/dev-ruby/rack-1.4.5-r1
 1404220737 metadata/md5-cache/dev-ruby/rack-1.4.5-r2
-1404211207 metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r1
-1404211207 metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
+1404242106 metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
 1404100210 metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r3
 1404100210 metadata/md5-cache/dev-ruby/rubygems-2.0.10
 1404100210 metadata/md5-cache/dev-ruby/rubygems-2.0.14
@@ -62908,7 +62849,7 @@
 1404211206 metadata/md5-cache/dev-ruby/domain_name-0.5.16
 1404211206 metadata/md5-cache/dev-ruby/domain_name-0.5.17
 1404211206 metadata/md5-cache/dev-ruby/domain_name-0.5.18
-1404211207 metadata/md5-cache/dev-ruby/racc-1.4.9
+1404242106 metadata/md5-cache/dev-ruby/racc-1.4.9
 1404211206 metadata/md5-cache/dev-ruby/gem_plugin-0.2.3-r2
 1404211206 metadata/md5-cache/dev-ruby/gem_plugin-0.2.3-r3
 1404211206 metadata/md5-cache/dev-ruby/classifier-1.3.4
@@ -62916,7 +62857,6 @@
 1404211206 metadata/md5-cache/dev-ruby/jeweler-1.8.6
 1404211207 metadata/md5-cache/dev-ruby/rubyzip-0.9.9
 1404211207 metadata/md5-cache/dev-ruby/rubyzip-1.0.0
-1404211207 metadata/md5-cache/dev-ruby/ruby_parser-3.2.2-r1
 1404211207 metadata/md5-cache/dev-ruby/mixlib-authentication-1.3.0
 1404211207 metadata/md5-cache/dev-ruby/ruby-gobject-introspection-1.2.6
 1404211207 metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.0.2
@@ -62935,7 +62875,6 @@
 1404211207 metadata/md5-cache/dev-ruby/ruby2ruby-2.0.7
 1404211206 metadata/md5-cache/dev-ruby/bson-2.0.0
 1404211206 metadata/md5-cache/dev-ruby/bourne-1.5.0-r1
-1404211206 metadata/md5-cache/dev-ruby/fakefs-0.4.3-r1
 1404211206 metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r1
 1404211206 metadata/md5-cache/dev-ruby/bsearch-1.5.0-r1
 1404211207 metadata/md5-cache/dev-ruby/lockfile-2.1.2
@@ -62943,7 +62882,7 @@
 1404211207 metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0
 1404211207 metadata/md5-cache/dev-ruby/yajl-ruby-1.2.0
 1404211207 metadata/md5-cache/dev-ruby/multi_json-1.6.1-r1
-1404100210 metadata/md5-cache/dev-ruby/ruby-oci8-2.1.3
+1404242206 metadata/md5-cache/dev-ruby/ruby-oci8-2.1.3
 1404211207 metadata/md5-cache/dev-ruby/jquery-rails-2.2.2
 1404211207 metadata/md5-cache/dev-ruby/jquery-rails-2.3.0
 1404211207 metadata/md5-cache/dev-ruby/rcairo-1.12.8
@@ -62952,12 +62891,12 @@
 1404211207 metadata/md5-cache/dev-ruby/matchy-0.5.2-r1
 1404211207 metadata/md5-cache/dev-ruby/jquery-rails-3.0.4
 1404211207 metadata/md5-cache/dev-ruby/jquery-rails-3.1.0
-1404211207 metadata/md5-cache/dev-ruby/ruby-shout-2.2.1
+1404242106 metadata/md5-cache/dev-ruby/ruby-shout-2.2.1
 1404211207 metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0
 1404211207 metadata/md5-cache/dev-ruby/rails-4.0.3
 1404211207 metadata/md5-cache/dev-ruby/rails-4.0.4
 1404211206 metadata/md5-cache/dev-ruby/hike-1.2.3
-1404211207 metadata/md5-cache/dev-ruby/six-0.2.0
+1404242106 metadata/md5-cache/dev-ruby/six-0.2.0
 1404211207 metadata/md5-cache/dev-ruby/riel-1.2.0
 1404211207 metadata/md5-cache/dev-ruby/mercenary-0.2.0
 1404211207 metadata/md5-cache/dev-ruby/mercenary-0.2.1
@@ -62974,7 +62913,7 @@
 1404211207 metadata/md5-cache/dev-ruby/samuel-0.3.3-r1
 1404211207 metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
 1404211207 metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1
-1404211207 metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r2
+1404242106 metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r2
 1404211206 metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
 1404211207 metadata/md5-cache/dev-ruby/metasploit_data_models-0.14.3
 1404211207 metadata/md5-cache/dev-ruby/metasploit_data_models-0.16.1
@@ -62999,7 +62938,7 @@
 1404211207 metadata/md5-cache/dev-ruby/rspec-mocks-2.12.2
 1404211207 metadata/md5-cache/dev-ruby/rspec-mocks-2.13.1
 1404211207 metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6
-1404211207 metadata/md5-cache/dev-ruby/temple-0.6.7-r1
+1404242106 metadata/md5-cache/dev-ruby/temple-0.6.7-r1
 1404211207 metadata/md5-cache/dev-ruby/shoulda-3.5.0-r1
 1404211206 metadata/md5-cache/dev-ruby/ammeter-0.2.9
 1404211207 metadata/md5-cache/dev-ruby/ruby-gdk3-1.2.6
@@ -63014,7 +62953,7 @@
 1404211207 metadata/md5-cache/dev-ruby/ruby-opengl-0.9.0
 1404211207 metadata/md5-cache/dev-ruby/watch-0.1.0
 1404222336 metadata/md5-cache/dev-ruby/execjs-2.0.2-r1
-1404211207 metadata/md5-cache/dev-ruby/racc-1.4.11
+1404242106 metadata/md5-cache/dev-ruby/racc-1.4.11
 1404211206 metadata/md5-cache/dev-ruby/dalli-2.6.4
 1404211207 metadata/md5-cache/dev-ruby/mash-0.1.1-r2
 1404211206 metadata/md5-cache/dev-ruby/bacon-1.2.0-r1
@@ -63029,7 +62968,7 @@
 1404211206 metadata/md5-cache/dev-ruby/evented-spec-0.9.0
 1404211206 metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
 1404211206 metadata/md5-cache/dev-ruby/httpclient-2.3.4.1
-1404211207 metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
+1404242206 metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
 1404211207 metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r1
 1404211207 metadata/md5-cache/dev-ruby/ruby-gtk2-1.1.8
 1404211207 metadata/md5-cache/dev-ruby/ruby-gtk2-1.2.6
@@ -63068,9 +63007,7 @@
 1404211207 metadata/md5-cache/dev-ruby/sprockets-2.11.0
 1404211206 metadata/md5-cache/dev-ruby/drydock-0.6.9
 1404211207 metadata/md5-cache/dev-ruby/origin-1.0.11
-1404211207 metadata/md5-cache/dev-ruby/net-http-persistent-2.9.1
-1404211207 metadata/md5-cache/dev-ruby/net-http-persistent-2.9.3
-1404211207 metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4
+1404242106 metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4
 1404211206 metadata/md5-cache/dev-ruby/deprecated-2.0.1-r2
 1404211206 metadata/md5-cache/dev-ruby/deprecated-2.0.1-r4
 1404211207 metadata/md5-cache/dev-ruby/little-plugger-1.1.3-r1
@@ -63101,9 +63038,8 @@
 1404211207 metadata/md5-cache/dev-ruby/rspec-1.3.2
 1404211206 metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r1
 1404211206 metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
-1404211207 metadata/md5-cache/dev-ruby/syslogger-1.5.1-r1
-1404211206 metadata/md5-cache/dev-ruby/gherkin-2.11.6
-1404211206 metadata/md5-cache/dev-ruby/gherkin-2.12.0
+1404242106 metadata/md5-cache/dev-ruby/syslogger-1.5.1-r1
+1404242206 metadata/md5-cache/dev-ruby/gherkin-2.11.6
 1404211207 metadata/md5-cache/dev-ruby/ruby-gio2-1.1.8
 1404211207 metadata/md5-cache/dev-ruby/ruby-gio2-1.2.6
 1404211207 metadata/md5-cache/dev-ruby/rack-1.2.8
@@ -63116,10 +63052,10 @@
 1404211207 metadata/md5-cache/dev-ruby/right_aws-1.10.0
 1404211206 metadata/md5-cache/dev-ruby/activesupport-4.0.3
 1404211206 metadata/md5-cache/dev-ruby/activesupport-4.0.4
-1404211207 metadata/md5-cache/dev-ruby/text-hyphen-1.4.1
+1404242106 metadata/md5-cache/dev-ruby/text-hyphen-1.4.1
 1404211207 metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
-1404211207 metadata/md5-cache/dev-ruby/sigar-0.7.2-r1
-1404211207 metadata/md5-cache/dev-ruby/timecop-0.6.0
+1404242106 metadata/md5-cache/dev-ruby/sigar-0.7.2-r1
+1404242106 metadata/md5-cache/dev-ruby/timecop-0.6.0
 1404211206 metadata/md5-cache/dev-ruby/amatch-0.2.11-r1
 1404211207 metadata/md5-cache/dev-ruby/thor-0.14.6
 1404211207 metadata/md5-cache/dev-ruby/thor-0.15.2
@@ -63132,12 +63068,11 @@
 1404211206 metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r2
 1404211206 metadata/md5-cache/dev-ruby/activeresource-3.2.17
 1404211206 metadata/md5-cache/dev-ruby/htmlentities-4.3.1-r1
-1404211207 metadata/md5-cache/dev-ruby/state_machine-1.2.0
+1404242106 metadata/md5-cache/dev-ruby/state_machine-1.2.0
 1404211206 metadata/md5-cache/dev-ruby/introspection-0.0.3
 1404211206 metadata/md5-cache/dev-ruby/fastthread-1.0.7-r2
 1404211206 metadata/md5-cache/dev-ruby/asciidoctor-0.1.4
-1404211206 metadata/md5-cache/dev-ruby/chunky_png-1.2.9
-1404211206 metadata/md5-cache/dev-ruby/chunky_png-1.3.0
+1404242206 metadata/md5-cache/dev-ruby/chunky_png-1.3.0
 1404211207 metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2
 1404211206 metadata/md5-cache/dev-ruby/bson-1.6.2-r1
 1404212208 metadata/md5-cache/dev-ruby/fivemat-1.2.1
@@ -63164,14 +63099,14 @@
 1404211206 metadata/md5-cache/dev-ruby/childprocess-0.3.9
 1404211206 metadata/md5-cache/dev-ruby/childprocess-0.4.2
 1404211206 metadata/md5-cache/dev-ruby/childprocess-0.5.1
-1404211207 metadata/md5-cache/dev-ruby/serialport-1.3.0
+1404242106 metadata/md5-cache/dev-ruby/serialport-1.3.0
 1404211207 metadata/md5-cache/dev-ruby/memcache-client-1.8.5
 1404211206 metadata/md5-cache/dev-ruby/fcgi-0.8.8-r2
 1404211207 metadata/md5-cache/dev-ruby/json-1.8.0-r1
 1404211206 metadata/md5-cache/dev-ruby/dbf-2.0.7-r1
 1404211207 metadata/md5-cache/dev-ruby/redcloth-4.2.9
 1404211206 metadata/md5-cache/dev-ruby/atomic-1.1.14-r1
-1404211207 metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
+1404242106 metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
 1404211207 metadata/md5-cache/dev-ruby/net-ssh-gateway-1.1.0-r1
 1404211207 metadata/md5-cache/dev-ruby/magic-0.2.6_p20130813
 1404211207 metadata/md5-cache/dev-ruby/method_source-0.8.2-r1
@@ -63189,20 +63124,20 @@
 1404222336 metadata/md5-cache/dev-ruby/coffee-script-source-1.7.0-r1
 1404211206 metadata/md5-cache/dev-ruby/http-cookie-1.0.2
 1404211207 metadata/md5-cache/dev-ruby/rmagick-2.13.2
-1404211206 metadata/md5-cache/dev-ruby/gherkin-2.12.0-r1
+1404242206 metadata/md5-cache/dev-ruby/gherkin-2.12.0-r1
 1404211207 metadata/md5-cache/dev-ruby/mongo-1.6.2
 1404211207 metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
 1404211207 metadata/md5-cache/dev-ruby/weakling-0.0.4
 1404211207 metadata/md5-cache/dev-ruby/simplecov-0.7.1
 1404211207 metadata/md5-cache/dev-ruby/simplecov-0.8.2
-1404211207 metadata/md5-cache/dev-ruby/sass-rails-3.2.5
-1404211207 metadata/md5-cache/dev-ruby/sass-rails-3.2.6
+1404242106 metadata/md5-cache/dev-ruby/sass-rails-3.2.5
+1404242106 metadata/md5-cache/dev-ruby/sass-rails-3.2.6
 1404211207 metadata/md5-cache/dev-ruby/sass-rails-4.0.0
 1404211207 metadata/md5-cache/dev-ruby/sass-rails-4.0.1
 1404211207 metadata/md5-cache/dev-ruby/pg-0.14.1
 1404211207 metadata/md5-cache/dev-ruby/pg-0.17.1
 1404211207 metadata/md5-cache/dev-ruby/simple-rss-1.3.1
-1404100210 metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2
+1404242206 metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2
 1404211207 metadata/md5-cache/dev-ruby/unf-0.1.3-r1
 1404211207 metadata/md5-cache/dev-ruby/redcarpet-2.3.0-r1
 1404211206 metadata/md5-cache/dev-ruby/buftok-0.2.0
@@ -63235,8 +63170,7 @@
 1404211207 metadata/md5-cache/dev-ruby/launchy-2.3.0-r1
 1404220737 metadata/md5-cache/dev-ruby/mocha-0.10.5-r1
 1404241036 metadata/md5-cache/dev-ruby/columnize-0.8.9
-1404211207 metadata/md5-cache/dev-ruby/ohai-6.16.0
-1404211207 metadata/md5-cache/dev-ruby/ohai-6.18.0
+1404242206 metadata/md5-cache/dev-ruby/ohai-6.18.0
 1404211207 metadata/md5-cache/dev-ruby/paint-0.8.6-r1
 1404211207 metadata/md5-cache/dev-ruby/test-spec-0.10.0-r4
 1404211206 metadata/md5-cache/dev-ruby/builder-3.0.4
@@ -63251,7 +63185,7 @@
 1404211207 metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r1
 1404211207 metadata/md5-cache/dev-ruby/uuidtools-2.1.3
 1404211207 metadata/md5-cache/dev-ruby/uuidtools-2.1.4
-1404211206 metadata/md5-cache/dev-ruby/hexoid-0.2.2
+1404242106 metadata/md5-cache/dev-ruby/hexoid-0.2.2
 1404211207 metadata/md5-cache/dev-ruby/ruby-gettext-2.3.3
 1404211207 metadata/md5-cache/dev-ruby/ruby-gettext-2.3.8
 1404211207 metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
@@ -63271,9 +63205,9 @@
 1404211207 metadata/md5-cache/dev-ruby/ruby-pango-1.1.8
 1404211207 metadata/md5-cache/dev-ruby/ruby-pango-1.2.6
 1404222336 metadata/md5-cache/dev-ruby/tilt-1.4.1-r1
-1404211207 metadata/md5-cache/dev-ruby/ruby-pango-2.0.2
-1404211207 metadata/md5-cache/dev-ruby/ruby-pango-2.1.0
-1404211207 metadata/md5-cache/dev-ruby/ruby-pango-2.2.0
+1404242336 metadata/md5-cache/dev-ruby/ruby-pango-2.0.2
+1404242336 metadata/md5-cache/dev-ruby/ruby-pango-2.1.0
+1404242336 metadata/md5-cache/dev-ruby/ruby-pango-2.2.0
 1404211206 metadata/md5-cache/dev-ruby/caesars-0.7.4-r1
 1404211207 metadata/md5-cache/dev-ruby/sanitize-2.1.0
 1404211206 metadata/md5-cache/dev-ruby/equalizer-0.0.9
@@ -63309,14 +63243,14 @@
 1404211207 metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.0.2
 1404211207 metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.1.0
 1404211207 metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.0
-1404211207 metadata/md5-cache/dev-ruby/rubytter-1.5.1
-1404211207 metadata/md5-cache/dev-ruby/rye-0.9.7
-1404211207 metadata/md5-cache/dev-ruby/shotgun-0.9-r1
+1404242106 metadata/md5-cache/dev-ruby/rubytter-1.5.1
+1404242106 metadata/md5-cache/dev-ruby/rye-0.9.7
+1404242106 metadata/md5-cache/dev-ruby/shotgun-0.9-r1
 1404211206 metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4
 1404211336 metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
 1404211207 metadata/md5-cache/dev-ruby/rack-ssl-1.4.0
 1404211207 metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
-1404211207 metadata/md5-cache/dev-ruby/rev-0.3.2-r1
+1404242206 metadata/md5-cache/dev-ruby/rev-0.3.2-r1
 1404211206 metadata/md5-cache/dev-ruby/hashie-2.0.5-r1
 1404211207 metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r1
 1404211207 metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
@@ -63345,7 +63279,7 @@
 1404211207 metadata/md5-cache/dev-ruby/redis-3.0.6
 1404211207 metadata/md5-cache/dev-ruby/rmagick-2.13.2-r1
 1404211206 metadata/md5-cache/dev-ruby/fattr-2.2.2
-1404211207 metadata/md5-cache/dev-ruby/storable-0.8.9-r1
+1404242206 metadata/md5-cache/dev-ruby/storable-0.8.9-r1
 1404211207 metadata/md5-cache/dev-ruby/rb-gsl-1.16.0
 1404211207 metadata/md5-cache/dev-ruby/pry-0.9.11.4
 1404211207 metadata/md5-cache/dev-ruby/pry-0.9.12.6
@@ -63380,7 +63314,7 @@
 1404211207 metadata/md5-cache/dev-ruby/ruby-atk-2.1.0
 1404211207 metadata/md5-cache/dev-ruby/ruby-atk-2.2.0
 1404211207 metadata/md5-cache/dev-ruby/mechanize-2.6.0
-1404211206 metadata/md5-cache/dev-ruby/directory_watcher-1.4.1
+1404242206 metadata/md5-cache/dev-ruby/directory_watcher-1.4.1
 1404211207 metadata/md5-cache/dev-ruby/unf_ext-0.0.6
 1404211206 metadata/md5-cache/dev-ruby/docile-1.1.3
 1404211206 metadata/md5-cache/dev-ruby/jquery-rails-1.0.19-r1
@@ -63389,7 +63323,7 @@
 1404211207 metadata/md5-cache/dev-ruby/rake-compiler-0.8.3
 1404211207 metadata/md5-cache/dev-ruby/rake-compiler-0.9.1
 1404211207 metadata/md5-cache/dev-ruby/rake-compiler-0.9.2
-1404211207 metadata/md5-cache/dev-ruby/stamp-0.5.0-r1
+1404242106 metadata/md5-cache/dev-ruby/stamp-0.5.0-r1
 1404211207 metadata/md5-cache/dev-ruby/tins-0.13.1
 1404211207 metadata/md5-cache/dev-ruby/tins-0.13.2
 1404211207 metadata/md5-cache/dev-ruby/oauth2-0.9.2
@@ -63429,8 +63363,8 @@
 1404211206 metadata/md5-cache/dev-ruby/github_api-0.10.2
 1404211207 metadata/md5-cache/dev-ruby/metasploit_data_models-0.3.1-r1
 1404211207 metadata/md5-cache/dev-ruby/metaclass-0.0.1-r1
-1404211206 metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
-1404211206 metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
+1404242206 metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
+1404242206 metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
 1404211207 metadata/md5-cache/dev-ruby/mime-types-1.23
 1404211207 metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-1.1.8
 1404211207 metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-1.2.6
@@ -63453,17 +63387,16 @@
 1404211206 metadata/md5-cache/dev-ruby/amq-client-1.0.4
 1404211207 metadata/md5-cache/dev-ruby/rainbow-2.0.0
 1404211207 metadata/md5-cache/dev-ruby/spork-0.9.2
-1404211207 metadata/md5-cache/dev-ruby/samuel-0.3.3
+1404242106 metadata/md5-cache/dev-ruby/samuel-0.3.3
 1404211207 metadata/md5-cache/dev-ruby/jquery-ui-rails-3.0.1
 1404211207 metadata/md5-cache/dev-ruby/jquery-ui-rails-4.1.1
 1404211207 metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.0
 1404211207 metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
-1404211207 metadata/md5-cache/dev-ruby/net-dns-0.7.1
-1404211207 metadata/md5-cache/dev-ruby/net-dns-0.8.0
+1404242106 metadata/md5-cache/dev-ruby/net-dns-0.8.0
 1404211207 metadata/md5-cache/dev-ruby/mixlib-cli-1.4.0
 1404211207 metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r1
 1404211207 metadata/md5-cache/dev-ruby/omniauth-1.2.1
-1404211207 metadata/md5-cache/dev-ruby/log4r-1.1.10
+1404242206 metadata/md5-cache/dev-ruby/log4r-1.1.10
 1404211207 metadata/md5-cache/dev-ruby/open4-1.3.3
 1404211206 metadata/md5-cache/dev-ruby/hoe-3.9.0
 1404211207 metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r1
@@ -63473,10 +63406,8 @@
 1404211207 metadata/md5-cache/dev-ruby/protected_attributes-1.0.3
 1404211207 metadata/md5-cache/dev-ruby/protected_attributes-1.0.5
 1404211207 metadata/md5-cache/dev-ruby/protected_attributes-1.0.7
-1404211206 metadata/md5-cache/dev-ruby/fakefs-0.4.2
-1404211206 metadata/md5-cache/dev-ruby/fakefs-0.5.0
-1404211206 metadata/md5-cache/dev-ruby/fakefs-0.5.1
-1404211206 metadata/md5-cache/dev-ruby/fakefs-0.5.2
+1404242106 metadata/md5-cache/dev-ruby/fakefs-0.4.2
+1404242106 metadata/md5-cache/dev-ruby/fakefs-0.5.2
 1404211206 metadata/md5-cache/dev-ruby/bundler-1.3.5
 1404211206 metadata/md5-cache/dev-ruby/bundler-1.3.6
 1404211206 metadata/md5-cache/dev-ruby/bones-3.8.1
@@ -63487,8 +63418,7 @@
 1404211207 metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
 1404211206 metadata/md5-cache/dev-ruby/columnize-0.3.6-r1
 1404211206 metadata/md5-cache/dev-ruby/capybara-1.1.4
-1404211206 metadata/md5-cache/dev-ruby/database_cleaner-1.1.1-r1
-1404211206 metadata/md5-cache/dev-ruby/database_cleaner-1.1.1-r2
+1404242106 metadata/md5-cache/dev-ruby/database_cleaner-1.1.1-r2
 1404211207 metadata/md5-cache/dev-ruby/slim-2.0.2
 1404211206 metadata/md5-cache/dev-ruby/capybara-2.1.0
 1404211206 metadata/md5-cache/dev-ruby/capybara-2.2.0
@@ -63518,21 +63448,21 @@
 1404211207 metadata/md5-cache/dev-ruby/merb-core-1.1.3-r1
 1404211206 metadata/md5-cache/dev-ruby/amq-protocol-1.9.0
 1404211206 metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
-1404211207 metadata/md5-cache/dev-ruby/ruby-elf-9999
+1404242206 metadata/md5-cache/dev-ruby/ruby-elf-9999
 1404211207 metadata/md5-cache/dev-ruby/term-ansicolor-1.0.7
 1404211207 metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
 1404211207 metadata/md5-cache/dev-ruby/omniauth-1.1.4-r1
 1404211207 metadata/md5-cache/dev-ruby/png-1.2.0-r1
 1404211207 metadata/md5-cache/dev-ruby/jruby-openssl-0.7.7
 1404211206 metadata/md5-cache/dev-ruby/git-1.2.6
-1404211207 metadata/md5-cache/dev-ruby/text-1.2.3-r1
+1404242206 metadata/md5-cache/dev-ruby/text-1.2.3-r1
 1404211207 metadata/md5-cache/dev-ruby/merb-assets-1.1.3
-1404211207 metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1
+1404242106 metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1
 1404211207 metadata/md5-cache/dev-ruby/wirble-0.1.3-r2
 1404211207 metadata/md5-cache/dev-ruby/mocha-1.0.0
 1404211206 metadata/md5-cache/dev-ruby/curb-0.8.4
 1404211206 metadata/md5-cache/dev-ruby/curb-0.8.5
-1404211207 metadata/md5-cache/dev-ruby/mab-0.0.3
+1404242106 metadata/md5-cache/dev-ruby/mab-0.0.3
 1404211207 metadata/md5-cache/dev-ruby/sexp_processor-3.2.0
 1404211206 metadata/md5-cache/dev-ruby/cocaine-0.5.3
 1404211206 metadata/md5-cache/dev-ruby/cocaine-0.5.4
@@ -63541,7 +63471,7 @@
 1404211207 metadata/md5-cache/dev-ruby/sexp_processor-4.4.3
 1404211207 metadata/md5-cache/dev-ruby/slop-3.5.0
 1404211206 metadata/md5-cache/dev-ruby/crack-0.3.2-r1
-1404211207 metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
+1404242206 metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
 1404211206 metadata/md5-cache/dev-ruby/highline-1.6.19
 1404211206 metadata/md5-cache/dev-ruby/highline-1.6.20
 1404211206 metadata/md5-cache/dev-ruby/highline-1.6.21
@@ -63549,13 +63479,13 @@
 1404211207 metadata/md5-cache/dev-ruby/matchy-0.5.2
 1404211207 metadata/md5-cache/dev-ruby/mail-2.4.4
 1404211207 metadata/md5-cache/dev-ruby/mail-2.5.4
-1404211206 metadata/md5-cache/dev-ruby/allison-2.0.3-r1
-1404211206 metadata/md5-cache/dev-ruby/allison-2.0.3-r2
-1404211206 metadata/md5-cache/dev-ruby/allison-2.0.3-r3
+1404242206 metadata/md5-cache/dev-ruby/allison-2.0.3-r1
+1404242206 metadata/md5-cache/dev-ruby/allison-2.0.3-r2
+1404242206 metadata/md5-cache/dev-ruby/allison-2.0.3-r3
 1404221706 metadata/md5-cache/dev-ruby/charlock_holmes-0.6.9.4
 1404211206 metadata/md5-cache/dev-ruby/calendar_date_select-2.0.0
 1404211206 metadata/md5-cache/dev-ruby/bcat-0.6.2-r1
-1404211207 metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
+1404242106 metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
 1404211206 metadata/md5-cache/dev-ruby/addressable-2.3.5
 1404211206 metadata/md5-cache/dev-ruby/hiera-1.2.1
 1404211206 metadata/md5-cache/dev-ruby/hiera-1.3.0
@@ -63828,6 +63758,7 @@
 1301071806 metadata/md5-cache/dev-util/abi-compliance-checker-1.98.7
 1302111436 metadata/md5-cache/dev-util/abi-compliance-checker-1.98.8
 1403150517 metadata/md5-cache/dev-util/dmake-4.12
+1404241806 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.0.37
 1211160136 metadata/md5-cache/dev-util/obs-service-meta-1
 1311021436 metadata/md5-cache/dev-util/obs-service-meta-2
 1404191438 metadata/md5-cache/dev-util/freecode-submit-2.7
@@ -66151,6 +66082,7 @@
 1404191437 metadata/md5-cache/dev-python/pyechonest-7.2.1
 1404191438 metadata/md5-cache/dev-python/pyxdg-0.25-r1
 1404191437 metadata/md5-cache/dev-python/decoratortools-1.8-r1
+1404241836 metadata/md5-cache/dev-python/python-nbxmpp-0.4-r1
 1403150515 metadata/md5-cache/dev-python/testfixtures-2.3.4
 1402061007 metadata/md5-cache/dev-python/markdown-2.1.0
 1402061007 metadata/md5-cache/dev-python/markdown-2.1.1
@@ -67254,6 +67186,7 @@
 1403150507 metadata/md5-cache/app-editors/fte-20051115-r3
 1403150507 metadata/md5-cache/app-editors/zile-2.3.24-r1
 1404191439 metadata/md5-cache/sys-fs/s3ql-2.8.1
+1404241606 metadata/md5-cache/sys-fs/aufs-util-3.13_p20140420
 1403150529 metadata/md5-cache/sys-fs/mdadm-3.2.6-r1
 1211091751 metadata/md5-cache/sys-fs/quotatool-1.4.6
 1403150529 metadata/md5-cache/sys-fs/quotatool-1.5.0
@@ -67308,6 +67241,7 @@
 1403220237 metadata/md5-cache/sys-fs/aufs3-3_p20140224
 1403220237 metadata/md5-cache/sys-fs/aufs3-3_p20140303
 1403220237 metadata/md5-cache/sys-fs/aufs3-3_p20140310
+1404241606 metadata/md5-cache/sys-fs/aufs3-3_p20140420
 1404230037 metadata/md5-cache/sys-fs/eudev-1.4-r1
 1309051736 metadata/md5-cache/sys-fs/f2fs-tools-1.1.0-r1
 1403150529 metadata/md5-cache/sys-fs/treesize-0.54.1
@@ -67367,6 +67301,7 @@
 1403220237 metadata/md5-cache/sys-fs/aufs3-3_p20131104-r1
 1403220237 metadata/md5-cache/sys-fs/aufs3-3_p20131111-r1
 1403150529 metadata/md5-cache/sys-fs/ext3grep-0.10.2
+1404241606 metadata/md5-cache/sys-fs/aufs-headers-3.13_p20140420
 1403150528 metadata/md5-cache/sys-fs/autorun-3.17
 1401171229 metadata/md5-cache/sys-fs/bcache-tools-1.0.4
 1401201606 metadata/md5-cache/sys-fs/bcache-tools-1.0.5
@@ -69653,7 +69588,7 @@
 1211091752 metadata/md5-cache/virtual/perl-Pod-Simple-3.14
 1211091752 metadata/md5-cache/virtual/perl-Pod-Simple-3.15
 1309051136 metadata/md5-cache/virtual/perl-B-Debug-1.180.0
-1404071706 metadata/md5-cache/virtual/perl-Dumpvalue-1.170.0-r1
+1404242206 metadata/md5-cache/virtual/perl-Dumpvalue-1.170.0-r1
 1401310336 metadata/md5-cache/virtual/perl-Exporter-5.680.0
 1401210107 metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.580.0
 1401210107 metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.590.0
@@ -69706,7 +69641,7 @@
 1401200108 metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.310.0
 1401200108 metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.320.0
 1401200108 metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.350.0
-1404071706 metadata/md5-cache/virtual/perl-Devel-PPPort-3.200.0-r2
+1404242206 metadata/md5-cache/virtual/perl-Devel-PPPort-3.200.0-r2
 1306291506 metadata/md5-cache/virtual/jre-1.5.0-r2
 1308161136 metadata/md5-cache/virtual/perl-Text-Tabs+Wrap-2013.52.300
 1212201736 metadata/md5-cache/virtual/gnustep-back-0.22.0
@@ -69868,7 +69803,7 @@
 1307120438 metadata/md5-cache/virtual/mpi-2.0-r3
 1211091752 metadata/md5-cache/virtual/perl-Term-ANSIColor-3.10.0-r1
 1211091752 metadata/md5-cache/virtual/perl-Pod-Simple-3.200.0-r1
-1404071706 metadata/md5-cache/virtual/perl-Math-Complex-1.590.0-r2
+1404242206 metadata/md5-cache/virtual/perl-Math-Complex-1.590.0-r2
 1211091752 metadata/md5-cache/virtual/qmail-1.03
 1211091752 metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.230.0-r2
 1211091752 metadata/md5-cache/virtual/perl-parent-0.224
@@ -69910,7 +69845,7 @@
 1404220738 metadata/md5-cache/virtual/ruby-minitest-0-r4
 1401210107 metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.33
 1211091752 metadata/md5-cache/virtual/emacs-flim-0
-1404071706 metadata/md5-cache/virtual/perl-CPAN-2.0.0
+1404242206 metadata/md5-cache/virtual/perl-CPAN-2.0.0
 1211091752 metadata/md5-cache/virtual/perl-DB_File-1.822.0
 1211091752 metadata/md5-cache/virtual/perl-DB_File-1.824.0
 1401171100 metadata/md5-cache/virtual/perl-DB_File-1.827.0
@@ -74593,6 +74528,7 @@
 1403150518 metadata/md5-cache/games-arcade/aop-0.6
 1403150518 metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1
 1403150518 metadata/md5-cache/games-arcade/mtp-target-bin-1.5.18
+1404242306 metadata/md5-cache/games-arcade/digger-20140423
 1403150518 metadata/md5-cache/games-arcade/xsfcave-0.5
 1403150518 metadata/md5-cache/games-arcade/diameter-0.4.0.3
 1403150518 metadata/md5-cache/games-arcade/xtux-20030306
@@ -74751,7 +74687,7 @@
 1403150518 metadata/md5-cache/games-fps/quake3-alliance-3.3-r1
 1404181636 metadata/md5-cache/games-fps/duke3d-data-1.0-r1
 1403150518 metadata/md5-cache/games-fps/quake2-data-3.20
-1403150518 metadata/md5-cache/games-fps/quake2-textures-0_beta8
+1404242336 metadata/md5-cache/games-fps/quake2-textures-0_beta8
 1404191438 metadata/md5-cache/games-fps/doomsday-1.9.8-r1
 1403150518 metadata/md5-cache/games-fps/ut2004-bonuspack-ece-1-r3
 1403150518 metadata/md5-cache/games-fps/tenebrae-1.04
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c2603ae00446..746d446e2a7e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 24 Apr 2014 10:00:01 +0000
+Thu, 24 Apr 2014 19:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f68631297c17..476cacda9dcf 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1398332101 Thu 24 Apr 2014 09:35:01 AM UTC UTC
+1398366301 Thu 24 Apr 2014 07:05:01 PM UTC UTC
diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index d4dcaac3bcbd..c186e1fffaea 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.249 2014/04/10 18:05:22 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.250 2014/04/24 18:18:22 chutzpah Exp $
+
+*dnsmasq-2.70 (24 Apr 2014)
+
+  24 Apr 2014; Patrick McLean <chutzpah@gentoo.org> -dnsmasq-2.69.ebuild,
+  +dnsmasq-2.70.ebuild:
+  Version bump, remove buggy older version.
 
 *dnsmasq-2.69 (10 Apr 2014)
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index b0ea0a451320..1aeb46bb3cec 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -10,27 +10,27 @@ AUX dnsmasq.service-r1 278 SHA256 2cca1e7ec70aee80c9d1f59e7f17b515e5fa66b08835ed
 DIST dnsmasq-2.66.tar.xz 401056 SHA256 5e143947527bcdc46a30f4b1bbdfbfa96333dd98bcecdac3b5b1d6cacfe06c75 SHA512 f0bde09f178ca15f4c28efb06901213af9a009b4476daa8a08bafc7682b9ffed13ac65c5c232acdf828382f321137de08b4a33108d22613b198fe30695b3362c WHIRLPOOL e749d24017c35fdbaaaf417decdf9316e235cf7f96f031caceee14d06b982c285b0e561f50597cd12b6a31ef554f7f2e22ca6234f44a6d8bb066dede99461166
 DIST dnsmasq-2.67.tar.xz 418484 SHA256 a8f1cec9d3f38d19c7c54e2879703d42748ace0f62c32e695b082051bdd2705d SHA512 32946fb01fca7f635b6164e0b06392d3377031c0f3fefbcd52bee74939ae527ba5abe494db7dd9d4afdd39faa044c0e82f0bec0b1137b7768013601bceb8a6b3 WHIRLPOOL d9d22e47a9e36962f87df3a76e38fd18415a00fdf60241861d8b29417c4d0f404cb6797e3a4688b95d4bc4cff86cb2cb3b3b0f405286c312300a54a0a61a2591
 DIST dnsmasq-2.68.tar.xz 420968 SHA256 055904f39a65bf651ccbe0f25922c88cf6e7e1b85e8b1905804253b6957ec7a0 SHA512 c67605f21fc5e64fe70ac4349c45a246575ebdb07ada14602c453b9a1152a12c3a7f3a01d5749db9f7a24a9f281a7fb9fd24bfaff1ec35e9ab0d213ae14cac07 WHIRLPOOL 9a69feedd8982dd70053df270fbd5523acc9a5b6e74d03e68363adb111d3ffe87f22dfb0f6f16f7159f717cb5d2de0bc142e585e26e2961068b0e3cc50734c03
-DIST dnsmasq-2.69.tar.xz 446724 SHA256 80ce4293b2c0966ebe7997adf626269cafdcb98d7dbe51d8a312ff15244e69fc SHA512 dfa5f1fe6837a27483035d68f0cfd18d9a95a5298b86bcd1961413d76ab33063ae8e86047b146e7fbb1c9855e2563db75f0e8d5fbb5744088f145055f5f86651 WHIRLPOOL 0badd6ac1eb18f6c606da7d61fc90e6d7964fbcbe023ab4aee229594f55e70dfb43b7c6b4b3ca7e18c479011843b7481002e7b6067296d5fa29d4c113619afee
+DIST dnsmasq-2.70.tar.xz 446984 SHA256 19d55bddc541271ad5271e3946f94e2cdf4491913aa5fb1ca9c6b23d5925f026 SHA512 69af462979ccb362efea028ee77aed953d20ed35c4f4f62126f92fe083384c6920efe22db866885293279ef34b8ba99fe5ba042f4df5bc4759259c5a19f67946 WHIRLPOOL b67d9949d0557b6fe7ac9eb79a7bca8036e074a29b73dbee185f887f523ec105fd9424f99a7866124f89b3837b0d452c4253329a2c945c071b5e28a85007b46a
 EBUILD dnsmasq-2.66.ebuild 3154 SHA256 62ffc1af6d4021fba25f7d9f6c36f71d291661c3988de2501b8a394b4bf6342e SHA512 049e94034f89e3a91c3b875a9e1c87ec014e5678c8c53708e17c8dcc858c418525ef550c4d4bc6201a235a0a66a3d9380b66dc8fc559d3a742d24666072ccd2d WHIRLPOOL d268b4ebaa126c73215b7cc6cf623a1eb085b4242ca04b08ce1cf89f9f5f60f078bc0f3dff5109053712048830c43793115d27cb6c144e5fc4e7d7a8f3b56654
 EBUILD dnsmasq-2.67.ebuild 3041 SHA256 22e5fca1aaac67e68e7f04de1eeff0547b46d682cd1ce0e629d404a158a782e2 SHA512 19a08db447e7cc58a6c4d3092b5e8e6bbc436683911bf819777d36697311fad4fbe38938261358f9a426e05caa68643aa287a3bfcb9e6630a3f2740c34f15836 WHIRLPOOL 547fbb5416e1ba8cf13c305d1ebceb43a8739431f63da30b393b4017a35c6c3ee220b2dae9b866850fa956f85960bf1a910102e99ca110213c08100bc42bfd43
 EBUILD dnsmasq-2.68.ebuild 3094 SHA256 9446bfc330242c7f381c361d3848c354c8d9bd90cf1f57e03910cd82297f0834 SHA512 7e85593b89eb636fe3cd520909cd25f283d004b69baffc840be096572c7a241a6f4283b414c93884376703e4ec78b7141c283c858afa540bf51bba0f1575637c WHIRLPOOL b267228927d2f11a967f0385c821fa098a10d46c0cf57878f617cb733263acf1ee4ae47455ac951dda57b836f3d2bdfaf1772fa5dc3411f89b3566dbcf278735
-EBUILD dnsmasq-2.69.ebuild 3685 SHA256 00b0f99cbd73b4730ab56d087a0b06b26508dd02534cdfbe087b3d9db4ea49fc SHA512 32b9d87fc83a277bfea7b4fdb48101c56edd6cb7216ab750f3d5d9b12fd7cd6fb44ee00fff8d855d201d73a69465bc206fa60f57b22e07d7dce48cc76d8f3909 WHIRLPOOL 6bc030ef28ba0ec96734c0cd359eedd16a4d709dfa0fa22e92a4eeb38eabce3e559087386d8073fdb9eba1fa2922318d9dbee8e255b64b5379c96152ab6a435d
-MISC ChangeLog 33506 SHA256 734940a1a7780ee2e77b0f8f04aa45d00909c28387d5e335d0d36385cfc84720 SHA512 4011eda700f81ad7568cce6887ed7fce5b161a794f56c3136404bdb61249e8ff58f5e78e89649b46276328409077f3dd9ea49bb9c74568b0398b35d9c5497737 WHIRLPOOL c03997a9d98389cdfc88419b240853cc869ba357f746092142132134d4f0c2eb0476ff9bf558e96dbe4f1ed147a6bea525d84586342d3528a74f26bdfe38a4cc
+EBUILD dnsmasq-2.70.ebuild 3685 SHA256 f5d6c60460dcb241676e01aa21010df3de6094f78885b4d5b18b36871a21ffd9 SHA512 49edaa2448b548e21ea0861c2c2da2681ef10f0552303d6b2d85c32baaec0e919da081b6f27969460df2110541215ef42a8816a2ca98cc1dcc4a42a6d90a6ba2 WHIRLPOOL d9bb237846350ecf98ba89e0c96d4ab331f853d103eabacfc2c245a0934171269bb9761296fcb640ed8cbf64b5b822f35c1a3e2d1e0b6c70c3d435d487d2a92a
+MISC ChangeLog 33678 SHA256 7664d6dbe60709336b7be2efabae3a8af5eeb4b035d04528dcbce70cbf09f7db SHA512 b70b74dfa9236f7ea8a77f20b1aeaef68a5f806e1068aa1c10459bfc02e66e5a459e67de065cdbb8ad7163ac2f27cd06a857e7e67b5b4c7b9254d26944c865a5 WHIRLPOOL d6d4d3d27f19019dc760142f14a3cf20a4e13b607d2e800a94725961c1d1f891f94d8010f25c422c624ba55ddd43f376d1256806cf22644e5ac6bcbf366b3c7f
 MISC metadata.xml 807 SHA256 6fb95e16dba00e7466dd6f5fb4820c799a2f54fbc05e5b4a0791b0ac11520359 SHA512 593d4c571ec9e3927988aeb5072af21b7c5f4fc6b55a1a7ebbd1d03c14aa0a0cfa026eb5ba6547370105792485b74f8d9c8350e4b606dbe1bcf4a89aa6d73359 WHIRLPOOL e7690f451f0c10784b6d6b0902c97aac877c0d76ffe66954daa79294c1e74665e9b5d28749a594a6a1dd7c7f755a88fd942fed4619c2bf2b31e75ef5b762dd6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTRt1tAAoJEHy/RO9cNQiDYP8QAMO4TiRrme4zmVcyGffW6jxR
-YTNBNpYFLaScPVoHVZFx01YjmZnTRbWOV2qoCAtWa1VpHso6kL/2PJzG5fEZ7SjZ
-ne2rUVOPVC/F1OuPF0M5X4Udkjlxo9go4YOBjk7M1PEdiUa3r534+xe7kNfqoW57
-JnX0+PzJ5cOUZcoPa82zxowVWpEaC3rxKh4sf8PjuG0Hc5QMHhkeYGxJuiPX8y/Y
-CGl7CLYYPZBrrfFmbBZiND/74x6QUDV44MBiHFCWCEE+5Ss/AbJBcBJC1Xnhpg7j
-1I29enGIJHY2e5owD9r3dV7orA3gCCQanfnQ2iZnpp+fcRC24M0ew9T+Bz+H+DNN
-zYmg+vasARdOVF+FeGhYYwFqRhnU5lHCrZzXwzStasyZi67jwzGH2ugGM/u+4RKu
-gb7dyHEbnpT2OK5ZRBPGpeF+Zb8QqcLVJ/2j37PLEBwwSvihOmWBsA2ASRO29I/V
-qWiOBuhEi2Igsz7u9Sxq2x7wyS4HL9ylZVRtS1xGpvVVNQgFyeAyLZjJJdiu+tnE
-1azHusCpoc/ytNxDsmANPw5cmGcd+dIL1vo6ZHA0KhpxseTRNsEk27RGqLya8o9F
-8ZN75+N9Vx+cM3YAbseBmCrAK9g4TZ1GdYjjYIbMgHIrxarXW+E9eb3bzGrCFd2B
-egPn6CPYZ6MaXtoufsvG
-=MRHP
+iQIcBAEBCAAGBQJTWVV8AAoJEHy/RO9cNQiDZcgQAJdDUMufTtZbA3o3H6Yoxn4E
+B6Wl6Ic+a0v6G+vZNUluwAb/nO+AeFsphrJQSDM3vniH2alZW3sGazRnElXY115h
+g5KrEiIhnKwPQaP3rgDYXAdLibQxxxX9lYTbQu56CPy8HT9EtrbesERmjjnSBjhM
+nMD/prXCJaUAmfv48fBJJv6sRejUgMOAwTP+BNAow5GFj3fhwecArNt3ZPqVxYBt
+qLgbo6ILgtQIxEuBmLoyFcmmeSQUgrkJ+YK9nmxDYSR3f90iUXClFUFxZLy49p4V
+dEB27t0d94+g+I3eFT9rMoNliDWMCqrVDoFMqMTJ7euDD3m5Ix+g6fLfk7g/w3ZJ
+e6r5Iu4CmT8ea1H+9TiwVcsZOwKrR7h50G0Ch2xQleCZVO2MKawUL3SSQ/0Xf7ye
+FqI/B58O4kblkO6fx58vNZOHRoVa229v1eS9UaJPpQkH4pf/a8a0NWBY4weTp3U+
+uaP6mjgj6skzHZQQSNXYMMfxHyAav9e2CQs3H+Jup3MsiDorFPcyxhZhVD9evAhf
+95MgLCTxc0rdMWpk8B1Hf8Tz/ezb4MuEknO6PpsG8qo+CgzUDQ7AKbNmVKxRjZQw
+0ec1a+YT1CbKbVdzuHttNirzVMrj5zvv2sYcD1eyAULE9B3IAJrk34byW8PdVPsp
+x7sSZbbRJuTFXqtE1mqs
+=XDZ2
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.69.ebuild b/net-dns/dnsmasq/dnsmasq-2.70.ebuild
similarity index 96%
rename from net-dns/dnsmasq/dnsmasq-2.69.ebuild
rename to net-dns/dnsmasq/dnsmasq-2.70.ebuild
index 762b68308e12..5860c06c3f70 100644
--- a/net-dns/dnsmasq/dnsmasq-2.69.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.70.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.69.ebuild,v 1.1 2014/04/10 18:05:22 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.70.ebuild,v 1.1 2014/04/24 18:18:22 chutzpah Exp $
 
 EAPI=5
 
diff --git a/net-libs/czmq/ChangeLog b/net-libs/czmq/ChangeLog
index 7663ef3b47ef..27f470b0bb26 100644
--- a/net-libs/czmq/ChangeLog
+++ b/net-libs/czmq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/czmq
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/ChangeLog,v 1.10 2013/12/24 11:34:55 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/ChangeLog,v 1.11 2014/04/24 12:58:26 jlec Exp $
+
+*czmq-2.1.0 (24 Apr 2014)
+
+  24 Apr 2014; Justin Lecher <jlec@gentoo.org> -czmq-1.1.0.ebuild,
+  czmq-1.2.0.ebuild, czmq-1.2.0-r1.ebuild, czmq-1.4.1.ebuild,
+  czmq-2.0.3.ebuild, +czmq-2.1.0.ebuild:
+  Version Bump, #508286
 
   24 Dec 2013; Justin Lecher <jlec@gentoo.org> czmq-2.0.3.ebuild:
   Bump to autotools-utils.eclass
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index 1d180e57da23..a2c8705f460d 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -1,31 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST czmq-1.1.0.tar.gz 385620 SHA256 3d8650721d5b24d0ccf9706893566d1b4c2d30765c5a93b9176c052d4d022d8e SHA512 dfad91c2c9cc3f59ba46912b9c7acca0b69a2a0ca104542f833157545d7d14c0a88cd0c0c7afbfd42d6dae03d5e4b30ddbbe9efc1a56aacab5268e0d3ae4a171 WHIRLPOOL a56716bc9bcec1422b29f728055783028819c339468fc44ac4a873164ef58a38da97860a3d263408aebaabc84e47c4eb37a47d54be38932cbdfe7f32800d0672
 DIST czmq-1.2.0.tar.gz 418301 SHA256 fe1d92f13ad0ca0d40a540c2b776f158b13782dcf2d2348dd7e3d33337193039 SHA512 c1d6fef16af3ad53498076a0dfce30d6092e14ff362238e4d91653c3575b618ff8f9a046c70736c763f3b2c1ba9abf0eb6b036d7656d99eaedcd586265eba762 WHIRLPOOL fd4a126e72b80f2612fd5a46d811ff31bc727f4b2044582ab426e857667db9531ac5c7e650ff3dc61101940a986021ccdb6d956e4d00c9f601582002a2005587
 DIST czmq-1.4.1.tar.gz 440955 SHA256 7b2074a3b753459a6fdb88d9cc52b725142783793bdbce35d0bfa52fad64425c SHA512 01614da6e3f98b1b123aab828e7b8a4eb3ad75d3308d67d30400871071a70a67d2cd29bcb51023da564f0849aa5fab12de126480205aec673961a82b3c4872a4 WHIRLPOOL a6d3862fe999e8ca1fabadb29cf115b592f031370494935c1f9e547600eb34a61f7011966f2c838ff918d43b4da8508d91e3dca04faaa17a987199636f795487
 DIST czmq-2.0.3.tar.gz 533845 SHA256 adaac33f03d58c3a2ab48be9095df3c4bc876d331c115965b5c48830fa7cd84c SHA512 5ac01dfbb2b0907729d42a807a267812ca1ab22104fc22f440d71264ecae75489d5c9385019da1e77c280735528e3cea677ff27fb823d9debcb26223eb8cf987 WHIRLPOOL 01889dc537f2931111d155641b2c52d2367e6638e1f92f3ca868ed32885d53d820945b8c957a5efa3e561a39a2c8206664d7fbdd1cfdcf176ed0af6713009531
-EBUILD czmq-1.1.0.ebuild 957 SHA256 71016ac1a4751832b914e232b43063c9fcfe59e48c25ecebf067bc275f39666d SHA512 0c425fe85ad346782b774da93bfd4be04c57243dc5e165e6e53864b7c832ae9326b2277719c00f85a70a10b16585b932714a7e4776ebba2b5c1eb02e5e7f4b2a WHIRLPOOL b6aa0d8fade239205869ee15fac78794e62bb7f3f479c6a229ce5b9ab57840ab4ff3f3b4ba3becb32b57d172eb277afcd2ea9bc7d50af573f09273c4db5c96d8
-EBUILD czmq-1.2.0-r1.ebuild 978 SHA256 8186925e7839cb83d2b8d15b34269fffe0bf0dbb23448ac32a84b074457fbd9a SHA512 8f23e9140fea43b71daab04eeed6920a2f81209995f6c5678e2d6332652fd9fff30a7f00dfb004c412bacadc02ac598ffd73ae9eacec91b057cf15e525657ef5 WHIRLPOOL eb089aa085ffaa918ae0998c79d8c576d9f99782735ab81d36b917839125409e284c0620906e0222f36fc7eec2a7cb56596934ce0f948339962ccbc7ff05c5bb
-EBUILD czmq-1.2.0.ebuild 955 SHA256 8714a8fe94af9f9cbf9d61411e3d51e93ed8cc66266d20dbe2685eac406a137a SHA512 34a50dfebb836df39cca109d86d6d3438e6d131bc3b89025954478a116ac2e5c06b5896d3db3fdca85526db16af887b591bb78f54a1406bed2ae1eaefc77f23b WHIRLPOOL 7efbcf17c487656b7e4eccd4d6d2f7bb93209f1ff117bdf653d02b90c5304c1016e6a808bcbbc95ae82eb7c4678036f9760c2ab55c8e033f5a86a118f6a63794
-EBUILD czmq-1.4.1.ebuild 955 SHA256 da5088ba6079a9652d645cde2f3c45a381d3ec0254f8ad124c6d14e4cad1d820 SHA512 db75188314ef8cf243cbe57cacd71f816a669e7aa18127fbce9298fca18067fdcd572e72574bcc15a7bb45da3d5ff73c4d337c255bc6d9d71c8b964e4df455c8 WHIRLPOOL 9f394c53da77ee5f75649ba94196a5e803d94036dfeb48f25977b1b37533688c600cb75761317622b1b60bb8018e880f9d056ce19573142529c21a06ca53431b
-EBUILD czmq-2.0.3.ebuild 787 SHA256 fd3aaae8698ce00675f98b78b37a8cbfd734d85a220595b76adcab46ded44b77 SHA512 5a1581d8e16e6c706a3da7c91811954c5ee84a305e95ee15ce22465808c5058ff968de61b13e4530c4d1c24ad829cef779db1344238bc330ccfff26d6ffebf8c WHIRLPOOL ce4df1a171ec511d27273c10575d71235a0ab407397902fae1afbf25a2f799e5f2f920485831fdabcf980a1e17c791ae2ef497172d62f021a4a5acc7274b126c
-MISC ChangeLog 1480 SHA256 44bb6ad36683e2061518f04a7bffa0b5975c59cff3f5f7fa0b371946807fd7a9 SHA512 d4f0d8b3cd3e19066af42cb629fab97ebe9a3fee6b3377774502fd9caa1f78781bff3511b5ae3f8081c8bd4bea2730760b910a7ebe1d3a6ce83f9f011552d1cb WHIRLPOOL 210238c6f03a66f123e694c983332e9a270405345019100f9b1065fa08b9ebf2082efb486c68092f418255a5d4f7009a65b08183510533c23482ff515d8064b4
+DIST czmq-2.1.0.tar.gz 585871 SHA256 d6f30b4b5def57496e7ca665ff306090f7c23c32eb0f3b41188a742933361ea5 SHA512 dfe83b9924f3c199550f2d077982055ead4727ce714ec91c75f2f6547f12adf5e2a7940bf7d31f49f8beec4b220a6336dec0131bab5f9e2c8ff0f5f112a05d17 WHIRLPOOL 74575591eeb80cdd7d2b4cc994469e69a412a1d973c5abbee29720f721232a27db4b206a362808ad4a5d12d7d517403e74199c78eb319103720ea8ca379b22c7
+EBUILD czmq-1.2.0-r1.ebuild 968 SHA256 e6a70321f03d800cdd2c6e452cd9b5202fd88c771cadb4367fd596f0d4d2a572 SHA512 f73a78268289e249afea42fcad547e2c169edc346caa33b9e7873f1d615c4bde97438ac9aa3ff19e23fb8a6021f29cbe06d9087f2b43791362a98da13f06766a WHIRLPOOL c246cb7000e0deb5b08c1a5a642f627bf061a0a51276120a9a1fd8ff1ced30e057d45176a707346a72f7cd864345bbd88a766f65cf82981509175e3eeb1a69e3
+EBUILD czmq-1.2.0.ebuild 953 SHA256 671f747fd8c9ce742cca3ac80de7766a35762e6733fca318e80a0b9189df542f SHA512 12a5381ab58ae4d1b2192e5ca6b827be1bf9ee23c8c7e2ec6e2c3d96fdc10f09a84a518b5112e0abbe8182d802007879f08a7f536b9217d5fa6b9ccfc6acc8e1 WHIRLPOOL b31250a6ed79ed722de724cede83aef9784f623c1e3d7f0321adc33e1321d0f09c7f07b20367f739921e3bda77118f9ff1dd05805370a066f85318826828bad4
+EBUILD czmq-1.4.1.ebuild 945 SHA256 20d81116887f12baae54f871782b5f224ab1d7008cd962b2ee37d4c84ce7bfaf SHA512 a51972491a3dd02707a4ba120498839d6caa2edeecc05a94ed83d72be80bf292c7a137def416fe0a67002737a13dd4b6e591cf0437514b749ee8928b5fee8cc5 WHIRLPOOL 44ecc8f6f3fd49e13fb73e3415a3ab045389580a8082683b738893dc05f10f377d344dceebe2f44bd5538bf09ce1c87692195a67dfbf5b577b3e43814382025b
+EBUILD czmq-2.0.3.ebuild 781 SHA256 a42418f66070a2af65c9dc481b58354e138d154221ecce1e920e56af307ed7e9 SHA512 693bb299170432752aa2519dd99028fceb3b1c491845fecc61f6bbaa6888abb1a336bf93e013c4755bec858b87f98b421133043a7c08d8a48cc02be975dca981 WHIRLPOOL f88aafdd5a44833581a6c4e12b65c6e792a7bf07b9dc97c07b15d12445d02d7d8f69c16f7b32363bdd45938907b57d04ef8bd2fc673e15a6df825b928b547ce5
+EBUILD czmq-2.1.0.ebuild 796 SHA256 331f3afae5d73d96b75b7f1e6dfbcc0b8ab2ee2fdb958a7905e18da97b5c6105 SHA512 12eb13669f6f8dba63c4f489ce3cbf5c1e55192460df8aeaf2d629ede05b31821fbda7e9f2e87de1714c4dd164f05a9cd4f6265018c75963e31fdf75a51e2058 WHIRLPOOL 9587adfafd1c907815a188dd28ae0dd4e7a9578a0005bf86568d8d1eefb2261ebb5baa30fd7a5226632d9f53cc41fe819f7dc74929c2d66c9664de96ce4a60ea
+MISC ChangeLog 1702 SHA256 8a8ef14281e84a27da12e3574c023d5e179914e10c117fedb0116f08962b1958 SHA512 9a21bbf09f962ea661bc2a08c008e4cbab2de3aa9c8ff169bc6169a31b30803836c2eba43653203d1f014d913842f21f34ab68af70cbecba59bcaf8c39efb77d WHIRLPOOL 831f2aca77bbdf779e1a646c55c8d9d59ac17845828ca04f641bcfa4a85ff0090b29dfad818f70c186eb14a23bca38ebfa599fda0d829a2704b249fc8297eeb0
 MISC metadata.xml 236 SHA256 feedd499ae6ddebc364ebb0f38d08bfbcc6b5d499f805a307a9367fb82dd12e8 SHA512 02882c2ecdf4fe400bf3e4455df1feae173e12b6fbb09181ea50541bb9dbf43780a0ab00fa799ccf5b7f2c27dcf9d854e16146cfb336ff3270a7b4369e451860 WHIRLPOOL b6580a9428931142ea961e985e6b5c736ab716eefb85706692c780c11f97d6019be488493c2e2a51b7ae8b480be80276edddb2858fe19684d48df64433475e06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSuXFgAAoJELnU8jG9FVircJ4P/2K/zsPnGDPMGzAdHvIz3iy4
-CEA0+tnVZ42LugfY6sPSOYT8yCjjY3QoDXEsTKKhm0EhMq9krSoitW4bf/lOVJyu
-ArWG0/5mMl9CjjCC/o/Y3OM4eVn0ABjp8L3vMoJCIKUmYUzCILFbyNemjxTYJTvS
-ki0V/LjV0AfbdHsahPfjJ23nA4/dvKVRySe61ZRAo6FGGxtugfgaFzHg/SzjUTA2
-Nu3jKmBKqMqSl/kpl+oW0TVxL9DDzObUXnid2iLkfhUGPoi4KdodWYQ9Nnw9SiVW
-Fz9ixmwbLycSBZcEElmChJOGIj0+VZfIswwVrPMBWPoEKj6DdcPF6epNJpxME3DJ
-aLbeJQ8IPfgEOES2BEUX/dEv3OVBsxKWIFm5tW+CZAg/h6+JiMOPrxocsVS8aBWU
-CKfOZy8jmNtSh/V+oFEMP3Bumm0AfnXQXDJ/bzSxQ2icmfaPGsYlQIUZhWHWVQvr
-CzVcx7V4Si6fdvSC77R2rrXVFwqJhjjVdMi2BDuNkyeTpj1MjL5gu/Z4kf++x6Pf
-OG8pnQFjxNufHFPiG9s6XWAn1gfONoY2qLbz2ea7RoXG5jObgpp0mHGgWo6y2NFl
-DDWnXGLvAbXgwEZGPPHAc1ms6ULs0K8558yTVAuDSNdce31DR+9aCaU6NavnMaNl
-RTiTyc/u9Saa1t34NLl4
-=+VjR
+iQJ8BAEBCgBmBQJTWQqCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirZv0P/0ORhN44/2ggwf5JOfyHn7kP
+Wjm2sEmJJe0chtU78ip3N5/fe5jH75OYP1wtIaEIOjhxwAxiBhUlKRYf2LUhMlWK
+zMqIbXhq9w9A/4pcCQ62Cp75edk3W0vvrAb4gL5A+/SD7/cg8faC8brypvgwXcZu
+k655ulBo955Xg3EIzW2pRaf2oLYjxMq9yUB1KHFVYwyKXT7wiw2pDCSQFisijFLT
+YBKeUKfuiJnZ7TTeUpZztszqvLzVqlsc0o8+0z07ueJIbhBnf0/vl2p1rOhZOHSY
+3KnG81e52+2X0M+ml5XZUeux8l7HK8Z0V7TJFdcO1CdT6BF2X7dc4OmZw3haZzeq
+z+9gK8Q8QmFPcrUET2y4vyV4DLdfj0WNG9RRqMMPQkP7QgLGHD2lMhQmbJ2a0D5b
+nJPP7gtr9rhgLI5i9StyAD5hIQ67vvXVt9ZwQWQfc6WBiOvjtLO9lM6FwKi5vN8B
+mcvOr7ep+ztrrwSL8BoiahTNg9vAvRuVaDAAlokiRrT8DpuBHHw5uSniLf1gErV+
+mY+zmlYjvs4iPnUfTaDKeWhWQgkaKKBZzUSZ8hvTYoKa21PBY3abQ43e9moOwC7G
+xZj11MkeKiPnZr9vhdg6YHKvDHCZYQw5xz2VWQl6vJcKg4Uaf9BfM+GQxZTMuwVa
+K4tsfR+XHnDz85GNrowG
+=Io6L
 -----END PGP SIGNATURE-----
diff --git a/net-libs/czmq/czmq-1.1.0.ebuild b/net-libs/czmq/czmq-1.1.0.ebuild
deleted file mode 100644
index 2a4eeb58c763..000000000000
--- a/net-libs/czmq/czmq-1.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-1.1.0.ebuild,v 1.3 2013/12/24 10:50:09 ultrabug Exp $
-
-DESCRIPTION="CZMQ - High-level C Binding for ZeroMQ"
-HOMEPAGE="http://czmq.zeromq.org"
-SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="doc? (
-			app-text/asciidoc
-			app-text/xmlto
-		)
-		>=net-libs/zeromq-2.1
-		<net-libs/zeromq-4"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README AUTHORS ChangeLog || die "dodoc failed"
-	doman doc/*.[1-9] || die "doman failed"
-
-	# remove useless .la files
-	find "${D}" -name '*.la' -delete
-
-	# remove useless .a (only for non static compilation)
-	use static-libs || find "${D}" -name '*.a' -delete
-}
diff --git a/net-libs/czmq/czmq-1.2.0-r1.ebuild b/net-libs/czmq/czmq-1.2.0-r1.ebuild
index eda92856aee0..e036d08737d7 100644
--- a/net-libs/czmq/czmq-1.2.0-r1.ebuild
+++ b/net-libs/czmq/czmq-1.2.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-1.2.0-r1.ebuild,v 1.3 2013/12/24 10:50:09 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-1.2.0-r1.ebuild,v 1.4 2014/04/24 12:58:26 jlec Exp $
 
 EAPI=5
 inherit autotools
 
-DESCRIPTION="CZMQ - High-level C Binding for ZeroMQ"
+DESCRIPTION=" High-level C Binding for ZeroMQ"
 HOMEPAGE="http://czmq.zeromq.org"
 SRC_URI="http://download.zeromq.org/${P}.tar.gz"
 
diff --git a/net-libs/czmq/czmq-1.2.0.ebuild b/net-libs/czmq/czmq-1.2.0.ebuild
index e474361973ba..38931119db31 100644
--- a/net-libs/czmq/czmq-1.2.0.ebuild
+++ b/net-libs/czmq/czmq-1.2.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-1.2.0.ebuild,v 1.5 2013/12/24 10:50:09 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-1.2.0.ebuild,v 1.6 2014/04/24 12:58:26 jlec Exp $
 
-DESCRIPTION="CZMQ - High-level C Binding for ZeroMQ"
+EAPI=2
+
+DESCRIPTION=" High-level C Binding for ZeroMQ"
 HOMEPAGE="http://czmq.zeromq.org"
 SRC_URI="http://download.zeromq.org/${P}.tar.gz"
 
diff --git a/net-libs/czmq/czmq-1.4.1.ebuild b/net-libs/czmq/czmq-1.4.1.ebuild
index 574498437b0b..56c9be110f4d 100644
--- a/net-libs/czmq/czmq-1.4.1.ebuild
+++ b/net-libs/czmq/czmq-1.4.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-1.4.1.ebuild,v 1.1 2013/12/24 10:50:09 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-1.4.1.ebuild,v 1.2 2014/04/24 12:58:26 jlec Exp $
 
 EAPI=5
 inherit autotools
 
-DESCRIPTION="CZMQ - High-level C Binding for ZeroMQ"
+DESCRIPTION=" High-level C Binding for ZeroMQ"
 HOMEPAGE="http://czmq.zeromq.org"
 SRC_URI="http://download.zeromq.org/${P}.tar.gz"
 
diff --git a/net-libs/czmq/czmq-2.0.3.ebuild b/net-libs/czmq/czmq-2.0.3.ebuild
index 75e06ed6702e..d0360ef76834 100644
--- a/net-libs/czmq/czmq-2.0.3.ebuild
+++ b/net-libs/czmq/czmq-2.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-2.0.3.ebuild,v 1.2 2013/12/24 11:34:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-2.0.3.ebuild,v 1.3 2014/04/24 12:58:26 jlec Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ AUTOTOOLS_AUTORECONF=true
 
 inherit autotools-utils
 
-DESCRIPTION="CZMQ - High-level C Binding for ZeroMQ"
+DESCRIPTION=" High-level C Binding for ZeroMQ"
 HOMEPAGE="http://czmq.zeromq.org"
 SRC_URI="http://download.zeromq.org/${P}.tar.gz"
 
diff --git a/net-libs/czmq/czmq-2.1.0.ebuild b/net-libs/czmq/czmq-2.1.0.ebuild
new file mode 100644
index 000000000000..9098df119d38
--- /dev/null
+++ b/net-libs/czmq/czmq-2.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-2.1.0.ebuild,v 1.1 2014/04/24 12:58:26 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION=" High-level C Binding for ZeroMQ"
+HOMEPAGE="http://czmq.zeromq.org"
+SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	sys-apps/util-linux
+	>=net-libs/zeromq-2.1
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)"
+
+DOCS=( NEWS AUTHORS )
+
+src_prepare() {
+	sed -i -e 's|-Werror||g' configure.ac || die
+	autotools-utils_src_prepare
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	doman doc/*.[1-9]
+}
diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index c04edc92fe23..4e303838ff68 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.206 2014/04/23 23:04:08 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.207 2014/04/24 14:01:10 mrueg Exp $
+
+*courier-imap-4.15-r1 (24 Apr 2014)
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> +courier-imap-4.15-r1.ebuild,
+  +files/courier-authdaemond-r1.service, +files/courier-imapd-r1.service,
+  +files/courier-imapd-ssl-r1.service, -courier-imap-4.15.ebuild:
+  Fix systemd service files. Patch by Salah Coronya. See bug #495068. Cleanup
+  old.
 
 *courier-imap-4.15 (23 Apr 2014)
 
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index abe81055de93..5d7b76764059 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,3 +1,4 @@
+AUX courier-authdaemond-r1.service 373 SHA256 c5b647b2f72f8f3097a093d929d021b2ec758e5f8183c7990dfb56af2eed9f8e SHA512 5ef9b65c24700f93a31626d2a657e19165853151e5c33eb96b0d41b818b4669a2785dfb868054231df20acfdfc4218a0bbc7e21260e337a3075c54f97ba9c46b WHIRLPOOL edc6e642105862d7cc3a2b10ae28ea08a9d17a30d99c7620615da74fe2f587a4fae827d656cba0ae0395126dfd72d171172b4ada611e1b0cb8669e02b45bb4f8
 AUX courier-authdaemond.service 376 SHA256 a275d29b61029b92e7ce76c1d16f9ec943a6cd0e2199821811253fabb6801370 SHA512 534f64625c21d65b22d3887c649df94615daaa80cc49800877c93990a1974998099d94585b49a2b5b7f637c106cc72b9caec1b79c8a3f7e7e82be731e9ebb124 WHIRLPOOL b1b68a2d4c9d11ddc18b41e3e3be19dbb121d03997a82e67afa94855a62391aedaee60d70728d14d362296d3097241a2d7786db3c3471e08b17153d8df3c98b6
 AUX courier-imap-4.0.1-disable-fam-configure.in.patch 654 SHA256 775dab159b4e05141e4d8fdfa5df75967dda8a8f60e4e962208f724a497d3f54 SHA512 193e40c5ef0e87c00b09d689433d34ba1a007a246fdb85df646fe66732d1170ed1567aa0b994c86b78635e96f1dc855973ba3330b058deb2633a5a77f414c0c4 WHIRLPOOL cf88477da67885f03d427b192ca22ca5140f7724039f3ac4124a794c4461cf9a0ad161a57aa8004eca61e94b2a3224af0df7c4b8d6e6c167892071b2dc887360
 AUX courier-imap-4.0.6-aclocal-fix.patch 237 SHA256 2bc930268fd9c1565f2dfc341557de4a6e4f867131b279d52d47d285e5f62579 SHA512 b19701037db1777f7c3c94a8da89381dab143fb2608f0bf0e8195dde118715db9586e5dc5fb9ec17910b132dfed1f63c22f6df22a4cffa66daf45a1e72b04ca3 WHIRLPOOL e34fdf1f9f514caaa1cca8bfd59d11ea7071fb919c343566cb0b0f32f90feec4f5f73160b73ab2ad13816f369861278e943a703b86b0e1c2a2c309d508c96ab6
@@ -19,13 +20,15 @@ AUX courier-imap-4.15-db4-bdbobj_configure.ac.patch 1495 SHA256 fd2b75c0b0bd4aee
 AUX courier-imap-4.15-db4-configure.ac.patch 1460 SHA256 d5d5888ce3534740be0e307830bec325746758af80d6ccc8313173b8dceb8b0b SHA512 99897d152f44713adf746996b8d720af65cb8af46e1ade68f4f3336b59b7b8acfba2d2e35b1b818c440e847e8126e8cf683a17fa4e2bf593e42274da6e21ce15 WHIRLPOOL 2501509d58d128c66f63e391933a2ef77a76dd50def0a67a5471336ed6fa31837cd857a4bbd8d53a76e9970f6fcfb310867bdbe1cb98eff5315238dc91756dfb
 AUX courier-imap-4.15-disable-fam-configure.ac.patch 626 SHA256 53f8a4504580c50da590859eb1c2759ef6d8f8751d8243699a5192bde89dbbf7 SHA512 649de2e7137642702b78f4e37808479124b1e71b7a2d9299f450bcae969399f1efdbc8a6076783baf7a8437fd90dfa6cc3a41908eb46e628ca05901e71c43a08 WHIRLPOOL 5bf1af9cbab1e7d6d08266f1377de6ff3c9238aab9737c9cb233f7b1b16e4c71ba97e86a52e17a791f74bd1784c38d11612c8b5c067844cce361870508e10adf
 AUX courier-imap-gentoo.readme 2827 SHA256 fbfe0396d87bcfe2722df94b2c68ef1a1993edcf776c8572604aed0390e4061f SHA512 a677218ed39483dbe07358382f557a877486d5028b890ce25822663a6fff58a4744d245537a5395c7a403a566522753c91f9c0c511b9a7229ac1ea2ba4a9c54c WHIRLPOOL 57e7f12fd054f5c22a4ec37bc7ff661dd07d09c4b95fb55849d7115a154a067ac1ff286445b987f39f83f3889c4dc82daeaa1cb9f72919bdea3486c22bdeab9b
+AUX courier-imapd-r1.service 299 SHA256 7c4800926bad3283164f91ba39a0aedc3404643062f7f508b1ed9bea71d34044 SHA512 5b44983d067b447bc60bd5365340c7ffd0c7102eba93fd87dda6cafb95c8625efe5badfaa4607c13a21ce37a7e781f5b81a47b9b18666403263e3d8789310d44 WHIRLPOOL 38310850fd03c76f72116862c97a0e1add1b7008b95416a2c6a3b7127b8a377d6ff497dbe9a36c085040e531716c0ece931266b055c7d7087c3cf2d8ec962c86
+AUX courier-imapd-ssl-r1.service 310 SHA256 c4705212124c13f01dd386ed4342c2a9d3ea436735fb3d8d066121b687eadcc2 SHA512 431a1113cbc10aa4042c621fda43eabaed79b4e0fabbc4692073c92368448324f958d3ad922b99b4290efad8a8164aff3698ac69e4e3c1f457d1616f769c11e5 WHIRLPOOL d13024f93ca06a3b019d6a9804d7ad3024bcc1cf6bb782fc27b4b7563492140ea4d13882e14150ccb60b2f7fe4a7fc7a298467e6627387e934d48d5d75dcae1a
 AUX courier-imapd-ssl.service 277 SHA256 9c1e97c93137a83fc5381d5ba2ba557777a22a7993d977b4cb9a139256330877 SHA512 8aa16239d239af9e344256de351bcd25cce5c92ccdca481d16c9c97bdb4c576bd889bb6bcbea163d5b472d3792a120fc1141e43701db8c631087f90a99076988 WHIRLPOOL 6b410784ee8850afa53cc6472e6945541e01252c584d86c43525721a09833a1a4ed0f34b5bcab67e711e2d26a31874942ec7daf1f7cdc70419a2ea955c20a94c
 AUX courier-imapd.service 265 SHA256 48c43249df0b0a2ff18372fca67d36da290f73bc1f9b453365015554985ca38e SHA512 154101170d1c7f03d3c63693695037027dfc36b086fa47bed4631de478f4a33c839dadc354990be2d0ecde1c27868f0d456565ced3fff79eaddd61199388c23e WHIRLPOOL 9eb2a50e5ce26a27aeeb42c6d91e55aeba3f033f2689777dce8782bb6d21a777ef575351ce41b3c51a0cb6f1475a887254fa1a4646c56bdf5fab01619426135c
 AUX mkimapdcert 996 SHA256 1ebd9ae44e3ca5fb906f5f399abec7d6f117d231db5725be0a1c4e043eaec4f6 SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4 WHIRLPOOL de07fbe8ef656223a5fe43c5e8b6df909257e0c171978db30d0c43e3ef56a927dd26b11468545c89e431dceb34f75a44b290192d304c5e32eb29fe54aaf6d111
 AUX mkpop3dcert 996 SHA256 c241ccca359b5d126dc56fc73f21991d8a7bffb5c211d8b0a1e4e88e693eb7cb SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078 WHIRLPOOL 7b30ab63852376236717eb7cd230b453e2144f56641f506bd47b5fbea645fd7ac53c9147a9e3707a8b0233e74218f69c6b6d8c0f8ff764b3aa13a18d22d966b8
 DIST courier-imap-4.15.tar.bz2 3266353 SHA256 6c34107e7ba9e5396d50b58fb414a495806335cab7135c96ad85a3816785b109 SHA512 7829662282db5e6f414a1d34f06a94c2dd028e263510f01b49ebd3a1a4994055ecc08604568f5a44a30f6411e3a34e0d6c38807c29eaf255752191e885f82e1a WHIRLPOOL 1b5e42bd1f72e3205030b54e9564ce45c4eccb394b31c64a616f225def5a5df05f74ef62c59fbea63b18ce336d77cc2368170a982abb7a6e94d309d0c6ee4dd2
 DIST courier-imap-4.8.0.tar.bz2 3362734 SHA256 ec7511a4398920a04f3bb60cf1208e29a9a5432baeff4d356a4ec142113bfbf2 SHA512 71f5aa44f1ab06bb83f06cffac728fde796f3fc8c00a7acc80e157a9c072876aa0c189781325c39634d14c4bbf8e0ac0b14d05725c7331bda817ea28a85be5a7 WHIRLPOOL 7dadd694348699222a52658cdec971bde7a2a3a4f0385745c32243e234784200a4415840de1e643943f83aa85cc29eb56ae4c5097c6a60c36e65ee2a40aa87f6
-EBUILD courier-imap-4.15.ebuild 7362 SHA256 d99b911c4d5e6612eb170656af211c6a447c09b947cfac6abb1ec976a4fd8b14 SHA512 7c1751e818b7781c47e9ab287b976d44b0fcab04f6b116e4e22de41cfff5661aaf7699f0c821c0cf159f54533d97d0a3f11c3cbfac0d4c3bea8b9f5e5909487f WHIRLPOOL e5c9eb4d6a8eb6be20b3d7b0e9487fa440db48bdb6f45a3944987faf019e234104560ffe492c304f8f7269a92ccb095e9284b3eeacf4fce4f5cd4957c62cb6f0
+EBUILD courier-imap-4.15-r1.ebuild 7453 SHA256 7a48e3f0890a7423045dd3fa85fda0c82b3fba2ad95b894117349a67b50c574c SHA512 b5330a63319d058919a018fe78cabbf0f6f4332489e58ed175a5f471a432c8a96baa796b1ab1588f2039f6317b30e38e5892068a57e420dddc4e43d929cf35f7 WHIRLPOOL 4c10ecc85a74041ece4c95fbf614bf3403a6af819e9cf0eb83811c4e8b9fb6f30891c1d996e33d73e9a67d137687af7c9a5b5cb7d9de4b185393bffda12aa531
 EBUILD courier-imap-4.8.0-r1.ebuild 7376 SHA256 ead07c4b93dbe5268413e5ddcb02a2911d34b0cbdb12ed3c4f5b85d53a172cea SHA512 e7f2139875bb946f79fe2945cbffec9e054533494d9b2a0eea6f97c10dd31787b9f0d02f337d23c7e45152ba188180015c033f2b9cf665f6979ad2f3f6c2ded5 WHIRLPOOL 77f3c7f02c62c11877e0a5069374d89fdd260f90be5bf8f972e307831b7b00e870d3ccca81e9907164a709baf859ab4e43e897a4083c6bc31b81ccb4da45d0e5
-MISC ChangeLog 40786 SHA256 d86d177a5b295b0ac303a6918dc485b43ca7a3bad16b3677d71bc50d0f997eeb SHA512 ab6ed7ffc58a16d8b22e039518b40c20bec729cee2efd530828f683066041c54cee885922c0bee7dcbe328fb62438c3554a28fec3184a95fcd0b2ceb35c7eb9c WHIRLPOOL da47fb83e816ee94e50f698ba526b496ff19c2a90364b7564b92ee359ea3c9f4034d3e2da1b88f6a4f76b0f4d6877a9f59cd827eae2952c882c0a7c16e36103d
+MISC ChangeLog 41127 SHA256 2f94941ecf04cf661d4dee70714d961b9131db56f5551e87debba6b2244dd677 SHA512 267efcfc998402521a1dc5dcb2de3c339eb4d7ec8315b46756f3d4228448c080a780b6d5a5078fab39986d2c0a5e49c2b0cf6b41c5b0118f4303b1c87c527f9b WHIRLPOOL 453623495b82f8f323c224bc77524f52ad9cbd2b880a1d512b5b75c6a8fdcdf08ab3ecf82b5312ffd25c18e363b4f6c786d7d8f2f555393c069c30e1b02e72ea
 MISC metadata.xml 590 SHA256 1a544bb17adaad2968157550ae691e85a19e00494afe3fc8902539efedff6a38 SHA512 a6d8d2f7397a091c3ba837f82c27768b89fc64b43496e7893f4133f463f5fd993a887b5be010a4e284f927e85bfebb3c6cd9bb3cdb3fbb32f500354342a22bd0 WHIRLPOOL bcef7db2d25ac4d9828ec96087edca56c42772376ef97dd8461f909d55a5a7c093d2152c71e862ecf38feef596e20c3f28727cdd6753bb5c1273954f0ddd6881
diff --git a/net-mail/courier-imap/courier-imap-4.15.ebuild b/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
similarity index 95%
rename from net-mail/courier-imap/courier-imap-4.15.ebuild
rename to net-mail/courier-imap/courier-imap-4.15-r1.ebuild
index 096808fd29ab..bd1d83be2c9d 100644
--- a/net-mail/courier-imap/courier-imap-4.15.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.15.ebuild,v 1.1 2014/04/23 23:04:08 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.15-r1.ebuild,v 1.1 2014/04/24 14:01:10 mrueg Exp $
 
 EAPI=5
 inherit autotools eutils multilib libtool systemd
@@ -184,9 +184,9 @@ src_install() {
 		doinitd "${initd}"
 	done
 
-	systemd_dounit "${FILESDIR}"/courier-authdaemond.service
-	systemd_dounit "${FILESDIR}"/courier-imapd-ssl.service
-	systemd_dounit "${FILESDIR}"/courier-imapd.service
+	systemd_newunit "${FILESDIR}"/courier-authdaemond-r1.service courier-authdaemond.service
+	systemd_newunit "${FILESDIR}"/courier-imapd-ssl-r1.service courier-imapd-ssl.service
+	systemd_newunit "${FILESDIR}"/courier-imapd-r1.service courier-imapd.service
 
 	exeinto /usr/$(get_libdir)/${PN}
 	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
diff --git a/net-mail/courier-imap/files/courier-authdaemond-r1.service b/net-mail/courier-imap/files/courier-authdaemond-r1.service
new file mode 100644
index 000000000000..239821647c26
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-authdaemond-r1.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Courier Authentification Daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -start /usr/lib/courier/courier-authlib/authdaemond
+ExecStop=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -stop /usr/lib/courier/courier-authlib/authdaemond
+PIDFile=/var/run/authdaemon.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-mail/courier-imap/files/courier-imapd-r1.service b/net-mail/courier-imap/files/courier-imapd-r1.service
new file mode 100644
index 000000000000..9510b31041d8
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imapd-r1.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Courier IMAP Daemon
+After=network.target
+Wants=courier-authdaemond.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/courier-imap/imapd
+ExecStart=/usr/lib/courier-imap/gentoo-imapd.rc
+ExecStop=/bin/kill $MAINPID
+PIDFile=/var/run/imapd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-mail/courier-imap/files/courier-imapd-ssl-r1.service b/net-mail/courier-imap/files/courier-imapd-ssl-r1.service
new file mode 100644
index 000000000000..79ae0dc93cae
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imapd-ssl-r1.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Courier IMAP Daemon
+After=network.target
+Wants=courier-authdemond.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/courier-imap/imapd-ssl
+ExecStart=/usr/lib/courier-imap/gentoo-imapd-ssl.rc
+ExecStop=/bin/kill $MAINPID
+PIDFile=/var/run/imapd-ssl.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 2338d820b931..a1071e2c1595 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.519 2014/03/23 09:55:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.520 2014/04/24 17:02:01 polynomial-c Exp $
+
+  24 Apr 2014; Lars Wendler <polynomial-c@gentoo.org>
+  -files/openssh-5.2p1-ldap-stdargs.diff, -files/openssh-5.4_p1-openssl.patch,
+  -files/openssh-5.6_p1-hpn-progressmeter.patch,
+  -files/openssh-5.8_p1-x509-hpn-glue.patch,
+  -files/openssh-5.9_p1-drop-openssl-check.patch,
+  -files/openssh-5.9_p1-x509-glue.patch,
+  -files/openssh-6.0_p1-fix-freebsd-compilation.patch,
+  -files/openssh-6.0_p1-hpn-progressmeter.patch,
+  -files/openssh-6.0_p1-test.patch, -files/openssh-6.0_p1-x509-glue.patch,
+  -files/openssh-6.0_p1-x509-hpn-glue.patch,
+  -files/openssh-6.1_p1-x509-glue.patch,
+  -files/openssh-6.1_p1-x509-hpn-glue.patch,
+  -files/openssh-6.2_p2-x509-glue.patch,
+  -files/openssh-6.2_p2-x509-hpn-glue.patch,
+  -files/openssh-6.2_p2-x509-hpn14v1-glue.patch,
+  -files/openssh-6.3_p1-aes-gcm.patch, -files/openssh-6.4_p1-x509-glue.patch,
+  -files/sshd.pam, -files/sshd.rc6, -files/sshd.rc6.1, -files/sshd.rc6.2,
+  -files/sshd.rc6.3:
+  Removed old files from FILESDIR.
 
   23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> -openssh-5.9_p1-r4.ebuild,
   -openssh-6.0_p1-r1.ebuild, -openssh-6.1_p1-r1.ebuild,
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index a777fcc65ccc..45183ac42afe 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -2,38 +2,15 @@
 Hash: SHA256
 
 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7 SHA512 4d00a9ed79f66b92502c3e5ee580523f63d7b3643fe1bd330ff97994acce527d4d285d38199cef66eddc0ef68afabf7b268abc60cba871bac5d2e99045d4ac11 WHIRLPOOL 2f118fd2f016c529dbc31e8f2b6b418931e6770ab02c28b7feeaba93e84e7fcd1c742f4420a43a9fec0bdfaa4d4bc7cf14fb860c0a56c68a30e7b136fb60bcdb
-AUX openssh-5.2p1-ldap-stdargs.diff 252 SHA256 97281375efa33e9ce70a55bfa95b6b426208175e7e3ff493012bc25d9b012f45 SHA512 2577b1476211f563bf8a7e62c2341e35cff7208a04b7a3fb1d331721e58f395cdef1ce2ac735b95c31781e06e16ec27c6692df09928393248c971837a1e03079 WHIRLPOOL df65dd54dd12be39fb4b830536f86aef97c086b227de1d87d56788bf8bce39a345da0ed814dd53abdaa5d158c99f0b87cb8510812d10c353a3b8a82493b210af
-AUX openssh-5.4_p1-openssl.patch 255 SHA256 f83627039491e9969f1ed5d77fe816465ce75809e8c2f2bfb07012bc21384347 SHA512 8cfd757dbe79ee502c10c5d518730f4e790bd61753120bb168d545dfc702a7a55c274fd9c81d2798ec78cba30f173aaf0bee1f15bb23f9f465c3524a5c81ca2d WHIRLPOOL 852f3e9dc6cd05934b52effa03961a0d989734a28649eb199e1f260d4e8129dffed378d8efdbd40a5f520362fe8fa404a744724135caa39f48e876849cf2350b
-AUX openssh-5.6_p1-hpn-progressmeter.patch 334 SHA256 eaa98f954934364a1994111f5a422d0730b6e224822cef03efe6d6fc0c7f056f SHA512 46eb5253549ddca045e67841daa092a8a33a6ae4411e75c301589f0a88159c6d2ccfe45c2f0502314465b93ac6f1965264a9b92b13e0e88d4ff15ced5f4ebfeb WHIRLPOOL 72b05e4243e746fc315468ac1dc8988b92919dbd147470855b8753e0ae37ad3696de6c9ec29346596aee2d60acbbcce79cea5735b9a91b3452a4b4f3f69d3012
-AUX openssh-5.8_p1-x509-hpn-glue.patch 1907 SHA256 7ab452c02b141645b764d404aa3de0754ab240a64601a6bb587919673f957682 SHA512 317c04fab93aaf82685e54335c876b2399623ef69428297c2e5934d45f69f0e78a89c79ad7bb186ef12a779ebf0f088ca142d6a426baeb32b166ceca8098572d WHIRLPOOL 34fdef826750070d112dc6c1bf84de11ebfa646fb5cbfb9f76d13dab925cff94996ed51cfdcba4e0b536915883bb4728756b79db157c019ba951ee1a32c18fe3
-AUX openssh-5.9_p1-drop-openssl-check.patch 848 SHA256 89b011e27548b9922deed63ed57a6c94ea8013bb3bfb4d6590ba43d284a2ab86 SHA512 bbcbb61b6fea194e7ee3862a5b462d48ce4cf4fec12cc8a8564fc5fc8f840dca2b4ddf301bf9d12bcbfd3922948023320ea660a8c194d57bf2b1e9d095fc8eb2 WHIRLPOOL dc8e140d2bfe59546b944236ebcc702cd4a19ed5c6ee24d590bb0d50221069666b3797cf1717e6090d12525b3310cd963537e4c2c413bb2692ec85dcb2d33b43
 AUX openssh-5.9_p1-sshd-gssapi-multihomed.patch 6622 SHA256 f5ae8419023d9e5f64c4273e43d60664d0079b5888ed999496038f295852e0ae SHA512 ffa45e97e585c8624792e039e7571b2bb5f38e4554de8bfc1d532f3348fa4a712ea1b6ca054e6a59ed1321a15cf1a9d3bdf3f399cec315346db89bae77abf57d WHIRLPOOL cc4871e3fb91a8075a13b5e49d7d3e0e83106bae0820ae3cf19d3427aad3d701b8f25b2cc2cc881a6315f8e5114fb82da9ca335acccb24afe221d66574fb7685
-AUX openssh-5.9_p1-x509-glue.patch 569 SHA256 579ef6409878cea36828057a82a37232ba230af0acb58438f020c284f06a6510 SHA512 534697c03837c8a6084348245722b8730b2547d0e2adca274077fcac295e13e8f2d8ae4cd788fc1c58824fc7b591e731e02d43873fdbe5f20ca1a87fa3060886 WHIRLPOOL 9dd0de494ba2c4a2dc1577e48ae8a63d95c794981ce1aa8d8f0d7fe464e489763f9af042ebecb6428c70cce56ae0b5ca93904669403bd9cc0e61e34989b82462
-AUX openssh-6.0_p1-fix-freebsd-compilation.patch 546 SHA256 4cee4d0b68a847b7686309ddc92f86fc36254d6e864682225143a28fc91e6187 SHA512 f9b783f76212ded27181b0a5ab8b4efc999a9960a020de54f109dad01a3e49b126a9c59da2286e565717f9e68991d2275e0872d54406f2c56a37d4dd439d92e4 WHIRLPOOL d0307e8e2a464914c9f4b2c790d72ff94eddc776986f0a847e04abede59feb6339bd256fe3dc831b362cb8e7f4e3cdb763a5c3c834f1fd7c32e4325cfb91ce63
-AUX openssh-6.0_p1-hpn-progressmeter.patch 379 SHA256 fb38d9d16132fcc16fb2648bce21e2260fb5cadf0ae2e2a7849638aeb79d3dc7 SHA512 4885f49f38c8a3afdef2ba63f324601214810aef8bbac89c926edca9edc8998f49f5060f1070ee0278ef7cdcdd7329a9b9fa37d1466e32cd2dc81edcdee50f51 WHIRLPOOL f73843d69f9aacea93a965eafecd16a037dae996d879d4b755831413321e3ed1e3e3167eff716a4ae836698b4e51c740bbfcca48033cb1dd4353f8599296272e
-AUX openssh-6.0_p1-test.patch 780 SHA256 c5893911cec3eecf84dc13bddbefbe1e1053db11e65a909b5f28eacbdd88a29c SHA512 733ee29c64f2469678ca0a4056332d43179cfe73d7efdd0c3c4b24da75baa74b7661e5039bd6fdbb0a375ae5ad5b60353c715946bb59d477ea0c5efaf70b1697 WHIRLPOOL a98055e2634eea3421dc2117a19e0548dae9b4705f7681e45bd4f33e3782f2ec22097de7f7ed4507d1ba5ed983d10499b786347688fadb6e803d20ea86bd7a02
-AUX openssh-6.0_p1-x509-glue.patch 569 SHA256 8c9048a33036a93f56e254cfd53b18313682d466deadfdcd8937a46793617900 SHA512 ad0c0cc7745a80dcc59e671f98608c0bdadf276449352615e738fe7f2e740e0f68713320c48b88b3b4565fd7e1f1a5653a0965e247bec68011c4eff72a9ffece WHIRLPOOL dde2aa90d6a19aeae8b6ad9586a10ac6b9c0e7b9e30f3e1d511bf7b938a299c75cc5771c8bc22ce6b6582ca7ea4804e545c463546580eacbcd38fa664841add1
-AUX openssh-6.0_p1-x509-hpn-glue.patch 1774 SHA256 b2dcff21652eea92d2ff2640a568070a944e7bfb2bd3217c433e6383a64b0970 SHA512 82793502b8c943f0bd69019ea1cf1172f9579dc6a8f6c91f6aba9a9d743384d5ac84f7a49df07165e252b4ef4fc06b745463bdc58d06da2aca3c7acbb3dd8623 WHIRLPOOL ffd01827dbf8162359cf7a278020f2bfa7ed1ee1051774522623bcf448ffc8a3e28ecff2de5733b352beef5722a9dec2e9bb25fabc7edca615a774f65f756246
-AUX openssh-6.1_p1-x509-glue.patch 573 SHA256 e51aa53e9e0336606fc36af237d50338347b845ee56a66d01f86829c4b46feb6 SHA512 bac2971b6435433d6ac88fb127c178e678fe805f51260454d9d0b631ef52dbafc08343fb307a74a116691545a82f5369dc014e71a7c8c65ba41699b31e1dfb6f WHIRLPOOL dd514ce502f7c7968e8fa526b1b2f7d7945f2d5b5f1f013e54f7513a7c7bf6025dbdeabe566958018db8f7442c9611f7efd435501b4b965b0fe7594e24ee20fc
-AUX openssh-6.1_p1-x509-hpn-glue.patch 1491 SHA256 28c5000f7c8b23afc363d066cf96d39c00882274f227b7743b1e376df8b61a2e SHA512 0d6bab08cc400b81d936883bf39f5a461799874f6ea3dcf55c083372ed379bc0066b913646f7a0e32167079ba85409c272b258de179d55660739df4bbbf30e5b WHIRLPOOL dbfbf8eb0312ae119421e45efd8243b089ab2d3c2bc1f7b7cbd5b56f86844dfe42b27952e4ed88653679ec036f70b8edd3e00f17ae097241fbc88567bab38505
-AUX openssh-6.2_p2-x509-glue.patch 555 SHA256 e0aa2310ffd1c4e1bd6663d1e9420e42ce9fce0096ca263b63d6a8fe34de91c7 SHA512 002d67109b116abb465c06c0f6ca6e431654bfc924864ffe4563afe91fba723dc3c0c484032205cadd6da4dcbe6a79ad31c83d0d2018adb22d0940ba35f531d4 WHIRLPOOL 8484c826e7c9aad0bd6a2f1779fff798573786c5b264c4a98e1c88db5b8b107ca9b5f573d3f240b8ecfa7fdf2a87e41cd174263804d29007093ae246ce034237
-AUX openssh-6.2_p2-x509-hpn-glue.patch 1451 SHA256 4e61991619cef00a09951ceea68fdd5c3e9d947031d5dfef2e054d0254ef606c SHA512 37d15f3014c45804436b804489b8a7473189867c71e5d6cce8d666b1556cfd5b89ef8ed143b7d81ca5d61ff03e6485dd1a096e9571a49ac9ad2d3ca5a1963d20 WHIRLPOOL 8b79e621fc9dd28e40c8544235e5ca44eb98f5987bd8024e8ae25f99fbfe468c7995814bae7ca207cae83dbfd5cccfa37a19f07049e5555b65fd9cdf9f30bd8b
-AUX openssh-6.2_p2-x509-hpn14v1-glue.patch 2613 SHA256 83c8d03cfd0f81cd2f7018ec85659d14e0c50f2de1da490e45699d1328eee5f2 SHA512 2f69a97334d3af4488e1e1a3e3d8d03cda38260595ddce0eee6b01d3cb818b513f21955d83636f0d5a0cb295be4ef303a941186d8a818c75d6cd2f0a08429ab9 WHIRLPOOL 7465382738c859007018f362acf0a3f771e2aca5207f0f55c9e4ee053d303f08d7d29a79da286f9f19891c88e490eaba24a23027605922dba3b53b9d7034f5f5
-AUX openssh-6.3_p1-aes-gcm.patch 367 SHA256 11e57d0b1e0de81b3bef67a026fb6e278807d9922feee2844482387c22dd6ac3 SHA512 a6e5b4a25db7a5ffc790c66180489ed3fd0926a982a6a1d6b3284ba841b61351b26d5c636163a1b6f551467c363695e4cac884845eecb5734aba2a4ab9a43197 WHIRLPOOL cba8c9a40d85848b2ced73b040e85bc37e52af752589e536ff5eedcb7a983492b7be31ef55791f629ac25777d4fa2a41542c78d800f32475ab44d14d26d15b9d
 AUX openssh-6.3_p1-x509-glue.patch 555 SHA256 1166dba2fe590dfee70119ce6dd79f535d7146d0afb8d36bf7a28505ba93a273 SHA512 1a3c2467215dde959fecdd563069d605f29632a7ffc385039a6fc90b2317ca56d463d0abb91a8bb594d321f64456f75a973bb62625deebe92f8787439416b82d WHIRLPOOL f894d19843a3c018efbe3ed365c8abbee52b1d7a3afea11b292a085996fef8d3cc9889a0e6ae596d4db876ed96efcb73d1823a677eac6779f8793c2fb3677cda
 AUX openssh-6.3_p1-x509-hpn14v2-glue.patch 1451 SHA256 d7179b3c16edd065977aaf56a410e2b9b237206fb619474f312972b430b73c8d SHA512 02577e3f718ff994bb4e962189f17048b4c03104d0a1981683f3c6a1d6d30701db368e132102c8396da2c0f5eb2f6602b26f32f74d19382af34bd9a93fc508f3 WHIRLPOOL b7d224d71634f380bd31b3a1dd3e588a29582255f717a6a308738ad58b485b693d827a53704479995ec2ebca53c9dc9b2113d8de52a1336b67ce83943f946b77
-AUX openssh-6.4_p1-x509-glue.patch 1445 SHA256 cf18f17b12514692a4e33d5fb995f5ba1bc1ea258c80babb38516d8def7d0bc3 SHA512 e5c51fd639e95ca9c7820974684117861cc58cf5172c7c44deaaca106c1e91a931421720cb210652aef30ffa41bc96efe04dbedf996120b40143080fc6b2b47d WHIRLPOOL 7c7065a22cc6237a927e6d6c0f7b4bfa7b57e32ffd8b3d70ed9e70b9a882a95ce40478873374460a6173cc5a33c22ddfbbded783568049f1b4fccb5f5253d4bf
 AUX openssh-6.5_p1-hpn-cipher-align.patch 3024 SHA256 c79e3a201b2150e2fbc1e869233bac6acc27b2b126d4539cc09aa651fb2e60af SHA512 6efc2fa5f0e9b508e162bf20ab21d2c639888250387fa58ec0d812c7b1db125d8c654a0286a8ffc0d5530e5f0ec0ed723f3a5c0b7bd593b356aee2e811a1f4ec WHIRLPOOL 729c14b8d6f55d789ae2ea0e9cb2e0a4caba62dffced273de5c7254732e94673c1dc2d9e260d56e3a641e03ebab55d61c8ab7541fbf75957855b811def115677
 AUX openssh-6.6_p1-openssl-ignore-status.patch 741 SHA256 604b0a5365c1b01c9ab26bf1a60acfe43246e1e44e2f0e78d7ec1e47856599e4 SHA512 578afe9ddb836d16d90eb8b0cf10e9282d9c5c5e639962034490cec0aab1bf98cae9b46fe7850446d0cdd93e848d98ca7ed0bdf2bfec6aad418f4c962d4ea08d WHIRLPOOL d30c079eee59281aa87935ad948c59a4c01f858b88d701575d58737cfe555a5229a5f921bfebe34a69dcd15d2dc5efc062050d183ad5a90180aed4e5b3cdadf4
 AUX openssh-6.6_p1-x509-glue.patch 556 SHA256 b37b83b058ff9fb25742d202e0169afc204f135012624bb2811dcacfa9fb346b SHA512 e9535477fe4b0232d2a06edb9f73d8c50baa77ddcffd166624ea8352f298ad119622347c62c1d1e555318e9e6c7d981d2e9b03c388281b6347943861e8813aea WHIRLPOOL 4f01d975e598ce0fe2160e52dbd8251fd5cdf95880d1ef09b730457620f48038156d4bf21c0810978bfc65c9feb90cdfed97aa20018bc175759096dcd3a044d0
 AUX openssh-6.6_p1-x509-hpn14v4-glue-p2.patch 999 SHA256 748f7caa953028da111d6f18ba91652a4821bc9bca60f5d4a90a6501c0098853 SHA512 d1b3790fc164c803e81c803b9e19e0bc351d2b9f353edb1d3531139898b372731b46fab5974a084830b2bab889b06fa33ce23b7d941f7d61da073c1bbfc5ff51 WHIRLPOOL c1d674b8e1cdc48dd0d8b2e7c8bf8e68cec757578f1217555e37eda8723e83e93b2ce183462499ad2165723eca2350544f810a1d6ec95ce4537a527f7918f117
 AUX sshd.confd 396 SHA256 29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41 SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81 WHIRLPOOL 69f43e6192e009a4663d130f7e40ee8b13c6eb9cc7d960b5e0e22f5d477649c88806a9d219efef211f4346582c2bb51e40d230a8191e5953dbe08bfff976ae53
-AUX sshd.pam 294 SHA256 f01cc51c624b21a815fb6c0be35edc590e2e6f8a5ffbdcabc220a9630517972f SHA512 3268dc826978fbb205968744d83c6f1c838c9c73bf9c4ceee709c5b4168b4aaf06bcde47a32808571fa71cbc5a6bfdb98406995b2b28c9e633ce392a53932d64 WHIRLPOOL fff8966d66d75cd4d70607585b5de063f225a776b73b8b0f8146c5eed6c8ffd2ca38c46f86fa4e2ca8caafcde7797a3f0b177e60baa6fa0642064080883fa68a
 AUX sshd.pam_include.2 156 SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c WHIRLPOOL ba7a0a8c3bb39c5fda69de34b822a19696398e0a8789211ac1faae787ee34f9639eb35efe29c67f874b5f9fe674742503e570f441c005974f4a0c93468b8970b
-AUX sshd.rc6 2189 SHA256 627125378ccfdd81289531f527346980da249d35499cb71518f88f1452f4c098 SHA512 b2981a6dd9b83a21c718bb4dbfe88a0f1157bc764d1795291a381e380b40141719e5e5cf0cbd89845e81a7e9b0b4fdf938a55ff80ae4b5cac1969189aefa2b1d WHIRLPOOL 136497f366686ae25d78b11c17d4f9235d8980a8a147b380c00c281adaa91940f82a709b7da312736608e3b3ce3a2dbca465a2010f27e9562389de98be5885cf
-AUX sshd.rc6.1 2270 SHA256 153119116208d328c496d29b7cb9f85991df93020cc50c83b05ed498b10a2126 SHA512 80f0e460ad7ffd9a6fb279ce2d307cbda1f7352745ffaca381867f636ae64df336a03de0da15aca39619acdbebf41e2ccbd2bb233433f93625754965aaaab780 WHIRLPOOL 6b7a4519282fe99fc36cd0f89f6163ad9c8c9d998b15e84d3758af607627db48cf58ffee1bc4291ac0e7f75455f8f8873cd5d996f3c75f1ea3bef0b249abdffe
-AUX sshd.rc6.2 2069 SHA256 94b1fc0d608464fd4a6c7ed23f0b9c44aada3404982d8fd25b8bfe202baffaa6 SHA512 f75f95e6cf912b8c45f7ccf81e764805a56057368b18425abe699b29c3c66d32ea5b2d1c9f6fadf97487430e703e01dc2d965e41b8511f31a3e06d3bcbbc1006 WHIRLPOOL b9082ba3854e1842e057717b9a1571ba5ac6bf69c5facb391b7a3d890b13f879d7ae1484eafbbffc17746c3a8184f23e4c3fa831f678eabdea7d23e2c0d1bf63
-AUX sshd.rc6.3 2057 SHA256 43d95b495440ed6b3c1eb82b81712d7f6e58246527605c11d733cb5eb5523254 SHA512 3ddcdeae6c7f4755df1f8fe77d9d1af8c728f8cc18da0feaeccc4b8147f86b4db1ab1bf4ad362c31fac986270b21fe2c80e0414d64f70bfdac2370e22c2c9db2 WHIRLPOOL 57a18d85ab77abe64eddf852975481d974bd68b0b058d854a31158aed14b1706743ad563aa013c770aa124533fb5344bc64d0c06b564e1b53e28e1b0ebe463e8
 AUX sshd.rc6.4 2313 SHA256 97221a017d8ee9de996277c5a794d973a0b5e8180c29c97b3652bd1984a7b5d0 SHA512 88826bc9923299ac4c1502e7076483d6c197fd5a0e693bc2e1690f82bcd7d1bbd144aae2ffd92acb28d6fe912233aa93346e00c72917de65c22811ce9cd5bff7 WHIRLPOOL a77bad5891eb74770ae12e79131a99e5645a83841d14f1d60e39581a23b9d86e66b2e5fb7d0c989afac410eb5c6a627b83389d54085d1b78c89fc07852f8eb66
 AUX sshd.service 242 SHA256 1351c43fe8287f61255ace9fa20790f770d69296b4dd31b0c583983d4cc59843 SHA512 77f50c85a2c944995a39819916eb860cfdc1aff90986e93282e669a0de73c287ecb92d550fd118cfcc8ab538eab677e0d103b23cd959b7e8d9801bc37250c39c WHIRLPOOL 0f5c48d709274c526ceee4f26e35dcb00816ffa9d6661acc1e4e462acb38c3c6108b0e87783eff9da1b1868127c5550c57a5a0a9d7270b927ac4b92191876989
 AUX sshd.socket 136 SHA256 c055abcd10c5d372119cbc3708661ddffccdee7a1de1282559c54d03e2f109d9 SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42 WHIRLPOOL 102d87b708c31e5994e8005437c78b1aa756c6def4ee9ae2fa9be1438f328fc28c9152a4ff2528941be18f1311594490ecd98b66716ec74e970aa3725a98e2e5
@@ -43,22 +20,22 @@ DIST openssh-6.6p1-hpnssh14v4.diff.xz 20932 SHA256 16dcc68c399990ec0c801d421d022
 DIST openssh-6.6p1.tar.gz 1282502 SHA256 48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb SHA512 3d3566ed87649882702cad52db1adefebfb3ef788c9f77a493f99db7e9ca2e8edcde793dd426df7df0aed72a42a31c20a63ef51506111369d3a7c49e0bf6c82b WHIRLPOOL 8630c81481a813a92da9c302d22135fe519fcc4826a892080e5a15368d13a6b47947ef47d53aad0a34e6ea49ce4caccc8f06e8afc2c90db0402fbcc2184efe89
 DIST openssh-lpk-6.5p1-0.3.14.patch.gz 18217 SHA256 ad678f366dd7ef63ee164e29b59a4a4d264de9ddf9ad2c1d59178779e83539f3 SHA512 16f0053663ffc9a0670dbf8956dc070e6891e1e47cb1fbbea9567a6a4368c5500bf7e2ff7a2eb7208e651a0121088c271fb0a6ece62b98d103b3337866374610 WHIRLPOOL 34ee5a67e4cb0eb5d8126fde5469b73e0c81d4a7795cd9849c671922227eb8a6767cecf3097acbff338a47c3a7930b285fa4ecf2ebe74cb2e9186f93ec70c40c
 EBUILD openssh-6.6_p1-r1.ebuild 9874 SHA256 223b5e4c5d0d3152e8ffadd20e8bcc391620c779749cf6ff235f0d3a857f7409 SHA512 3104586dedfb189adc780bf56cb030f3a9c2427fe07ce340424ea4e279b6335653b2eb38f9d86a8f6ac76360cd94b87d858863fd79b2054763f72ccb83f1a0ed WHIRLPOOL 1bef688d59baf3cf10ce3ab60f3eeb6e6cf875989ffcf711628f56b34a1344838c3a46ae548399c49f11459e5dd2045fcef810691421e69ef02eb92489c22824
-MISC ChangeLog 84776 SHA256 4b91f71c0bdcd726c351662cc66abeeaf22bf429b840fff91c54d772675ae08a SHA512 9744185805176336c9e574981fed5644995b352d177c9f0746c01ce700f635f59e30ec4615c68e50eb62219b8ac3fa789f18a06fce3ac1039f50c35589b81022 WHIRLPOOL 84a9909b29147bdd568811e6a30a31436386df512061956613cde3d6fafe111932f882a9b4fd71d98ab8a4458502b909c78636ca73dea02b18a83510a2e9e5e2
+MISC ChangeLog 85757 SHA256 a79b837fd11fe7e1fd3265256f15ec4809a628a0e21abfcd4ed54302fbbd50ef SHA512 ce2b13504f4bba52227e7298525881f5aef05f5f81a4310d3b5b93ed679afdb64488f324761b3e5bdabd44e9df17aa921c053608dd18186e9140261cef59e8e8 WHIRLPOOL 270358b9a53d98697cb28c2d1eb2a0c8637f7fbe9a6091c5a10fb6ff0db2ce4b74824c17fddf5b0dffe9120ec65b8871481933d63134109bd983f2befc2251bc
 MISC metadata.xml 1837 SHA256 5f8be0245926a5dc8007dd78594febffc68bbcb45306630d027666872e664050 SHA512 76e044611e16ede9bb9697c0ad448c149131f1f20b84ef1000fb77d6cec954abd48542fd26299a372b4411aa0ecb161ed38396b2c3b5c11c71a4bc247e0b23ed WHIRLPOOL 46c8b0f7911fec3ca086e1601cfab5d03e01a7d8cd2069460975545438f6fa5964f138d19a70ec7db7f1f8c9c0fbb48dcec6ee8269fa9d7b432214e9e3e46806
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLq+tAAoJELp701BxlEWfOA0P/0l/UJj4UfJgzM7M5Yk3QKMZ
-OZMIrQG4PwnZEUlzWxNr0QUtp9QLwGeXa4qJXwYGXAX+Owd+Ty9mDW07wT8NCMxi
-19ejI95X9KUkro18UrTFyhi07uppUse+ez13Vl4L1kCRaGGceAHGsd1bsGIGORPw
-l46gMdP3ZKc8X7qidbWXHgV27qyhwRcVRlGlvlnTdHEF9PDD8TGzrjUlx+Ij7HAF
-jVEg5vbN8eYJbKWPOOGjW63PAdRfPy33ZDkqRViOvBm9PO69/uail5XSBa7dXMka
-oz3HvxV1eAqhWr6kWgeTwMoap+GDQYw4s/pBZr0OSD4SfOvqo6ZrRqSyIFzS/fC4
-4abFHuBdK1mWYp37lEtIgf8Jbame/x90Eo6NUJPAjAASC33+ad89+TfEmMM8voGT
-6fI8Dj4cfpxMQt4q0x0Whjjt/yLlMcQwc3kxJKvrtEOA+AH9xmzw7UoDfIQVNkmA
-OtNIU6CD5FRijhsNvMaVSVTpWHqworWvmO/IosBmXP6TaU3DQZmOH6yoEixxrmbN
-k7KwfnsSZteIfCviHVQw9Eiv5emxM2sABJIlb8srcAigsjHSVgdLkgwbr+ykBdaq
-SIIXMnCLw8Xe5VksPOwRnGX6QRJvLaWxl1XdtUEDS7K6EEycuuye4v/Ar847CJHC
-QR3yRb5Pss/SPj+Jhhwh
-=qF8Z
+iQIcBAEBCAAGBQJTWUOKAAoJEPiazRVxLXTFXBwP+wYc1LYrRWH6nqJXpHUCJAgQ
+TKZYAvRhRrJvKP5d+1BOpmytj9Hz+vHJHP/TEKDOaCGNrO6qifbs2H42TPIgSmFc
+/9iUWR/yXSHe7Tf7LcJXGFDsgcPMrUBe+8ydjuB/80OCjeDv6+VsUYNyFedC3tVr
+RlbfRC3HnKaVH6dqEX8DJjnzqPEIEK0MLcxxzyy9cizTGC3Bb90BbV8piAY1xx43
+vTzCCIPs0tciWMzdy/y1lmFqkeUittKSl8tagnbNGmuif15vN+8y/q7NkXe4i7R4
+N3rY1CORicAoVzvavJ8BsGZaklI2sWKUmI0ONBdJoRXvMVpzJqYows+zFy1+YVDe
+afx2kSmzMJl+kEntA+XPv6ByZzyUUZEc78yGn+iL7kP2lw7WzO/jvyLCCX+jnJmw
+ROHa9SoYyyRHiEcO2xSW5cb3rU6AOj961sGhlu3ZRuiKOQ8+ybEsQuF1dbcs6fYe
+2tCG4R7Rn8PhVx3AGjz2jzoRBMBuvO1KGyED7NanF2mQ7T801zy8fooCp8hW2kic
+V29vTvn8f4kGArJ9U94ppT+O4yf3tIfYA9G2KmneejqKsoIGJxMIEb2BLzU3cO0s
+ulPqU4hsNfbeDpbLscUFTzoFSa7SGBMMdYoB18bz14lHN0uIjoICFbfJ1veIgTUz
+I+d3Lb7B5mJEzXp25aMX
+=uKsG
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/openssh-5.2p1-ldap-stdargs.diff b/net-misc/openssh/files/openssh-5.2p1-ldap-stdargs.diff
deleted file mode 100644
index 346d52719877..000000000000
--- a/net-misc/openssh/files/openssh-5.2p1-ldap-stdargs.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ldapauth.c.orig	2009-04-18 18:06:38.000000000 +0200
-+++ ldapauth.c	2009-04-18 18:06:11.000000000 +0200
-@@ -31,6 +31,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-+#include <stdarg.h>
- 
- #include "ldapauth.h"
- #include "log.h"
diff --git a/net-misc/openssh/files/openssh-5.4_p1-openssl.patch b/net-misc/openssh/files/openssh-5.4_p1-openssl.patch
deleted file mode 100644
index e4cdb63a26c5..000000000000
--- a/net-misc/openssh/files/openssh-5.4_p1-openssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-pull in openssl/conf.h for OPENSSL_config() prototype
-
---- openbsd-compat/openssl-compat.c
-+++ openbsd-compat/openssl-compat.c
-@@ -59,6 +59,7 @@
- #endif
- 
- #ifdef	USE_OPENSSL_ENGINE
-+#include <openssl/conf.h>
- void
- ssh_SSLeay_add_all_algorithms(void)
- {
diff --git a/net-misc/openssh/files/openssh-5.6_p1-hpn-progressmeter.patch b/net-misc/openssh/files/openssh-5.6_p1-hpn-progressmeter.patch
deleted file mode 100644
index 5fe18dfc9ac0..000000000000
--- a/net-misc/openssh/files/openssh-5.6_p1-hpn-progressmeter.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-don't go reading random stack values
-
-already e-mailed to upstream hpn devs
-
---- progressmeter.c
-+++ progressmeter.c
-@@ -183,7 +183,7 @@
- 	else
- 		percent = 100;
- 
--	snprintf(buf + strlen(buf), win_size - strlen(buf-8),
-+	snprintf(buf + strlen(buf), win_size - strlen(buf) - 8,
- 	    " %3d%% ", percent);
- 
- 	/* amount transferred */
diff --git a/net-misc/openssh/files/openssh-5.8_p1-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-5.8_p1-x509-hpn-glue.patch
deleted file mode 100644
index 74d06c79c0e9..000000000000
--- a/net-misc/openssh/files/openssh-5.8_p1-x509-hpn-glue.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Move things around so hpn applies cleanly when using X509.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -46,12 +46,13 @@
- CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
--CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
-+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
- LIBS=@LIBS@
- SSHLIBS=@SSHLIBS@
- SSHDLIBS=@SSHDLIBS@
- LIBEDIT=@LIBEDIT@
- LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@
-+CPPFLAGS+=@LDAP_CPPFLAGS@
- AR=@AR@
- AWK=@AWK@
- RANLIB=@RANLIB@
---- a/servconf.c
-+++ b/servconf.c
-@@ -153,9 +153,6 @@ initialize_server_options(ServerOptions *options)
- 	options->zero_knowledge_password_authentication = -1;
- 	options->revoked_keys_file = NULL;
- 	options->trusted_user_ca_keys = NULL;
--	options->authorized_principals_file = NULL;
--	options->ip_qos_interactive = -1;
--	options->ip_qos_bulk = -1;
- 
- 	options->hostbased_algorithms = NULL;
- 	options->pubkey_algorithms = NULL;
-@@ -168,6 +165,9 @@ initialize_server_options(ServerOptions *options)
- 	options->va.certificate_file = NULL;
- 	options->va.responder_url = NULL;
- #endif /*def SSH_OCSP_ENABLED*/
-+	options->authorized_principals_file = NULL;
-+	options->ip_qos_interactive = -1;
-+	options->ip_qos_bulk = -1;
- }
- 
- void
-@@ -367,9 +367,6 @@ typedef enum {
- 	sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
- 	sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
- 	sUsePrivilegeSeparation, sAllowAgentForwarding,
--	sZeroKnowledgePasswordAuthentication, sHostCertificate,
--	sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile,
--	sKexAlgorithms, sIPQoS,
- 	sHostbasedAlgorithms,
- 	sPubkeyAlgorithms,
- 	sX509KeyAlgorithm,
-@@ -380,6 +377,9 @@ typedef enum {
- 	sCAldapVersion, sCAldapURL,
- 	sVAType, sVACertificateFile,
- 	sVAOCSPResponderURL,
-+	sZeroKnowledgePasswordAuthentication, sHostCertificate,
-+	sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile,
-+	sKexAlgorithms, sIPQoS,
- 	sDeprecated, sUnsupported
- } ServerOpCodes;
- 
diff --git a/net-misc/openssh/files/openssh-5.9_p1-drop-openssl-check.patch b/net-misc/openssh/files/openssh-5.9_p1-drop-openssl-check.patch
deleted file mode 100644
index eb621abb175d..000000000000
--- a/net-misc/openssh/files/openssh-5.9_p1-drop-openssl-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-newer versions of openssl have started to be compatible across minor versions
-too, so this sanity check fails.  since we already handle compatibility with
-openssl via SONAME checks, we don't need this openssh check at all.
-
-http://marc.info/?l=openssl-dev&m=133176786215023&w=2
-
---- a/entropy.c
-+++ b/entropy.c
-@@ -208,16 +208,7 @@ seed_rng(void)
- {
- #ifndef OPENSSL_PRNG_ONLY
- 	unsigned char buf[RANDOM_SEED_SIZE];
--#endif
--	/*
--	 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
--	 * We match major, minor, fix and status (not patch)
--	 */
--	if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L)
--		fatal("OpenSSL version mismatch. Built against %lx, you "
--		    "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
- 
--#ifndef OPENSSL_PRNG_ONLY
- 	if (RAND_status() == 1) {
- 		debug3("RNG is ready, skipping seeding");
- 		return;
diff --git a/net-misc/openssh/files/openssh-5.9_p1-x509-glue.patch b/net-misc/openssh/files/openssh-5.9_p1-x509-glue.patch
deleted file mode 100644
index 6fbb88b6716c..000000000000
--- a/net-misc/openssh/files/openssh-5.9_p1-x509-glue.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch
-
---- openssh-5.9p1+x509-7.0.diff
-+++ openssh-5.9p1+x509-7.0.diff
-@@ -11995,9 +11995,9 @@
-  Specifies whether challenge-response authentication is allowed (e.g. via
-  PAM or though authentication styles supported in
- @@ -430,6 +507,16 @@
-+ This facility is provided to assist with operation on multi homed machines.
-  The default is
-  .Dq yes .
-- Note that this option applies to protocol version 2 only.
- +.It Cm HostbasedAlgorithms
- +Specifies the protocol version 2 algorithms used in
- +.Dq hostbased
diff --git a/net-misc/openssh/files/openssh-6.0_p1-fix-freebsd-compilation.patch b/net-misc/openssh/files/openssh-6.0_p1-fix-freebsd-compilation.patch
deleted file mode 100644
index 3b34cd2e35a9..000000000000
--- a/net-misc/openssh/files/openssh-6.0_p1-fix-freebsd-compilation.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 2b60300..21b6112 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -725,6 +725,10 @@ mips-sony-bsd|mips-sony-newsos4)
- 	AC_CHECK_HEADER([net/if_tap.h], ,
- 	    AC_DEFINE([SSH_TUN_NO_L2], [1], [No layer 2 tunnel support]))
- 	AC_DEFINE([BROKEN_GLOB], [1], [FreeBSD glob does not do what we need])
-+	AC_DEFINE([DISABLE_UTMP], [1],
-+		[Define if you don't want to use utmp])
-+	AC_DEFINE([DISABLE_WTMP], [1],
-+		[Define if you don't want to use wtmp])
- 	;;
- *-*-bsdi*)
- 	AC_DEFINE([SETEUID_BREAKS_SETUID])
diff --git a/net-misc/openssh/files/openssh-6.0_p1-hpn-progressmeter.patch b/net-misc/openssh/files/openssh-6.0_p1-hpn-progressmeter.patch
deleted file mode 100644
index 56805d12a9b7..000000000000
--- a/net-misc/openssh/files/openssh-6.0_p1-hpn-progressmeter.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-don't go reading random stack values
-
-already e-mailed to upstream hpn devs
-
---- progressmeter.c
-+++ progressmeter.c
-@@ -183,7 +183,7 @@
- 		percent = ((float)cur_pos / end_pos) * 100;
- 	else
- 		percent = 100;
--	snprintf(buf + strlen(buf), win_size - strlen(buf-8),
-+	snprintf(buf + strlen(buf), win_size - strlen(buf) - 8,
- 	    " %3d%% ", percent);
- 
- 	/* amount transferred */
diff --git a/net-misc/openssh/files/openssh-6.0_p1-test.patch b/net-misc/openssh/files/openssh-6.0_p1-test.patch
deleted file mode 100644
index 8b988aed9b5e..000000000000
--- a/net-misc/openssh/files/openssh-6.0_p1-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-changeset:   10701:b159befd3104
-tag:         tip
-user:        Mike Frysinger <vapier@gentoo.org>
-date:        Sun Apr 29 00:26:33 2012 -0400
-summary:     use = with `test`, not ==
-
-diff -r d8a3ea854288 -r b159befd3104 configure.ac
---- a/configure.ac	Fri Apr 27 00:55:42 2012 +0000
-+++ b/configure.ac	Sun Apr 29 00:26:33 2012 -0400
-@@ -2591,7 +2591,7 @@
- 	AC_DEFINE([SANDBOX_DARWIN], [1], [Sandbox using Darwin sandbox_init(3)])
- elif test "x$sandbox_arg" = "xseccomp_filter" || \
-      ( test -z "$sandbox_arg" && \
--       test "x$have_seccomp_filter" == "x1" && \
-+       test "x$have_seccomp_filter" = "x1" && \
-        test "x$ac_cv_header_linux_audit_h" = "xyes" && \
-        test "x$have_seccomp_audit_arch" = "x1" && \
-        test "x$have_linux_no_new_privs" = "x1" && \
-
diff --git a/net-misc/openssh/files/openssh-6.0_p1-x509-glue.patch b/net-misc/openssh/files/openssh-6.0_p1-x509-glue.patch
deleted file mode 100644
index 3633a2af60be..000000000000
--- a/net-misc/openssh/files/openssh-6.0_p1-x509-glue.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch
-
---- openssh-6.0p1+x509-7.1.diff
-+++ openssh-6.0p1+x509-7.1.diff
-@@ -13502,9 +13502,9 @@
-  Specifies whether challenge-response authentication is allowed (e.g. via
-  PAM or though authentication styles supported in
- @@ -430,6 +507,16 @@
-+ This facility is provided to assist with operation on multi homed machines.
-  The default is
-  .Dq yes .
-- Note that this option applies to protocol version 2 only.
- +.It Cm HostbasedAlgorithms
- +Specifies the protocol version 2 algorithms used in
- +.Dq hostbased
diff --git a/net-misc/openssh/files/openssh-6.0_p1-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-6.0_p1-x509-hpn-glue.patch
deleted file mode 100644
index 9e3dfdbe3e6b..000000000000
--- a/net-misc/openssh/files/openssh-6.0_p1-x509-hpn-glue.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index ecb45cd..7834fb1 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -45,12 +45,13 @@ FIPSLD_CC=@FIPSLD_CC@
- CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
--CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
-+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
- LIBS=@LIBS@
- SSHLIBS=@SSHLIBS@
- SSHDLIBS=@SSHDLIBS@
- LIBEDIT=@LIBEDIT@
- LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@
-+CPPFLAGS+=@LDAP_CPPFLAGS@
- AR=@AR@
- AWK=@AWK@
- RANLIB=@RANLIB@
-diff --git a/sshconnect.c b/sshconnect.c
-index 19a2b06..dd75f78 100644
---- a/sshconnect.c
-+++ b/sshconnect.c
-@@ -580,7 +580,7 @@ ssh_exchange_identification(int timeout_ms)
- 	snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s",
- 	    compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1,
- 	    compat20 ? PROTOCOL_MINOR_2 : minor1,
--	    SSH_VERSION, compat20 ? " PKIX\r\n" : "\n");
-+	    SSH_VERSION, compat20 ? "\r\n" : "\n");
- 	if (roaming_atomicio(vwrite, connection_out, buf, strlen(buf))
- 	    != strlen(buf))
- 		fatal("write: %.100s", strerror(errno));
-diff --git a/sshd.c b/sshd.c
-index a5c437d..a1105a0 100644
---- a/sshd.c
-+++ b/sshd.c
-@@ -428,8 +428,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
- 		minor = PROTOCOL_MINOR_1;
- 		comment = "";
- 	}
--	snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s%s", major, minor,
--	    SSH_VERSION, comment, newline);
-+	snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor,
-+	    SSH_VERSION, newline);
- 	server_version_string = xstrdup(buf);
- 
- 	/* Send our protocol version identification. */
-diff --git a/version.h b/version.h
-index 78983d9..ec1746d 100644
---- a/version.h
-+++ b/version.h
-@@ -3,4 +3,5 @@
- #define SSH_VERSION	"OpenSSH_6.0"
- 
- #define SSH_PORTABLE	"p1"
-+#define SSH_X509	" PKIX"
- #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
diff --git a/net-misc/openssh/files/openssh-6.1_p1-x509-glue.patch b/net-misc/openssh/files/openssh-6.1_p1-x509-glue.patch
deleted file mode 100644
index e6db835d1ada..000000000000
--- a/net-misc/openssh/files/openssh-6.1_p1-x509-glue.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch
-
---- openssh-6.1p1+x509-7.2.1.diff
-+++ openssh-6.1p1+x509-7.2.1.diff
-@@ -13502,9 +13502,9 @@
-  Specifies whether challenge-response authentication is allowed (e.g. via
-  PAM or though authentication styles supported in
- @@ -432,6 +509,16 @@
-+ This facility is provided to assist with operation on multi homed machines.
-  The default is
-  .Dq yes .
-- Note that this option applies to protocol version 2 only.
- +.It Cm HostbasedAlgorithms
- +Specifies the protocol version 2 algorithms used in
- +.Dq hostbased
diff --git a/net-misc/openssh/files/openssh-6.1_p1-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-6.1_p1-x509-hpn-glue.patch
deleted file mode 100644
index 5d69a50bc7fd..000000000000
--- a/net-misc/openssh/files/openssh-6.1_p1-x509-hpn-glue.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -45,12 +45,13 @@ FIPSLD_CC=@FIPSLD_CC@
- CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
--CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
-+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
- LIBS=@LIBS@
- SSHLIBS=@SSHLIBS@
- SSHDLIBS=@SSHDLIBS@
- LIBEDIT=@LIBEDIT@
- LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@
-+CPPFLAGS+=@LDAP_CPPFLAGS@
- AR=@AR@
- AWK=@AWK@
- RANLIB=@RANLIB@
---- a/sshconnect.c
-+++ b/sshconnect.c
-@@ -580,7 +580,7 @@ ssh_exchange_identification(int timeout_ms)
- 	snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s",
- 	    compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1,
- 	    compat20 ? PROTOCOL_MINOR_2 : minor1,
--	    SSH_VERSION, compat20 ? " PKIX\r\n" : "\n");
-+	    SSH_VERSION, compat20 ? "\r\n" : "\n");
- 	if (roaming_atomicio(vwrite, connection_out, buf, strlen(buf))
- 	    != strlen(buf))
- 		fatal("write: %.100s", strerror(errno));
---- a/sshd.c
-+++ b/sshd.c
-@@ -428,8 +428,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
- 		comment = "";
- 	}
- 
--	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s",
-+	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
--	    major, minor, SSH_VERSION, comment,
-+	    major, minor, SSH_VERSION,
- 	    *options.version_addendum == '\0' ? "" : " ",
- 	    options.version_addendum, newline);
- 
---- a/version.h
-+++ b/version.h
-@@ -3,4 +3,5 @@
- #define SSH_VERSION	"OpenSSH_6.0"
- 
- #define SSH_PORTABLE	"p1"
-+#define SSH_X509	" PKIX"
- #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
diff --git a/net-misc/openssh/files/openssh-6.2_p2-x509-glue.patch b/net-misc/openssh/files/openssh-6.2_p2-x509-glue.patch
deleted file mode 100644
index f405d7d1c293..000000000000
--- a/net-misc/openssh/files/openssh-6.2_p2-x509-glue.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch
-
---- openssh-6.2p2+x509-7.5.diff
-+++ openssh-6.2p2+x509-7.5.diff
-@@ -14571,10 +14571,9 @@
-  .It Cm ChallengeResponseAuthentication
-  Specifies whether challenge-response authentication is allowed (e.g. via
-  PAM or though authentication styles supported in
--@@ -487,6 +564,16 @@
-+@@ -487,5 +564,15 @@
-  The default is
-  .Dq yes .
-- Note that this option applies to protocol version 2 only.
- +.It Cm HostbasedAlgorithms
- +Specifies the protocol version 2 algorithms used in
- +.Dq hostbased
diff --git a/net-misc/openssh/files/openssh-6.2_p2-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-6.2_p2-x509-hpn-glue.patch
deleted file mode 100644
index 89d3d66e5775..000000000000
--- a/net-misc/openssh/files/openssh-6.2_p2-x509-hpn-glue.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- openssh-6.2p2/Makefile.in
-+++ openssh-6.2p2/Makefile.in
-@@ -45,7 +45,7 @@
- CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
--CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
-+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
- LIBS=@LIBS@
- K5LIBS=@K5LIBS@
- GSSLIBS=@GSSLIBS@
-@@ -53,6 +53,7 @@
- SSHDLIBS=@SSHDLIBS@
- LIBEDIT=@LIBEDIT@
- LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@
-+CPPFLAGS+=@LDAP_CPPFLAGS@
- AR=@AR@
- AWK=@AWK@
- RANLIB=@RANLIB@
---- openssh-6.2p2/sshconnect.c
-+++ openssh-6.2p2/sshconnect.c
-@@ -458,7 +458,7 @@
- {
- 	/* Send our own protocol version identification. */
- 	if (compat20) {
--		xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX\r\n",
-+		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
- 		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
- 	} else {
- 		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
---- openssh-6.2p2/sshd.c
-+++ openssh-6.2p2/sshd.c
-@@ -466,8 +466,8 @@
- 		comment = "";
- 	}
- 
--	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s",
--	    major, minor, SSH_VERSION, comment,
-+	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
-+	    major, minor, SSH_VERSION,
- 	    *options.version_addendum == '\0' ? "" : " ",
- 	    options.version_addendum, newline);
- 
---- openssh-6.2p2/version.h
-+++ openssh-6.2p2/version.h
-@@ -3,4 +3,5 @@
- #define SSH_VERSION	"OpenSSH_6.2"
- 
- #define SSH_PORTABLE	"p2"
-+#define SSH_X509	" PKIX"
- #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
diff --git a/net-misc/openssh/files/openssh-6.2_p2-x509-hpn14v1-glue.patch b/net-misc/openssh/files/openssh-6.2_p2-x509-hpn14v1-glue.patch
deleted file mode 100644
index befa44e4f559..000000000000
--- a/net-misc/openssh/files/openssh-6.2_p2-x509-hpn14v1-glue.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- openssh-6.2p2/Makefile.in
-+++ openssh-6.2p2/Makefile.in
-@@ -45,7 +45,7 @@
- CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
--CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
-+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
- LIBS=@LIBS@
- K5LIBS=@K5LIBS@
- GSSLIBS=@GSSLIBS@
-@@ -53,6 +53,7 @@
- SSHDLIBS=@SSHDLIBS@
- LIBEDIT=@LIBEDIT@
- LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@
-+CPPFLAGS+=@LDAP_CPPFLAGS@
- AR=@AR@
- AWK=@AWK@
- RANLIB=@RANLIB@
---- openssh-6.2p2/servconf.c
-+++ openssh-6.2p2/servconf.c
-@@ -385,6 +385,16 @@
- 	sKerberosAuthentication, sKerberosOrLocalPasswd, sKerberosTicketCleanup,
- 	sKerberosGetAFSToken,
- 	sKerberosTgtPassing, sChallengeResponseAuthentication,
-+	sHostbasedAlgorithms,
-+	sPubkeyAlgorithms,
-+	sX509KeyAlgorithm,
-+	sAllowedClientCertPurpose,
-+	sKeyAllowSelfIssued, sMandatoryCRL,
-+	sCACertificateFile, sCACertificatePath,
-+	sCARevocationFile, sCARevocationPath,
-+	sCAldapVersion, sCAldapURL,
-+	sVAType, sVACertificateFile,
-+	sVAOCSPResponderURL,
- 	sPasswordAuthentication, sKbdInteractiveAuthentication,
- 	sListenAddress, sAddressFamily,
- 	sPrintMotd, sPrintLastLog, sIgnoreRhosts,
-@@ -407,16 +417,6 @@
- 	sKexAlgorithms, sIPQoS, sVersionAddendum,
- 	sAuthorizedKeysCommand, sAuthorizedKeysCommandUser,
- 	sAuthenticationMethods,
--	sHostbasedAlgorithms,
--	sPubkeyAlgorithms,
--	sX509KeyAlgorithm,
--	sAllowedClientCertPurpose,
--	sKeyAllowSelfIssued, sMandatoryCRL,
--	sCACertificateFile, sCACertificatePath,
--	sCARevocationFile, sCARevocationPath,
--	sCAldapVersion, sCAldapURL,
--	sVAType, sVACertificateFile,
--	sVAOCSPResponderURL,
- 	sDeprecated, sUnsupported
- } ServerOpCodes;
- 
---- openssh-6.2p2/sshconnect.c
-+++ openssh-6.2p2/sshconnect.c
-@@ -465,7 +465,7 @@
- {
- 	/* Send our own protocol version identification. */
- 	if (compat20) {
--		xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX\r\n",
-+		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
- 		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
- 	} else {
- 		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
---- openssh-6.2p2/sshd.c
-+++ openssh-6.2p2/sshd.c
-@@ -466,8 +466,8 @@
- 		comment = "";
- 	}
- 
--	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s",
--	    major, minor, SSH_VERSION, comment,
-+	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
-+	    major, minor, SSH_VERSION,
- 	    *options.version_addendum == '\0' ? "" : " ",
- 	    options.version_addendum, newline);
- 
---- openssh-6.2p2/version.h
-+++ openssh-6.2p2/version.h
-@@ -3,4 +3,5 @@
- #define SSH_VERSION	"OpenSSH_6.2"
- 
- #define SSH_PORTABLE	"p2"
-+#define SSH_X509	" PKIX"
- #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
diff --git a/net-misc/openssh/files/openssh-6.3_p1-aes-gcm.patch b/net-misc/openssh/files/openssh-6.3_p1-aes-gcm.patch
deleted file mode 100644
index 92cd7a192f32..000000000000
--- a/net-misc/openssh/files/openssh-6.3_p1-aes-gcm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://www.openssh.org/txt/gcmrekey.adv
-
---- openssh-6.3p1/monitor_wrap.c
-+++ openssh-6.3p1/monitor_wrap.c
-@@ -482,7 +482,7 @@ mm_newkeys_from_blob(u_char *blob, int b
- 	buffer_init(&b);
- 	buffer_append(&b, blob, blen);
- 
--	newkey = xmalloc(sizeof(*newkey));
-+	newkey = xcalloc(1, sizeof(*newkey));
- 	enc = &newkey->enc;
- 	mac = &newkey->mac;
- 	comp = &newkey->comp;
diff --git a/net-misc/openssh/files/openssh-6.4_p1-x509-glue.patch b/net-misc/openssh/files/openssh-6.4_p1-x509-glue.patch
deleted file mode 100644
index 6aed19be7bd5..000000000000
--- a/net-misc/openssh/files/openssh-6.4_p1-x509-glue.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch and remove
-redundant README.x509v3 directory.
-
---- openssh-6.4p1+x509-7.7.diff.orig	2013-11-09 14:51:13.400696545 -0800
-+++ openssh-6.4p1+x509-7.7.diff	2013-11-09 14:51:05.798786189 -0800
-@@ -6809,9 +6809,9 @@
-  
- -$OpenBSD: README.dns,v 1.2 2003/10/14 19:43:23 jakob Exp $
- +$OpenBSD$
--diff -ruN openssh-6.4p1/README.x509v3/README.x509v3 openssh-6.4p1+x509-7.7/README.x509v3/README.x509v3
----- openssh-6.4p1/README.x509v3/README.x509v3	1970-01-01 02:00:00.000000000 +0200
--+++ openssh-6.4p1+x509-7.7/README.x509v3/README.x509v3	2013-05-17 18:50:02.156263192 +0300
-+diff -ruN openssh-6.4p1/README.x509v3 openssh-6.4p1+x509-7.7/README.x509v3
-+--- openssh-6.4p1/README.x509v3	1970-01-01 02:00:00.000000000 +0200
-++++ openssh-6.4p1+x509-7.7/README.x509v3	2013-05-17 18:50:02.156263192 +0300
- @@ -0,0 +1,615 @@
- +                                                          Roumen Petrov
- +                                                        Sofia, Bulgaria
-@@ -14793,10 +14793,9 @@
-  .It Cm ChallengeResponseAuthentication
-  Specifies whether challenge-response authentication is allowed (e.g. via
-  PAM or though authentication styles supported in
--@@ -490,6 +567,16 @@
-+@@ -490,5 +567,15 @@
-  The default is
-  .Dq yes .
-- Note that this option applies to protocol version 2 only.
- +.It Cm HostbasedAlgorithms
- +Specifies the protocol version 2 algorithms used in
- +.Dq hostbased
diff --git a/net-misc/openssh/files/sshd.pam b/net-misc/openssh/files/sshd.pam
deleted file mode 100644
index 511494025162..000000000000
--- a/net-misc/openssh/files/sshd.pam
+++ /dev/null
@@ -1,9 +0,0 @@
-#%PAM-1.0
-
-auth       required	pam_stack.so service=system-auth
-auth       required     pam_shells.so
-auth	   required	pam_nologin.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session	   required	pam_stack.so service=system-auth
-
diff --git a/net-misc/openssh/files/sshd.rc6 b/net-misc/openssh/files/sshd.rc6
deleted file mode 100644
index 031606862b1f..000000000000
--- a/net-misc/openssh/files/sshd.rc6
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.28 2011/12/04 10:08:19 swegener Exp $
-
-extra_commands="checkconfig gen_keys"
-extra_started_commands="reload"
-
-depend() {
-	use logger dns
-	need net
-}
-
-SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh}
-SSHD_PIDFILE=${SSHD_PIDFILE:-/var/run/${SVCNAME}.pid}
-SSHD_BINARY=${SSHD_BINARY:-/usr/sbin/sshd}
-
-checkconfig() {
-	if [ ! -d /var/empty ] ; then
-		mkdir -p /var/empty || return 1
-	fi
-
-	if [ ! -e "${SSHD_CONFDIR}"/sshd_config ] ; then
-		eerror "You need an ${SSHD_CONFDIR}/sshd_config file to run sshd"
-		eerror "There is a sample file in /usr/share/doc/openssh"
-		return 1
-	fi
-
-	gen_keys || return 1
-
-	"${SSHD_BINARY}" -t ${myopts} || return 1
-}
-
-gen_keys() {
-	if [ ! -e "${SSHD_CONFDIR}"/ssh_host_key ] ; then
-		einfo "Generating Hostkey..."
-		/usr/bin/ssh-keygen -t rsa1 -f "${SSHD_CONFDIR}"/ssh_host_key -N '' || return 1
-	fi
-	if [ ! -e "${SSHD_CONFDIR}"/ssh_host_dsa_key ] ; then
-		einfo "Generating DSA-Hostkey..."
-		/usr/bin/ssh-keygen -d -f "${SSHD_CONFDIR}"/ssh_host_dsa_key -N '' || return 1
-	fi
-	if [ ! -e "${SSHD_CONFDIR}"/ssh_host_rsa_key ] ; then
-		einfo "Generating RSA-Hostkey..."
-		/usr/bin/ssh-keygen -t rsa -f "${SSHD_CONFDIR}"/ssh_host_rsa_key -N '' || return 1
-	fi
-	return 0
-}
-
-start() {
-	local myopts=""
-	[ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \
-		&& myopts="${myopts} -o PidFile=${SSHD_PIDFILE}"
-	[ "${SSHD_CONFDIR}" != "/etc/ssh" ] \
-		&& myopts="${myopts} -f ${SSHD_CONFDIR}/sshd_config"
-
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec "${SSHD_BINARY}" \
-	    --pidfile "${SSHD_PIDFILE}" \
-	    -- ${myopts} ${SSHD_OPTS}
-	eend $?
-}
-
-stop() {
-	if [ "${RC_CMD}" = "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec "${SSHD_BINARY}" \
-	    --pidfile "${SSHD_PIDFILE}" --quiet
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --stop --signal HUP --oknodo \
-	    --exec "${SSHD_BINARY}" --pidfile "${SSHD_PIDFILE}"
-	eend $?
-}
diff --git a/net-misc/openssh/files/sshd.rc6.1 b/net-misc/openssh/files/sshd.rc6.1
deleted file mode 100644
index 6524601ce7b9..000000000000
--- a/net-misc/openssh/files/sshd.rc6.1
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.1,v 1.2 2011/12/04 10:08:19 swegener Exp $
-
-extra_commands="checkconfig gen_keys"
-extra_started_commands="reload"
-
-depend() {
-	use logger dns
-	need net
-}
-
-SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh}
-SSHD_PIDFILE=${SSHD_PIDFILE:-/var/run/${SVCNAME}.pid}
-SSHD_BINARY=${SSHD_BINARY:-/usr/sbin/sshd}
-
-checkconfig() {
-	if [ ! -d /var/empty ] ; then
-		mkdir -p /var/empty || return 1
-	fi
-
-	if [ ! -e "${SSHD_CONFDIR}"/sshd_config ] ; then
-		eerror "You need an ${SSHD_CONFDIR}/sshd_config file to run sshd"
-		eerror "There is a sample file in /usr/share/doc/openssh"
-		return 1
-	fi
-
-	gen_keys || return 1
-
-	"${SSHD_BINARY}" -t ${myopts} || return 1
-}
-
-gen_keys() {
-	if [ ! -e "${SSHD_CONFDIR}"/ssh_host_key ] && \
-	   egrep -q '^[ \t]*Protocol[ \t]+.*1' "${SSHD_CONFDIR}"/sshd_config ; then
-		einfo "Generating RSA1-Hostkey..."
-		/usr/bin/ssh-keygen -t rsa1 -f "${SSHD_CONFDIR}"/ssh_host_key -N '' || return 1
-	fi
-	if [ ! -e "${SSHD_CONFDIR}"/ssh_host_dsa_key ] ; then
-		einfo "Generating DSA-Hostkey..."
-		/usr/bin/ssh-keygen -d -f "${SSHD_CONFDIR}"/ssh_host_dsa_key -N '' || return 1
-	fi
-	if [ ! -e "${SSHD_CONFDIR}"/ssh_host_rsa_key ] ; then
-		einfo "Generating RSA-Hostkey..."
-		/usr/bin/ssh-keygen -t rsa -f "${SSHD_CONFDIR}"/ssh_host_rsa_key -N '' || return 1
-	fi
-	return 0
-}
-
-start() {
-	local myopts=""
-	[ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \
-		&& myopts="${myopts} -o PidFile=${SSHD_PIDFILE}"
-	[ "${SSHD_CONFDIR}" != "/etc/ssh" ] \
-		&& myopts="${myopts} -f ${SSHD_CONFDIR}/sshd_config"
-
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec "${SSHD_BINARY}" \
-	    --pidfile "${SSHD_PIDFILE}" \
-	    -- ${myopts} ${SSHD_OPTS}
-	eend $?
-}
-
-stop() {
-	if [ "${RC_CMD}" = "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec "${SSHD_BINARY}" \
-	    --pidfile "${SSHD_PIDFILE}" --quiet
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --stop --signal HUP --oknodo \
-	    --exec "${SSHD_BINARY}" --pidfile "${SSHD_PIDFILE}"
-	eend $?
-}
diff --git a/net-misc/openssh/files/sshd.rc6.2 b/net-misc/openssh/files/sshd.rc6.2
deleted file mode 100644
index 22aaaad218ab..000000000000
--- a/net-misc/openssh/files/sshd.rc6.2
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.2,v 1.3 2011/12/04 10:08:19 swegener Exp $
-
-extra_commands="checkconfig gen_keys"
-extra_started_commands="reload"
-
-depend() {
-	use logger dns
-	need net
-}
-
-SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh}
-SSHD_PIDFILE=${SSHD_PIDFILE:-/var/run/${SVCNAME}.pid}
-SSHD_BINARY=${SSHD_BINARY:-/usr/sbin/sshd}
-
-checkconfig() {
-	if [ ! -d /var/empty ] ; then
-		mkdir -p /var/empty || return 1
-	fi
-
-	if [ ! -e "${SSHD_CONFDIR}"/sshd_config ] ; then
-		eerror "You need an ${SSHD_CONFDIR}/sshd_config file to run sshd"
-		eerror "There is a sample file in /usr/share/doc/openssh"
-		return 1
-	fi
-
-	gen_keys || return 1
-
-	[ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \
-		&& SSHD_OPTS="${SSHD_OPTS} -o PidFile=${SSHD_PIDFILE}"
-	[ "${SSHD_CONFDIR}" != "/etc/ssh" ] \
-		&& SSHD_OPTS="${SSHD_OPTS} -f ${SSHD_CONFDIR}/sshd_config"
-
-	"${SSHD_BINARY}" -t ${SSHD_OPTS} || return 1
-}
-
-gen_key() {
-	local type=$1 key ks
-	[ $# -eq 1 ] && ks="${type}_"
-	key="${SSHD_CONFDIR}/ssh_host_${ks}key"
-	if [ ! -e "${key}" ] ; then
-		ebegin "Generating ${type} host key"
-		ssh-keygen -t ${type} -f "${key}" -N ''
-		eend $? || return $?
-	fi
-}
-
-gen_keys() {
-	if egrep -q '^[[:space:]]*Protocol[[:space:]]+.*1' "${SSHD_CONFDIR}"/sshd_config ; then
-		gen_key rsa1 "" || return 1
-	fi
-	gen_key dsa && gen_key rsa && gen_key ecdsa
-	return $?
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec "${SSHD_BINARY}" \
-	    --pidfile "${SSHD_PIDFILE}" \
-	    -- ${SSHD_OPTS}
-	eend $?
-}
-
-stop() {
-	if [ "${RC_CMD}" = "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec "${SSHD_BINARY}" \
-	    --pidfile "${SSHD_PIDFILE}" --quiet
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --stop --signal HUP --oknodo \
-	    --exec "${SSHD_BINARY}" --pidfile "${SSHD_PIDFILE}"
-	eend $?
-}
diff --git a/net-misc/openssh/files/sshd.rc6.3 b/net-misc/openssh/files/sshd.rc6.3
deleted file mode 100755
index c55116e966e1..000000000000
--- a/net-misc/openssh/files/sshd.rc6.3
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.3,v 1.2 2011/09/14 21:46:19 polynomial-c Exp $
-
-extra_commands="checkconfig gen_keys"
-extra_started_commands="reload"
-
-depend() {
-	use logger dns
-	need net
-}
-
-SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh}
-SSHD_PIDFILE=${SSHD_PIDFILE:-/var/run/${SVCNAME}.pid}
-SSHD_BINARY=${SSHD_BINARY:-/usr/sbin/sshd}
-
-checkconfig() {
-	if [ ! -d /var/empty ] ; then
-		mkdir -p /var/empty || return 1
-	fi
-
-	if [ ! -e "${SSHD_CONFDIR}"/sshd_config ] ; then
-		eerror "You need an ${SSHD_CONFDIR}/sshd_config file to run sshd"
-		eerror "There is a sample file in /usr/share/doc/openssh"
-		return 1
-	fi
-
-	gen_keys || return 1
-
-	[ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \
-		&& SSHD_OPTS="${SSHD_OPTS} -o PidFile=${SSHD_PIDFILE}"
-	[ "${SSHD_CONFDIR}" != "/etc/ssh" ] \
-		&& SSHD_OPTS="${SSHD_OPTS} -f ${SSHD_CONFDIR}/sshd_config"
-
-	"${SSHD_BINARY}" -t ${SSHD_OPTS} || return 1
-}
-
-gen_key() {
-	local type=$1 key ks
-	[ $# -eq 1 ] && ks="${type}_"
-	key="${SSHD_CONFDIR}/ssh_host_${ks}key"
-	if [ ! -e "${key}" ] ; then
-		ebegin "Generating ${type} host key"
-		ssh-keygen -t ${type} -f "${key}" -N ''
-		eend $? || return $?
-	fi
-}
-
-gen_keys() {
-	if egrep -q '^[[:space:]]*Protocol[[:space:]]+.*1' "${SSHD_CONFDIR}"/sshd_config ; then
-		gen_key rsa1 "" || return 1
-	fi
-	gen_key dsa && gen_key rsa && gen_key ecdsa
-	return $?
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec "${SSHD_BINARY}" \
-	    --pidfile "${SSHD_PIDFILE}" \
-	    -- ${SSHD_OPTS}
-	eend $?
-}
-
-stop() {
-	if [ "${RC_CMD}" = "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec "${SSHD_BINARY}" \
-	    --pidfile "${SSHD_PIDFILE}" --quiet
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP \
-	    --exec "${SSHD_BINARY}" --pidfile "${SSHD_PIDFILE}"
-	eend $?
-}
diff --git a/perl-core/CPAN/CPAN-2.0.0.ebuild b/perl-core/CPAN/CPAN-2.0.0.ebuild
index bdecefec4317..75cde826261c 100644
--- a/perl-core/CPAN/CPAN-2.0.0.ebuild
+++ b/perl-core/CPAN/CPAN-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN/CPAN-2.0.0.ebuild,v 1.5 2014/04/07 12:46:19 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN/CPAN-2.0.0.ebuild,v 1.9 2014/04/24 17:44:05 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="query, download and build perl modules from CPAN sites"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/CPAN/ChangeLog b/perl-core/CPAN/ChangeLog
index 9b771913e6c0..50672bffaeab 100644
--- a/perl-core/CPAN/ChangeLog
+++ b/perl-core/CPAN/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for perl-core/CPAN
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN/ChangeLog,v 1.8 2014/04/07 12:46:19 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN/ChangeLog,v 1.12 2014/04/24 17:44:05 zlogene Exp $
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> CPAN-2.0.0.ebuild:
+  Add ~sparc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> CPAN-2.0.0.ebuild:
+  Add ~ppc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> CPAN-2.0.0.ebuild:
+  Add ~ppc64 keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> CPAN-2.0.0.ebuild:
+  Add ~mips keyword wrt bug #505156
 
   07 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> CPAN-2.0.0.ebuild:
   Add ~ia64 keyword wrt bug #505156
diff --git a/perl-core/CPAN/Manifest b/perl-core/CPAN/Manifest
index afa7fc3dde1c..adb142508677 100644
--- a/perl-core/CPAN/Manifest
+++ b/perl-core/CPAN/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA256
 
 DIST CPAN-2.00.tar.gz 745694 SHA256 70410ab0a6fe749c1fcac6ed61e0898a709b877e14594dde96e7ce0d36c9d9db SHA512 78559a7117d0cb8856ca22641fd3b867f2b0dcf3ef6bc94af79ca42be687be65e090493fe9327bf339c22a21d1d1cb3c95ea4ae15e60afe943c1663f43fd20b1 WHIRLPOOL 8d57630517bdb4834ed7b51a17cca20c01caf9672735de9a6b50d11c0512541f2a56e691ee4fbe1430b42fcaaf5c0dfb8804aa14f52ed622dec0ac6805a30cf3
-EBUILD CPAN-2.0.0.ebuild 433 SHA256 e179d153ff332217f06acee96592a88dd918d03f3b9051feca177539efc38ac4 SHA512 c78e2733f659e71547cf9ae9b570af3d098e1333f96df1f1fb5075d1ea6000d3f666ce44f2d0d704ea82f235eda955dc9d3972abbbc340dcc431617a8eaf9b5c WHIRLPOOL 2eb66086f71a62056a5c261426fc0ad5f3d78517bf28dd652c2b8dc521dc2d18aa6fbf1813d5d63cb38c50b703f53c09dcf38f845f629b32c224a08851828bfa
-MISC ChangeLog 764 SHA256 a39083d44f8363236dbe737335ef8b7dc38f19d8269f34ae82b692e6f323d1f8 SHA512 f15de737b072f16cc63ff2a8f92a20b4b45db80f5a2bf178c58f0db11a21f84e6b8227a09bacffc59956f537a853a18fa72b33e7367de973a0b23bce570a5797 WHIRLPOOL 377a06ad1df3034f0377c034e269ac6be85aa324517687ca44bb1ef1c37a7093aa98647001e2528e97aeb24722e4f28d1c1cacc75e090e07c132a67257d8aece
+EBUILD CPAN-2.0.0.ebuild 458 SHA256 f03d53b82f007e59e4780c5a221d31eba811bb8075a7ba27f487d38d466e8148 SHA512 f75b3c459bb64da12365c44c9f98e53e285e334fc6b2866ee2be828f4eb7e278e317347dc2af76e471f7450d9400b54435534493403b1f395fa9d64aaec6daeb WHIRLPOOL bb686e9dbfb475a921000a4cde01be24264abb6897ab3a9ce238825316af64c9a5180d7d1858e68b8a60416bb93708b985167b8aa81401b7a40f85bef03b5360
+MISC ChangeLog 1190 SHA256 0c13653698d7ee99766dbf17307450cd74832e410b506168fb0cac64b812b00d SHA512 569000f2737f0e07184c5423737703b50bfc9ba7a1093eef7978d9c95d0a0ad4da33d2bfa37d95f5b4f69514668d9872216398fd7bfbcaaaf13a5b7b5a0a4b65 WHIRLPOOL 3acf97997029ec9915d6e80350d70217a0566e4b61f4ec835237ade7bad1773996e662921b5830e3f7960fb450ac6b0ec3e2865a9e0e048ebcfddb8daaa08b48
 MISC metadata.xml 158 SHA256 1fef4c0af5f71b777110f54d9dfbd27d6c85c750fca007f4a2fb38345ebbb710 SHA512 0b83af178d8e59a07953fc2582b6e4177ec933439a6638de4f222e4e9b6c21135ca1702f7f4838624e283d39db0d3f4d4227ddb6108dbb06cdcc09ebf9d6bc55 WHIRLPOOL 696c0536d7047d00bd1590ddb9bebd01caec0e15b3a970828eebe526b46f14d61eec5bd541db7d4628bdff743461198158832e2bdb47e31a5523ad63f16708bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlNCn24ACgkQG9wOWsQutdZa9wP9GfC30QjH0cB8uRvnn6LIvs8x
-jkriQUwB80tCCMyCbfPYT4uemWf+a0ysTZXfT0Fh3qBnUCQpF0VpQGYXfxv9LLRw
-FCHLsLrgF5fXf5w1QBuoeafKMZLUtK5WoEemAtyYLJVJsBSd3uO/MQGwCqQ5nWpl
-zK3Hh5ZJ9w+g8g5RKQI=
-=tJYK
+iJwEAQEIAAYFAlNZTrUACgkQG9wOWsQutdaBrQP/UHcCQXaGm1pMN9kf7eZh456i
+uW0OcQKM2Zlhik38lySUeiTIELpkuA5Ril4TFPQd1VAlHdKwjrKOpWhgDkbLWjSw
+zKqbOl78cGOJKN+zYvEdJiR1JnVowx3PQcC7UJnv3kkkmK0w1xFlv5H/xpQnCNnV
+/0i/WtgUExw0zScDtG4=
+=UCfH
 -----END PGP SIGNATURE-----
diff --git a/perl-core/Devel-PPPort/ChangeLog b/perl-core/Devel-PPPort/ChangeLog
index 0b02f6063b56..45def57e62e9 100644
--- a/perl-core/Devel-PPPort/ChangeLog
+++ b/perl-core/Devel-PPPort/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for perl-core/Devel-PPPort
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Devel-PPPort/ChangeLog,v 1.6 2014/04/07 12:47:15 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Devel-PPPort/ChangeLog,v 1.10 2014/04/24 17:45:04 zlogene Exp $
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Devel-PPPort-3.200.0.ebuild:
+  Add ~sparc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Devel-PPPort-3.200.0.ebuild:
+  Add ~ppc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Devel-PPPort-3.200.0.ebuild:
+  Add ~ppc64 keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Devel-PPPort-3.200.0.ebuild:
+  Add ~mips keyword wrt bug #505156
 
   07 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Devel-PPPort-3.200.0.ebuild:
   Add ~ia64 keyword wrt bug #505156
diff --git a/perl-core/Devel-PPPort/Devel-PPPort-3.200.0.ebuild b/perl-core/Devel-PPPort/Devel-PPPort-3.200.0.ebuild
index 27bb308898d7..7094fdf931c1 100644
--- a/perl-core/Devel-PPPort/Devel-PPPort-3.200.0.ebuild
+++ b/perl-core/Devel-PPPort/Devel-PPPort-3.200.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Devel-PPPort/Devel-PPPort-3.200.0.ebuild,v 1.5 2014/04/07 12:47:15 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Devel-PPPort/Devel-PPPort-3.200.0.ebuild,v 1.9 2014/04/24 17:45:04 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl/Pollution/Portability"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/Devel-PPPort/Manifest b/perl-core/Devel-PPPort/Manifest
index 82ca04152c9f..6962b06ba49f 100644
--- a/perl-core/Devel-PPPort/Manifest
+++ b/perl-core/Devel-PPPort/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA256
 
 DIST Devel-PPPort-3.20.tar.gz 195221 SHA256 8002038a2613945cd88a9996fd313b0647c7d8f35c9338504f77dff12364f368 SHA512 06946307c3faf4e2f27d3274c58bb9e7c2fd582807286c68d69f6920a803f4b7ee6b55b7c2102302cd2e89a35dae2f891782e05418a2bdd6f2f541b75dee6fd4 WHIRLPOOL 766546e8d15c377f61846631517425e598ad7a614663c24ddf66b459688165cc6772b381cf745ad0a401e961daa433826e63280df7ebac4f6483bbf3643a45fa
-EBUILD Devel-PPPort-3.200.0.ebuild 422 SHA256 fee3397290968e728b8566013d947b7e26f12f21d68ce83376601d83271f3fbb SHA512 c998c844e82f619af05b7d74073c68aec1b1b07167151d4496955dfa50f73c280e6fd7e6cba43e298b3192c3bfd7db08716923ef77afd1200ae0bd7b10ebaa22 WHIRLPOOL 1a3b52a4bf2d80453ce1664c61f876a6f81376f49210d81133412571ab2992affe55335aeb2d53623227c59aa682cd7097b29f12aa1284dc4e237aa65bd300bc
-MISC ChangeLog 1008 SHA256 83e2fb816ee2c8a7849513788e813383008f1edeb29c4505f243c6b841df9101 SHA512 96a1195bccb86dea72791e07da255156df224032bf460af15af1be465021c83b6bfc7f797cf38217734462cf0c9c431802291bbba89bfcaec70042f84a7eb672 WHIRLPOOL ce494e8b72a3116947bf51ae1633630c7a370bdb8c480d7bd235e81276c4efcdd029630f79971c5f81dd279c2a98776c856f99286c20af5a23f22da6a0923702
+EBUILD Devel-PPPort-3.200.0.ebuild 447 SHA256 10128f0d7837d917aec3d362c9e76e9ebb7e9d07bfdb9a3aa33eb98b4310ba13 SHA512 db3d9a58302c0a832d5e91e0934059f41e1170d407c9a8710de5f278c56407fd45a90130ddd90c19a0d55e07a7beedfe06416b3a91e0778d5c8b685d637381bc WHIRLPOOL 2f792cb12e4dd8a8c483d4b46594f55de4fb58e764d2b04e50060ab442fc70d8c5c8d12835e50ac452d18c57b8143c0acb0e281fe61ec0433e14fe1e7eafcd91
+MISC ChangeLog 1474 SHA256 f32d804c4350cb28f304170e5ace40f7490d71fe7f05c5ea223f9f2b056ab241 SHA512 6edc64164d8f4a84cf5610586b3e3ed221db3ea0471612b6258997394db144c8123a558fe9a217873b97f946d447e30945c6d392de8fc6307b836a0b9d527dc2 WHIRLPOOL 82779b16a49bb186d4a7d1a210336d82f6cb554d8e5a41dc0bc264cc2d8db9d60504c4a0ef96f625bd4999515827e37d43db4699252e9e13fbaed0ffde817168
 MISC metadata.xml 158 SHA256 1fef4c0af5f71b777110f54d9dfbd27d6c85c750fca007f4a2fb38345ebbb710 SHA512 0b83af178d8e59a07953fc2582b6e4177ec933439a6638de4f222e4e9b6c21135ca1702f7f4838624e283d39db0d3f4d4227ddb6108dbb06cdcc09ebf9d6bc55 WHIRLPOOL 696c0536d7047d00bd1590ddb9bebd01caec0e15b3a970828eebe526b46f14d61eec5bd541db7d4628bdff743461198158832e2bdb47e31a5523ad63f16708bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlNCn6YACgkQG9wOWsQutdao5gP/VAorjyFtWjaomLzlBto+WtGK
-fX8DP9qhwGAZXdRIlPTGr7o9ccsi579UWar0wDTgrapxtDn4uv4JYPB/2LWqrrqx
-xOpxOdbtG1IguR8FdHtbqqocKKsDsyrdQt4PZCf0Sy0w0PczbkikDWOfs8hB6gtf
-CBUBIU9eu5Sz1KTgcOE=
-=VeXz
+iJwEAQEIAAYFAlNZTvIACgkQG9wOWsQutdYL9QQAgD5a4bhaivSGXwgw3WJjtwCL
+8+CdQSSIBpKj83S/wGWiUmVsjAYrWnXFSIL425PAccwv/wNqcL4CMsWD16vcbH94
+W14N53EWgQdY7765vConejL4HM4LcgIvGR+dMK0KeKbK/19udWMrRyyNdkz2IEuX
+GAT1iazm8HeIqRX6lUQ=
+=ji9v
 -----END PGP SIGNATURE-----
diff --git a/perl-core/Dumpvalue/ChangeLog b/perl-core/Dumpvalue/ChangeLog
index 751fec0892e6..fb55388294dc 100644
--- a/perl-core/Dumpvalue/ChangeLog
+++ b/perl-core/Dumpvalue/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for perl-core/Dumpvalue
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Dumpvalue/ChangeLog,v 1.7 2014/04/07 12:48:01 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Dumpvalue/ChangeLog,v 1.11 2014/04/24 17:45:37 zlogene Exp $
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Dumpvalue-1.170.0.ebuild:
+  Add ~sparc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Dumpvalue-1.170.0.ebuild:
+  Add ~ppc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Dumpvalue-1.170.0.ebuild:
+  Add ~ppc64 keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Dumpvalue-1.170.0.ebuild:
+  Add ~mips keyword wrt bug #505156
 
   07 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Dumpvalue-1.170.0.ebuild:
   Add ~ia64 keyword wrt bug #505156
diff --git a/perl-core/Dumpvalue/Dumpvalue-1.170.0.ebuild b/perl-core/Dumpvalue/Dumpvalue-1.170.0.ebuild
index 0a40688fa84e..f3cb2107f446 100644
--- a/perl-core/Dumpvalue/Dumpvalue-1.170.0.ebuild
+++ b/perl-core/Dumpvalue/Dumpvalue-1.170.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Dumpvalue/Dumpvalue-1.170.0.ebuild,v 1.5 2014/04/07 12:48:01 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Dumpvalue/Dumpvalue-1.170.0.ebuild,v 1.9 2014/04/24 17:45:37 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="provides screen dump of Perl data"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/Dumpvalue/Manifest b/perl-core/Dumpvalue/Manifest
index 3c01a415d3a4..4cb173d7762d 100644
--- a/perl-core/Dumpvalue/Manifest
+++ b/perl-core/Dumpvalue/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA256
 
 DIST Dumpvalue-1.17.tar.gz 18434 SHA256 9ea74606b545f769a787ec2ae229549a2ad0a8e3cd4b14eff2ce3841836b3bdb SHA512 c4c275ff9e01d699eb785ce91c213be9baabe98f4fc6395ef3f5b1505470c87c60ff0b0b88df7ebdb6124bcd9bd8e596eb016b663950d1685478df9b8b1b707e WHIRLPOOL b4281960ed7ce7552565c1e03d5f84f47aba926bf25dee072742d30503c698ef8eeeec64c542b6cd341bfbde62a34c5f7dfdb44315b274192ad138dff221c6ee
-EBUILD Dumpvalue-1.170.0.ebuild 425 SHA256 936b72300d2a572b63c2800b687755ccedcbbc3fe3cd26baf53ed6bdec236382 SHA512 4fc7d34b859f37ba0cab63c29faab14a8b611e02d4fc2a541c3d2bdbf6e5bd9444f6db5ae9cd5072a102a461e35068aea07a0625316b21dfd0f413957a1e57e4 WHIRLPOOL 279cee57d1ac73417a59c94c2319779554b075ff5377b6087817fcca963bbdb9bcbf703b671f0b897e6d30b6e17f0938c0b7e3887a63beb48faceb688d6969f4
-MISC ChangeLog 1044 SHA256 4a5c6a6a458a5e2a6cb6ee4e026b7ed7d6459836ebd9c70d79b917e50cbcc193 SHA512 559a20ec8d03913a7f0aee314a7ba76526f9285e79415eb40754ef88a08cc0f39dcd03331c4f91abbb663da5d5de95c65d4983001a0365d00fe3a152fe919d02 WHIRLPOOL 7a01e3e9978e4e298aaaa83b102a0561d72c60ccf0513f6f641c7e2250b84fcad404b9102c754e5bb9bf3196b0de99ed7056eddf819ef9eb8ea695f6ea167423
+EBUILD Dumpvalue-1.170.0.ebuild 450 SHA256 70ffc5fc989b73bed3e8058c36d2b3491d464281b49cfb8c066fb99b56fecd1d SHA512 faee49f96d92a6fc919e49224708eedd76f7f1cf0d5c0b716c44bbe92286f1ee1354b1a8f1c55b90c33de9c88889a38f465e2a3dbbe065adc7caddc82a896a24 WHIRLPOOL 6227884f28f1587af4dd4bc04890c42680c6191ad2a51c530766a787b8b9d3291ccafc0a3183bd22ba11a347ab041ca1d45b763e32ac958fdb63930f4c9ac062
+MISC ChangeLog 1498 SHA256 c34cbf91ae95b5491c0bb9690356631b979b4d1a7802c90fbdd9aba5576c946e SHA512 343dd768a241b290a2df58a8905d512da0fe0c8a583c4eb009c09088cdd4807bc8ce88e0184c40f23e5c546d5bd2ecbedea984533e25db75c993104052d537cb WHIRLPOOL 7df9ed49fe8e7415846a4f862b6f2a7ae503bb67efaf09417da36a9c30ee1e74e6928817a7c8f5ed351b4f8e40a9d929c350d7972a06c6219b411d9fffd76bf6
 MISC metadata.xml 158 SHA256 1fef4c0af5f71b777110f54d9dfbd27d6c85c750fca007f4a2fb38345ebbb710 SHA512 0b83af178d8e59a07953fc2582b6e4177ec933439a6638de4f222e4e9b6c21135ca1702f7f4838624e283d39db0d3f4d4227ddb6108dbb06cdcc09ebf9d6bc55 WHIRLPOOL 696c0536d7047d00bd1590ddb9bebd01caec0e15b3a970828eebe526b46f14d61eec5bd541db7d4628bdff743461198158832e2bdb47e31a5523ad63f16708bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlNCn9QACgkQG9wOWsQutdaomQQAxq0vNkR1FtO2o+pDdJhcfCpp
-H7VVs7lvTkYJsUKTowIeBiwEELIq3UIhcniObOWcm4IuXSZsJCAhOt14FU/bYs79
-bWIJWcCOYtHff+LW0rvg6ShK8OBEsfX45qwMCNMx2+Jx7DnyJr4CR+6RkusrmC6E
-6pPJmLQdCdDjCFNTRgw=
-=x2OU
+iJwEAQEIAAYFAlNZTxEACgkQG9wOWsQutdajUgP/SfQ7PDLjy2MA8Nw8/OyRTi3R
+rzAw2Ahs42oLxjaTnkZ8wTjYArQlKfsi0wubkBskBkbIht3raJZgJXAjpsZT/jl+
+QB26kxeERWdzjPhcrofFHABmeynr4e7NraeJDhxYaHEV1GhM9LZFbQXNMzT5nojs
+MIudFneYFYBBDzlbS/U=
+=cJvJ
 -----END PGP SIGNATURE-----
diff --git a/perl-core/Math-Complex/ChangeLog b/perl-core/Math-Complex/ChangeLog
index bac5bfe2b460..c669fbf1412f 100644
--- a/perl-core/Math-Complex/ChangeLog
+++ b/perl-core/Math-Complex/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for perl-core/Math-Complex
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-Complex/ChangeLog,v 1.5 2014/04/07 12:48:52 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-Complex/ChangeLog,v 1.9 2014/04/24 17:46:06 zlogene Exp $
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Math-Complex-1.590.0.ebuild:
+  Add ~sparc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Math-Complex-1.590.0.ebuild:
+  Add ~ppc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Math-Complex-1.590.0.ebuild:
+  Add ~ppc64 keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Math-Complex-1.590.0.ebuild:
+  Add ~mips keyword wrt bug #505156
 
   07 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> Math-Complex-1.590.0.ebuild:
   Add ~ia64 keyword wrt bug #505156
diff --git a/perl-core/Math-Complex/Manifest b/perl-core/Math-Complex/Manifest
index 776776c58a41..701bef566dcb 100644
--- a/perl-core/Math-Complex/Manifest
+++ b/perl-core/Math-Complex/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA256
 
 DIST Math-Complex-1.59.tar.gz 38980 SHA256 f35eb4987512c51d2c47294a008ede210d8dd759b90b887d04847c69b42dd6d1 SHA512 eb20b0aa505ba2ed1c177addf1f477a82512644aace8f92111654790292402648d30d2bb6c4a27ba411a7b2d33927dc5ac913c820f7117f00fe66395f6b0f4c5 WHIRLPOOL 064e77cc186fedee3ed29aa84ee3d6ff6f7587d620d9d1a9706b37d0eb9f61b2980e126065a1c9af153840142c78d1c5fa3d2a718f692cd708f63c475063b7b0
-EBUILD Math-Complex-1.590.0.ebuild 452 SHA256 10aedb6fae5e92f871c2c2ea9e1f68edd00f2f16e37c338ea4f44fb0616b183b SHA512 e903254d33051e923535092dbe4ddf4893d6e294005a3abd2869acce122aac037e7c516c92f71f5bc83b1c429b69e757760614d8b3d4a5f7edbf611ceab45b64 WHIRLPOOL 5c673191adfa5b28afc94924063e4644013dba30a685ab3751189101899c5b3bf18122393db6a1daef707a8b665ef18234f20e1a6d29f330062fdd4791ec2184
-MISC ChangeLog 816 SHA256 331facea8ccb131072455f1f5f8f0bf99af3d4fdfbbd00d596457553e47feb83 SHA512 f0590ab0ce715e9800c30d20ec125b259af25d5b2ba1196a0337406f8b735fa690be8e928b66a9c7ea5c9ab56366b009d96e460b3f7d768213696d6a473862c3 WHIRLPOOL 3d080f60cb35cfdbbebef34d5300283800490cea3cba1d7d5b80bdb4f54e49ed2907c5bda71857e2cc6b477a80b475a205e62220c9d1eae0aab0ff2e30768c37
+EBUILD Math-Complex-1.590.0.ebuild 477 SHA256 b6ac3822ff1a2c922ccd95cf65ba7d2397ca4d3d945e2ab2f545fed558c54b90 SHA512 0cffb5b9dce395928b6a2ad832d4d3708be34da349a4e1a0226566ed82f5830e6b44fce090e92b8f01a576c6f2ab7991809d87a458cc6be759ed221d0ec43d5c WHIRLPOOL 2aa3c4a660b5c4df6516c6146d13a0023c5629919b11758ff5afde86064bb1d6ecccabe3c497a8f7a531f9bd3a99c17eb152423c7d0ffe59f166bc0988fc56ee
+MISC ChangeLog 1281 SHA256 15b3b5c39aaf630ef9b9564ccac006c1964a978b05e1df6a8e550070bfbe3124 SHA512 16038eebe10a978336fe58d5a49df11ee7b910955672251ea2d96ac923289f955cdb96d6e0e5828b642c0e52b64ae8b6337cdf91f588971f2235776e1fbd8f22 WHIRLPOOL 46c7a75cd5dfb67ddb38216bdcb32732756436763e684ddf6df74af1ffff816e16f068775c11922ed0613fb33ce8fdf823681b2a0a5e74bd6003634e9507aee6
 MISC metadata.xml 158 SHA256 1fef4c0af5f71b777110f54d9dfbd27d6c85c750fca007f4a2fb38345ebbb710 SHA512 0b83af178d8e59a07953fc2582b6e4177ec933439a6638de4f222e4e9b6c21135ca1702f7f4838624e283d39db0d3f4d4227ddb6108dbb06cdcc09ebf9d6bc55 WHIRLPOOL 696c0536d7047d00bd1590ddb9bebd01caec0e15b3a970828eebe526b46f14d61eec5bd541db7d4628bdff743461198158832e2bdb47e31a5523ad63f16708bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlNCoAcACgkQG9wOWsQutdaoKwP/fmOkZcRWm2OsT+DYqzERP/Uv
-SvE2raYbefhUdhCPXxkBwX/UJ1Iv5vwQc2OgjSO4E2NgbYxvzvQL5Tx0fgyI4bYA
-Megou94KJLh/1SyoM2Q++r50FZ9Y87MXuiXjf+JoMFd/QcEzpygmkHMXklPD+j8B
-pzN7EVk3WXFB7mdM9Ug=
-=dIDu
+iJwEAQEIAAYFAlNZTy4ACgkQG9wOWsQutdYabwQAglvKiESoiRnaGqJ/uLwHuOZi
+a+leCrI8Ivcw82kqjWqepy0VU+9tyKFwav0KhKrxKVB66vAtQhAGutS1U3y4NPH4
+Q72mqh0xO1idC+flJmvmJOuoa7x7DKLcsmkup35e6gbU0p+xndBWyllPiFZfpk2E
+31T0GjAwJkV2PdERp1U=
+=DAsG
 -----END PGP SIGNATURE-----
diff --git a/perl-core/Math-Complex/Math-Complex-1.590.0.ebuild b/perl-core/Math-Complex/Math-Complex-1.590.0.ebuild
index dcfb1a2a4dcc..80058c4ba7a2 100644
--- a/perl-core/Math-Complex/Math-Complex-1.590.0.ebuild
+++ b/perl-core/Math-Complex/Math-Complex-1.590.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-Complex/Math-Complex-1.590.0.ebuild,v 1.5 2014/04/07 12:48:52 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-Complex/Math-Complex-1.590.0.ebuild,v 1.9 2014/04/24 17:46:06 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="complex numbers and associated mathematical functions"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index d46bf26f909c..3212e3ec7f7c 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8866 2014/04/23 21:48:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8867 2014/04/24 10:38:57 jmbsvicetto Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  24 Apr 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  arch/amd64/package.use.mask, base/package.use.mask:
+  Mask tokudb use flag for dev-db/mariadb in all arches except amd64.
+
   23 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
   Remove networkmanagement mask on request by mrueg
 
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 8bab7705a82b..d2629b90384b 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.180 2014/03/27 15:00:53 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.181 2014/04/24 10:38:58 jmbsvicetto Exp $
 
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -18,6 +18,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (24 Apr 2014)
+# It's only supported on amd64
+dev-db/mariadb -tokudb
+
 # Mike Gilbert <floppym@gentoo.org> (27 Mar 2014)
 # sys-libs/libseccomp is not keyworded on many archs.
 sys-apps/systemd -seccomp
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 6708b6ddfc97..67af3402ceeb 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,11 +1,15 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.562 2014/04/23 09:19:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.563 2014/04/24 10:38:58 jmbsvicetto Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 #
 
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (24 Apr 2014)
+# It's only supported on amd64
+dev-db/mariadb tokudb
+
 # Lars Wendler <polynomial-c@gentoo.org> (23 Apr 2014)
 # Not working on 64bit systems
 media-sound/lmms vst
diff --git a/sci-biology/profphd/ChangeLog b/sci-biology/profphd/ChangeLog
index 5f1300e41b35..5b29b3af77b8 100644
--- a/sci-biology/profphd/ChangeLog
+++ b/sci-biology/profphd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/profphd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/profphd/ChangeLog,v 1.3 2013/04/24 14:28:05 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/profphd/ChangeLog,v 1.4 2014/04/24 11:38:57 jlec Exp $
+
+*profphd-1.0.40 (24 Apr 2014)
+
+  24 Apr 2014; Justin Lecher <jlec@gentoo.org> profphd-1.0.39.ebuild,
+  +profphd-1.0.40.ebuild, +files/profphd-1.0.39-perl.patch:
+  Fix for newer perl, version Bump
 
   24 Apr 2013; Justin Lecher <jlec@gentoo.org> profphd-1.0.39.ebuild:
   Updated deps
diff --git a/sci-biology/profphd/Manifest b/sci-biology/profphd/Manifest
index 7038e8ce318a..691620115325 100644
--- a/sci-biology/profphd/Manifest
+++ b/sci-biology/profphd/Manifest
@@ -1,14 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX profphd-1.0.39-perl.patch 376 SHA256 3452144a6f1dade6ab5219b757975002b617b04b1da151593e810bbd561be500 SHA512 e4004dbb835560b3a2aa140aea0ed57812ee9dc11dc18fb7b1dbdeee73bacfef3fecfd686f15fa87cde5597ddb322057d67fa61708ba3077c5449f93a0284b8e WHIRLPOOL 5fd5111f9f5075a7533b5af6e72976cab6404f36b3be3558809815553243aaad4e763e7cc1ec8e06c3c841617200c9c7396aa64c4728f6224b4879416de8f3b8
 DIST profphd-1.0.39.tar.xz 4406776 SHA256 4ff67e7b4dcb5748ee5115f1e7b9de7de6ca1c5a7982971a7147fe4ee5a5d288 SHA512 0ea6a34a8dad8fcd0d8b23e7a7d476e211587bf580389e9f43ed857bab7853cbe5ce698d2a610e9344e9bc95661cf074355310ea02c1a03e6378058ba169b15b WHIRLPOOL 7e149f3e724ae5e727810ace6a1063708c35bb957861e4873c0763e48af5362ea50757d94c592052fec9d6e63767d036a39104a72ba6deb981c1f6023f19464e
-EBUILD profphd-1.0.39.ebuild 893 SHA256 f7ada60c521ad981e95e825e21b9ad423360e6f9d61e0bc3fa08113c72dd4841 SHA512 2fe94fb6dd0c02b97e2ec163ca82361428002e8354aece00ad3b007c418066663c7241bb495cf6d04268b8433f15911bfc8360a2bceb32189fe9af24b6ff043b WHIRLPOOL 9ffe526ed89da3fc91f6685a2ddad6002eb07252e0cd360dfc04ef649b095e8cff1245921522643ed4e43a3b36c5164018ab16a785bdb3dc982950a770bef5de
-MISC ChangeLog 529 SHA256 50d38d679c6fc09a8efec9d5754964258490168bcebb5317ae7289e67f0f758a SHA512 23d8321f958ca257ce2aed6c61046fc35a916aec3549efba936f16ae9040e40edf657c542eebf8c292a1dbe01ffab035a10de8f51b0e3fc017dfada9933a0b4d WHIRLPOOL dd5edf41c4a6cba583318d289bc95c91c4d83cc0cd58eabe2ac738d1b8f856c0f2d6e1d86514af9fd246a11866fd0b6cf22db5c218d25fd453962a7e9fa347e5
+DIST profphd-1.0.40.tar.xz 4491592 SHA256 50c85da552993758df191e3e06910fb221a156a8eaba94badf5a716b04648c5c SHA512 287f1a548030e7978119788dffdf2529e0018cd772bc820e116f79ed10cefd440645424b56415333362098a1ed32f4841d3fd4069adede2a95968f81c63956e3 WHIRLPOOL 4d7ac3cf32607cefc983116fa8fe8e795e92e89590bd612a2180e9fd59ec5c60220b065a2fddf3552aa81a3d02f852a36e08086d0867ac28ded2faf0d31a38ad
+EBUILD profphd-1.0.39.ebuild 947 SHA256 7bb9ab3b9a03092a8fb82beccd09f8180137de6303c23eab4ff70c52c13f2791 SHA512 395d206b8ef1052a479f3d48fe2a3f36edab70643dc440b8b34a305d8b039b0b906c44d745050403a46ce2e07bb03f82da46f50a0e55efc430f7225915e83137 WHIRLPOOL d00f4c5003b7270188fd9f775f702f7e3748ac89c8b23a993764eee28eae95a9070a74dd8c6498976e40920caba6d5ab460cbb4485dc73fc1228765ae188d3b4
+EBUILD profphd-1.0.40.ebuild 955 SHA256 b68d64404c70758d249ca9842e49a037f8390e025648fbf46b52c91905754b87 SHA512 cf99a163815f28ff5b6058b9db26ee311071fc3545c8aed8e4a53de2ae39716dc920c0fe7a818d8ffae90c9275a18214c4798cd1e605bc0f3d65ba99538d7ec5 WHIRLPOOL 78bf16fff3d8b7e4bbcb780d0e5b446ee5b13427a3322c2c26143deff5cc4ae1a0a9afcf42c778250cb97773d317066044efdcf4fe0f402e1c78f5c5318ce245
+MISC ChangeLog 726 SHA256 6b1b7fe7d0c46bcdc7cec211cbaccc8760e115256be3533b14356084cf707b7b SHA512 fa760ad44e8fdfe6c16727e6b2c8820ccbb1d06df9f1a1d6750876ed734fadcbc39fb56d5e3c7098b479500b880e236a8f744c17b257b997a3a06e0fe0ef81e6 WHIRLPOOL 3eb1e886b3d977cbc425e4be86c25d2f1804cfadd66c6ad09bdf6dd023bd0e7afba1807b08d3ee9de64888f6e91c86b48ada852054f6a0a40283fadbd434679a
 MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREKAAYFAlF36/YACgkQgAnW8HDreRb3QQCeKtw6vhMmIjup9wlVGd2vxn9C
-E0IAn2GSdsa5XZNaTyJnVPEGKw2mUzy/
-=WxSN
+iQJ8BAEBCgBmBQJTWPfsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir2a8P/A4HxLjLFmbqkZtScoWrJKz8
+JyPIzj/TkpRPBJzAuJdQUyGV22k38QDxvmaKCHHbPBGj8ECZc47hJRjDlSPvhQ6j
+xNwIXL4Y+E7GLa+DCBluUa0GkXON8JiCm7d6d/pQsQA76NroqSTZm3gRo7yO/PBH
+HJVP6lRJYMcbh2ViV7jXf9e0kGgez4Cw53/J1MnN0WDcwY6fjO6P2mh7oOELiey8
+Zqe76zaqaUIR0apu3tvmyLtQfga90mxrbf3Hw4BrV++V94vqRw09gC8LHIF4ML9e
+80KyYdXHQ2CUoQrzFU5MRigakHisaCriXUx3uY5GLusec38iNVbixy7/iR8+7/ll
+hy5yErq5IAaSWeuTp8DX240ichjjvH8D9gQJRKMM5FCGQK9+rrVtjVbKLfH93pCd
+Jc6eVoUSKQRwjnyOnf/MYH6JTqApR7J8iU/9m3dp2F6EZXxcV+3P8XZzVZPD6EIa
+LOppRjexEMJxdvjQU5u/9Ltkd+cbsEn5IAWIZI4h33BYxhMJNOXmh2SbxxDaUwlL
+7y/OOYDOtoCExhzn10epYvALrdWJZuSV4G1e6PoSdbVnUmFSj8iN9MexkFIL6LRz
+hZWE0oJycT97m0PaFBNo8yJfQC9VQf7uof50JxmFldAnz5l2Zoy193rMerfXIkAs
+YQ/Pu54jPms1nI50iCEV
+=uMrw
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/profphd/files/profphd-1.0.39-perl.patch b/sci-biology/profphd/files/profphd-1.0.39-perl.patch
new file mode 100644
index 000000000000..10682271601c
--- /dev/null
+++ b/sci-biology/profphd/files/profphd-1.0.39-perl.patch
@@ -0,0 +1,16 @@
+ src/prof/prof | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/prof/prof b/src/prof/prof
+index 4f26024..356442d 100755
+--- a/src/prof/prof
++++ b/src/prof/prof
+@@ -238,7 +238,7 @@ See each keyword for more help.  Most of these are likely to be broken.
+ 
+ alternative connectivity patterns (default=3)
+ 
+-=item 3
++=item C<3>
+ 
+ predict sec + acc + htm
+ 
diff --git a/sci-biology/profphd/profphd-1.0.39.ebuild b/sci-biology/profphd/profphd-1.0.39.ebuild
index 77e853cd685c..72bf2e8fff12 100644
--- a/sci-biology/profphd/profphd-1.0.39.ebuild
+++ b/sci-biology/profphd/profphd-1.0.39.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/profphd/profphd-1.0.39.ebuild,v 1.3 2013/04/24 14:28:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/profphd/profphd-1.0.39.ebuild,v 1.4 2014/04/24 11:38:57 jlec Exp $
 
 EAPI=5
 
+inherit eutils
+
 DESCRIPTION="Secondary structure and solvent accessibility predictor"
 HOMEPAGE="https://rostlab.org/owiki/index.php/PROFphd_-_Secondary_Structure,_Solvent_Accessibility_and_Transmembrane_Helices_Prediction"
 SRC_URI="ftp://rostlab.org/profphd/${P}.tar.xz"
@@ -24,6 +26,7 @@ src_prepare() {
 	sed \
 		-e '/ln -s/s:prof$:profphd:g' \
 		-i src/prof/Makefile || die
+	epatch "${FILESDIR}"/${P}-perl.patch
 }
 
 src_compile() {
diff --git a/sci-biology/profphd/profphd-1.0.40.ebuild b/sci-biology/profphd/profphd-1.0.40.ebuild
new file mode 100644
index 000000000000..0995a72af1a7
--- /dev/null
+++ b/sci-biology/profphd/profphd-1.0.40.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/profphd/profphd-1.0.40.ebuild,v 1.1 2014/04/24 11:38:57 jlec Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Secondary structure and solvent accessibility predictor"
+HOMEPAGE="https://rostlab.org/owiki/index.php/PROFphd_-_Secondary_Structure,_Solvent_Accessibility_and_Transmembrane_Helices_Prediction"
+SRC_URI="ftp://rostlab.org/profphd/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-perl/librg-utils-perl
+	sci-libs/profnet
+	sci-libs/profphd-utils
+"
+
+src_prepare() {
+	sed \
+		-e '/ln -s/s:prof$:profphd:g' \
+		-i src/prof/Makefile || die
+	epatch "${FILESDIR}"/${PN}-1.0.39-perl.patch
+}
+
+src_compile() {
+	emake prefix="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake prefix="${EPREFIX}/usr" DESTDIR="${D}" install
+}
diff --git a/sci-chemistry/gabedit/ChangeLog b/sci-chemistry/gabedit/ChangeLog
index 64d294af7288..8bd2cadfeaa5 100644
--- a/sci-chemistry/gabedit/ChangeLog
+++ b/sci-chemistry/gabedit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/gabedit
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gabedit/ChangeLog,v 1.25 2013/09/18 11:37:59 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gabedit/ChangeLog,v 1.26 2014/04/24 12:46:46 jlec Exp $
+
+*gabedit-2.4.8 (24 Apr 2014)
+
+  24 Apr 2014; Justin Lecher <jlec@gentoo.org> +gabedit-2.4.8.ebuild:
+  Version BUmp, #508388
 
   18 Sep 2013; Justin Lecher <jlec@gentoo.org> -gabedit-2.3.6.ebuild,
   -gabedit-2.4.0.ebuild, -gabedit-2.4.2.ebuild, -gabedit-2.4.3.ebuild,
diff --git a/sci-chemistry/gabedit/Manifest b/sci-chemistry/gabedit/Manifest
index b11fb75eeb85..5f9b5a384f19 100644
--- a/sci-chemistry/gabedit/Manifest
+++ b/sci-chemistry/gabedit/Manifest
@@ -5,24 +5,28 @@ AUX CONFIG.Gentoo 349 SHA256 9ecf7149934fee3f91024cb13b4431808b62febb2a4e77b1191
 AUX gabedit-2.4.2-gold.patch 564 SHA256 a75ed9aaf44a3415171e3553f94e832086e14945a3eb268cf007ffd92e3e2b76 SHA512 5239c864b2809c19ab4ad80fb5b432f90beb2226a3068771e0a4302aa382ad13a0fdcfe6a6beb7331abc9482a6bf999e4a7c783bc85fcdab7aaef41d5aa5585d WHIRLPOOL 2b72c1a249ce95ecf3c444830b8ffd185361e084d4b9d9be091e235071fc9c18c29ca9ed95eed37b99af2c108b6916ea5332d9722f41a3c9eb58a2a0759ed625
 DIST GabeditSrc246.tar.gz 1964406 SHA256 3881df1f2d4788d4b3660e7d8af0f7318223dd50194fd9ed0072dd58a6beaa12 SHA512 fbd92ff532ce21e97dcc2d012927fb0d19f4634956e88122a8e9a41e9484592ede455c3a88670cbd1c6387a4d0916425f897d2ade1957ebf4b25b89c7365a076 WHIRLPOOL 12be8d5299e6adcb63e4c989542f2fae02136a18bf515ded7ce8f7b3ab4e69f9fb085778be0bd5589b9ae42b7fd80c5ea7fa451a24377e5feedeb09ddff7a6b7
 DIST GabeditSrc247.tar.gz 1990187 SHA256 e9f84aae6751146f72e5cd8d3f33ec68f057f720edc68e3a89d53c5a2c3c9020 SHA512 a562dd650f9dc90a3c28a6d6b45212dc1d945548c9021f84e25a96022e67f95309030ded30bc20c052526783d0613f328830c640955822237828fcbac6d91b95 WHIRLPOOL f6a69e8e6a60fb48ef23849538a8718f507abc4e09de97abe10016ecf7b4ae101c09135f2762d7db7d764c4a66f9a268bd194ece9f05d6162b94a70b36ccec7a
+DIST GabeditSrc248.tar.gz 1992373 SHA256 38d6437a18280387b46fd136f2201a73b33e45abde13fa802c64806b6b64e4d3 SHA512 d06b54693c4887e3cecb6bb20b98307db8aeb7f32ff87b85af536a4034f2d6af04f30809c04e29ed6fb4744e6290dcd276c9f85b2940daa71a595f6bd5f154da WHIRLPOOL c47cf238b7080dbeddb3992162e6bb31f17a33623299a0bc4608aa86d2d4ff71f18159f3ca952d71251b039ace9bca0d3736a56af3e1dc8305200395c2a422e3
 EBUILD gabedit-2.4.6.ebuild 1461 SHA256 469136815cade7040b42ca2f430e760d44f49eead662a454901256a2864e9d09 SHA512 89569b72dd09fddf83a356e24c42b0cb20ad517693b53744b68ae466b3432119dad608c255fd9800d67cb83abf14c04a86f70500c43266db64b3029c34434d5c WHIRLPOOL e3207c674f7c62f2e78b1e3df1f3021ea1ce81f47328e5ca006a87835cf9ac2ef7230cafb8e84c9a5be4536e03de10a5836848c7dfc05276b75bfbc612774cdd
 EBUILD gabedit-2.4.7.ebuild 1464 SHA256 57c68ecf67c153093aa27d4b8ded61a12f6a0a7cc62cf2563c222c14e3b69c18 SHA512 8e330bece2286279706cd4eb5ed1af5d59ca129f4f77efcdb84ed64a78051107a2f560c524af6dc40fc63e935e563513f1da1f289ed5c385cd0024f793ed5c4a WHIRLPOOL 189577e24fe85fb0854c7b32a84c900a7b76d48d66067801a57bc09c58cab7b18148aa152ddcdc019daf9413556b97961e22bb7f758ced8f781c05441b63b8eb
-MISC ChangeLog 3883 SHA256 1d1dbeb03e3df9d52bcb51aaeaca6ca9d9d7cebde9cbefd798c92a8570beb823 SHA512 d3da913a93c8be789dee9cc41855353b4525da9e05aef28088a56a8029fc92fe261f9382213490e1bff37875d012f25f6b88a23578069e6a210de83c2fe4578c WHIRLPOOL da2b6cadc4ac7b0bbce459cb2bf0e49be4a4a24c2dcb5e1fdad20ac28cda64cff43e24124fd8e1451f6c15e620a00407d37078d0dd9a51b03f4f46c530fae7ee
+EBUILD gabedit-2.4.8.ebuild 1464 SHA256 db50e791e0e4379d1878e30582629482847d1c3b0e84c5275863ff5fe2dce271 SHA512 ef99337d8bb7e788b300ec37351d36a5b0936a08138e1a793bcdeba553816db9abbf082c6d76f20580d9cfe16194efe546791c74f5be22b444b982c5109f0b07 WHIRLPOOL 3283060d667f258d24445560dba2f7d84f007dc4b350c29e82d0686e00f9c64e2dff688ad99e55ab3b131caaa41fde59c7d2634ff4ca3be51b967aa14080b3a6
+MISC ChangeLog 4008 SHA256 a2bf0ff0034a5ef170584a4e480c5a7ffa5fa00a6f4350766497f763d0cd2aef SHA512 1f3a196b265dcac36ba5ff938e7cdefdd4890e7f99f0ec6928c2d10d81792a993af2032a21a0a0d3eb854b5a2955c00eeecb1a8f2238a000e743019d9a0882ec WHIRLPOOL 7da8879364798613e1beaf34d74402d91453c3e44aaa0e9d47bf86843dffdae65ad6de48fbe7647ea9dafdc3104949558cbcc8218b5f9c0304730f8016e797fe
 MISC metadata.xml 284 SHA256 06edf0076d7e6342318b19e8adeab1daeb96446530b32889e7b265f75bb4e1b7 SHA512 a953852e0c4b98da30a203a695bc9f6f0483b1892a92bc21b8abea83dfaf9868e52657367df12ade2643fe3ed11a142932e5e7e59ef2f6c3a79dad362d37331b WHIRLPOOL c0314e6aba68193733693a5b8c614c1d82b78b58beada8d4bc749201501950929759b15891e8679ec73428c6f2ad311fd87673c0a1e76fea566acdb71b10cb53
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSOZCYAAoJELnU8jG9FVirOG0QAIhqrC3UIE7PQXu1htprh+vN
-bBTYG0qflkXdb8Y5pEawDDtFKowQl1jJeh3hJGR7NzISEFW6vDXXCUJVAtQ0XMdn
-cckbDij3Ij9EFjCrbIAxl6DgiZ7rtF+beqFed660thGUjO6DlPn1iD5s7TAwkPsH
-gDNhPCVMci6KAX10T7ihNIBrcxjrDskyU8innKgJYXb9zJLa/2fOjgKVB+lb2ymt
-/RhfLdHJaF18pnI713clFrMuIce5iiuxlZKxEvuLSX2/+EQ+cXo8UVQIOMXWadQ6
-e36nGywTJcMEDSnwMWVu6zyNtZQdoOYq20YGTZV9/xgp3eqjGqRvCKk2HBfaMs4a
-CJNGj8XuKdeCYLO47TbdxSiBQUwBGegbnHoMVJPtZ7l9zk8nqaVGn7kUxKJEe61A
-wloJAycZN1s8zcKwhOXFAhlzBMXvf2JHaMvw7swGKGXRUy9f/1b5gfpeqp2gTtiv
-FFV/JwttIrk2czNprh0DkLHYTIPrXD3NhcJ14MzRbAIgjl40MBJJW3YJ/HKeUcNj
-ibcFjqVMaBNmcx4GYtuumKNk/PUa486msVaxtX8W+jEpkq944Y6zXSO29aF+19od
-kDNRIBz9xD0mw4xdcarO99LxPcOgboKyoBj51+Bbgo6pixcK1LirGJ9Ewuc4v6wJ
-ttNoh6+kjGgbwVR+YBTa
-=wn8n
+iQJ8BAEBCgBmBQJTWQfhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirzdYP/3I6d6FWhQQi2vql2JptgDZI
++RXUOjHOqdgRcogIrI4RpkF/trEVaYp2lZHTDl3REF2n1YKdpDpLXGQhOuzwj1o9
+WFrk4Oche3BX2/6hvPtMmsP62PTXo50LP3AGqrBZjcGyYi71ayZydhhUO6cGyZ2v
+7E8VNAm/Freo2dfWwL4nehWxL8Ylg+dxHr2N2Y1QSBkeNZcjm6CVoYiPox0DaoJ/
+8c6e30VwNwB9JBOebOCOM83BaS5QyHb1UR78rcidNnv34PNsXGUSSHBRsZ+wFQg/
+rXVgGFAZKI8fN0tPGrUcaTqgRg2SkpoiM2kdRv73pi10IWQrXJHZPUMtWuxN8b+a
+ws+GoWzcGv1dpJfDEQ+NQsjJP/rrEhBbGQnRXdnaiGRxNyEFN5YVKDG4wbqvbUz8
+9MYMvRRcPH5HliNBBIxlxaQ9WjJkR5VZOLN9Zijxqp3jUPZveVtNEWxn0EjawYUl
+8bQ/skNDDUXqISFwptUBu7QepVC13hxWrNTxhY/FO9mtt7RhXUOEoGLujqaP2zHe
+3xLzKVwqOesuanpPKzraNReecBOwoVM98vQDNHIiDVsIkxyopF+FtaiV2QsLYYDz
+V61x1jUhggZp3GNE1onjSREjPX7nk4E+btfAcye5O1R5qXbKsP2/+4erYJuCkKSG
+11TgkkYfmgK50ltPFq0n
+=+4+o
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/gabedit/gabedit-2.4.8.ebuild b/sci-chemistry/gabedit/gabedit-2.4.8.ebuild
new file mode 100644
index 000000000000..42936a2eb196
--- /dev/null
+++ b/sci-chemistry/gabedit/gabedit-2.4.8.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gabedit/gabedit-2.4.8.ebuild,v 1.1 2014/04/24 12:46:46 jlec Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs versionator
+
+MY_PN=${PN/g/G}
+MY_PV=$(delete_all_version_separators)
+MY_P="${MY_PN}Src${MY_PV}"
+
+DESCRIPTION="GUI for computational chemistry packages"
+HOMEPAGE="http://gabedit.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openmp"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtkglext
+	x11-libs/gl2ps
+	x11-libs/pango
+	virtual/opengl
+	virtual/glu"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i "/rmdir tmp/d" "${S}"/Makefile || die
+	sed \
+		-e "/GTK_DISABLE_DEPRECATED/s:define:undef:g" \
+		-i "${S}/Config.h" || die
+	sed -e 's:-g::g' -i Makefile || die
+	cp "${FILESDIR}"/CONFIG.Gentoo "${S}"/CONFIG
+
+	if use openmp && tc-has-openmp; then
+		cat <<- EOF >> "${S}/CONFIG"
+			OMPLIB=-fopenmp
+			OMPCFLAGS=-DENABLE_OMP -fopenmp
+		EOF
+	fi
+	echo "COMMONCFLAGS = ${CFLAGS} -DENABLE_DEPRECATED \$(OMPCFLAGS) \$(DRAWGEOMGL)" >> CONFIG
+
+	tc-export CC
+}
+
+src_compile() {
+	emake clean
+	emake external_gl2ps=1
+}
+
+src_install() {
+	local size
+	dobin ${PN}
+	dodoc ChangeLog
+	for size in 16 24 32 48; do
+		doicon -s ${size} icons/Gabedit${size}.*
+	done
+}
diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index f98416d5d7cf..5724324c12e6 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.146 2014/04/23 18:38:11 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.147 2014/04/24 14:27:03 williamh Exp $
+
+  24 Apr 2014; William Hubbs <williamh@gentoo.org> kmod-17.ebuild,
+  kmod-9999.ebuild:
+  Clean up python_compile function by switching to using here-string instead of
+  echo, thanks to arfrever
 
   23 Apr 2014; William Hubbs <williamh@gentoo.org> kmod-17.ebuild,
   kmod-9999.ebuild:
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index b36a5b79cba1..7e8298dd3e2e 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -6,14 +6,14 @@ AUX kmod-static-nodes 584 SHA256 078b07581e63b5113cef9e85da7d5b53e1fbad91d793f7f
 DIST kmod-16.tar.xz 1440880 SHA256 63412efab37c70459ccef167556965c93fd4f56af5986cd3750542a684c613c5 SHA512 326921bb184d53840837cc600f6301b948031ef7c2048e46ef16bc26ef7b967fa3c20cb133b1ebbddcf8a8537e9af8166fbca6a28d94f694f12ce1d89361a1bc WHIRLPOOL 625c277d7733a344040eaaeca26ce103d79c96ca1ba7759302e5fd573bba86285420c6f599a70411e7732e22145108afadbc29606d9f8fc62fe94479480f3a3f
 DIST kmod-17.tar.xz 1484336 SHA256 3ba7470041de04ca88308f501901b574169cb517d3192397074611b3921a2dfa SHA512 2b237a96b8bcfe03bde30d4f8b6886f8ec33817cc6f0fe810f6f382310bd71814236b299b9051304ca5a9b29c205d8e1ba5a15bf6ee98648644ac268dc368294 WHIRLPOOL 421f95e48da7baf40617c9222d4cc26868d26dbf51f77aa2613cfe5cf7a84b5489eca4611fe86108135c164890eeab32916836776561ab8f2541aa10456d1095
 EBUILD kmod-16.ebuild 3791 SHA256 be36a499e17190ab608b19706978477063d3c6295700838d613504000014bf20 SHA512 a2a237b0f0c95852c64030bae807c9501da448f9c7a2858b1bbbbda5a347b2dbeb473d941f91a28ee7eb2083814f17fa6aefb9081038c771ff658c97d4195852 WHIRLPOOL d7dafcabc14d2195f61dced5724c1de14eaa57770af51c40e1daf1224c6e32dee995a2ba9f0be5185c1de91acf6e3eab83c2a82dc39e2216cd41e6d041623432
-EBUILD kmod-17.ebuild 5123 SHA256 c5e8f16e25b32f8625ee789c4d099c331efa12fae76cf5e6b73c4e229ad4bad2 SHA512 6b4101f8edbd95768ebe7fb30de1f5b080b143db6f0fcfb98d0ffbb7218fcaedd7f39af5a116aa2086df67091e9c255381699ea326a5f1d4cb7427de30a61a3f WHIRLPOOL 9173b8e2f37e4f8aae68535255c984f7bcde4bb80a92647d116ede8b5b6e3a53542d129f332ea6dc5d86ad6fb4ae8e924d57efa0a73386d0ab8b531d7b0ec0b7
-EBUILD kmod-9999.ebuild 5126 SHA256 7f0ae738e895d6debe50bf05a0afad472b917ddc1dd059c3214f2e84eb3f504e SHA512 e2c0cf7937368dc126648fada9b13c1b419097577cf7cb92c49432f748e73f0ec81d20c179b933a4cf8d877b019a0da8684e92effb983ce28d8375a2e48b79d1 WHIRLPOOL dc46b45224d5b9798dcffe98b29fef613ee3e5c75c94aee470c9264ebefb0f99d5fe182d3702670051c56182cc685709edf319bbf92fb435e9817989b68dc83b
-MISC ChangeLog 20847 SHA256 f81acb9894941d04ebaccfa5ca577175fdf7e9c60440d1b6d5ddd21e74b49bfe SHA512 902a46029b98f58e29289c38dc9d93d4325fc00d5ed9e1c2e4b091dc6fbb9be86936a3b302cd3a6b5908ff9e5abe2242bbd5870048a1ecdf1e54a9e33283be90 WHIRLPOOL 12628eece605bd2dd6c99203e664f04716a3ff85f3c3d5803f1c524edd5a44314a171f7bbb82bf438eb9bccfdb3f00b7da866d21a2b6ec71fb971baeda4154a7
+EBUILD kmod-17.ebuild 5123 SHA256 89490b38d0edb53cbab287b3152d67fd4e71c0b0c1fadc6bbc25c3085da454b0 SHA512 6aad5f49a02bba72ef5c985181e2c58495ddeb06776323a7291831bd5dcd92f93a428498f9c725b7300b9fa44b934785f10ba4f3262bea64edde88ef1a020aca WHIRLPOOL aafd9706039fb72046bdbb99a91d75ff4e2ee1f4611f70e16442f9dcb2bb52f39eeadbefbbe3521eb8830272c9ea20d4328f1c446de7272dc6a272cd5935cf2c
+EBUILD kmod-9999.ebuild 5126 SHA256 aa4caf09601cee4f4acb131a2c29f6a8fbf297c47734b2fa2216025ce1e1feae SHA512 fa24c64d77a93e9e778ac16b68390fdf5d89bce4832013302e580de4bc3e361112b161f3c98f6a84d3d9c5b7731a80e7118b30716cc347b103830d17a29cdb9c WHIRLPOOL 31d3cd0c92f847a8949e4474da2f38c7deceb55d40d7bc7aecda607759abca3e5ce8c0ed73b3fe9f00776fda852cd189bad15071a55696f2dad8d886521c93b3
+MISC ChangeLog 21042 SHA256 b9fc8a965446626b4505486f8fcc3eaf7b0ac806ad62a92cafa2362279b576e9 SHA512 99f068a254e8b3966df12bbfdebd50f797ddca5923275a53d6628990a0219a82eb48d42ea7bdea454fe0cfde1e7ee31ba990b9f78c9833b7894dee30e3237fcf WHIRLPOOL 383c4182f48e03b9bdb8c509879b54e810a5b3880766e85e3e8bf0cd0c7017c3374f77bafff03638859c48bfeddab00d0e7af95d5b0aa62b3ec9ffd38878b366
 MISC metadata.xml 376 SHA256 5eb64ba82d456033efa6947dff12b009f73f4e5b4e883841c7fb4c8a368b3e0c SHA512 7dd59b5c777f37c5aa734a81562491ab90e0ed2854340f4d89fd9198d17c8e8d880e8d47ae99dba23b1fb16bc0b711788b7159f77ff53b08a2b2a3af01894f43 WHIRLPOOL d659931a7f525e0453e86a96f2dd6ca889bcf428496f1510bb612251961dac7afa5c36b87f90947371f4903c84b5cabf42d7647cfbbbf7af3e24396107a7197f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNYCKcACgkQblQW9DDEZTg6+gCdElAKyWQGZqPmy2CFyZXB4PBq
-D6AAn2Gg9nhzrsv50HfVN8ATSlXuqUE2
-=aWrC
+iEYEAREIAAYFAlNZH08ACgkQblQW9DDEZTg5DgCaA7QBuKYDzvaLu8V7A+2/lg+e
+UH4An1oU2UtTRIMSZCdL99x+cfN4Hx+5
+=mBOX
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-17.ebuild b/sys-apps/kmod/kmod-17.ebuild
index f228fc0d1680..efc4bef23b6a 100644
--- a/sys-apps/kmod/kmod-17.ebuild
+++ b/sys-apps/kmod/kmod-17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-17.ebuild,v 1.3 2014/04/23 18:38:11 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-17.ebuild,v 1.4 2014/04/24 14:27:03 williamh Exp $
 
 EAPI=5
 
@@ -112,11 +112,11 @@ src_compile() {
 		local native_builddir=${BUILD_DIR}
 
 		python_compile() {
-			echo 'python: $(pkgpyexec_LTLIBRARIES)' |
 			emake -C "${BUILD_DIR}" -f Makefile -f - python \
 				VPATH="${native_builddir}:${S}" \
 				native_builddir="${native_builddir}" \
-				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la'
+				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
+				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
 		}
 
 		python_foreach_impl python_compile
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 06c14a04f9cd..b2658a6875a3 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.74 2014/04/23 18:38:11 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.75 2014/04/24 14:27:03 williamh Exp $
 
 EAPI=5
 
@@ -112,11 +112,11 @@ src_compile() {
 		local native_builddir=${BUILD_DIR}
 
 		python_compile() {
-			echo 'python: $(pkgpyexec_LTLIBRARIES)' |
 			emake -C "${BUILD_DIR}" -f Makefile -f - python \
 				VPATH="${native_builddir}:${S}" \
 				native_builddir="${native_builddir}" \
-				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la'
+				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
+				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
 		}
 
 		python_foreach_impl python_compile
diff --git a/sys-fs/aufs-headers/ChangeLog b/sys-fs/aufs-headers/ChangeLog
index 009faca06910..95d0bf318da1 100644
--- a/sys-fs/aufs-headers/ChangeLog
+++ b/sys-fs/aufs-headers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/aufs-headers
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-headers/ChangeLog,v 1.16 2014/01/14 13:54:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-headers/ChangeLog,v 1.17 2014/04/24 11:53:01 jlec Exp $
+
+*aufs-headers-3.13_p20140420 (24 Apr 2014)
+
+  24 Apr 2014; Justin Lecher <jlec@gentoo.org>
+  +aufs-headers-3.13_p20140420.ebuild:
+  Version Bump
 
   14 Jan 2014; Agostino Sarubbo <ago@gentoo.org>
   aufs-headers-3.11_p20130915.ebuild:
diff --git a/sys-fs/aufs-headers/Manifest b/sys-fs/aufs-headers/Manifest
index b362cd09ecea..f2ba22af5652 100644
--- a/sys-fs/aufs-headers/Manifest
+++ b/sys-fs/aufs-headers/Manifest
@@ -1,26 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST aufs-headers-3.11_p20130915.tar.xz 2516 SHA256 296828ffe6c7c211517379dd5c9046e14f50d8fb2735cff57ea9d67200335a97 SHA512 5de690f610b011d34d6d2ac9e4ce107153d8548d3bcc289d22d4313863cc0649b55b2183dafbc392b36120e658016786c9ffc2290468a33fc55c3a256889cdf6 WHIRLPOOL 0483e63f99666c128d10a61bf2054fedc8386a8d46565fde501011d41a1704a5a01010d3c16644c2ec95c007cd2b9122c834b51889ddc89dfab573a1b09a3285
 DIST aufs-headers-3.12_p20140114.tar.xz 2148 SHA256 6a93c8ca20a8c387494178dfcea8c2550e5065378947448c1e854d14b730a0da SHA512 2edf3d02aecbee5f3fb3d5c2ed541a448a91b672592781a40ca5edc0419a0ef32fb95188cc40923a76569d4ac6b987528718539df585d2892c3236aa0b499a12 WHIRLPOOL 1f892619dc8f19660708714110b35a4d2ea1814577f0250f6722078fd08840307efc584c11130b6a9340f92daa9b50d16414ba34a8ef33e52da85806811fbb1e
+DIST aufs-headers-3.13_p20140420.tar.xz 2144 SHA256 0f99f6978325622e28b109152ffdc9b3b46ca9837ea0953f60d8d07520261f9b SHA512 68e24a5d1bee3e1b2ca6652758035b575420131e53fcddf6df4e5440219e4fa3cddb3eac7b79da544c400af52904492fc52d5ab3bb65d0d9805bbb83c39c1cb7 WHIRLPOOL 230aa2a7daed57527b0bf492e5a46b0e0d1fac08b165b1542e0233fe17b44b98cc5f84de78510547bcd3fbf801de7829076b4eb20a9e8f1f95e6693faac7f708
 EBUILD aufs-headers-3.11_p20130915.ebuild 763 SHA256 e667b40485984924cd763501948a47fb28ed0d881f2daed73f370588c662ebe0 SHA512 5eb89917a54440c0994a2968d6033f25ab572fe65b2c721c65a4617ee3d57646d4cb91f071475f19747eeb867b416be8ba605c1e97355005de46beac925725ad WHIRLPOOL d017d0e5dd8ef048c11c928161f00c8681fedc6a4419f1ec8b5e75d6ae3d39f840ad31c486b2458377e7559c6a931378a39869ce7af619da32070dcd9aebd6e0
 EBUILD aufs-headers-3.12_p20140114.ebuild 766 SHA256 61475de76877e0a155055aebf024a72af312ff4413db39d50b443d6c641b7ec4 SHA512 9d8be50a7ce6bda032144612c89bc9ca8285d79ef347854e797263d9187ee821fdc48eba8ce38dc39b5ad0bfab4db33b4e3b7df6cc58a26174894e8124b663c2 WHIRLPOOL 3671b1456179d5e00195891ae647b4468e81d18a42286167432421fc1928ec30f38c45330bfc8f21fbf8503019f8dda9bb6e6f3be88d777eb0da2b0d55570530
-MISC ChangeLog 3352 SHA256 1fa676e777191dee73747538005d030f173cd9511fe4650ed873a5194538d747 SHA512 25158aafbd535fb1c826721fd89c769adfbfee3232998b30fe5872918bda360ae06d29ab1bd123ad6a801d1113af7a1dd871fca4bfcc2a652737c72a244f9667 WHIRLPOOL e0c275c000bbb63ba230023ca67d66898d8eb91626e93540da6e7f71e0751c2ac777d8b1b6f37972772a20765d7413dbadb95c48e0109d6afc25e36ff9d14ddb
+EBUILD aufs-headers-3.13_p20140420.ebuild 766 SHA256 024bf6d90eac190f0cf0e16c8a74243052d8d5b7d787ea8742492ed55f5784e6 SHA512 3a60e2d845603120e74922d5a20f0e7b598e3ba8a524e81bcb24566f57ebc912116e0bfc07eb1556e8f6e96e458eb6d17207f4949114813f15622e8c801c612d WHIRLPOOL a8597cd53425659107c675f8f739ebea6e0d7f8bac8b2ea082060e85ae9739df12c5d0be40ea6d5c24f0488d9df83e0b772fa96389f464ae8900ace9dcd6a9a0
+MISC ChangeLog 3499 SHA256 8c4b6579782ca7baed568f8cf92f0c0e2bab0fb33ded70b3f6e7bfddbc3c2c44 SHA512 16d37d0a9ad0a7662ca32e24a56272e190085f24b335f2a83339ce3f0d7756ecca6e1111a1441a16f5084e85f60ca6126c6fac79d346f0c4b9f1f7be9402977f WHIRLPOOL 353490096b0d44d4a630022519b1a95b3039326b1529e2ff88d2b3bde87d6f8227b89c35c0646697d2c6a4e67d7deab77a91be11e71d06faf2faa9c99ef24ad0
 MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS1UF/AAoJELp701BxlEWfkxEQAJ/AZ2oDTowXbQXfF2Rqbiri
-GWfrv1lRjUVbVifFdGrNrVcmpuZpHWG7PA7J1Jsnf9cjIpji6wuWYD5A2gF5jPkv
-2m5P9TPuo4iKRpOv2Lx1miNE1nkUmSqv5Va+8/eu2c///L2xbv7T6kcHWcf4nII5
-Gq8NbaKoXVituyZkBiDFMLsm3bt6N7OOISRjJR3HIG+ce3ZOF3FFVIVFuQzjGOtV
-zGSI8kVv/4D6ND20vdIf0PJRldi01ugWwNxUDqRYM+a+9tjCASCp1XFl3FT8ud1K
-MuS1znDnoHgvQS3NbMISDUCvq4JYc9bsB3RVr3HWDyqjc5sf3bQ+SMnJ4R8FsIA2
-GwafRAMuVjDXyGjuQU2aCDYe2kADlNtv9RDUW7tH2uUT7eoNCP9tIWEORHN9eOJW
-06i4P2x+F9eqky1NcqfNNZvd7UD9Mjfub9PkoRCSnbMiuuQgut+d8YlAK+WNuZaR
-FdbgN/H8aG3gaYWyyw16TiOWKcrfAcM5Hp7T2hvPjAkJFgPVJaGeeHwDy4/sEpuS
-FmLTddBeV6Hi2R6dSc5oo67l3qbwklSMgx7im+OHodRKoVhmX5sNacxOdvLHYvGK
-0jpdgy6g+1jWdTREBCYaZvfZQwfB1gckr5W4NnvLaAt9WSm8StNsrQbR6RRGq94r
-pSLNhB6W2Mx+HMnhOCKD
-=1yTD
+iQJ8BAEBCgBmBQJTWPsjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir5WAP/0hBag7erxx0OjmN+jVS9Q90
+HPbrkhN21/QCiiXoXJhDTU8gj1UgU03yU8AF2fyCcF5gNv15oXqsp3BEi0CxdUFG
+O0lOZrJq/thEqJGeSTrtTETuD4ZfD00cROqQ1E8xPEanuNc89c7ypy5Kv2XlVwqg
+VGBV2vcZBBIKEB6cbzgdAk0cjOyNbnYTxS3tiUlcCFkrnqRFF/NTeG/WhmR7USdE
+/EKyd/6NSMKFeZnT7zZ2K9mX81cPPhrMYepSqme8aMEbpH6oLaAU9+J4IFhsunhX
+gzYMns9IuMZXUeeipBRuqpYMv6R1tQrTuxjFVO4lfHV6iid+GDQx+vSIdNuFk7ad
+vjfCPivAOd3y1X22K0YPBSy/uNKXoqp/nRVp5kJl9+upvrcJCbdZxUJQlnhN0Tjd
+q39lxoKTqRYKqUEI1zRYl/0nP9V1z/UYXH3s+a8iuayFFD+OdBcAFpacCeuXZOPx
+L49cN/k2AbdhGWSV+M7Y7usBJOlY2pIfCns2k/ryaysVzP0otwif8nR1Y6wA9HBx
+clOjT407AHz0zD/0E7eu2H1AtBlA5AwB7d8+qswjlvOoCaGrvey9vY2B9geT9EdK
+lykCqQbHPIoeO9+G+8OG0x7cn/MBLhNvzmSDOMRZV3BzSkXt/6um+kyBe/bu/Q6v
+K03Qv71xEczQjttNUsj4
+=t8Ys
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs-headers/aufs-headers-3.13_p20140420.ebuild b/sys-fs/aufs-headers/aufs-headers-3.13_p20140420.ebuild
new file mode 100644
index 000000000000..6bcc629ee559
--- /dev/null
+++ b/sys-fs/aufs-headers/aufs-headers-3.13_p20140420.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-headers/aufs-headers-3.13_p20140420.ebuild,v 1.1 2014/04/24 11:53:01 jlec Exp $
+
+EAPI=5
+
+inherit versionator
+
+DESCRIPTION="User space headers for aufs3"
+HOMEPAGE="http://aufs.sourceforge.net/"
+# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
+# Check aufs release Branch
+# Create .config
+# make headers_install INSTALL_HDR_PATH=${T}
+# find ${T} -type f \( ! -name "*aufs*" \) -delete
+# find ${T} -type d -empty -delete
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	doheader -r include/*
+}
diff --git a/sys-fs/aufs-util/ChangeLog b/sys-fs/aufs-util/ChangeLog
index 8b187615647d..ec197dc86faf 100644
--- a/sys-fs/aufs-util/ChangeLog
+++ b/sys-fs/aufs-util/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/aufs-util
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/ChangeLog,v 1.25 2014/02/24 00:59:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/ChangeLog,v 1.26 2014/04/24 11:56:01 jlec Exp $
+
+*aufs-util-3.13_p20140420 (24 Apr 2014)
+
+  24 Apr 2014; Justin Lecher <jlec@gentoo.org>
+  +aufs-util-3.13_p20140420.ebuild:
+  Version Bump
 
   23 Feb 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   aufs-util-3.9_p20130915.ebuild:
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index d82c0de9c42b..43ad91b83a65 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -1,26 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST aufs-util-3.12_p20140114.tar.xz 79472 SHA256 026976f2168ec5789d2283afe8d055fc5c09a2df5cb2109da2c51ceacabc8602 SHA512 4c3751dfe37f94d30415408b8ef027fad506b7e6f49fa2db14f98e694fa7a7e23a805b5c022dba3747badf9de362b135fff75537ed6236bf790d7ef3eb5c5d0c WHIRLPOOL dd92239c87f673498523da40487ec14f4391a4b8a69ac8f26bb3473725457bf2d791f2f60dae80dd4fce04c0fb95caebb61018058896cfb4faae0d6157dfa322
+DIST aufs-util-3.13_p20140420.tar.xz 79516 SHA256 b8250e19b78d9edff8a10e39dbc35e16c0d4ee7fff19d76830c796bbbe84ab60 SHA512 1d8d8e4a568f1371884293e3934f20b8883b8edf96de5bd4167904bd9137896718c814a870d6912ca3f210c7a4b551d4c9163747180ed0f74fb4fbcab35aa6a2 WHIRLPOOL 4685ff9f6e3cb9bf1e6fa3e83218eb14c6f7576e99a3dd571c70de678e7b3bb03db66a4f8035392ad44ca36d36ccf06fbd65d74c0371e6645fe611d7c79de662
 DIST aufs-util-3.9_p20130915.tar.xz 79024 SHA256 0acabea84fa1b7cb3bedfd01f79cdc6e243660edd0de9702e43e1a55a7c64158 SHA512 b0bb86c939163e34a06664ed0c64800fe6d0b28ee048899a653385cb0f73e145688ae6613ef54c3a8b4ccdeaeedcd21767eae23c618ddb1f18e63f184dd0b7d7 WHIRLPOOL 67ad5578e64da76b33cf5b9f50bb9ae474713718e0e842848b080bf3bed011bf06cf3daad32ed62642eb9216c62a95f6813fbf598fffe313743d9b00d1039567
 EBUILD aufs-util-3.12_p20140114.ebuild 989 SHA256 e8ed0f9e1fc6f15ccb87933ba1777c025bec270e218d3a8b213fd37377a47a32 SHA512 a0f6af6c58619bf709f0e07915d119b573eca0b4f0593c5b26a6ba882d5a4531bb98d58b5cf22a6c460c558ba448bfa81f1b9f6e8517e0299c37971eb1742928 WHIRLPOOL eac5be26e3e2af977c77a6a22d4ece84e5090afce2aaf1df65131ec20a301344360c58f2663b75a8f3969aac032fceae0419181cbac4de84272246814b3a9587
+EBUILD aufs-util-3.13_p20140420.ebuild 989 SHA256 505066ec120502b1a1f4e9d9d9a0cbe1e3df8d8aea6d55c48e7c8913ec1b5df7 SHA512 e1c04989460afc2e22a45c385a7948f9e89edcfdb97ffbdb6f48ef6f292844a202ff6b2e42971d781bbc881a5dde651dbdb23f3ec5d52bdb1493fa57cab30d22 WHIRLPOOL c5934e3ce081297eb4ebeb0accaccd99032ed8720975b682726c372a9c6433e15a5fa7e0958f3c57dca5a4ceeeba0d1b54a1d483eb11094973c2996b52656b03
 EBUILD aufs-util-3.9_p20130915.ebuild 992 SHA256 3139de17cafdaad9d4011adf17498de17b96b39e6cde653d94a676070f8fd579 SHA512 0c7b54168396b504b81134e3580d9b1544dacef414da519eccc8ea57ac5bdd4645998a998b35d6d7631928f6738142fbca5e08cc2a81d8d5999113716185228c WHIRLPOOL b49e3d3d710e4c9f0c9b8173345c02dfcc6a895b038080f4e309c25cfe27953ba6710351428771014406a04a97e6b7ff50eece11acec078e230a93805c624fd3
-MISC ChangeLog 4325 SHA256 f5f2d9b9dc83319e1b90f7f31aa54ff40088005fbc6cfbada12cdb691f10c803 SHA512 580a38c94e4b02e1eb9bba4b40bb96bd3cb9aade400bf514b476327a1bc2c6fd9897bd147b4771419a1840cbfbf350091069b48b75f2e062ac537ddc684fd240 WHIRLPOOL c981999a6a66d17d9f826e3d2548e4b92a0207bbc0fe8a47a73c547d6674664321496e0d439520121720de0aa8636d04fda917955ff7eff611ab037fb78a4541
+MISC ChangeLog 4459 SHA256 2d7c5acb19bf1de03a2b4ec6921f76efcbcce44c2a5201dcc4dc55999e48f3d0 SHA512 b17de343cced388f63beb4ba2cb12d1d7a436b358cdde593d2610c68c579683f278a4928d2a92e98d7685a20e4a0db08086add9fa6436313b8c5c357fad533e1 WHIRLPOOL ab60164c8ece3359b6bea7c73cafd785dab0826bda517a5acc6478672bb9f0289a86637555438b398466334405f5b937a4e5388861d9d257767859475329c6b3
 MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTCotMAAoJEE8aJVXqcZkdtlIQANF5RgDFzP3vThbTBtPM+fKQ
-ZPglGyy8Phgo8oq2TsSSD2zabxUUU8oXlMDcr3CMZa3FeNrF00f2e2efqFtkoGsa
-f5wCqBpcDE8FaZLsHh/5r15VdT/q5WKrGvtImilsrWLP/fR9O8sGpb1lI1ey61wD
-ObqB7FmKweDhxotmNQQ8sCyDmeNVlWcmAYIAsYoUIK3ueSvnzYQnKBqRULEHiApy
-fGSi3Sm2emG5lpYAw/hLG+hpPB1g468YlTugXq9uJEkTO7vkIlNpvgOkJKIgcmUh
-LMbgXaQi1WifuBYoNbGToNLjog+3bxvBScFviTduVPVboMlPZUcQKcox+6np3qLK
-VYv03jLZG/AycZGPooO96KzUYlH+SRP4BteJcjn4ycLFmwragoiJpEeqwuULmTOP
-Q8hx+oAWYC9OlreEQKlrA7KoOYWBIDUJfR+Q5yrlmttYjq0OHptDNySodymEDnOQ
-GnXh3+7/K/IR0xqYz7qQcf99lfOPnkYrFKatXnSITZ5VTn87i0zZGSFXhdWJfZnb
-54hcrcoHV4TuKavN61rixnztkqYRpoH683Sl915BJ94ffEqe5a39j+s6FOzmnYuf
-UWQnRD8cAvI+fDC2HjBSZHv1goRvUr5L1AIPKrHDhFwD9dtPesO/QP6IGVxl+as5
-/XXx8wI74XQ9fke86o55
-=HvHU
------END PGP SIGNATURE-----
diff --git a/sys-fs/aufs-util/aufs-util-3.13_p20140420.ebuild b/sys-fs/aufs-util/aufs-util-3.13_p20140420.ebuild
new file mode 100644
index 000000000000..60ed76bf202e
--- /dev/null
+++ b/sys-fs/aufs-util/aufs-util-3.13_p20140420.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.13_p20140420.ebuild,v 1.1 2014/04/24 11:56:01 jlec Exp $
+
+EAPI=5
+
+inherit flag-o-matic linux-info multilib toolchain-funcs
+
+DESCRIPTION="Utilities are always necessary for aufs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs3.9 -o ${P}.tar
+# xz -ve9 *.tar
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	!sys-fs/aufs2
+	!<sys-fs/aufs3-3_p20130318"
+DEPEND="${RDEPEND}
+	>=sys-fs/aufs-headers-3.13_p20130826"
+
+src_prepare() {
+	sed \
+		-e "/LDFLAGS += -static -s/d" \
+		-e "/CFLAGS/s:-O::g" \
+		-i Makefile || die
+	sed \
+		-e "s:m 644 -s:m 644:g" \
+		-e "s:/usr/lib:/usr/$(get_libdir):g" \
+		-i libau/Makefile || die
+
+	tc-export CC AR
+	export HOSTCC=$(tc-getCC)
+}
diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 8d32b927ef15..73e7df0a1e26 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.89 2014/03/10 07:30:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.90 2014/04/24 12:00:12 jlec Exp $
+
+*aufs3-3_p20140420 (24 Apr 2014)
+
+  24 Apr 2014; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20140420.ebuild:
+  Version Bump
 
 *aufs3-3_p20140310 (10 Mar 2014)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index d37396ddab84..49dc4c59fd5b 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -14,6 +14,7 @@ DIST aufs3-standalone-3_p20140127.tar.xz 1681488 SHA256 8dd99e178e8f4cabb0a755d9
 DIST aufs3-standalone-3_p20140224.tar.xz 1685640 SHA256 4dbfeb433d957dd3bc8019b3ea61222c42f25e315ec52ee436b544fe4bc691f3 SHA512 3f126735a1e45ca997310f878d19f5bfac2bdc854794ea44949a532aec145845d015aa5360b8599a2fd65adda705cd7a41603dd408ec31d93a3092866a0607e2 WHIRLPOOL b8c21f408fbbb38c61f2c14224ef5efa4a114124d8d2c552da65855145b8c5b7e2a371d839127f35e9d0690a2b8e77c784219099c3d135ee70ffc2269ea6b069
 DIST aufs3-standalone-3_p20140303.tar.xz 1701264 SHA256 9d5c3c1bdb3ca1132ec3b11cb88d43309970c8f3277275a380c265b536bbeb40 SHA512 077a03db09de8195015c3530d62ea1cc98071c969057b19866c8c81e44054eda5a15e53c98f684ed51097c118a30141179355fa1171e1d450f43f363780346d6 WHIRLPOOL 0a2bb202d8dc099d9f5a746bc6a3092470a5fc8542d149e9ac6903dbc99c9f3827ae99d93ffefaea4434257033d62454588e0da708d0cf42bf878823455415ac
 DIST aufs3-standalone-3_p20140310.tar.xz 1697212 SHA256 708dd73eeb43a364b80557bbf97d9c9d87ea21c9033b7a6b8d49e387973b1737 SHA512 556638c120ae05f95aa0a4d0eb4ad5fa01954193afbe3bca0605ceb74b8d5f75b6f01b2aa70578fb93f30a05538a7a85dd4f83618546ab13703b874cf9f318bc WHIRLPOOL 0f836452348b2cb282739b44a5e193a8904272314f6f3fdf2f6756730048d6eb8940fa5119f7fc36245a7abff0cbf53c11d7fc043445b041451ad50b88d07113
+DIST aufs3-standalone-3_p20140420.tar.xz 1706528 SHA256 196340c20b080ab2eb458d55d2c43838761cc849ac4715d0cbcbf91dae07cccc SHA512 db826206d4311ceb65b96351b167801c9e7581d5d16c8c25140eac66ddd70fd82151619bc7269fefc5eb16b53d15343969136acba12eb96d07c1d4773e926a4f WHIRLPOOL 27f3b37d012f9db861cd47b13f5d48650d80cbc318c5d9e52f3253d8a50c2f89403947199fe10d7418979dab2611353b2104cfe081acf9a610b11b7d54be0216
 EBUILD aufs3-3_p20131007.ebuild 4698 SHA256 9f443498a9de7e6c238aebc2bd9be4353686c11878f1ffe46c53f7c1f082b710 SHA512 0f38101a85be0724f599e357ca1a9721fa127b5523acb0a2a704a665adb7118cc6eb13f55a89f39ab1e30713e85afab0fe5b5f3b5186e80282eab08d74776889 WHIRLPOOL 23c597f3dc1cc736a77792906b64fcaed150b998fa2c7c93ef8190615a9ff7711738ca7b2cdf8e749265ba467dd6af6d9bf6c810ac43123afa770d0e2452bef3
 EBUILD aufs3-3_p20131014.ebuild 4698 SHA256 ffcd8421f15e90df7e79f0a799b594b2a6e4d1f843ad4f571091077931972dd0 SHA512 acfb8d87f742da0418b43ffaa79390a1d374b64da3ed31652a67a57cddb94d63df6a144fe13cbdfbb9e4f08f02f1c318f44b07bee3faa936d5699f871b7567fb WHIRLPOOL 3bee56dee7da38fd55af4493a7400e336e0521e9780dd2bf791b22bbeec66870243102e718d7cde4689f25a00ce461c9ed1318a80e810680c9fcd33580805e5d
 EBUILD aufs3-3_p20131104-r1.ebuild 4812 SHA256 5264e3ddaed1ed9547215e3e7f6b459c2f261980ae60900ca5d0f57a49e1a5a8 SHA512 0f826d4d200a4cb5074a5274b5d20f5e56edfbb19cefa812cbb68436af25ae2744c559a3adadf06910e6e983ec079b66ed072ad8124b28a958b92d8466ad1619 WHIRLPOOL 8e8d3ab45dc8c0532c140f9becbdd4dcd00d5c8ef0fa07af9c7c5d8f2624cb529ed9b2d39b98791af223dd35e98e22aef83ffbdb90a10b2fdd4c46df6448c3e5
@@ -26,24 +27,25 @@ EBUILD aufs3-3_p20140127.ebuild 4948 SHA256 bad0bf05cad9046943eb8c2fd32021f36211
 EBUILD aufs3-3_p20140224.ebuild 5034 SHA256 b385489aef8402e908a7839554637d8f4537002b01f72b1dcdd1d88801a68979 SHA512 19e377e76572690d1a196bc45d1461fc465c852b58e7e4015397f3c00bd156223f78e15fb976e3c040267174f7eaed2e4aba2ccfbf922a3444e22d4fbee9f560 WHIRLPOOL af24a75acc170eae319b5f2721eabe6291492a8f13a36155c81b0b2d8da32fa5aaf8b636960b059084a32222710305114c9898e16ea2acfeb6091ca1c5485620
 EBUILD aufs3-3_p20140303.ebuild 5083 SHA256 13ce4d58e04d31ac959057ac5a7950a8b79e8a3267329cf612d68c9c2a75ea3c SHA512 a0fbc34fe412d4f8379d236c16f61fd019be0a4d0716388a5ac9d441bb85538863f60d3d9061c0c44fcf466679717d16bbcd2c3cd4cc35207ee559f2bdf90a41 WHIRLPOOL 1ba73e476d507824910af022bc6cf62dced0e661402db8d1d1d70a36c9d91d5c54a04018a6f902646d999d95fd86743a562da88d0c03b1522a9d25fecc388a2d
 EBUILD aufs3-3_p20140310.ebuild 5083 SHA256 536dc15adca75852f1cc56acd2179a2ca123453955e2e4450cd55a1ebf57d8ab SHA512 538bf0ca02e2ea9927ad5b3c12946543f5fbad2ef6106eff41353c67d296db81b14a8b78fdb5cf1a593864eb06ab01abde06771253b0d60b8ccfb426a639da59 WHIRLPOOL a5daaa3d5621d8adc503354a5d7dfc7acc3f26e7ce224936d10abaee1f1a728159de1c02b5d62dd0d28ea1e9f65b4e36562b81dc35d1ad94f6d0d735988f1f61
-MISC ChangeLog 22897 SHA256 e9102852bb6bccb174a45d946db759d80a5bb7d8731db362f71bdb4ae4dab286 SHA512 430b56e24f0490766103fb42be4f87730427774808f4943a4e95a1bc86bcffd8712e69ed40f24561aa099ae6c992be607e60e91e8b13d1f0b93c66b22616f1b9 WHIRLPOOL 7c41f6cae8e8fdba85311b0d0d955970f2b1caee30b0f99c777217a83139ccc9690cc35d47b1bf9f1d9248719607725e10bd66b127adfddf5169550678521c21
+EBUILD aufs3-3_p20140420.ebuild 5083 SHA256 e047e2558ff9a2140045e203f6ad2d2571b3b7ad30d17b6786bb252f7d52889d SHA512 805d16ee377b46a5b1b960cc58be164c11810972e2f7ee216c33449815cde9dc85940022dfc34bebe8806fb6f3363f9cee6ced8a45625c78212f747127c5c127 WHIRLPOOL be81c80536b4a3e57386b6cf7fe9ab3c9e0782a19b6004800c8f1ad2de3eb7142e9c6bbffcbb79651093eb13522820bba083d872ac3acb10a06747239966ac42
+MISC ChangeLog 23021 SHA256 ccdb96481d17ab832c0e78cec731999e94d9135be4d91209774502f2b590bcde SHA512 0c464ff0f3e6d57bd7fb5d12768576f454a1aec4b214f74cd25001ae1d14532a7b644e48f6f2fb0c0cf460609943112712c1ee4cd09379dd7546ef5fd4815cea WHIRLPOOL c4bdccf4adfc3678d8fcca2aaef4e05ab0487cef7c0ca5319c9922d9926ad7825091fcc980598c74e88c91ea9a8848accceafe6548390c4c94aa83563facfafb
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJTHWolXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTWPzQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirra0P/jhhEB6jqNiXnZWKIzrfjFL3
-EP0/nwRVizSNc0VvpSkmdd10a1Yvf7m3rA9hzW/O6i1ZCSm86tHHD9hgFmszoADH
-C9PNUJ3WOts1bvk6lfNBvICH5bqw2EXv7CKvTomjOae5KUtbDwpczf7MHoREQCyM
-AmbDSbm2AImPtlga42FGJKf3bIGPuvOnNIiUna+SnwVqwit4rDj5yn+P4nzlBo8F
-Mbrc0wwFcGijHAQTleA1x/lVz0a1PZrv/sAn4J3A0e4IIgqeEmRI6bLtLUg2G70X
-EKNY2Alq68PtPSEf9J4piJgk4ry5F/BtAoMWMbFiqlDvJ8x5SUYDtG4iHI/b5fKU
-pcWRRbKUZMy2L0Zk19N3uds8bz8d340lLRp/eom4vuDVFuflqXzjAr/9qLU4zq/X
-2sXGjE5y8vnQFw6kWvu9FlUi334aXvs32k3UQ5QBNEvKj3JiTcjcbDBXMoTGHKEv
-lXD/iip0ABnuJY5EYGqtH0ymBmfJQCVkGB9A2ZWjxIn+4QGBQ8kZK1l5Lf0gErVu
-daB0MKm56Ig6LiRObD6uMrtf4zYt8erL47bbUwlUahFB02pmWFpvvH/GNFybT4VQ
-sLgAUUtrw8x91OQsH96Of8jtTW8un0MLTFdljdWiM7rXbGuPjsMJcr3l0wNf2E0I
-46Y1Y2TQX1VDBdV9Xjif
-=qTVF
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirSC4P/1w4ZHBqqEXr4tMLjRraPQyS
+TP5Zec0Y8tkoi+gGvtpfXuvYV24kaTQR3zNxSCMGkC11nJKlOIkvyCJwL198T0yt
+ew4ymIe+RzEUdOqUU+1TZlsK+a46H9ZcjqUa2K0Nh/9eezTtA91AFFtFsUxVdCDb
+y8LNxDMApG2Hk0lo1Jtbg3hCRNO9Q8Osdr/u3bbYLTZAv819MjGksr1BtWhwQNw+
+whdKXPAmUT+DGBGArOBTx9DLdqJilb3EmdoHUJE44dDGD0755tqKuyaPunqcyi11
+CtavVbBG45Rjlrd4NfSp8YmfHfCCT33vuw13b6CwWWcfHGh1b66kSw+DOPmDyEP+
+zBKOWEOzAv4Rjm8bz1C30/wbEG8ri4p+pc/6c109sA3GvzyWcJnMMd/9KzpWN0bI
+1GXERryv2PBjONIcnA/ZtR0zyhyr2I0d0qxJ2CK6Y33FdZRk5OYLB1DvZ1UeTDG1
++Vj/ARPmgdm72VnJxwyloGVKkBae7CqiGFFTUMxPUdvwsfPnKqxnww2Km9Npgrp/
+8jWBrv4SH5o5SYQLWj8qWbxwKD8feUGCRFL6HIMXrboBm8sFd3IVtpHDiH8eyTbu
+Oazqtr4Go9rH/RWCdoqe1/3eUeTAiTnvcuf5FlrMzCOQN/xJ23IJFwHnpvpSnCPX
+CQ3xLNHiVRw+hQgenkr9
+=bZee
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20140420.ebuild b/sys-fs/aufs3/aufs3-3_p20140420.ebuild
new file mode 100644
index 000000000000..b3b3eb3124fe
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20140420.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140420.ebuild,v 1.1 2014/04/24 12:00:12 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=14
+# highest supported version
+KERN_MAX_VER=15
+# lowest supported version
+KERN_MIN_VER=10
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "10" ]] && [[ "${KV_PATCH}" -ge "28" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".x
+	elif [[ "${KV_MINOR}" == "12" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".x
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use pax_kernel; then
+		if kernel_is ge 3 11; then
+			epatch "${FILESDIR}"/pax-3.11.patch
+		else
+			epatch "${FILESDIR}"/pax-3.patch
+		fi
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README
+}
diff --git a/sys-kernel/aufs-sources/ChangeLog b/sys-kernel/aufs-sources/ChangeLog
index b64cebdcecbf..0a0a7ae685c5 100644
--- a/sys-kernel/aufs-sources/ChangeLog
+++ b/sys-kernel/aufs-sources/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sys-kernel/aufs-sources
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.108 2014/04/07 16:12:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.109 2014/04/24 12:08:05 jlec Exp $
+
+*aufs-sources-3.14.1 (24 Apr 2014)
+*aufs-sources-3.13.11 (24 Apr 2014)
+*aufs-sources-3.12.17 (24 Apr 2014)
+*aufs-sources-3.10.37 (24 Apr 2014)
+
+  24 Apr 2014; Justin Lecher <jlec@gentoo.org> -aufs-sources-3.10.33.ebuild,
+  -aufs-sources-3.10.34.ebuild, -aufs-sources-3.10.35.ebuild,
+  +aufs-sources-3.10.37.ebuild, -aufs-sources-3.12.14.ebuild,
+  -aufs-sources-3.12.15.ebuild, +aufs-sources-3.12.17.ebuild,
+  -aufs-sources-3.13.5.ebuild, -aufs-sources-3.13.6.ebuild,
+  -aufs-sources-3.13.7.ebuild, -aufs-sources-3.13.8.ebuild,
+  +aufs-sources-3.13.11.ebuild, +aufs-sources-3.14.1.ebuild:
+  Bump to latest aufs3, genpatches and linux release
 
 *aufs-sources-3.14.0 (07 Apr 2014)
 
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 834eb02296de..24ffebb4a13d 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -5,12 +5,15 @@ AUX aufs-sources-3.10.26-mmap-aufs3.patch 1176 SHA256 f1a37d0d6257e04ccd7a71465e
 AUX aufs-sources-3.12.7-mmap-aufs3.patch 1176 SHA256 1161c8d0ec37bfacea451a5636d1e5104db0c6d477418e5e09c91dd18a1f5c5d SHA512 a1c97d9b69210d1c91de0f8758db570da4efb6ac97cab4b3c15786914f7241ad9352b15c6f9feceb3524f95aa5a6d726bd3836757f0c8fa14372792f9bb3652d WHIRLPOOL c3d530941fafe2a1d418706bf9517c9da7d29f69056403a5b9689ed13faef3a7b170afb49b83d26e5db83291e598ee277414daab8a9295ee25645e649d4b50d8
 DIST aufs-sources-3.10.x_p20140224.tar.xz 151480 SHA256 01b3337fd849cd9798b882e85a7509a873ce77a61bd23f8ec5a07e8427778789 SHA512 48619aa25baad97c36b51e633662592fb82b09c06f746752e9265094d5e6ade5cd8f8fc8bb6b97593ac3f432b2b2b4cc4422251de5317eb9d6ae33722826aef4 WHIRLPOOL 9828fed5d6056b3ab5f7582230435647e71aa73e3f7373e56bff7e9c6940849707e67ac8d9728e7e45fa4ca2496049faddb420beeabe170073bb90b6ce64fa2f
 DIST aufs-sources-3.10.x_p20140310.tar.xz 151544 SHA256 798f80ce0a7663cd6b0956a30490778423836d9a7af72c4eece34d8291578bcb SHA512 0a05ab795f9f01eac5016dc24388ed1cf61d614ee1553173fc52abd20fda7600780a499700ee9e0bb8d64a6c8c464708616431f1b4fd51df66b19077027a97e6 WHIRLPOOL 0396c88e4abb0aa02915b1230b4ac7d8a6ca62abbd8412188f005a3c8ed0fcbe2882cbe99e2c1ffe07719f3455b36594606dcb97138018da3b6f7b1666cd417a
+DIST aufs-sources-3.10.x_p20140420.tar.xz 151544 SHA256 798f80ce0a7663cd6b0956a30490778423836d9a7af72c4eece34d8291578bcb SHA512 0a05ab795f9f01eac5016dc24388ed1cf61d614ee1553173fc52abd20fda7600780a499700ee9e0bb8d64a6c8c464708616431f1b4fd51df66b19077027a97e6 WHIRLPOOL 0396c88e4abb0aa02915b1230b4ac7d8a6ca62abbd8412188f005a3c8ed0fcbe2882cbe99e2c1ffe07719f3455b36594606dcb97138018da3b6f7b1666cd417a
 DIST aufs-sources-3.10_p20131111.tar.xz 151456 SHA256 a5229c12e9cf62a04bc84458df88d4fdb3c4e30e38c184cd2e236b22efe01e6f SHA512 421ac913b40c66dab4ca01da1c08204d1ed78a93e4dba09795f0a081a1af5c30bd82863fafdd034defb840b7961e49713242549c2bbe4d8bddc4c81663b27ff0 WHIRLPOOL c215c4ca78409efe48dea1cae373b645452d16ee8711a00913b52c4796756e90960e3d4a61c0a2b1ddf693aee3e206401f6bf648f0d5af0404cda710ee3d8339
 DIST aufs-sources-3.12.x_p20140224.tar.xz 152188 SHA256 649ca61d4cd38e5b93aaefc1acdaa09367f552bea41a8b8e1ac792f51673a631 SHA512 760bdfc20113cdfae9c126851c94b99447c0203c5b4a517f785871308bed0710742a355cec6761ea216fd62a3921fc3a701015af56b28bff543ed5c0dce9fb26 WHIRLPOOL 899523d0a09b747c7e305512d4a11486747f3796f6a199743ae1c268fc7bfc997a5f1d6e1212e3c9eeca26bce959d8e96b1417ec35ae5578992d3366169fc8dd
 DIST aufs-sources-3.12.x_p20140310.tar.xz 152176 SHA256 fb2c3547cf908e968d1c439be47706bdf05d3203f3e6d4fadec84878dca4efe9 SHA512 96415f28559b1e6fbcf8bf777294b727c0613b685b0674503350af044e9c51ab0246f28da8eb2768549ff1109a911509b5bc03b486365c42058248346ee1437d WHIRLPOOL 3b4d9d14f78a63a3a7b6c2c4bca730667771f1dee40a37bb7b433c93cdd5e9514765d317ff200a973f29bb83290447b1e9bb8fd497e070ac11b7d81730a9fcdc
-DIST aufs-sources-3.13_p20140224.tar.xz 152200 SHA256 e18951d96973503292d7f801721f2cbc4c40dfff07fccbd44d0db8fff980ab39 SHA512 1aadf71acfef0d6de248869eefdd4e9d8cd69e1a897e123a4d9c80d78dcedd31538b4e7a44325bb8a6a8234af11d799e753bb8a00322c3307a47a6a6362ede6c WHIRLPOOL e5b4b14a040661f17e46cafe70f32faa18d38cd62b16b494d4627107ecba7ceab85a1f5f67fccf8db3ca10bf60a808f8e6f573f9a9eea95f5742df9983e61e10
+DIST aufs-sources-3.12.x_p20140420.tar.xz 152176 SHA256 fb2c3547cf908e968d1c439be47706bdf05d3203f3e6d4fadec84878dca4efe9 SHA512 96415f28559b1e6fbcf8bf777294b727c0613b685b0674503350af044e9c51ab0246f28da8eb2768549ff1109a911509b5bc03b486365c42058248346ee1437d WHIRLPOOL 3b4d9d14f78a63a3a7b6c2c4bca730667771f1dee40a37bb7b433c93cdd5e9514765d317ff200a973f29bb83290447b1e9bb8fd497e070ac11b7d81730a9fcdc
 DIST aufs-sources-3.13_p20140310.tar.xz 152112 SHA256 f5985f50cde210a99dae027cd4f4e73daa5755b2e916fa8b1e987f7229971a23 SHA512 d1b1c144eeb2b9ae57a16b57409f69591ab1e9cb1db33dba9548998c578cde3a18d711ee272c049ec88b8a6611c5a7e0050dca027dc6be9365540fa6f7a0be22 WHIRLPOOL 93cefd96908f4def5936eab0018ba7816994a9f0a3267a0c17be46ef53299904f7d4288c86a132e4d16e06f3911fd12d034d0bd9dda72c72af0e26f37a14bd18
+DIST aufs-sources-3.13_p20140420.tar.xz 152112 SHA256 f5985f50cde210a99dae027cd4f4e73daa5755b2e916fa8b1e987f7229971a23 SHA512 d1b1c144eeb2b9ae57a16b57409f69591ab1e9cb1db33dba9548998c578cde3a18d711ee272c049ec88b8a6611c5a7e0050dca027dc6be9365540fa6f7a0be22 WHIRLPOOL 93cefd96908f4def5936eab0018ba7816994a9f0a3267a0c17be46ef53299904f7d4288c86a132e4d16e06f3911fd12d034d0bd9dda72c72af0e26f37a14bd18
 DIST aufs-sources-3.14_p20140407.tar.xz 151932 SHA256 33706eb5f9d1b1613fc3015395345851ed77f12bdc0d947f277da40608594f75 SHA512 bca69ef2013e636213d22ac4b2fd9a374c0430886e7185785f4ba307f0e4ad62931e8744d3e2f2abb216c1113467e2879f8d4cc9e642ae7787af1d9e2a904c62 WHIRLPOOL 0719f8328b552c26ee8cbca12b0de25b6aa45e99dcd12dcb895e4d8fe6b94373108407d70b9451762f72eee79e1013e3bb145520cfa3659ab5754068bde6b8d0
+DIST aufs-sources-3.14_p20140420.tar.xz 151932 SHA256 33706eb5f9d1b1613fc3015395345851ed77f12bdc0d947f277da40608594f75 SHA512 bca69ef2013e636213d22ac4b2fd9a374c0430886e7185785f4ba307f0e4ad62931e8744d3e2f2abb216c1113467e2879f8d4cc9e642ae7787af1d9e2a904c62 WHIRLPOOL 0719f8328b552c26ee8cbca12b0de25b6aa45e99dcd12dcb895e4d8fe6b94373108407d70b9451762f72eee79e1013e3bb145520cfa3659ab5754068bde6b8d0
 DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9
 DIST deblob-3.12 120320 SHA256 1d767acd3f461bcaa7ebef744dce1ca3eefde1cd41fde4c69a449e2470ab8c0e SHA512 61073cb763e3e0c21a84c0ee888087fbbf37b667ce0efbbc6c2ebc46ccae8460553511e347cf23d3c3603eec64df738ad4552a1b527453c7d795b8f90c4cf678 WHIRLPOOL c64cc566944ac241149a2a517da069185830be5b8ee25168b2b6b942bcf24fe3f2c0fe487b51a5b7e73e2910af2cabd7167cd1497ab7272c865d1eb3e68e4efe
 DIST deblob-3.13 122060 SHA256 8fc8f5242cd58f8560d1caecdc6ab786d6470660280f910a8b70bc47fae5eabb SHA512 90c329c7b2e49ca8e51b3ccd5ede999f01a70ce1b227f958f34306d32414787192d51481a22ae831c30179e2ef83bdf4eb5c356b49864ab8d7b5a9ed6baed294 WHIRLPOOL 56a7dc599ece173ace43a633ddf2d1fc4876b392e8cd31dfe840a6109eebed18a8a9c33c7e191ea9cf0b605818a59312c76787c77aa479b6c84feb23083c0fb4
@@ -25,86 +28,66 @@ DIST genpatches-3.10-32.extras.tar.xz 17760 SHA256 c9beea4242a8429553991400ed43b
 DIST genpatches-3.10-39.base.tar.xz 622488 SHA256 f05a05731752b06c82c9adc4483052caf5b4c7d02fe9635be1a838d73dfd0df4 SHA512 d0cdc6cd559f9a855de04454c3de5de397aa04d84cf36b315053a19a5d44e71d14ece5f2334adcf8ff0bcc8962350bfd4f7afc8804de5f9e6fa8e637b486b09f WHIRLPOOL b2b418fd276769efa6dcb9f0cf0acca19bd330d0c6467516dba6aa9b47757f089c38f1fc6751ba8151191cfe658745ba8a1280210c50806a756ac3f9aa007115
 DIST genpatches-3.10-39.experimental.tar.xz 45584 SHA256 5776a59da1a985a7a4cece53f79565a8c7509fed88e1b077ea20c0e715302110 SHA512 e27d58584306da5d59b5f7f8cab04ccc21a58822c665878ce974c0b2e40b8f4102df374fe8b33ac367aea2b376175baad913537548bf55f06a1231ab19554f9b WHIRLPOOL 1943e1e7481412f7a7657e36ae16de8089100ce5fdb371d9357e9b382cce92304fd07ddd5c29231be9e395304f5347a8f5b79005fbbfc6ff275b084fb19466e8
 DIST genpatches-3.10-39.extras.tar.xz 17756 SHA256 611b96b571e93f9e708529e35dbfb3977b1f1bb4f0178ae7a2935b28d110aa2e SHA512 08347a5f186bd90420b2d7354f3e94fcd78f6853257deb41ec0e52aea0e15c8455e9173d61611064c83a09887b601647102ba57d59315413040800b17d8cd18b WHIRLPOOL 1d9d3d66dbdb98ea3c48bfdc16e4ed3cef9afceee4ac66f6c2c5d8da398226fe98ceba09a90d22fed164a0157f1b461d501def88ed512768a0e7237becd2b68b
-DIST genpatches-3.10-40.base.tar.xz 649680 SHA256 6591ee04321f68cef315a67846c05a343a53ecd1948ed14595b568a827516690 SHA512 28cea8584a878a6bf77d8b763721657dbb7da3206c805e7831fa711b67b4d43ce244eaac6deb42c6d53f1f2cebeb23bd2dbdd5c13cf15007495bcc6a2f914fa6 WHIRLPOOL aed1348423871e552a3714e3272f540a120af33c387d387db0bb845c40d364e11a575367ff460dfd990bc86fab68e8cafed47699e711529abfe36ab2d952058b
-DIST genpatches-3.10-40.experimental.tar.xz 48596 SHA256 fb8f048de6c351bd5ac4ea396686e0eda051f522ad4d8b146487ac650d84c17e SHA512 3b0bdfab78a5c34bebd717a40acb7d2f429af2c3a6c743bf2096da29ce4cc95855eb6437389f86c33d123b7e270de0754e05a162d3dcabc485791f3708fb5a9f WHIRLPOOL c6b00e178d400699c0fe4b394f8571df9477b198049253a065b82328ebb74e0e2dfbaf2f2a202df1695ab0621190e61eb73887f9e542306e830434bc85521576
-DIST genpatches-3.10-40.extras.tar.xz 17756 SHA256 611b96b571e93f9e708529e35dbfb3977b1f1bb4f0178ae7a2935b28d110aa2e SHA512 08347a5f186bd90420b2d7354f3e94fcd78f6853257deb41ec0e52aea0e15c8455e9173d61611064c83a09887b601647102ba57d59315413040800b17d8cd18b WHIRLPOOL 1d9d3d66dbdb98ea3c48bfdc16e4ed3cef9afceee4ac66f6c2c5d8da398226fe98ceba09a90d22fed164a0157f1b461d501def88ed512768a0e7237becd2b68b
-DIST genpatches-3.10-41.base.tar.xz 669772 SHA256 37097099bfd860140efbc6e4e9c5732f458586663a83d4b7d1a63f8d4fe5df6d SHA512 9ad3b74faf01ad9bafac0d2e8712bcde92bcc9dade01e2fe0efed6e46adc9bacdbef95be0ec053dfe946d5da6ac6892ed9f8e4e38dfebc4368d51f48f27c4f8b WHIRLPOOL 837fb5774d4a901b485cf8f35f9559a3136071d3ce98ca760273b46dd7b1c8db8820e054adfc45b002f7d5a0cd295bc41789af92bdbf302a379742e247cf8af8
-DIST genpatches-3.10-41.experimental.tar.xz 48596 SHA256 04000c4555756aabf9bf7fc0701d8b1d2ef878e513eea3a8fcdd9541c309ab1e SHA512 192faf267f17f8708a96ea9429a5e14ff03b591ec888cd4688b5c02765f3af1f052a99915969c366c65965ab657152193bbd98c83f093da76ba66930de473d77 WHIRLPOOL 6ddd24fd6f79b60cba7eae10b24a581dbd27d685b604ca19dd7b23edf714458f13bcbe0a090cfd012675d91fe660e5ee8411d539b78394269d803bc1d9a30d06
-DIST genpatches-3.10-41.extras.tar.xz 17760 SHA256 000d999dbce3be66cdfe54c5c59400d448b39150e53924f6c2238330a953d731 SHA512 bbb7f9bb03273db4e2f627570c44f3851d7aedc232467f89ea3b22828b2cf0e43ec260ca2e4014f1d44d420c82639cdf7e2e85e8cb17d3b8f7d945989cb1a838 WHIRLPOOL 52fccf3ea047b44e8d301b1318564cc6c47a23dd3dd71812c6a041f3f202a70413c2e28579002120e39b6195d20670c7aeb5de61a717658247f42c88eeb586bc
-DIST genpatches-3.10-42.base.tar.xz 675988 SHA256 67363b35c4ce7bcc79c64ac808d4eb127710f4a405b9859dd2a7ce83526e36a1 SHA512 c83c05cffa3bc851789f4eb3a5926b70ceccca2fc8464368a76058aafc06ea310d496ace5858fafc784260acf60758787cae4c17a86193e8117b3315ed92acf8 WHIRLPOOL 31493caa03e6a451c0ff64261f379ec713b666c3576e3c37d9da9ceb6d30c9ea58f106774a231596bcd0ba04fd52925aa0b442c812c36283143ce2844daa220f
-DIST genpatches-3.10-42.experimental.tar.xz 48596 SHA256 fb8f048de6c351bd5ac4ea396686e0eda051f522ad4d8b146487ac650d84c17e SHA512 3b0bdfab78a5c34bebd717a40acb7d2f429af2c3a6c743bf2096da29ce4cc95855eb6437389f86c33d123b7e270de0754e05a162d3dcabc485791f3708fb5a9f WHIRLPOOL c6b00e178d400699c0fe4b394f8571df9477b198049253a065b82328ebb74e0e2dfbaf2f2a202df1695ab0621190e61eb73887f9e542306e830434bc85521576
-DIST genpatches-3.10-42.extras.tar.xz 17756 SHA256 611b96b571e93f9e708529e35dbfb3977b1f1bb4f0178ae7a2935b28d110aa2e SHA512 08347a5f186bd90420b2d7354f3e94fcd78f6853257deb41ec0e52aea0e15c8455e9173d61611064c83a09887b601647102ba57d59315413040800b17d8cd18b WHIRLPOOL 1d9d3d66dbdb98ea3c48bfdc16e4ed3cef9afceee4ac66f6c2c5d8da398226fe98ceba09a90d22fed164a0157f1b461d501def88ed512768a0e7237becd2b68b
 DIST genpatches-3.10-43.base.tar.xz 679732 SHA256 366d18aab17ff4ee5e447dda6d8345ee3072fef6cce4b239888c798fc6d1b56c SHA512 2ef2a70c1cc398d5ca268a2e3274414cc385da05a03cf73c401f87e930bd6883fe27189376222fa873244cef7abdb96dc3beb9f319bfb0084c637e934627f0a0 WHIRLPOOL 22156a181f36d11f8ad44c80aa50d97247fb0516b263683b95d5f5df6673d1fc9dd014e15e49a5e6916cdc7fd8921e1af3e5b7be64d18d56db9347e1314c8d1b
 DIST genpatches-3.10-43.experimental.tar.xz 48596 SHA256 fb8f048de6c351bd5ac4ea396686e0eda051f522ad4d8b146487ac650d84c17e SHA512 3b0bdfab78a5c34bebd717a40acb7d2f429af2c3a6c743bf2096da29ce4cc95855eb6437389f86c33d123b7e270de0754e05a162d3dcabc485791f3708fb5a9f WHIRLPOOL c6b00e178d400699c0fe4b394f8571df9477b198049253a065b82328ebb74e0e2dfbaf2f2a202df1695ab0621190e61eb73887f9e542306e830434bc85521576
 DIST genpatches-3.10-43.extras.tar.xz 17832 SHA256 a63e8ea3d2e6b51ab4e79216b459768daf17b91681c886afeafbef31513d27a5 SHA512 175ce7c65b027cba22bc43f2f38128c23a5c5882baa766437b85e5a89c0f1ba7d4ce43f26613154723539d124852c0143be35f894b8d27ee52c792deb587b335 WHIRLPOOL b90ce83b9ce8bc921b0038f3a52ab26c53f9239c36ff3d1f2e802f8f9240458f1b6ca10c144df8f9ea099285538fbb7711d743f36ab31bf9946175e096b5bc66
+DIST genpatches-3.10-44.base.tar.xz 690868 SHA256 7ec6d9c7fd1b919e22f7fb2d3a086da35da1d593ec93ea53d355f63c73870598 SHA512 098b7c83e8d23c4ff51803cea27dbbb677aead5a351673fdc4064038be0d99da2a078025cadf960135d1c407a1be5349c51ba0b1b5a22378f7282baad0b9000e WHIRLPOOL ac14209bc6fa309a92dc743029dbaaac979fe3f9d17a67102e9fa13b6825cf07d8d0df48d91d61e5be160f24383aba7e18a0081152ae7357e5889dc8f9a8ace1
+DIST genpatches-3.10-44.experimental.tar.xz 48592 SHA256 a875331e657c7fc9eb4e1581ac87a6aa489c989a4f06e4b8a73c00605a083c97 SHA512 f114bd6647a28d78f2b97565fba7f2afce541c838da458d5bd0af665731c5fa11f0de75557b713e7d3593512296f4e79631c454c3757a59b82c03952250c5202 WHIRLPOOL 2f613b62f93882b8a68cd45891f2fb06b574ff7e04b8eed714030a247babe1599e8c51e1b44b8bde144603322f4d7af5b45c92ef2a2618b6f455f1c0177d353d
+DIST genpatches-3.10-44.extras.tar.xz 17832 SHA256 a63e8ea3d2e6b51ab4e79216b459768daf17b91681c886afeafbef31513d27a5 SHA512 175ce7c65b027cba22bc43f2f38128c23a5c5882baa766437b85e5a89c0f1ba7d4ce43f26613154723539d124852c0143be35f894b8d27ee52c792deb587b335 WHIRLPOOL b90ce83b9ce8bc921b0038f3a52ab26c53f9239c36ff3d1f2e802f8f9240458f1b6ca10c144df8f9ea099285538fbb7711d743f36ab31bf9946175e096b5bc66
 DIST genpatches-3.12-14.base.tar.xz 359152 SHA256 d9d619f8be1169824e0e9ac58db0116cdc682e541da9906a4a75c92d44103804 SHA512 b5aa64709a7b831ba8bb9e164aaee9be570b847731c1e8adeca6171a7eddbc4de54ba49742e70459b6de5393b6c0ec69bc221b9e458438fd7e10810beeb3e2ba WHIRLPOOL 4aed026b4528d990165b9eed60b73d312dd503a16e65bc6dcd5f29bfb65e2bd9306382e52d5f6a24bddf9028667e78324bc79c74d0a94dc130d4e0fcd6a16125
 DIST genpatches-3.12-14.experimental.tar.xz 46540 SHA256 a8b8667730e47b61d55d1bbe11cdec4a2e539e749028353172ab1269bbefe96d SHA512 31d5c2e7aca9574cd6e04e5e61a907ffbe6940424a877eef5d7e12b74552062b9c0afb177f2bb44d70d67264d52158b024159a170409be23c6bc4cf2a773a28a WHIRLPOOL 273c23fcb13289421956a61c1ee0a5844d776b679943b2a9ae35fd46e7319b233db0e255ad032e44eabc76a51a2380f7129619a50f859ed4907acee08678ca18
 DIST genpatches-3.12-14.extras.tar.xz 18148 SHA256 dbe4784918b0f0a2947d842f2045b3b1e18eaa55b82b8be0fb22493afba76738 SHA512 ed7c453c0e6412e3b24b1a440c6baa7391532dc16cdd5a4f7d59c4e3b166d4fca428f6f14ded091885abd920b2ef0fae6881f3d06cf6896c4136dc36ed2f7185 WHIRLPOOL 84f83e680b85f207287ed0710ca29e6d0bda4efd5812b497adc8b4cbc815f02add85061fdf192d5ac970e22cdfbb5cb85d33ec1ee20fbe57a48d5610b218eaf2
-DIST genpatches-3.12-15.base.tar.xz 400348 SHA256 89df46c8c9acfc7cf8781fe7e22af6c7d059667fc09370aefc985e55dc4956c7 SHA512 0fefd8e0fb4b917e98a647e1a6a4fedbcd44284561d43efabb3e75a343c1936f21038cb39201b220afb3686017a54a473e7ef7566838f37b824865d5337878fc WHIRLPOOL 85f79a14a9969a0af1448729bae0a441b439a18890c09e5963e3089ca677970d2eb5ad151ab25ad35312f613a7743ac530a8f30365fbf98a93f135d704113cd1
-DIST genpatches-3.12-15.experimental.tar.xz 46540 SHA256 a8b8667730e47b61d55d1bbe11cdec4a2e539e749028353172ab1269bbefe96d SHA512 31d5c2e7aca9574cd6e04e5e61a907ffbe6940424a877eef5d7e12b74552062b9c0afb177f2bb44d70d67264d52158b024159a170409be23c6bc4cf2a773a28a WHIRLPOOL 273c23fcb13289421956a61c1ee0a5844d776b679943b2a9ae35fd46e7319b233db0e255ad032e44eabc76a51a2380f7129619a50f859ed4907acee08678ca18
-DIST genpatches-3.12-15.extras.tar.xz 18148 SHA256 dbe4784918b0f0a2947d842f2045b3b1e18eaa55b82b8be0fb22493afba76738 SHA512 ed7c453c0e6412e3b24b1a440c6baa7391532dc16cdd5a4f7d59c4e3b166d4fca428f6f14ded091885abd920b2ef0fae6881f3d06cf6896c4136dc36ed2f7185 WHIRLPOOL 84f83e680b85f207287ed0710ca29e6d0bda4efd5812b497adc8b4cbc815f02add85061fdf192d5ac970e22cdfbb5cb85d33ec1ee20fbe57a48d5610b218eaf2
-DIST genpatches-3.12-16.base.tar.xz 451760 SHA256 246225881c45795def61471eb5e68e65674d095ef0b57f54c0fdaede410842e7 SHA512 14b300065abd5530189e39ae1fa880be78edbf9172420033f769fa2e1d8f36b205fa2934fa42759e35433f12915969848e4a5edaef96c0b354cedc93b26b028c WHIRLPOOL 27a927b06ad531f40538bde94e5ac68a44685a201eb7b01af006e8963c1d1bbb5276ea8469b691f1aa5d06562718ba0b6261b7e79af887ee896b915da9476a43
-DIST genpatches-3.12-16.experimental.tar.xz 46524 SHA256 bf0db63a463b9c6003e47f00eda2eb1474d9a365f0481c151bd5d78086e4cffa SHA512 ea9d03454b635816585e0ddaa678febba540b19d1a435efdef8fa6f6e4b03db1baeee36333ca1a9a0ad25b3a20b1f4976c3a50ff9621f13c80ec17b9372a2a79 WHIRLPOOL fc3ea785a3edc38ebfd25e2eb83484a6ad3a186d9293949ef1e2d55ed01c1a8e710b05c42b2650042bb16d7555b869cffaba62b04db9828ca3ebc4b1ba57bb67
-DIST genpatches-3.12-16.extras.tar.xz 18152 SHA256 976f1955368e5bac0bfefe97fc6fc53a67ad003da86c22a0eef8860fc8439909 SHA512 edb22af4c538cd02fc4d43cfe5d2eff887a2ba636c50428c2794722cf02fea3bf22b251ddb81da7d2a934331b4d0231fdeb68fd15e6556bf93cc5d743fbdc923 WHIRLPOOL 6dc333619fb6e70f760adab02c820c58295d3d55f6d60252183f3b979d5cffe78fab04f671dbdada6e1134decfefa8440b28def7ca1a68fc2e9fca41db2a329c
 DIST genpatches-3.12-17.base.tar.xz 466564 SHA256 58fb8b23531f92b1a3e470fe6cea875094effaa182d5c9fecb6bac38ff36299d SHA512 8a20d94b7583bea5b6c0098cb48a54ae5798a44a2b5a8f44c7a88bb93f01f0ad81bcb95f121adfc940ad96ba5d2366ec57ddb5db8eb633e35f92a9cdbc45d931 WHIRLPOOL f42b302243db1c082b28e98cea4853a3fd49d17bb0995aee1a7384880fc29a6bb5de0304fc53850213b4d81787bb2a818ff3c5978cf0fe007ab7cce610d2b3e0
 DIST genpatches-3.12-17.experimental.tar.xz 46532 SHA256 a1491fddfab9dc468e6f19e0aa4fad8c28749bb3e86fc35caec5562dff809ee1 SHA512 15cc64ff7e72e39aaa4d22f0b3d97cadb56f7e7e2400ec9c9ddca1d493e02ba81ce6c38398a6e7b354ddfb8a81c59df1bd3c5a6f6b91abd0ade1c2df2bc00090 WHIRLPOOL 286e564a1c32f479c6482d476cdd088bbae42a56ddd978fa66ae67081801c81316e7f2850ad727691ff90c55abe611e249faa961c6dbf928da180c90ffcc12e5
 DIST genpatches-3.12-17.extras.tar.xz 18224 SHA256 d5980aa35d89459789efcebc39c933b3b223a0a3f3c3ef6b82f25e8f720c9038 SHA512 556906edeb2e6825cbb22aa6b058142dd3cfcf1026bf32ab094065c8bf539d114042f3edb91587e01af9a980c25220e33006d19a515863803dab0614c022fcc0 WHIRLPOOL efbc9ce40054e07d1dd9b788ef93b52e160b83c87859a4744c038a61ec346cacb16ecfd528138a3e65a376e2ef2c9fd56a112486937482747d822b580add4d7e
-DIST genpatches-3.13-10.base.tar.xz 235084 SHA256 917269ea4b97798d1c5c412dc2d31a24be0ed4b589cb9a56f604c1e9fae3bd2f SHA512 80869c9da4ff9171b95e7c58a307d9865cdec6a48deb5a53eeeb3a7f358b957f74246bc4a621e9e6009b283dc2cf158f7dc76acec910cf5125e0023595a71ae4 WHIRLPOOL 18cafbf80f012873b58f663f04f6d47e4c476bb5baaf802ae936661b1cf9d286ed73b892ae33afa50d4405e02688e537b2591f93890da4da145b0d3ebfbd53d5
-DIST genpatches-3.13-10.experimental.tar.xz 50984 SHA256 2b2b90ae4dec0cf9c692a918dcfb79e7d82440b07ce1b81add7799268e0498e3 SHA512 a3625907eff6a5651dd9f7261ae1caad2a578b6a266f0680d8732c647b7b8fa6c0f3a667720594a443ca27d1c7cd12a25af794a1e1cee506ca19415c7913e354 WHIRLPOOL 01b2e70f49f5345042f0cf15308509a96760a666a0943f8202dd5e85f6cb7897f0ee58d7c26b08f7344d1af0f1327ec47487a5ac343931fe241066e7f2384791
-DIST genpatches-3.13-10.extras.tar.xz 18184 SHA256 701e71e53b4a96907c2d9258a86c4abe49caf94430e4a0706ccb241ade3d8715 SHA512 a3f224a85dd0ddf03d2ff734388b592de0320653664c181923d243b1f439ef7ee9278ab835425ddf6574901bfe5605e9ca71c53184f1bc9f2b971331e6015275 WHIRLPOOL 5881bd3a9dff0e0a6aa54895701bcaf688900da77f075d99c27bc9ddd45b6ba3fff41becefa121698e2b01b15bce83897c68266a1facf9222e1c8436a17f1ed3
-DIST genpatches-3.13-11.base.tar.xz 253240 SHA256 d35db3455fc0d01efc9ada22b955c42d0ae724bbf23d109df990ad76bfb545b3 SHA512 a8b063573169a222cdd5771822748372c808e9f88924b5d30746ebcfba588f23edffc6717b0fb4a2bb26346e9c9d9dca761d135090ba40a266ca8a6203ca645a WHIRLPOOL b2f1d18e3e2e0a97c9f7a80327efb4d522d62ae6b5dd934cb62ba9b8a0653008fa75d109aaef3e6825a986901c3d82e73c8cd448121901642aa1e01cd5e0aeed
-DIST genpatches-3.13-11.experimental.tar.xz 51040 SHA256 6fe179278ac918873fa98ace837bae30a18e6de080292f7f746cf2417ae3ee64 SHA512 b1cda893b355f9ed9e26ed61b6d250fb518b51c069cc415eab30111c4eb33458d316574e8773aabd230cfc0b6f6081e1dc895274c6af8ad49753247320e63bd1 WHIRLPOOL 907c9411a4a2a124ffba3df75092a0f858297420b33df778c4e699a4de890fc7447cbc4a916a952c9c87639351876d714a6a22b65455f5d6a76e03d813ec8a1f
-DIST genpatches-3.13-11.extras.tar.xz 18188 SHA256 1769bc3ca09646c637b277c9af215a5eadb0ba3988d0a86ac719578563d43fba SHA512 a635c6b7cc04ce41afb5f8b2efc263a2e0d2d78dc5aafb8f3e4fa35ae7ed55ccec06cd63a12b71f7818477d4a1b812a06b254ba2b2eb4b0a3185356319532e54 WHIRLPOOL e7fb7279f802a6b4b173d10a4a2677490bee7f18a8d385af7247bf5db0d909da8374980dcef15f981cc52bec51fa061d9b2dfd5678b9bcb8761160ab1897c30d
+DIST genpatches-3.12-18.base.tar.xz 479480 SHA256 f1df4b33603a74ded27ed89aea0657719fdce0b22ed20f4e6e52053a9cae6505 SHA512 fcc70c9d989bf760ca7c822873fd6183bec087c6c36c5c30f73b8da8d6aa05ebd848c40e82452f7c1aa8a2337bf43e33aa91304cf460eb96868845c1808f3bd6 WHIRLPOOL f100b92fc2027df4af56ded1657bddaf7cedc23e6d0f7dc3d381ba5ba2f95eea6a5815f309b10c0dd2a7e56a7c1fa467fca4263f3c40b78d35656678a2fbc1f1
+DIST genpatches-3.12-18.experimental.tar.xz 46540 SHA256 a8b8667730e47b61d55d1bbe11cdec4a2e539e749028353172ab1269bbefe96d SHA512 31d5c2e7aca9574cd6e04e5e61a907ffbe6940424a877eef5d7e12b74552062b9c0afb177f2bb44d70d67264d52158b024159a170409be23c6bc4cf2a773a28a WHIRLPOOL 273c23fcb13289421956a61c1ee0a5844d776b679943b2a9ae35fd46e7319b233db0e255ad032e44eabc76a51a2380f7129619a50f859ed4907acee08678ca18
+DIST genpatches-3.12-18.extras.tar.xz 18224 SHA256 7c9078f1fa6a0497e67bc1a07111168f453c66cf7927b644bd76d4e64c23ef8e SHA512 9493514bc7d3bc5689c9f0ce53a5d9a8ef424f4810d717647aaef255cccfc789c571c0f60a669dd1729d15e8a96271f22937990bda2e5db37ab0f772a8e9276d WHIRLPOOL a203bf55dd89c39e06c2522abd96bb837aae9465d795a51d52b827df6341c19a6d997246f103504dfe1b278537067e3de704482e0592c20f4a9308d70a7dae48
 DIST genpatches-3.13-12.base.tar.xz 262440 SHA256 8ed8c85ebfac182d0e99f89042377e3820d272f0b2f58755565fb687b84eafb0 SHA512 43ac18b049912a94375c50530960b3a4000119358777799fe0861b94e3b4dcc79adf6f69298f60ebfc68bfc5400c4f2f7e5373eae63332f0b9683b1c4b01f904 WHIRLPOOL 93a641df30b4ac42327ea477c3719d6048f17bca8bf976be8f60771732bea5dd852cc6ca91103f639a74fbd8875c4ef09f249b12d37db002cced63cb88cc59a7
 DIST genpatches-3.13-12.experimental.tar.xz 51008 SHA256 71b41f5039fe0c5095b033befbebe9e0f950f040b554a3bdf694b17dfe95535f SHA512 8916f29c6768c146473d0038ea3de86a8f975dd53acb833bc048291aa243ca17e3905e279de6532a33417732f608328fe3c53d4bf0929f98b38090fea5f8e4df WHIRLPOOL 23c6c270034e0aa6aa882e660a97755e8a29762460ae7febcb1bd8f9536791023067a3c9cfa984c9a21c8535bb020fac5b89a641195fc694a1d1888c03f11a71
 DIST genpatches-3.13-12.extras.tar.xz 18252 SHA256 6e551ddcdae045990264eeca3868a34bf9fa3a2be9b6b973037f8f2fced11a21 SHA512 bae47b3ec6ff97d616fbfdc04616aa03097b4c6345648edee7f912022a9d5ccac486d181da3a5c51a8cabc712c126eca6a32e384bc3fd25f096baf98113de62b WHIRLPOOL 4944fcd6b3192606f099ef66d5299a6eab1bc639797ce3e08ac1b784a0f31021e567d44d8c150dc60beaa9d0fa8cf13ce7d3e793e7f66b4ec38d3560a484fb84
-DIST genpatches-3.13-8.base.tar.xz 138020 SHA256 f3e048a313ab55bcadb5a44036c6421d316102e6aee15c15dc13f1ba8d516fa2 SHA512 bfb9d7b221a2b0d302f5f8453784886ce553b0e8e8a2faf29e3b1f95611c745dcfce4293d5e768e878f2b88aed3866a9f38545b8551b9db3fca18d39a966c1a5 WHIRLPOOL a8bb17a0815bb7a369ae371ce1939bf2d38d9d2324653e77c16ded0d31f8891824fdb08879c2315d99ee55d6bcb130a3b1589c79f5431945042433c8a0c57d69
-DIST genpatches-3.13-8.experimental.tar.xz 51008 SHA256 9f15466cbb76f7c9d2b13df5bb5f4ed77f97a5b7ae865b96edc47a2e55be340f SHA512 d51e4c14945bbd622332af87aa40896727efd64a0442728eb17fc86d57b9ce5d19959ad45e5614396c36ace496c641df1bb2455be701462e347e4de27838e5e9 WHIRLPOOL 5b226304d5554eb4e888a65ce091112b4064ae73bef5fede666fb6013ec0977ba2eb57ad941727d98e13a38f76bd36735207f9d09e5cd0a8997235793b5c542b
-DIST genpatches-3.13-8.extras.tar.xz 18168 SHA256 a00603ac5ca73f37261c2dca4f8c396a9d2b988fd326c793d9016fe8355e790a SHA512 25fd010838a4de56a513dbb21cb1ffd3c99566cdfd55011f1fe25811d1b2c882c62be6d6904115f1f1aa894bc917a61fdf5009c119e2a2614d39d3c258382453 WHIRLPOOL 7d245c855d6ac0b501317d33924fdd8c92ac2dd5b13ea0377fd169e01df27442413dd4e648d7f71e96a1e071f5788553dfcc7db3f12ea9ecf5efbbd3614eaaeb
-DIST genpatches-3.13-9.base.tar.xz 193284 SHA256 f507ccb65f1c2cbeee86e4e5949f62db924f5cd9cd35b3962e478802c2279995 SHA512 49540e2c4aae2641a14c27c88888a52358298711d682865ae39128f1d5935325c0bf901cb58ad8d5477940efaee87e5bbd4d758ff4daca88fc23765d8ee176a3 WHIRLPOOL d30fe74184a549493da4fd2ee1b0bd7d75e5439c8387d7d81bc9319926be8706db3e177d5e91b073c988c49a7ff2d2be63854a1e7b43472675844c512daddbc7
-DIST genpatches-3.13-9.experimental.tar.xz 51008 SHA256 71b41f5039fe0c5095b033befbebe9e0f950f040b554a3bdf694b17dfe95535f SHA512 8916f29c6768c146473d0038ea3de86a8f975dd53acb833bc048291aa243ca17e3905e279de6532a33417732f608328fe3c53d4bf0929f98b38090fea5f8e4df WHIRLPOOL 23c6c270034e0aa6aa882e660a97755e8a29762460ae7febcb1bd8f9536791023067a3c9cfa984c9a21c8535bb020fac5b89a641195fc694a1d1888c03f11a71
-DIST genpatches-3.13-9.extras.tar.xz 18184 SHA256 cede36eae206fe92a5eaffe068d27cc5095eaa7a64d5edd579fffffd0730a2c8 SHA512 4063d9a26e749a1bd5758598104e31dcbb34d5daea1c2a54aebc21a2d38a983eb2d4d7c2583caea844ec70b1e8d3e25616a28bebc1b533e68076bf6daf8e71ff WHIRLPOOL 6b682c0bced62aeb937d5c11939a55209a6a325a4a8b0c9234f111b9b0f1ff9aef4d15ae9988fbdb9746722eb4e4d9ed82356d6731d12140d39ef9f54ef31d38
+DIST genpatches-3.13-14.base.tar.xz 292688 SHA256 889aeb1d1d6173d9f7b6a92312995c6085e91788d4c683bc8cb6f798abe3973e SHA512 04480bc989431630fc9d3e4a0d81fe6bb76951044a32827ebf12aa34ff6c4f8d022013593cc87b4dee511bf1608a7c6e4789da8794369e72a3c1da7faab20ddf WHIRLPOOL 58daad871dab13573e33432eb74c0d129506063397e3e97fccf092c8c0140b4ee042b084b20162b5c6c32fa812ce3f2a5565d692d33bebab0c34a1c6f6e98346
+DIST genpatches-3.13-14.experimental.tar.xz 50996 SHA256 081da6b56209f08f9bdfce4e7854c9c275d3085344be0b211032d7e8d738a466 SHA512 3dc38c374de14d919490d002fc93a9aca529801eb8e7bdc608aa7b1cc8f3893ebb2aaa79fd36d892f1c967a4494a7e0f92ea14cee45ccfe1bf8da65678f575af WHIRLPOOL 808ec9b834c25c93da80bc1a3807366c3308c1685bdc41a5156bb707fbef39225de5816254cbea781fb4426ecad129ade6161cec24a60df3380ce781aa2297ce
+DIST genpatches-3.13-14.extras.tar.xz 18240 SHA256 aa302dc1de4a64fdf1b01b2e0f9b949be3b91e0d1d43ffa99d701076c13b83a5 SHA512 67621934e3c437cca531914368aa51e35c448ad44f98e583b9eda90aec005b21c0d0f40ef25182579577444c6eff1f1cb8fa853c862e2529a9dcaf56d5e69da6 WHIRLPOOL 9a7dd161e24cb5da8edf816c62c2ef0f660f4d147876c3b58f8a6de33ef56ee384d2e6c207db94b4c7dbb755fc3d215cb5db53a71cac3225e985f66651b2f14e
 DIST genpatches-3.14-3.base.tar.xz 7804 SHA256 7e5c21c949921a637851a78b0c8299343f06b3b2af3b11ee5fe8ec9cca2dd147 SHA512 ef45321d53689d0ab079c3dc993e00c579fa83b761c3cd59fdba252d00475502ec3aa5093284a2b52d94f39790fc71394da2a04ef7d7a46ee67801dcb124da1e WHIRLPOOL 6e909a9c8ae73b146144015af71c9395255af3d3a4e4fa89241654564ad7d16d8a183121e74d5bc075a4dd4c9369997b77584251c920e6fc48661d64e0ee7c75
 DIST genpatches-3.14-3.experimental.tar.xz 51240 SHA256 b7690f65afcdf71e105b4f3b32eed35f3e4c662efcf588b659553ef2ef9bb430 SHA512 98533e108d86614239d23b7468f60aa31d0136c89524794b58eed288f573934d4a9337e082c2ec71e0acbfdf9df4527962499960103f72f654c799368223fdec WHIRLPOOL 7a64664ec624931f31290eee2b8037714ac014c28155898c8800ccd61201ed73e64787e25985661f048a6f8fd33c82acc8d31005e3f305a9a2e02d7c40aa3ac3
 DIST genpatches-3.14-3.extras.tar.xz 18184 SHA256 34f824b2c617e7f32171610a3a7542fee18ea3c22434f8ef6d74435cc009667a SHA512 f3cfd808ee226b84e376fc29cb2e73298dedd263677bd680034189a7bf571cf8167e441011d46d40f0c1949623dae922f7fb13330f799e543d32c3e4d0c59420 WHIRLPOOL e65348503f15089771cb383a0e9b39d919ce9a7427a465a276763fb27d4cde26d498eef987fc3da349a7f7c7b31a40604bd549b3b27a2e05e851a51c86d7883f
+DIST genpatches-3.14-4.base.tar.xz 19028 SHA256 2d6abfa6a7af3f4ad1f46a0b6f121226b08674b2cae272a783cbcc9d20b30e31 SHA512 6885c66e73abb07c55b675cb6a577c2570e19d06ca33fd93857d870d2331177d2f3c7ca99489967f5c7e7b3d4bb808c4cc90b56a8483a6d507e8b2a3198cb636 WHIRLPOOL e093704335fb19bfcf193c000ebe9b119aa42f8c3464fc51c119dc2a8eaae0dfefd9e8f07b98c8aa6cfeba647e18ed1812f1f61ce43907a4c03c9a847967bfb9
+DIST genpatches-3.14-4.experimental.tar.xz 51208 SHA256 4609f87ad634e262ee00da8505833ca3f848014e863d8c0147acfe924df94d75 SHA512 d2dc7440fa0964bf03a451deaf72d8a85ad8423cea3a7eb7cb209009e52b9aa52f876775f7ceb3dd2977be0f9be7f1f78f2108313d873633a602b0c792e32396 WHIRLPOOL 0c6990fd2ef260d46193b571a6ae71ba127141c8418f1e4d3b0d5471d22d144956e6bf20f2ced3213e107a9d97e578b62102d1d6b7c0764b0b882e68a0511b92
+DIST genpatches-3.14-4.extras.tar.xz 18244 SHA256 7cb1d8f36ef56e4036708185855be8a34ef5b953dc74eb5d2d7a35fe41c1d009 SHA512 ef0799d129ad31602763b145e8274cc98e76902fabfbcd94a5ddc95d7d1b0af9dbe874730fb30d8221f3b770df649c2a42f5703c262ad9fb5b57e4a29f44c1eb WHIRLPOOL 1b1743ea48c58f66a27b685657c8d38b60415c96531c21227a666446f0bfe896ffa774b0cf7ecaf2a92cebfadc0ee2fe8fab64a4e1bd3909cc728f2e4b76c061
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
 EBUILD aufs-sources-3.10.25.ebuild 2040 SHA256 183becb9c7dd965cab8b785cc81afaafb661b1121f7c09d6c510c504ba02cf5a SHA512 f0ae7db14e7c6c95702f2632eae50ea634310a153a702b65df7ada96d78f183b7dcb5e555f203c6e97ed45ee089807740a3a65f3b8da0600e91f290dda425b13 WHIRLPOOL 364158a94635388a3177843ae40965adedabfb50b4a6a329e30ebf53c484c81197cc8dd87e553aed1d227fcb2a6d7e766831e223b2c12beeb5c804f95e8bf367
 EBUILD aufs-sources-3.10.32.ebuild 2065 SHA256 42ac6dd204fb43cf6769504de7ef05b4cddf723c8f05d68c00e7bc1b0c716e18 SHA512 e0d59decd10e6356b2e6884280024916fa3f7b7bbf635d025d8b333d99d77ad8896bdc980fdad296944a3471248dae098b08b1633f5704bafa90f8a7810da0db WHIRLPOOL 54abb86f4522842bde3e734335caef4c4683fc79bfc5cb8d1a45e7115df70079c6d153137f210b4994a86a05a0051ff8b2170d09227baffe5ad6b880fccabac9
-EBUILD aufs-sources-3.10.33.ebuild 2112 SHA256 c609a700f964114e4a2a6c2cd9d479dbeecec8c2a6339079aee5a18651a85406 SHA512 170395e1b378f37eaaa4deb91beb5666bfb8301a5581513173aaefa4d2424d1ad3071fc982bd007a46dcffb9a72ab72835cf773cbb96a7c3cdde797c90d12ba8 WHIRLPOOL e663915ca441a37fd1292bd145834ff13e898264b071ba21ace5df7eba08d7588e0ad33e77f68838ed4279b01595178662afa6cce219cc9e962a73254d470738
-EBUILD aufs-sources-3.10.34.ebuild 2112 SHA256 ac7fc09aa40e1d2449b19a73fe6b531ba5eb6636ab5f126cc8c67741b1b390a2 SHA512 b4c5ddc9a1b51d4af73ad6c4546a860e3af7a8360be7b7e5e0bd259b6df351e15f99db50c2e93a217ca04c47a028c37d8f038e9855413b626f459f6792840b95 WHIRLPOOL 9ec90214346c499178c89cb6dc802fc7b54a35c818d587f4e54db27308c65c455683ad6ce385333b9a42a51f67ab0acb51d9b95dff9d6fbfca4746ab52a26200
-EBUILD aufs-sources-3.10.35.ebuild 2112 SHA256 1b1156bcb3773429eb404797fba4787a61130f083febe050a3fe9c133e0c1cc4 SHA512 8a4983c9d675183a3733ace486b064584aee1c9bb8fef5abc37b992c5335553140a93839843d2b8f8457d2f19b07231a3fbbb80e0826a604943a4492abe6882f WHIRLPOOL 954d84ed420496f42937ad490ee82a08ab781945bbfd287b45e892999dc58829f38a27754b43fa28eb3dffd3579633c6fa246377d53e2887ddaa0cee94eaf3c3
 EBUILD aufs-sources-3.10.36.ebuild 2112 SHA256 5a53ef7a250979536a4541ab6cf467714fd09059f99e883c5f7966bdcda87a37 SHA512 20e92f39846850b6ee179c24a016cf1c0fa41663aef5616c10a3b02598257015f93197efcb8340ab4cc5ea8aae68e2868127d4351d08006ed2e3e34c53238367 WHIRLPOOL 06924d083193fd0c2173fb577de916071f6ca21f38611ec5f8b0c0e2c89acd071f0ccb6520f9261152e9c7460cb91be2adca7401671dbd69ecd1e3e0d96b2557
+EBUILD aufs-sources-3.10.37.ebuild 2112 SHA256 ebfb5cd76628b1651d1718e9943cb6f96c3bfecf8774abd6438a74cfeb2a0b11 SHA512 e6586d378d4af4dfcb1c6512cfea7738caf20a363087d116e950437b75a69dad5ebf8a839bb46b31f067eee23f2b75fe1e76e532ac6f6cf957e181cc26560f74 WHIRLPOOL f95aabd64cb0d5a0d5247025d5020120b5b28ae027787b8b34bd2a45075fee379635767c8f89155a30327d350afa48c98a9f641bbf9244aec659e4637a8db4fd
 EBUILD aufs-sources-3.12.13.ebuild 2065 SHA256 6f99c24826f15438dfd54f5ba3b918578bc57e5a80d505557b80f500fb4a989f SHA512 6f155853e8428c43065bc36a2fcbe52d20cef66cefa5110cef96db9e33f624ec77d9884a7a7474b979da57e755211498724dbb05c25e6b2da0dbbf368e925728 WHIRLPOOL dcd4202a9d0aac91deef5975a6efdc237c0edb8e7d4dcbc7aec94dd55914b92ac1346288c0b21117d2b0b461d764175b3edebfcf8bc235cafbc210dd9f6574b5
-EBUILD aufs-sources-3.12.14.ebuild 2065 SHA256 3c989ad530a99a66676f19485c6323138085add5ad0b40e24643d0d3e0226048 SHA512 ee8812ba7d2102fcc18054930cee5d8db6710dd8df4d5e0f8dfe3b602e1aeb6e4ef8d2b8f7c41b88f4b7c7e3b80c3976504c421f3ab21b5f77adbffb53d32bd8 WHIRLPOOL 5d36eb1cf3681739b175fa5fa234e83b6786df07afbd0aa64c2cf35ee378f858f1693c08c0420f4f5e7e1c651c33d05e1ac60fe7dbe6fd5c978c237d0cb29b1e
-EBUILD aufs-sources-3.12.15.ebuild 2065 SHA256 32501f94fc6486df5aea1ea61a89a3fcbe1125361072e2d2c990c5ea8bfabc5e SHA512 7cd4b4183e78070f43171974bb3d78a883f448b07c46e3b8da93ca6ff5f321f84f4abb56e4acc6a71c33584b40b5a800f99d4f4cad8f89b8d909a18007ade29e WHIRLPOOL c80a17da374f58804c3ae9375d103fffc9ea767520d606c8f2cd1d259b11d8e2b24b4fc6d8c8c02586971ea600fd4167fb45a1e2520980f98e431619d37fa670
 EBUILD aufs-sources-3.12.16.ebuild 2065 SHA256 b5c5cc28742cf497098491b5327d8f858a5b8d5918b0014a5dcf4b1c4fda1f54 SHA512 d98c2f3d7d3e479e44b51b00502f07db6c8bd4f60fe395cfe5196baef45931b98df0b71499651f6f472343418ec6395ac8722b591c12dd3309deb502954ae92f WHIRLPOOL a673bd29a8a851d7d38d20749b951f7a02d5bdf09aa5c88792c37c6a1fe195b7daaea8c0ca0c1c40b4be80032dfb665a63700b007f082c0b785d5a906cd4be2e
-EBUILD aufs-sources-3.13.5.ebuild 2061 SHA256 34c75a1d51b893d630f93893a352c9b771a615e30801a797cd902f29c9ec994a SHA512 17caa1486a7af64051997114db3219bc2870310506d1c1546b307cf656a3bb7264c10010849021e9b95058bbec8e79b87a9da6c526d508445f0caf95e0dcd8d0 WHIRLPOOL 1174cfc5f1af2219351dd10a385f650f11a49d7c0aee5be073fe77f4276c6b04f3de8c225bb8f79edf4c2f1d89d1f138a9d45e95095c8eea004ab50d84f8d772
-EBUILD aufs-sources-3.13.6.ebuild 2108 SHA256 a0ce4c544d3ba29ab88c7da2f3845cc3ec71c2ba0cce49ecc194850b866209a1 SHA512 08cbd9ef7c5c38f1f933a9d01b75a13bc3e690a47c5af7f845f3d9dca50d1c30f14b93d4e53635f4089c7a1ec1a994c271fca215687271170f4a5d5a5b477c61 WHIRLPOOL f905437144846184d3dd649dce316da353809c93ffd2be3551186cdb98da4badfa8e1b6438e94bc56ae22804fe6d257a33899a39f2f084122cc0dcf8c172701e
-EBUILD aufs-sources-3.13.7.ebuild 2109 SHA256 2069f5a24b50d96bd40b0a4a7d5b075b62e8d15dd26345ebf93c0a2494b6670d SHA512 2def7ab8073a67d50e9168183681e9ef098064b5a601843d4b7e358f37fbd80b60c0fdcdc3e12b1394e6402a1e3879e0c6331c501b135dc35edb3b64a71286e1 WHIRLPOOL 65f6480c2a92ae0074cd33d0f2ace659505ca39198938ae99890d0eac5348775d05b7f87433cecb4fa3664d96a89e20c8401bbaf9bfdb2bb51cc4cc3569a2523
-EBUILD aufs-sources-3.13.8.ebuild 2109 SHA256 49488dc50a3e24043fe7525759772eebe66eb47329ec2c094f25bb0d2ba2082f SHA512 fd4fad1e3f02fb32fc4b4e3b73f818b51255d880b87acc9369b40f2109f9e8244b2f27460eba10f694c6997996a6faaa85beca8ef2ca4b78eb32b33b4906eb5f WHIRLPOOL c4a2fc14abd991420f6051f64cc5ecca514a0be3fb62d32e2d821952dbcdd18944cc3ce6aec447631d3749ab5a8c6903e3e43916e1c113775576dff30bafb676
+EBUILD aufs-sources-3.12.17.ebuild 2065 SHA256 18939fd19e2ba63d8f8db3bd5b652762cb75e8c91063cfb282e86705da4ee898 SHA512 df376d99ed606dd8a9b12205df78cad6a80cea68f0846fa3a9bec3cf257927a8c89f181aec85fad6e256c3f7e6b66ed101b5b73ef5c2b639c27f560963ae5e8a WHIRLPOOL 790d7382b8c420cdcc384c39d9569248b2fc909192cae6cee2452e9c824cd4fdad26553fe9f84528a6baff6b60e2bff14dc42d8b396d9ef6390beb33fd682b69
+EBUILD aufs-sources-3.13.11.ebuild 2110 SHA256 f50f3fdd8caa448b36b72eaea5f2739cf2963da05741a6d0db2eb950dd72d93e SHA512 68153cd7770a8aee0aa2f417ea80b8928535fb9c750a3e4e509f57bd779901c92a86d550aa9691b3af056bd6a5b15b4ee8e7d9aef3c053092448a3284adb6e68 WHIRLPOOL 01c9f2b6cd92d445715cc013f2ca554ac14546c6ca697cdded3e0f6ba273d3cda0f79f8afaff433a99a1ca05736c990a5f941b670449d8f4f08e4468bfb6c7ed
 EBUILD aufs-sources-3.13.9.ebuild 2109 SHA256 e4ad206f8a89b7eb5c17a0aefc23e5851c189f6d1cd01fc02af325670440a579 SHA512 f55718bd1c9302ef02c920d7220ead118ef0b024ee750ad3bac993b57955c3fa7bba92998888c01edb767580c0c43adddacfe2ea5a60577772e07a5e03c8a8a6 WHIRLPOOL 222916e3ba0b9c1998ba0b7ba89e20ecbac888d75ed503b00fbb46efbf5e144a5142e1f8594812ee58c56624f94a7ea1d9b174fb8c08f415a412ece38f088729
 EBUILD aufs-sources-3.14.0.ebuild 2108 SHA256 3e06be1702f856d6542b84f0629e5a10964e55b23919d5cfe407dedf090d6f1d SHA512 72073136f982f8dee177cafd53273f7c3e1e613cd94bfadd85d6ccd546042e753ccb4b35a46ccc6524edfa26eace89c2971692c5c43ecde1e8b02281eeb8601f WHIRLPOOL 9776e2f78f09fe2fa90a437bbfda032a6835f7eabe5d1005fcd134e061decb7981fd306afa9bf412e5b7a65b59aa170600814a3b5581462df06213f45563893a
-MISC ChangeLog 26019 SHA256 d1dcb612761562001206995ddba987b3d02e0ed909fe1a041f76a5d65195d7e9 SHA512 b8ad75d2262d4f8576623fca4681a7ee9c0f4f85b2817e6ce998c09350ed122a85e3d89540702011e9639519cc239510279cfc31395a617fae2a1f9d48945871 WHIRLPOOL 996cb46466980636fa0406d38023bc9e324c99a5d75f8cc66fb3768ffd1bf445714584e930ef89eb15f7faecc3dd00fbd4fa359bbd1bb1fb22283b2794202d89
+EBUILD aufs-sources-3.14.1.ebuild 2108 SHA256 0c7ae34e30c3a291ff85d54057b9ca7213eec5a273d1c92a438f96784919de83 SHA512 4fc88d585e462a1403250d4034a5ccbaa8cf65e77a4763ae36979f0f8b9fd5210024a8362515ee02aea2c023ae53a87bac4ea2e000f066a6b421e13173dd30ef WHIRLPOOL d3ef8fe20035c40623dce65637956b3b102677ef28ef247c5881bac36431ac36bbed33aa9303f5ce4d3225d7a5738d113887513b232d365b0bca80ed125ae740
+MISC ChangeLog 26661 SHA256 7727b9b4b7c2cb14b59255441c6f0e6a268f669900bea44dcf4d2d0ef091ce40 SHA512 b67c678b8e71d1ac18485c8e7db7a1b594b72f05d08c7a478b26c1b2556e78c307c9a51d38688a0565ddd73426f7c804b7e6c624d9880e8d65dac2001e1e9624 WHIRLPOOL f539de08476e695f895cae0a640dbab094bd12f93ebd2b46dc5fbc0455afb3bbc2b967761353b3ca35c3c7af963a7d845dece9ce1bd9d0ae949cf11ca99824c2
 MISC metadata.xml 859 SHA256 fea95e250bdf2560e059525693cbdc5aeb05c91b3ea7649c8ba9b866b8023ff4 SHA512 8466d0af4afc071c685af5c91b39de19f2c3c9d0d05e99fc52690021b19b967254491c430b96fb5575ef4379ba6158cfc8b010f7ca03c8bdd9b34b1e1ef44e69 WHIRLPOOL 521937092ab56073f8abf36e96a988f79157e8276fb777e8c6c2a90ef8d3fe488a968d360ab2993c9020bf67a6ffe9044665e7ec0dd52f8a036a1e11615d5f4e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJTQs56XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTWP6wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirIAIP/iS85mgBBBI/5oNHwRaqemIU
-5vWXwr+op+Fu6SpoFU9LilB0i3I0LzJ1eZJNZJFcKHyCS7QlpD0722Q5Il4X+TeU
-ARCXFsk4ROcSt6VpqUWNKuGhejDMj8um4A/znhG9FdV+y+e3qJo0jOykpndVx7NV
-/aq3lTOWzkHud/SlNppN04xW8Agdwtdul5fq8sh/MfK9twEg7yms9YgTP3SkPKxc
-MxuG7v+Xc6/PSeHs2GOT42nsR+JcyCAwyiaUsc1pgZrZESoAWANS4YtjX3OzSgYl
-nfM8D+07MFJgujXrzMBI++NBvfhAz/rRCtLkPQItREnfldk9cyZvcdAKDEV4fZ0b
-1MC612MGW3NU0x3xIfAOjPj1eoaA3AfpJa5rUeJ6x8il6xPdNOf/uz9Tku8RRGsL
-cZ/dT3JbGXGN5fU/9dC6DmkoG53xFKkMWGQ1ybf4NDohOWgyglpambxAjZsl6fBF
-sKTKVcYKa7/6+Mz1x4ve561RJ8wM5w+mLDQgb8IEla4lmWhf5zS+njVRGXGfYf61
-TWGMJ7n5oQxuZNIhBlNae0OrlQR5oMx6uKAGXF6CZ6z9dvjvynblLKVq4a1x25ps
-9Aj4Vw32f40cK5j70SD7K+oZGmHwy1V1qIXv0mNwcX8JkhfOHhhNRxjMg0CAstXv
-2WLkkGXghjk+cLuyWq31
-=KldO
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVircb4P/iuvraO+hER5/mn2OxEO2CSe
+JKQscK3HtqB1nhVWyH2z+bCq8yEWcjQcMsBBtQH2gfuxzmFcypSyhQBDKqQwRZYY
+IwXekfIvuVuNdI3l5B4yvEsYRMVXYCSEq6MASr4orlC4VekIt7ynRcGF0/4wnwy0
+R98e8EkKl1Fc0VXL/KCQ0YPXsLPJTirFdn3tK7Ywat5sCkZ9AK6YOVwMpKDLNMNn
+gM7jsK1scYo+h5HsTPc2hjMVfsOgMlYynCNxzmeKmNwXRogN5byyfcPuBoEJ1Iy4
+yI/d8pZ0PWgZvJx/lsMqV7syQgDikrZdwE8j7ojpYGUU597k+Ww/sZ9WiRmyYAc+
+OHIzO7kW/nu7j5ftxeZlKcyAqJgBbhQFXhO1BlKEoUMvOy+H2c5DgZKCnt6GS7Yu
+4cP80LveOGKLUYWtXiFDlakgsODsooigKZx0lx3Ysb5XPihU538gPNgJtiF82l0r
+tJI8rP+4LQ9TFgEo89fiBj+bxE6CGKItJtzjY/7r73fpBODAwnlxyi81ma3S/cUk
+hkxUy1+IzD0g2trfK5ucrW2hfCpHT2/ef69T0m53kbjMkIh/JhiepTPTzBNJXX6r
+2c1500M7jXDcz8oRgmC0eHBWgpeh5Hd0ETL0RfGzrx2VOqzg/mccQJf4IxI3e7p2
+wGonk4avPkK4cLgDmIji
+=O3bt
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.10.33.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.10.33.ebuild
deleted file mode 100644
index 3224962805ee..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.10.33.ebuild
+++ /dev/null
@@ -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/sys-kernel/aufs-sources/aufs-sources-3.10.33.ebuild,v 1.1 2014/03/10 14:06:49 jlec Exp $
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="40"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils
-detect_version
-detect_arch
-
-AUFS_VERSION=3.10.x_p20140310
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND=">=sys-fs/aufs-util-3.9"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util && \
-		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.10.35.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.10.35.ebuild
deleted file mode 100644
index 6fbc14c6b914..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.10.35.ebuild
+++ /dev/null
@@ -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/sys-kernel/aufs-sources/aufs-sources-3.10.35.ebuild,v 1.1 2014/04/01 14:56:36 jlec Exp $
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="42"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils
-detect_version
-detect_arch
-
-AUFS_VERSION=3.10.x_p20140310
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND=">=sys-fs/aufs-util-3.9"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util && \
-		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.10.34.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.10.37.ebuild
similarity index 94%
rename from sys-kernel/aufs-sources/aufs-sources-3.10.34.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-3.10.37.ebuild
index b5d146238028..2e5ad2b806b0 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.10.34.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.10.37.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.10.34.ebuild,v 1.1 2014/03/24 20:00:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.10.37.ebuild,v 1.1 2014/04/24 12:08:05 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="41"
+K_GENPATCHES_VER="44"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils
 detect_version
 detect_arch
 
-AUFS_VERSION=3.10.x_p20140310
+AUFS_VERSION=3.10.x_p20140420
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.12.15.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.12.15.ebuild
deleted file mode 100644
index 3049b0fdf840..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.12.15.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.12.15.ebuild,v 1.1 2014/03/28 08:09:21 jlec Exp $
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils
-detect_version
-detect_arch
-
-AUFS_VERSION=3.12.x_p20140310
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND=">=sys-fs/aufs-util-3.9"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util && \
-		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.12.14.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.12.17.ebuild
similarity index 94%
rename from sys-kernel/aufs-sources/aufs-sources-3.12.14.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-3.12.17.ebuild
index d24f9e818743..5729cab09bda 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.12.14.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.12.17.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.12.14.ebuild,v 1.1 2014/03/16 10:38:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.12.17.ebuild,v 1.1 2014/04/24 12:08:05 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="15"
+K_GENPATCHES_VER="18"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils
 detect_version
 detect_arch
 
-AUFS_VERSION=3.12.x_p20140310
+AUFS_VERSION=3.12.x_p20140420
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.13.7.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.13.11.ebuild
similarity index 94%
rename from sys-kernel/aufs-sources/aufs-sources-3.13.7.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-3.13.11.ebuild
index 1db905810855..5b073c8549ba 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.13.7.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.13.11.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.13.7.ebuild,v 1.1 2014/03/24 20:00:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.13.11.ebuild,v 1.1 2014/04/24 12:08:05 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="10"
+K_GENPATCHES_VER="14"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils
 detect_version
 detect_arch
 
-AUFS_VERSION=3.13_p20140310
+AUFS_VERSION=3.13_p20140420
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.13.5.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.13.5.ebuild
deleted file mode 100644
index 5748ba0f7cee..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.13.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.13.5.ebuild,v 1.1 2014/02/25 07:22:25 jlec Exp $
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="8"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils
-detect_version
-detect_arch
-
-AUFS_VERSION=3.13_p20140224
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND=">=sys-fs/aufs-util-3.9"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util && \
-		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.13.8.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.13.8.ebuild
deleted file mode 100644
index 5a24c716dc2c..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.13.8.ebuild
+++ /dev/null
@@ -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/sys-kernel/aufs-sources/aufs-sources-3.13.8.ebuild,v 1.1 2014/04/01 14:56:36 jlec Exp $
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="11"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils
-detect_version
-detect_arch
-
-AUFS_VERSION=3.13_p20140310
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND=">=sys-fs/aufs-util-3.9"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util && \
-		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.13.6.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.14.1.ebuild
similarity index 94%
rename from sys-kernel/aufs-sources/aufs-sources-3.13.6.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-3.14.1.ebuild
index 6c3c2d73f0e8..9af8ced593fb 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.13.6.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.14.1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.13.6.ebuild,v 1.1 2014/03/10 14:06:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.14.1.ebuild,v 1.1 2014/04/24 12:08:05 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="9"
+K_GENPATCHES_VER="4"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils
 detect_version
 detect_arch
 
-AUFS_VERSION=3.13_p20140310
+AUFS_VERSION=3.14_p20140420
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index 3a8e59e8f63b..4b3c7fe2b9e0 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.1304 2014/04/23 12:30:03 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.1305 2014/04/24 13:12:32 mpagano Exp $
+
+*gentoo-sources-3.12.18 (24 Apr 2014)
+
+  24 Apr 2014; Mike Pagano <mpagano@gentoo.org> +gentoo-sources-3.12.18.ebuild:
+  Linux patch 3.12.18
 
 *gentoo-sources-3.13.11 (23 Apr 2014)
 
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 4d2eda77e032..df3dbde5bbf2 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -34,6 +34,9 @@ DIST genpatches-3.12-17.extras.tar.xz 18224 SHA256 d5980aa35d89459789efcebc39c93
 DIST genpatches-3.12-18.base.tar.xz 479480 SHA256 f1df4b33603a74ded27ed89aea0657719fdce0b22ed20f4e6e52053a9cae6505 SHA512 fcc70c9d989bf760ca7c822873fd6183bec087c6c36c5c30f73b8da8d6aa05ebd848c40e82452f7c1aa8a2337bf43e33aa91304cf460eb96868845c1808f3bd6 WHIRLPOOL f100b92fc2027df4af56ded1657bddaf7cedc23e6d0f7dc3d381ba5ba2f95eea6a5815f309b10c0dd2a7e56a7c1fa467fca4263f3c40b78d35656678a2fbc1f1
 DIST genpatches-3.12-18.experimental.tar.xz 46540 SHA256 a8b8667730e47b61d55d1bbe11cdec4a2e539e749028353172ab1269bbefe96d SHA512 31d5c2e7aca9574cd6e04e5e61a907ffbe6940424a877eef5d7e12b74552062b9c0afb177f2bb44d70d67264d52158b024159a170409be23c6bc4cf2a773a28a WHIRLPOOL 273c23fcb13289421956a61c1ee0a5844d776b679943b2a9ae35fd46e7319b233db0e255ad032e44eabc76a51a2380f7129619a50f859ed4907acee08678ca18
 DIST genpatches-3.12-18.extras.tar.xz 18224 SHA256 7c9078f1fa6a0497e67bc1a07111168f453c66cf7927b644bd76d4e64c23ef8e SHA512 9493514bc7d3bc5689c9f0ce53a5d9a8ef424f4810d717647aaef255cccfc789c571c0f60a669dd1729d15e8a96271f22937990bda2e5db37ab0f772a8e9276d WHIRLPOOL a203bf55dd89c39e06c2522abd96bb837aae9465d795a51d52b827df6341c19a6d997246f103504dfe1b278537067e3de704482e0592c20f4a9308d70a7dae48
+DIST genpatches-3.12-19.base.tar.xz 501660 SHA256 151911c19a7aa06dc9edad29a0310d6c757165d0baba12f4bd96025a53168a94 SHA512 fd7c7ef41b2bd32956cfcaeca91f8c039eab70ffa468ce7a340824dbcd8b59c485f853b5c48a36c74847a0d68bd1d4a7459b1fe47ec595be55fc8bedaf1d4f60 WHIRLPOOL 255be4c1d87ad30b52dd7347438290c853af96c733e9a142308ba171bd53048efebe0a06300a7b5dfa25a94373506fde770a4a9881d0843c7fa4cb090da00872
+DIST genpatches-3.12-19.experimental.tar.xz 46532 SHA256 a1491fddfab9dc468e6f19e0aa4fad8c28749bb3e86fc35caec5562dff809ee1 SHA512 15cc64ff7e72e39aaa4d22f0b3d97cadb56f7e7e2400ec9c9ddca1d493e02ba81ce6c38398a6e7b354ddfb8a81c59df1bd3c5a6f6b91abd0ade1c2df2bc00090 WHIRLPOOL 286e564a1c32f479c6482d476cdd088bbae42a56ddd978fa66ae67081801c81316e7f2850ad727691ff90c55abe611e249faa961c6dbf928da180c90ffcc12e5
+DIST genpatches-3.12-19.extras.tar.xz 18224 SHA256 d5980aa35d89459789efcebc39c933b3b223a0a3f3c3ef6b82f25e8f720c9038 SHA512 556906edeb2e6825cbb22aa6b058142dd3cfcf1026bf32ab094065c8bf539d114042f3edb91587e01af9a980c25220e33006d19a515863803dab0614c022fcc0 WHIRLPOOL efbc9ce40054e07d1dd9b788ef93b52e160b83c87859a4744c038a61ec346cacb16ecfd528138a3e65a376e2ef2c9fd56a112486937482747d822b580add4d7e
 DIST genpatches-3.13-12.base.tar.xz 262440 SHA256 8ed8c85ebfac182d0e99f89042377e3820d272f0b2f58755565fb687b84eafb0 SHA512 43ac18b049912a94375c50530960b3a4000119358777799fe0861b94e3b4dcc79adf6f69298f60ebfc68bfc5400c4f2f7e5373eae63332f0b9683b1c4b01f904 WHIRLPOOL 93a641df30b4ac42327ea477c3719d6048f17bca8bf976be8f60771732bea5dd852cc6ca91103f639a74fbd8875c4ef09f249b12d37db002cced63cb88cc59a7
 DIST genpatches-3.13-12.experimental.tar.xz 51008 SHA256 71b41f5039fe0c5095b033befbebe9e0f950f040b554a3bdf694b17dfe95535f SHA512 8916f29c6768c146473d0038ea3de86a8f975dd53acb833bc048291aa243ca17e3905e279de6532a33417732f608328fe3c53d4bf0929f98b38090fea5f8e4df WHIRLPOOL 23c6c270034e0aa6aa882e660a97755e8a29762460ae7febcb1bd8f9536791023067a3c9cfa984c9a21c8535bb020fac5b89a641195fc694a1d1888c03f11a71
 DIST genpatches-3.13-12.extras.tar.xz 18252 SHA256 6e551ddcdae045990264eeca3868a34bf9fa3a2be9b6b973037f8f2fced11a21 SHA512 bae47b3ec6ff97d616fbfdc04616aa03097b4c6345648edee7f912022a9d5ccac486d181da3a5c51a8cabc712c126eca6a32e384bc3fd25f096baf98113de62b WHIRLPOOL 4944fcd6b3192606f099ef66d5299a6eab1bc639797ce3e08ac1b784a0f31021e567d44d8c150dc60beaa9d0fa8cf13ce7d3e793e7f66b4ec38d3560a484fb84
@@ -71,6 +74,7 @@ EBUILD gentoo-sources-3.10.9999.ebuild 2262 SHA256 89ed294d75257550f40e6fd7a2c4f
 EBUILD gentoo-sources-3.12.13.ebuild 884 SHA256 01c83a3b3bc685d42762979c1b516b1e8a9d7a68748eaa1c86fea7ba1366071e SHA512 fb829b581a1606dcbf8bc4cc773549a7bff5b2e3a2b28f55682878d3887adb8076b4e747a53ec4c49b095e4e5e306b3d4842f6d5d6e3010c2172ae9a05b58163 WHIRLPOOL acee41f517f353a40277c7a71dfa0801769f9f3c5c054f0eb80a4ad768c87590d75c7a91274d61b2ae3fa1d03527e0b5e3ca6085748a6aab6c2cfb3c9d907f2c
 EBUILD gentoo-sources-3.12.16.ebuild 894 SHA256 48d56646166329b87926315ce9d18690275898aa2bd1c0b5f590acad15de68b4 SHA512 dae5a482a8fad31db2958d9ddf74224c8fff5906bb390a9be3d31d0d8e09a92956d9d525d1449ce82073b1d072a3c09f1a23d5ec67a5d37845e77313efb9a8ff WHIRLPOOL a2065ff0f0ff7504bab8fb4337078e723ec3b26793ce603e83f995437362283a66de661b4336f8ef1b275782111fd13bb079a29ddb0df74f14411f243f65e726
 EBUILD gentoo-sources-3.12.17.ebuild 894 SHA256 d6319a1af70863b06e6d04f52933e53f54671df04faad2efe8532e338a9c2fc7 SHA512 82cf0ba3f415234205d6d0884cb2a101c39cc88695ce9fa326c591ed8567c1b9dd2ef10d3138bc0395a178e7cc627cab5df7f353fd44058d61f7548f81c4bfa2 WHIRLPOOL 5c9ba3c261e652a3d107306f807b8baf70a4ef8f4352d5f08980a70125d80e36cddee1035631aaca950e5e8b01107eee8fc7e4900a9cc002fe6eea5dfa60b5fd
+EBUILD gentoo-sources-3.12.18.ebuild 894 SHA256 e14582279095cee48aee0daaeaa61197e07ceb91d52e8636c259c652a99dcf20 SHA512 6d095a90b40f4fbc51876d8d49428e7543d2c8bc200fe3148e1a4db542edda811476bef1258d81b10fbbe7f1414bd45d7b601626155a38b10b40cbe13c59b383 WHIRLPOOL e5c77d5850a5f36b0ff447889145061686c92df7781f8b6784632c21143953329245d594ce90be62b70db77199113514d1d58308468477b2d773723965558298
 EBUILD gentoo-sources-3.12.9999.ebuild 2262 SHA256 5579df1f2b3f2e93649a76fd8709cc001905aeb08d3604c437a14bcb8865accb SHA512 fa0a9983e09015cef47be253aee33cf7fabc00a0ab424734a79de6785a014bf75fdfa026df7e918ef9481fec2e97bb42a84b9c941f05e65863f477d804345eeb WHIRLPOOL a5e6576747721a276f4bb8d9e162fa3b4fc57d1de16af3835a53ceab5e7028c57f5bd10814d4833139ecb3d1ad8b10e06bebd3ed8d97cd96cc42b54fd450b053
 EBUILD gentoo-sources-3.13.10.ebuild 901 SHA256 d42b43196b0b31393d9eae9eb5dc662181e8800263d0f86573ae462a16751475 SHA512 a16d6122075d6dc58efa9d8c7c302377c4095bb0451cb914da365900a40cbe3eea7fcdecffa125a7cc7c42279a09adea64183dc3e47a2bddc1c01f907af85573 WHIRLPOOL fefef580cc99335105779947299f064be24ba914f5ac5ee96799e398ff0180483c5042103d085e2a1cab1c3764e09100d02acc87f9918352796a7cc4c3c8574a
 EBUILD gentoo-sources-3.13.11.ebuild 901 SHA256 63760c5e6336f29f9c25af44724156fdf8cfb30791cbc567e6b1970d1d57dedb SHA512 3498fa3e1b0ee89ca0e258cfe1347458587cc83e93040e6e363f448b955ff1c19b1bfeeb8a4152c5fc419565286eb0b579bd1ed897bc4f74a6d03e51a88d0c09 WHIRLPOOL 55e07782dd17aafe2a6e05b96585e11575a83f10396e095d97200d4efab600c0ff5fb194370d76776bcfbdd1ac860a19aba972917a68f9c8adf0fac67971100a
@@ -83,14 +87,14 @@ EBUILD gentoo-sources-3.4.85.ebuild 861 SHA256 432b2b03b403927898584a31595fe0985
 EBUILD gentoo-sources-3.4.86.ebuild 861 SHA256 ae06b866b3a13c0bcb67ba55736fa0a87dd8d820938011f90bf2be680688a773 SHA512 63819a36fe890770c33953fa1ab9899839efb3f630513fd46914e94ec7ec70c5c7a588c55c6d68d798ba260964793caadc144e9391b8c5946d9a79bad84a2239 WHIRLPOOL 15912baef86310cb5a62df6a6074c73498a983b2fda30f23b08ee85a21cf066f04232e2d6183a9c857c85d2b1a113051cd569f74b6be8455991ce5e2a9979f3b
 EBUILD gentoo-sources-3.4.87.ebuild 861 SHA256 23ceb30fe332283f4aa5f71887e9c5081c114461b99cbd753dc561ea758c1644 SHA512 3d1d34870cfc57946957b7d069e4a3f47cafc0ee368ecd8124bc2e381baeabb62363ca44b7be7ee7cc3a3ab4543d40b16c9599d0ca48dc8b2ca1e8f33b98f398 WHIRLPOOL 47c78080e4c7efa30cdd0c9cbcc991dd468b93a4021ebfbaeee79a79441afdd2a4a7f67dbc635ba76046a5d31aa50690664b152ba4ca5d67b7d65e2c5c1f7575
 EBUILD gentoo-sources-3.4.9999.ebuild 2261 SHA256 64d3f4729e4948fdf9014146398b83037934c269559bf1d741ae6f8ec7a8035d SHA512 5245ba40f58e8e697834f5700e9e26cc30636d9d5fe85207e113cbeca36d1b3af0b949c24100de4b4291b532f76f6f127e2e0a93645058fd9bb517bb429fff01 WHIRLPOOL 16a31af3779c07c0008dd8423d9ee25c4b8d96b1ad0278ce454627c6d88bc0f533576317486f046228ad771cfa621273f4d9099324b238cdab709da7690dd14a
-MISC ChangeLog 61719 SHA256 d08243c441f96b9d45c6836370ef8a64e260928d1d121ffd6370a1cca7f67771 SHA512 576d8f9793edddd5585215539ec4a04a7e5e2c3257f12417a5a90337933e173970468140cb491858ee53c1f226565a0e17d07e85298e3f5f616c2986d4c3340d WHIRLPOOL 301d23f38f6c4f2c7d43a78a690dfc3d41c33146eb24074b37c85a3bbe6c12a13f67ca8ef64053a269b0f57e5275c99b3947de8ce4b11cdb921b3afd8650f8a0
+MISC ChangeLog 61861 SHA256 58270faf0f5a1e009f3cac170054d299f2eeb764e805ba87dd5be2ca10d208b9 SHA512 a610d2ec37e71c3b2ac6ac57816b83e79152daeb4dedf4eb8b4d53f077d07b339d1dbd11a9ff0fa0d46592dbbe8e61f4903d5fecef5dbf44403ed9ac7bd3f4a5 WHIRLPOOL bc32b1aee3fc8c7b4048da87139b325b26af885e72e20cc5f40b523239b422b4e2c8d284305d41017dd38f76775d84501b4ff2a86a2876a528189c3213d8fba9
 MISC ChangeLog-2007 91971 SHA256 8c37498df2246749abb2fd1eca05c396257989b91ba5ec0f83cedb25488118a9 SHA512 2215a9856bc1706abe21ad51d0af6176fec226e85a56ad8f54664d20a041bbe076359347f473a87c47904df2d8d2006d56d1535528b2eb7aa756f96ad9554876 WHIRLPOOL dd881fa7bbfc42ca35a46a0fe01d751b3373ac8f4e2ce5626ff26f94244d729e107f57b1be43daf3b73c2f18b090ee896d8a5eb38888fa9ca01097d1cbd46da7
 MISC ChangeLog-2012 101665 SHA256 a60304f93fc4644cdf0b068e586f6036d4463ea4b21bd745a8aa926da71db6ec SHA512 892085806f4c87f64db78e04d3c215ae6bca8939ffeced8a3792fe4a2476e72d2cc9dbc8a3b906943971eb853c337847e6a8bf976f9496be9944e216fb983234 WHIRLPOOL 590f17b5a90f48fa1733959500ce06fd72f95524b64b6abf508653a616961af2c0ea04ca2dbfe5523ff9dcd3bc67b3b24bc368eb84326d091ca449e558555f46
 MISC metadata.xml 512 SHA256 80143273f4462ac67194f8ef90706e5ebf65f3f30ff153b7ee19d2c155f49f7b SHA512 6262ba3cbc6480081a195024fc752ad0df27afe9b71d626d759f747a52a2a181d114379e463bd8741a843622556c1e46820e535e8fbe71e2790828370d70c5f0 WHIRLPOOL b4430c0590efa2c5cbfc85fed1386943f4c8d101dfc07a76ba79c37b1fe2fe4db21f65b58186e1cad1ea3987292c2ea0251f0e2017be018c020f7e2309b57bd1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNXsmoACgkQPDPGULV25OMSwwCgpiVTdfTOyp7BkQ1BPj7V8Dea
-lRgAoLQBD7J3ng7kYdNug6lid+qX/LJW
-=gvBs
+iEYEAREIAAYFAlNZDYsACgkQPDPGULV25OPLkACdEz79+f6auY8FDsScHsNFcgnk
+a4YAoJ9r0JgmhQsKfNeS7BvA2xmMKb+m
+=V9Ba
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.18.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.18.ebuild
new file mode 100644
index 000000000000..3f07ad11f7f5
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.12.18.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.12.18.ebuild,v 1.1 2014/04/24 13:12:32 mpagano Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="19"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-process/parallel/ChangeLog b/sys-process/parallel/ChangeLog
index 6b66b5fda4d6..52b558603150 100644
--- a/sys-process/parallel/ChangeLog
+++ b/sys-process/parallel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/parallel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/ChangeLog,v 1.60 2014/03/22 21:07:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/ChangeLog,v 1.61 2014/04/24 18:15:23 radhermit Exp $
+
+*parallel-20140422 (24 Apr 2014)
+
+  24 Apr 2014; Tim Harder <radhermit@gentoo.org> +parallel-20140422.ebuild:
+  Version bump.
 
 *parallel-20140322 (22 Mar 2014)
 
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 806d65df44ad..c4516d6b8cae 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -7,22 +7,24 @@ DIST parallel-20131222.tar.bz2 817581 SHA256 6772be4d236de1696c1d7f84eee00f36d0a
 DIST parallel-20140122.tar.bz2 821184 SHA256 b18339bba65f9b2e287ec934d05c12e8103c2c83bc7f9b3c06f6648ecf15c79f SHA512 ca0a5f29a277cb6fb33e3b9ffbb923e4b0eab6ffd4f771caf66fc7d39b5da2d5ea13aee39bb622e39c72e0ef9a5f1a9852ccccb2e34fee23236ff261054426be WHIRLPOOL 2278b37ad5094ecb4d32bbd8b22d7907f12204bb25a029857b5b9efb08729e04e3521640765fe3b219d04d1c4c56bae88cd3ee7d742be4b684c51aaedbf98184
 DIST parallel-20140222.tar.bz2 825763 SHA256 7e74cc72d350cfab0bfff64c1910773030e74ca0ee5f60e528cae425d283637d SHA512 389688e168b31c02bf2ed64493818813fbf8ba98a8097c9500c44185813c9ba90ca774fe1f675a6d6825b836217d408946341e4e602204c3cd2d6f7f40334a81 WHIRLPOOL c7835ef65b8ae08ec38bf43c77edf53b82578b769aa26dd7648371bb3ae0471060a877e84aba9125ef7709f650bb96853c59bae7f6bf2ad66f4bdd823bd133b6
 DIST parallel-20140322.tar.bz2 837047 SHA256 b4690319856f9a4cbb73cdd498d358666412d1fbc8848f1e83edf4d5d62d69fe SHA512 8b7535f245847e3edf643c29e641dbd7909811e5dcd280f3a0387ec8914044d3ca3e02520dfbb3a71dcb30c12b793dec16934366fcd42391f07c9b44afcb79bb WHIRLPOOL f3645302cfbea20ba25e2afcdd07a7d8d0c87be695a2dfdb33e70b9b2c92a98d88128f56365e93411b890c9095413a1cd4c89c0d064e3290270a58ab382c4ff6
+DIST parallel-20140422.tar.bz2 850996 SHA256 eeffac0c1b87749c500cebc975ecae57197a1202f896a2b24320e5b5171ef4dc SHA512 68d64f7ea40dff5d97923b10beb397badce40b101470226ef1acc23c04e441decf671a343b76086b8ce83cee587799e9174151af08175ddc3b79d50c9644cc60 WHIRLPOOL 4bd579e5610b5fa760cb83ddc1f7e1e50f90afd204e80b9f94215b369585e1dbb4c92ca26b1bcbc2823fbc49059a3740da0574fe13e9b41fded7f5a099037e6d
 EBUILD parallel-20130522.ebuild 1105 SHA256 b1e37398d639e9dcd9369ff4f1692c626f4b75f844fd030b0f59671586a178a7 SHA512 018f607f19f1c7305536d75a1dab08eef8948f8ba66085bcc7fec6a19890c2e919441e23e70f66d097150f38d06f34324e6d276bc867bccf82ce9283f33c0c21 WHIRLPOOL ceda63101a54195060c933b63e15305af409eae902f0f4bcabde62b79f374ebc385d76f82d1c0000d5cb5c41e0acabf52365a05790b96d5bcea8628baf6783df
 EBUILD parallel-20131122.ebuild 1113 SHA256 24d12e631e9d0bcc3af29ed706875922d5702ac6bd1009c5328504b10ee2eaa6 SHA512 6004e0359617cf9d61415526c9e269097793758ea7b3e34bed3bb3f180b61d75d08397439c463e6a616aa3732d5a274b37023a47e01f20a06f06b58f15bf4b0e WHIRLPOOL 05a2c6ef0af970cb2e0b78bd72d1006605fa68a0f968cb0859b9ba3f87673683d8810d88067d5e511c5f233dd5aa662b6a467fde6fbd0111ea32ad7bcee1373e
 EBUILD parallel-20131222.ebuild 1113 SHA256 1491e20a9b42493b687e0ce6e4561a55b147df08801f4986c21c52ad2013dade SHA512 75b373ca223d1de23712645c53e2c8fef7fab9c1a198c0013adb54f475eb81b6b3c20f18824a6f0374c49d6e1c4594840476d77220537d9807ee580292b6ff10 WHIRLPOOL 00b5af81346db61e032f248e00903fde4a45b4d67133c617e7dc5b4a36010b380613a686ceacafa08fc93eeff0c06ef49eb4edaf2efbfa363a7fc71a0ab4d4e8
 EBUILD parallel-20140122.ebuild 1113 SHA256 600773e34940b9d9ba3dfc209b51e4ed358b6a4b610183b7a449410ac6a8ddd2 SHA512 b973224ced477c3bcfe5bdd64cdc860ab4df2c3639b9031daf8cb35828ff010aa01e38a3a27b7e6f03c460c0dffafd7f2cc22de97c7b872986663fb83509cb96 WHIRLPOOL bc271b4e8046c10bba1a7309817be0c7caea3e79a08db316d3fb4901d89d198a9d3b2981dac1ab8d48140d4f7fe7973d5ad708e718d405c79eadaf0affbcb12a
 EBUILD parallel-20140222.ebuild 1113 SHA256 6fee9a14fce432c22001de298e0a65179494349c92b4d325030c469aad5c510a SHA512 a5969d8678ff8d69a74e47e07c0fe6292f548f1a7a28a271a8baeeb9172c4aa6925b48ff9fa56119532867bb8395198e7bcad3e8c77a765ef76ecd77bc34ff9c WHIRLPOOL cce7c6d498df6b162f36b3a9bf41ce490692c480a086553fb83fe770e297dd01c61034e7a9c434b86538e2bc309ac549f94545eca17edb587c9a0fefa8f907f2
 EBUILD parallel-20140322.ebuild 1113 SHA256 7c5661ac84d966864bb355bba29d62cdf19a3f2da5c8f1259793373a09847c9c SHA512 d6aef7536528f5aeebafe1be7c926e18d894817abc4bed6f7bc81a34c473652789a761f1dc66b757a6b769240a6c148a7f5772e6fce5a472c0275380855d8bd4 WHIRLPOOL 3db7b436f11a31380cf7a958405bfe81a6961b4d8fed1037171a6a7a6f05fb699ea6055d6c308e9b96ad671f7ad64f28e6d58b84e9096d010e20712f746a7438
-MISC ChangeLog 8260 SHA256 e69a822582e8c746f1c7853180075462e3faaf5a32c10476816f5ae2c2828403 SHA512 da5b408e3d3ee702899270dca99d4dfeae71477fc937dd02d7dc537d4b2b3b7bb932846c954df5615b3b3dc94c712cc842a0d368ee0c52b6f66786abcd2b1a37 WHIRLPOOL 3b9cd9c89ca6caf27546dfe0c668fb3823694911d5ea8b92bee6fe292816a032e820e39178f2160c5572078463734e651b98361d987a77cd9e4f778826dc2f39
+EBUILD parallel-20140422.ebuild 1113 SHA256 af0ad421692263c9efb56a26f428f8a62484531d19ffd204e5fc3c35bf6b9f2d SHA512 cf5ecc9dbe606378d30c47947352b3197ff9a1f830976b520d0d4c7c3210fdd54ee8d9f19276077dfa002ac87af7fd585a300660b3facb3325cc5dacdb844f73 WHIRLPOOL ecc84cefdada0aac12ba043e71e2e3c47a32afa13cc5882e1ab8bfb0a3df2c3e00aab9c29eacde8841ca89cc244556de2b73b6d9947d3cd0297175bb253a96d7
+MISC ChangeLog 8387 SHA256 258627148300b65cdc5897f47ca955934d136321e44a7d5fe5d0fa82600a7fa3 SHA512 0aa0d78797f922bb200fbce4d9e7e39bd999705cca1653a3786e77eb70d0fe6c878e6dbe4d96b94fe1cb3673de2811132a0ed83c45e9b7fdb27b937bd245e576 WHIRLPOOL b8bd7582aaf151f585deeecda7dec404a9628e76e35f20b9de8cdbceafb64d583110a9a69910bff5e061a2f4e1dd9261270e106e77598127916e1f23ae8e3618
 MISC metadata.xml 1122 SHA256 b4a8eb328bc0153803d2a95ced0564de18ef8f65723ce28844e2e24647c12f87 SHA512 58577b74fe04e8045c7becb0bb551d51f363fee26ff50d9f94f751ebc73a55d4a87d7e2c80c33e17be41b6fb31a5a68acb28d41ac3041401e2fd3a5140adfe97 WHIRLPOOL 164af98bad15d44eb5ca8a09cd67689178c07dbc2c96a61bb9109a9f5f09f37d4c8e5b920d172298ed55dd813c2bb76b504ac04ae1a4c94b3c8e7240f4e601df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTLfukAAoJEEqz6FtPBkyjTY0H/2I+91eY6Gr6xtEuzC5IpKXT
-7EWZeRsNCMI3dSF944VsdU6FJWjDQpkADWXJpYLWvVB+etYu9NJwPJYzeeNKwsnP
-LENJCyOD23jYIntpMzY0I3b4txniskUXBi9mLl6Sgiq2DcSkkE+x0TX6iEf5lRLz
-mvAprc0VPt2zB702wwGWTSCzv/rmzyl5cQ+GQuSnw9vf3W+tY2V2dhowzvrcquWu
-2wlkTDxupH3iOq/mzB8H0n8f4pPalw00OcFS+rfdYAr53TQLjB1iNFGOs8amTC97
-f0Ax2YvO3eUH8Q45n3lC7dxvJmmvHRdI2W3f9112rOIvVWmfTKuziGWZoOk0a14=
-=iWF7
+iQEcBAEBCAAGBQJTWVS/AAoJEEqz6FtPBkyjUV0IAJ8E5UTK2bjuKT9ciOmECDdL
+PbZ7T9D8ISKGsQTewn74ReAcFKZcxsnzoOEirrtPVvBIHDGqUdzacccIGwSnYHEP
+SpRFwwyBARZUCTinzmy4ntg/b7Ft2UDDQJDyRusPVutsSVDo/4fZPQXI2v43yTYI
+oWgVlMf3oUJvk90wkNHWlhimcQppleemhn8zjDsclRZqw3xpH8gkGxEBwtYuWyba
+9MKUH9luwaSeYhkfevwXoTrSr7VSHTtDKjR0tv0vwAcmPJ+aCf67SWQm7XfzkNBp
+eWegySo+1IwaIj9zPmljvunSCsRprxhmAUdNlgR29qu0JFajV2J1HlpbT6mCJbY=
+=jqgQ
 -----END PGP SIGNATURE-----
diff --git a/sys-process/parallel/parallel-20140422.ebuild b/sys-process/parallel/parallel-20140422.ebuild
new file mode 100644
index 000000000000..20d0eea8e0fb
--- /dev/null
+++ b/sys-process/parallel/parallel-20140422.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/parallel-20140422.ebuild,v 1.1 2014/04/24 18:15:23 radhermit Exp $
+
+EAPI=5
+
+DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
+HOMEPAGE="http://www.gnu.org/software/parallel/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	dev-perl/Devel-Size
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-IO"
+# moreutils for `parallel` and grass for 'sql.1' manpage
+DEPEND="${RDEPEND}
+	!<sys-apps/moreutils-0.45-r1
+	!<sci-geosciences/grass-6.4.1-r1"
+
+DOCS="NEWS README"
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# See src/Makefile.am for this one:
+	rm -f "${ED}"usr/bin/sem
+	dosym ${PN} /usr/bin/sem
+}
+
+pkg_postinst() {
+	elog "To distribute jobs to remote machines you'll need these dependencies"
+	elog " net-misc/openssh"
+	elog " net-misc/rsync"
+}
diff --git a/virtual/perl-CPAN/ChangeLog b/virtual/perl-CPAN/ChangeLog
index e6d64bdc6f77..82f25161331f 100644
--- a/virtual/perl-CPAN/ChangeLog
+++ b/virtual/perl-CPAN/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for virtual/perl-CPAN
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/ChangeLog,v 1.8 2014/04/07 12:49:48 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/ChangeLog,v 1.12 2014/04/24 17:47:10 zlogene Exp $
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> perl-CPAN-2.0.0.ebuild:
+  Add ~sparc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> perl-CPAN-2.0.0.ebuild:
+  Add ~ppc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> perl-CPAN-2.0.0.ebuild:
+  Add ~ppc64 keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> perl-CPAN-2.0.0.ebuild:
+  Add ~mips keyword wrt bug #505156
 
   07 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> perl-CPAN-2.0.0.ebuild:
   Add ~ia64 keyword wrt bug #505156
diff --git a/virtual/perl-CPAN/Manifest b/virtual/perl-CPAN/Manifest
index bad66fe19391..c416d5cd15d5 100644
--- a/virtual/perl-CPAN/Manifest
+++ b/virtual/perl-CPAN/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD perl-CPAN-2.0.0.ebuild 425 SHA256 feca02afb7c732b94d1f32dff94159a9af708bb104aa5d47c80d16053b912fb3 SHA512 44284980f631cf95b72e7fe6a569d1bc0c264692e82659fe963231062e36cdc19dac299045aa46cb8cf2f26d4403f0c5d6455e00df547fd3337f4821e036c6e5 WHIRLPOOL dfae6f5b1a948ad6b9bcee42bb6e8adc2f5fb4b9d667ca956eb402d794c334e32a04a07ecfa6ab345bb8aa645125edeb94f20c76fc6bced21a175717f93ffd90
-MISC ChangeLog 785 SHA256 f8f888a6b3c7a27e7534cb9a0b8d664abb9fd2585fda780949be70f428d49afe SHA512 88659a30c73aef015081758a3702f5811d581433213af49c9fd390f7e1b6263caee94dc46e6756c427cb4fc6fd9c39ab811a5d2bd158286b15501947df7bea6c WHIRLPOOL 927ec702d7e5ddd127c37b2cd4c34b7294bdd23be7c8c502d87c0fba1c463660d3229eb9074602d74b74f0b3e6f7b78653c595218f5257a2940efa86791972c0
+EBUILD perl-CPAN-2.0.0.ebuild 450 SHA256 c98c312afa2a01dd6d7445d1704ce646a81129e347eedfb9322f71ec965100fa SHA512 d473deaeb9871ca4628adebc796c720fad6441223668cd53abe7661960ef267c8e79523c255c1491b62d54bf94b25effdbf0ce4bce76098949b1834576ca6a33 WHIRLPOOL 7307cb96075dea0e937e989738972e812a4731320947f7e4c529b2d38f2cff5aef9a56af1128333e84530122e68092aa944ea4a6e0a65f46fdf0d35d07c74e68
+MISC ChangeLog 1231 SHA256 af3ffea591366a95689eb38fabe7375e4938f1dcb320acb72ff1fc08f724492d SHA512 8856adc740d375458c493d06630c3e72e14d73e52f60a84b7e9e1dab78c60c96e1522c114d412993f86dd0d909cbd7fb1c112295bf24dd724668e037923a3597 WHIRLPOOL d658a45c672ff44cf86752641d738cc3841be30974c85505fbbe932c5c4d415f680ee7d4d45614046452881ce66ecf71b55e9a5d6ca855b49a6ff15f8e7cef1f
 MISC metadata.xml 158 SHA256 1fef4c0af5f71b777110f54d9dfbd27d6c85c750fca007f4a2fb38345ebbb710 SHA512 0b83af178d8e59a07953fc2582b6e4177ec933439a6638de4f222e4e9b6c21135ca1702f7f4838624e283d39db0d3f4d4227ddb6108dbb06cdcc09ebf9d6bc55 WHIRLPOOL 696c0536d7047d00bd1590ddb9bebd01caec0e15b3a970828eebe526b46f14d61eec5bd541db7d4628bdff743461198158832e2bdb47e31a5523ad63f16708bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlNCoEAACgkQG9wOWsQutdad6gQAn2GH2fo6Qyko7rnHZK+PfQk1
-bK6ADufnMD/8VsL6rInZuJqPmX0N4lG8FdKy6RLQu59cltGTlpxMoRYfgkG9hwKi
-oaDnrbfLUhOq1qpXc9ysgPyIzbjRLUxw6RibRxXQKV+5Bz2rxSe+ERrfqns8shcq
-cg3D8UqOzobXVuCBT3I=
-=B5Ss
+iJwEAQEIAAYFAlNZT24ACgkQG9wOWsQutdZ2VgQAox5FRdbWUwXEpz0xCMDstkKv
++0k7KnWNdOa9l//eTdGWYnmhgrza/7wP4pRJQJfZrwzpgnTPOWF01G7h5tTODph4
+gu70eWmlbjDPE83IWWQt/BlufD4KYpz5j97qsrg7LnIK63WPo3uVmKhpEe1elQ1S
+xmL4JR6b7d2/p61ZSzw=
+=fsZ7
 -----END PGP SIGNATURE-----
diff --git a/virtual/perl-CPAN/perl-CPAN-2.0.0.ebuild b/virtual/perl-CPAN/perl-CPAN-2.0.0.ebuild
index 9dea7904ef9b..b82f18e5e26f 100644
--- a/virtual/perl-CPAN/perl-CPAN-2.0.0.ebuild
+++ b/virtual/perl-CPAN/perl-CPAN-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/perl-CPAN-2.0.0.ebuild,v 1.5 2014/04/07 12:49:48 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/perl-CPAN-2.0.0.ebuild,v 1.9 2014/04/24 17:47:10 zlogene Exp $
 
 DESCRIPTION="Virtual for CPAN"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-Devel-PPPort/ChangeLog b/virtual/perl-Devel-PPPort/ChangeLog
index b3011721cd12..73a4b0cc7549 100644
--- a/virtual/perl-Devel-PPPort/ChangeLog
+++ b/virtual/perl-Devel-PPPort/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for virtual/perl-Devel-PPPort
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Devel-PPPort/ChangeLog,v 1.5 2014/04/07 12:50:37 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Devel-PPPort/ChangeLog,v 1.9 2014/04/24 17:47:40 zlogene Exp $
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
+  perl-Devel-PPPort-3.200.0-r2.ebuild:
+  Add ~sparc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
+  perl-Devel-PPPort-3.200.0-r2.ebuild:
+  Add ~ppc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
+  perl-Devel-PPPort-3.200.0-r2.ebuild:
+  Add ~ppc64 keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
+  perl-Devel-PPPort-3.200.0-r2.ebuild:
+  Add ~mips keyword wrt bug #505156
 
   07 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
   perl-Devel-PPPort-3.200.0-r2.ebuild:
diff --git a/virtual/perl-Devel-PPPort/Manifest b/virtual/perl-Devel-PPPort/Manifest
index ad0fb493e4b4..abed6d4f9fa2 100644
--- a/virtual/perl-Devel-PPPort/Manifest
+++ b/virtual/perl-Devel-PPPort/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD perl-Devel-PPPort-3.200.0-r2.ebuild 483 SHA256 2d0613d2931ae1ab6d0ff60320dc1d47e5ed7ea50bec44a13b2c80b8cc53e085 SHA512 0682abb7072eac4a6363709648d3506df2c5aff94c014255ba58d3116769650bf96b4eb28a745cfd8e82989aa113493861b8240b7fced32b3def46d4787721ff WHIRLPOOL 1d661c4a616c93b7bc265816744627ef144cf828f3c326e03ad46f27c2ea56ba20c65ad716a3de0c1e494e282eda9030d338ffd8ad8ed4a01b8521a5e1b8187d
-MISC ChangeLog 887 SHA256 6dad952de951c923df1e64ec338a8815c4a6465761fcb666e69ad9ad44d07f70 SHA512 316f6bf4e94c4c1fe6e98ef817833b8311385cfa65a790474d53a48b9597f358a29785943fc519bc831134c47d78896f851c6fcef5c0267dc46ce204c968eca4 WHIRLPOOL 408f2ca868da430ec8948471ea9ba6cd6ab6959495f8f82c4e5ae8c4460159e00f343695dad0bee2f83b9ea4838fe686d8db41e2cc066818bd3b098e4f3d8cf0
+EBUILD perl-Devel-PPPort-3.200.0-r2.ebuild 508 SHA256 6b974c8b2c6e986e5ff2ed5ad1d066bf8b255e86571b2476a6aedb45ab3ab281 SHA512 c2899993d040f4b58b8b1754ce632b3b3ea467edd3ec6b4c3aa09265304268f5d2289f2ab8203dae0fb17c84b2a3d412208bfebf3c2cd1fcbbfd4ebb15dd5fd0 WHIRLPOOL 5188c96a4b54810a64a0469d0ac4419453624180a4ae09f2541f2c460be518274ea6a83f7487b40ed11efa2d633d694275d312ef09791da5853b387ab8f796ca
+MISC ChangeLog 1392 SHA256 e55215f4d93839bbfe0ec6bfd964fc167f53c3443712aa48220e0b98275ccd51 SHA512 90213b152b42a246842fdbebf41a763b3894a4677db02b2be42f50bf6d08e34cd7457749c76b88618ee3199b6a7a1128b66de3c78a65462243c83e2543e71efe WHIRLPOOL 68214bcc8ecee373c069df92a34b2b1a9840c65a72b84bdbec4dee969d440a04b78eb6accd1c871aa144a19ee84a1d2b9341fb70ed04c2463eb07d4d3b05c113
 MISC metadata.xml 158 SHA256 1fef4c0af5f71b777110f54d9dfbd27d6c85c750fca007f4a2fb38345ebbb710 SHA512 0b83af178d8e59a07953fc2582b6e4177ec933439a6638de4f222e4e9b6c21135ca1702f7f4838624e283d39db0d3f4d4227ddb6108dbb06cdcc09ebf9d6bc55 WHIRLPOOL 696c0536d7047d00bd1590ddb9bebd01caec0e15b3a970828eebe526b46f14d61eec5bd541db7d4628bdff743461198158832e2bdb47e31a5523ad63f16708bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlNCoHAACgkQG9wOWsQutdbk1QP+IcxK0Wsuoq/3MPWY/bDYqE+1
-5IupRo6ZuuUYcA/+6T/UTRbXrmxwvt7232s/Xm7bg14F0Qz6/EiUrCsi10tO9xfi
-4qP4IZh2qwnb2K6UhYUsoIDQolELAmfjkTXGyAUNRh5Ac6Qt37aNpFvTHxjsn6rj
-T2ic5eZ6b8Bbz7IutDM=
-=5EMX
+iJwEAQEIAAYFAlNZT4wACgkQG9wOWsQutdZuLgQAsGGmWR1eM0VFR1TIF6ndF+K9
+0XKVK5nhPGQpoZiHdxC58iTo7D8GxvdwLadmuXHCx6uItb1DQYnv/CzWUP7caAQ9
+Tx65IKJpHqEktkLhznf9fKxnhKn+z1Eqbe4igsRuRSzBSHXo/u0Dl78UHoLGHY8d
+LmZuK7dEShlydbmLEWA=
+=Iafe
 -----END PGP SIGNATURE-----
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r2.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r2.ebuild
index 40f0a226f649..a9337ad1f524 100644
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r2.ebuild
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r2.ebuild,v 1.5 2014/04/07 12:50:37 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r2.ebuild,v 1.9 2014/04/24 17:47:40 zlogene Exp $
 
 DESCRIPTION="Virtual for Devel-PPPort"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-Dumpvalue/ChangeLog b/virtual/perl-Dumpvalue/ChangeLog
index e04f6f956536..06ac81c72854 100644
--- a/virtual/perl-Dumpvalue/ChangeLog
+++ b/virtual/perl-Dumpvalue/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for virtual/perl-Dumpvalue
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Dumpvalue/ChangeLog,v 1.6 2014/04/07 12:51:21 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Dumpvalue/ChangeLog,v 1.10 2014/04/24 17:48:15 zlogene Exp $
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
+  perl-Dumpvalue-1.170.0-r1.ebuild:
+  Add ~sparc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
+  perl-Dumpvalue-1.170.0-r1.ebuild:
+  Add ~ppc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
+  perl-Dumpvalue-1.170.0-r1.ebuild:
+  Add ~ppc64 keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
+  perl-Dumpvalue-1.170.0-r1.ebuild:
+  Add ~mips keyword wrt bug #505156
 
   07 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
   perl-Dumpvalue-1.170.0-r1.ebuild:
diff --git a/virtual/perl-Dumpvalue/Manifest b/virtual/perl-Dumpvalue/Manifest
index c9309df91925..c1012d7ba111 100644
--- a/virtual/perl-Dumpvalue/Manifest
+++ b/virtual/perl-Dumpvalue/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD perl-Dumpvalue-1.170.0-r1.ebuild 489 SHA256 375907188cffe21114dc055ab1f1eb745a1ef5554b3dcee86692b12e7609e35b SHA512 54579fde290648064c8a267bfe4d78eaf37408b961774d24a3ebaf271433ee73ebc685a604bd74c722b7743813ce3d21f04d414a8a9c997d211355c36fcb84dd WHIRLPOOL c3bfe5466353260bc056c31be0f7f7b9ab2db1334bde965c0ace98a73cc439607499243a1d235abda7386976ecd33fe9296d4e1667d21c81dcdc27bb906a6921
-MISC ChangeLog 978 SHA256 24cf661151310ed433474631583507536bdf332cb5b942d8b2fbf0de0085f0ba SHA512 c29f2555b3a8cd6bbede77eee9d9d3b4afbd76ece756c7960cb77f1df53794b7f0eee1f790733ce9e1739211622d7a503231eeecb92233f4a1a85d66efe4208d WHIRLPOOL f416bba50b03ffb708d8209b22fdf05f7b293bf0ef9ecca6beeb4f24447e50ccb363cbbca929369c5f60310b033588e5e17a210f3dcd5044e06c0e1570def0c4
+EBUILD perl-Dumpvalue-1.170.0-r1.ebuild 514 SHA256 00fd3b2cdb64b5749f96b82eab222d6cc414da61d49b56ee5e335ce4712564ff SHA512 f773356dc718f896571cbbb4c5e2612eb161f40b3a87ac73f86b58e8086532e7139906bb0a8cef70d00402f67baafed2d434546d9e87c5f67adfd092490746ce WHIRLPOOL 0d4def6a94b774cac84ad05f6c4262a871dad30b12df714dc2aa7fbc33ae857aa1ee6645f5a6ef1ab5300eec78b18fbe41d1ed16ef815d1cda5f5eecb5b7f2b3
+MISC ChangeLog 1472 SHA256 0ae92d218fb095d089d3b4867872dd59a653d499dc17fb8baf2a2d9d4695173b SHA512 cc38c7d887486c7b976f3b89fad06056d6279480af4a66f2eb17368671faebbc7e868ae7fc71fc9f80c851d984f055245498c8cab4d134b2aae15795d1dcf5ea WHIRLPOOL ce56ffe4a174288caa35a01b7a388110ed9891bd5d74582bb6e4e43f52b890190af781dc9551ee38eb9baf45e65386c94917ee86835384599810f91e76629af4
 MISC metadata.xml 158 SHA256 1fef4c0af5f71b777110f54d9dfbd27d6c85c750fca007f4a2fb38345ebbb710 SHA512 0b83af178d8e59a07953fc2582b6e4177ec933439a6638de4f222e4e9b6c21135ca1702f7f4838624e283d39db0d3f4d4227ddb6108dbb06cdcc09ebf9d6bc55 WHIRLPOOL 696c0536d7047d00bd1590ddb9bebd01caec0e15b3a970828eebe526b46f14d61eec5bd541db7d4628bdff743461198158832e2bdb47e31a5523ad63f16708bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlNCoJwACgkQG9wOWsQutdZLqwP/QJU6HbANODnBZneDptmsXTlh
-K3DyASHVMGDSz8hoF2EoBUWy/j8L88Hva/1EntByrcW3Zz6NVQ7eMW1J0wRVs0fC
-Rg+gcD0/kEBCDs0vnIgJujRWM8rxV3dyZwI07HBPh/DYBfhsDJ4ctJwqoXj3Wcga
-oXooiVtj5bqIggU2s54=
-=27Hl
+iJwEAQEIAAYFAlNZT68ACgkQG9wOWsQutdbW0wP/XYJPApm5DlAePFD/KKqmk62c
+0dWyttihLJq+IyPZN1EobMSPzZxH+l2yxSMwwaj9QejqAPH+BwbXLDTXVPqSzEhl
+dv2+gW2opgJJMgLKRdl36LKpgc84Gq1TA949jJinh5q6isM7NumyQcT0Ggy3dtq6
+zbyPw6KtYKDh8YgSlfA=
+=AOCd
 -----END PGP SIGNATURE-----
diff --git a/virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r1.ebuild b/virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r1.ebuild
index 841f22935b89..1650cc9b4758 100644
--- a/virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r1.ebuild
+++ b/virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r1.ebuild,v 1.5 2014/04/07 12:51:21 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r1.ebuild,v 1.9 2014/04/24 17:48:15 zlogene Exp $
 
 DESCRIPTION="Virtual for perl-core/Dumpvalue"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-Math-Complex/ChangeLog b/virtual/perl-Math-Complex/ChangeLog
index de0875bb9101..65d44610dc22 100644
--- a/virtual/perl-Math-Complex/ChangeLog
+++ b/virtual/perl-Math-Complex/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for virtual/perl-Math-Complex
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Math-Complex/ChangeLog,v 1.5 2014/04/07 12:52:33 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Math-Complex/ChangeLog,v 1.9 2014/04/24 17:48:47 zlogene Exp $
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
+  perl-Math-Complex-1.590.0-r2.ebuild:
+  Add ~sparc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
+  perl-Math-Complex-1.590.0-r2.ebuild:
+  Add ~ppc keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
+  perl-Math-Complex-1.590.0-r2.ebuild:
+  Add ~ppc64 keyword wrt bug #505156
+
+  24 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
+  perl-Math-Complex-1.590.0-r2.ebuild:
+  Add ~mips keyword wrt bug #505156
 
   07 Apr 2014; Mikle Kolyada <zlogene@gentoo.org>
   perl-Math-Complex-1.590.0-r2.ebuild:
diff --git a/virtual/perl-Math-Complex/Manifest b/virtual/perl-Math-Complex/Manifest
index 30a27fdb0e06..5aa072af9262 100644
--- a/virtual/perl-Math-Complex/Manifest
+++ b/virtual/perl-Math-Complex/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD perl-Math-Complex-1.590.0-r2.ebuild 493 SHA256 df36338b32116cf557bb4c57cdf3b82b3b8d5d7c6e145ff3801e443c16972d42 SHA512 52b2c190e99e97257c71ad14cefc7afb6a36bd5482c16d58caa819483c8597e96db8c1efd0afad1e87f237e8975a92284464336fd64c7eec271479e237743796 WHIRLPOOL 16a792e29c6c6b0b764c1b8284b034651c903e2eb4ff00dc67a6ff4ad44ca5ecfaa6a03b1108c5dc3d17d3084ef52a7c6e22ca6042b2588de3c3be97bc6a588b
-MISC ChangeLog 887 SHA256 e9a4f460899eefc47c2ddb184a530eb95fb0fe5e7de33640736ff22e46a99d7a SHA512 4997039672f16cfa2d3c9a5eba6a69500b55f04d4ee038d5d3acc437f15bb3eb76c7abbbfa089e92aae2cb1f39014d907eff189794dc39af736f8af9943510bf WHIRLPOOL 0205dd5341a83bb4849d62b106fabfed082a075b74a3bb13add1762912807863c316a8d921c10807d9f0560b92f92e78e76976f16cb17261f7a43bc028937682
+EBUILD perl-Math-Complex-1.590.0-r2.ebuild 518 SHA256 c76916b28d8a5128c92805a8db160a051d2e34cd7696fdc44e9a105bbcebb855 SHA512 2fab1f8acccf757f66b2ee1a742c15013f0e5150470ddc7aecdbdd35be955354477bec6c70181d677e22489366c3366e61df1983c4541044cad409a2c9b0f244 WHIRLPOOL a5c59120bdc869f660e4b129e52db8e25f9ec0dcd34ec425040227da42173e3f1bace83924ce956279bc0fe2ed6d880c3e73c385a1a5d54b53258d0ca9e7ce73
+MISC ChangeLog 1392 SHA256 1942a79318e4b5ded077911dbba0444e4b52e7023f9a4d898c49c1ab1e869e11 SHA512 bb24651f9342c21744b9504436d734af80adf53ec73cfd2cc520720c261d04c12ef48a3089f393ea805482663e473f5bb90507c9edf4d510bbba3d4d3623a1fe WHIRLPOOL 28d8e3d8d2348292c969fda53964e00016188947929b0111ade8ae5593cb5b6e2d1aab0df6582a548227b2bc8adea463a3651722f009eb837af23387c22a2dea
 MISC metadata.xml 161 SHA256 03133f1c99f9897289d97dc74a0ccc9b0a8138838507982422de997be1910a54 SHA512 105dfa237851f1eaa24a51b58404cc2dd4c96e5ae29dc602aa10fe916c2b8af6e6272ac89e7e1352d64e38799f38a293eebf488843490417657e94c3e751f5c8 WHIRLPOOL e2af9fd199381669706b1ddf6bc2db7a9019b6acdb1422a8f2ee8311705c819c120e87df08901c7865b37c916540862ff1d207773541d848ece41eb03e8a3d0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlNCoOUACgkQG9wOWsQutdbG3wP/SojNEcXOnr9OdEnJxBK5Tj6+
-azVhvNOkM9cqSCdlO35fVsjQRBIuTXjU5HmjdKfJ9XGSl6RXZ6rVtEJF4uhD3yaV
-wKQCFgj0Zf6jt5OYVy0Zu2LjAIaLbZgLuY+xARhdNgc1hepEKAEcAd+Q3jL9uZ9x
-aXYch/iAkHjtTEWY4Gw=
-=QB11
+iJwEAQEIAAYFAlNZT9AACgkQG9wOWsQutdZ2ngQAj1fprHeLiRjkhkPJfD0Rg24j
+LwheXC0r/m4eSQ8lLZB4lS6j/A27/j+9VXT23V2+s6oayakNN5R1yifCPyd5k/vi
+lu9dv7USSEDLfFMw0tHcZtZCJLSGCLLXIVxhghJEnbkOtXh167KpNBGZUHWxXk4M
+C0lL25IivK1Cx0rwU3I=
+=sErO
 -----END PGP SIGNATURE-----
diff --git a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.0-r2.ebuild b/virtual/perl-Math-Complex/perl-Math-Complex-1.590.0-r2.ebuild
index efcef673f71e..838385c29e91 100644
--- a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.0-r2.ebuild
+++ b/virtual/perl-Math-Complex/perl-Math-Complex-1.590.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Math-Complex/perl-Math-Complex-1.590.0-r2.ebuild,v 1.5 2014/04/07 12:52:33 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Math-Complex/perl-Math-Complex-1.590.0-r2.ebuild,v 1.9 2014/04/24 17:48:47 zlogene Exp $
 
 DESCRIPTION="Virtual for perl-core/Math-Complex"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 841c090fbe88..d2d356ce03e6 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.89 2014/04/09 05:54:20 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.90 2014/04/24 15:36:26 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> passenger-3.0.21-r1.ebuild:
+  Remove ruby18 support.
 
   09 Apr 2014; Hans de Graaff <graaff@gentoo.org> -passenger-4.0.37.ebuild,
   -passenger-4.0.40.ebuild:
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 1d5fa1bf2fab..7451f3b2c030 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 2.2.15-gentoo-multilib-strict.patch 1278 SHA256 dced348f25d2bb41dff59f51c1dd7a8b6771c81dd699a54170e3627bef12ddea SHA512 19bdd5fd1fe2d9ff0c6797acde965cddf0e997aac87a9572a0516143eeb1ae858b3fd298c186e611df9f6dc1380d3f4d85c7d5bb0141e82fc91e10072ef43c90 WHIRLPOOL 9368f5591cc3a9e6b69eaf0566747cda936fa447d75159dcef88b4869d17ff3568adc04a698f3cb74b8a2216e5c9fd982262b03e4ea2096f8596e4ebff91251b
 AUX 2.2.4-gentoo.patch 1617 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea SHA512 5a80b36b0b62e2a450584f7a7c25f574ad0ae5b9be813ea94069a68583db4bc944e7624a53ac0b1c00eb56329b97f2f37027d530731633fdb4ff4461843a102c WHIRLPOOL 147dddd7762a6a914962283c6e6737e10575da03954e10ea5b70dc80c7e975461f61c21db0fc555ab442689ca3f8d812a252fba6b1a7ae0c95def409bc03e9e9
 AUX 30_mod_passenger-2.0.1.conf 2695 SHA256 65095dd4e633c81d6283faa7f6cd91324b0a964ce73a79f7330c177eaf0d2bff SHA512 251648009a9dac7e87efcb42481c222497a6609e0c72b0ae36adbae75d982c5732549379b0b169c79fd7267609f6f397926dd091a53643055f5540fa1b268d4d WHIRLPOOL d73cf3df89a7147a626bfad9a2ecef304e2dd931b6c6de066842a8930bfdd7451c223f3da881ee38498298f51030ce6b86e22d9443f263d69c2e67cd56488ae3
@@ -16,14 +13,7 @@ AUX passenger-4.0.21-gentoo.patch 1759 SHA256 86070ab8259af80eee024162340fbf53a2
 AUX passenger-4.0.33-gentoo.patch 1066 SHA256 f1eb0799b3b1dfbc35985aed4b4f972d7ab92b354d8f77d9fd6d9e1a7397603a SHA512 d2060b54e10ca75bf4876b6d6076e64fb182f6d07f3609893a71bc62f564d37016edffc6d5eab684864ecb15717c7e18116c94c763cf105203c76031df5b2a70 WHIRLPOOL 3f8db66d1d408dcd552ea7657058050676f6d430a7a07fef012cd28e272dfaf5f4d6f612033958d4904489f7a0bfebb9fee2f2de1a6dcd7ae335cc08b4026991
 DIST passenger-3.0.21.tar.gz 2657475 SHA256 82a79a2ff6803e1669ebf806ab320180990ddc096e3d30977ad1c86081b594a5 SHA512 4e92fe8cc679776531a73525ac0dd99612096c1370b4019dcda54aa928cbf6ba17c024124286342209a2b9d1ec9cb22d3783fc6bedc85cb9a0d0fb7561995eec WHIRLPOOL 11f9a5655e7ebcfd9f4a03a63d077126a0766ed7ad92e24494c3515202603782d3a8c999b4662004577d3463de68c040d783d9f93c01f95aa935289c0628780d
 DIST passenger-4.0.41.tar.gz 4060645 SHA256 7b1857e02280066d4be9123a1c13ead1eba280e60e3eba7b4f0e16279fd71259 SHA512 a65c1a2b3ef14d9ea03f0dab0588f96dc3edcc9752cc00d7ea9f8b5839d000e9a993dc9ce93cf9f3a94a7565aae338835041efbaf5272506e4adabf393078fd0 WHIRLPOOL def6f3ac303895f9d807a5a559f6debe682a5a7e661abaac4fc5cfaf5d56d968b9059e47e1966f56039a91c47230b1fdda98df2fb36f4cdad3627f2edb5fc1fe
-EBUILD passenger-3.0.21-r1.ebuild 3253 SHA256 19b231560cbfe3b4a4bc8303fab0da874927a5f30ad897187fe4028cfaa76bf6 SHA512 4ae46a34d9aa5b5756949380bc6a8a2ebd475852052c374059ec072a5e03c97724a13fbdb9e0b40cadff438c527c8034b3c5293e9c165b4a0360f6190ec5562c WHIRLPOOL f9b99a8e94a842ff2b61eb3b7f57d4d3b264072b95c73c64dcca9482e6c9013396be0ea4310bfa804e07f171340af7df8289c0eee50bc6ed840ce41a7d61292f
+EBUILD passenger-3.0.21-r1.ebuild 3071 SHA256 85613845c6c48745ed5b09cab992e134e9eb591c4492729b789a91b383241e61 SHA512 797046dd6f399b8d323f52baeafa53b3369790cc5e0d2e3f4c9639fcd156b77075a9c5a17916027a8c748f35848651dfd0c5b83b00bd9aad743250e96e405543 WHIRLPOOL db5d90350c7992d8ada6a0785a58d88b84996e9f058ddd19cbc46033faa33d273d916ec1748a1e20118082771f13c80fd41e9443555e98884554ca33a432f5f0
 EBUILD passenger-4.0.41.ebuild 3628 SHA256 2ca87cf4e4e2f5fc313691b5b4bc1295fd9865dbc3b275ba258c17099a0c59aa SHA512 62d7b6334e77d20d98cd4e48522fc61f01f61e6dd504ffdb44577169628ec1c4e7309c90f218a08a8603c5763a38efe6ecfa75449678de8666fa704129734e5c WHIRLPOOL f537cda016bd9e2da42e58a9d7c7a7fc3c6ce3b9ec532fcb67539b81e673f381cb672738bd628f6ea4b63f307d7e09eca28eb29b433e9bdb73a06fad8891fe3d
-MISC ChangeLog 13947 SHA256 4654478455fd6bb38f19b319e9fd146af942a9f138ef71224268f52c13c61cc2 SHA512 67c45825b9705b2ee721b05dc3ad071c3def8825e87d9f92ef5de0beeda26a1fc4fffa0306f24b6bbf3224bc6b776233902027c6addd6ef11795e5385ddc6633 WHIRLPOOL 22988c280d3d5425b9b4f8ad10c9b633b1b188fdac0707864260f9bfb66e7fb6801d159bf0d45f40097994d210cb28cae50dacbfe167ffc924d87f55489cf1c7
+MISC ChangeLog 14048 SHA256 fb5933a211f5d857c40c725ab5c281f4bff816122d1be080a06ec4c175dc8f16 SHA512 faafa3a8375653afb30876e5ee7903af2896a1572df0bdd3caae9f1f151dd77522052cd679af93c40fb5aa1f75881dd7e23c78d21f46a0a357a9d6a68f986995 WHIRLPOOL 164437dfeb61622d19d69c8a360bde6d9debcd7106f52f593dfa474ba8e7847f79ce9e77bdf9a4513090d1ab8c3cbff7b8154ccafb960f6170ba354c6ab72bda
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlNE4I0ACgkQiIP6VqMIqNeqtgD+KVWQyh6e+B969tZYpBaOC8Ei
-KjTZy+a7Z7urJKowyzEA/1aF+gVRIBi9pq0gpOr2dXduLU3Jse3kXZcWt4f+YGNx
-=ND8S
------END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-3.0.21-r1.ebuild b/www-apache/passenger/passenger-3.0.21-r1.ebuild
index 4337b5534687..f45c5178b8bb 100644
--- a/www-apache/passenger/passenger-3.0.21-r1.ebuild
+++ b/www-apache/passenger/passenger-3.0.21-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.21-r1.ebuild,v 1.3 2013/10/06 07:51:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.21-r1.ebuild,v 1.4 2014/04/24 15:36:26 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 inherit apache-module flag-o-matic ruby-ng toolchain-funcs
 
@@ -22,8 +22,6 @@ ruby_add_rdepend "
 	>=dev-ruby/daemon_controller-1.0.0
 	>=dev-ruby/rack-1.0.0"
 
-USE_RUBY="ruby18" ruby_add_rdepend ">=dev-ruby/fastthread-1.0.1"
-
 CDEPEND=">=dev-libs/libev-3.90 net-misc/curl[ssl]"
 
 RDEPEND="${RDEPEND} ${CDEPEND}"
@@ -33,9 +31,6 @@ DEPEND="${DEPEND} ${CDEPEND}
 APACHE2_MOD_CONF="30_mod_${PN}-2.0.1 30_mod_${PN}"
 APACHE2_MOD_DEFINE="PASSENGER"
 
-REQUIRED_USE+=" ruby_targets_ruby18? ( !ruby_targets_ruby19 )
-	ruby_targets_ruby19? ( !ruby_targets_ruby18 )"
-
 need_apache2
 
 pkg_setup() {
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 26e6028adbf7..9cd2682dc68d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1060 2014/04/18 13:11:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1061 2014/04/24 13:09:54 floppym Exp $
+
+*chromium-35.0.1916.69 (24 Apr 2014)
+
+  24 Apr 2014; Mike Gilbert <floppym@gentoo.org> +chromium-35.0.1916.69.ebuild,
+  -chromium-35.0.1916.27.ebuild:
+  Beta channel bump.
 
   18 Apr 2014; Mike Gilbert <floppym@gentoo.org> chromium-35.0.1916.47.ebuild:
   Disable fatal linker warnings, bug 506268 by Vasco Gervasi.
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b1f0d9a17465..521926647da0 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -31,23 +31,23 @@ AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a4
 AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d071384ed324 SHA512 ea858464ee8732536633259ed3d11990822e8b8493c07b83218856a127320ba21b9cfc184f7e7a899739bc5f938fbca25224e559fb7db8558cb86fccc743a685 WHIRLPOOL 72a5a9af7955e653151090b555c6a67a261ff807871fdda16d7c3fabf4b52449ac9caae466ba51a17d2efed74a68adc32687599ea4287cc033e75f787d874b55
 DIST chromium-34.0.1847.116-testdata.tar.xz 108468560 SHA256 a5a021f336a8db4d9d2dbca4519c9da89af4caad3431da1c9410e309630365db SHA512 ad2b3f06ff80ba41d916f1e82f4d3be56752496de1b3cead4e0b84f875243ebc82f33f5a5848ba6f4c5a892f392271261d00af4008ffe3bbd62435cbba0f93e6 WHIRLPOOL 95246efee2648fbcbe563ed0c2bdaded35d66e3ef164331f2ded4f6c821216055111e719b4d980cc336e38e065194c54e03880fb1b1dde6224ccc158be7115ff
 DIST chromium-34.0.1847.116.tar.xz 190250900 SHA256 dd6579c170eecd8d1f366461575e9754e44200e0b9fefde20941e15cb6729711 SHA512 8f88d6da1a13318c6b0b8d310018232dbadcb1bf369cff422f5f4e497566e873e1061c47cafd4f7b4555bb5f70d994ae6af9a58264bedfd341ebb9481dff920c WHIRLPOOL 48923f844e44f926c39240ba8424910acea760f8df6f3375b226f651c7d6ffcd676302359613d2a58e875dbfcdebdf798a149694e7f076443b9f25703bca20b1
-DIST chromium-35.0.1916.27-testdata.tar.xz 109106228 SHA256 c2aa82a45bd9b7db8af18411f00ac3bbd8cead30efdbb1eb381c9190eb71b4da SHA512 2d5288d9fbe3b925d9a2cb85d1a86a5f21462a9ce27a03caf84eed9da89f03a882758b252739911d3382cd51335d570fa4653327e371501ba6760ed7ec385a18 WHIRLPOOL 66d4deb1c236ac7300aa5ce2420722f330b6aec3cd22c7726b49443caea4e61dfcfe05ff64159077fa5ea2549a3059ae90bab8870741ab8be2869cffa8938ffe
-DIST chromium-35.0.1916.27.tar.xz 206043348 SHA256 f757af7fdf0c60ba812596e9a2c8f148da5368a5036a16bc580d2825c910227c SHA512 ff12d9d71377a1516fd7b21cef9dd1dd087bfaebcfae2ca659968fc1b2dc0af988403f5b8de1c8502d0ff61f2a48af5e42cdac4d76c9579da517f0f2cc0463de WHIRLPOOL ffbfe4f47a9cf0547cca0c6ded4d5b52fe00403d74bd02a608e5f96bed6c9bce34b652700bde280d2d7f5d88de165ad1627fc03729d0840f02f64c3bcd56bf43
 DIST chromium-35.0.1916.47-testdata.tar.xz 109107096 SHA256 2bcdbbcede804266a46a53844c289c7c901893d8ef966cdb9c0a080406c6666f SHA512 f493992497810902dce8fb273b8a9222e6dd2b37b9bbdfa5529475e48b893b5d2b70bdff71aa5adbc5c9bf4365d685ac73a1ecc551647fbab24dc2702ddfb6f4 WHIRLPOOL 3ea99f80111539b30860c23a66f48d325adb5dcbc0223eb91cc1d5c27cad97e5a5e158ebd37ef8f9ac0333e26547df958e109defc444217d121b6c9a6dafa69c
 DIST chromium-35.0.1916.47.tar.xz 206217416 SHA256 90154389a49bd5acb025849d1a7fd66b16992f3d690be0f4bb4459b7bc3a085f SHA512 89b4a6c9218f3d3174b544eadf670647627c9c1d551185e662061fec0dcd00fa608ff10a7ec5891d6ad8a6c648febeabbe3ebbb641c50aea741d594d01bf83d5 WHIRLPOOL f64b78fe26c9d558cd416662ea32740aa7a38f45d05bfbcd64f56b31a857fbd85e6cc1fb24fed4c34ed0fc9aa1a4e72154323ec488fab6dc9c9e4516d5c89410
+DIST chromium-35.0.1916.69-testdata.tar.xz 109110744 SHA256 0be9d3d686ac819dfaa93cfd6ad4f94b0e41aeafcc1fca24570e6b50b9767b59 SHA512 a1c868b628571fb7902157057384d8a195bcf83491e3d77f984eb85671869a8989e64ecf818c4501bc1010d95d6420de09d807d23e71165c629cdcbe8ec12b76 WHIRLPOOL 7905131b8b195947e23bfb6684705af9712d495c3ad9f4626bd85247b5ca32a49590275000698f509831117dfc2be93864df0e6ff041edef4af5149ef197435e
+DIST chromium-35.0.1916.69.tar.xz 206229124 SHA256 a45a1fce3359fff09f7e35e64eea9d28f72e637ca9c6fb22cf19bf1b019a6474 SHA512 cb416ce598707acbaba53d39d19dd84a4cb7d4e8b88f1faf31c6af53e4b343839af8098bdddb3ff3cb791d3e874ab417e92cff6a1fa960471452829abf36fa58 WHIRLPOOL 0ae27d679478a496352e146868a985761f9c45e289c447dc0b5de527e33df9ec0ce791227bad2fe76b033425ffb6deb77b5f18c80e8622a9cc8f746b13b8aa3b
 DIST chromium-36.0.1941.0-testdata.tar.xz 109180096 SHA256 4007f36ee0442cee4757ee192a4faf4058e79728332af9cb14ed995f7974d4e4 SHA512 c1ec3a0f774f8918ce6b4ae75e2eafe461322876b67566761ac28251b99fe248ba0fc9d46e6b169843bb0aef91800ee6897bb144fd3a2d83a69383ad0a814b0a WHIRLPOOL 4f757e0939db5ce43b1d231fc438d8c18777872721fce724db815fa33f1a2b5a050f95115a01d641f112fcd9059645e1f5376e1868301d1fef65167aa24d26fd
 DIST chromium-36.0.1941.0.tar.xz 204959420 SHA256 fa3a7d5d9fe2a946139d023403584a6fa94f7f57028633c6428c470a11f6308b SHA512 15e5f8866be2963bf647f75fd25222d0e1bcb0980ad997210990cf5b02beaffc8b471994d2bb6a38f983e788e16ab60582522c55dd813ceccaae62981da754d6 WHIRLPOOL 0fd4f12956911239f87f4b3ca924987b36b018d45d5c8e3405a2738ea078243a352108e62b9364e7dc236621a1969ea6a0678d3535038f2a41d172e3b397aefa
 EBUILD chromium-34.0.1847.116.ebuild 19628 SHA256 b75129f9047c79d86488703116dd05c782e9bd9157ab4b2e2fa214829d3b2a29 SHA512 3b1f2a857f433d2db5df52640b8137ef13fd362dcfc5a0bf005de0fee3924f2c10566f30479e5985d9bf85448a991323e865d8f8bb55228147c01a80da36be39 WHIRLPOOL d1fe1af969ff4292875a331f8d0abd4a2645bf1fa11ff9863c18c2f9968a8c8481667ab295a731dc1162cc738fecea3a1fed6f214f23e4298915fa666f7a0544
-EBUILD chromium-35.0.1916.27.ebuild 19800 SHA256 c763140ed722743f7b70c491c902bd725f0a79220e4e757a368f0d466f2d8927 SHA512 3d93201b98850e2243adfd4960ea5a59ef110a6322c9a5686dc5c6fc209f9164db3ad6407077784c7355d4e4642ae8c9d4e549f4b009e4267b7ecf2a4fa1a398 WHIRLPOOL bd8ada7e6d789eaac231f9928364d1e65717d944f0e460673fa9599ef972e85d1073e6957c3ab25ffd76c2095280ee13a36efdb75e47589a76e47b1c99a4b699
 EBUILD chromium-35.0.1916.47.ebuild 19893 SHA256 f045d7c171b7dae76595d09924d468665e1a05803f7a357333e8f64bff6c12a4 SHA512 3468751ee83e05f85c27fca904bd7612b22bbdf1b4a4660d77f12663c6718cb504f975605697092901073f4982ad763c4100386a1fb68b633ed80c55a2529a75 WHIRLPOOL 471a6f9ee2e0b4c0b3dc9830da4b5df869d1ebd9c8359c350485149336e38c716ce611882c98ec6a926e2c1157c267aa39a3daa52d111d5174620bdc690e2eb7
+EBUILD chromium-35.0.1916.69.ebuild 19893 SHA256 85e22df48b565492b19fc43d836785fee01142f13a847711465c710b31302ad4 SHA512 17d996316ccec7176cdaa80d668f7633296e15f5db4dd8a8c42232e7da0515405a7bf69ebf4752b088e20c04272d7e8e08820973a1fa984ffaa96084810f758e WHIRLPOOL f22e70ef3d17ce220d6205f8d88f01c817a41d4c878b5f77fe3ea4e344b9309987a9ca91ae1e05dfb9e4dfbd6395adb7f33c7b51e21f97cb2dd29bada1cea402
 EBUILD chromium-36.0.1941.0.ebuild 19912 SHA256 3d7ef672f6eda3a58810dd8bf97f2e61ca9cf67b41cae3a6ffc0ff2a84a86968 SHA512 6b2438e90d6fc56d1f4cc18bd3a134105184741eaf049951366e9ffa856bcdc7cfdf1f3bc4a33c552d64000ef0db8dfd7dce6143588da204365e93707e90ffa1 WHIRLPOOL faaecde67bd834675b8fe15894d3fc24e0d3b95a2de109a00ced8ce03c5ddf771b730ca2e92a7b2b2b2232ff6c3d76ff3db8142da8b2eceb814cad01e497305b
-MISC ChangeLog 103202 SHA256 03027605bf3fa32e0504694ce4a8954e4004c88fb701645b0e103d0e981e0697 SHA512 68cf5e26a4455eb833a97fa4dc3e2f0c6cf6f2b7d0354eb4f6752883914b2b2f06fd1767e8fdfb59b3d8b00b25fd2e10755ba54acc29f869029c91042308d709 WHIRLPOOL 9f230281a4ac7e34985947484a17bc07956dbb4be6b7866a0dd5296295e82fc291f216a2194722d0ffb246003efab6156fc3a7f22da0f62ed12e478282ea21cd
+MISC ChangeLog 103375 SHA256 aa414c621a2754364db83374719a7df5595b0188c92ddfe1fd7296ec8eb862d4 SHA512 724eaa85fcce8524e8afaee03e210390556feeb87d034a2b5133e15ca775e70cd1ca5f70a8438fa828069adad28b4fe8b1b2361a1f51c9e1ce673bf13da19bfb WHIRLPOOL 7c6a52b0d679a32011b0b242db39252a9c031a477d2a767a1158c90f33b3924339fb2a6e728074df7a9f93faed828d67f76644a7ea6c48dc94a5861df58f472e
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 599 SHA256 445f23a3d80f257019d11074a593608bc3f3abd22b6985b89f533d94f7799008 SHA512 606d4ead8b6e9c4852110a5b5efe5a5d6219d2e9d546ad114f01d496f4966df0238b8c1fdec93916715887a08e7737c138b6c0a22267256616edded58914c951 WHIRLPOOL d6273eb9bdc89b4a08a572a27708128985094bd684323c2c17587e80364bc446762b325d31977bed1bdbaec31e5dc6d22c29b5bc49c9943e99e837bf529bbea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNRJHwACgkQC77qH+pIQ6SaAgD+Jrr5qnZW6nFbHxLnyjTPfHdb
-Tqkd/9ckg10o0zoKtYAA/jXoFpN24Kyd8Gt3/rfZbRcKwCRd/47tWYAkVxVVJSHC
-=z3Kd
+iF4EAREIAAYFAlNZDSUACgkQC77qH+pIQ6Th+QD+Ks33zk62Z/Wjwvrerku7nomw
+9UDPZ6dHTrqthG5Ffp4BAMZr0VDn0YcrdW+XYAN4kHs8AsjB4/Qc0UukUUE/0qHG
+=dVUY
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-35.0.1916.27.ebuild b/www-client/chromium/chromium-35.0.1916.69.ebuild
similarity index 99%
rename from www-client/chromium/chromium-35.0.1916.27.ebuild
rename to www-client/chromium/chromium-35.0.1916.69.ebuild
index 384fd2f4ba6b..bd0dd5b49077 100644
--- a/www-client/chromium/chromium-35.0.1916.27.ebuild
+++ b/www-client/chromium/chromium-35.0.1916.69.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-35.0.1916.27.ebuild,v 1.1 2014/04/12 20:40:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-35.0.1916.69.ebuild,v 1.1 2014/04/24 13:09:54 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -393,6 +393,9 @@ src_configure() {
 	# the build to fail because of that.
 	myconf+=" -Dwerror="
 
+	# Disable fatal linker warnings, bug 506268.
+	myconf+=" -Ddisable_fatal_linker_warnings=1"
+
 	# Avoid CFLAGS problems, bug #352457, bug #390147.
 	if ! use custom-cflags; then
 		replace-flags "-Os" "-O2"
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 6a8fe719b45d..90c758fbe6af 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.267 2014/04/22 12:28:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.268 2014/04/24 09:38:26 polynomial-c Exp $
+
+  24 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> metadata.xml:
+  Cleaned up maintainer list.
 
   22 Apr 2014; Agostino Sarubbo <ago@gentoo.org> apache-2.2.27.ebuild:
   Stable for arm, wrt bug #507866
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 509d1e516da7..18adb5818841 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -20,23 +20,23 @@ EBUILD apache-2.2.25.ebuild 3431 SHA256 1c22f6a2ad0126cc7be3bce968931b0c204a030a
 EBUILD apache-2.2.27-r2.ebuild 3084 SHA256 dab174367d17465b9f4a8ef673bbe80d0dc5e9215257bbd975e5c0b9641bb7ec SHA512 989eb2e2ce712c0e37ac2dfc84061214b0bfff5d943ff2b4efba9e92678064bf0e2f2f9d47a4fa94582ee07a86017a67d01a9a0e901a4452ed899ed672688cae WHIRLPOOL f8e98f002e3eb8142c92dd675a9685065b71613ddde8708d39e6127fca07004381e300275a682ddcd0d75eca3968e09d441b0dabead37514cc4303aaf63f1e26
 EBUILD apache-2.2.27.ebuild 3410 SHA256 a030b2c031df127f9d97cfca4d100b05d18a0dce71d38d79d6cb363cd6ca26e2 SHA512 6b1051f4d7e79a480f8f613f04cba03232b3496700240496314867d9835015057cbe97c285caddad1ff5c15e5b8c04246726e7585bf4ebff14a436b10d4eed4c WHIRLPOOL 115ee87e5f56e59ff2627c0da48b73d495ef5bb6e91a4e6946427485149000cd31a95e78b74208416b2ca87b90684d7cb99057756acae353a33439d68ee1ba9a
 EBUILD apache-2.4.9-r2.ebuild 7462 SHA256 9ae7c2af5500d53974c2b770e90e57d911475a51d43d8adc6424f3630f76871d SHA512 daf34d0dc5a447d45b5180caf94af6a37d7920aef97196acd8ccb343f3d13465ba8c9e2158b4f06e8b813bd513b94f770199a64b141a9486c33b706b06afa888 WHIRLPOOL dd6958775ed254fe1b090a1dddf7e67be956e17b84ad00edbbb1de16375a0bcaac8cee3869f7bacd91a53cbb19abcad142ab1913fdc8ce062009ff9d56699154
-MISC ChangeLog 25129 SHA256 ac27931cb4aed968c543516ede957d55ece97f64ad04cebd4b9bfff3dfaffcc6 SHA512 5d4e2e2397efad780281ce2da66833b859d40f678870d135a39a7795d4ef25c20b3c82f3eea62e8bbadcef0c83bcd1e4adcd3f95f55e11d4ec5b7adb5470c42d WHIRLPOOL 8b96c3f0ec9fa354122c6113c12a7cbe5636adb6e8f95150329094f62ae8f1a6ee75f77ceb84a869e82de3ec84424e1ca054604e7f22699f84ebd9093251a073
+MISC ChangeLog 25237 SHA256 f278fc952396d6d80a20d751ac64efd5145bdd928cd797f6816ccdc770d40ef1 SHA512 abedf2d72e6cd590e6ed75d8f89af63e022ccf321a24596b9ede1f19086bf1d06eb6cc10bcde25e8f3e84c7cd1a5490fbeb33ba58dbf73207d641b132cb9aa9e WHIRLPOOL cb5017b4f6124bd71c268a14113cca8c653a65a97f2906dc1876bd99f47a1c809123f95be9f90984a814651144cf640081b279a73cb5f515acfc64a260151b0a
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
-MISC metadata.xml 2590 SHA256 165207b1cfcf0ce30ad2af5b0dd7e8cf06dbfc9ae4ed42e35bbc5d8e6ce0fdee SHA512 74bd116d0678c035c0e19f82a379c80b7f59b87db649e9c6835a3133569c52d6c0973f9445054bb1b5278d22c95f28f3d85dfda0878ae094172f7e84e15a0113 WHIRLPOOL 8c5ce73c072551040ac44c6ee632fd6144cf2673904401481a01311fe9edf72eb8e1a3d57cee9f94c1c8d9d71d1f80ce2a2f11fb9cb3274b7057489fe7b8578c
+MISC metadata.xml 2525 SHA256 7fa8f12016109ded908ee9387aa3385712cc12f41c04191d35696669372a93f5 SHA512 3628766cd4c5fc05172ff46666d0c20c3d74673687c944174a722473006aa674c0d7d43401a5d86ca00beec081ec265a719b52a7fc05fb97070cccd25640f798 WHIRLPOOL f20a43f305e0130954f5070f2f5f190f54fc3627b2bcc4cb6219a81bcd78ddcc79985fb730380372eceee054102f3464de8a72af35e08592be49a7cb1fe2a49a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTVmBWAAoJELp701BxlEWf1G8P/jMnHHkX6jb/E/Bsn42wIBQU
-n/g+s2JTQKDiX8dsnWcRhnlDZMZv321hSkrIYZ/ajoi7EDtSw3fkWkzFRgIG3qk/
-HZ/oyyrpsqaSJK9XpZil5a6ZGBpNFCMvYDVy3QSe/AKVgg2D3ecEKvBQmUqDgpFj
-h9dgGWVtuetCImgthgFNsRiWU4mMWk5jfevj/MJEF48wed0G3jPXYlAQ8HEhtv2S
-L9ei+w9cup0YijVtMpw/5HVr08JDcky0Q3cWOjcKVit3f62lPrsaKH/oOnFJyo12
-miTd8TQRHPcpE+DeQ548VQ1EW97VcQZBdejf7Ybr05qSNW4Y+UQqt2OrIDhdJtu9
-zabVdzbCilNm4h4nJXZKuiFRfh7URdDnjnO8pieWf9Y+Vqg29QBdRm/Y8cvY4FDO
-xsLK0KoVTWUSkPWtF8s3Deq8dYuEqm3KfadRSx4+tI3eOGMFgwaf+GOTjJxK5Wyq
-BkNju6ESNaJFD6TIxFiViQmWeRxVchmDbKignLLkKFqkCFAzIKSGWkghkknxtuV9
-r601UhY8EMxCg/B3IvUXCYWgDibnDPmcDSI4aH2CQtWZ8ED5uFMRLLGeTjq1yv8K
-d/WKhB9w3RbfkVFK/7vqThqTG67Wgbxe9J1r6Lug5wE7zrfAZ3eOKSu/nrP422um
-tBXyrdh5gKJNBjm6aR7q
-=fauF
+iQIcBAEBCAAGBQJTWNuTAAoJEPiazRVxLXTFe9cP/ieX44V7GIBWSVsr3F2t1nXZ
+sNNYOeUtpaQpp3xtBxyEtIfTAsBcXMApV91g78qXWYS3Zok6TLUFI/Ac20V20Wqc
+Y8k6mdLGaivE98hD6ZobDmRWnnsspSh4M0+0kXPIeLMMzDWGpmPM5lR/1O4h2mj4
+fsYhjTboLIORzXLyQRskH2O3hdsNL9UFwP1kYXry10wnRTY5tybAymLgZ/AQjDpr
+0PEQGeo3NpdwcvG7/z60PbR4SoU+/YNqPu3O587Ab9oXUseoPWQv2OpRxPywS53v
+bWcqSXy3Qegk5+y+tgEvIvhOzrZD4/2yAKMuO/9y3W99SRMzxNn0psernCOrZsis
+sLSzpdRRT+FJRgOR/D4nnHkTdAOYqECvHle3g8d4YDW+hozN4Cwck65XYT4AIOHy
+4M7wsKqhXl0UAQ1RYR9gOeBcf6h1g+JCM3PVlpIHm44OKMKkMQbcx//VHrzFKK7B
+eiDKaOdLRHxIkdgIN8zxNAe7hT14sWr8f/NImYIRgvtFNb+DzWympskycCyGtdub
+gBxU9ztFkrb7cB5TI87qeTJ9ytPCW+QPKoq2AA88QwzGYgMZJxj3LFQXTnjXmIBI
+lP96G3cLxPwMs2Vyrrk8w5M+bkqMbPe2KYdbE/J0T14bLZmxHSQNBBTgkGvs+9kT
+i/JX/GCg/XeNMSO8bHL6
+=8o3Z
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
index 9d9a4bf08c56..a941ea1e6ef3 100644
--- a/www-servers/apache/metadata.xml
+++ b/www-servers/apache/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>patrick@gentoo.org</email>
-	</maintainer>
 	<maintainer>
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>