diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index 6535e7454e53..00792ee5f8fb 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.88 2014/07/13 10:01:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.89 2014/08/22 10:31:59 dlan Exp $
+
+  22 Aug 2014; Yixun Lan <dlan@gentoo.org> files/ulogd-2-ng.init,
+  files/ulogd-2.init:
+  bug 520294, fix init script issue. proxy for itumaykin at gmail.com
 
   13 Jul 2014; Agostino Sarubbo <ago@gentoo.org> ulogd-2.0.3.ebuild:
   Stable for ppc, wrt bug #508846
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 17e2d5e50694..7f2f6eaee49e 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ulogd-2-ng.init 922 SHA256 1dd1fc93a622856a4e576c58bfe7291730a9dbcfa8d4f7f94b19e4cdab02299e SHA512 f91a6f07d18d31c5fa4a84847e508045bc8da7fa8e5e5254d5f078ee840466c0713aadb4189405af4754949d4ebf2e72ecedfa5820cc11b60a705ca7d62f4f7a WHIRLPOOL e4e927783d9da4c3e6f652c2d4ebc26b84c060e107addf2da4d9a8e2eeeb98da8143f025ea7bdd9e831a1df417d47d8e2eb57c7db855f60428dc4d0c0595c1ee
+AUX ulogd-2-ng.init 1000 SHA256 72e5ef08facee693fdbd264bcc42d8277220706b2539150fef97a31b6039c44a SHA512 de80e76ef91b7913b4eb0a28f6632700c8944dd0a29a8e7a1f7365f8523ef79bd52e1e873bc94dc3958c5b4224680457b7b6d4ef0e196dc0179af50c6a9c6a92 WHIRLPOOL b2c4d7eef3ba5d2d2c9777fdafcc08137b78000a2558e894dfa737997ed236e4796abf2a9011e055237e233fd7217cad26e8607c19f6cc34226c5dd74df42e28
 AUX ulogd-2.0.2-automagic.patch 1879 SHA256 57045fdf9475be4b60a87dc19545515275e1eddfd07aab7b57e92c141232d457 SHA512 a31ab086b82ff88232e984760cf16553cb9c7ef170039da37ea5cdf347eee1fb3a21088e19033499e5940ae0556e7a59e7298749be9fef02dc6b5b30bce318e3 WHIRLPOOL aba1862ac7344111f6aa42910328018e198c19d3e20c6735b19667ac154307ae569dd92511f5888df3eccfe582939c64f5be9f09906405744aae6c226c8db70a
-AUX ulogd-2.init 947 SHA256 b988174c0ad590ed7b9a195e9fb04a85adb86e31dd900b4aa624f98db03cc8ef SHA512 ed7fef40ea92cb6c92ffa7859687b47df8f2fa70adcf9f3b2afd3cc78ffe01b3c4313723ade168d45068edf57730d4830a7b8715ffa1e2b6219555adf6c9993f WHIRLPOOL 4a20ad03168e8c1ccbc04316e03f47d39b19b485e584d34cc1abca3cb731f44df2e5775514ab9229a40b440590dfcdc9eabea6326cef5178e382680661044a09
+AUX ulogd-2.init 1001 SHA256 228ccc589881e5b33763c15b84ec6d15d3dd65b86f9ec53f395d7ea282df9256 SHA512 e2f7e8651d6b6a88c81b248be1489f8fa327f65dc14be9125688eaf056c40a28de0b39a5530b1b9fa3a789bff0c40221d5f98b37e3daad7e6e3b6be3d6b36327 WHIRLPOOL 3d02937a6514d1f0302d0454760ee43d446d3daae21dc49ef1996d106f806a4d46d93cf8d646f24c327bdaeab557115036814df50e4ad585235086d283e01436
 AUX ulogd-2.logrotate 212 SHA256 df0f73b4dd4b0c1f6afaf3efc98c99b972e068bcbf8ea768f6522cbebd339669 SHA512 1c29316f42903a8893a110e74c171f2b8b4c9bb2d63221b65e601f077549c7447941ce6257259b4f1042076c1e4b5bfba0bf7c85289519aab6edb27edf6ffc95 WHIRLPOOL 8f2290e7de1e8958c1fc5cf1f075170a691304d1ddbf53a2f14b989925d5da6996ab409442ee9a92852a711f56a2bfe05bd97a55ab2d6be3fd1cca346cd0dd93
 DIST ulogd-2.0.2.tar.bz2 466664 SHA256 a36c4032d83edaef1b13f96b6647e9e150d7f20b5af7035f0a91c17fe2e066c5 SHA512 a7ac243ec67ab4325855df631bae011284c716495e5e2d26c1f392207448b6b793117124c89b66e7745a05b74cdddb5ed7acb44c34c24618cc27948a25e978df WHIRLPOOL 8113b5e35fe236fbcba8239daf13f435949aa7798f23794e1fc138cd6decc4119da3b06fdda1e3ad6f4c45f0521c44f0e1a50a7bef19644263df1972fedb00d8
 DIST ulogd-2.0.3.tar.bz2 447550 SHA256 1ec965073e7f4e5605b2bd1c143b2094e495ad24a298e6fc8f6fcbd131234376 SHA512 09d61cca6cd1c8137b3a4e5ce101f54e48f30c98761602a97766554bc4130eda632b8541f5c1e3e2ac686ec718bb4d440d3bea57c811317cabb274917c996140 WHIRLPOOL f79f0300e610ee9de82aee478dec1c28ffbe10c7b4348ddc586229ac53226f238371f1e71d0b33095904d373c26359b848e18069d8da3d7e22a4819568c1ee44
@@ -11,22 +11,22 @@ DIST ulogd-2.0.4.tar.bz2 452234 SHA256 56b30a13a8832e97178f39b7bb173a0b1dfe173db
 EBUILD ulogd-2.0.2.ebuild 3179 SHA256 37420f11b149eeccba025acd698affafc1fdec3a25a196e095368357df5087a6 SHA512 5ac08f7cb92388199d09599b8da5da5fddba452645e7b233e6adc13a4b5dd8d9f34abeb3a91713cc969c140b614b604b0a78bafa56ce3130fec3238f613fa9b5 WHIRLPOOL 456dbb76782ad5841feca9ca1aeb890091b83fe15b901c7787d97629d99417551b98877d50011e7d1f85a305697fa44b21350dfda42377c70827ffdea16e4701
 EBUILD ulogd-2.0.3.ebuild 3068 SHA256 0015baf2db2efa37594d9acffe43139c08a10f97537626add68fd35cbc085e24 SHA512 63de9afca8ab0b3a62bc67af12fe014dcf928561504b8cac58e362a23ba843a046ed1e261da192cf07568eff6581e9e8b4677349ef5be0cbfc2431f4ebd89c4a WHIRLPOOL db9d1863374fa18a8495226b9ff15144a3bd58c9f1b58e81d616a89d1c48941dbc921d9aafcc171c53bc348c26577d7f87a4ba0fd334dd4915e013345cda07c0
 EBUILD ulogd-2.0.4.ebuild 3147 SHA256 d0b578eaf6158249bd728cb50e7bfef7e12e13345ed09730d4867c1ca64b7c21 SHA512 c2f84d6fc451ad117f3323586b27e3d86e5cf5a33e85d19116f277bf02a3f18a45ba734b0ff433f0fa969b20505933a9afcc226504aeed85084719967e785143 WHIRLPOOL e0b3322565957dfbab48294a9d0b93c7c355a2603ffcaf4d7fa92774630f56cdc90c27aefbd60588ea397ecede2ced7427ea68efcf09be467534f42c7605497e
-MISC ChangeLog 14597 SHA256 3af35a35ef2c29fbe280b3c1a11a8815b745db1f789cd322ece0f18229a28822 SHA512 e815761ef6d49d159149213a1a68df4247d151fb445375e1a2e2e892a926cb4074e85b9a3b94a410fda05f28e3fb8bd83290eb40140920fa06512717455f319f WHIRLPOOL 43d8ec01ab952a7f60d5e3de8f54b32c63b1aeadcbb12a18da309ba69b253b9262989feb3e33b0e80b2b16bf441d1fe51e2e70f0da76576b57128bb0e8b1bee9
+MISC ChangeLog 14757 SHA256 ffc08ed1e8cf53d9d329dbe28f7bd0c1662d1604d90e02ef4a6edb04c0109da5 SHA512 edf60b4d752d79977e4da0124852b3a50dffe8c087e550043527d3bfad6b28f1f554e206b8d38f1a4e8445219d81795d87c822bac6322706573917ec28a857b0 WHIRLPOOL e96e88bc74cd5989e58430df198dc28b42004fee9b80482db5129885eb736d04ed9c04e26da070a4ccb51d507129f5436ac93472f9f63099cbda61b41cd960b7
 MISC metadata.xml 1045 SHA256 8fca8605bebf933527d992e67d15b73a73ffb10ceaa23369b9243f9aca546a94 SHA512 95b9494ea6fa7771e53b2300e7bb3c795f0869e2aea0f8c56e307836cb152082c584daa935eb99416e1cacec4e22a370812da7dca7689d408b232c58eb4cd514 WHIRLPOOL 895778a343a2f24edf5083236e8489570e739ce3023491c8b6f483a14c3343931e340fec227fb5f0250c902692dcc8841d4bd976d13490d361e4599424658693
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTwljkAAoJELp701BxlEWf7nsP/0Z5NycXaZRVftWW5HguMtYD
-slx3JfPLxY8zHFHKx7caX39ZJSWa+qknBcBgtuJCC7TpK34Lv7uA30Xp8kawBrNj
-5AO0IQQpV7xUM4G6S84F1oEPeWaNPyRRl5X+Ak5h3OBtkl0MQv1sorvd6/7USOZ+
-vuMLckXQIO5pv4qyKBjav8K+aMIGx1qGILiS8MgPZ7jfjOJ4/pJ7J4zuCtPDka8p
-Qvi4N0hCOtNGlYQ7zKeVz/vDbcbdFmNvehed5jJclFw3S4bkb0vS8nCed4abCSh0
-O5P2sMktwjBS1CkmF+EOjlODiHIrpN8x7ZxZSYYYnlAUA6dBHR0ms/kfvllz5Op/
-LZZtxFJ6j7NWjbUSoNQpjwmkSZerIZZW+EocgTOkmQ7K7J5gJ0SzyNl99AV3nMWy
-ZX8ZNyL50sgv532Rr6iDnj1pgknoWO+unk4XE38cI5w++EPCd+EQFyOqqixqwMHe
-LSJHY4jgrTmCt8xPJyDeJxDt/VZIItcCX3uTadZZ51aPCp4+VVMxKdF6+2zhcSNa
-/xzo7bAWATzieLQMEN5aSDZOYb54EADXMwl0f4uJrFqaMWq4bsRYZY0ckp2f4tBV
-541zYoTWb4NwTcjw6/rDR+4AkScp+muftse8iTcDRtC0jnTqnnwIQyLjthh7B/lS
-p/STVQO84C6rswgmML7M
-=JmqQ
+iQIcBAEBCAAGBQJT9xt2AAoJEJIMDbyqvv1VIKoP/jzSqItb4kUEjuydoVSz3cWY
+ztXV/pAyrczHlR619zYi2ZFquJI9EON1ATIzt1kBNzU225uskvKiOz4DJhlIwqHT
+KCPQgGddT59fKIbFMJVninmeGIiM5cQzYPIDqpOnSDX4SzRDfkrNfGYQficrwFIh
+2klQeXyUlEwfxUyM1zKM3bkezldbbnmOQdjJFO5GMAlvcscmegAV3X2YVqPhdFO8
+Af997KDYJwzC+uoH5Di/i5RD6WBZgZqYAwHk3qfFQPg8SGFKxFADtU6DND3BCpPa
+OBezabrVJ5eIS7gGbheT52B8VeIKmX1JqFQgwwpw5dIkN7Zc4KGdzUVQ4NlTCvk8
+UVNx+7IZ9Bo4BS1yj8TE0fmGzXaBkHD2GJysNHF2HX9BAIMykTtQU6zw1T8Jrv33
+NQVqT1e9AtzANpfgB98yfoDWsHWrr0Z0oX6wg9jeNV04RgRhUMDFr1w2w+hfjQgC
+BWzHgVM2NqDL7CwJlHvpOqAh6ZjwQmpN641fKD9oHQi3+YkCHaDG9zFZCijPFwhz
+mWpYE9UVlHur7wFRGBBuVFNq3V5Y+ANE8rA+YFBR2AacmyjQTF2DtccqE6sHkPC9
+NAPua4NSx0o2aM7VbEo9LmEN7eiaoHkv233L9/3vQG/nL3ALaO+res1/JpOpepFV
+XTHg0TlwdXR2Idh6pEFd
+=jFUd
 -----END PGP SIGNATURE-----
diff --git a/app-admin/ulogd/files/ulogd-2-ng.init b/app-admin/ulogd/files/ulogd-2-ng.init
index a818ce2ab0e1..b1c5d616dc12 100644
--- a/app-admin/ulogd/files/ulogd-2-ng.init
+++ b/app-admin/ulogd/files/ulogd-2-ng.init
@@ -1,22 +1,23 @@
 #!/sbin/runscript
-# 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-admin/ulogd/files/ulogd-2-ng.init,v 1.1 2013/12/17 21:38:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd-2-ng.init,v 1.2 2014/08/22 10:31:59 dlan Exp $
 
 ULOGD_PIDFILE="/run/ulogd.pid"
-ULOGD_EXEC="/usr/sbin/ulogd"
+ULOGD_BINARY="/usr/sbin/ulogd"
 ULOGD_OPTS="--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}"
 
 extra_started_commands="reload reopen_logs"
 
 depend() {
-	need net
+	before iptables ip6tables ebtables firewall
+	after mysql postgresql
 }
 
 start() {
 	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet \
-		--exec ${ULOGD_EXEC} \
+	start-stop-daemon --start \
+		--exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} \
 		-- ${ULOGD_OPTS}
 	eend $?
 }
diff --git a/app-admin/ulogd/files/ulogd-2.init b/app-admin/ulogd/files/ulogd-2.init
index 68718f3b0e85..28aa571bbbc4 100644
--- a/app-admin/ulogd/files/ulogd-2.init
+++ b/app-admin/ulogd/files/ulogd-2.init
@@ -1,25 +1,26 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd-2.init,v 1.3 2014/04/27 09:57:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd-2.init,v 1.4 2014/08/22 10:31:59 dlan Exp $
 
 ULOGD_PIDFILE="/run/ulogd.pid"
-ULOGD_EXEC="/usr/sbin/ulogd"
-ULOGD_OPTS="-u ulogd"
+ULOGD_BINARY="/usr/sbin/ulogd"
+ULOGD_OPTS="--uid ulogd"
 
 extra_started_commands="reload reopen_logs"
 
 depend() {
-	need net
+	before iptables ip6tables ebtables firewall
+	after mysql postgresql
 }
 
 start() {
 	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet \
+	start-stop-daemon --start \
 		--make-pidfile \
 		--pidfile ${ULOGD_PIDFILE} \
 		--background \
-		--exec ${ULOGD_EXEC} \
+		--exec ${ULOGD_BINARY} \
 		-- ${ULOGD_OPTS}
 	eend $?
 }
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 27c8c3a2ad92..16f5d21da098 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/scribus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.194 2014/08/21 08:02:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.195 2014/08/22 07:55:39 jer Exp $
+
+  22 Aug 2014; Jeroen Roovers <jer@gentoo.org> scribus-1.4.4-r1.ebuild:
+  Stable for HPPA (bug #519890).
 
 *scribus-1.4.4-r1 (21 Aug 2014)
 
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 9f47ba51debb..be4a1e129d96 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX scribus-1.3.5.1-system-hyphen.patch 3754 SHA256 f17ef356e0c096b71e83048a4c97b53e455a73af7f25bc9048136c8000744e67 SHA512 0dae24abfc63253d3979398073645a510a872cec685c83d2c854221c9537b86c4285e248b42fa8e09aed5e8b8b83b5365eec9b4769db6a513d3010536b832d81 WHIRLPOOL 16b3101ca254f96507e1bc9675dc871d6b766a8f0a780b28040e0ceab88b42c2729347da57e110ba4c60b7e6773d941406b86003d6fc372407ff17969b58a8f5
 AUX scribus-1.3.6-podofo-0.8.0.patch 1749 SHA256 498e2ec592175123b54cc090b1b839c8452c1a1a768d9b29737c5386aad963b7 SHA512 b3215b9028875288c1848e69c00dbc84b5375b29954394af75291fe9352950c45412f9471becd9d38b9dbea7c4a66899ddb1a0021d557541056185fc420a51d6 WHIRLPOOL 6ef3d13307334fe2a9338d4088b88fe7d43303e6f12e4d93eb2b03a51c70ef8985915a7a653a61e740f825009032cbb7dbdf13ad3371b476dc90320e6b3a303c
@@ -14,27 +14,15 @@ AUX scribus-1.5.0-docs.patch 738 SHA256 28cb58a737e85dee4ddb616eb985cb767c4111ce
 DIST scribus-1.4.3.tar.xz 70503072 SHA256 c72ef314c32f995895ca5025127e65ffeccbe2d445c358bca334a7249ea0afff SHA512 e4841b346803bc096c2e00b2071d03ce3bae6af8d7317353ebf8e724b5a9b6461d95406bee61c2a316bc6ee5d9e302e3fee7b51dd89eae9adc9e69b3aa40454e WHIRLPOOL fbcbd4ecaadb868d836848ef2656df4a1dba58ce7f7b27a810818604f9a2875c948e91484475a68b034d0cdcd9457b925701a8435a687c7cea0c2606f4d8cfca
 DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
 EBUILD scribus-1.4.3.ebuild 3870 SHA256 4fa63fe3561abc61956ab3b159e13010f90c30a89db2c0ce07ba5d2939eb7110 SHA512 d462c22fdf9423e36a06b3a2a068f4366bf4faaec3e0609c2b16d3d1eb4cd9b1a0e8951d1ad7552ce3ea47ce477b54b5f7988d6afc1a7b7147282b1d4477cf02 WHIRLPOOL 7046c1f4d806de3b044677620c47858ddda69f54b6fa0efaee2b499cf953fd042855e1dc428316b78af31fd4694992b1e3692328ec53154a5a291ac2e2374188
-EBUILD scribus-1.4.4-r1.ebuild 4116 SHA256 7a5535a3661509b863ec38ca521655673b1344155068d356bd0174322c6bfd2e SHA512 09fcf25ba81f3b80466a0839b0cefa2549d1641d15d81813f453602773c99b27ec75406632c11aa7735b561e0e290858037ec9093dd6d5a29a9156260183eaf5 WHIRLPOOL ce7121bd86af9e43b362573ed31d6c520ca31a35c4d76d5b5655866619e3887eca188e9360c2a3801e5303959aa84863db9500011e55d7bbd6f1e97339ed32bc
+EBUILD scribus-1.4.4-r1.ebuild 4114 SHA256 bf9463cd02c7cd5a16af8680039551ac3b7d51ad47dddbcd12e955d21bb8dd6a SHA512 3392a7ffefcfca1400b7510cd694819631a9abca0ae605ddd9c6348c6ed1338b3e0cb6d56bd87e2c5cde24eded90be76e1ed53d1facdeb82479beb057c1f119b WHIRLPOOL c262f190ce5a08eedc57d869940559bd34dd768b2ddd4223f25bb3d13b8cdaf8402d05852b225e0650e996a08208a70bf72a6ca9620c0a3f6ffb18b79521f0f4
 EBUILD scribus-1.4.9999.ebuild 3980 SHA256 128439f5422e8fe164daa6d009ae86332bdf1c1ee9bb6de3d4e73854ebd6d528 SHA512 ae6331a53c82a11e4520011ec130776719a52bba08006a33077a5ccdd8e0645d41d9f01b8ac9763ab1ce6539380602569cfec842f5b095cc90f3630006e28b2c WHIRLPOOL 13abbe23339587854474473c15ec8396a72ce253ea41999804b3fa9cf72673923dccd84573d811fe3c7a638d05d584fb2f91ff43921d4bed0c859a08ed670703
 EBUILD scribus-9999.ebuild 4106 SHA256 3b85e9115115abe71195a4d8cccba1242c6252348bb4f17d97c5c4e4d596e009 SHA512 d5cd4ae30f6d9ee81e652c543a7cca790b1eecbc379c96c49d8b4d2c7dfac3f94377f6b550b0e3f96291d1e06afd5a73ba7941f1d68000f975e1a7bfbc8ff77e WHIRLPOOL 597da55784d33404bdb4e14a2db6ebfb5b03f5196ce10bb0f31efb88964cebbcdf1ebac9cabf9d0b1f3ca815f45c0bada2c06857fb5fa26fc5f222105ba0b1ce
-MISC ChangeLog 25790 SHA256 e6fe8a6c5bee67366e8ef3f7b123b5edb714bc241c8d541c400a140ba58dc50f SHA512 d40e15199890fddc3227db75b6b69415b44a28ea3518c8234588dec4acbf42f9c668c3a56a2a36fe8b9294d744f2ea00c6e11a2d3e72f4635c0d9089675ffed4 WHIRLPOOL eaa06059d96b7294c4554e1b51846e1b58fc88a81b2ba46b310c04817051de6c3150d3b055f411a1ddfa5e26b2ccd92c3ca822cef3997350815a0f74bf2a7ad3
+MISC ChangeLog 25895 SHA256 8e62641f632516ebef5cd3cfd40541e138995934673ca89d8206f507a7a7d8a9 SHA512 2a3a2cbcd7c315da64931f066e2d021cee719d1e9213773340c87051b5ac8891e792d9837f1883a9ce725125551b60c84606c6efed65fc9b7230a56daed579b1 WHIRLPOOL d9af22ad96d3d1d5e7baa18c839d16c0c82a2912f13f6117c3cf96d7b4b4e8378bc4703e7ca30a034637bbd2320770ee7a9ad146d5610ce5f23fa5bc7c23fe32
 MISC metadata.xml 1525 SHA256 23a06249a009e2b5fb3b11d1d2e9790ae25f9898333bb885d5764fcdd7a146a9 SHA512 8ab161b6a1b6981f8a81e95e62b514886b893d57243540f6f2f66c076047c147600d8f5d6b2341f667a70fed53d6ae74f427904c670aa4b5ca35500d81997ddf WHIRLPOOL aaaec9da2b5a731190be8b3b1fb3956fa88b9f6e59bead78db610d146fe455ae766ed8af21e40109486a37d8eb6022392c350bcef374c140a269bd38d6dc2914
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJT9ad+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir8ogP/1UyyjPXfZw8Q6UHR/rffieR
-IIMRiS4lHdw5Q4uIeX14RokPqQYnucR9LlyjM0eaarHIQz4lnSO2W8wGy816VuZI
-qxgKLgAvCiysodpbkmpWsTZsJvzLlYfyKmQng3Ydd5D4RhtGtyVE60GIYRvKjOer
-ssY+lJFzkyGVqxB6oV4z0un+M9eiH+TQivjZux//wgpORKMZ/+ThPACk3Z7faCaQ
-PoflEwSNSgnzSouXvYqrrn5N1BFAM6m1w9OzPqWUEE9LWtNkSp37Fdm4Jzau3trY
-+OexcUf3iupCfva+Bz9EtNAfnmUbcew9ahtSowD2EfL21RkIzRRVkiga3C0mptkW
-3TJfp5p69Xof8miUzplXcWIpmmAD/0Leex2Tate2MMYfdvUkoEyOvRsDxgt5W9zW
-WnC3COibm2gWlelSEpY27NiirMhRlJb0qJbeYN+HPAnmVBcYKOdJOm8xs7rroQ1A
-HjnBrqHifU0z9VdRmj7L/OrGfQo5uDNQSRm2W9ZBIuQLcP1IuyZgeS6TOmVLpboz
-HbmH3ZYw0EDJew0F/In1ltZp6OAEt2GoSOjQmbesas6oVUuq84MOXD78B/tG19H5
-osayvO9BFvGnARim5BIqdM/+0kKRYRQrWSilBcHX200rHl7b0YSshs9iehjVpLey
-fFsvNmlO0wBr1jhB8xxv
-=F5d1
+iEYEAREIAAYFAlP293wACgkQVWmRsqeSphMIHgCdErPD0U5jNBvbcrBzHUR98q00
+EWkAn2gV691bpBxHh+RxznWEiQ6A8bdh
+=uA1B
 -----END PGP SIGNATURE-----
diff --git a/app-office/scribus/scribus-1.4.4-r1.ebuild b/app-office/scribus/scribus-1.4.4-r1.ebuild
index 921fc9ab3f23..122ddf5cfdcf 100644
--- a/app-office/scribus/scribus-1.4.4-r1.ebuild
+++ b/app-office/scribus/scribus-1.4.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/app-office/scribus/scribus-1.4.4-r1.ebuild,v 1.1 2014/08/21 08:02:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.4-r1.ebuild,v 1.2 2014/08/22 07:55:39 jer Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
 
 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 58c1c016c39d..c9c4dc775220 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.875 2014/08/21 09:46:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.876 2014/08/22 09:29:01 olemarkus Exp $
+
+*php-5.5.16 (22 Aug 2014)
+
+  22 Aug 2014; Ole Markus With <olemarkus@gentoo.org> +php-5.5.16.ebuild,
+  metadata.xml:
+  Version bump of php 5.5. Added webp support
 
   21 Aug 2014; Agostino Sarubbo <ago@gentoo.org> php-5.3.29.ebuild:
   Stable for ppc, wrt bug #519932
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index a3a07c33a011..000a1e5ac7bb 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -23,7 +23,9 @@ DIST php-5.3.28.tar.bz2 11051714 SHA256 0cac960c651c4fbb3d21cf2f2b279a06e21948fb
 DIST php-5.3.29.tar.bz2 11396771 SHA256 c4e1cf6972b2a9c7f2777a18497d83bf713cdbecabb65d3ff62ba441aebb0091 SHA512 c22c463df7371bbd97beb258f0a9b9d77ec5c3c733fc565091e2bfcda3da2f1d2ab406047afcc70a6da2331acd2698885328d5a334c9922fa7591852eefda5f7 WHIRLPOOL bb9db8ba267016af18d0d993e764561b11d6fc1302ed139d2b047ec84f139b078faf53d27a7dd394b0972199b3990c34a77ef1e2f7b632ceb5660cb1667bf0ab
 DIST php-5.4.30.tar.bz2 12315772 SHA256 32b83644e42d57388d6e5ec700c3502cde5f5e1207395b1e361e4cb2ce496ce6 SHA512 02e1fdc49420cdf3611503e3f65ad7272fe069f9a3be4edad8ad142bed42658cef25e97dbdab4e99a3f85874505e47dafd15bfe008663e31ad5fcb78e0929a17 WHIRLPOOL 0da8e3564d34766d6e63bcbb62fccdd8f383eb19166b606693b753eeddb9f6f21bd6c018ea8d1cd948805fa30f5f0ac4bec2c38fbf1eb2aeb2f852406016bef4
 DIST php-5.4.31.tar.bz2 12273437 SHA256 5e8e491431fd1d99df925d762b05da05c80b02cb38c9b3db616e8894a307914d SHA512 58ff77ed7cfe00ae92ad9d30f934af59e532a0d562f31701807616ae993eafa5b7eafe893f2648f12e02a02018012b31b27e1bb3c4d3b2fc0642e51cf5bb5486 WHIRLPOOL 0073d33c0c2f691295cab758d3355b34ca0ae4532490265a5f0553e48035b18f8f6575c2eb28dadad09104ca999ebb7547ca1f9f94ef5de029e8790d846e57a2
+DIST php-5.4.32.tar.bz2 12277458 SHA256 26d0717669a098f18cd22dc3ae8282101d38508054500c26775ddcc26ca7c826 SHA512 a2bf1c4977bfb36502163f5fd1ba81b6d7ac2a99f77c7e584761efbd6bbbc3ba0ec493ccc5bf61d78f956c8666b84b1b4bbfbbb778d2834541b47a9a5cfd63e0 WHIRLPOOL 718edbce480fe3b8b9a360d35b07cb9cfb629bc1d1182f0f434b072f514f9f94e90490079cff7754b128ca3f33e27b72ec73bec9b321c3a8c7d10496b36d4c52
 DIST php-5.5.15.tar.bz2 13244903 SHA256 00f24226b12fee27e332383b6304f1b9ed3f4d9173dd728a68c5c3f5a59b8ba7 SHA512 0a6a0c17c59a782f07639382263db10968e1f540f53f15c6b49c3bf7d953f8887dd16e3da838f863324c85aaf38655be499148d4998e0efda723b5cc587961eb WHIRLPOOL fc2068e2c5be2954703ee1802ea541ee5e6151186537a9a8de09cf01a41b7f64b6e8d0cbd6f14052b3191e9c4102eee12bc2b2aa9ff297119db2882b2a4adcf3
+DIST php-5.5.16.tar.bz2 13257031 SHA256 a1d7c4556a80bed744a348211b33bc35303edd56dd0a34e0a75a948c879cc5f6 SHA512 609e08cbc4974b356f81cd538d5f875befeaca83fbdb410c1980b420577da19148321a0c99b3494cd06f341571f00f2d381748900d4bad17c8240e4d6e90f7af WHIRLPOOL 715f3ba0230f3987c488a1f67b2bc542d8ef183b8ee0096fed0fcd6cf54c1173c04358ab3e6e4816814b2d7b7da88d396483e2a95ee566c0bf2feba5f6c59469
 DIST php-5.6.0RC1.tar.bz2 13480421 SHA256 695f28e5b0751bd583986d79759b3b76871cb9bf6624bd5e8ce6bd1e64e183d7 SHA512 06ed1d4d61c9add5794c8781968319b92e4220b80e2d3eb93f585273872cbec1e2e2a458907bab8be6a07c1ce172e42c7700d7ee3527d8a974a3f5233bd0fe82 WHIRLPOOL 1634f63daef4d3b09e312a93824cc04903b621f690e1451c4cab1a050026ed3910403686061bd2f3d7cc1de3c754a2c9d36973e1c465a7851103dcb8df5ffb69
 DIST php-5.6.0alpha1.tar.bz2 12989378 SHA256 17123fd1b07aa1cd16eedc9ae653dfbd560e2b7da95961f546334fda14bba804 SHA512 3cfa54c724f41790d2bbef5d9f5552ec17d6d5fdc75356ba41f747e161d5112ce46fc32f7300897227b61a959f6973558f8d67c7eb669d866569c44ad7507140 WHIRLPOOL f3fcfae2782e6de86e84913c2daaeefc03dd39796143c8001753b9e1dbd923c4f28f39beb81c05cca71d0642db283102f1dee3b4788791d6f478010335595a3e
 DIST php-5.6.0beta1.tar.bz2 13358124 SHA256 85e101acdfa15da3cce63a9d18bbaa92c2f1507246305bd20baf1e5824596d7f SHA512 bc013d2dd6a356519368f9d8486b74660224689a017251df88de849f79f1fbe4ff0d3b4324581bbf37894668359a4131304adf6bc4fb8fa1a5301318c1461239 WHIRLPOOL cf97ee5b2fc744aee8f0458ac271e1a92df73c7e0c165a53017bfebbaf2802ef542929aa3dc63ee880d43c9381a62b26cb34585ff6c842a6e6ccabacd62c3b8a
@@ -34,29 +36,27 @@ EBUILD php-5.3.28-r3.ebuild 22250 SHA256 9422fd426f65b6ab15cdc90950767c8b0ef00f5
 EBUILD php-5.3.29.ebuild 22246 SHA256 989007a465b6afc317e1adc9ffac904a65815d67361254a37e396719b4c8e25a SHA512 db509645b2562022ddaa9c2a0b3b10735c5fd018e65ffe86d80bb05b1f982b6b75ca3e9b832b178e78829b0cbff13d22932154f08f5498b6b51767086dae6820 WHIRLPOOL d0aa56273a3cf2d9637efd58e2e444db02efd45e9fc12dbf01b81f273d4d7194033b2dd34352a25f23ba681c9a5f4ce3524ed21e8d111551907e5288cf520894
 EBUILD php-5.4.30.ebuild 22307 SHA256 c11ccbcb77584ab4c2868fa04201874cfbc85e32f00aec0345fa245967cc30c3 SHA512 95c2172d71fe058d349ff620345ec817f6a3fea63f8791a7a2d1244bed689b00fd1401944258f0878daaa952a6b0be180b0fe57d07dc2b39fbf0c022c3c6c0f5 WHIRLPOOL 3d447087025144a90f6d7437f9ff920fd171b4a4499127c26c3bc307522dac318b38f394ef6a688dbb2334d905758910acb1b7917d346ebf8b9f52b9285bf4f7
 EBUILD php-5.4.31.ebuild 22315 SHA256 bf7a1fc0dcb3e4c681d88fc9e5105141a0b6dd35bd626c4b4097ff8eab7b32a4 SHA512 2303e00247a3dcb8af6684b950b3292a1a739deec2840d453961d890ce05be08eacfcd0528f83c0046a4e738788d14d4c9bddace29375aa56be6ca431c8ecf30 WHIRLPOOL e37d5ce106c02ecf1426f4dec0b6399a4c2c878281603ead75022e4fc4c660ad924b67ad474c23113069a2c31691366e2da3d1b7c2408002633c49b42abdaf46
+EBUILD php-5.4.32.ebuild 22389 SHA256 e0cba94698ef23c4b86e972ea32ec7afe1716dc4dbe5646ab2ac437102a664e2 SHA512 2380887dcc826786312338a0160dcda9d96d039d90142dc3195b6cd80611487c7d6ed93bbf008e79f709fc895deda3cc42ea495e7fe139e690c2c07eb973607d WHIRLPOOL 8a17519ebe6054b3bcf6db26320a2a337b6e44230a01d4887ac1f918d8f132c6dc0b02c91b86cfcdc7602f33b45b5278bb3649f23e73d87f82ba1f7e180671f3
 EBUILD php-5.5.15.ebuild 22156 SHA256 aa77fa6e78153d6abd3e8ee68687c90f8b482af4087b77cd317a6401a6a9e255 SHA512 7555f03d965cc1f14f0e1feae8af1a2a8e86be4e90f82cda0cb627bf6c19ca63ee4cdbaf0e45ccc017071000b6a89fc048b5325807e6c7608fae225efcc615bf WHIRLPOOL 1f1f80a59829c50ce6ce14f94dc2d214071e22cc93f617c1db515ddfdfeb81a7431ded054c6a0aff9e5de999f23cbf212edf0ce159a95580c69edafff6c0ac85
+EBUILD php-5.5.16.ebuild 22323 SHA256 b66f7dd875e89824e65b48e8e6acec7edca212d17610ace98007b314e29d873c SHA512 d457d369732cfabf592c0ec625a2ee15934b5411ced5ea5709af22e22a98ebf60c854231be654f9dce4fc58d8fe42f3a4f91758fd2b057e6dca57544bbfd2dbc WHIRLPOOL b40f3e2830053ea325b5d7d81c81a9802cd4d4ed7e5d3312e1bfeaaf2726dca5a621b92ecd8ac4d968df0d251a4bb80c34cef6dae64411aabe20816857d24997
 EBUILD php-5.6.0_alpha1-r1.ebuild 22176 SHA256 b21651ae8febf6a9e9ea783b86c659241637ec653c9c3ef288783fed9633ed2d SHA512 1d8da3a8ea417bee5d0309c46c32325b92e00de2acac9c7daa06a4970722441c0028958affc8716b288ac299e39bf178c8e002b543de59de292792555507e58a WHIRLPOOL 6c84df439861052b15349ba41df86a57da9ed8a3091be0cf0ebe8f88f84f8c988a5ad419e3f8915663476295251b370ce438342d7961af6d1a2a11db2bf7a693
 EBUILD php-5.6.0_alpha1.ebuild 21864 SHA256 432a8580444e47996a83d8b530337869746e37358019b12db3daeee4581e88fd SHA512 fe0d7360e1fe437c4dcb4c3d843c97fab111d9192645a8f09a202d9b470e0f640bc9f15a3143bddbbb9bb81324aa98563fbcf9aab8b2c7fe3c6c7446a8eacd3f WHIRLPOOL d9f45a73e216aaed458b8549c4ad703d17f424b201a176394e5b72607870778de22d568636d1ab199b74689ca91f1c0ee691e1eb0c64b00ff2762a593077a510
 EBUILD php-5.6.0_beta1.ebuild 22172 SHA256 c8d86636c3264bc22e6bb492357b20ff58bf9ffd9c4b0680720524575e1b77df SHA512 012573fa9d21a7fc5bd204bf807989f363c742d45eff763629dea67560f3a33b8d769d2b5ae0505411362698dc76bbab405bb33879a0027e15bf908ceabb9382 WHIRLPOOL be9528d371b21926cad386bddb2014b04889dbb0b945900ceaeb4eaaef9a5c8bc4334eee80905a42db949c279d375249e22521633f82a45a6bd36441629343db
 EBUILD php-5.6.0_beta2.ebuild 22172 SHA256 499e8ab66ad9c9fec734e0d7fd3aac526781c4558c590f82b6c4b9d8ae3e5a29 SHA512 eebcc158d9c34bf0b46c35860b8aa7ce21ae55145206f6cce20e1ef7e03dd037c2f36e42335f50ee084cb2f8b713eaf536c824f5a2e80806076c6ce289db9347 WHIRLPOOL f373861891254cbc653d7e8dda5cf9a54549dadd5bd70f8460ae3fc87aa161614b3ff42c53baf8f52592ed239088d7b522e268ac20ddfe03f818aa303c21b79a
 EBUILD php-5.6.0_rc1.ebuild 22170 SHA256 3b44c8d6793674d1bd8e189035fb0047b686cc7729ac0013d51fb46e4c6b9964 SHA512 b4c8f1d17f864b23019868c3a49ee4b11eb3880f23b3782a34fe583dbd358bd0456bff816de13117b6aba718c3e75a80b1c6153be02ef6ed071d2fef2da290ba WHIRLPOOL 2929fd032e5a5b3cf8a14ac8cabadc031cb1126d168c0edbc8e1630b746f77a19ff6bb6974b35f7fd38e7d2a3931ddc36112a13ff9a64a79ae69d55deb6c29dd
-MISC ChangeLog 30432 SHA256 4b6bdbab4d936e3ff31d66af414e87527a47ffe6ea062ed9b1401f6a59bfb8c9 SHA512 398a4de07294742dcd6f88b7486b91cafeb9550c7cab5f7e1e9f0b6f07f932bc9252d3dfae399590eb95c81b28b954284ff8b4ea578635b7b884009d2533c3cb WHIRLPOOL 755e7c208ff4529cbab98aa6ba2dc56b7d29117610501ebd8c4260633faf7a09f427485654002120160e5ecb0e34bcf33e4a2dc54540bb6df15978d9cf71b7bd
+MISC ChangeLog 30602 SHA256 7cbc694c605acd9601607e35b59a0ef7bc2faef4971d40cb8186c819a3986cc2 SHA512 9199cd4bac6aa791af3558433b866309c82b505f0bb936359c092c3a15954ec6768549c48d2048c2a533d1202637dfe424299f4b25a8d3ad0a9c4ab7be54738c WHIRLPOOL de2d3a881d6e99d741504be1f691ad17296f535c45e0f5b438ab9afd9fae37a10484821edc8a11d32df5b3c7a2d799e403aeaa184c439b676c3d91a9e45b22a2
 MISC ChangeLog-2012 108488 SHA256 c2eea36502d34eadc7995d546f78aaa553ba07beeb51ea738715ad7f2e51b08d SHA512 eb25224993eff1ea42ea133302991a3ffad3adda0bc524cfa4fae49574230a8e65b35b08750d780c11cc9c152435fadbf2c416241fac28dcbb025e060e96cd7a WHIRLPOOL 82f627853fa961f3f3707fb2c8757acbc8fc644e89121d78703b40ff0f668aa7d0f1aa26c77f8f503e4f6da22ed865e4cb7c02d5d112c89488b12aa6b0d80568
-MISC metadata.xml 1547 SHA256 2ce287830b8238e330c0585ef3023f86a9e5d46204619c92588244c5d7fa2f77 SHA512 a3a1c2dfddb4d0d92eafa33d74dc0bb90f1a9976e1d2fe0d3717a0d94149d3023dfdc9e68d42d440873561b2e6c34969ae86cec24ac0f0bddcf9ba14103ba450 WHIRLPOOL d9d877b3ae1b304ff89f7b0dd3a1f23d78062280ee935eaaa02c44e8e1dc2fd78bf2c6336cfebb2d9e8dddc03414a7744114ecebee6e364e962c49ff5e2bdf57
+MISC metadata.xml 1601 SHA256 0f0d69832d7bf8ca13c940247d67e184d866ae48f4f77167b3b6a508f4c0ebfe SHA512 744b80efb645e7c6e632101c98cb7bcaf2a6530d948e5cb320050cfe4ca3733e29b995e2b1e4677b648c7a9e051a8056c6f38ae03ae18656a9583b24c32b6056 WHIRLPOOL 8ba9c5edf403759541ea1aad65138f48ddc4e4bef73c3a43744e1d0513031ab431fe1e742a39125257c3545ae0a091118d1b36d04a28bdf96e9989185764ae50
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJT9b/sAAoJELp701BxlEWf0mwP/2GyEB/zLsNnrE/uOiDZ4zfz
-VFKLXF8tThUpp0f+2qyixwc9Zv375neHXAr9oFzwvtYO4WePwesaLzLMy5CyUh9k
-DEU9WAEBJrAyE3k3zD6mPlmsl6NZnu2wRTJBWuc/UnhW6IE4mLb48J14+rdtId9o
-SdfuQDIEZoeteNNDpS/IQ8ymoR3w1bwlPaPLKOr0hBX+tyAENq9t23gN/LHgXHo1
-NnVL0PXXtcuY/dQhnOoudFbDNO39vdTQAlt1tKQFFXM96bHo4HMr1smi6vj3bqfy
-f8kLuqHCbxjsSTrQfcQT19KkPNVhAjWR/T+JQwtTeTHMVmN/gJKCK/B+mLAb3Qnl
-z3gWucKGMYVvg/N9rg6W28lWnG7KWL/gjKi2OOm6Shvub1FLcUNweHW/ZeMavd9x
-q0o8041MRpguaqbxj+GIDdsz88M7l6hCcDoVdAUf22GLA8IFoVIGn6rgfZouPwaf
-c1S15IUbEHx38gRyP1cFwiMuVxu0NNP5c99qciVJnv5H4MV+jCHtWhbPZP2rMlpH
-QkgXO0pCncYAdQd073uS2lYz6nCmhPFUeql1fgqEA9Cn/PWMVhc303QFs65ulvFJ
-hkH5ZAoTx4BvYpuGolLxv5dSl+9vX3sMWgMOm6k9dNyKUXOq6qGOy/r0AYwQ+sYH
-W5KJHuxCdMIuy0J1Rk4v
-=8Ow7
+iQF8BAEBCABmBQJT9w23XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
+QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1jTQIALs69s9uaofBMHrdG/rRKiLv
+VBHgAFm/KmcZLbQ7htrdag7cBKeNLLQvqBp4H01RiHAbYw0nsOpY7CsnRTlP5GAo
+WPOCe83iMgdAB29/41X1Q+MuTSL5R5e5G9CvBtvZjP10uZR6DPw6bf+53fVWw1k+
+PEpG+bxzSh18kLaXQTwadluAi7TecJLzEY2IW6a48QLbuTPvbuyCAHzTupq/7m1W
+DKTNqE4E+aRJRIvWxJgSb6cdBBlnXnSjvQmav0ZJJsxTti4qPrzPq2O56CW0I9Df
+XUxAcDkrlUk2HQvCfta9iyEqQmaNvg33dUvKs4k7O8D1sP5pmdCV/eOkAU37HIE=
+=LyM5
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index aa64511e801f..75bdf547ab8b 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -23,6 +23,7 @@
 		<flag name='xmlreader'>Enable XMLReader support</flag>
 		<flag name='xmlwriter'>Enable XMLWriter support</flag>
 		<flag name='xslt'>Enable the XSL extension</flag>
+		<flag name='vpx'>Enable webp suppoprt for GD</flag>
 		<flag name='zip'>Enable ZIP file support</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-lang/php/php-5.4.32.ebuild b/dev-lang/php/php-5.4.32.ebuild
new file mode 100644
index 000000000000..98a2ff275de4
--- /dev/null
+++ b/dev-lang/php/php-5.4.32.ebuild
@@ -0,0 +1,802 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.32.ebuild,v 1.1 2014/08/22 08:21:42 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/stas/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="2"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl curlwrappers debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql mysqlnd mysqli nls
+	oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	!mysqlnd? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	mysqlnd? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to ${phpinisrc}"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
+	fi
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with systemd fpm-systemd)
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	if use mysql ; then
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysql mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	fi
+
+	# MySQLi support
+	if use mysqlnd ; then
+		my_conf+="
+		$(use_with mysqli mysqli mysqlnd)"
+	else
+		my_conf+="
+		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )"
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysqlnd pdo-mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-5.5.16.ebuild b/dev-lang/php/php-5.5.16.ebuild
new file mode 100644
index 000000000000..6939f0d062ff
--- /dev/null
+++ b/dev-lang/php/php-5.5.16.ebuild
@@ -0,0 +1,784 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.16.ebuild,v 1.1 2014/08/22 09:29:01 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/dsp/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	vpx? ( media-libs/libvpx )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	vpx? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with systemd fpm-systemd)
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)
+	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	my_conf+=" $(use_with mysql mysql $mysqllib)"
+	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	if use mysql ; then
+		my_conf+="${mysqlsock}"
+	elif use mysqli ; then
+		my_conf+="${mysqlsock}"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )
+		$(use_with mysql pdo-mysql ${mysqllib})
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 96e381046b0d..d252cedbe5b5 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.305 2014/08/20 15:45:47 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.306 2014/08/22 11:35:36 eras Exp $
+
+*cyrus-sasl-2.1.26-r9 (22 Aug 2014)
+
+  22 Aug 2014; Eray Aslan <eras@gentoo.org> +cyrus-sasl-2.1.26-r9.ebuild,
+  files/cyrus-sasl-2.1.26-send-imap-logout.patch:
+  Fix send-imap-logout patch - bug #520486.  Thanks to Jeroen Roovers
 
   20 Aug 2014; Eray Aslan <eras@gentoo.org> cyrus-sasl-2.1.26-r3.ebuild:
   Fix stable version for >mysql-5.5 as well
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 11d39791b0e4..f136417f0d36 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -40,7 +40,7 @@ AUX cyrus-sasl-2.1.26-CVE-2013-4122.patch 3838 SHA256 39c3c404d6fc0da79c51157c6a
 AUX cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch 284 SHA256 334c3a2c7f409707026136ef595845f61e971e369035c3b5e3bf284f1e7e6e1d SHA512 f3b789b7dea3f6a51fca6fd1877c81b5f5a3be342fa5c90ddae98a822e0c2a71e8fa582c6cb60c696363aa5cb99db8609cd6b3a91c5d402a0ad1e6124c726f5f WHIRLPOOL 70fb8cbddf81c3dc631c0b9df72d3255590d20ae5d7d1d0ed6ca70548aaef3c48444703821c2a5ccc3b7fec5592584bc843fe5284fa1b0ef40a3446727e0f6eb
 AUX cyrus-sasl-2.1.26-fix_dovecot_authentication.patch 2603 SHA256 3edf79a6b1a03c87bef8b41f858ffe32c778288cd22ffc05460c3b8ad2f6393c SHA512 4244015451dfd41443a0cf8b56ae19a1dfb550e374fcdc37dc091a54f73ab36818c25fe96f7837e3ddfe5c7952d309a5b51bedfe0b7c7f1dec8ecf15f067acda WHIRLPOOL da1a5afb7a17e0eb3e7ca7586769a766b994794d3c24a21a88c895b17b0685a06287186b3bba6cce2daf0216ee91c89f79770f205eaa6b7ba844ade263ea134b
 AUX cyrus-sasl-2.1.26-missing-size_t.patch 348 SHA256 1821e0f511a3eab2cbefba36b6538a997afad2a4892d1fcbf22847d34e06711e SHA512 026183880caa504af9dda5fb93a6f47a159c7ab6af79463bc512709681dd260489411b8b8da78a9f8cd260b77ae5d1977854a39de80bc48f3a03e3ffa1b09fb2 WHIRLPOOL c71d5e4919577b6c23b1610c3fa695ad035befa9cc1de43867c9e9c17016f681854e734275241dab60271d3bc7198fd633b079ab6f53e6b8bc8ce4c513eff6bd
-AUX cyrus-sasl-2.1.26-send-imap-logout.patch 1897 SHA256 3af4cd230e7a0374a2b581f42372d157ac2e69562e6d7f93be08d26fc6ec6d98 SHA512 076d86d4a3fe0fe94c0b6a112cfeb7e8a5f7cc5172830b4f88b2e5bbb1dbbee186933191736497b269b312a9770b6fa4ab831b3f41f447836d7637541dacc173 WHIRLPOOL 5f36da99554ef1d944a7d2e84f44f499f2fd7f169ae09a0418f5e39d59aae675c765a105d3e31293d345229756c6273242aefc4764d813edc1d884f9a1dfa4bf
+AUX cyrus-sasl-2.1.26-send-imap-logout.patch 1897 SHA256 021289615c690937dacf7bd0d1f23823255d141ea0c7f81a9f98d4d2b42260d4 SHA512 b30a4faea9fb66d8fab95a27b8ec87371d3650c5d2d4475449b8cebb223631d1afe9cdebd8c9b076e77bc3d2e2f5c32b24fe9292db26523212a72754cbff9995 WHIRLPOOL b7348e5300c7584d9bf18421a703a66c348bbb926c569da618876c500c78385b5580cab98c261fb051684ed45f2fb682ca837a0d4beff789f94134801898f0fa
 AUX cyrus-sasl.conf 34 SHA256 1d246914153ca86390e7c39aaa9494ce1175d783d3292a8cc5a2d867b816fb7b SHA512 67b9bb97191d091ffc2b8f450ad88a558df304a29651a9a49407c50df0a316666a96e7d1a2ca3ac8ee5e60a58a5d5b618ce963661f4f45049dc6b3ef2cf8099e WHIRLPOOL 671625830fc9df9b44fff4d7fe16a7d7e76c42e8c1cf75cc7a725586aad3f80b98aa5a07ae5dea848833aed6aa02294c2a7b9969f1e708dd6854370a62c5cd23
 AUX java.README.gentoo 934 SHA256 aeb733ab6371c1fe50e413e8469dcd11f0750b5afff489408c45f118857fc3fe SHA512 afcecb94e8e8c427b9491fc21312f4bed2a7d4ecedbbec8fec895cf8ca1e747073979f4415e12d8499eadbc29e8d74c6029f7cdfd7a2cb732454faaa19d52dd4 WHIRLPOOL d32cd2cfc9ffab9f791f48e0450c7eeff1b2203e29af8df8b96c4091ca7195cd579e41f38b857ef646eec28a11ea9e7c80aa6cee3f41a58d354b732a6ea15a92
 AUX pwcheck.rc6 518 SHA256 3e4999ec0671b21845b12229b48b21a24d7ee73fe27d6b1432f2f26482a0371d SHA512 63be5e3a60a149e935c845816c9999ea4b40ba21e5e47d817ee3a86182a814908343fcf6457d07a982d2abe7182227cd80c6cc876fc88a0b6e143bee7980cbd5 WHIRLPOOL 2104689b50c03b630481c2fc3ecd61e651cb46a40a6a49f146a2c73e985b05931998ecd8d4b3f03585bdbace77653425dd237a2fd51530ee80614536efccf75f
@@ -60,22 +60,23 @@ EBUILD cyrus-sasl-2.1.26-r4.ebuild 7304 SHA256 5cfc9d22b5df08c5764dbc62a9acddf7d
 EBUILD cyrus-sasl-2.1.26-r5.ebuild 7243 SHA256 e03e387a42c2df294ac8606850d43aa56d07d7807ccc7effe916d25684fcefef SHA512 ce52378c3d58195fce4f61fb50cfc8b128a3ff92f4de91cca194ba745e3684048484814bb616033ff03048d184649865bd5741c31a2a44cdd63537507ccd7ee1 WHIRLPOOL ecee304416b6031d0ad8cf0c08758c1289d8de6bd3a985bb54eb36535b24e60d096f6ec28c616131929db07eab9895243ee8bb474766077dcdf4a377c1b1aca1
 EBUILD cyrus-sasl-2.1.26-r7.ebuild 7735 SHA256 62352c86b10f4a9cedd4ecd8d6d342bb3d56604bdb79030bef525f45939b7c70 SHA512 79bec3b3a85ed8614ff76ccdddc61066fc3d34a6d0c88c2fea784faa3c668b34ad38e612c2790b1c587c96160de25c5e8f245f32404bc08ada50d55a92633ac5 WHIRLPOOL 2c917cfd2a50030993225b3e70c0b4431231b9f0af5e774ad14761d2c1b42a626d5d220401a95dcf85d19ccf9f569899be22690dbec5e731af82e7d9492db252
 EBUILD cyrus-sasl-2.1.26-r8.ebuild 7744 SHA256 10fc365838aed7d52b5940e33e9c2fd841c77e1281c271d3d1ee148cdf253760 SHA512 d43c3c90d337ecddc6cba55b07441331f8243fbe3581a92bbc83bf71be6b5a700d38419b479495cdf5076bce42b822393a48a14517e5677fffc210d360fb3347 WHIRLPOOL 96204eaace0e2bfd6cbb12ac8cede044bba6b6662e06cb34c24a509e59386608cdec39ee096e12165eb2df5b0c8f929b83210cdcd48284e40e09b26af73eda6d
-MISC ChangeLog 50081 SHA256 7178b864cef59f83468639f89e208a516d374b495125e62fdf96167356af8ed2 SHA512 f77fe1fa10d6332e1774da70f8d1c027711aaef6b60ea2be24635053ece729bf73c224f73bd24b49fd9490d06d11f1bca40aa739081ea5192f1d9e82890a20d0 WHIRLPOOL 36453461b089e661fdea291814db21f5b2144dfec19146d4623d16cc6857ee40ae7707aff65474d0e9443e994c9191e06cf4c656fca87112f5a104daf995e035
+EBUILD cyrus-sasl-2.1.26-r9.ebuild 7744 SHA256 72f0ffaf4b3c288b5159f62b66d28985941218b784d9820cc220b6ca1dd93933 SHA512 b1239536fc6e8fcb87e013d4dd1570f5c7f9023c8880094232d2e4b51b785aca6df55b0dccf3e8ef7b573e8659d386d47b89bbb2e4b6ff08ee3ea81b00a41b03 WHIRLPOOL 49e0a7c91eb06bd6a772c0ab375dbd1b1c6eec82aef5e7811219775acb6cd56f8011a0c27bb183708415fcf9b32aafb7b77b64227e45ed049f4a0077084acd92
+MISC ChangeLog 50313 SHA256 fcbb19dc564afb4e95e539fa8d03b5ae7c800093da8b8ce13d807ea396abe800 SHA512 52086c00d75a082e7ec247a7fecf65406c20b1f5ca01f8924f132efb63e6caed0c2402b1119909aa865723c8c430700058987b2d4f4b313930ecd28c42f26548 WHIRLPOOL 0ff3add6240b0121292cdc1da843dd3325432da4faacc46916e780f1a7ee9dbf4de52ae0a4ea78ea7cba06643fd037242d0c824192e2a1777e58d41a1365467e
 MISC metadata.xml 727 SHA256 6b9f368b484972e833084dba4aedf70c09767b816b57cb43a7c0945b8b11b497 SHA512 8b6c6556dd9adff73a6f0bc40fd8064cae8ce8b45734ab0a30b7611be9f226144403fa0dbcf6d3965bd03e12b7c36848c91937bd8133a5581bd296d741a013c7 WHIRLPOOL 5e24419ac72d0ef8591de06c7ab4d95435234e8d894ee31b2015e6465d15a777919c714aae4e3293e194ccfcb505cf0d77f2565959d5e9ecf41c1cbb7b9ff1c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT9MK2AAoJEHfx8XVYajsfK/wP/jHbBreS8HGkXTJOyqp8xYw6
-yUlpH5hYmK9arnvP4Yh427q569nIITpG4f3fwtwx4EXmO6nPlNPxn1IqyM7aDGqC
-RiuA9QG8e71hjqzc4/0TAi8V0UVoX6y0g/wVEe7EgHlk1eRIfc+V/hOX3odHSz+z
-11sf0V1VRUOkOh9lOAcgbpmh7U6CCDBvCh4SnTcWsqfK/W+Mtgry4MTIHTlqKrWT
-Ap7Kf4vUSSOEmTrpEnYrgsBSmt33tkrfju8aftRAugtJorkznSxj4FewAtPtBr+K
-9B4YAhO1VLXp9zq7081hJmD+0bv9LYFYDWoYzVHm0prM6IFTONV5fqHnwb6S45Nc
-YH5vcpRLwk5jssWDa8et+SlBO66zSV5DUdXZm+UHtzgnovXGgH6ApYcBhm77ixyG
-QodJq7tHVQmUP6W6WGOGyo9aUthuMnpjLxl6eiu58ttBZKBHf38ZyZIDpZXRRZu+
-Ff2BtHIAXS6OifNTko6u1ln+ZJK/Ddvn5eOmHQzuv/C8KY8wiMqfACGBFz4ABm75
-nsJLUjbia0HQf/cTORbo4M8ldXEmu9Ohhaci+REACu5ZjMIomDglVSfZDRPOjatY
-/SnNbxaXUtn9kg/e4a18wORKRIH5V7TlUwnTjmnxrAVKQ6hT/44yKwBm8yQg2ZV8
-ZhQ79C/HvpD76Hk7tk7L
-=IsGp
+iQIcBAEBCAAGBQJT9ysWAAoJEHfx8XVYajsf9j8QALUG44Be6EaMoz543fSMRi1O
+qsVPbSA8CmxUDy6H9jBTF7sI1m7MsHA0nX4Yw71Gv6h7I9BdAkqOqBstdIGa3wGp
+rQX4c2KrWnKFvn+nYWIJH9NAmTPd4HlkCK1ICgBRRKeWFgKNVYBhJXpn06c4rsBY
+t/A0AODQuec2E1PNycG8Lq/fg5clDGZE1dVFNJK5IPxNPsUmP1q8WZy5zEZUP8rA
+p2WPPLcNoWPQQanNFdBnWZtd2kvfGJFWJBTAr/jrNtoW0RvJ7Qjn4lkG4KuBx5UE
+OkkQqno0EaxOl+oiwH2vIYMaQBS8RK1AI33Cb0S4ac5/+0B1zWFwh9M8Fo8pvknz
+CBEzsbt42eKI+71c13B5+MQynQ/mNTxWhAIAz2bkjQa6f1F8ryjqb2j+R2lwoRJP
+0z9tPfxU9nVTE+kFXG8oqfOpB35PkhYbAMr/SWIb/00xGmKoD0K6uQFhHm6F8iSO
+VZqd6wSWbI/2cEm2PXWGyCS+BNAuGkUJvWqXkdo8o3w3JtUzbpSlOnqD1R3jhAMR
+67BHi+n62YrXc1mZoKdNsnpeorNdisZm41Bm8wyvWeQpXD8j3e0PVXU957FYhL3A
+XjkgDUUF6zcrpxA9r5y6ScPXp6hwORG2F5AgEo4G8RZDgJmlXCNFnCdE5g54me/o
+p0sicA5LWRkSdvZxaiiQ
+=FMbx
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
new file mode 100644
index 000000000000..e5f2275314f0
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild,v 1.1 2014/08/22 11:35:36 eras Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
+
+SASLAUTHD_CONF_VER="2.1.26"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
+HOMEPAGE="http://cyrusimap.web.cmu.edu/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
+srp ssl static-libs urandom"
+
+DEPEND="net-mail/mailbase
+	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
+	berkdb? ( >=sys-libs/db-4.8.30-r1[${MULTILIB_USEDEP}] )
+	gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	mysql? ( virtual/mysql )
+	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
+	ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/sasl/md5global.h
+)
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
+	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
+	epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
+	epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
+	epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
+	epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
+	epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
+	epatch "${FILESDIR}"/${PN}-2.1.26-fix_dovecot_authentication.patch
+
+	# Get rid of the -R switch (runpath_switch for Sun)
+	# >=gcc-4.6 errors out with unknown option
+	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
+		configure.in || die
+
+	# Use plugindir for sasldir
+	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+	# #486740 #468556
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
+		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
+		configure.in || die
+	sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
+		saslauthd/configure.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Java support.
+	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+	local myconf=()
+
+	# Add authdaemond support (bug #56523).
+	if use authdaemond ; then
+		myconf+=( --with-authdaemond=/var/lib/courier/authdaemon/socket )
+	fi
+
+	# Fix for bug #59634.
+	if ! use ssl ; then
+		myconf+=( --without-des )
+	fi
+
+	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
+		myconf+=( --enable-sql )
+	else
+		myconf+=( --disable-sql )
+	fi
+
+	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
+	if use gdbm ; then
+		einfo "Building with GNU DB as database backend for your SASLdb"
+		myconf+=( --with-dblib=gdbm )
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB as database backend for your SASLdb"
+		myconf+=(
+			--with-dblib=berkeley
+			--with-bdb-incdir="$(db_includedir)"
+		)
+	else
+		einfo "Building without SASLdb support"
+		myconf+=( --with-dblib=none )
+	fi
+
+	# Use /dev/urandom instead of /dev/random (bug #46038).
+	if use urandom ; then
+		myconf+=( --with-devrandom=/dev/urandom )
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-login \
+		--enable-ntlm \
+		--enable-auth-sasldb \
+		--disable-cmulocal \
+		--disable-krb4 \
+		--enable-otp \
+		--without-sqlite \
+		--with-saslauthd=/run/saslauthd \
+		--with-pwcheck=/run/saslauthd \
+		--with-configdir=/etc/sasl2 \
+		--with-plugindir=/usr/$(get_libdir)/sasl2 \
+		--with-dbpath=/etc/sasl2/sasldb2 \
+		$(use_with ssl openssl) \
+		$(use_with pam) \
+		$(use_with openldap ldap) \
+		$(use_enable ldapdb) \
+		$(multilib_native_use_enable sample) \
+		$(use_enable kerberos gssapi) \
+		$(multilib_native_use_enable java) \
+		$(multilib_native_use_with java javahome ${JAVA_HOME}) \
+		$(multilib_native_use_with mysql mysql /usr) \
+		$(multilib_native_use_with postgres pgsql) \
+		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
+		$(use_enable srp) \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	# Default location for java classes breaks OpenOffice (bug #60769).
+	# Thanks to axxo@gentoo.org for the solution.
+	if multilib_is_native_abi && use java ; then
+		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		if use sample ; then
+			docinto sample
+			dodoc "${S}"/sample/*.c
+			exeinto /usr/share/doc/${P}/sample
+			doexe sample/client sample/server
+		fi
+
+		# Default location for java classes breaks OpenOffice (bug #60769).
+		if use java ; then
+			java-pkg_dojar ${PN}.jar
+			java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
+			# hackish, don't wanna dig through makefile
+			rm -Rf "${D}/usr/$(get_libdir)/java"
+			docinto "java"
+			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
+			dodir "/usr/share/doc/${PF}/java/Test"
+			insinto "/usr/share/doc/${PF}/java/Test"
+			doins "${S}"/java/Test/*.java
+		fi
+
+		dosbin saslauthd/testsaslauthd
+	fi
+}
+
+multilib_src_install_all() {
+	keepdir /etc/sasl2
+
+	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
+	newdoc pwcheck/README README.pwcheck
+	dohtml doc/*.html
+
+	docinto "saslauthd"
+	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
+
+	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+
+	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
+	systemd_dounit "${FILESDIR}/pwcheck.service"
+
+	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
+	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
+	systemd_dounit "${FILESDIR}/saslauthd.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst () {
+	# Generate an empty sasldb2 with correct permissions.
+	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
+		einfo "Generating an empty sasldb2 with correct permissions ..."
+		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
+			|| die "Failed to generate sasldb2"
+		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
+			|| die "Failed to delete temp user"
+		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
+		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
+	fi
+
+	if use authdaemond ; then
+		elog "You need to add a user running a service using Courier's"
+		elog "authdaemon to the 'mail' group. For example, do:"
+		elog "	gpasswd -a postfix mail"
+		elog "to add the 'postfix' user to the 'mail' group."
+	fi
+
+	elog "pwcheck and saslauthd home directories have moved to:"
+	elog "  /run/saslauthd, using tmpfiles.d"
+}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch
index 3bfcfbd2d60b..d8b4b6efc3f8 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch
@@ -12,7 +12,7 @@
      int	s=-1;				/* socket to remote auth host   */
      struct addrinfo *r;			/* remote socket address info   */
      struct iovec iov[5];		/* for sending LOGIN command    */
-+    struct iovec iov2[1];               /* for sending LOGOUT command   */
++    struct iovec iov2[2];               /* for sending LOGOUT command   */
      char *qlogin;			/* pointer to "quoted" login    */
      char *qpass;			/* pointer to "quoted" password */
      char *c;				/* scratch pointer              */
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.300.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.300.0-r1.ebuild
similarity index 90%
rename from dev-perl/Archive-Zip/Archive-Zip-1.300.0.ebuild
rename to dev-perl/Archive-Zip/Archive-Zip-1.300.0-r1.ebuild
index 5695836e4f4f..31c3a30ba3df 100644
--- a/dev-perl/Archive-Zip/Archive-Zip-1.300.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.300.0-r1.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-perl/Archive-Zip/Archive-Zip-1.300.0.ebuild,v 1.6 2014/02/01 23:44:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Archive-Zip/Archive-Zip-1.300.0-r1.ebuild,v 1.1 2014/08/22 14:01:01 axs Exp $
 
-EAPI=4
+EAPI=5
 
 MODULE_AUTHOR=ADAMK
 MODULE_VERSION=1.30
diff --git a/dev-perl/Archive-Zip/ChangeLog b/dev-perl/Archive-Zip/ChangeLog
index 3f87032a2100..36fa6c14f212 100644
--- a/dev-perl/Archive-Zip/ChangeLog
+++ b/dev-perl/Archive-Zip/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-perl/Archive-Zip
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Archive-Zip/ChangeLog,v 1.88 2014/02/19 10:37:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Archive-Zip/ChangeLog,v 1.89 2014/08/22 14:01:01 axs Exp $
+
+*Archive-Zip-1.300.0-r1 (22 Aug 2014)
+
+  22 Aug 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +Archive-Zip-1.300.0-r1.ebuild, -Archive-Zip-1.300.0.ebuild:
+  bumped 1.300.0 EAPI to 5; committed directly to stable as no other changes
+  present and revbump helps stable systems to keep from dieing on perl-5.18
+  upgrade
 
 *Archive-Zip-1.370.0 (19 Feb 2014)
 
diff --git a/dev-perl/Archive-Zip/Manifest b/dev-perl/Archive-Zip/Manifest
index ae29ca7a7806..f579f61489b7 100644
--- a/dev-perl/Archive-Zip/Manifest
+++ b/dev-perl/Archive-Zip/Manifest
@@ -3,18 +3,14 @@ Hash: SHA256
 
 DIST Archive-Zip-1.30.tar.gz 197179 SHA256 f8b472ff77b7238e423bcb351968accc562f9d20700fbf2d8ed2a65fa0fa6318 SHA512 ae717225c54013eb5759982fff5491a8a590a4666b3a93895270c89f361fe289094a35d0caf57320d36fa8f3f5e0c778045a099d0a024f2606c700f0aff3b4e7 WHIRLPOOL 9511cc57941aa8d5367f5041130c27025e90055fa65be6b3ad361d99a07adc9eb9ca9edec00b97fa86478d6b19ab6e604259eab218f9c7e5a0d863771f2a29b8
 DIST Archive-Zip-1.37.tar.gz 184345 SHA256 ba789436dc82db02a7f3d2e9d120d0221edc83d8c7ec72519648ae64bbc4ce05 SHA512 416dc16286edef085a9fd11b3f98c3abf6345a70552cf4f0d4e0da364b39d400cb259a09f1b33b82ff4aa6494a88e85e59afd80a94ae8446c329eb8a3af63ef1 WHIRLPOOL 07103e2d5a2f23e911b9bc9b3e784e21645864f2e6b08042c577deeaf5b27799c3df0fc8c2a89dfc805840ac0349e88053b173e8db51aefacb2dc7e225d5a8d1
-EBUILD Archive-Zip-1.300.0.ebuild 716 SHA256 de4ccdcf0673fc1de7674a57300abdd7aac01f2dec1ae7781e6de5b75c33079f SHA512 720db00e388ef4e9c39e5666d2b5c7d4bf7e639eceb3f17d038fc973178d700dc1b2c95b8fd34c5d6368f205ed2653366360c5f797b8e970ad8a46e5db6d3c25 WHIRLPOOL a7c396a756b178bdd0da66b7613dd9501b58e6982442b80f3c67efb88fe4c5cbcd7f1e0686ddd85cb217b9fbce51489f8b1ebc0871b783a204f856ab7fbab1e7
+EBUILD Archive-Zip-1.300.0-r1.ebuild 716 SHA256 8c3dc43cda677b7d3b6cb8ce66c5000f72596970a8733e0a999576ac83c1f5df SHA512 940110b64ee4b23385fad4923fb879dc7ec79538ae643888dda67797b871154f872bba6a7782c426f9ce53922186e8bf14c4499bdd93842a684c36c476d7e796 WHIRLPOOL fe33bb96c79f48c23f2a7b20292343ab9eafa02c718bb2f5e42bc86812d726038a190523ca06f8ba9fa8351c0fb40a8395b928faaf9f39fc143d9c311f03a97a
 EBUILD Archive-Zip-1.370.0.ebuild 732 SHA256 13d635bb8752bdd1d14fd6b39cc0ff8322ba7071eadcaab64ee469823e810458 SHA512 41685e3a665cde4ac32ca12b9270bf432c47a0bb36cf1f4368d8e86dfd5cd9510baa3368bc8667344a97400a7419f8a3ff8fc43cc79540acb45dd09e8f18e11b WHIRLPOOL fc33844e2f22abc506628c61d0ba3c3b44742dd85ca0f8fe4f25884d4a198aab23cf2667bb483d178b2d38c4ff25a519ab4a1ce2d8aaa3edd474ed3ef524ac56
-MISC ChangeLog 9611 SHA256 cd2435a611a24e4c0fb129bc852970cc950a5ad267b28a76d03c367a894a0d1d SHA512 5bb91b731189622d1c127c31fc1f9ff20eb39bf1bdcd3fc450c60c421cd7e68492efbdc0ea72a16868b1f8e5bc148c53a66fdcc5dd4ac561d89a47ba1a64a399 WHIRLPOOL 64703a9919a5bcfb10bd96330b5af41ff9e0ec5a0fc6b830a6c2ddfb28613d564f4e51e270ee28eb82e1d056babf8e561b3f1c7920bd3f433bf20597dc6e7e14
+MISC ChangeLog 9928 SHA256 708de9f54c5ab69dbca2e67b6e56e002e84123a2763149d163c471dd4f906c11 SHA512 5232347756b6bf672d9b06f14c195b34826816d94bb67489c59651e61754431bc1809abaee63358b8536ea8258b44a0425a52fd534639c4f3ac627455b635289 WHIRLPOOL ff605c05be9ee9d62e8fad2dad90b237216968cc0ee1fc80f4bccca37d149330f15a86ff1cd772a902ed867826a74a84ae9c837d10a87f31978be8455f9ea436
 MISC metadata.xml 1089 SHA256 a15b34864bf980065fa956fd00ad91a4edad62851b04fe3a6938631feba0cee5 SHA512 6ea517cb5bb6ee8119a2f585b9b2e74228db7ea9ce5ce6e06057e8b2c69ec46020fe7d8df9932fb5006c673a1af12319f0656b516d469bf54b5195ba221fd683 WHIRLPOOL f318f4e3c0c8a3e261d2a1ce63d00b9c319e3fcf400d2f6bf23f3c47d3db6a12c96fedda5db1b055832f2802e1164932246123ba6f205726e51bfb06aec60235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTBIlYAAoJEEqz6FtPBkyj2Z4H/iR0qhkcVMCnPf6IV39dxn4a
-jgcH3Y949bfRaA2PHSk/4Od1VnSqYUOCiJZOq3jXta1IypqUiQhdpRsAN0AiMDXL
-iSj9Hht3iAkydQRkwSiHdfV/ggevFJbkNZzYWerV+lpR1xbfwHDgmf27BpQUfKs+
-yLqOAV6/MFFaAwNxn8VVfRSM4yWjjoDnjcMh4myV6+pR4Li/k9orQgUrdm6jH6wj
-yzQwKwp7CQL63MS+g/aXhHpX5N4ykwNEUFXYsVilolxKWgvg/GNE+5RhwrI7X3v6
-9EaamErcyRoxwzDl9sym/Q8EwDtpkmKHrTuoEhuXJqxhCGqG3F+WHvXrUFMTIl8=
-=g0Se
+iF4EAREIAAYFAlP3TSIACgkQ2ugaI38ACPCpVwEAsTQ4ubcqjmQW/fTlOQLziFQb
+v/rEjrZGChj4qAQZxLIA/2brrqFuWaYMHZUTh9Tvse9mreABKBQbuc+Q5Wzqg8XV
+=J4rV
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/Readonly/Manifest b/dev-perl/Readonly/Manifest
index a62e5557cb58..acc9e45eaa8b 100644
--- a/dev-perl/Readonly/Manifest
+++ b/dev-perl/Readonly/Manifest
@@ -1,4 +1,4 @@
 DIST Readonly-1.03.tar.gz 13677 SHA256 53c46815dea724e29ceabb5d39471b0e6f2ebbb3cf1fe2a23d881a2855f713ea SHA512 0655a37828f70058f136218d11f9c12c91eb9f365b4e9c7c2c6e22c5ec469a1bbd8196c40c17db09a26a3260e638148570c3859541d840348b6d9ddf3890e5c1 WHIRLPOOL e512f91f438e2622cf8495d11b556a185a96a6fee51a30d04fe1ceaf08397c4f167ac7f51525ee8c796251ee2b7cc9a0f9e59a7ccc9ada4d06f37a197f7f9875
 EBUILD Readonly-1.30.0-r1.ebuild 523 SHA256 dd7ec3e18ad4f6cd11a489c21bed147ed3bf33ec1701e9c64032f8c9b22ea825 SHA512 1e1594a47116e5d670fc7098a17321212dd8dd33019deca128d635d34086ebf52f8814fdfa884ba50ac5e40f5b0743664fc3dd7f123b9eaf9ae9fdae90faf38a WHIRLPOOL a93ee971926cc050b391d224b1f85c7ebef5cd4ae303084e29769f2a61686d50dd6d5f66f563a66af2cd05fc8622163e920814777eb801b76b30078898aef1c2
-MISC ChangeLog 2737 SHA256 cc068aa020d64cad626a48f4d577ca35b2db3c0e816a01da823427395fb5684e SHA512 c878ff8204772832eea622723d15f659d0f67999a075e8ca5c4bef6e1c3dc131f5e199b457520a87c4a22356fbc4da1262069032f0b7f9c34ad3964e93c26508 WHIRLPOOL d2249c15dd86fb5f3556d341aa3789f943046b26c5f17536e9c157b7bde9262f0efcd60c134e281354268d81a38e00930fba4af1b052480149774d3b7dacd095
+MISC ChangeLog 2737 SHA256 0e32184dc6275519f5137315e9284a4276ad0abf8edcb3ac58c91d034eb15bef SHA512 5b9fa9e1fc6f83974aa26ca4dc26569883e873400199eff680f82bb27402f5b7da7ebfcabe70cd062b5e44087bbc017570c3a4f09004b5885bd80fa3f5255f1a WHIRLPOOL ba29975fcc35378927444dfb6a3204d35d2308b308b5539e76b54623e7673e868b9f32af532d5b10a1d83c1e7f14fd7e1f9203858bbb89c9250df2aa13a6804f
 MISC metadata.xml 475 SHA256 e0c3bebc8151fc39cc561c92c362775129d37506b2dd67257ce7c3fc5a5a281c SHA512 7e55a0dfdeac325df81016f574df53f981b5305b95f37099c17820d654799cb98756ec05880bd656007779cd7b332dc349198e5654a9999f0c44d50826b387bd WHIRLPOOL 80c0dbd9eb6bcdb0dd43a7d83d1d689e60eb1fccbe5323eff354efb336969c0d4a3a75a93232e3af8fbf40dc62aa3847c09351b40322b9666957be66761b7abf
diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index da50f64fa579..13560a76b2fd 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.237 2014/08/14 06:23:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.238 2014/08/22 11:09:44 idella4 Exp $
+
+*numpy-1.8.2 (22 Aug 2014)
+
+  22 Aug 2014; Ian Delaney <idella4@gentoo.org> +numpy-1.8.2.ebuild,
+  numpy-1.8.1.ebuild:
+  bump
 
   14 Aug 2014; Justin Lecher <jlec@gentoo.org> numpy-1.8.1.ebuild:
   Fix doc installation patrh, #519236; thanks ero-sennin for the patch
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index c9fbcae21091..2b4caa897b45 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX numpy-1.8.0-f2py-insecure-temporary.patch 7232 SHA256 3e10992bcb67bedb61d07c6679e66b02de4e0cde5cb7c60034a5aafdaab9f337 SHA512 509e75d3c0a0c0afcbd57545078fb3cbc3ec611429560b9f70529a9dfb36ec13a942e3cf8ae39463be36fc5bcd6aee68445559e03801cc11ccca3a69ccf556f0 WHIRLPOOL 3653cf024f8f2c67704e3ca2501553437a41103bf2b87a1c0f43e1bd4a8364ae90a6322fa59971b26dd488a62de4fccad1109ea5059fd8ac1226c7319dfa9011
 AUX numpy-1.8.0-no-hardcode-blas.patch 1153 SHA256 ad79d788189db97178b73f019a47c502bb9297ae7a1b248da878f3f91ab8af3b SHA512 baa29a0c981ede608d890e776026961fb71156eb7804f702623bce775e3b6ce3bb28ced252d9c6fe991429b690b3eef8468d703f79247820527648d6484d23f3 WHIRLPOOL 38db4618b8fe505b711270b9050c56c1541c2fc3094b02ef6a45e776d56f54fd82b79ddc1b65721e0ac08949c6b9354da8c6ae0437b77e3b474ca941d44de9bb
 DIST numpy-1.8.0.tar.gz 3779617 SHA256 2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253 SHA512 ec3d002ed786335e8748983261c96f88a9f1520fc345ad5b810dc02a5e126e15fe5afb02bed1f4b43d580a1da39583d86b84f57dc456b0702653e34e5357c857 WHIRLPOOL 8796d90795ddec62e6d72be433ea00917a63ef39cf3fe81e094f653e1863b69ecdce812995877f78e4324434141b03e2ceb3f872ed4e023b19c6bd9bcc294ac2
 DIST numpy-1.8.1.tar.gz 3794076 SHA256 3d722fc3ac922a34c50183683e828052cd9bb7e9134a95098441297d7ea1c7a9 SHA512 39ef9e13f8681a2c2ba3d74ab96fd28c5669e653308fd1549f262921814fa7c276ce6d9fb65ef135006584c608bdf3db198d43f66c9286fc7b3c79803dbc1f57 WHIRLPOOL 10615c0c70c153156034447e9c3f2b70b0259173a44af3b5cc641dd31c0af71ef1053a9cc7938deff5edb899ae2666b2b3109491d7394f03d1a81cb19722d398
+DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311
 DIST numpy-html-1.8.0.zip 9779825 SHA256 39e853c1aaa711976333782f465f2579ca66e6698393f6ba79f5cc78317b1203 SHA512 33333c48a3f4d27ccddf6696dce4e346f8729d1f398128b3bfebb8a9d53ded7bb62b63a766319f6e49ba7cf8ca4e1ce252996acd263976ad2990bf9650d71043 WHIRLPOOL 7eea0ad3418c55d6104a4a115fcdcd5eeb291b9fc1237724e10dcbbf95bc7a4a23b519c64976ac405fb4c5abbaae87a6c747f9ad695d08b6326b459ba1fb8a15
 DIST numpy-html-1.8.1.zip 9703711 SHA256 f7fc3af4dba7b40deabd1828a86ea2e2eb5b9fa17c7ebddd73ee4cb8625105b1 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071 WHIRLPOOL e502b1416bad4b189773ba98035dfbeed0dc251d8f9b76e336450f14e8425caf92d55d2b1c2cc5ef9eb2d33eb2bf7cd55e720c1b265e45539b195fea1d7f046c
 DIST numpy-ref-1.8.0.pdf 5324229 SHA256 49ecb1d768eb48598439cc63058f830ca3522fe1cfeba1a321086e9820ae8911 SHA512 d89314215c4adefa487b3e46b2babeda7739ee193fef821846d4df0089fabf2167b47dd2990b6bd423432f75238547548924622c6f3b9a90a36d578450001eb2 WHIRLPOOL 3bb12c719cbe4734014774f1bfc3f98af544ee2c407adb2e3ee988e2b1035ad0ef711eaa68168656be7b034df2db76c8789daa2940a048b4a6cb3af0bb0eca68
@@ -12,25 +13,14 @@ DIST numpy-ref-1.8.1.pdf 5348248 SHA256 973851e66d0d5ab095f444f8aeb966fefe2dd544
 DIST numpy-user-1.8.0.pdf 408447 SHA256 a8c30360f9e46c63cfdf48fa594971d94d68ce59ece08c13d4acde8b14032cfe SHA512 10293dba45377c6f1024125a49810b01e388eb33a3e8ed75b8ec39c2b93e53878cbe62e6b7adbf1e957dc47ef253e20304afa7d86d798fb5198887cbe618131f WHIRLPOOL 70cc5a5e97a919bb027f92ac87127fb1bc08d06e2a131c4b413837e76d8feab9b65d7dc9e95b6e797d057efb6abf0d2b3e7562ee3cd140b1ff1418bad5475335
 DIST numpy-user-1.8.1.pdf 408305 SHA256 be827f2d92ef86c3af7f59c623017e7bc23ee95c64f88e8c9871f3ad1f99b262 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c WHIRLPOOL bf4105093b208b35b1914e842821b8d289b46eb28f1fda110643f5970bbfafe801e9d148c5f535b43eba9a23e09d333e3aecd9a55b33e64827883d253477d19a
 EBUILD numpy-1.8.0-r1.ebuild 4065 SHA256 4eaa79959b08194a35ad004af8a1b9d7f80283e785b2343f28417fe4b8f72a35 SHA512 a139d97ba12d88d6620d0f6c675f3ee3672ce8ad6ab32152c0d4b3c877549e1646088b5084bab9da8d6cc55e3b33acf91d7ca8240b8c51c239a397e854e43b4a WHIRLPOOL 4b0acb4066e81e5c772e87ac70389e5ac1b4b7a2a814602536f3c68909204727c93bd49b1dc4795525694de7154f44cccf72cc37e054fdea722e851be3e4b8e7
-EBUILD numpy-1.8.1.ebuild 3984 SHA256 daca2e40e1699a299d74b6b5ef350e1d899bfdaa4cb3eeaca92a516d1605fea9 SHA512 19e9d62fb7c03678c95eddbf19fda73c1459cb89a7d45a54ad60a28d3efdc0868fd62ac60e574232a5c08e30857007716434bd61dbd877941c2257c5ded32c91 WHIRLPOOL a727952b37e76696005ce606023b32188d68dfd68e47f83e3b106363432ec1ddf223076ad4b04895e6bdd6e6331d24cd7138e155258bd664ebc9abea3b9020bd
-MISC ChangeLog 33090 SHA256 9ecf8550084b32c3545d48bab8efa9f0b40aa07803e159b364f01db2e5559d67 SHA512 ee3989ab5af46ebae88f9061cc359a9b0f38bf7cd07b111e788f660f29b3032445eb8a2a783be06dd5e7dbaee17891decd861fb001cf767978b2376e8ac5d37b WHIRLPOOL c7e81af0748a77e610eafa6ba5d51899e41db03575ac02c29d726d0eedba1ae78e9c27276abf7ec8e51ecc5b941683648acebc5d5d80534ec5e81681c42c27e8
+EBUILD numpy-1.8.1.ebuild 3992 SHA256 0f5981a2faa150e3060c16a114b35b4c26add145eea60d8bff39c98d846232ec SHA512 1c2fe0866f856749a5ad7c599d549122cc1b258ff9c35546a17c5f3aa9c25080b91723d05f35e35b78ddb45ac8917b6ffe6f943eaec3ee77270d96799304c05e WHIRLPOOL 32bbe0c8081ef96a0e19760cd48bcf3cb575f26b660dad1de45ed18bffe347982ba96dce76f6a8ff5798e425b98944adf21330832bab58855cf7f247e2c115d5
+EBUILD numpy-1.8.2.ebuild 4050 SHA256 b3c21c90c4af916c8bdf0bc1111f080b9d36eee99367e14e30820f8a7f38df51 SHA512 e6adfd541152c4b4353d30191e808d2d7e62d2945d6a96bf8fb4b65bb482c883540c362ff5160728db96d96f807c407c1c926bb3d4e2e7d32849c4acffc8309a WHIRLPOOL 2b84cf3f201171dd77c0ba399f6db5a85036abc0e0328056d21ecf615a24a3c947cf6e2690b31c987dd1198bac8eb5967ad20a9fe0c49299e949f4333a75d7a2
+MISC ChangeLog 33220 SHA256 8325d8576e2a047eaafe7514ed640bf152a131ebae7ecfde3524a0ba64699324 SHA512 49e5c5c1a2a74a96c952317a53574de11e3904425e638c5c977c6e0d58f054db5db16a4b028f160b8d396aa015a00324f2081ea211df627c80efb9d2d075eeb6 WHIRLPOOL f9b006d31bd74ab2c8b839eab0cb67e0c6e98272aaf925645fb0b3e51987783a096491924202d2004b1cc13a2c0f86654fe8200af92f436fe17f1c748ce766c5
 MISC metadata.xml 690 SHA256 9c315188497956a9b1e2a1373f7830f702cf9b588aabc33a3f5547ab75b20a84 SHA512 1adcf955fdc7f06b56a69c6345b79a4fb0ca0df17cfdcd1f3604a234389534f8f00b88ebddb3e47a39d563d7374d40349c3e4050799a31405446a1629f8c7698 WHIRLPOOL e2b34ab0b391c99a279dd11de292aafd9225f9743ec3bafafd980edb7522e772cde461705d5394569aa8dd73e72a210560eb50a23b2334ab5c12ec064099abd1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJT7FXvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirbS8P/2Z3/TIB1RqNBVnaOjyyJGRJ
-sIJUvSJdd/L43qhFWhk1EJS0li02uOhKqmsBaFboVBTfas5BVyDumhiGj0R9HFo/
-MlNIXNRLqixpE7o2TlOtSp5A8A4xVbK7ObZ/ZI4Nf2htBQkHdUcpp88yDU/lpqvS
-qFHK7VnfswRrzTyHzP18jl9D5gnZQacTo78VESjWyxpzcmA4UVP3oTHJIv7mFEJh
-ExD6geS3tdNjuS4uSU7LZM4zgSpa+5OJ5EZXq1aFQ5hgSNALznqw8X4KAzchJB5v
-r/6pCgf2fLLZTpyQNCMZvbGiKE13Rzz4OzMadnimVv8RLTbcd9fgE9vC3LgMsKtZ
-FrMS9sXgNRNbDxZtNELILYqjQt26XOyoRlNYSPTsHTin4t/5oiT+fnxY29nK8bEM
-N9jw2HKTpfGUWflV5pJKLzXsNz+dCM1ZKr0bCQpMhWNxAHbp/YXi5EwGRKsKE3Su
-h6Bmj0Gdeks95Lw04eZ3qtN1Dfwpn0jr4xsvad+lXuCwNYcBrzzvK2KCV7N/YI+J
-jGPx5pkpTVxKC3e9XDWDKrwZHtkNdJhfR518DVouYkTzmWvkgJfKv66npxp2dcNM
-5Bg0WPscHV6wDy8Flsz0OH5QPf2aTnyIzqf0Zx03e94VjYerZed6qBJwW1S5gxbj
-zfgVPZfA5T4XtjDgoEkS
-=0HJT
+iEYEAREIAAYFAlP3It0ACgkQso7CE7gHKw0DHACbBgexYZuZAhxEhRgtA/OPKhAK
+1hcAoKAtmFqOIRqTl95HQ0vMWxc078c8
+=F9e8
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.8.1.ebuild b/dev-python/numpy/numpy-1.8.1.ebuild
index 9759b430be2e..1d9a0274aad3 100644
--- a/dev-python/numpy/numpy-1.8.1.ebuild
+++ b/dev-python/numpy/numpy-1.8.1.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-python/numpy/numpy-1.8.1.ebuild,v 1.2 2014/08/14 06:23:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.1.ebuild,v 1.3 2014/08/22 11:09:44 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy )
 
 FORTRAN_NEEDED=lapack
 
diff --git a/dev-python/numpy/numpy-1.8.2.ebuild b/dev-python/numpy/numpy-1.8.2.ebuild
new file mode 100644
index 000000000000..b1d7aec2aa44
--- /dev/null
+++ b/dev-python/numpy/numpy-1.8.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.2.ebuild,v 1.1 2014/08/22 11:09:44 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
+
+DOC_PV="1.8.1"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://numpy.scipy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${P/2/1}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${P/2/1}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${P2/1}/${PN}-user-${DOC_PV}.pdf
+	)"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	lapack? ( virtual/pkgconfig )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.0-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		# make sure _dotblas.so gets built
+		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+		cat >> site.cfg <<-EOF
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/*
+		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+	fi
+
+	docinto f2py
+	dodoc numpy/f2py/docs/*.txt
+	doman numpy/f2py/f2py.1
+}
diff --git a/dev-python/patsy/ChangeLog b/dev-python/patsy/ChangeLog
index c8b6b3e45e4b..67b95d89e88b 100644
--- a/dev-python/patsy/ChangeLog
+++ b/dev-python/patsy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/patsy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/patsy/ChangeLog,v 1.3 2014/02/03 00:38:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/patsy/ChangeLog,v 1.4 2014/08/22 07:13:42 jlec Exp $
+
+*patsy-0.3.0 (22 Aug 2014)
+
+  22 Aug 2014; Justin Lecher <jlec@gentoo.org> patsy-0.2.0.ebuild,
+  +patsy-0.3.0.ebuild, metadata.xml:
+  Version Bump
 
 *patsy-0.2.1 (03 Feb 2014)
 
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index b53c0e5b5c23..9708eb95092b 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST patsy-0.2.0.tar.gz 315486 SHA256 1d399e504dc7c9e5f35460698dd4ebf098aa215e861ea4f5ded29e98e73740c3 SHA512 4e1028dcab58e2fc938c4f8dec0aeb148fbf7d2430855d8caa844bc19088b66a8ab9b83edc3f3066df41e751f1e0ff6d24478109be562e420da6c84e3f76763f WHIRLPOOL 2da9956373cc9bd2f13d277bcca37467ab8f5b37223f9c6bf6d59b6c69e7c54bdcc70433c990ea4a02aa424c497be08031966963721194af308cda1bb36edb13
 DIST patsy-0.2.1.tar.gz 316115 SHA256 31374ce25275813d8f1c48bdda40bba06f7a16cce7dcdfad73f43a555393d065 SHA512 b7cbd9b224081b2496292b23c134abfdd9decedfda433bc7c289b899003c527184e0ba0f729eca1f3bceceac0c43090d9b611b8b1f593df5ce2a01129fabf9f6 WHIRLPOOL 91b8bc896146e48c272429482d3294a35cbc0a46662e66b913811491b2d89005371dc6eb09f38a4a043e507fba3b359dcf3a1fc61e9bf88c462c8b9ebeb995d9
-EBUILD patsy-0.2.0.ebuild 1051 SHA256 673a6d38a231ca1a09deb9049eee891f0b9b0540e9037541ae5fdb8ec0059344 SHA512 c84850ce5c8d1f90ce7e3a7724c5a7420600f229e7f2e056890e21099aca8fef8cb41198ece9bd0669d620259731af88ea5c96b09e3fbe9106bf451baabc4ad0 WHIRLPOOL b5b8325ddf51d0f79e510049316eda4f5ea7b6a19ef50797abb07b157a3705095eebd098f31eb42bfe4a9dcc53195a83deaa15fbb7c0bcbf12f7b22835d2922d
+DIST patsy-0.3.0.zip 414947 SHA256 a55dd4ca09af4b9608b81f30322beb450510964c022708ab50e83a065ccf15f0 SHA512 e716588372ca5c2cb8923b5a04c11be4911cb44e7af2c82ebf92aba478bd9ec6707bea5abfa11439038a6be7522c80fb5d67d452725669f38bc81bc9a0c1e2e8 WHIRLPOOL c0e82d8f15961d4954245c7abe03973b8f660c58e57962dbb3d0523a6a544d4a922c578f3394d72e00ca5656ed5a552aeab5633317bf52d33fd856e135094c30
+EBUILD patsy-0.2.0.ebuild 1051 SHA256 955c5e5f0f004d95918e241c139a9899de51f77aceda7cf3020052a5513e112b SHA512 af10ad1a2e6a125b9ae91f2412ef110ef7307b6bec670ade7e190dbd5c129e7f1785365148b1144817c613b470f6b9202d41d015b9b2e8080c7368d7d9b5c060 WHIRLPOOL 04539b2ef3334d2eeedaca5b764071c2faa89d0767684f91ea47e7048a9fd567b36761325f0e5edf06b8bd034b2e4879539bfb4bfe240072bff4fed9303a2b02
 EBUILD patsy-0.2.1.ebuild 1055 SHA256 9ff0d62f30b3969422a26f33994d444675bb0f484c139c5f7060757d9093e686 SHA512 2244c0c0d388fda115fee77ea6e108816e91c1f5ba557d5668cb129778f040693e59a4417edc118a43cdda6be4687afcc9bd914a7fd0df85221c61acac51a8bf WHIRLPOOL 87bfe4c88c70c93e8d95b08c44f285d0f2cd1e6b94bd0027d2079b5bc746626ab580c4be20b154342a00501ff41eee71a989fc43b60804c7b5f2e7159dafcc3a
-MISC ChangeLog 622 SHA256 61a8a1a3538622b12faaa1d1a7d970abf316c36bcea7eef5257e27b89ee3edb2 SHA512 356122125bb022bd008d23e30ae8cd1e3744907f842b6c704e3c92609acdd60979eec3d9b06d6245755a81db8d839da2da01c526acf93443f45ee217ffe978b7 WHIRLPOOL 8553ddfd6dd8cdd7bdd7e6c29a5b2de21b6a833183744628b0166a2a942cd11ab24219cc804d1e56bb8cfee611de4a8f7b0d2492b0fc8ff855462046f31e56ef
-MISC metadata.xml 453 SHA256 5422f246cae8f740b1c4c10ef5f9d327d67a83102258e10852d4fc52972b54cf SHA512 e5ae3e737a0a32d822ce98bf748e72ab2cc3b3c1a4c13eaf40998615b00e88466ca91bde5fb8a77b88279edc52b80e601e7987765c9a014d9b76735f05ab6193 WHIRLPOOL d071a88c85e4c1dd6ba20f147218f97f3f11de3b6e72d397e33b9c68c56478fadf244a1eeabc17f13b0f23f768b117017e6da522f4e407e2113d4d0f5b90e09d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlLu5PIACgkQ1ycZbhPLE2CsJQCeMuGVh+g4lwq1uxuv/tQaiBrY
-gDgAniamo9MmFFxNrIqGkOXJRqU+zHkP
-=O7E4
------END PGP SIGNATURE-----
+EBUILD patsy-0.3.0.ebuild 1102 SHA256 69ec8913a2c1ee70ab7d74821d090d37ad88d6df86bbea4f0442bea0362c8c42 SHA512 f22ba7189adbf48ba285819d83012d545b17b552275cdfaf559a0bb14b4878d8236e98c69599197e5317b38fe86bf64a5b785e58e6dd597c58d319257ecc6824 WHIRLPOOL aeecda4d96e7b13c323166ad365e6988427f584dd3865eb85a9638b5b05c2ec3536fb7c1a7cb9fa9bb15e9243756d40f634b3d28222190acf1c67c24d9bda738
+MISC ChangeLog 766 SHA256 414277aded1d2cb826e7a42bb964235c9243b90f2110cce06bbc1b864153caf3 SHA512 a6c3e9b97e69b25467157695fb67c4f6ade10f103560fded5ef5f9084f7e3d59291b67dd5ce6d8ffa449d091abca539c31d9242fa73ed73f85bbfa9b26f54874 WHIRLPOOL 33dc9a4c8474d35aa708844db8d7532a5f74bbf537e50225b91d4b18b9de2092722cc49f577b66f31275bf859b0e71a906309b624b60ce731421827b87e919c5
+MISC metadata.xml 463 SHA256 f1c2d0f9f0d6f1cf5587ef553893225b1209981f4c4284bebd3aa35d72d5f880 SHA512 e1cd2e2339391c35c14e4909482d4dce8d634bdcebcd64c90657d5d230cb3ad8c47841c8f42bf43359478b77b34f629ba6ad7b7388245f682640044d50bfb9d4 WHIRLPOOL 97e3108eb071e760257456550d483ac47a6bbae7ecf6594cda8208ea678d7dbf01a39e76d0266e1bf4bebc122d942d9a5c35f89dc864ab861b9a3c2a279e0eda
diff --git a/dev-python/patsy/metadata.xml b/dev-python/patsy/metadata.xml
index ef46dbd241e7..5296bb5bc086 100644
--- a/dev-python/patsy/metadata.xml
+++ b/dev-python/patsy/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription>
+  <herd>sci-mathematics</herd>
+  <longdescription>
   A Python package for describing statistical models and for building
   design matrices. It is closely inspired by and compatible with the
   'formula' mini-language used in R and S.
 </longdescription>
-<upstream>
-  <remote-id type="pypi">patsy</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="pypi">patsy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/patsy/patsy-0.2.0.ebuild b/dev-python/patsy/patsy-0.2.0.ebuild
index f92d24c43c75..4f532dbc779f 100644
--- a/dev-python/patsy/patsy-0.2.0.ebuild
+++ b/dev-python/patsy/patsy-0.2.0.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-python/patsy/patsy-0.2.0.ebuild,v 1.2 2013/09/14 07:44:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/patsy/patsy-0.2.0.ebuild,v 1.3 2014/08/22 07:13:42 jlec Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ python_compile_all() {
 }
 
 python_test() {
-	cd ${BUILD_DIR} || die
+	cd "${BUILD_DIR}" || die
 	nosetests -v || die "Testing failed with ${EPYTHON}"
 }
 
diff --git a/dev-python/patsy/patsy-0.3.0.ebuild b/dev-python/patsy/patsy-0.3.0.ebuild
new file mode 100644
index 000000000000..358d08c6a0a8
--- /dev/null
+++ b/dev-python/patsy/patsy-0.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/patsy/patsy-0.3.0.ebuild,v 1.1 2014/08/22 07:13:42 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to describe statistical models and design matrices"
+HOMEPAGE="http://patsy.readthedocs.org/en/latest/index.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use doc && dohtml -r doc/_build/html/*
+}
diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index 5fbd8765aa47..2496346a05b4 100644
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/nokogiri
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.101 2014/08/15 07:19:04 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.102 2014/08/22 07:27:29 graaff Exp $
+
+*nokogiri-1.6.3.1 (22 Aug 2014)
+
+  22 Aug 2014; Hans de Graaff <graaff@gentoo.org> +nokogiri-1.6.3.1.ebuild:
+  Version bump.
 
   15 Aug 2014; Hans de Graaff <graaff@gentoo.org> nokogiri-1.6.0.ebuild:
   Nokogiri checks compiled vs. runtime version of libxml2 and will start
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 6f9da527bef8..5a7857756768 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -5,15 +5,17 @@ AUX nokogiri-1.4.4-libxml-2.7.8.patch 729 SHA256 56fbfb502adbb04dc77373a2d7c3708
 DIST nokogiri-1.5.10-git.tgz 2027539 SHA256 d52f63518be0fcaa4a618308847e57261f1007627ff89d2d02fca1a3f8061ee6 SHA512 3a7523fdaf13a0364fe073d957e887bd82b15556ea4059e7a6820ab7d1fd40f7f5f652f7838707953b4fd25d411ca8c76a378aa92c1eeba9a7035d7fbe21bb43 WHIRLPOOL 4e7bfab43d9b9c3203afe85d791e7b06e87e7406ee9147a2d043f508c9d34774900c88b2070be0c8ad9d4bd1ad0c352255db19ab70928c23ffbf4410989b13d5
 DIST nokogiri-1.5.5.tgz 2003354 SHA256 18c1dd504596e9f60267f48d9b9b28901bf1ba66be53b64ac78b32f5d277c685 SHA512 d70ea5975cd769f6b6d6e4cfae0daa5ddb430258e19ad70ac8caca6185a5a9dd08d4178ae39fa93dae09141508f754ff4166d7b6c4130eeabe081e2f653b99f9 WHIRLPOOL d8c9a60849056323eb9b2569d589358001623467af6e7926bbdfb842f2af46bacb75c6257289ab07803c9dda3cf48a971ad4e09617beb2d0a3d6fdf9cd9ae702
 DIST nokogiri-1.6.0-git.tgz 2030137 SHA256 ec1f11c2206167dbbf8556802f070a6fedecf71c4f552bf2db1be7b960ce7fbc SHA512 916247f2a84763c1b402c1c868000ce2d310deb708cdb42beab928edbcd7ab3bb55a641f7bf1ff958046bcdd6b1e6cbef06f9a0a6b90c24bdd2c51649f5ef0f0 WHIRLPOOL 54a8a04ce87c4015642b9e4e7bc7853b46aa679c320db5d5b7cc2c0b20451545162905e21793944f5dc81bc1284572c5db86a3806c983b5e62e67d01003fccfb
+DIST nokogiri-1.6.3.1-git.tgz 2289208 SHA256 a7aac3b6e7781ceaa53497aef429278831f505ca6bc98e0b64958be4c2597bd4 SHA512 e56b2c470343ba829f71f93cf69c99797e16b8d6ea509e4035ac2cdb3d5b6bbfd9abd6bebf7de18152a14250ea5d74725467522ecd45f4a44d98db858ddf7279 WHIRLPOOL bc8a8b04c1fcd6fe57e87a445836ab61696845c2eb2cbeeea556ad49edf9c2cf01123e4dbeb9adf0d14afd79e539961b397ba396227a43302f1a1aaf5da0d2ec
 EBUILD nokogiri-1.5.10.ebuild 3427 SHA256 1256ba8e96ca89a52e2df81863678bbfc7ad535ce830dece9bf7054050839999 SHA512 968f71bf8b8d49a4d12e1bd4d9d129540bbfed5e8f662b0959b8d1231fa155efadf789e0525a606437f7c8df3c2cdd618759c511b7396251e036155ffee61126 WHIRLPOOL 5c6661a7f53624e90ba35dbb5ecef252f1ea12a116354e6577764de28a2e15891402cc06a9f174072e1abcb3607e206d4a913fda39faf76aabb359f3b10ac82a
 EBUILD nokogiri-1.5.5.ebuild 3026 SHA256 7f493d0d9f43f445d5b34e4c4622ded3f0f93ae8e3bff2a53ed650e6c3bc74eb SHA512 5e3fa384ba4997d248226fce6a551467235f97ad37048aca6e8e01b7ca0ec5e403e57d0e76e5d4eba587ceeddf76c6e79a32b8a85af59044c95c666ea6bfa644 WHIRLPOOL aae43b6698fd9cbe128f8b572e78e742075e6b2424a9270679505e508736c1046f2f5dc2e643d46229bc392b98a7749b7651d5cc1cc7e87f6cd2feba160844fc
 EBUILD nokogiri-1.6.0.ebuild 3457 SHA256 65e26ef2fb773d2cdd59a7da74d0e4bbad19187d4a8916416afcdcc4f0657b65 SHA512 cbbd5126b4c2d011ad658d0e8d50a19e3cf0cb632b86dceddea4bf769158742847c7b5dcb452f6c2465e91e5eabed268a9053b759667003e3bf8c915e59df762 WHIRLPOOL 78c2a7ba555431fd6dd6854caa617e45e14c49be23e67f77a30ad1b94dc262c43e7518dade93d76966db3c532aa3ec368aca48585e1251e8fd36aebc0492ebef
-MISC ChangeLog 14535 SHA256 5b7b2c05afb293520122f0b6c1925cb495ce255aaa9e67904bbc5e3151af946c SHA512 3f845ff40bce941daf64a88934d18ff0b1699b3606adc6c8f8df5bdfad95920a5063bac9789b4bcbe1ebe32f5b0601a0a73b008079c3e420602743207530c37c WHIRLPOOL 3a843b32f64c082e63f524a79517f604dac3655d848a8c35c4bc32c711dd43dcc6676c180bd46a711af962a0e7e58c9c79b806c7cbf4a64a9a9eb803a389c288
+EBUILD nokogiri-1.6.3.1.ebuild 3478 SHA256 aeec080858548e64bcc9c5c6debb722292d6d963f4e1d5d1f5ed2e44d4a04475 SHA512 77b2f856efa0fed441ce5b0faecdb5d313b68b67a1b2eb0a3fecae90ef2ed18879fc0f54b32eb2b2d88438e7961aa41311887d5ce377b3e8bdff00f23e57eee3 WHIRLPOOL ee527983e08e91a0b2e8bc454b03e345c9001400afe9bef6bcfdb43807bf727cb6cc720468053f4bde7a7b689620e1a0d5cacfb4d21bf4f6d5a2014555da3068
+MISC ChangeLog 14661 SHA256 9567a3dd0b9551b846062d9b3700b846aad773054b23f8554d8b595327e4a6bb SHA512 8eeab53f40ea82854d741cab032eafa66bc8754c51b4866b56be67a855b1cd4ea321430957fdaae3ff2ea42200b341a9ba269195fbdf23715af977411324934f WHIRLPOOL 3b86f61f4592770af10eb6047ae1aea5f1999db6b4dc70a9281abc8943794b62bb7ef9b29131c31af34bc5ead395f82f8befea11f13c7bf28a63cc69838b3b13
 MISC metadata.xml 159 SHA256 abab7965b1f41e0acf6b54c554945c1c9fa35b5afab848d784dc58c298bc4679 SHA512 39d857a527ff3a066b0fa7a6e57f789e60178ca13c5ddaa93802b58ec8d45f47418c2ce85c389e2eed619216aca72d761651efa5a401d84357df9b24b478b3fb WHIRLPOOL ddb2c776f81935d41c9e81592c1ddbabc4f94422f44bab6e312730aa541994234a2405ea5ba2782818404a730be20dc53c9cc205efbf8f0843bd21cf839b0980
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlPttGkACgkQiIP6VqMIqNcMOAD/QZTIuBnin6eHwFzZYWcUd2SH
-yzhK417yUVOAZk54A6oA/1gTf3Qe+YE5agf5/SGr48hhhLWSPFaDtQEqO1teFATY
-=rmkG
+iF4EAREIAAYFAlP28OIACgkQiIP6VqMIqNewuwD/ch5qoWUj6suJLF5dc8RgD5al
+FnXCnSk9wNv5WTv4k/sA/32JRD7AFh8pAQESqeBYbY4ylEGHjki9CrGnL4YjOP+l
+=yOvj
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild
new file mode 100644
index 000000000000..0b7f1cf5dcc9
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild,v 1.1 2014/08/22 07:27:29 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.rdoc README.ja.rdoc ROADMAP.md STANDARD_RESPONSES.md"
+
+inherit ruby-fakegem eutils multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="http://nokogiri.rubyforge.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+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"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	dev-libs/libxml2:=
+	dev-libs/libxslt
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	dev-libs/libxml2
+	dev-libs/libxslt
+	virtual/libiconv"
+
+# The tests require _minitest_, not the virtual; what is shipped with
+# Ruby 1.9 is *not* enough, unfortunately
+ruby_add_bdepend "
+	dev-ruby/hoe
+	dev-ruby/rake-compiler
+	dev-ruby/rexical
+	dev-ruby/rdoc
+	dev-ruby/racc
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+}
+
+each_ruby_prepare() {
+	# Avoid tests most likely broken by libxml2 2.9.x
+	sed -i -e '/test_multiple_filters/,/^  end/ s:^:#:' \
+		test/test_convert_xpath.rb || die
+	sed -i -e '/entity_reference_without_dtdload/,/^      end/ s:^:#:' \
+		test/xml/test_entity_reference.rb || die
+	sed -e '/\(test_last_of_type\|test_nth_of_type\|test_nth_last_of_type\)/,/^      end/ s:^:#:' \
+		-i test/css/test_nthiness.rb || die
+
+	case ${RUBY} in
+		*jruby)
+			# Avoid failing tests:
+			# https://github.com/sparklemotion/nokogiri/issues/721
+			rm test/xslt/test_exception_handling.rb test/test_xslt_transforms.rb || die
+			;;
+		*)
+			;;
+	esac
+}
+
+each_ruby_configure() {
+	case ${RUBY} in
+		*jruby)
+			;;
+		*)
+			NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+				${RUBY} -Cext/${PN} extconf.rb \
+				--with-zlib-include="${EPREFIX}"/usr/include \
+				--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+				--with-iconv-include="${EPREFIX}"/usr/include \
+				--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+				--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+				--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+				--with-xslt-dir="${EPREFIX}"/usr \
+				--with-iconvlib=iconv \
+				|| die "extconf.rb failed"
+			;;
+	esac
+}
+
+each_ruby_compile() {
+	case ${RUBY} in
+		*jruby)
+			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+			fi
+
+			${RUBY} -S rake compile || die
+			;;
+		*)
+			if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+				${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+			fi
+
+			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+			fi
+
+			emake -Cext/${PN} \
+				V=1 \
+				CFLAGS="${CFLAGS} -fPIC" \
+				archflag="${LDFLAGS}" || die "make extension failed"
+			cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+			;;
+	esac
+}
diff --git a/dev-ruby/stamp/ChangeLog b/dev-ruby/stamp/ChangeLog
index c389f0ebcb79..31de6f4e02ea 100644
--- a/dev-ruby/stamp/ChangeLog
+++ b/dev-ruby/stamp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/stamp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stamp/ChangeLog,v 1.5 2014/08/02 02:57:03 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stamp/ChangeLog,v 1.6 2014/08/22 06:46:59 graaff Exp $
+
+*stamp-0.6.0 (22 Aug 2014)
+
+  22 Aug 2014; Hans de Graaff <graaff@gentoo.org> +stamp-0.6.0.ebuild:
+  Version bump.
 
   02 Aug 2014; Manuel Rüger <mrueg@gentoo.org> stamp-0.5.0-r1.ebuild:
   Add ruby20 target.
diff --git a/dev-ruby/stamp/Manifest b/dev-ruby/stamp/Manifest
index 970c17dda335..db0e0d968784 100644
--- a/dev-ruby/stamp/Manifest
+++ b/dev-ruby/stamp/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST stamp-0.5.0.tar.gz 9022 SHA256 7346d95697a8eabe5d8e769bb098e1ff01bd1746f096176411ceba0c4c007ba0 SHA512 961121e2305d9948b003c12a16737c3a43235fc508bc1d2dd668bb7fc68893251c8575152aa61cea24617c9ce74c99c080b41353f81d9e70ab355e6e9f2365c8 WHIRLPOOL 5688685f0015c055d4830a1ec9b8b88cd81741710ac8e6623b0cfd466877f726beeeb20a6a105adaf25bc6f746083898b3c830e2f7de5de0c7ac305678f7a340
+DIST stamp-0.6.0.tar.gz 9099 SHA256 2b332424813c9bece7d61e7fa73c511802929fd9fe1349bc9ac58552648de63e SHA512 2f467444bad3c8932aeaeda061796ee3469b16d908027325efa28f7da005c8a4c8c95f0d3b84b6b1040bf5e5fe4114fc4779e3c9efc6c00817a050c13be62472 WHIRLPOOL bc345c03789669e809a7b480d8876cfa3afbef2a945583925bee204e087d2b3ec28b1a87dc569dad8b7c4633e01a40d9349d75616633c2f5b28cba4c5530ed12
 EBUILD stamp-0.5.0-r1.ebuild 968 SHA256 0f63cc860eaa840bef7dc4d1942ceae211d1fc45fcd11a98011c279e492b1446 SHA512 b5442873a29bc3cb2ab23ed9ee0365116fd3b266f32c98f83b3e2dbab851ccb012bceb2e110443e611abef2ab50a76f4f8d829c52027af5cac6d7c0fed7ceb6a WHIRLPOOL f749869e0c46c9266fb49d0da99064f7f40b4fd6db199c15941adbe12bc83c688ec2d052e7d1b9a29fc3e990e3c6f01fe0c59a2d08dc2a7efdce88e4194429a2
-MISC ChangeLog 780 SHA256 39733635247b4a521a2345afd32f1ff8b2cf72a276619768e678eac15ce47eee SHA512 2f423d6384c339692456688807d3d6ec6fa319fd5ab5462e77ff2ec5356c0dad8d82cb0bf2ccc9a825036ce92f716326a751b588e50f7592a06f92f40e3c804e WHIRLPOOL a0effa9d09ca0aae54ffb2d0e98def7c78e635f100ed09c13b6dd68a6d8c1dce90b2de35a479290e1ffab875e36962ce8c7b1597c59b21d95fe85f8092a24cc0
+EBUILD stamp-0.6.0.ebuild 894 SHA256 602a6e99811a502b15d510f30c3a5945463e07b6c2133125073bcf1eaad31539 SHA512 16a679454e3a1723a2e3c5d9a45fc3fefff17fb6d53eb301d742b98c3fccc429f80d5a7eafc85bf9e6e46fe9b9d754f7ff5648a0fb3ec79bce1fef8d6293d25e WHIRLPOOL c839d758d873f6aa9f06a8657188913282863e7eab5737bb5f310d5f5a312e2540af4d7e3c02c7442f49a01cbdca12aace2246c6c7ffa3a90d0f1651f51812db
+MISC ChangeLog 897 SHA256 a592eca46db6388a8bdeb327d85be81d63d7a4a7f62b83e25ea93d33f5834897 SHA512 86dac11a4b64f9bdf2bcfdf3f70ee0f92deceb6fa81c30aa1edbb232dd809fa1ea8d59a9719a27a9ab3f4d1157c5ef5fd7167732148ef408a6a90b144ec0a630 WHIRLPOOL 0f1d2816cf2b8cb974ae7b38fd5db74ae35a0f2ae0ffe6cdaf8563f2ab3f95de624c7393c62ef9e0be2e309ca56ad768c85ef38d02dcdd1927ff30f62594082b
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlP2520ACgkQiIP6VqMIqNcLmQD/eRWbHV2w1HebKa/B7NFexGKA
+NkbINa7bXCjHgnry+9MA/izTRqBp+gIJBY0SUYy6KvRQ4Jj6hI170NIRmu6xdYo2
+=+152
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/stamp/stamp-0.6.0.ebuild b/dev-ruby/stamp/stamp-0.6.0.ebuild
new file mode 100644
index 000000000000..b33cb4626561
--- /dev/null
+++ b/dev-ruby/stamp/stamp-0.6.0.ebuild
@@ -0,0 +1,35 @@
+# 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.6.0.ebuild,v 1.1 2014/08/22 06:46:59 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="cucumber"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Date and time formatting for humans"
+HOMEPAGE="https://github.com/jeremyw/stamp"
+SRC_URI="https://github.com/jeremyw/stamp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' Rakefile || die "sed failed"
+	sed -i -e '/bundler/,+7d' features/support/env.rb || die "sed failed"
+}
diff --git a/dev-util/reviewboard/ChangeLog b/dev-util/reviewboard/ChangeLog
index 5f09c0153b53..288527e4a744 100644
--- a/dev-util/reviewboard/ChangeLog
+++ b/dev-util/reviewboard/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/reviewboard
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/reviewboard/ChangeLog,v 1.9 2014/07/05 14:53:03 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/reviewboard/ChangeLog,v 1.10 2014/08/22 10:26:40 idella4 Exp $
+
+  22 Aug 2014; Ian Delaney <idella4@gentoo.org> -reviewboard-1.7.12.ebuild:
+  remove old unviable version
 
   05 Jul 2014; Michael Palimaka <kensington@gentoo.org> metadata.xml:
   Remove myself as a maintainer.
diff --git a/dev-util/reviewboard/Manifest b/dev-util/reviewboard/Manifest
index ba4aba13cd59..49e25a0e2f9a 100644
--- a/dev-util/reviewboard/Manifest
+++ b/dev-util/reviewboard/Manifest
@@ -3,28 +3,15 @@ Hash: SHA256
 
 AUX CVE-2013-2209-sec.patch 3367 SHA256 18ae4b1f4af8c8872497b8efdcf304d13bcb2192d2c2857a293dd32edaf0d0d0 SHA512 e12d36ee960134f3233647e6cc3e9f7c134282e88259c920e346823e578e29bcc21062c417e12c0f13c3c1cc4310e8e18ce6be740dfaa2219c335c2e28e832a6 WHIRLPOOL fe391e1f110973c9cf81442454e33c1cc5086b5f93389315aebc4f478220202149d314e0d6b07d7f43537b1b69f81b957800b98df9fc1587623bbae068403279
 AUX docs.patch 2031 SHA256 b013c83c282756b78adc128b2e2a26914eb3b64f3940e0091cc0cff54d618e5f SHA512 3a99f5cb314e8a315325c02bc3f5fa8c700baf958564dc46c64d4715229cadef5512014409b3647c8adf7fc20c29c2de0fd1f1ff58867c719d70b16fcf3cf2dd WHIRLPOOL 433ff7949062eda6bf8d0c5d5a6967b78b00a806082775e528f5cb9a3c3e76a22f30bb32f7ba991df28275722eb6d69832a3e8ca62844b8d8150dbfd7928b8c8
-DIST ReviewBoard-1.7.12.tar.gz 2977329 SHA256 50ab910488373d1119e17b88f5564d1e7f825b1a15b39db5bc1f52b33a12d255 SHA512 6fa3197625a3e5fa5ac61e24bf834d062c2028a69d7cedf0fa32a21e98d06fe67ece3879f05780c02c313208d75c1e0a8b2f19ba599c7377824d8061831ef6ca WHIRLPOOL c8a9bdf4adeaad38ac9499889eea780b29134d628037d5310b6a2e551b00a26552fde0518b8e915bdb41bc48c8e0bd53b4aa8edb1ab5ef72d024862a6fada259
 DIST ReviewBoard-1.7.7.1.tar.gz 2946656 SHA256 4e3306cd55e572179cdd1157e50a3e3bb4b0b8847bc14d0bafdb7fd7fe696208 SHA512 3896be4ee0dcd6817f21e326ef4a55ed04d1101939971c92f88d8e3501b8133a793816bd94c93475fb59528a4c37f1c405691a98bf896bc0df3fc0c8c08df02a WHIRLPOOL b288af9765a6df271ffc1e51f9fadca91f604a5166dd6f44a7c28c3ecea8e63676d96e5a84f5e1a18331fdab2cbb799dbb3d33ac28e9bd37c7af66fed17070ac
-EBUILD reviewboard-1.7.12.ebuild 3865 SHA256 b8e78a033f917d950340321b218a44f55416ca60dcd177a53a984cefe16308a8 SHA512 436637d346cf644412444adcf927da7ded379c73a4548f959cf41fb3e3e6c9512afb3e5f37a6998de858a3e1a5ea09c94cc841c7fe658fd47c383477f18ba946 WHIRLPOOL 586c7c4a1095faa2f4e8bc82ceaaf11a1f90f060cebaedd16e28159f708f29298484f49206d68446ee5cd69e1484f261096288c1466a3d742e5bde247d2fb8ec
 EBUILD reviewboard-1.7.7.1-r1.ebuild 3846 SHA256 317cece5eded099143b9cad2728e92706797b7a0aac29d106cc402b090a7acb7 SHA512 81adfac592a6af7cba8dc12c10321197da20f27c7445fe6df33e0a45424fc9401523ef223ffcebab70e85ba8657b521df65bdb70bb9408840999e45df480d652 WHIRLPOOL aabc71d795b5daafed465e99b948edde39b64689c6d56a7c225f7a896a77cdb082d80aef8485fe0dd3446e29f6ad1f0e5089ea3bc1d3810560e3cabefbb4397a
 EBUILD reviewboard-1.7.7.1.ebuild 3765 SHA256 8f4be71279b6c85c48dd82c29dc84abf2f60c1963a5b4dac94b4889b86f6efaf SHA512 a2727ca06c0eb82c745ec5e3990ac93fc2e4d5d1798ddfad9f7712a82bae5c33690f58dc52d2815dc21b5ecc89cbcdaa9c4a303552ff8425c699646768896db8 WHIRLPOOL 21c47afc9ee97c8d43574fd02f49a9a3b0e6326bfdaa4dc95e1306ec8482dd6615e389523cad6b99af69c916d26ab2b822cb658b9a7cce7ab1e6a9fa4c46868c
-MISC ChangeLog 1605 SHA256 0053337fb8030f73f7a3992d4aa825e1aa7bc1bb892935a7e75cea184207969b SHA512 152ecbd5399ce3399e9c9d023aff8b1e5e6c61b041561f35774d6a8199d6825dbb20ba4abeb8e291f5eef04dfc024033fdf9e6f765899073b2ed2ab9b21b28f5 WHIRLPOOL 0ce4b04f070c38921b8b9748fb7e02bb4ce17f5137a7a01a171a80c601504344dbf9c8fcc934337fc469b9e290ba351aae2f2f7d03f8e0f504bf1f34fb9d9e40
+MISC ChangeLog 1710 SHA256 da6f9f41d661803d425248d5c5d3a8dd54e2b9d1caf9887f31ffa816a9da2eb4 SHA512 9043cbad971c5742adaead8db723657b8b746290bc6c72c9b7fdeb6f6ad1ba464ddcf2a9da774d782b0f06f64af41509aebebfe8b92b5b8c2e0703bb877a09fb WHIRLPOOL f062dcf09661999f0a2ee2cbbde1377fe5730dfa4793b3c59842b3846b402154064527de9de29960712a0133a5751369f69a592728e4fa0fdff49131fc14a41d
 MISC metadata.xml 462 SHA256 d8d96800a4de27dd2ecd60879f9d2cdd035baf3512d214f11d9c002b22ca7aba SHA512 dc032d4b08177d4d39b4b415ffe96806b003674f4352870aa3f008822a65ece18e8448a9a5cda8b398f9595728c0e80ade6680d83ae20a2bcc11b909bf47d1cd WHIRLPOOL 5d6cb94e8ca4f3189fa9a945c12a9eee8542f7050e48e643e9056a377e036da54c2ffc10d77ae61b9ea753023e84ac0978ef12f90574ed1099530eeecd9a1f66
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJiBAEBCABMBQJTuBFURRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7GDBD/9qaZq6n2/UsRZw4MTvK+cTltK7+Tt2zSfKLBoDXZ6kLSrTEtybtzFjb953
-4yMEfnJPuuAmmafWYO6KZJnWROPrVVrSKcjKshzp6RGjOG0KmtePq6y18yDZRXpY
-lYOEl6sDPH5nFHQPbEsw/GMln92WoHe5OfHTp3CQzU4uYOFwt+PF7CtY27Ycazrg
-BQTlSvBsw3wlAh7IpII1HWQ3ateVVjm04pLra+v3y9t1lCLgLfPumfQsTV6MZKAp
-CQqEtTpJRHuyZgzppLmB3v4D9wKWMueY6EHRVnGFJXp5zkQXHBRPPjg+RXMC4Bmt
-BQtvdfwK0uwaNqSgojfUu4Tfxb5G0T21Fwa+zZ03kEO4srtMrexSjL13gFlNvQ3y
-GD4ODzOZRl/MsjN1j098y597hpEsNcWW5kfz/AgizZwaG6kJAV5fzxKfogLZDpkE
-jUN1YEZTOyXursSd7p1bOFq5WrQiWkIcDPLDQMYsMWNzznNLxTIj/6VT5kgp/B7a
-EHQZ09emyDs5+fMT773l2plX4B7jpI5d/dFykGV9jb3Nuekf1SL89XYmfAnI/X4J
-TO7VoURm82oIyqaTVwzhf5m9jwqRjXLml0iHVZ6KNEFSFmLwOKmLcvXfGTmWptgE
-zrQP1WouDM7x7En8nklv4iNHKBRuYPLno5UVjGRm0oy5E2wpxw==
-=lMlX
+iEYEAREIAAYFAlP3GMMACgkQso7CE7gHKw0FzACguH36r1wBblXETr58ua2JIy85
+b30AnRkKgZINekp86eWw8rU/FiszYxbc
+=soDJ
 -----END PGP SIGNATURE-----
diff --git a/dev-util/reviewboard/reviewboard-1.7.12.ebuild b/dev-util/reviewboard/reviewboard-1.7.12.ebuild
deleted file mode 100644
index 4447ed0f7502..000000000000
--- a/dev-util/reviewboard/reviewboard-1.7.12.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/reviewboard/reviewboard-1.7.12.ebuild,v 1.4 2014/07/04 19:46:36 hasufell Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_PN="ReviewBoard"
-DESCRIPTION="A web-based code review tool that offers developers an easy way to handle code reviews"
-HOMEPAGE="http://www.reviewboard.org/"
-SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/1.7/${MY_PN}-${PV}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="codebase doc manual rnotes test"
-
-LICENSE="MIT"
-SLOT="0"
-S=${WORKDIR}/${MY_PN}-${PV}
-
-RDEPEND=">=dev-python/django-1.4.5[${PYTHON_USEDEP},sqlite]
-	<dev-python/django-1.5[${PYTHON_USEDEP},sqlite]
-	>=dev-python/django-evolution-0.6.9[${PYTHON_USEDEP}]
-	>=dev-python/django-pipeline-1.2.24[${PYTHON_USEDEP}]
-	<dev-python/Djblets-0.7.17[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	dev-python/python-memcached[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2012h[${PYTHON_USEDEP}]
-	dev-python/recaptcha-client[${PYTHON_USEDEP}]"
-# >=dev-python/Djblets-0.7.16[${PYTHON_USEDEP}]
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="doc? ( || ( codebase manual rnotes ) )"
-# Tests mostly access the inet and when run mostly fail
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}"/docs.patch )
-
-python_prepare_all() {
-	# Higher versions do not support python-2.5, while reviewboard upstream
-	# still does. We do not support python-2.5 for this package as it will
-	# prevent downgrades for some of our dependencies.
-	sed -i setup.py \
-		-e "s/python-dateutil==1.5/python-dateutil/" \
-		-e "s/django-pipeline>=1.2.24,<1.3/django-pipeline>=1.2.24/" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# See http://code.google.com/p/reviewboard/issues/ #3009
-	# until build of manual can find and use ROOT_URLCONF, only possible build path for manual
-	# requires sacrificing the resources section, all of which call on ROOT_URLCONF
-	local msg="Generating docs for"
-	if use doc; then
-		if use manual; then
-			rm -rf docs/manual/webapi//2.0/resources/ || die
-			einfo;einfo "$msg manual"
-			DJANGO_SETTINGS_MODULE="django.conf" emake -C docs/manual html
-		fi
-		if use codebase; then
-			pushd docs/codebase &> /dev/null
-			ln -sf ../../contrib/internal/conf/settings_local.py .
-			popd &> /dev/null
-			einfo;einfo "$msg codebase"
-			emake -C docs/codebase html
-		fi
-
-		if use rnotes; then
-			einfo;einfo "$msg release notes"
-			emake -C docs/releasenotes html
-		fi
-	fi
-}
-
-python_test() {
-	pushd ${PN} > /dev/null
-	ln -sf contrib/internal/conf/settings_local.py .
-	"${PYTHON}" manage.py test || die
-}
-
-python_install_all() {
-	if use doc; then
-		if use manual; then
-			insinto /usr/share/doc/${PF}/manual
-			doins -r docs/manual/_build/html/
-		fi
-		if use codebase; then
-			insinto /usr/share/doc/${PF}/codebase
-			doins -r docs/codebase/_build/html/
-		fi
-		if use rnotes; then
-			insinto /usr/share/doc/${PF}/release_notes
-			doins -r docs/releasenotes/_build/html/
-		fi
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "You must install any VCS tool you wish ${PN} to support."
-	elog "dev-util/cvs, dev-vcs/git, dev-vcs/mercurial or dev-util/subversion."
-	elog
-	elog "Enable the mysql, postgres or sqlite USEflag on dev-python/django"
-	elog "to use the corresponding database backend."
-	elog
-	elog "For speed and responsiveness, consider installing net-misc/memcached"
-	elog "and dev-python/python-memcached"
-}
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index e3d6fd8e7622..e2e80858dde5 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.711 2014/08/07 19:53:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.712 2014/08/22 11:40:56 ssuominen Exp $
+
+  22 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> xine-lib-1.2.6.ebuild:
+  amd64/x86 stable wrt #517988
 
   07 Aug 2014; Jeroen Roovers <jer@gentoo.org> xine-lib-1.2.6.ebuild:
   Stable for HPPA (bug #517988).
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index aed313512599..16c7b96f211c 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -5,14 +5,18 @@ AUX accel_vaapi.h 4077 SHA256 0e4c485595fbe59cfebdfab8758df9c9dc78a79ab1fe49fb22
 DIST xine-lib-1.2.3.tar.xz 4905356 SHA256 e06a9e01d2632530e694d4a96bba71810e2f447f9ac036d2a150c43baa27852a SHA512 1abbced7c67fe04492bb28ada9d847e82be4bbcc426378dae1056dd6b01e22b8fa78218f5a96a0947ff1e9f70ebc1ee4bb06c330b0e17ca8d7c4d9be49982887 WHIRLPOOL 0e6bfb61ce77d14fbd0a807499b2a0b3f04ac976e8b7c06a5b34be06cbecb822339451031b80c4dc8faa5265adb1883861d96d0e7dc43a0b3ebe7040b619fb65
 DIST xine-lib-1.2.6.tar.xz 5020964 SHA256 bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005 SHA512 ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd WHIRLPOOL 66d85e75e28598ce3790f08c69ccd912aac115c8071f1795abd51d43b1e35fbc08827ae93fc9ce113cc0c0565b409714103cfeb14aa7acefe6bdb2fdf46ee307
 EBUILD xine-lib-1.2.3.ebuild 5506 SHA256 af3e95c991d8191009b9f3ee4c68d881447e1e1e2260190761e3614dbdab8811 SHA512 5ab354f142a9994e5283146b1b5dce119cbdf608964a45eccd6375af780196868721fc9366fc07c63a7de0fae2a00baa06cc07585cb77bdc7ffc2eb1a6c489b9 WHIRLPOOL 32811e2ea08b42f2dbc5fb41766683ecde54fb358f364330fd0d3f8a64ce38c128cf6c99e1674393b76108c345dc23f7e5db4ddf1fe97dddfeb2da6c24c45790
-EBUILD xine-lib-1.2.6.ebuild 5710 SHA256 135342207a008aafb8d05a8ee0afae07ab8d466ecb87d136eadccddadd1110f1 SHA512 15bda665fe7e704c3d0d36d79870d8e38b95ab7dc80620362119c9e2c9595720196b23c7e3dec3147ba866e60177712116c997062027be694f47e9c0c4648f0f WHIRLPOOL c1a80f8b30efc4980f2ac96e006d19a277faa66200ee01b2bb88f1840e136774fc899bbc21d1fd876636b2983f5b94f6d3cbb31875e3bffdf36644af4c586d36
+EBUILD xine-lib-1.2.6.ebuild 5714 SHA256 bcc441e011db6343b590b42e6ae33839a2b705f43bb1ae04b9f5df4c55f55e9c SHA512 f7ef97106b677586c83aeaf13787ec09953c34c05e7d8d50b387dfb1d59413d120d2fe59b29e3571aeb9b268e6f7d2d6b85b86c9800d0209e76b0d8812941204 WHIRLPOOL db4168982a3da1b83185f4c46fd465fecb7a73a481392fb974b817f68dd5a2f47911e12565dd1840837464296d14b9fcf65460ca0e10bf0939f5e3dd24a2e2d7
 EBUILD xine-lib-1.2.9999.ebuild 5721 SHA256 c6b15370c8f4592bb0e9f37801b10d1eff1544d338a145c56ebe5ce605316fdb SHA512 bd06be5f69e97ee9a7cb011b0ec228736492dbec5efa7c5b1247ef08fa757d374695411c86f46869d3079b5dfa234e7389e61d8bc3cb65eeb77fd0fe4d3d627d WHIRLPOOL 23b13d9b7ac96e08696f656f9ded5dc20404c2bc507274d6f3518441cc0208ec45f17e295adc7eaf027619043a76de55cd132628f2e3b6e5f7c8d547aa900a52
-MISC ChangeLog 84758 SHA256 987f04894a543bf4d43cb7aab6ef859b7977bf54706696cf503a9ce381fd3767 SHA512 b2f9556b02d7b74f811ac12944b1be118950a0e6f264c9a1ec52c6f592d25aafa499674644c80ffa5d52ec3db988fbdf6ab494f830b685e63e7c36f1248b2d64 WHIRLPOOL f37f522efeb38f1ec95f7a21a78145a9c569b7441ac8595c63ad1ce6af51a2f0dde3511f893fe23637659acbed9feb5b11445da421cd2766a644ede69296663f
+MISC ChangeLog 84873 SHA256 9eb5d01e0bce81c433ce807da0d71b0a3dff153f0484e76a4a3a4f40ff50788f SHA512 9692d6c33e95a8eb845da5e99335f7297918fa26cbe610ff1d5a113da2088b1a176ca2bb79ec5932cb4e1a60071c8e8aa47b4d4723ce344e6c28e7d7a389e359 WHIRLPOOL e03ec7302912b8692f790753897fc29c9bd2b5b622715058ce3fe163409bf967843dff2fcbb6cfb9fbeaf3cd196b6de233ce6d8d1bdd63eca9e742b68821432a
 MISC metadata.xml 2690 SHA256 30364b4d91d5564f9939419bc2ec841785823d3cfc35f9d853f0b99a428bd93b SHA512 6e990dc233db3de62948788360ef9eaab4103850d01999d04ed629356283d1de6aa65a9ecfa74f1e5897500e4b4752394f56d0965acc5fedcf9dc3651de6cd90 WHIRLPOOL 7d8b2d3cd990543cfbbd67c8b20f0582eabb5e38000fcbd6b75091bb033af75cf89ab9bfc208e1e4c06373009e1eb9937dc457a157cb45a660a8b3135caa7a6e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPj2TMACgkQVWmRsqeSphN7fQCdGrAwIknpp7/yRq3KW5yDxEn3
-TEsAn0bR2JXHJ2lpFEiAvB5Va1Q79aM1
-=9bP8
+iQEcBAEBCAAGBQJT9yvXAAoJEEdUh39IaPFNrAsIAIXmBVC0f/8ewMhMME6T/rhJ
+f5cg0K3XIQNib5RraDGi1T68aJhnLZQZoIFjy65T9nC2pDYhXFRzJtCk3MPwmjza
+ogRRJs/Zox/zRpRJyJX2DhtBMVM1WyjBwMzXS3wDc4wGQOBqp8kTIJNdRq/7mRwu
+lxZrcDXPtLa17ljMh0ZuesZgbSxaHJxpysmBkHCDO1mVmdAEGRHvZ+srAUBKcTsj
+79DOz+pFEaOwnC79FBjrxid87gcRUzJ1IQMk6vWfsVudFdQS8cm2ZG9RZoPFBQVS
+p1RND9nZ3ZINwl0GXjtbpHO4slG0dLNHnUG8YiiPqX6jj1SGxme5JLfobMeA6ts=
+=jQTf
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1.2.6.ebuild b/media-libs/xine-lib/xine-lib-1.2.6.ebuild
index e1fd221a6a46..56ce374b10e0 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6.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/xine-lib/xine-lib-1.2.6.ebuild,v 1.3 2014/08/07 19:53:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.6.ebuild,v 1.4 2014/08/22 11:40:56 ssuominen Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 hppa ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 586fd453d293..03aca9d8536f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 22 Aug 2014 04:06:59 +0000
+Fri, 22 Aug 2014 14:07:02 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 586fd453d293..1410d8464fa0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 22 Aug 2014 04:06:59 +0000
+Fri, 22 Aug 2014 14:07:03 +0000
diff --git a/metadata/md5-cache/app-office/scribus-1.4.4-r1 b/metadata/md5-cache/app-office/scribus-1.4.4-r1
index 5f3107e287fa..bc3786856e9f 100644
--- a/metadata/md5-cache/app-office/scribus-1.4.4-r1
+++ b/metadata/md5-cache/app-office/scribus-1.4.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=5
 HOMEPAGE=http://www.scribus.net/
 IUSE=cairo debug examples hunspell +minimal +pdf scripts templates tk linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_cs_CZ linguas_cy linguas_da_DK linguas_de linguas_de_1901 linguas_de_CH linguas_el linguas_en_AU linguas_en_GB linguas_en_US linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt_LT linguas_nb_NO linguas_nl linguas_pl_PL linguas_pt linguas_pt_BR linguas_ru linguas_sa linguas_sk_SK linguas_sl linguas_sq linguas_sr linguas_sv linguas_th_TH linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-libs/boost dev-libs/hyphen dev-libs/libxml2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg cairo? ( x11-libs/cairo[X,svg] ) !cairo? ( media-libs/libart_lgpl ) hunspell? ( app-text/hunspell ) pdf? ( app-text/podofo ) scripts? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) tk? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) app-text/ghostscript-gpl
 REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) tk? ( scripts )
 SLOT=0
 SRC_URI=mirror://sourceforge/scribus/1.4.4/scribus-1.4.4.tar.xz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=848c4c1636b44b08cf8de2bd015dec68
+_md5_=97bd4b02689f74faea6de21eb9d46549
diff --git a/metadata/md5-cache/dev-lang/php-5.4.32 b/metadata/md5-cache/dev-lang/php-5.4.32
new file mode 100644
index 000000000000..e671280b33d7
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.4.32
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !<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.69 sys-devel/libtool virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs
+EAPI=5
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3
+RDEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
+SLOT=5.4
+SRC_URI=http://www.php.net/distributions/php-5.4.32.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.tar.bz2
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	ebea507d219855923e3438c953cf4ab8	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3374afc6451b522333cfb6709ac5918b
diff --git a/metadata/md5-cache/dev-lang/php-5.5.16 b/metadata/md5-cache/dev-lang/php-5.5.16
new file mode 100644
index 000000000000..ea15a3cef5c8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.5.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !<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.69 sys-devel/libtool virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs
+EAPI=5
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3
+RDEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
+SLOT=5.5
+SRC_URI=http://www.php.net/distributions/php-5.5.16.tar.bz2
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	ebea507d219855923e3438c953cf4ab8	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=82dde2e34220d12657c5155b4d80e513
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
new file mode 100644
index 000000000000..79eb4b82647e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql-base ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.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.69 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
+DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
+EAPI=5
+HOMEPAGE=http://cyrusimap.web.cmu.edu/
+IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD-with-attribution
+RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql-base ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+SLOT=2
+SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b1f42675340369898a46bde4f236f0bf
diff --git a/metadata/md5-cache/dev-perl/Archive-Zip-1.300.0 b/metadata/md5-cache/dev-perl/Archive-Zip-1.300.0-r1
similarity index 83%
rename from metadata/md5-cache/dev-perl/Archive-Zip-1.300.0
rename to metadata/md5-cache/dev-perl/Archive-Zip-1.300.0-r1
index 172fab800b9b..be500e94c1b2 100644
--- a/metadata/md5-cache/dev-perl/Archive-Zip-1.300.0
+++ b/metadata/md5-cache/dev-perl/Archive-Zip-1.300.0-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-Compress-Raw-Zlib-2.017 >=virtual/perl-File-Spec-0.80 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+DEPEND=>=virtual/perl-Compress-Raw-Zlib-2.017 >=virtual/perl-File-Spec-0.80 dev-lang/perl:=[-build(-)]
 DESCRIPTION=A wrapper that lets you read Zip archive members as if they were files
-EAPI=4
+EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Archive-Zip/
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=virtual/perl-Compress-Raw-Zlib-2.017 >=virtual/perl-File-Spec-0.80 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+RDEPEND=>=virtual/perl-Compress-Raw-Zlib-2.017 >=virtual/perl-File-Spec-0.80 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Archive-Zip-1.30.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	0f1760274637a138b99bb649202ea402	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=0f563e14e5f97d99cb21621b75046800
+_md5_=ea49d83b38c6a972db8b8165610f2391
diff --git a/metadata/md5-cache/dev-python/numpy-1.8.1 b/metadata/md5-cache/dev-python/numpy-1.8.1
index 803eaa9da16f..1686932b1e83 100644
--- a/metadata/md5-cache/dev-python/numpy-1.8.1
+++ b/metadata/md5-cache/dev-python/numpy-1.8.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] lapack? ( virtual/cblas virtual/lapack ) doc? ( app-arch/unzip ) lapack? ( virtual/pkgconfig ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] lapack? ( virtual/fortran )
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] lapack? ( virtual/cblas virtual/lapack ) doc? ( app-arch/unzip ) lapack? ( virtual/pkgconfig ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] lapack? ( virtual/fortran )
 DESCRIPTION=Fast array and numerical python library
 EAPI=5
 HOMEPAGE=http://numpy.scipy.org/
-IUSE=doc lapack test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
+IUSE=doc lapack test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.8.1.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.8.1/numpy-html-1.8.1.zip http://docs.scipy.org/doc/numpy-1.8.1/numpy-ref-1.8.1.pdf http://docs.scipy.org/doc/numpy-1.8.1/numpy-user-1.8.1.pdf )
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3ddb1b4f8a4315ead3812117bae61191
+_md5_=83f1311dbf6cabd5180dd4a5674b5af9
diff --git a/metadata/md5-cache/dev-python/numpy-1.8.2 b/metadata/md5-cache/dev-python/numpy-1.8.2
new file mode 100644
index 000000000000..8a8a648673fd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numpy-1.8.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] lapack? ( virtual/cblas virtual/lapack ) doc? ( app-arch/unzip ) lapack? ( virtual/pkgconfig ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] lapack? ( virtual/fortran )
+DESCRIPTION=Fast array and numerical python library
+EAPI=5
+HOMEPAGE=http://numpy.scipy.org/
+IUSE=doc lapack test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/n/numpy/numpy-1.8.2.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.8.1/numpy-html-1.8.1.zip http://docs.scipy.org/doc/numpy-1.8.1/numpy-ref-1.8.1.pdf http://docs.scipy.org/doc//numpy-user-1.8.1.pdf )
+_eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=2c10273db9ac08aa8cfa21f81f4ee872
diff --git a/metadata/md5-cache/dev-python/patsy-0.2.0 b/metadata/md5-cache/dev-python/patsy-0.2.0
index f1c5863b49cb..6a9a18b01c27 100644
--- a/metadata/md5-cache/dev-python/patsy-0.2.0
+++ b/metadata/md5-cache/dev-python/patsy-0.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/patsy/patsy-0.2.0.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=d3d1b905f9925c856925b693d081d97c
+_md5_=a59706056853812ca5e19f7bac2d5d0c
diff --git a/metadata/md5-cache/dev-python/patsy-0.3.0 b/metadata/md5-cache/dev-python/patsy-0.3.0
new file mode 100644
index 000000000000..a70537cdfbbc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/patsy-0.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Python module to describe statistical models and design matrices
+EAPI=5
+HOMEPAGE=http://patsy.readthedocs.org/en/latest/index.html
+IUSE=doc test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/p/patsy/patsy-0.3.0.zip
+_eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=b25e55aa69a737ebe804f08b436b88fb
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.3.1 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.3.1
new file mode 100644
index 000000000000..734aa4343f58
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.6.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/libxml2 dev-libs/libxslt virtual/libiconv ruby_targets_ruby19? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/rake-compiler[ruby_targets_ruby19] dev-ruby/rexical[ruby_targets_ruby19] dev-ruby/rdoc[ruby_targets_ruby19] dev-ruby/racc[ruby_targets_ruby19] test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/rake-compiler[ruby_targets_ruby20] dev-ruby/rexical[ruby_targets_ruby20] dev-ruby/rdoc[ruby_targets_ruby20] dev-ruby/racc[ruby_targets_ruby20] test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/rake-compiler[ruby_targets_ruby21] dev-ruby/rexical[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] dev-ruby/racc[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? ( 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? ( 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=Nokogiri is an HTML, XML, SAX, and Reader parser
+EAPI=5
+HOMEPAGE=http://nokogiri.rubyforge.org/
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 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=dev-libs/libxml2:= dev-libs/libxslt virtual/libiconv 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/sparklemotion/nokogiri/archive/v1.6.3.1.tar.gz -> nokogiri-1.6.3.1-git.tgz
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=145c38ebcd5526a3feb7adf1dd946e57
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.6.0 b/metadata/md5-cache/dev-ruby/stamp-0.6.0
new file mode 100644
index 000000000000..d5db79a3f1b2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/stamp-0.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/redcarpet[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-util/cucumber[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-util/cucumber[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-util/cucumber[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=Date and time formatting for humans
+EAPI=5
+HOMEPAGE=https://github.com/jeremyw/stamp
+IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+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_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/jeremyw/stamp/archive/v0.6.0.tar.gz -> stamp-0.6.0.tar.gz
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=9d1e64a1f5b9d0a5a2071c7e9ca16483
diff --git a/metadata/md5-cache/dev-util/reviewboard-1.7.12 b/metadata/md5-cache/dev-util/reviewboard-1.7.12
deleted file mode 100644
index 34f226a37401..000000000000
--- a/metadata/md5-cache/dev-util/reviewboard-1.7.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/django-1.4.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),sqlite] <dev-python/django-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),sqlite] >=dev-python/django-evolution-0.6.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/django-pipeline-1.2.24[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/Djblets-0.7.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygments-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markdown-2.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mimeparse-0.1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-memcached[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2012h[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/recaptcha-client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A web-based code review tool that offers developers an easy way to handle code reviews
-EAPI=5
-HOMEPAGE=http://www.reviewboard.org/
-IUSE=codebase doc manual rnotes test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/django-1.4.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),sqlite] <dev-python/django-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),sqlite] >=dev-python/django-evolution-0.6.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/django-pipeline-1.2.24[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/Djblets-0.7.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygments-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markdown-2.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mimeparse-0.1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-memcached[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2012h[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/recaptcha-client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=doc? ( || ( codebase manual rnotes ) ) || ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://downloads.reviewboard.org/releases/ReviewBoard/1.7/ReviewBoard-1.7.12.tar.gz
-_eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=30d59582c9794a8b5c02b8c69dbd5daa
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.6 b/metadata/md5-cache/media-libs/xine-lib-1.2.6
index 4dcede25818a..8a708d588cc7 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.6
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.6
@@ -4,11 +4,11 @@ DESCRIPTION=Core libraries for Xine movie player
 EAPI=5
 HOMEPAGE=http://xine.sourceforge.net/
 IUSE=a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc nls
-KEYWORDS=~amd64 hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 hppa ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib || ( media-video/ffmpeg:0 media-libs/libpostproc <media-video/libav-0.8.2-r1 ) virtual/ffmpeg virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1 ) css? ( >=media-libs/libdvdcss-1.2.10 ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusion? ( media-libs/FusionSound ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
 SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.6.tar.xz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=30bf5f535f6eea0f0b906e06acdfdbc4
+_md5_=702d81909d99fb63f2c03567bdbcb1e8
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.0.0 b/metadata/md5-cache/net-analyzer/icinga2-2.0.2
similarity index 90%
rename from metadata/md5-cache/net-analyzer/icinga2-2.0.0
rename to metadata/md5-cache/net-analyzer/icinga2-2.0.2
index 34f4f2d2a5ad..76bee9d9f52d 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.0.0
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.0.2
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=dev-util/cmake dev-libs/openssl dev-libs/boost sys-devel/bison sys-devel/flex mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) plugins? ( net-analyzer/nagios-plugins ) classicui? ( net-analyzer/icinga[web] ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=|| ( mysql postgres )
 SLOT=0
-SRC_URI=http://github.com/Icinga/icinga2/archive/v2.0.0.tar.gz -> icinga2-2.0.0.tar.gz
+SRC_URI=http://github.com/Icinga/icinga2/archive/v2.0.2.tar.gz -> icinga2-2.0.2.tar.gz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=17b63839aec08a7530d587e16df3ea9a
+_md5_=f4f5bc8dedd5482251347c686488e647
diff --git a/metadata/md5-cache/net-misc/dibbler-0.7.3 b/metadata/md5-cache/net-misc/dibbler-0.7.3
deleted file mode 100644
index d3b114832e21..000000000000
--- a/metadata/md5-cache/net-misc/dibbler-0.7.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Portable DHCPv6 implementation (server, client and relay)
-EAPI=2
-HOMEPAGE=http://klub.com.pl/dhcpv6/
-IUSE=doc
-KEYWORDS=amd64 hppa ~mips x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://klub.com.pl/dhcpv6/dibbler/dibbler-0.7.3-src.tar.gz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=a6d5a191521ab097ddea75dad7b358da
diff --git a/metadata/md5-cache/net-misc/dibbler-0.8.3-r1 b/metadata/md5-cache/net-misc/dibbler-1.0.0_rc2
similarity index 78%
rename from metadata/md5-cache/net-misc/dibbler-0.8.3-r1
rename to metadata/md5-cache/net-misc/dibbler-1.0.0_rc2
index e3c78711ca42..90bfe20cff79 100644
--- a/metadata/md5-cache/net-misc/dibbler-0.8.3-r1
+++ b/metadata/md5-cache/net-misc/dibbler-1.0.0_rc2
@@ -4,9 +4,9 @@ DESCRIPTION=Portable DHCPv6 implementation (server, client and relay)
 EAPI=5
 HOMEPAGE=http://klub.com.pl/dhcpv6/
 IUSE=doc
-KEYWORDS=amd64 hppa ~mips x86
+KEYWORDS=~amd64 ~hppa ~mips ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://klub.com.pl/dhcpv6/dibbler/dibbler-0.8.3.tar.gz
+SRC_URI=http://klub.com.pl/dhcpv6/dibbler/dibbler-1.0.0RC2.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=4b4759fde1a1f0cc9793f5a74c7f0a7e
+_md5_=86db12865f36d96da65d89c45b6e5f01
diff --git a/metadata/md5-cache/net-misc/nx-3.5.0.20 b/metadata/md5-cache/net-misc/nx-3.5.0.20
index 8b3c1626567d..f33d2108f95d 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.0.20
+++ b/metadata/md5-cache/net-misc/nx-3.5.0.20
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto !<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.69 sys-devel/libtool
 DESCRIPTION=NX compression technology core libraries
 EAPI=4
-HOMEPAGE=http://www.nomachine.com/developers.php http://www.x2go.org/doku.php/wiki:libs:nx-libs
+HOMEPAGE=http://www.x2go.org/doku.php/wiki:libs:nx-libs
 IUSE=elibc_glibc
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=media-l
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.20-full.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=f8c340ff1877c2c3c862b43dbd6ec2ab
+_md5_=28d6fcbb41819f671736340c8b1b6f26
diff --git a/metadata/md5-cache/net-misc/nx-3.5.0.24 b/metadata/md5-cache/net-misc/nx-3.5.0.24
index eacc4bd684df..e141cff57fda 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.0.24
+++ b/metadata/md5-cache/net-misc/nx-3.5.0.24
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) media-libs/freetype:2 >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto !<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.69 sys-devel/libtool
 DESCRIPTION=NX compression technology core libraries
 EAPI=5
-HOMEPAGE=http://www.nomachine.com/developers.php http://www.x2go.org/doku.php/wiki:libs:nx-libs
+HOMEPAGE=http://www.x2go.org/doku.php/wiki:libs:nx-libs
 IUSE=elibc_glibc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) media-lib
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.24-full.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=33cdbabaef5723f21d69ca4e930d80e9
+_md5_=e2f2e6c779146d454f2e17f5542cb702
diff --git a/metadata/md5-cache/net-misc/nx-3.5.0.27 b/metadata/md5-cache/net-misc/nx-3.5.0.27
index 814ceb977299..66ef3cb90387 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.0.27
+++ b/metadata/md5-cache/net-misc/nx-3.5.0.27
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) media-libs/freetype:2 >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto !<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.69 sys-devel/libtool
 DESCRIPTION=NX compression technology core libraries
 EAPI=5
-HOMEPAGE=http://www.nomachine.com/developers.php http://www.x2go.org/doku.php/wiki:libs:nx-libs
+HOMEPAGE=http://www.x2go.org/doku.php/wiki:libs:nx-libs
 IUSE=elibc_glibc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) media-lib
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.27-full.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=9dc158b53b78e338996ced601d2c975c
+_md5_=9a73eb2dc76d043485717bce9fe2d837
diff --git a/metadata/md5-cache/net-misc/openvswitch-1.9.0 b/metadata/md5-cache/net-misc/openvswitch-1.9.0
deleted file mode 100644
index f378e791cb14..000000000000
--- a/metadata/md5-cache/net-misc/openvswitch-1.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
-DEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl ) monitor? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web pyside? ( dev-python/pyside[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) !pyside? ( dev-python/PyQt4[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) net-zope/zope-interface[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) debug? ( dev-lang/perl ) virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Production quality, multilayer virtual switch
-EAPI=5
-HOMEPAGE=http://openvswitch.org
-IUSE=debug modules monitor +pyside +ssl kernel_linux python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl ) monitor? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web pyside? ( dev-python/pyside[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) !pyside? ( dev-python/PyQt4[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) net-zope/zope-interface[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://openvswitch.org/releases/openvswitch-1.9.0.tar.gz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	linux-info	2b8c53f6065bdee2d757472215a3088f	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3e91d697728cb5caa4c707bbb174113f
diff --git a/metadata/md5-cache/net-misc/openvswitch-1.9.0-r1 b/metadata/md5-cache/net-misc/openvswitch-1.9.0-r1
deleted file mode 100644
index cf7eec80f43a..000000000000
--- a/metadata/md5-cache/net-misc/openvswitch-1.9.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
-DEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl ) monitor? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/twisted-core[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/twisted-conch[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/twisted-web[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] pyside? ( dev-python/pyside[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) !pyside? ( dev-python/PyQt4[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) net-zope/zope-interface[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) debug? ( dev-lang/perl ) virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Production quality, multilayer virtual switch
-EAPI=5
-HOMEPAGE=http://openvswitch.org
-IUSE=debug modules monitor +pyside +ssl kernel_linux python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl ) monitor? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/twisted-core[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/twisted-conch[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/twisted-web[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] pyside? ( dev-python/pyside[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) !pyside? ( dev-python/PyQt4[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) net-zope/zope-interface[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://openvswitch.org/releases/openvswitch-1.9.0.tar.gz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	linux-info	2b8c53f6065bdee2d757472215a3088f	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=84117a423db86e1522510986ff346901
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.1.3 b/metadata/md5-cache/net-misc/openvswitch-2.1.3
new file mode 100644
index 000000000000..1012f19ff0b7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openvswitch-2.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
+DEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl ) monitor? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/PyQt4[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] net-zope/zope-interface[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) debug? ( dev-lang/perl ) virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig !<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.69 sys-devel/libtool
+DESCRIPTION=Production quality, multilayer virtual switch
+EAPI=5
+HOMEPAGE=http://openvswitch.org
+IUSE=debug modules monitor +ssl kernel_linux python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl ) monitor? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/PyQt4[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] net-zope/zope-interface[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://openvswitch.org/releases/openvswitch-2.1.3.tar.gz
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=98ae13176b8b5258048b3e9edba43009
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.3.0 b/metadata/md5-cache/net-misc/openvswitch-2.3.0
new file mode 100644
index 000000000000..4a2e7f10761c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openvswitch-2.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
+DEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl ) monitor? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/PyQt4[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] net-zope/zope-interface[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) debug? ( dev-lang/perl ) virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig !<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.69 sys-devel/libtool
+DESCRIPTION=Production quality, multilayer virtual switch
+EAPI=5
+HOMEPAGE=http://openvswitch.org
+IUSE=debug modules monitor +ssl kernel_linux python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl ) monitor? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/PyQt4[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] net-zope/zope-interface[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://openvswitch.org/releases/openvswitch-2.3.0.tar.gz
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=030bd84f9daa021ba5754f7cef2f3614
diff --git a/metadata/md5-cache/net-misc/radvd-2.5 b/metadata/md5-cache/net-misc/radvd-2.5
new file mode 100644
index 000000000000..8fa43d2fbc01
--- /dev/null
+++ b/metadata/md5-cache/net-misc/radvd-2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst setup
+DEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd ) dev-libs/check sys-devel/bison sys-devel/flex virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Linux IPv6 Router Advertisement Daemon
+EAPI=4
+HOMEPAGE=http://v6web.litech.org/radvd/
+IUSE=kernel_FreeBSD selinux
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
+SLOT=0
+SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.5.tar.gz
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=a5428c8fffec9dc43a414340d0c8f5c3
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.0.1.12 b/metadata/md5-cache/net-misc/x2goserver-4.0.1.12
index c3a172389b17..a5bd76a07e2b 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.0.1.12
+++ b/metadata/md5-cache/net-misc/x2goserver-4.0.1.12
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.x2go.org
 IUSE=+doc +fuse postgres +sqlite
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-ReadBackwards media-fonts/font-cursor-misc media-fonts/font-misc-misc net-misc/nx net-misc/openssh x11-apps/xauth x11-apps/xhost fuse? ( sys-fs/sshfs-fuse ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
+RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards media-fonts/font-cursor-misc media-fonts/font-misc-misc net-misc/nx net-misc/openssh x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( sys-fs/sshfs-fuse ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.0.1.12.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=72ea6fd72cd9d68c33fbe9a007bb04b4
+_md5_=f3d8a2eff1eb8ddda13b1409b33a59e5
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.0.1.13 b/metadata/md5-cache/net-misc/x2goserver-4.0.1.13
deleted file mode 100644
index bb00c6c5a043..000000000000
--- a/metadata/md5-cache/net-misc/x2goserver-4.0.1.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=doc? ( sys-apps/man ) virtual/pkgconfig
-DESCRIPTION=The X2Go server
-EAPI=4
-HOMEPAGE=http://www.x2go.org
-IUSE=+doc +fuse postgres +sqlite
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-ReadBackwards media-fonts/font-cursor-misc media-fonts/font-misc-misc net-misc/nx net-misc/openssh x11-apps/xauth x11-apps/xhost fuse? ( sys-fs/sshfs-fuse ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
-REQUIRED_USE=|| ( postgres sqlite )
-SLOT=0
-SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.0.1.13.tar.gz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=72cb908aee0ddbcf7bdca497e366b76b
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.0.1.15 b/metadata/md5-cache/net-misc/x2goserver-4.0.1.15
index 1a6e3a442852..006691607408 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.0.1.15
+++ b/metadata/md5-cache/net-misc/x2goserver-4.0.1.15
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=doc? ( sys-apps/man ) virtual/pkgconfig
+DEPEND=virtual/pkgconfig
 DESCRIPTION=The X2Go server
 EAPI=4
 HOMEPAGE=http://www.x2go.org
-IUSE=+doc +fuse postgres +sqlite
+IUSE=+fuse postgres +sqlite
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-ReadBackwards media-fonts/font-cursor-misc media-fonts/font-misc-misc net-misc/nx net-misc/openssh x11-apps/xauth x11-apps/xhost fuse? ( sys-fs/sshfs-fuse ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
+RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards media-fonts/font-cursor-misc media-fonts/font-misc-misc net-misc/nx net-misc/openssh x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( sys-fs/sshfs-fuse ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.0.1.15.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=2a4fa01dc45aaa39c1e81ff2c36686d8
+_md5_=80ab855c0873be96c6c73f949d68c00e
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2014.08.22.2 b/metadata/md5-cache/net-misc/youtube-dl-2014.08.22.2
new file mode 100644
index 000000000000..5ab0b30dcdae
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2014.08.22.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] test? ( dev-python/nose[coverage(+)] ) 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 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?]
+DESCRIPTION=Download videos from YouTube.com (and mores sites...)
+EAPI=5
+HOMEPAGE=http://rg3.github.com/youtube-dl/
+IUSE=offensive test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=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 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?]
+REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) ^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 )
+SLOT=0
+SRC_URI=http://youtube-dl.org/downloads/2014.08.22.2/youtube-dl-2014.08.22.2.tar.gz
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=a2ada0c3ce5021045f1e0aa78b6de741
diff --git a/metadata/md5-cache/sys-apps/systemd-216 b/metadata/md5-cache/sys-apps/systemd-216
new file mode 100644
index 000000000000..0bf20525f76d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-216
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test
+DEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.8 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) python? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=System and service manager for Linux
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl audit cryptsetup curl doc elfutils +firmware-loader gcrypt gudev http idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp selinux ssl test vanilla abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_2 python_single_target_python3_3 python_single_target_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.6.8-r1:0[systemd] >=sys-apps/hwids-20130717-r1[udev] policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.14 !sys-fs/udev
+SLOT=0/2
+SRC_URI=http://www.freedesktop.org/software/systemd/systemd-216.tar.xz
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=cc7fec5654ef0ee59482f1ab036a6513
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.2.8-r2 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.2.8-r2
deleted file mode 100644
index bd94d9c0cfad..000000000000
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.2.8-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/expat test? ( || ( dev-lang/ruby:2.9 dev-lang/ruby:2.8 dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) dev-cpp/gmock dev-util/cucumber dev-util/aruba ) dev-libs/boost !<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.69 sys-devel/libtool
-DESCRIPTION=A suite of tools for thin provisioning on Linux
-EAPI=5
-HOMEPAGE=https://github.com/jthornber/thin-provisioning-tools
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-libs/expat
-SLOT=0
-SRC_URI=http://github.com/jthornber/thin-provisioning-tools/archive/v0.2.8.tar.gz -> thin-provisioning-tools-0.2.8.tar.gz https://github.com/denys-duchier/thin-provisioning-tools/commit/3a4c06b772bc8ca27bcf7c2d82abc46c65c23795.diff -> thin-provisioning-tools-0.2.8-boost.patch
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=3a55c8e0d0e052a976231188123ff2a3
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.3.2 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.3.2
deleted file mode 100644
index a3eaf34c4205..000000000000
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/expat test? ( || ( dev-lang/ruby:2.9 dev-lang/ruby:2.8 dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) dev-cpp/gmock dev-util/cucumber dev-util/aruba ) dev-libs/boost !<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.69 sys-devel/libtool
-DESCRIPTION=A suite of tools for thin provisioning on Linux
-EAPI=5
-HOMEPAGE=http://github.com/jthornber/thin-provisioning-tools
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-libs/expat
-SLOT=0
-SRC_URI=http://github.com/jthornber/thin-provisioning-tools/archive/v0.3.2.tar.gz -> thin-provisioning-tools-0.3.2.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=5072b11c289225942a181a5a0afec5a5
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.3.2-r1 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.3.2-r1
index a7a22ac557db..08cca281e1dc 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.3.2-r1
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.3.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A suite of tools for thin provisioning on Linux
 EAPI=5
 HOMEPAGE=http://github.com/jthornber/thin-provisioning-tools
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/expat
 SLOT=0
 SRC_URI=http://github.com/jthornber/thin-provisioning-tools/archive/v0.3.2.tar.gz -> thin-provisioning-tools-0.3.2.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=d7ae7587102565a16fd4699b16a4ddde
+_md5_=379cd2d31e9c2bc338fd69cf69ba9320
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-3.14.1 b/metadata/md5-cache/sys-fs/btrfs-progs-3.14.1
deleted file mode 100644
index 0664623f6781..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-3.14.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/lzo sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=5
-HOMEPAGE=https://btrfs.wiki.kernel.org
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs
-SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v3.14.1.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=cdbb711d87c83d7c6adb813e1996d0a5
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-3.14.1-r1 b/metadata/md5-cache/sys-fs/btrfs-progs-3.14.1-r1
deleted file mode 100644
index 5efbd81641ff..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-3.14.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/lzo sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=5
-HOMEPAGE=https://btrfs.wiki.kernel.org
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs
-SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v3.14.1.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=653562e6eff08b927735b0ab2ee43c2b
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-3.14.2 b/metadata/md5-cache/sys-fs/btrfs-progs-3.14.2
index dcafd3f3106a..3f8cc00a7549 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-3.14.2
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-3.14.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/lzo sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs app-text/asciidoc app-text/docbook-xml-dtd:4.5 app-text/xmlto
+DEPEND=dev-libs/lzo:2= sys-libs/zlib:0= sys-fs/e2fsprogs:0= sys-apps/acl app-text/asciidoc app-text/docbook-xml-dtd:4.5 app-text/xmlto
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=5
 HOMEPAGE=https://btrfs.wiki.kernel.org
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/lzo sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs
+RDEPEND=dev-libs/lzo:2= sys-libs/zlib:0= sys-fs/e2fsprogs:0=
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v3.14.2.tar.xz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=beabcb49235f3d2335da1c2ba1d15dfa
+_md5_=d5245a66c2af55b0a56c165496ff853e
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-3.14_pre20140414 b/metadata/md5-cache/sys-fs/btrfs-progs-3.14_pre20140414
deleted file mode 100644
index 235e8fcd889b..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-3.14_pre20140414
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/lzo sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=5
-HOMEPAGE=https://btrfs.wiki.kernel.org
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs
-SLOT=0/0
-SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/btrfs-progs-v3.14_pre20140414.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=8f9f2803260d4e82ac0e7558af1f5418
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index 93ea1dbf267e..aceaee7124b4 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=dev-libs/lzo sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs app-text/asciidoc app-text/docbook-xml-dtd:4.5 app-text/xmlto dev-vcs/git
+DEPEND=dev-libs/lzo:2= sys-libs/zlib:0= sys-fs/e2fsprogs:0= sys-apps/acl app-text/asciidoc app-text/docbook-xml-dtd:4.5 app-text/xmlto dev-vcs/git
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=5
 HOMEPAGE=https://btrfs.wiki.kernel.org
 LICENSE=GPL-2
-RDEPEND=dev-libs/lzo sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs
+RDEPEND=dev-libs/lzo:2= sys-libs/zlib:0= sys-fs/e2fsprogs:0=
 SLOT=0/0
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=3df94723e4bb9690240ef0b0ea62a62c
+_md5_=98482226c8cf91d9afd63fcb2564a0f2
diff --git a/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r4 b/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r4
new file mode 100644
index 000000000000..1e6b29af2568
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=selinux? ( sec-policy/selinux-cachefilesd ) virtual/pkgconfig
+DESCRIPTION=Provides a caching directory on an already mounted filesystem
+EAPI=5
+HOMEPAGE=http://people.redhat.com/~dhowells/fscache/
+IUSE=doc selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( sec-policy/selinux-cachefilesd )
+SLOT=0
+SRC_URI=http://people.redhat.com/~dhowells/fscache/cachefilesd-0.10.5.tar.bz2 -> cachefilesd-0.10.5.tar
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=2955972ae7807ba7df4c46bf5bf2e53f
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.105-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.105-r2
deleted file mode 100644
index 4225d37936c8..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.105-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( selinux? ( sys-libs/libselinux[static-libs] ) udev? ( >=virtual/libudev-208:=[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] ) !<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.69 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
-EAPI=5
-HOMEPAGE=http://sources.redhat.com/lvm2/
-IUSE=readline static static-libs clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.2.8-r1 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
-SLOT=0
-SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.105.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.105.tgz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=52b2b16f40f1efff3a91e045ab60a01c
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.106 b/metadata/md5-cache/sys-fs/lvm2-2.02.106
deleted file mode 100644
index d086346a975c..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.106
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( selinux? ( sys-libs/libselinux[static-libs] ) udev? ( >=virtual/libudev-208:=[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] ) !<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.69 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
-EAPI=5
-HOMEPAGE=http://sources.redhat.com/lvm2/
-IUSE=readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
-SLOT=0
-SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.106.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.106.tgz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=68aef4e7c73771324408b703d2f34e7c
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.107 b/metadata/md5-cache/sys-fs/lvm2-2.02.107
deleted file mode 100644
index 303430dd2b37..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.107
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( selinux? ( sys-libs/libselinux[static-libs] ) udev? ( >=virtual/libudev-208:=[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] ) !<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.69 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
-EAPI=5
-HOMEPAGE=http://sources.redhat.com/lvm2/
-IUSE=readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
-SLOT=0
-SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.107.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.107.tgz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d9fb614f32209b2fc6bee3a7eae61452
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.108 b/metadata/md5-cache/sys-fs/lvm2-2.02.108
deleted file mode 100644
index bfc0958de2db..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.108
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( selinux? ( sys-libs/libselinux[static-libs] ) udev? ( >=virtual/libudev-208:=[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] ) !<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.69 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
-EAPI=5
-HOMEPAGE=http://sources.redhat.com/lvm2/
-IUSE=readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
-SLOT=0
-SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.108.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.108.tgz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=039a79d682fd66e437741d810bc36280
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.109 b/metadata/md5-cache/sys-fs/lvm2-2.02.109
index 5c13795f27df..2f28b1f2a564 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.109
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.109
@@ -4,11 +4,11 @@ DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=5
 HOMEPAGE=http://sources.redhat.com/lvm2/
 IUSE=readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.109.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.109.tgz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f0a3a0b935570e79f68ee33ad18d1b8e
+_md5_=2faece2fa1309aa67c8cb2d508105ce9
diff --git a/metadata/md5-cache/sys-fs/mdadm-3.3.1-r2 b/metadata/md5-cache/sys-fs/mdadm-3.3.1-r2
index 142eb58f09d3..1dcd8cdd7fc2 100644
--- a/metadata/md5-cache/sys-fs/mdadm-3.3.1-r2
+++ b/metadata/md5-cache/sys-fs/mdadm-3.3.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A useful tool for running RAID systems - it can be used as a replace
 EAPI=4
 HOMEPAGE=http://neil.brown.name/blog/mdadm
 IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.16
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-3.3.1.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_3.3-2.debian.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438
-_md5_=0fc82e317e266d10d8fd010b4df3ef17
+_md5_=02de8157eb31b2e67bd4c7355ed09f52
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.13.10 b/metadata/md5-cache/sys-kernel/hardened-sources-3.13.10
deleted file mode 100644
index 9385c4024cbe..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.13.10
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.13)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.13.10
-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/~blueness/hardened-sources/hardened-patches/hardened-patches-3.13.10-1.extras.tar.bz2 mirror://gentoo/genpatches-3.13-13.base.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fac31ed850eb99d9c291622ff8f4efed
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.13 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.13
deleted file mode 100644
index e08e239b9b98..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.13
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.14)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.14.13
-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/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.13-1.extras.tar.bz2 mirror://gentoo/genpatches-3.14-17.base.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6dd63690102098362195bc0902bb9e0e
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.14 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.14
deleted file mode 100644
index 0f0eb2a75e1f..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.14
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.14)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.14.14
-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/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.14-1.extras.tar.bz2 mirror://gentoo/genpatches-3.14-18.base.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e84a4974c7c6acb3f949458b77cecb9b
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.15 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.15
index 9e6eb2be52c8..7939ba20b0d6 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.15
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.15
@@ -4,7 +4,7 @@ DESCRIPTION=Hardened kernel sources (kernel series 3.14)
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=3.14.15
 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/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.15-1.extras.tar.bz2 mirror://gentoo/genpatches-3.14-19.base.tar.xz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=830f8190b81efff1ce6ca63641019e0f
+_md5_=eb93650bcf31ca148780a4b75cc8719c
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.16 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.16
deleted file mode 100644
index 2da5d4d380ad..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.16
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.14)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.14.16
-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/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.16-1.extras.tar.bz2 mirror://gentoo/genpatches-3.14-20.base.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=adb44814858055b35d87f20499bea181
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.5-r2 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.5-r2
deleted file mode 100644
index 2bf9d7b37521..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.14)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.14.5-r2
-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/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.5-4.extras.tar.bz2 mirror://gentoo/genpatches-3.14-8.base.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=37a09c42b0f1dc321c749eb241522281
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.15.6 b/metadata/md5-cache/sys-kernel/hardened-sources-3.15.6
deleted file mode 100644
index fc946d4d94b9..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.15.6
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.15)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.15.6
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.15.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-3.15 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-check -> deblob-check-3.15 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.15.6-1.extras.tar.bz2 mirror://gentoo/genpatches-3.15-8.base.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cc102665e7895d8de2c948cbcc01ae30
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.15.7 b/metadata/md5-cache/sys-kernel/hardened-sources-3.15.7
deleted file mode 100644
index dfef80d65d8f..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.15.7
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.15)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.15.7
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.15.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-3.15 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-check -> deblob-check-3.15 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.15.7-1.extras.tar.bz2 mirror://gentoo/genpatches-3.15-9.base.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=34a41977f136edd35a989c453c0bf3b7
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.15.8 b/metadata/md5-cache/sys-kernel/hardened-sources-3.15.8
index 377e1c00f3be..ee9a7c2a41c8 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.15.8
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.15.8
@@ -4,7 +4,7 @@ DESCRIPTION=Hardened kernel sources (kernel series 3.15)
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=3.15.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.15.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-3.15 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-check -> deblob-check-3.15 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.15.8-1.extras.tar.bz2 mirror://gentoo/genpatches-3.15-10.base.tar.xz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a68a4c417dc77864eb7825319f62e7e7
+_md5_=af5b8b0276c1c8c61760eae3bf4b5d45
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.15.9 b/metadata/md5-cache/sys-kernel/hardened-sources-3.15.9
deleted file mode 100644
index f5a049c02243..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.15.9
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.15)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.15.9
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.15.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-3.15 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-check -> deblob-check-3.15 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.15.9-1.extras.tar.bz2 mirror://gentoo/genpatches-3.15-11.base.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d74815b47578a953ea420d5d7a87e79e
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.55-r7 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.55-r7
deleted file mode 100644
index 6ce2c8a9a9c1..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.55-r7
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.2.55-r7
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.55-8.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d7a03a1cfc15b7575d3dc53d92390823
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.59-r5 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.59-r5
deleted file mode 100644
index 35ba8d2ff4ad..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.59-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.2.59-r5
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.59-7.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6a0ad2f78e7c0b3b2a834fe75abe1950
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r3 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r3
deleted file mode 100644
index 363b85b38cea..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.2.61-r3
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.61-4.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=dce6632673b9308773f603d5996395c3
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r4 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r4
deleted file mode 100644
index 71cc4a76ca4f..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.2.61-r4
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.61-5.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8e1e1290904faaee7fe6acb0b3f5c3e2
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r5 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r5
index a41386582044..c581c05b6843 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r5
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r5
@@ -4,7 +4,7 @@ DESCRIPTION=Hardened kernel sources (kernel series 3.2)
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=3.2.61-r5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.61-6.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c5d273a99ce7335b52650c540ac97f80
+_md5_=daf3fe024af29649360cd0114b83390f
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.4.57_p72 b/metadata/md5-cache/sys-kernel/rt-sources-3.14.12_p9
similarity index 59%
rename from metadata/md5-cache/sys-kernel/rt-sources-3.4.57_p72
rename to metadata/md5-cache/sys-kernel/rt-sources-3.14.12_p9
index d7d78fa8558e..bd2ac609d6fe 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.4.57_p72
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.14.12_p9
@@ -1,6 +1,6 @@
 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 ) )
-DESCRIPTION=Full Linux 3.4 kernel sources with the CONFIG_PREEMPT_RT patch
+DESCRIPTION=Full Linux 3.14 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=5
 HOMEPAGE=http://www.kernel.org/ http://www.gentoo.org/ http://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svnwiki/selibre/linux-libre/
 IUSE=symlink build deblob
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 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.4.57_p72
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.57.xz mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://kernel/linux/kernel/projects/rt/3.4/patch-3.4.57-rt72.patch.xz mirror://kernel/linux/kernel/projects/rt/3.4/older/patch-3.4.57-rt72.patch.xz
+SLOT=3.14.12_p9
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.12.xz 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 ) mirror://kernel/linux/kernel/projects/rt/3.14/patch-3.14.12-rt9.patch.xz mirror://kernel/linux/kernel/projects/rt/3.14/older/patch-3.14.12-rt9.patch.xz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cbc5ee019b89b5adba2a143c4c056acc
+_md5_=097dfafade3854392f45a52fa9f8e275
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.8.13_p15 b/metadata/md5-cache/sys-kernel/rt-sources-3.8.13_p15
deleted file mode 100644
index 6f355a432e19..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.8.13_p15
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) )
-DESCRIPTION=Full Linux 3.8 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=5
-HOMEPAGE=http://www.kernel.org/ http://www.gentoo.org/ http://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svnwiki/selibre/linux-libre/
-IUSE=symlink build deblob
-KEYWORDS=~amd64
-LICENSE=GPL-2 !deblob? ( freedist )
-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.8.13_p15
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.8.13.xz mirror://kernel/linux/kernel/v3.x/linux-3.8.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-3.8 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-check -> deblob-check-3.8 ) mirror://kernel/linux/kernel/projects/rt/3.8/patch-3.8.13-rt15.patch.xz mirror://kernel/linux/kernel/projects/rt/3.8/older/patch-3.8.13-rt15.patch.xz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e0c9e88f5c560d202a3678c1e59b5d0d
diff --git a/metadata/md5-cache/www-client/chromium-37.0.2062.68 b/metadata/md5-cache/www-client/chromium-37.0.2062.68
index 3e728dc95787..642cf97723f2 100644
--- a/metadata/md5-cache/www-client/chromium-37.0.2062.68
+++ b/metadata/md5-cache/www-client/chromium-37.0.2062.68
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=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/glib:= dev-libs/icu:= >=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/libgnome-keyring:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=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/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=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/glib:= dev-libs/icu:= >=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/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=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/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=5
 HOMEPAGE=http://chromium.org/
 IUSE=bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
 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/glib:= dev-libs/icu:= >=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/libgnome-keyring:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=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/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/ttf-fonts tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+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/glib:= dev-libs/icu:= >=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/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=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/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 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-37.0.2062.68-lite.tar.xz
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	51ad5130f4a69b1a118ca5296de276ae	portability	a45c088f246ef5091e029f6285d7ce42	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0dda8eda9bfe7bb121cbddf5d436c13d
+_md5_=fdfb21d50d39c01bf0410b3114a16aaa
diff --git a/metadata/md5-cache/www-client/chromium-38.0.2125.0 b/metadata/md5-cache/www-client/chromium-38.0.2125.0
index 849029bde0a3..762488d8890e 100644
--- a/metadata/md5-cache/www-client/chromium-38.0.2125.0
+++ b/metadata/md5-cache/www-client/chromium-38.0.2125.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=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/glib:= dev-libs/icu:= >=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/libgnome-keyring:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=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/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/jinja[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/ply[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=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/glib:= dev-libs/icu:= >=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/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=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/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/jinja[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/ply[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=5
 HOMEPAGE=http://chromium.org/
 IUSE=bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
 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/glib:= dev-libs/icu:= >=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/libgnome-keyring:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=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/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+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/glib:= dev-libs/icu:= >=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/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=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/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-38.0.2125.0-lite.tar.xz
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	51ad5130f4a69b1a118ca5296de276ae	portability	a45c088f246ef5091e029f6285d7ce42	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e20e03d010a720dc2ea87e806aece7db
+_md5_=ac0de55e0975aca559d0644d7bb8e1cd
diff --git a/metadata/md5-cache/x11-misc/grsync-1.2.1 b/metadata/md5-cache/x11-misc/grsync-1.2.1
deleted file mode 100644
index a3b4db065089..000000000000
--- a/metadata/md5-cache/x11-misc/grsync-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-2.16:2 net-misc/rsync virtual/pkgconfig dev-util/intltool app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=A gtk frontend to rsync
-EAPI=4
-HOMEPAGE=http://www.opbyte.it/grsync/
-IUSE=debug
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.16:2 net-misc/rsync
-SLOT=0
-SRC_URI=http://www.opbyte.it/release/grsync-1.2.1.tar.gz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=644d9053d88c3847c4c6ce29647c243d
diff --git a/metadata/md5-cache/x11-misc/grsync-1.2.2 b/metadata/md5-cache/x11-misc/grsync-1.2.2
deleted file mode 100644
index eff5575902f9..000000000000
--- a/metadata/md5-cache/x11-misc/grsync-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-2.16:2 net-misc/rsync virtual/pkgconfig dev-util/intltool app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=A gtk frontend to rsync
-EAPI=4
-HOMEPAGE=http://www.opbyte.it/grsync/
-IUSE=debug
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.16:2 net-misc/rsync
-SLOT=0
-SRC_URI=http://www.opbyte.it/release/grsync-1.2.2.tar.gz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d93748f2fc54fa8e3a10fb6e8bc6e4cd
diff --git a/metadata/md5-cache/x11-misc/grsync-1.2.3 b/metadata/md5-cache/x11-misc/grsync-1.2.5
similarity index 89%
rename from metadata/md5-cache/x11-misc/grsync-1.2.3
rename to metadata/md5-cache/x11-misc/grsync-1.2.5
index 22007540192d..5565c4ffbeb8 100644
--- a/metadata/md5-cache/x11-misc/grsync-1.2.3
+++ b/metadata/md5-cache/x11-misc/grsync-1.2.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.16:2 net-misc/rsync
 SLOT=0
-SRC_URI=http://www.opbyte.it/release/grsync-1.2.3.tar.gz
+SRC_URI=http://www.opbyte.it/release/grsync-1.2.5.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=47dcc5ff80fed50f2dc7120269598c01
+_md5_=e72196c51a5cdb8e2df8d4a38def5520
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.29 b/metadata/md5-cache/x11-misc/xscreensaver-5.29
index 33926aaf1fe3..07d8176a5d7d 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.29
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.29
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appr
 SLOT=0
 SRC_URI=http://www.jwz.org/xscreensaver/xscreensaver-5.29.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=7d54e77792023ab709e246fd194f97f2
+_md5_=ce9e6a4a065e7917e5331eb6a3f97822
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6d80f31fa102..c7bda7970f5b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 22 Aug 2014 04:07:02 +0000
+Fri, 22 Aug 2014 14:07:06 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2aba776428d6..1196323c4670 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Aug 22 04:06:59 UTC 2014
+Fri Aug 22 14:07:02 UTC 2014
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index e90aa8d259da..c554a1a9c66e 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -2032,27 +2032,15 @@
 1408170054 ./sys-kernel/tuxonice-sources/tuxonice-sources-3.10.53.ebuild
 1408170054 ./sys-kernel/tuxonice-sources/tuxonice-sources-3.14.17.ebuild
 1408170054 ./sys-kernel/tuxonice-sources/tuxonice-sources-3.16.1.ebuild
-1408120502 ./sys-kernel/hardened-sources/hardened-sources-3.14.16.ebuild
-1407260027 ./sys-kernel/hardened-sources/hardened-sources-3.15.6.ebuild
-1408051553 ./sys-kernel/hardened-sources/hardened-sources-3.2.61-r5.ebuild
-1404081648 ./sys-kernel/hardened-sources/hardened-sources-3.2.55-r7.ebuild
+1408221531 ./sys-kernel/hardened-sources/hardened-sources-3.2.61-r5.ebuild
 1408211726 ./sys-kernel/hardened-sources/hardened-sources-3.15.10-r1.ebuild
-1407260026 ./sys-kernel/hardened-sources/hardened-sources-3.14.13.ebuild
-1408051557 ./sys-kernel/hardened-sources/hardened-sources-3.15.8.ebuild
+1408221531 ./sys-kernel/hardened-sources/hardened-sources-3.15.8.ebuild
 1407301631 ./sys-kernel/hardened-sources/hardened-sources-3.2.61-r2.ebuild
 1408211724 ./sys-kernel/hardened-sources/hardened-sources-3.2.62-r1.ebuild
-1408051555 ./sys-kernel/hardened-sources/hardened-sources-3.14.15.ebuild
-1407301831 ./sys-kernel/hardened-sources/hardened-sources-3.2.61-r4.ebuild
+1408221531 ./sys-kernel/hardened-sources/hardened-sources-3.14.15.ebuild
 1407301631 ./sys-kernel/hardened-sources/hardened-sources-3.14.12-r2.ebuild
-1406101449 ./sys-kernel/hardened-sources/hardened-sources-3.14.5-r2.ebuild
 1408211725 ./sys-kernel/hardened-sources/hardened-sources-3.14.17-r1.ebuild
-1407301835 ./sys-kernel/hardened-sources/hardened-sources-3.15.7.ebuild
-1405110358 ./sys-kernel/hardened-sources/hardened-sources-3.13.10.ebuild
 1407301631 ./sys-kernel/hardened-sources/hardened-sources-3.15.5-r2.ebuild
-1407301833 ./sys-kernel/hardened-sources/hardened-sources-3.14.14.ebuild
-1408120504 ./sys-kernel/hardened-sources/hardened-sources-3.15.9.ebuild
-1406101449 ./sys-kernel/hardened-sources/hardened-sources-3.2.59-r5.ebuild
-1407260022 ./sys-kernel/hardened-sources/hardened-sources-3.2.61-r3.ebuild
 1407122057 ./sys-kernel/openvz-sources/openvz-sources-2.6.32.92.2.ebuild
 1408172007 ./sys-kernel/openvz-sources/openvz-sources-2.6.32.93.4.ebuild
 1407272009 ./sys-kernel/openvz-sources/openvz-sources-2.6.32.92.3.ebuild
@@ -2209,8 +2197,7 @@
 1408110031 ./sys-kernel/ck-sources/ck-sources-3.6.11-r2.ebuild
 1312032251 ./sys-kernel/ck-sources/ck-sources-3.11.10.ebuild
 1404262006 ./sys-kernel/ck-sources/ck-sources-3.13.11.ebuild
-1308191609 ./sys-kernel/rt-sources/rt-sources-3.4.57_p72.ebuild
-1308191609 ./sys-kernel/rt-sources/rt-sources-3.8.13_p15.ebuild
+1408221538 ./sys-kernel/rt-sources/rt-sources-3.14.12_p9.ebuild
 1308191609 ./sys-kernel/rt-sources/rt-sources-3.10.6_p3.ebuild
 0903241734 ./dev-ada/aunit/aunit-2.03.ebuild
 0903241734 ./dev-ada/aunit/aunit-1.05.ebuild
@@ -5243,7 +5230,7 @@
 1312081950 ./x11-misc/devilspie2/devilspie2-0.31.ebuild
 1404221641 ./x11-misc/devilspie2/devilspie2-0.33.ebuild
 1206240331 ./x11-misc/autocutsel/autocutsel-0.9.0.ebuild
-1408201231 ./x11-misc/xscreensaver/xscreensaver-5.29.ebuild
+1408221131 ./x11-misc/xscreensaver/xscreensaver-5.29.ebuild
 1403191752 ./x11-misc/xscreensaver/xscreensaver-5.26.ebuild
 1404011042 ./x11-misc/e16keyedit/e16keyedit-0.7.ebuild
 1212282205 ./x11-misc/e16keyedit/e16keyedit-0.4.ebuild
@@ -5313,10 +5300,8 @@
 1408091331 ./x11-misc/synergy/synergy-1.4.16_p1969.ebuild
 1408091331 ./x11-misc/synergy/synergy-1.5.0_p2278.ebuild
 1205050853 ./x11-misc/gromit/gromit-20041213-r1.ebuild
-1210231554 ./x11-misc/grsync/grsync-1.2.2.ebuild
 1407222331 ./x11-misc/grsync/grsync-1.2.4.ebuild
-1205050853 ./x11-misc/grsync/grsync-1.2.1.ebuild
-1301172341 ./x11-misc/grsync/grsync-1.2.3.ebuild
+1408221152 ./x11-misc/grsync/grsync-1.2.5.ebuild
 1208271730 ./x11-misc/openbox-menu/openbox-menu-0.3.6.7.ebuild
 1308250347 ./x11-misc/openbox-menu/openbox-menu-0.5.0.ebuild
 1306251658 ./x11-misc/openbox-menu/openbox-menu-0.3.6.8.ebuild
@@ -5567,10 +5552,10 @@
 1304211148 ./www-client/netsurf/netsurf-2.9.ebuild
 1406250217 ./www-client/netsurf/netsurf-3.0-r2.ebuild
 1308222050 ./www-client/netsurf/netsurf-3.0-r1.ebuild
-1408080701 ./www-client/chromium/chromium-37.0.2062.68.ebuild
+1408221131 ./www-client/chromium/chromium-37.0.2062.68.ebuild
 1408172331 ./www-client/chromium/chromium-36.0.1985.143.ebuild
 1408132101 ./www-client/chromium/chromium-38.0.2121.3.ebuild
-1408192138 ./www-client/chromium/chromium-38.0.2125.0.ebuild
+1408221131 ./www-client/chromium/chromium-38.0.2125.0.ebuild
 1407310820 ./www-client/chromium/chromium-37.0.2062.58.ebuild
 1403120648 ./www-client/epiphany-extensions/epiphany-extensions-2.32.0-r1.ebuild
 1408211631 ./www-client/opera-developer/opera-developer-25.0.1597.0.ebuild
@@ -10858,10 +10843,8 @@
 1305220822 ./sys-block/vblade/vblade-21.ebuild
 1107171507 ./sys-block/vblade/vblade-19.ebuild
 1309191735 ./sys-block/arcconf/arcconf-1.2.20618.ebuild
-1408110031 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8-r2.ebuild
-1408110031 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.3.2-r1.ebuild
+1408221601 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.3.2-r1.ebuild
 1408110031 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8-r1.ebuild
-1408110031 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.3.2.ebuild
 1310032150 ./sys-block/iscsitarget/iscsitarget-1.4.20.2.ebuild
 1310032150 ./sys-block/iscsitarget/iscsitarget-0.4.17.ebuild
 1310032150 ./sys-block/iscsitarget/iscsitarget-9999.ebuild
@@ -14473,7 +14456,7 @@
 1304252250 ./media-libs/libvorbis/libvorbis-1.3.3.ebuild
 1406182351 ./media-libs/libvorbis/libvorbis-1.3.3-r1.ebuild
 1408091501 ./media-libs/libvorbis/libvorbis-1.3.4.ebuild
-1408080001 ./media-libs/xine-lib/xine-lib-1.2.6.ebuild
+1408221601 ./media-libs/xine-lib/xine-lib-1.2.6.ebuild
 1407171101 ./media-libs/xine-lib/xine-lib-1.2.9999.ebuild
 1406222149 ./media-libs/xine-lib/xine-lib-1.2.3.ebuild
 0810080304 ./media-libs/libclxclient/libclxclient-3.6.1.ebuild
@@ -16109,6 +16092,7 @@
 1401150337 ./sys-apps/s390-tools/s390-tools-1.17.0.ebuild
 1311060637 ./sys-apps/s390-tools/s390-tools-1.13.0.ebuild
 1408201201 ./sys-apps/systemd/systemd-9999.ebuild
+1408221422 ./sys-apps/systemd/systemd-216.ebuild
 1408200131 ./sys-apps/systemd/systemd-212-r5.ebuild
 1408200131 ./sys-apps/systemd/systemd-215-r3.ebuild
 1403251503 ./sys-apps/netplug/netplug-1.2.9.2-r1.ebuild
@@ -18573,9 +18557,9 @@
 1010010657 ./net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r2.ebuild
 1408110101 ./net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild
 1408110101 ./net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild
-1408211531 ./net-misc/nx/nx-3.5.0.27.ebuild
-1405211048 ./net-misc/nx/nx-3.5.0.24.ebuild
-1306111420 ./net-misc/nx/nx-3.5.0.20.ebuild
+1408221231 ./net-misc/nx/nx-3.5.0.27.ebuild
+1408221231 ./net-misc/nx/nx-3.5.0.24.ebuild
+1408221231 ./net-misc/nx/nx-3.5.0.20.ebuild
 1407240631 ./net-misc/arm/arm-1.4.5.0_p20140714-r2.ebuild
 1206081612 ./net-misc/arm/arm-1.4.5.0.ebuild
 1205050720 ./net-misc/bti/bti-031.ebuild
@@ -18694,9 +18678,8 @@
 1208211720 ./net-misc/raccess/raccess-0.7.ebuild
 1403251420 ./net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
 1305251144 ./net-misc/lksctp-tools/lksctp-tools-1.0.13.ebuild
-1406261849 ./net-misc/x2goserver/x2goserver-4.0.1.15.ebuild
-1406261849 ./net-misc/x2goserver/x2goserver-4.0.1.12.ebuild
-1406261849 ./net-misc/x2goserver/x2goserver-4.0.1.13.ebuild
+1408221331 ./net-misc/x2goserver/x2goserver-4.0.1.15.ebuild
+1408221331 ./net-misc/x2goserver/x2goserver-4.0.1.12.ebuild
 0802031429 ./net-misc/ng-utils/ng-utils-0.6.ebuild
 1408110101 ./net-misc/clusterssh/clusterssh-9999.ebuild
 1402141523 ./net-misc/clusterssh/clusterssh-4.01.05.ebuild
@@ -18729,9 +18712,8 @@
 1408110101 ./net-misc/guacamole-server/guacamole-server-0.8.3.ebuild
 1408110101 ./net-misc/guacamole-server/guacamole-server-0.9.0.ebuild
 1301291546 ./net-misc/knutclient/knutclient-1.0.5.ebuild
+1408221600 ./net-misc/dibbler/dibbler-1.0.0_rc2.ebuild
 1402221207 ./net-misc/dibbler/dibbler-0.8.4.ebuild
-1311091930 ./net-misc/dibbler/dibbler-0.8.3-r1.ebuild
-1109210403 ./net-misc/dibbler/dibbler-0.7.3.ebuild
 1403020219 ./net-misc/remmina/remmina-9999.ebuild
 1403020219 ./net-misc/remmina/remmina-1.0.0_p20130723.ebuild
 1204031409 ./net-misc/nut-monitor/nut-monitor-1.3-r2.ebuild
@@ -18822,6 +18804,7 @@
 1408210306 ./net-misc/putty/putty-0.63_p20140820.ebuild
 1404161953 ./net-misc/putty/putty-0.63_p20140416.ebuild
 1407310212 ./net-misc/radvd/radvd-2.3.ebuild
+1408220836 ./net-misc/radvd/radvd-2.5.ebuild
 1403241910 ./net-misc/radvd/radvd-1.9.8.ebuild
 1407310207 ./net-misc/radvd/radvd-1.15.ebuild
 1312070248 ./net-misc/pycnb/pycnb-0.0.4.ebuild
@@ -19004,6 +18987,7 @@
 1303262054 ./net-misc/blogtk/blogtk-2.0-r1.ebuild
 1408110101 ./net-misc/aggregate/aggregate-1.6.ebuild
 0801182145 ./net-misc/fmirror/fmirror-0.8.4-r2.ebuild
+1408221201 ./net-misc/youtube-dl/youtube-dl-2014.08.22.2.ebuild
 1407191931 ./net-misc/youtube-dl/youtube-dl-2014.07.15.ebuild
 1408212236 ./net-misc/youtube-dl/youtube-dl-2014.08.21.3.ebuild
 0909112141 ./net-misc/cgterm/cgterm-1.6.ebuild
@@ -19140,10 +19124,10 @@
 1010171330 ./net-misc/jwhois/jwhois-3.2.3-r1.ebuild
 1407182131 ./net-misc/lanmap/lanmap-81-r1.ebuild
 1312082332 ./net-misc/sparkleshare/sparkleshare-1.1.0.ebuild
-1408110101 ./net-misc/openvswitch/openvswitch-1.9.0.ebuild
 1402170907 ./net-misc/openvswitch/openvswitch-2.0.0-r3.ebuild
 1408110101 ./net-misc/openvswitch/openvswitch-1.11.0.ebuild
-1408110101 ./net-misc/openvswitch/openvswitch-1.9.0-r1.ebuild
+1408220828 ./net-misc/openvswitch/openvswitch-2.3.0.ebuild
+1408220828 ./net-misc/openvswitch/openvswitch-2.1.3.ebuild
 1407181824 ./net-misc/apt-cacher-ng/apt-cacher-ng-0.7.27.ebuild
 1407181824 ./net-misc/apt-cacher-ng/apt-cacher-ng-0.8.0_pre1.ebuild
 1406241720 ./net-misc/apt-cacher-ng/apt-cacher-ng-0.7.26-r1.ebuild
@@ -19933,7 +19917,7 @@
 1401261601 ./app-office/calligra-l10n/calligra-l10n-2.7.5.ebuild
 1406161438 ./app-office/calligra-l10n/calligra-l10n-2.8.3.ebuild
 1408141131 ./app-office/scribus/scribus-1.4.9999.ebuild
-1408211202 ./app-office/scribus/scribus-1.4.4-r1.ebuild
+1408221201 ./app-office/scribus/scribus-1.4.4-r1.ebuild
 1408141131 ./app-office/scribus/scribus-9999.ebuild
 1408141115 ./app-office/scribus/scribus-1.4.3.ebuild
 1407262301 ./app-office/hourglass/hourglass-0.7.2.ebuild
@@ -21518,6 +21502,8 @@
 1408110101 ./dev-lang/php/php-5.4.30.ebuild
 1408211401 ./dev-lang/php/php-5.3.29.ebuild
 1408110101 ./dev-lang/php/php-5.6.0_beta2.ebuild
+1408221329 ./dev-lang/php/php-5.5.16.ebuild
+1408221221 ./dev-lang/php/php-5.4.32.ebuild
 1408110101 ./dev-lang/php/php-5.3.28-r3.ebuild
 1408110101 ./dev-lang/php/php-5.6.0_rc1.ebuild
 1408110101 ./dev-lang/php/php-5.6.0_beta1.ebuild
@@ -22876,6 +22862,7 @@
 1408110101 ./dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r7.ebuild
 1408110101 ./dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r5.ebuild
 1408110101 ./dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild
+1408221535 ./dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
 1408110101 ./dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r4.ebuild
 1101191722 ./dev-libs/cxxtools/cxxtools-1.4.8.ebuild
 1401240131 ./dev-libs/cxxtools/cxxtools-2.2.1.ebuild
@@ -24372,7 +24359,7 @@
 1109040104 ./dev-perl/XML-Dumper/XML-Dumper-0.810.0.ebuild
 1307311701 ./dev-perl/Archive-Rar/Archive-Rar-2.20.0.ebuild
 1402191437 ./dev-perl/Archive-Zip/Archive-Zip-1.370.0.ebuild
-1402020401 ./dev-perl/Archive-Zip/Archive-Zip-1.300.0.ebuild
+1408221801 ./dev-perl/Archive-Zip/Archive-Zip-1.300.0-r1.ebuild
 1108301530 ./dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.70.0.ebuild
 1303031431 ./dev-perl/perl-tk/perl-tk-804.30.0.ebuild
 1308131556 ./dev-perl/perl-tk/perl-tk-804.31.0.ebuild
@@ -24790,6 +24777,7 @@
 1408052031 ./dev-ruby/nokogiri/nokogiri-1.5.10.ebuild
 1408052031 ./dev-ruby/nokogiri/nokogiri-1.5.5.ebuild
 1408151131 ./dev-ruby/nokogiri/nokogiri-1.6.0.ebuild
+1408221127 ./dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild
 1408052031 ./dev-ruby/sass/sass-3.3.14.ebuild
 1408052031 ./dev-ruby/sass/sass-3.2.19-r1.ebuild
 1408052031 ./dev-ruby/sass/sass-3.3.11.ebuild
@@ -24999,6 +24987,7 @@
 1408152201 ./dev-ruby/spork/spork-0.9.2.ebuild
 1408052031 ./dev-ruby/spork/spork-0.9.2-r1.ebuild
 1408020701 ./dev-ruby/stamp/stamp-0.5.0-r1.ebuild
+1408221046 ./dev-ruby/stamp/stamp-0.6.0.ebuild
 1404190731 ./dev-ruby/stomp/stomp-1.2.16.ebuild
 1408061131 ./dev-ruby/stomp/stomp-1.3.2.ebuild
 1404051931 ./dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild
@@ -26081,7 +26070,6 @@
 1405021301 ./dev-util/glade/glade-3.18.2.ebuild
 1406062031 ./dev-util/gperf/gperf-3.0.4.ebuild
 1407171101 ./dev-util/reviewboard/reviewboard-1.7.7.1-r1.ebuild
-1407171101 ./dev-util/reviewboard/reviewboard-1.7.12.ebuild
 1306162002 ./dev-util/reviewboard/reviewboard-1.7.7.1.ebuild
 1206241201 ./dev-util/kelbt/kelbt-0.15.ebuild
 1202241901 ./dev-util/flawfinder/flawfinder-1.27-r2.ebuild
@@ -27247,13 +27235,15 @@
 1407171101 ./dev-python/numba/numba-0.12.2.ebuild
 1407171101 ./dev-python/numba/numba-0.13.0.ebuild
 1406161528 ./dev-python/numba/numba-0.13.2.ebuild
-1408141031 ./dev-python/numpy/numpy-1.8.1.ebuild
+1408221509 ./dev-python/numpy/numpy-1.8.2.ebuild
+1408221531 ./dev-python/numpy/numpy-1.8.1.ebuild
 1404020601 ./dev-python/numpy/numpy-1.8.0-r1.ebuild
 1312031657 ./dev-python/paste/paste-1.7.5.1-r2.ebuild
 1205170201 ./dev-python/paste/paste-1.7.5.1.ebuild
 1310221831 ./dev-python/paste/paste-1.7.5.1-r1.ebuild
 1402030438 ./dev-python/patsy/patsy-0.2.1.ebuild
-1309141201 ./dev-python/patsy/patsy-0.2.0.ebuild
+1408221131 ./dev-python/patsy/patsy-0.2.0.ebuild
+1408221113 ./dev-python/patsy/patsy-0.3.0.ebuild
 1408211701 ./dev-python/paver/paver-1.2.0.ebuild
 1408211701 ./dev-python/paver/paver-1.2.2.ebuild
 1408211701 ./dev-python/paver/paver-1.1.1.ebuild
@@ -29794,12 +29784,8 @@
 1408110031 ./sys-fs/fuse/fuse-2.9.2.ebuild
 1408110031 ./sys-fs/fuse/fuse-2.9.3.ebuild
 1005230557 ./sys-fs/lufs/lufs-0.9.7-r3.ebuild
-1408110031 ./sys-fs/lvm2/lvm2-2.02.106.ebuild
-1408110031 ./sys-fs/lvm2/lvm2-2.02.108.ebuild
 1408110031 ./sys-fs/lvm2/lvm2-2.02.103.ebuild
-1408110031 ./sys-fs/lvm2/lvm2-2.02.107.ebuild
-1408201823 ./sys-fs/lvm2/lvm2-2.02.109.ebuild
-1408110031 ./sys-fs/lvm2/lvm2-2.02.105-r2.ebuild
+1408221601 ./sys-fs/lvm2/lvm2-2.02.109.ebuild
 1407242331 ./sys-fs/ncdu/ncdu-1.9.ebuild
 1403141451 ./sys-fs/ncdu/ncdu-1.10.ebuild
 1403042357 ./sys-fs/s3fs/s3fs-1.74.ebuild
@@ -29883,7 +29869,7 @@
 1407171101 ./sys-fs/eudev/eudev-9999.ebuild
 1408211604 ./sys-fs/mdadm/mdadm-3.3.2.ebuild
 1309252130 ./sys-fs/mdadm/mdadm-3.2.6-r1.ebuild
-1407182001 ./sys-fs/mdadm/mdadm-3.3.1-r2.ebuild
+1408221601 ./sys-fs/mdadm/mdadm-3.3.1-r2.ebuild
 0502201914 ./sys-fs/lufis/lufis-0.3.ebuild
 0501232234 ./sys-fs/lufis/lufis-0.2.ebuild
 1112152243 ./sys-fs/mp3fs/mp3fs-0.30.ebuild
@@ -29943,18 +29929,15 @@
 1301220220 ./sys-fs/iprutils/iprutils-2.3.0.ebuild
 1408110031 ./sys-fs/fatsort/fatsort-1.2.ebuild
 1408110031 ./sys-fs/fatsort/fatsort-1.3.ebuild
-1406201000 ./sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild
+1408221401 ./sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild
 1403102334 ./sys-fs/btrfs-progs/btrfs-progs-3.12-r2.ebuild
 1302040650 ./sys-fs/btrfs-progs/btrfs-progs-0.20_rc1_p56.ebuild
 1210170734 ./sys-fs/btrfs-progs/btrfs-progs-0.19.11.ebuild
-1406200105 ./sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
-1404290550 ./sys-fs/btrfs-progs/btrfs-progs-3.14.1.ebuild
+1408221401 ./sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
 1311301240 ./sys-fs/btrfs-progs/btrfs-progs-3.12.ebuild
 1301061511 ./sys-fs/btrfs-progs/btrfs-progs-0.20_rc1.ebuild
 1401051446 ./sys-fs/btrfs-progs/btrfs-progs-3.12-r1.ebuild
 1205111815 ./sys-fs/btrfs-progs/btrfs-progs-0.19-r3.ebuild
-1405201847 ./sys-fs/btrfs-progs/btrfs-progs-3.14.1-r1.ebuild
-1404150026 ./sys-fs/btrfs-progs/btrfs-progs-3.14_pre20140414.ebuild
 1307250623 ./sys-fs/btrfs-progs/btrfs-progs-0.20_rc1_p358.ebuild
 1408110031 ./sys-fs/sshfs-fuse/sshfs-fuse-2.4.ebuild
 1408110031 ./sys-fs/sshfs-fuse/sshfs-fuse-2.5.ebuild
@@ -30003,6 +29986,7 @@
 1403161322 ./sys-fs/udiskie/udiskie-0.6.4.ebuild
 1408030852 ./sys-fs/udiskie/udiskie-1.1.1.ebuild
 1404182357 ./sys-fs/cachefilesd/cachefilesd-0.10.5-r2.ebuild
+1408221741 ./sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild
 1406081713 ./sys-fs/cachefilesd/cachefilesd-0.10.5-r3.ebuild
 1408091631 ./sys-fs/genext2fs/genext2fs-1.4.1.ebuild
 0703070316 ./sys-fs/genext2fs/genext2fs-1.4.ebuild
@@ -36888,8 +36872,8 @@
 1408110131 ./net-analyzer/zabbix/zabbix-2.0.12.ebuild
 1408110131 ./net-analyzer/zabbix/zabbix-2.2.5.ebuild
 1407201754 ./net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild
+1408220927 ./net-analyzer/icinga2/icinga2-2.0.2.ebuild
 1407170705 ./net-analyzer/icinga2/icinga2-2.0.1.ebuild
-1406161935 ./net-analyzer/icinga2/icinga2-2.0.0.ebuild
 1404131834 ./net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild
 1407111624 ./net-analyzer/flow-tools/flow-tools-0.68.5.1-r3.ebuild
 1408110131 ./net-analyzer/zniper/zniper-1.0-r1.ebuild
@@ -39543,7 +39527,6 @@
 1407111303 metadata/md5-cache/x11-plugins/asmon-0.71
 1408110037 metadata/md5-cache/x11-plugins/wmmenu-1.2-r1
 1407281837 metadata/md5-cache/sys-kernel/gentoo-sources-3.12.9999
-1407111301 metadata/md5-cache/sys-kernel/rt-sources-3.8.13_p15
 1408170436 metadata/md5-cache/sys-kernel/git-sources-3.17_rc1
 1407281837 metadata/md5-cache/sys-kernel/raspberrypi-image-3.10.9999
 1408110037 metadata/md5-cache/sys-kernel/ck-sources-3.6.11-r2
@@ -39572,11 +39555,7 @@
 1407111301 metadata/md5-cache/sys-kernel/linux-headers-3.7
 1407111301 metadata/md5-cache/sys-kernel/linux-headers-3.8
 1407111301 metadata/md5-cache/sys-kernel/linux-headers-3.9
-1407111301 metadata/md5-cache/sys-kernel/hardened-sources-3.13.10
-1407260036 metadata/md5-cache/sys-kernel/hardened-sources-3.14.13
-1407301906 metadata/md5-cache/sys-kernel/hardened-sources-3.14.14
-1408051606 metadata/md5-cache/sys-kernel/hardened-sources-3.14.15
-1408120536 metadata/md5-cache/sys-kernel/hardened-sources-3.14.16
+1408221536 metadata/md5-cache/sys-kernel/hardened-sources-3.14.15
 1407111301 metadata/md5-cache/sys-kernel/ck-sources-3.10.24
 1407111301 metadata/md5-cache/sys-kernel/ck-sources-3.10.32
 1407111301 metadata/md5-cache/sys-kernel/ck-sources-3.10.39
@@ -39606,7 +39585,6 @@
 1407111301 metadata/md5-cache/sys-kernel/ck-sources-3.4.89
 1407111301 metadata/md5-cache/sys-kernel/ck-sources-3.8.13
 1407111301 metadata/md5-cache/sys-kernel/mips-sources-2.6.29.1
-1407111301 metadata/md5-cache/sys-kernel/hardened-sources-3.14.5-r2
 1407281837 metadata/md5-cache/sys-kernel/gentoo-sources-3.4.9999
 1407301636 metadata/md5-cache/sys-kernel/hardened-sources-3.15.5-r2
 1407111301 metadata/md5-cache/sys-kernel/linux-headers-3.10
@@ -39635,12 +39613,8 @@
 1407301636 metadata/md5-cache/sys-kernel/hardened-sources-3.14.12-r2
 1408211736 metadata/md5-cache/sys-kernel/hardened-sources-3.14.17-r1
 1407111301 metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
-1407111301 metadata/md5-cache/sys-kernel/hardened-sources-3.2.55-r7
-1407111301 metadata/md5-cache/sys-kernel/hardened-sources-3.2.59-r5
 1407301636 metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r2
-1407260036 metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r3
-1407301906 metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r4
-1408051606 metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r5
+1408221536 metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r5
 1408211736 metadata/md5-cache/sys-kernel/hardened-sources-3.2.62-r1
 1310031936 metadata/md5-cache/sys-kernel/raspberrypi-image-3.11.2_pre-r20130926
 1407111301 metadata/md5-cache/sys-kernel/pf-sources-3.10.1
@@ -39698,15 +39672,12 @@
 1407111301 metadata/md5-cache/sys-kernel/raspberrypi-sources-3.6.11-r20130711
 1407111301 metadata/md5-cache/sys-kernel/aufs-sources-3.10.41-r1
 1407111301 metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
-1407260036 metadata/md5-cache/sys-kernel/hardened-sources-3.15.6
-1407301906 metadata/md5-cache/sys-kernel/hardened-sources-3.15.7
-1408051606 metadata/md5-cache/sys-kernel/hardened-sources-3.15.8
-1408120536 metadata/md5-cache/sys-kernel/hardened-sources-3.15.9
+1408221536 metadata/md5-cache/sys-kernel/hardened-sources-3.15.8
+1408221606 metadata/md5-cache/sys-kernel/rt-sources-3.14.12_p9
 1407281837 metadata/md5-cache/sys-kernel/linux-firmware-99999999
 1408151206 metadata/md5-cache/sys-kernel/aufs-sources-3.16.1
 1408110037 metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5
 1408110037 metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.8
-1407111301 metadata/md5-cache/sys-kernel/rt-sources-3.4.57_p72
 1408110037 metadata/md5-cache/sys-kernel/ck-sources-3.5.7-r2
 1408121640 metadata/md5-cache/sys-kernel/spl-0.6.0_rc13-r2
 1408121640 metadata/md5-cache/sys-kernel/spl-0.6.0_rc14-r3
@@ -42749,10 +42720,8 @@
 1408121909 metadata/md5-cache/x11-misc/screengrab-1.0
 1408121641 metadata/md5-cache/x11-misc/cairo-clock-0.3.3
 1408110037 metadata/md5-cache/x11-misc/cairo-clock-0.3.4
-1407111303 metadata/md5-cache/x11-misc/grsync-1.2.1
-1407111303 metadata/md5-cache/x11-misc/grsync-1.2.2
-1407111303 metadata/md5-cache/x11-misc/grsync-1.2.3
 1407222336 metadata/md5-cache/x11-misc/grsync-1.2.4
+1408221206 metadata/md5-cache/x11-misc/grsync-1.2.5
 1211091753 metadata/md5-cache/x11-misc/grabc-1.1
 1408121641 metadata/md5-cache/x11-misc/xaos-3.5-r1
 1408121909 metadata/md5-cache/x11-misc/andromeda-0.2.1
@@ -43027,7 +42996,7 @@
 1407111303 metadata/md5-cache/x11-misc/xkeycaps-2.47-r1
 1407111303 metadata/md5-cache/x11-misc/xdesktopwaves-1.3-r1
 1408121641 metadata/md5-cache/x11-misc/xscreensaver-5.26
-1408201236 metadata/md5-cache/x11-misc/xscreensaver-5.29
+1408221136 metadata/md5-cache/x11-misc/xscreensaver-5.29
 1408110037 metadata/md5-cache/x11-misc/wmakerconf-2.12
 1407111303 metadata/md5-cache/x11-misc/genmenu-1.1.0
 1407290137 metadata/md5-cache/x11-misc/kdocker-4.8-r2
@@ -43048,7 +43017,7 @@
 1408181309 metadata/md5-cache/www-client/weboob-0h
 1408110037 metadata/md5-cache/www-client/fetch-1.0-r1
 1408110512 metadata/md5-cache/www-client/chromium-37.0.2062.58
-1408110512 metadata/md5-cache/www-client/chromium-37.0.2062.68
+1408221136 metadata/md5-cache/www-client/chromium-37.0.2062.68
 1408121640 metadata/md5-cache/www-client/jd-2.8.5_p120826
 1408121640 metadata/md5-cache/www-client/seamonkey-2.26.1
 1407111301 metadata/md5-cache/www-client/conkeror-1.0_pre20140212
@@ -43146,7 +43115,7 @@
 1407111301 metadata/md5-cache/www-client/firefox-bin-24.6.0
 1408042336 metadata/md5-cache/www-client/firefox-bin-24.7.0
 1408132136 metadata/md5-cache/www-client/chromium-38.0.2121.3
-1408192206 metadata/md5-cache/www-client/chromium-38.0.2125.0
+1408221136 metadata/md5-cache/www-client/chromium-38.0.2125.0
 1407111301 metadata/md5-cache/www-client/luakit-2012.09.13_p1-r1
 1408211636 metadata/md5-cache/www-client/opera-developer-25.0.1597.0
 1408170807 metadata/md5-cache/www-client/netsurf-3.0-r1
@@ -48262,8 +48231,7 @@
 1408110511 metadata/md5-cache/sys-block/iscsitarget-1.4.20.2_p20130821
 1211091751 metadata/md5-cache/sys-block/qla-fc-firmware-20071207-r1
 1408121640 metadata/md5-cache/sys-block/thin-provisioning-tools-0.2.8-r1
-1408121640 metadata/md5-cache/sys-block/thin-provisioning-tools-0.2.8-r2
-1408121640 metadata/md5-cache/sys-block/thin-provisioning-tools-0.3.2-r1
+1408221606 metadata/md5-cache/sys-block/thin-provisioning-tools-0.3.2-r1
 1408121909 metadata/md5-cache/sys-block/partitionmanager-1.1.0
 1406271236 metadata/md5-cache/sys-block/sas3ircu-5
 1408121640 metadata/md5-cache/sys-block/partimage-0.6.8
@@ -48388,7 +48356,6 @@
 1408110511 metadata/md5-cache/sys-block/iscsitarget-9999
 1408110511 metadata/md5-cache/sys-block/tgt-1.0.24-r1
 1408121640 metadata/md5-cache/sys-block/parted-3.1-r1
-1408121640 metadata/md5-cache/sys-block/thin-provisioning-tools-0.3.2
 1407111300 metadata/md5-cache/sys-block/megamgr-5.20-r2
 1408181309 metadata/md5-cache/sys-block/fio-2.1.10-r1
 1408181309 metadata/md5-cache/sys-block/fio-2.1.11-r1
@@ -52078,7 +52045,7 @@
 1408170807 metadata/md5-cache/media-libs/soxr-0.1.1
 1407111253 metadata/md5-cache/media-libs/sdl2-net-2.0.0
 1408110510 metadata/md5-cache/media-libs/xine-lib-1.2.3
-1408110510 metadata/md5-cache/media-libs/xine-lib-1.2.6
+1408221606 metadata/md5-cache/media-libs/xine-lib-1.2.6
 1407111252 metadata/md5-cache/media-libs/libclthreads-1.0.2
 1407111252 metadata/md5-cache/media-libs/libclthreads-2.2.1
 1305251236 metadata/md5-cache/media-libs/libmpdclient-2.8
@@ -53759,6 +53726,7 @@
 1408110511 metadata/md5-cache/sys-apps/net-tools-1.60_p20110409135728
 1407111259 metadata/md5-cache/sys-apps/baselayout-prefix-2.2-r3
 1408121640 metadata/md5-cache/sys-apps/fakechroot-2.9
+1408221436 metadata/md5-cache/sys-apps/systemd-216
 1408121640 metadata/md5-cache/sys-apps/accountsservice-0.6.35
 1407111259 metadata/md5-cache/sys-apps/accountsservice-0.6.37
 1310210136 metadata/md5-cache/sys-apps/collectl-3.6.9
@@ -56200,6 +56168,7 @@
 1408110511 metadata/md5-cache/net-misc/netkit-rsh-0.17-r10
 1407111255 metadata/md5-cache/net-misc/aget-0.4.1-r1
 1408212306 metadata/md5-cache/net-misc/youtube-dl-2014.08.21.3
+1408221206 metadata/md5-cache/net-misc/youtube-dl-2014.08.22.2
 1211091747 metadata/md5-cache/net-misc/6tunnel-0.11_rc1
 1407111256 metadata/md5-cache/net-misc/networkmanager-openvpn-0.9.8.4
 1407111256 metadata/md5-cache/net-misc/netkit-fingerd-0.17-r3
@@ -56238,6 +56207,7 @@
 1407171006 metadata/md5-cache/net-misc/tinc-1.1_pre10
 1407111255 metadata/md5-cache/net-misc/blogtk-2.0-r1
 1407111256 metadata/md5-cache/net-misc/netkit-talk-0.17-r5
+1408221606 metadata/md5-cache/net-misc/dibbler-1.0.0_rc2
 1407111255 metadata/md5-cache/net-misc/htun-0.9.6
 1408110511 metadata/md5-cache/net-misc/clockspeed-0.62-r6
 1408181308 metadata/md5-cache/net-misc/flexget-1.1.138
@@ -56296,6 +56266,7 @@
 1407111256 metadata/md5-cache/net-misc/rwhoisd-1.5.9.5-r1
 1408121639 metadata/md5-cache/net-misc/smbc-1.2.2-r2
 1407310236 metadata/md5-cache/net-misc/radvd-2.3
+1408220906 metadata/md5-cache/net-misc/radvd-2.5
 1408121639 metadata/md5-cache/net-misc/portspoof-9999
 1408121639 metadata/md5-cache/net-misc/nxsadmin-0.2.1
 1408121908 metadata/md5-cache/net-misc/badvpn-1.999.126
@@ -56333,7 +56304,6 @@
 1408121639 metadata/md5-cache/net-misc/sitecopy-0.16.6_p3
 1407111256 metadata/md5-cache/net-misc/sparkleshare-1.1.0
 1408121639 metadata/md5-cache/net-misc/mediatomb-0.12.2_pre20140810
-1407111255 metadata/md5-cache/net-misc/dibbler-0.7.3
 1407111255 metadata/md5-cache/net-misc/dibbler-0.8.4
 1407192236 metadata/md5-cache/net-misc/iperf-2.0.5
 1408121639 metadata/md5-cache/net-misc/iperf-3.0.5
@@ -56513,7 +56483,6 @@
 1408121908 metadata/md5-cache/net-misc/remmina-9999
 1407141936 metadata/md5-cache/net-misc/dhcpcd-9999
 1408121639 metadata/md5-cache/net-misc/openssh-6.6_p1-r1
-1408110107 metadata/md5-cache/net-misc/openvswitch-1.9.0-r1
 1408121639 metadata/md5-cache/net-misc/arpd-0.2-r1
 1407111255 metadata/md5-cache/net-misc/aria2-1.15.2
 1407111255 metadata/md5-cache/net-misc/aria2-1.16.3
@@ -56600,11 +56569,11 @@
 1407111256 metadata/md5-cache/net-misc/slimrat-9999
 1407111256 metadata/md5-cache/net-misc/wput-0.6.1
 1408110511 metadata/md5-cache/net-misc/iputils-20101006-r2
-1408110107 metadata/md5-cache/net-misc/openvswitch-1.9.0
-1407111256 metadata/md5-cache/net-misc/x2goserver-4.0.1.12
-1407111256 metadata/md5-cache/net-misc/x2goserver-4.0.1.13
-1407111256 metadata/md5-cache/net-misc/x2goserver-4.0.1.15
+1408221336 metadata/md5-cache/net-misc/x2goserver-4.0.1.12
+1408221336 metadata/md5-cache/net-misc/x2goserver-4.0.1.15
 1407111256 metadata/md5-cache/net-misc/nemesis-1.4
+1408220836 metadata/md5-cache/net-misc/openvswitch-2.1.3
+1408220836 metadata/md5-cache/net-misc/openvswitch-2.3.0
 1407111256 metadata/md5-cache/net-misc/networkmanager-vpnc-0.9.8.6
 1408121639 metadata/md5-cache/net-misc/npapi-sdk-0.27
 1408121639 metadata/md5-cache/net-misc/npapi-sdk-9999
@@ -56669,9 +56638,9 @@
 1408121639 metadata/md5-cache/net-misc/miredo-1.2.6
 1408110107 metadata/md5-cache/net-misc/redir-2.2.1
 1408121639 metadata/md5-cache/net-misc/l7-filter-userspace-0.11
-1408121639 metadata/md5-cache/net-misc/nx-3.5.0.20
-1408121639 metadata/md5-cache/net-misc/nx-3.5.0.24
-1408211536 metadata/md5-cache/net-misc/nx-3.5.0.27
+1408221236 metadata/md5-cache/net-misc/nx-3.5.0.20
+1408221236 metadata/md5-cache/net-misc/nx-3.5.0.24
+1408221236 metadata/md5-cache/net-misc/nx-3.5.0.27
 1407111255 metadata/md5-cache/net-misc/ethercard-diag-20050321.1g
 1408121639 metadata/md5-cache/net-misc/asterisk-12.3.2
 1408121639 metadata/md5-cache/net-misc/asterisk-12.4.0
@@ -56909,7 +56878,6 @@
 1407111256 metadata/md5-cache/net-misc/suite3270-3.3.7_p8
 1407111256 metadata/md5-cache/net-misc/networkmanager-pptp-0.9.8.4
 1407111256 metadata/md5-cache/net-misc/ipsc-0.4.3.2-r2
-1407111255 metadata/md5-cache/net-misc/dibbler-0.8.3-r1
 1408110511 metadata/md5-cache/net-misc/iputils-99999999
 1407111256 metadata/md5-cache/net-misc/vpncwatch-1.8.1
 1407162236 metadata/md5-cache/net-misc/aiccu-2007.01.15-r4
@@ -57493,7 +57461,7 @@
 1407111238 metadata/md5-cache/app-office/odeskteam-3.6.1
 1408121906 metadata/md5-cache/app-office/kmymoney-4.6.4
 1408121906 metadata/md5-cache/app-office/kmymoney-4.6.6
-1408211236 metadata/md5-cache/app-office/scribus-1.4.4-r1
+1408221206 metadata/md5-cache/app-office/scribus-1.4.4-r1
 1408141136 metadata/md5-cache/app-office/scribus-1.4.9999
 1407290136 metadata/md5-cache/app-office/texmaker-4.1
 1407290136 metadata/md5-cache/app-office/texmaker-4.2
@@ -59325,7 +59293,9 @@
 1408211406 metadata/md5-cache/dev-lang/php-5.3.29
 1408121637 metadata/md5-cache/dev-lang/php-5.4.30
 1408121637 metadata/md5-cache/dev-lang/php-5.4.31
+1408221236 metadata/md5-cache/dev-lang/php-5.4.32
 1408121637 metadata/md5-cache/dev-lang/php-5.5.15
+1408221336 metadata/md5-cache/dev-lang/php-5.5.16
 1407111242 metadata/md5-cache/dev-lang/lazarus-1.2.2
 1407111242 metadata/md5-cache/dev-lang/lazarus-1.2.4
 1211091737 metadata/md5-cache/dev-lang/falcon-0.9.4.4
@@ -60063,6 +60033,7 @@
 1408121637 metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r5
 1408170806 metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r7
 1408202006 metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r8
+1408221606 metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
 1408121906 metadata/md5-cache/dev-libs/fddl-20111124
 1408121637 metadata/md5-cache/dev-libs/blitz-0.10
 1407111242 metadata/md5-cache/dev-libs/grok-0.9.2
@@ -61459,6 +61430,7 @@
 1407111244 metadata/md5-cache/dev-perl/Test-Number-Delta-1.30.0
 1407111244 metadata/md5-cache/dev-perl/Test-Number-Delta-1.40.0
 1407111243 metadata/md5-cache/dev-perl/Email-LocalDelivery-0.217.0
+1408221806 metadata/md5-cache/dev-perl/Archive-Zip-1.300.0-r1
 1407111243 metadata/md5-cache/dev-perl/ParaDNS-2.0.0
 1407111243 metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.240.0
 1407111243 metadata/md5-cache/dev-perl/Mail-Mbox-MessageParser-1.500.200-r1
@@ -62121,7 +62093,6 @@
 1407111244 metadata/md5-cache/dev-perl/encoding-warnings-0.110.0
 1407111243 metadata/md5-cache/dev-perl/ORLite-1.980.0
 1407111244 metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0
-1407111243 metadata/md5-cache/dev-perl/Archive-Zip-1.300.0
 1407111243 metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.190.0
 1407111243 metadata/md5-cache/dev-perl/Archive-Zip-1.370.0
 1407111243 metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
@@ -62908,6 +62879,7 @@
 1407111246 metadata/md5-cache/dev-ruby/builder-3.0.4-r1
 1408052036 metadata/md5-cache/dev-ruby/gemcutter-0.7.1
 1408052036 metadata/md5-cache/dev-ruby/vlad-2.6.3
+1408221106 metadata/md5-cache/dev-ruby/stamp-0.6.0
 1407111247 metadata/md5-cache/dev-ruby/rgen-0.6.6
 1408211136 metadata/md5-cache/dev-ruby/rgen-0.7.0
 1407111247 metadata/md5-cache/dev-ruby/right_http_connection-1.3.0
@@ -63012,6 +62984,7 @@
 1407111246 metadata/md5-cache/dev-ruby/builder-3.1.4
 1407111246 metadata/md5-cache/dev-ruby/builder-3.2.2
 1407111246 metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0146.1
+1408221136 metadata/md5-cache/dev-ruby/nokogiri-1.6.3.1
 1408052036 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.7
 1408122306 metadata/md5-cache/dev-ruby/journey-1.0.4-r1
 1407111247 metadata/md5-cache/dev-ruby/rgen-0.6.6-r1
@@ -63368,7 +63341,6 @@
 1407250736 metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1
 1408181308 metadata/md5-cache/dev-util/ninja-ide-2.2
 1408181308 metadata/md5-cache/dev-util/ninja-ide-2.3
-1408181308 metadata/md5-cache/dev-util/reviewboard-1.7.12
 1408121637 metadata/md5-cache/dev-util/cocom-0.996-r1
 1408121907 metadata/md5-cache/dev-util/min-cscope-16.1.0
 1407111248 metadata/md5-cache/dev-util/stubgen-2.08
@@ -64994,7 +64966,8 @@
 1408181307 metadata/md5-cache/dev-python/ipaddr-2.1.10-r1
 1408181307 metadata/md5-cache/dev-python/pyamg-2.0.5
 1408181307 metadata/md5-cache/dev-python/pyamg-2.1.0
-1408181307 metadata/md5-cache/dev-python/numpy-1.8.1
+1408221536 metadata/md5-cache/dev-python/numpy-1.8.1
+1408221536 metadata/md5-cache/dev-python/numpy-1.8.2
 1408200836 metadata/md5-cache/dev-python/pyfits-3.3
 1407111245 metadata/md5-cache/dev-python/hachoir-regex-1.0.5
 1408181308 metadata/md5-cache/dev-python/reconfigure-0.1.50
@@ -65329,8 +65302,9 @@
 1407111246 metadata/md5-cache/dev-python/webob-1.2.2
 1407111246 metadata/md5-cache/dev-python/webob-1.2.3
 1408181308 metadata/md5-cache/dev-python/webob-1.3.1
-1408181307 metadata/md5-cache/dev-python/patsy-0.2.0
+1408221136 metadata/md5-cache/dev-python/patsy-0.2.0
 1408181307 metadata/md5-cache/dev-python/patsy-0.2.1
+1408221136 metadata/md5-cache/dev-python/patsy-0.3.0
 1408181307 metadata/md5-cache/dev-python/cryptography-0.5.1
 1408181307 metadata/md5-cache/dev-python/cryptography-0.5.2
 1408181307 metadata/md5-cache/dev-python/cryptography-0.5.3
@@ -67306,7 +67280,7 @@
 1408181309 metadata/md5-cache/sys-fs/s3ql-2.8.1
 1408110512 metadata/md5-cache/sys-fs/aufs-util-3.13_p20140420
 1408110512 metadata/md5-cache/sys-fs/mdadm-3.2.6-r1
-1408110512 metadata/md5-cache/sys-fs/mdadm-3.3.1-r2
+1408221606 metadata/md5-cache/sys-fs/mdadm-3.3.1-r2
 1211091751 metadata/md5-cache/sys-fs/quotatool-1.4.6
 1407111300 metadata/md5-cache/sys-fs/quotatool-1.5.0
 1407111300 metadata/md5-cache/sys-fs/quotatool-1.6.0
@@ -67387,7 +67361,6 @@
 1309051736 metadata/md5-cache/sys-fs/f2fs-tools-1.1.0-r1
 1408121640 metadata/md5-cache/sys-fs/treesize-0.54.1
 1408110037 metadata/md5-cache/sys-fs/safecopy-1.7
-1407111300 metadata/md5-cache/sys-fs/btrfs-progs-3.14.1-r1
 1407111300 metadata/md5-cache/sys-fs/s3fs-1.74
 1407111301 metadata/md5-cache/sys-fs/vzquota-3.1
 1408111236 metadata/md5-cache/sys-fs/aufs-util-3.16_p20140811
@@ -67424,6 +67397,7 @@
 1408121640 metadata/md5-cache/sys-fs/sysfsutils-2.1.0
 1408110512 metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r2
 1408110512 metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r3
+1408221806 metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r4
 1211091751 metadata/md5-cache/sys-fs/mtd-utils-1.4.5
 1211091751 metadata/md5-cache/sys-fs/mtd-utils-1.4.6
 1407111300 metadata/md5-cache/sys-fs/mtd-utils-1.4.8
@@ -67431,15 +67405,12 @@
 1408121909 metadata/md5-cache/sys-fs/reiserfs-defrag-0.2.1
 1408121909 metadata/md5-cache/sys-fs/reiserfs-defrag-0.2.2
 1408121640 metadata/md5-cache/sys-fs/lvm2-2.02.103
-1408121640 metadata/md5-cache/sys-fs/lvm2-2.02.106
-1408121640 metadata/md5-cache/sys-fs/lvm2-2.02.107
-1408121640 metadata/md5-cache/sys-fs/lvm2-2.02.108
-1408201836 metadata/md5-cache/sys-fs/lvm2-2.02.109
+1408221606 metadata/md5-cache/sys-fs/lvm2-2.02.109
 1407111300 metadata/md5-cache/sys-fs/iprutils-2.3.0
 1407111300 metadata/md5-cache/sys-fs/iprutils-2.3.9
 1407111300 metadata/md5-cache/sys-fs/btrfs-progs-3.12
 1408121640 metadata/md5-cache/sys-fs/evms-2.5.5-r13
-1407281837 metadata/md5-cache/sys-fs/btrfs-progs-9999
+1408221406 metadata/md5-cache/sys-fs/btrfs-progs-9999
 1407111300 metadata/md5-cache/sys-fs/exfat-utils-1.0.1
 1407201706 metadata/md5-cache/sys-fs/exfat-utils-1.1.0
 1408110512 metadata/md5-cache/sys-fs/aufs3-3_p20131104-r1
@@ -67552,8 +67523,7 @@
 1407111301 metadata/md5-cache/sys-fs/udftools-1.0.0b-r9
 1407111300 metadata/md5-cache/sys-fs/genext2fs-1.3-r1
 1407111300 metadata/md5-cache/sys-fs/lessfs-1.7.0
-1407111300 metadata/md5-cache/sys-fs/btrfs-progs-3.14.1
-1407111300 metadata/md5-cache/sys-fs/btrfs-progs-3.14.2
+1408221406 metadata/md5-cache/sys-fs/btrfs-progs-3.14.2
 1408110512 metadata/md5-cache/sys-fs/fuse4bsd-0.3.0
 1408121640 metadata/md5-cache/sys-fs/zfs-kmod-9999
 1407111300 metadata/md5-cache/sys-fs/btrfs-progs-0.20_rc1
@@ -67627,11 +67597,9 @@
 1407211206 metadata/md5-cache/sys-fs/aufs-headers-3.15_p20140721
 1407272236 metadata/md5-cache/sys-fs/aufs-headers-3.15_p20140728
 1408101236 metadata/md5-cache/sys-fs/aufs-headers-3.15_p20140804
-1408121640 metadata/md5-cache/sys-fs/lvm2-2.02.105-r2
 1407310007 metadata/md5-cache/sys-fs/bcache-tools-9999
 1408121640 metadata/md5-cache/sys-fs/zfs-0.6.0_rc13-r2
 1408121640 metadata/md5-cache/sys-fs/zfs-0.6.0_rc14-r1
-1407111300 metadata/md5-cache/sys-fs/btrfs-progs-3.14_pre20140414
 1407111300 metadata/md5-cache/sys-fs/arm-fdisk-3.0.6-r1
 1407111300 metadata/md5-cache/sys-fs/nilfs-utils-2.1.6
 1404191736 metadata/md5-cache/sys-fs/inotify-tools-3.14
@@ -74236,8 +74204,8 @@
 1401260806 metadata/md5-cache/net-analyzer/nagios-imagepack-1.0-r100
 1408181308 metadata/md5-cache/net-analyzer/linkchecker-9999
 1407111254 metadata/md5-cache/net-analyzer/p0f-3.05_beta
-1408121908 metadata/md5-cache/net-analyzer/icinga2-2.0.0
 1408121908 metadata/md5-cache/net-analyzer/icinga2-2.0.1
+1408220936 metadata/md5-cache/net-analyzer/icinga2-2.0.2
 1407111254 metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4-r1
 1408121639 metadata/md5-cache/net-analyzer/nb-0.8.16
 1408151336 metadata/md5-cache/net-analyzer/nb-0.8.17
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 65836d3b897a..71ff3b434717 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 22 Aug 2014 04:30:01 +0000
+Fri, 22 Aug 2014 14:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index a673241c740a..9f852d3496f1 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1408680301 Fri 22 Aug 2014 04:05:01 AM UTC UTC
+1408716301 Fri 22 Aug 2014 02:05:01 PM UTC UTC
diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index 1f362e5bc836..e2284f7aa123 100644
--- a/net-analyzer/icinga2/ChangeLog
+++ b/net-analyzer/icinga2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/icinga2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.3 2014/07/17 03:05:42 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.4 2014/08/22 05:27:00 prometheanfire Exp $
+
+*icinga2-2.0.2 (22 Aug 2014)
+
+  22 Aug 2014; Matthew Thode <prometheanfire@gentoo.org> +icinga2-2.0.2.ebuild,
+  -icinga2-2.0.0.ebuild:
+  bup
 
 *icinga2-2.0.1 (17 Jul 2014)
 
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 8dac49b27afe..201b4c0daaf3 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST icinga2-2.0.0.tar.gz 533346 SHA256 c8a0717b0726d084fc93f695e51f35c80afb853a184a9bae8927d95830ef6e1a SHA512 b28658c29fd247e4023b82447168276fbe1402cf84eaca8b90420add56db16e77c74849adf1c2e72cd0484741abc7b9c438927bae9e2932711093771ef3a593d WHIRLPOOL 1c9c349dcc1778cdb4484ab3b65970790316b321d01600cf67d0623cbb08d8385f4a31a5a4b3a3d0a2a83d2c3ec154e4513273def3f26aff82b919dd93fd089e
 DIST icinga2-2.0.1.tar.gz 538638 SHA256 7076ce1781454884b5b922cd7c0f1e7bf146435a7f3e49b2cc5887df28e179e5 SHA512 c1faa5e8922497625d95f202a9e9c4a3f4a7210ef2eb3ade77ff9464690cdf913e5bc2ab3e3b8a6e3739e8c5f7676b78f6b2a09ffb79f843be66866914b64e7f WHIRLPOOL 0dbd9067d4492a77e2050d296c90da78090dc9c02fe71284677af01cc6537aa0dbb2100260aaf4a97c9b26df31e5936794c90ebb0d4a18256d02ddfaf550d926
-EBUILD icinga2-2.0.0.ebuild 3168 SHA256 f33c80f93cd909e753a5f5753c4f54708bf7fe030067e92c1bbde29cc75471bc SHA512 9616c6f4a6f8afd0d1b69b0d372279306beaa717396cf5a4931b58a72c0cc8dcd7a898268685df8de09a5ac78e301fb3ec42b99d84f90fc61a2a8e232c715b8d WHIRLPOOL 58ac0fbcdb357d0c19fe430d710970046919c9ac85b74c5db35d3595a3685b61e49275e1faa0e64ddf6e40cf2efa4033fd51b2b7cfaf01f13146ffa87588c791
+DIST icinga2-2.0.2.tar.gz 546107 SHA256 b21c4c4bc2152ed3850d34ef3eed03588e508a9080c10f15750e9a115d856ced SHA512 2d754f605dafbcf0290566241d776c20269f13f243ba509ddf33cf86c012e633c78beb226b904b487c6180a1fe6c5e50816e33960f1cba7c3df901649e4f0c7d WHIRLPOOL 0a5e61343a528fd88828a5b1acd2e704554af71eb750cc52dd92fd7c4cc390a752943041a6723d23d5c79dc23b3bcdcb2eeb42047ba226e4e2c905589502b60c
 EBUILD icinga2-2.0.1.ebuild 3316 SHA256 c6b5044cff61c03623e7f3157d053c933f85c4ee48c7167f01c1f4bb411fe7cd SHA512 65924a00968603bc0847966b771422e975c5f4284133b6c2a8162d9bdb7c27d64c85b2c3b469c1d640924d049499684bf23817a111aed779a991bcea7e2e1588 WHIRLPOOL c36e0cb22ef4e7d702e6e7d535f2fa2cd7b01b0cefba6aa8361fa925fd70537b0d8c4310d29047d72fcb8b5eae2c669cdf5c91d26c7b45ed18b46a93ad9d0ace
-MISC ChangeLog 643 SHA256 31597d1c67e787fe04b2c1c89eef46ec4e5cc821b1317a2ff81c96c5a0dd7827 SHA512 70b94e85c5209c4508196a6f26f94d60f7678bae0e791aac41778e48fd131df25f6f1324fb1f914c614843b95d37c1abbdb8b3e65b2f147255e9c504fed67f7b WHIRLPOOL c73c39248ab829ece45a17a04f8d7b7100d94912557d7cc25edcaaa704c1cb900289cd5d5ba0a59e9380be2c6266bf6f2802072461dba321f8f67c562e2932fe
+EBUILD icinga2-2.0.2.ebuild 3316 SHA256 c438bf7caf9e3ba325f6e9fade01b5d66224284a31d2c17cfdd5dde536c3e40c SHA512 0abc1c4fe803415b8df6bdc2fe4ed165aabe5d8ed959d9af6f684a38ebaf80157ed647a225ca03ede26313c62efa539a27a9198f4bf76d1c0deba448050cfdc6 WHIRLPOOL ab600c5dc261616faac3fcf1fd9ceac7c0055ccb7a393e16fdc615e9b437cb3a73b66a3fce54dddff0a41e394686152dd2f75d9512cd1a03652638377209e835
+MISC ChangeLog 785 SHA256 6a1013c49c09b3e29f90c66d634eccb6305247105a099c9f67e4f86afc62c578 SHA512 dc93b19708352ded5ffc5b74e9800ee657411b13a794db30fdde23d54a0de8713b118d59653fefbfc106ff36f6d196627f31438c85f6c3427dbb027b1ea08341 WHIRLPOOL 4b858fa7181b33f4b39baae3f500cb21f29abda39c7643a8cdf594fb24edd110d681b7625dc48600814657921f88b228094b2638edc64ac566308e11aef223d3
 MISC metadata.xml 484 SHA256 b8c4326958ead6f6bdab93edda5d82a63e0608d93a14bcc975bfaa1d26121253 SHA512 124d4a6c2770ed91b9d8f5037d8bb350b26a2cbdf814331564303ca8aec347152eb584cc2214fa54747f85c270e5832c0b5cb431ef9e7e4b9341c865b1d5e7fc WHIRLPOOL d82ec9268326bd65c3912a9ef730d33c189af7858d3a760c2fcc188d855e013aa741f1b4ccc3fb829d7ea2ecfb670c1ddd4633231a23e891a32eb62ff003ece3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTxz2cAAoJECRx6z5ArFrD9akP/jMr17ilmFdXwzUGFPtFYm5d
-/eVE8rRaEo+akkwq7vhqQATNCIZFWxVUbet8xeF6p2uvunII1XhIWQ2SjNknwzA8
-ggs9OjKahFheslorjKivrGftbdRUNKwQcnYT6Z0nbCkOn2npwHOtvyhMfeCPXbSp
-Sihgj2AhETa4RYxYllaCk9mx33svom8kqXc509L5pD8qiVngQj253I6GrSds/VKI
-HbR7fyEHvwbrRfBNG9c442W2PXIKnryNVQSbCf2rGf31JJz2DKZ16MQwuSARdNbX
-6erEUEHfSthFJ0v4BQtWIBS70FYcBc/fBpd2zHL41yix8fNr+oISG12RwGAZQr0/
-m5DtEMnUtmVtAQBxadu/KRq0dgYQQYGJbDRTHTqn7RdcTwKZHHT/l8prV+c8lA+e
-x0bJWm3s1WIn8MWOJlXx9Hg3wHmnUCXcwqbO/rN7ovTYDdjiIXOEp9EQFFbt2frE
-62i1WolO59qItCHRjemSNXwEfraNtdYEgnTt2fS1JwsulfBmFWW8NJqA9vh5jNIu
-RBqOXoI9BPQvfXW6RJwLkpmQP+l7+6G7b3gQmxmmiivryP6w5vop2pAvbMDYsCIx
-ZshH+lU5Kk3dQyEF/b2SvwAymBXVB9/EQDOV6KWtQZA5Y7sXzmzcBjjOEmmRt9NE
-HgwjVA4EhdBvfsxZTw/J
-=m5ym
+iQIcBAEBCAAGBQJT9tUiAAoJECRx6z5ArFrDMPsQAIQ7DxOVwJNRruRVh7nVjx45
+T8Am7/cESrTPedlezUVytMq7IFQaoJyfWYwsj7mpu87BdMquTcJ/gDLcBeJWPbKf
+dG4sDOjZL9rK9TQ9MmoHPooU1XY+AklonO8vwqK17zwMACzBHcFJo4OKZUA2yqhy
+I+m/db2vFfegDwsZuUuVE2Qsoxnq9TrdC3uWq3w+SgwJjPwkxNR5yhUU2KfmueBH
+JFxK0o4WYCeJHsInC1ExAJO6JShPpW3OjIdPLQfDl/VBndaSwc2BmX0Y9EpguVZG
+LUexwC5xKRjlfXEv4H0xh0WkH6Uwc938bmHbsETHMBNUIgoh9Nyw/wO0pOPkC1O4
+fzIrNnmEyA8qPd7mSnCJ9EzDiC2vUgkEuSnXsw0wt2z6S8gRDf6X2Jj0TI9tY2XL
+D26Wz/zZbDGL9BqAioAfRf5C+gr3PpYD9Ewi+rMmDOHLkdBy8EBe9ulM0d2iEHoT
+SkHBobPMkI9rKFOHF+3s8K0YO8pIzaeRbpuznynLepa296suH5yN7Z35eGbGnaZF
+OdOYKk7qLKdCQuYSS+plhlU4SiCasya6jMxi78fikDIo8l6lgFnkuEocdyhO/Tbv
+PtPPx/q3SKuDNPpXBnB2Uvxun1GVkasNqImsEMtpC61ruTY5BfaCUnWknkq9ELw5
+Uj0VBqydEUoL2NLwP4zR
+=l4WJ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga2/icinga2-2.0.0.ebuild b/net-analyzer/icinga2/icinga2-2.0.2.ebuild
similarity index 89%
rename from net-analyzer/icinga2/icinga2-2.0.0.ebuild
rename to net-analyzer/icinga2/icinga2-2.0.2.ebuild
index f0ff4f6984d7..00066e1fe446 100644
--- a/net-analyzer/icinga2/icinga2-2.0.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.0.2.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-analyzer/icinga2/icinga2-2.0.0.ebuild,v 1.1 2014/06/16 15:35:03 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.0.2.ebuild,v 1.1 2014/08/22 05:27:00 prometheanfire Exp $
 
 EAPI=5
 inherit depend.apache eutils cmake-utils toolchain-funcs user versionator systemd
@@ -50,9 +50,8 @@ src_configure() {
 		-DICINGA2_GROUP=icingacmd
 		-DICINGA2_COMMAND_USER=icinga
 		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
 	)
-#		-DUSE_SYSTEMD=ON
-
 	cmake-utils_src_configure
 }
 
@@ -95,10 +94,13 @@ src_install() {
 	keepdir /var/lib/icinga/archives
 	keepdir /var/lib/icinga/rw
 	keepdir /var/lib/icinga/spool/checkresults
-	keepdir /usr/var/lib/icinga2
+
+	#remove dirs that shouldn't be installed
+	rm -r "${D}var/run" || die "failed to remove  /var/run"
+	rm -r "${D}var/cache" || die "failed to remove /var/cache"
 
 	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
-	fowners icinga:icinga /usr/var/lib/icinga2 || die "Failed chown of /usr/var/lib/icinga2"
+	fowners icinga:icinga /var/lib/icinga2 || die "Failed chown of /var/lib/icinga2"
 }
 
 pkg_postinst() {
diff --git a/net-misc/dibbler/ChangeLog b/net-misc/dibbler/ChangeLog
index 268a632fcc1a..af301c8b7730 100644
--- a/net-misc/dibbler/ChangeLog
+++ b/net-misc/dibbler/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dibbler
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/ChangeLog,v 1.27 2014/02/22 08:07:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/ChangeLog,v 1.28 2014/08/22 12:00:03 voyageur Exp $
+
+*dibbler-1.0.0_rc2 (22 Aug 2014)
+
+  22 Aug 2014; Bernard Cafarelli <voyageur@gentoo.org> -dibbler-0.7.3.ebuild,
+  -dibbler-0.8.3-r1.ebuild, +dibbler-1.0.0_rc2.ebuild:
+  Version bump to 1.0 rc, reported to work better than current 0.8 branch.
+  Fixes bug #487876 by Alexander Wright
 
   22 Feb 2014; Agostino Sarubbo <ago@gentoo.org> dibbler-0.8.4.ebuild:
   Stable for x86, wrt bug #499102
diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest
index cf9248cc05c9..8d9aa3660217 100644
--- a/net-misc/dibbler/Manifest
+++ b/net-misc/dibbler/Manifest
@@ -5,28 +5,16 @@ AUX dibbler-client 465 SHA256 c0df2b8ea3968f1cd9edeeb20db3e65007b99cf52fb63a8813
 AUX dibbler-client.service 134 SHA256 1f5d6ef13392cba1c9fa01bfecc39967974568cd2c10fcfbee2ee7e88c3b378b SHA512 419e40ac4110061e675cccd351b5a3e5f46e0c62d5169feb97eadee805d99b9caaae5f65fb9433808081d670db1cbb5ba6d9776e794f4cff624ec85906e28613 WHIRLPOOL b04cd675afed703acdddbe2494f47f15b381fb88a4ae6ebb2b932414dae71ba5a051e1a277f4b225e52834e19cdf5cb3a6fcd53091f777463298948f9f82c8ae
 AUX dibbler-relay 458 SHA256 8776df7bd9a016e6f41f67e89a4ecc44720717f7a3ca0a528550bf3739339a2a SHA512 905f8b9ffa29e38203c1e70238929beca0a4beed355e0304cc75c9aa3f45eee0ad8c026330c95f43630ed2c446dc0d9989dba25b097dfa091d0291980037bbd6 WHIRLPOOL b60933592ace1ded58e5b65cdd6c5d6aab9e06d70c515e588c9eed0d7e543810332478ef14bd14043212d83c9e0cf771ff27eeba2acfa9cbd2bd3bfde039e270
 AUX dibbler-server 465 SHA256 dfa7249acf9240737e3150fe7243dbc5871507ad48973b5fe641172a6a3537ea SHA512 45d9b142cec2a905ffbdb22ff643e70bda1ab246dfc1afd2b9eb0b40d6c64b0b54b821a9aa1ac19eed892ddb2f3929f9c11d1e5b0d4d4b3ebec464c4ed21628d WHIRLPOOL d4e5db3fccbf62a65b8964805733a9b8d9cffcc0b6a37af0a415135c07d93335f66f26b641162c84abc8f8fa023f75bcd2185b1b46868376a87dc02a22f90333
-DIST dibbler-0.7.3-src.tar.gz 3723163 SHA256 95553d25dbd465a3d39e6ac710ae6a98ac573249694f27e44811684855c20c88 SHA512 dfdbc735e3e04c0d98775fc91440a71fdcfc50e4b594b2c8e866e2e192e6791c4a009dc6cbf9f5f5d3b5f1630053cc40b61c9d9cec0638279c3e87bda117342c WHIRLPOOL 73c1ff7ccae69ed6f7a3b7018b2be7f629597367af38d0fe17ab4bdf4979344fd8db12477ba8dce03b31dd3c6e9f71d57fd6f59b38bba9055d8da9859f74202a
-DIST dibbler-0.8.3.tar.gz 3993154 SHA256 8513ef956bc16f716f0474f86cbe2c53dd0b3ab1c375e84cea021ee57440a41f SHA512 03f78c0361e338efc5b33a327f9237a2b233ed7c02b423c1787b3d20e068df56a3359db19c8c5d4ac924088d4eac5ef505f476edb3d7d44a5ccbfdd8638fa556 WHIRLPOOL 310545930c21c5628da2bfbda39cf9498d0e9347747bc3d11781a6a90dae4921b4f7d4bfeae36f85e293d77329189386ffec1d50863737ce57c2c37061378330
 DIST dibbler-0.8.4.tar.gz 4292008 SHA256 90382709200b6f1c4d403aceeedb52fd5633cfb71c7df3742062ddfe8b71c013 SHA512 7d0323abd42d0ab57fcaecb30c1354a831f2b8b8b300a9a20678062ef52743b5724569d1885f3866d517abbfae48651966734d47a6c5f43d19fd65332ebeca6c WHIRLPOOL f1d9c2219daebe3f69fbcde956a164902fa2b6ba1448d95a00aaada0423a995d013256fc35fbc8c860efd11f28b0dd42f97de4761a31f0b7662dec23bb36b25a
-EBUILD dibbler-0.7.3.ebuild 1558 SHA256 bda85f287ceea713fceeefd7b4399ef0aa8b47169cf2ec3307493453e6d51622 SHA512 2217e652a201a4f39608495f83e64b600104de665f021c4864f20fbdad04e52cbd76b87d9833eb7f266e2d0cad2d2bed1478d6c1a75374229aac569e8340bdf8 WHIRLPOOL 78c8d67e96987181db5f2816bd3a66e79af21961eab6bf7f1cf5a61df54cc842195d369f9007fd3a9df85596ef2a7512a37f08601825d8a3d8bcc60e0249ee78
-EBUILD dibbler-0.8.3-r1.ebuild 1298 SHA256 dd1be129793c5452195252ae41ffb117e7f4e2ed222eca362bf0f940b5143a67 SHA512 9694645b7b93a77455345f9ed165be8f375a5e6109edb0065a35d5634f2ec02bd30f2f7eef1db8f24b6415b46e1740f9939347c189ab1d77da138b4c92085660 WHIRLPOOL 0d172264e1986ea62b1ef137c4e67aa6a198c6ca4159ad95347467a25f7dc0c741a046d28d51e221fc01185a002c903d3af638194816fef7ecf2651a1cce94e7
+DIST dibbler-1.0.0RC2.tar.gz 4331108 SHA256 206a27421db7ae5298805d00f9adcafcf6aef7496a5fb23640f6fa99a6ee2d68 SHA512 b0384629a4139bc95609eaf19df6d0c57daebfd0ecd063981271153e3c3cd1658376fd8a473a6568f8b782e58c08c44a101209b49ea3ac39436a3aac4cb27259 WHIRLPOOL 6377ad56bbe61eb7e88f0e92814fd4cbceb4518419b0ec74bceaa7fd09d8de8b00061d73d8d2dead2c3b4389b058ab968586d8373e9b47f1eede0e18b91784f4
 EBUILD dibbler-0.8.4.ebuild 1293 SHA256 8a46003562eb606870344b0d6b3a062ea5179e3ca5f5213ed6c91e63f2cd53f2 SHA512 e430d7f2aba12bc1bdceae9b1c14e611d42c7321d0918ebec15f9defb9b5ae6a1a03bb00e2f7bdea00b2f9c5e27480398300e969ece51b3615b302f5b1aecb8a WHIRLPOOL 654cbf08d30a95317d8ebcce208aa7c72fc5040ab04854c843fffc507cd004f03b4a9e20358a1f09af0ae1a11aaf3fda2f849c4563a4f4049f601f24dbbadc3d
-MISC ChangeLog 4076 SHA256 0b38dabb9dc4319cadf8ac96fe26286ac2d787079d1620628801abe35e2ca63e SHA512 ccfa497b20260d05b892d7e617a1fb2d8e63643c2f6a3363fe7d5204ea08cc80ff7a112e79602ad90ab5aaa1a15126e39e5ccff873c86f7c75772fb031c5c465 WHIRLPOOL 333dea262af2ef27fb247ed8d173e05d30b0d8593f5b0882b67e0866151ea55ddea81d4d37b288a46d1e8d3ccdf42e16ca1b60fe493325f75ea0f8e24d03ce40
+EBUILD dibbler-1.0.0_rc2.ebuild 1338 SHA256 869820558a1c134fd153f61970c206452af6638802f0be4a23b2aed79816887f SHA512 572517ea6ef545c767d7bedc71198db8f32204b6d1ea64083ae9056080bfd2fe1acc59252edb15ef3be333f7ee46bff34e725e6d97b9206c657dcf892e0ee5cb WHIRLPOOL 8167c52aa01e4b9ecbced90c3fd25ef80608434fc1275cc4390c40fa41f9c1e4dc13de996e81a57155ec3be5b5f1bf5476fb0bf703725de17ff6abd2546eb6b8
+MISC ChangeLog 4364 SHA256 5d7d7380ab796afce46310423441f6031d482a82b56daab5b96cd151db9e2985 SHA512 4f9cf11531a4de0694cb9e2593909008b6c6cd83dd8bb1077ebf5bc5965d57556b828f92dbf89bee9c659edbb89de6a0b56880618d83f6c822562903646e87a5 WHIRLPOOL f27c17accd2e00c9b722290bc33de4aebaba92ed0919f434ea1042978c46c29c8309a843fb615a72f1cf5c19ffc6be63537b9db433448cb8d8ce30c9d3f3bbe6
 MISC metadata.xml 238 SHA256 325bc955f2a5e5f2ed4b013fb6ec3ab8308fa98e84ce1c503f6a78bf42f3234e SHA512 14453949e63d402e99c24dfede43ebcac8bf3fc5c731114141bed639d0e0b0e71ffce033ab268595c155dee0b58e04e1bbe4023554f7fd54031c2f90f607cde4 WHIRLPOOL c31742cff7c49498de00d096d5dbeb0177bccbdea3f5713baab174d9e1ec782b781f8eb7c87e0e52aa4968c2f2601d1a914dfb6e5e2e59b9a1ca1615a0a9d172
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTCFq0AAoJELp701BxlEWfVRAP/0gvxe0leKVGB7K0CGH80C4b
-x/nXoBEuIek8oL7JuJhzaeGgLZ5Ny+ayN8e9LpaCKHX30cXAvoqBOJTpNjZQ9wWR
-unt1CbkaCJieCB8DlUFqnBlKnX3o6xyY3tCPFoht3Php3ee2TOvGTgoiWZGe21BH
-arMb3M3B/REa51cg59SY1KhHIejC+lv0O0EWxkap0ls9bK3wOzwJwjOG5W/zyh+C
-pzSe9tu3/9WNybwiP853LemmG47vQj4OeliMNufmaTCUIMMrrekXDO+E1MoJfIOL
-urcN0d7YUoxhRFYZh1SpBrjdyKfve8Aj6nTyYWiVxd3lZVSRc8Rn/2tGrE7NCKYp
-73AaMEv1F/GkEA+LHjiSPzq1nhRi61VwvCe96ivqTyBJNttE0/jpA6gDWRNuxevn
-9mwbMyM7BaW9ADFRxaMjXb9TTdKnhcMCHgWVQHZryjiIj4+MKmZEaWbf2Nlt+R0z
-fpeLjMjoNOt02ml+fHA/eH3BCEkCJxyChQX/zjsqEHl7acwCrpD3PzhOPpPEvllq
-5P26xuc66LVzz/u6nM99fnoVKshPoXnkwBDi/riLHPsDLEPnO5RgmmuvO6fuIyE9
-IynbOlzRRmmgR0cpHOs0MtPbbjGKBQGo2Ikz1dJCFffnalXlU8cYFP8gq3bFBapb
-ZPfwHQ82ZkIBZQGyJnDJ
-=mVDn
+iF4EAREIAAYFAlP3MMgACgkQFYEBGcdFJfLD6QD6AgF5knkmcUBPSTkAIDlvSNJF
+8KYSphgafNbOPRTYF6QBAJ2glrVJ0EfwOdnC0L6OEuTYMl3DhVedvdSriPcNyh2W
+=ukBR
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dibbler/dibbler-0.7.3.ebuild b/net-misc/dibbler/dibbler-0.7.3.ebuild
deleted file mode 100644
index 57af467fc1c0..000000000000
--- a/net-misc/dibbler/dibbler-0.7.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/dibbler-0.7.3.ebuild,v 1.4 2011/09/21 00:03:26 jer Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)"
-HOMEPAGE="http://klub.com.pl/dhcpv6/"
-
-SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips x86"
-IUSE="doc"
-DEPEND=""
-RDEPEND=""
-
-DIBBLER_DOCDIR=${S}/doc
-
-src_prepare() {
-	sed -i \
-		-e "s#CC           ?= gcc#CC           ?= $(tc-getCC)#g" \
-		-e "s#CXX          ?= g++#CXX          ?= $(tc-getCXX)#g" \
-		Makefile.inc || die "Patching Makefile.inc failed"
-}
-
-src_compile() {
-	emake -j1 || die "Compilation failed"
-}
-
-src_install() {
-	dosbin dibbler-server
-	dosbin dibbler-client
-	dosbin dibbler-relay
-	doman doc/man/dibbler-server.8 doc/man/dibbler-client.8 \
-		doc/man/dibbler-relay.8
-	dodoc CHANGELOG RELNOTES
-
-	insinto /etc/dibbler
-	doins *.conf
-	dodir /var/lib/dibbler
-
-	use doc && dodoc ${DIBBLER_DOCDIR}/dibbler-user.pdf \
-			${DIBBLER_DOCDIR}/dibbler-devel.pdf
-
-	insinto /etc/init.d
-	doins "${FILESDIR}/dibbler-server" "${FILESDIR}/dibbler-client" \
-		"${FILESDIR}/dibbler-relay"
-	fperms 755 /etc/init.d/dibbler-server
-	fperms 755 /etc/init.d/dibbler-client
-	fperms 755 /etc/init.d/dibbler-relay
-}
-
-pkg_postinst() {
-	einfo "Make sure that you modify client.conf, server.conf and/or relay.conf "
-	einfo "to suit your needs. They are stored in /etc/dibbler."
-}
diff --git a/net-misc/dibbler/dibbler-0.8.3-r1.ebuild b/net-misc/dibbler/dibbler-1.0.0_rc2.ebuild
similarity index 78%
rename from net-misc/dibbler/dibbler-0.8.3-r1.ebuild
rename to net-misc/dibbler/dibbler-1.0.0_rc2.ebuild
index c0b7bc6cf4ec..bf222bae4002 100644
--- a/net-misc/dibbler/dibbler-0.8.3-r1.ebuild
+++ b/net-misc/dibbler/dibbler-1.0.0_rc2.ebuild
@@ -1,17 +1,17 @@
-# 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-misc/dibbler/dibbler-0.8.3-r1.ebuild,v 1.5 2013/11/09 15:30:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/dibbler-1.0.0_rc2.ebuild,v 1.1 2014/08/22 12:00:03 voyageur Exp $
 
 EAPI="5"
 inherit eutils readme.gentoo systemd
 
 DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)"
 HOMEPAGE="http://klub.com.pl/dhcpv6/"
-SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz"
+SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P/_rc/RC}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~mips x86"
+KEYWORDS="~amd64 ~hppa ~mips ~x86"
 IUSE="doc"
 
 DEPEND="doc? ( || (
@@ -20,6 +20,8 @@ DEPEND="doc? ( || (
 	)"
 RDEPEND=""
 
+S=${WORKDIR}/${P/_rc/RC}
+
 DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf
 to suit your needs. They are stored in /etc/dibbler"
 
diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 6f8e3c2f76f9..6f795d101029 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.87 2014/08/21 11:07:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.88 2014/08/22 08:20:03 voyageur Exp $
+
+  22 Aug 2014; Bernard Cafarelli <voyageur@gentoo.org> nx-3.5.0.20.ebuild,
+  nx-3.5.0.24.ebuild, nx-3.5.0.27.ebuild:
+  Clean homepage as x2go has been the only actual upstream for some time
 
   21 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
   +files/nx-3.5.0.27-jpeg-9a.patch, nx-3.5.0.27.ebuild:
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 6594f6e1da50..1977368bdd53 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -10,19 +10,15 @@ AUX nx-3.5.0.27-jpeg-9a.patch 916 SHA256 e0a8772cc509c1e4cba98340241d1b84bdf2766
 DIST nx-libs-3.5.0.20-full.tar.gz 21875905 SHA256 ce53b1c1cc5115d1303b652099c7b7e1a50a996ff0f136853a6fd54bb5668da8 SHA512 0cecdde638c454e6bf48cb73037a0b6651eda4cf93c5953f678a122219df6c06cea70509b044482ea1b630ae413b26a701341b20d55347b57170517aa9709eef WHIRLPOOL a2d8e64db333d02ca22d0d0a8e9e2ea97199fb3315af8cb60ffd617a8e8a0b2851ce87d912d40c3cd00e7455a67a096ac48360a5a1df2ffb4c627ecd0dbed513
 DIST nx-libs-3.5.0.24-full.tar.gz 15569555 SHA256 95ed68d34ceec0ce43cb8175d6b555dfde46b5ae8c3fb943ed5a9ff138d5b94b SHA512 b73e657d29c58da46d05ec3b5fd988aa87a77cda288094f26a97ce067539e8517615eca4c7e66239c97a4414d2176179f1ca35a88c22d1b98eca1b1e25dda58b WHIRLPOOL 287d66536d2c09b5a5fd44bf9f8d181752ae5ba9d3036af059ccae768b2c08d221c90ac126cb582dbbbc64cd0e1dcb19f6c42ed9bce20240ac5a52b261a6fe94
 DIST nx-libs-3.5.0.27-full.tar.gz 15583374 SHA256 4b328acc9ca680566baf1657a5d26d2d47594ea749cfb4a15e064889287f3efa SHA512 618d98f2a3ddae697ddc7a6f59c9b7c7cd7026aa9c719cc3f4acda10fba1904bef7a7b7f9f4ba2a4c492f04ea3d8baaa9fe5be26b5438a342e5092b7c8128192 WHIRLPOOL 505d3177f8bef3b7d2ece913ebdb14c0c1a1bfc1e97a303f644d9ffbb2a279990d2226e40a71adf0bfce0efbfffc010d5b8501ddd3aa09afa226dc680fab72a6
-EBUILD nx-3.5.0.20.ebuild 2686 SHA256 5a9dcfbe7ee27275b2af0f4c1755f359287291ccd928e19b36d26307cb2d3202 SHA512 7d6abda7ab08acab12b8d50538d99e7d010320e8c05f35329b04ee2dec44c204bfd7434fa4df571e61b01569d8931b1323ae0b52ac1e7bff4dbe7ec1f4abdadb WHIRLPOOL bc5b506364c8bf00b466bb009a2089c08a47bea3969c1610cc76c44d7ee147f923f8252d501610a0baed813b47cd78f18b54d6a540c4319d00dd458d20fb7de6
-EBUILD nx-3.5.0.24.ebuild 2844 SHA256 bc8c97b97d2f952cb42f4faf50a30096ffa2c8310874125432d582d4ebdabb41 SHA512 103235ad28630960d9913f68ea3da313f4df244da532b75729df0b2994caf5f31b62afa08f932bf4e9a1a268d65e3d1802cd54be7507193343a382179870b4b8 WHIRLPOOL c85b6fdf7bbc40050d4e8adf1b104c8d80d71f18941b5a4c4bccb4c916c3c4f35a1ce5914ed3dd6076be35eefb605074d1e17268bfeffa4e5c964eee0e78dfc1
-EBUILD nx-3.5.0.27.ebuild 2894 SHA256 f2d14b87582bdaaeed0868744eb16d977d0d5cc1e438a8368986b955e1b8dae9 SHA512 deb9a74f90878006a2ddc51360240f0cc2dba24739cf8fbc51e3e16da42bc6604d2136a4bb8944bec1f9bfc66d6d2f9f062d257a54ca65a841996622d75206da WHIRLPOOL e3acd25778629946a1d0cb24e0db84f42d3850bd6dcb1549cd93da8ff23dd0f36099f0b26af58f259296ea1b910773f576b0e1a87a3c75110d4b14c03cdbcde9
-MISC ChangeLog 13887 SHA256 e5fb5a30d827c55a3cfe86e6541cc4689cd5ccd884a42f229e82108b6ff44f91 SHA512 bcad719623dc8e675bdedfa844ed4e7fa5f5f391f935ceab0657a7d572f50d1318d119efb284968962417198ccf6bc071a9926ff9d1488c24c01205a15c56ce4 WHIRLPOOL dc48411dd8fc80bb0701470c6819a1a3916dff351a265f9f3f267719da514981944129908dbe8b84e9381a04d7ddadc64eac975b04f3872482c977050b5d5ee1
+EBUILD nx-3.5.0.20.ebuild 2650 SHA256 bd3ec2628457e408d58e2add8d1063321b2749c98f24e52959d09c8681ff0599 SHA512 81d838b8c4b77ce2c372cf2c54f42a7b8237eca881302938a7eaec36ce2432328d1821db4d6ed4a4887ed258714b90d2ea07d2c1f6af9accdd2dce2c48496d22 WHIRLPOOL a1167f37505c2a82332f4b3a582f81294b644156aaa452f88da7d92a082a183d4c610af9800d09b9390d255ee04477782e904752303ddfe594fdcb55f6013a63
+EBUILD nx-3.5.0.24.ebuild 2803 SHA256 2c16fbc41f0c8397bf3ea90002fe462ab07d71faa93eca07a3d08b1645614269 SHA512 776cf2b8156b420b275046aa752ebf38195c786150774a88d644fe645e145bf7c356772c2c5a01dfc12701e156cd26d0ae0ebe4f9ac4c9264f426893bf676670 WHIRLPOOL 5478bac9c578a570654d74dc3a895fa4cae35e4d8f35d83e2019b3b75356938882daef9e35c38d3c4a632039ac3ea744c3ef0a90ef2176bdf61a87342a8145f5
+EBUILD nx-3.5.0.27.ebuild 2852 SHA256 320131763130c3262b8134999cd614e1aa40d8245a122083cf6660802f7eccc7 SHA512 7941b1dc2825522462ccb988d10055cd6d430f14b6e19b64efd6200ab9306a75722f480e055396887766b09eb0a6374475b962a58b7857a38311d45ca88a2a84 WHIRLPOOL 25a8809fdcf15cc81b8449448fd84dc79b0749389645e5849a973a67664ec551ca003769f4584423b392ae59ec33fd30bec720167aa2dadf026bcca365b48417
+MISC ChangeLog 14077 SHA256 cfe106360e0bef58800e867236690da1194563877ca9a3c28bbcb2d21b3ebbdf SHA512 545899fcb3be1086169a4bba7d05d6cb6aced5cb715d6d890d7bcf24acc58fd85282f1e6c71f2f78ad7a76a514ec064497f447b0285b695da6e4b6f8886957fa WHIRLPOOL 90648ee950fd04cf05a400e93f05e90826f7a64dab2f0c85645bd52c26cda477bc1a62581a3151cb9a0d4ecc2b0f95dcfab98ec944588b2cf4eeaaa86fd00db2
 MISC metadata.xml 254 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033 SHA512 ec6af573e67162251786be7ef21a5ea10a4c5ca8b9f080828fa5b72f5d20862150b5033f80afdb6665b243bd24d1c82348b65c91855f4756c5585738a7ce4286 WHIRLPOOL 4456b9fe62e80868740cabd66c246a77ebdab37904be853b977a38a974f07e89d3abcd82e3502e741bc7004016b455768b08ba9cda76bd42a535b1d3ac6ca2ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT9dKCAAoJEEdUh39IaPFNJoYH/R4dkvd4WUayJt2ZDlTB6A5t
-WG/I4WMfaw9wMGNixBh57iW3ioHzFoIyMjZ0pSPezs0REj+zVObIKhRwHRJOXH6W
-cIlTjARzEImDSziBUI3mUlDueU22SPdfezUb77abw4l6MGv4aj+UxqszjhJUuVnL
-KjjxK9+m2narD4lKjqgPeygQdpybWMgJiU25Xi7FFPOr5FQO+1tzwLaKpIvZzLGM
-Icg6WMqZjLLE/erjH9Yxa8JXTSc9vQi+WfqNUOuaYSLNZP0p8gxwCFFOASpDovrY
-//tUS2Pa8d4UpxlLw3ylwKEj0mv345FAAcCGKUi+RGzaHSv9nSGd3k32SPN1i2I=
-=Bh9r
+iF4EAREIAAYFAlP2/T4ACgkQFYEBGcdFJfKoGAD9FolnLjsdLHHMPkEY7BnR7BX2
+CA0JjOx6auixYy4ckqoA/3tQYyIzxzf0HDyUYzQzKWWhTJMsspGt/7kfZXo2LhKl
+=Gpm9
 -----END PGP SIGNATURE-----
diff --git a/net-misc/nx/nx-3.5.0.20.ebuild b/net-misc/nx/nx-3.5.0.20.ebuild
index 7e94db764023..e00f48cb3009 100644
--- a/net-misc/nx/nx-3.5.0.20.ebuild
+++ b/net-misc/nx/nx-3.5.0.20.ebuild
@@ -1,13 +1,12 @@
-# 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-misc/nx/nx-3.5.0.20.ebuild,v 1.3 2013/06/11 10:20:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.20.ebuild,v 1.4 2014/08/22 08:20:03 voyageur Exp $
 
 EAPI=4
 inherit autotools eutils multilib
 
 DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.nomachine.com/developers.php
-	http://www.x2go.org/doku.php/wiki:libs:nx-libs"
+HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
 
 SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
 
diff --git a/net-misc/nx/nx-3.5.0.24.ebuild b/net-misc/nx/nx-3.5.0.24.ebuild
index c0cb7922802b..31d89f67e57b 100644
--- a/net-misc/nx/nx-3.5.0.24.ebuild
+++ b/net-misc/nx/nx-3.5.0.24.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.24.ebuild,v 1.1 2014/05/21 06:48:53 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.24.ebuild,v 1.2 2014/08/22 08:20:03 voyageur Exp $
 
 EAPI=5
 inherit autotools eutils multilib readme.gentoo
 
 DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.nomachine.com/developers.php
-	http://www.x2go.org/doku.php/wiki:libs:nx-libs"
+HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
 
 SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
 
diff --git a/net-misc/nx/nx-3.5.0.27.ebuild b/net-misc/nx/nx-3.5.0.27.ebuild
index 7b4f7be3b356..232ea0d18ca9 100644
--- a/net-misc/nx/nx-3.5.0.27.ebuild
+++ b/net-misc/nx/nx-3.5.0.27.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.27.ebuild,v 1.2 2014/08/21 11:07:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.27.ebuild,v 1.3 2014/08/22 08:20:03 voyageur Exp $
 
 EAPI=5
 inherit autotools eutils multilib readme.gentoo
 
 DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.nomachine.com/developers.php
-	http://www.x2go.org/doku.php/wiki:libs:nx-libs"
+HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
 
 SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
 
diff --git a/net-misc/openvswitch/ChangeLog b/net-misc/openvswitch/ChangeLog
index 19ba75f07d6d..e61f002881fd 100644
--- a/net-misc/openvswitch/ChangeLog
+++ b/net-misc/openvswitch/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/openvswitch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.23 2014/08/10 20:46:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.24 2014/08/22 04:28:25 prometheanfire Exp $
+
+*openvswitch-2.1.3 (22 Aug 2014)
+*openvswitch-2.3.0 (22 Aug 2014)
+
+  22 Aug 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +openvswitch-2.1.3.ebuild, +openvswitch-2.3.0.ebuild,
+  -openvswitch-1.9.0-r1.ebuild, -openvswitch-1.9.0.ebuild:
+  bup
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> openvswitch-1.11.0.ebuild,
   openvswitch-1.9.0-r1.ebuild, openvswitch-1.9.0.ebuild:
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index e9e98b094903..d27a5fe286ac 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -19,18 +19,29 @@ AUX ovsdb-server_conf2 544 SHA256 d0d8a6a7256f4cc47ab1b9f9f7657202388133bcfff366
 AUX prevent-traceback.patch 3590 SHA256 23226a4dc03482acf9ba9b66fcbc3c148eb1370ad98132b7120c3a0ae41fcd25 SHA512 646b4c9730870a335eb75a8f7d4ff8cbf224a54b47b6858148712749279c79b4b17f39b79c41c1a0dc009c374d5bb9f15a30b39cc6d3b0edb913063f705195a6 WHIRLPOOL 2b63c33fa1e3c400e47bedd03546a4a76c721ebe28b324f0072ddcc34ccffc4dc87d8ed7ac29ebcbae20ee0d9bf026e9ec4470248dfab69aad10261210b66f07
 AUX xcp-interface-reconfigure.patch 920 SHA256 bc65b4ce895047083bd342fe32a5480a054918d8e283e11d15520484a30ddfd3 SHA512 24dcc0c9eeafc0912e868aa473b32a68f9219e913ee195171209ec3955929d8ea8df957116b7b65e5412bf2ba187ec0827849e6692d6bf5704287ad45d20dfda WHIRLPOOL a5e30572354146e1bd5b0c57992a58012aa08f776c8bbda0a64fac6a0d36766aea63a717e45c24fb13471b08cb97f1d40b502e8a0b3b0e713a7ee0ac70cb16ee
 DIST openvswitch-1.11.0.tar.gz 2551510 SHA256 007d7d3f2deabe5a3845d1045d23b6b1de174497a8e436091541221dd71833da SHA512 9c338a9e376c845ae5f273030263dbae52fa268350d943e65987d6840d9647194f715e36517c829be32200f1064e13a585bd5b2acb9fa2a7f32199bd4be31459 WHIRLPOOL fa7bc71f0f17f789ed0dc1dce953e1399f56c7529d13a10761f90a3b40a210e511722dda99a502fa2ef8f74ccc6ea5e8c3392c408bf00a85b5824bfa96fc7f24
-DIST openvswitch-1.9.0.tar.gz 2351740 SHA256 825730db82c7b46a142f057a43345590c299e66704ef7a88d9ed4ffd0c3d6b64 SHA512 6368852aafa81f003a09108e973a37281a938ad36948aef96b0699c85a754c33fdb274e998ca804c8102a8cf0839e023633510d43a975cf355b10575bc024587 WHIRLPOOL d4c88aadfe8676d5aef24673051c34864dcc9b6bbc624e6396389fae7ffbb0518f213334ede034fe1c4894187fb001b8e389a11cd8d0bc253f5237696ab0b405
 DIST openvswitch-2.0.0.tar.gz 2708774 SHA256 5060e2be69cce01c15f67b481482cb1a0eaa6ef5cbdbed592bac3c3ab2a390f8 SHA512 f6d36663b65d054d179e5a09a478cf45ae9510c8f3aa31bb2013aaee1b146ee21ce986bb8b9f63ac72036f94d0b415f30ab874451b661b855f46b44eaa42537d WHIRLPOOL be6ac428d5d01b751d8d6312e7e028a23160d44da62231cc84c21d42c19c8c5f6b9457c29c26e7b283db91b08a00d8b54368534a621e556c54e15c0682dad4a1
+DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaefe73069b5699654538bf2f16ebfb1a SHA512 ede64d37f8bf4a475ab3e4a1e0cd83ae1f29df318f7834b804d9f334710ba43b25b9f562f8c7e91041e24f3121fd03e9e09fc789f398d352a2dceaa0576013dd WHIRLPOOL ddd6c1c733a7a139d58d0492ea8c0efa40065443f763faffd5964e5578acfe9b02ec1dd009c52843759d8a93027eb89412e768ca3e70d9ceeb0d030e791a9b7e
+DIST openvswitch-2.3.0.tar.gz 3259225 SHA256 011052645cd4c7afee2732e87d45e589a0540ac7b7523027d3be2d7c7db7c899 SHA512 f3a665bc84d8a6e282928db61ae648a826f273e44e34311a60e6f0e74a6ab10c8410cb374f0ce80abe7c58b9559a97388cdbfe2ef28ac4bedd2f5e52b3cd6ed1 WHIRLPOOL 0fc743b7d12c2ab9c6bea58ec3b80d7633f860c720acb2b61306ff5035d4f3bfeddf7b9bab44a21a1b7fb62c0c3828c2aaf7e9b9167a67ee2def065248ef329c
 EBUILD openvswitch-1.11.0.ebuild 4500 SHA256 4d3bb47ce829fbc64b52bfd6ac92770b379f691579a3e196800687cca7cc804d SHA512 df694c33f9f6ddbaa9d18c3908040babca8666eb8534b979da0522ea2919d018f56709f0df1570e6da30ea57f94aa11e78fd4f5f45e4729cc66a1f5e1c398a7e WHIRLPOOL a8e230fddc39d15101d8fe68ab4139e51cd8adebe6f03fc1d4f852e009ae93a7a61fcfe3c6af778b67a5bf6b995a4ddb226f1045b7d9a05d99fcb38805643c1c
-EBUILD openvswitch-1.9.0-r1.ebuild 4738 SHA256 39349226d554e5630ad8e393ab766ec8335c55d858efc608a2ffca12aeb4df7f SHA512 3160a889e397dfbfd114f48f10f38c63bb564d0cc1bb39a86c4a3a101953d5a374ecb86425245e7efc4dd9049d544ce458f7646e1194696af668bb2c25f04683 WHIRLPOOL 2bdece5f768e6f1b430771af72415174303cefafc8d41adbed3c7005513f887c468711d676f7f6d7e8ccd04ff36f2643cc860cb27fd8f5b83d4fca536961e9d6
-EBUILD openvswitch-1.9.0.ebuild 4556 SHA256 dcecce22e7a1291fa424ebfa15a228b8e52e2acd2b094ba56abdaba082871259 SHA512 7caa3d2a6802ff28f45ae27bd8e55e573fcff1a81bbf63329aabf33ffded5180ed9617f71b7b56f384895a4c64fb25a3d3f246368001b5711fdafffef84e5216 WHIRLPOOL c3f0444e14ce5502aeb97311c08343ae9badaae8eb039e2ddb9565fd0e0b83a492a4bdb0b13e5254e75f019c3a580262671a73b4e77ed5de7ad50201b7677d2b
 EBUILD openvswitch-2.0.0-r3.ebuild 5143 SHA256 8ad27a901505e8abf6e672cdf4380ed6d97885be97a6c8d5178aa754928e3fdb SHA512 d62553c7a92efa9119e4f3f8421aee33386e50280eeae53f12acc9c3520101ca471dd7081097baaf58a80a6859f9e5e9589845f7368542fb9cdf1db15602f81e WHIRLPOOL ce4c988ee9fed53cd8d9839460214e5eb2d0d313f16c4b8297af2da120ecf85375618dfd2ac1db3f14d3c6e79e28ae0b7c7b683877dea179ce011385c518fd20
-MISC ChangeLog 4941 SHA256 3f28d3d1bda013233dc748a04ec2bc2f14137229615565d2a3f76b3fd09c6b88 SHA512 0c1caef2fb864893b5f1405f2e6f744b03bded2bdc19dd7cf97b4cd86f3e93dbb5b332bd3effeabb265cfec5efacabb228917c07dcec1571acb047d2cd6ab247 WHIRLPOOL 0ba69b04108699ba093ec1864a35befb097cb538cef0d967d4d932e2df31910861731d3fc77bdc13e34049774b35283c9fbe92b8a070944cc645270bd9cecb7a
+EBUILD openvswitch-2.1.3.ebuild 4812 SHA256 1ba7ddf2dffe2a1d95db5d86fa8983b975edddfd9d74014348002b1a003d68c9 SHA512 61df2b5830a7a1a92884d8597b1d1186461f8ecb99fcfedd04ccfe633b932b19327f6fa432904206558ed15ed37531c0cb97590f2efbff43baad7911eb270e56 WHIRLPOOL c1441ccaa50b66950e977ea2edd1a23f48f9a64fa456405216c0d8c676e12df0c8f5776588453ad65024848d0b29308a442cef967c8d9e12ad330b2fbe0140c9
+EBUILD openvswitch-2.3.0.ebuild 4764 SHA256 fac11bdaab632d90d53aaa39b4a0f0eb155df91fb37a5af44373b8f3aec9eb87 SHA512 9b4356806d5285877f1f6e78bb79674838d596bb749490c623adf332e76b6dab141c3c7e70c979473927f4df412415eaeae958d566c7d6246b91122e07a4cb80 WHIRLPOOL b34fe82aa0d22d40424b5badd8bed508468636106b89515d2b6916eec58cfe1422d36c132c5b5a091ff877b47f7d55c031849b36b350a4a64d91840ad4dbfdcf
+MISC ChangeLog 5195 SHA256 0592d48e8b5ef1396c2f79e8329d884dcd77f58376bb16163f461be1f4c44540 SHA512 df94d86886d0669bbc134aef2cb7bf55e69980a64dc11756ec9ee7ba66ab889207ee078570688a918a9eb2c918285398e0f1cec888da409305c92ec09ae0193f WHIRLPOOL 45df8df66504906db6a40275087b30566760bca4d0171272bc687508cfb3ae25793a7dc8a1ad5224605621880b2839ff8398010cbe7d5ff96ded535629f9f866
 MISC metadata.xml 550 SHA256 73d17e0623524a9e95d3c4c2c34a29559d29a9dd0786ff4f98969b34949bc440 SHA512 c76de2feb5eac06781f42d74654e107200d5fd8f5377fd3af71559826c7263e837e42ca923811931cd9f86f68279085dd9e15796ee99033edd3ba0ccec2618f5 WHIRLPOOL 6919b71b9691b6659dd3b319d162cfb973cf25a15c3bbd01233c0842c6cd3e54c043f14f8b5da92a455a718f0dc25daa393e6f172266d66d1af2a15fa45c4df4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn2hIACgkQcaHudmEf86rkhgCeLWCIErE7u9XltkCiov7Qd7RU
-wy4An39NDSz+Gak/YSk8OQdSnQcyrqu/
-=bGDw
+iQIcBAEBCAAGBQJT9scHAAoJECRx6z5ArFrDTdUP/itBR29T42jo/P+5MyvDocKp
+T1GFjk54Nf52mskeimTyU69BHitBzR8+dmFnwaMVWVZ3HA3yTg2agurfpqpqFTMd
+YPLT7lPmU2e1KAvkxeW55beE7bV5ryQWLAfXKMi3uCEMF63eLh2Dw85JzuQuZ9yE
+f6/HTXoYd6EISRRdqKUPU72XtG55hGGhD6vjVRl+M0kvOED4q9JNEVkZHZq44gwD
+g2N6IClHTxcO0wSY6LQFElc71lcm2eNTVse5YTc572zBoPe45sC3hndr2BmlIcev
+t/p8ROO9QWVAOL+F8BVMNaxQXqENDqL+N6sEI68MYHzXzEn8YFEkgpAHAMjIDR3L
+vvvacI7+eZlynOqqrnYypyKWp3dOb13h0nEFZi72+dyvNWgOvJVnMUjVbC072aYu
+NUIisPX+ezaAemamohjQxJTLf9EwpZI5JXCP9/kTz6kqMAWb/+fIHvifAxp3xBRr
+o7rRsmMgnzla5Qeg7/XQMiX+Q+r6jX9wyPWQES06QnerlSLkqRu8gYuptSSOsuNc
+h1ttFIs0yRIvJ/8GezWzrv2lDXNVezj2IQGlQkP2f2r4UFMJcK7Kc+XuPZpes0fD
+3hP0DNF1+EJYp51SamwPJHYvW0gYJculNj/KPo1vG15Q3JAf90HtJuxtRP9463/u
+bdFO54I3tyst6tmQjZ5l
+=nLmk
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvswitch/openvswitch-1.9.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.1.3.ebuild
similarity index 79%
rename from net-misc/openvswitch/openvswitch-1.9.0-r1.ebuild
rename to net-misc/openvswitch/openvswitch-2.1.3.ebuild
index f767624e9754..051a2d561490 100644
--- a/net-misc/openvswitch/openvswitch-1.9.0-r1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.1.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/openvswitch-1.9.0-r1.ebuild,v 1.2 2014/08/10 20:46:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/openvswitch-2.1.3.ebuild,v 1.1 2014/08/22 04:28:25 prometheanfire Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils linux-info linux-mod python-single-r1
+inherit eutils linux-info linux-mod python-single-r1 systemd autotools
 
 DESCRIPTION="Production quality, multilayer virtual switch"
 HOMEPAGE="http://openvswitch.org"
@@ -15,36 +15,35 @@ SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug modules monitor +pyside +ssl"
+IUSE="debug modules monitor +ssl"
 
 RDEPEND=">=sys-apps/openrc-0.10.5
 	ssl? ( dev-libs/openssl )
 	monitor? (
 		${PYTHON_DEPS}
-		dev-python/twisted-core[${PYTHON_USEDEP}]
-		dev-python/twisted-conch[${PYTHON_USEDEP}]
-		dev-python/twisted-web[${PYTHON_USEDEP}]
-		pyside? ( dev-python/pyside[${PYTHON_USEDEP}] )
-		!pyside? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
+		dev-python/twisted-core
+		dev-python/twisted-conch
+		dev-python/twisted-web
+		dev-python/PyQt4[${PYTHON_USEDEP}]
 		net-zope/zope-interface[${PYTHON_USEDEP}] )
 	debug? ( dev-lang/perl )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="brcompat(net:${S}/datapath/linux) openvswitch(net:${S}/datapath/linux)"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
 BUILD_TARGETS="all"
 
 pkg_setup() {
 	if use modules ; then
 		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 2 6 32 || die "Linux >= 2.6.32 and <= 3.12 required for userspace modules"
+		kernel_is lt 3 12 || die "Linux >= 2.6.32 and <= 3.12 required for userspace modules"
 		linux-mod_pkg_setup
 	else
 		CONFIG_CHECK+=" ~OPENVSWITCH"
 		linux-info_pkg_setup
 	fi
-	kernel_is ge 2 6 18 || die "Linux >=2.6.18 and <3.2.9 required"
-	kernel_is lt 3 9 || die "Linux >=2.6.18 and <3.9 required"
 	use monitor && python-single-r1_pkg_setup
 }
 
@@ -53,14 +52,18 @@ src_prepare() {
 	sed -i \
 		-e '/^SUBDIRS/d' \
 		datapath/Makefile.in || die "sed failed"
+	epatch "${FILESDIR}/xcp-interface-reconfigure.patch"
+	epatch "${FILESDIR}/kernel-3.12-support.patch"
+	eautoreconf
 }
 src_configure() {
 	set_arch_to_kernel
 	use monitor || export ovs_cv_python="no"
-	use pyside || export ovs_cv_pyuic4="no"
+	#pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
 
 	local linux_config
-	use modules && linux_config="--with-linux=${KERNEL_DIR}"
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
 
 	econf ${linux_config} \
 		--with-rundir=/var/run/openvswitch \
@@ -76,8 +79,7 @@ src_compile() {
 
 	use monitor && python_fix_shebang \
 		utilities/ovs-{pcap,tcpundump,test,vlan-test} \
-		utilities/bugtool/ovs-bugtool \
-		ovsdb/ovsdbmonitor/ovsdbmonitor
+		utilities/bugtool/ovs-bugtool
 
 	use modules && linux-mod_src_compile
 }
@@ -102,12 +104,14 @@ src_install() {
 	use monitor || rmdir "${ED}/usr/share/ovsdbmonitor"
 	use debug || rm "${ED}/usr/bin/ovs-parse-leaks"
 
-	newconfd "${FILESDIR}/ovsdb-server_conf" ovsdb-server
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
 	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
-	newconfd "${FILESDIR}/ovs-controller_conf" ovs-controller
 	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
 	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-	newinitd "${FILESDIR}/ovs-controller-r1" ovs-controller
+
+	systemd_dounit "${FILESDIR}/ovsdb-server.service"
+	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
+	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
 
 	insinto /etc/logrotate.d
 	newins rhel/etc_logrotate.d_openvswitch openvswitch
diff --git a/net-misc/openvswitch/openvswitch-1.9.0.ebuild b/net-misc/openvswitch/openvswitch-2.3.0.ebuild
similarity index 81%
rename from net-misc/openvswitch/openvswitch-1.9.0.ebuild
rename to net-misc/openvswitch/openvswitch-2.3.0.ebuild
index 8760be0c98fd..380dec2ede40 100644
--- a/net-misc/openvswitch/openvswitch-1.9.0.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.3.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/openvswitch-1.9.0.ebuild,v 1.5 2014/08/10 20:46:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/openvswitch-2.3.0.ebuild,v 1.1 2014/08/22 04:28:25 prometheanfire Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils linux-info linux-mod python-single-r1
+inherit eutils linux-info linux-mod python-single-r1 systemd autotools
 
 DESCRIPTION="Production quality, multilayer virtual switch"
 HOMEPAGE="http://openvswitch.org"
@@ -15,7 +15,7 @@ SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug modules monitor +pyside +ssl"
+IUSE="debug modules monitor +ssl"
 
 RDEPEND=">=sys-apps/openrc-0.10.5
 	ssl? ( dev-libs/openssl )
@@ -24,20 +24,21 @@ RDEPEND=">=sys-apps/openrc-0.10.5
 		dev-python/twisted-core
 		dev-python/twisted-conch
 		dev-python/twisted-web
-		pyside? ( dev-python/pyside[${PYTHON_USEDEP}] )
-		!pyside? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
+		dev-python/PyQt4[${PYTHON_USEDEP}]
 		net-zope/zope-interface[${PYTHON_USEDEP}] )
 	debug? ( dev-lang/perl )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="brcompat(net:${S}/datapath/linux) openvswitch(net:${S}/datapath/linux)"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
 BUILD_TARGETS="all"
 
 pkg_setup() {
 	if use modules ; then
 		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 2 6 32 || die "Linux >= 2.6.32 and <= 3.14 required for userspace modules"
+		kernel_is lt 3 14 || die "Linux >= 2.6.32 and <= 3.14 required for userspace modules"
 		linux-mod_pkg_setup
 	else
 		CONFIG_CHECK+=" ~OPENVSWITCH"
@@ -51,14 +52,17 @@ src_prepare() {
 	sed -i \
 		-e '/^SUBDIRS/d' \
 		datapath/Makefile.in || die "sed failed"
+	epatch "${FILESDIR}/xcp-interface-reconfigure.patch"
+	eautoreconf
 }
 src_configure() {
 	set_arch_to_kernel
 	use monitor || export ovs_cv_python="no"
-	use pyside || export ovs_cv_pyuic4="no"
+	#pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
 
 	local linux_config
-	use modules && linux_config="--with-linux=${KERNEL_DIR}"
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
 
 	econf ${linux_config} \
 		--with-rundir=/var/run/openvswitch \
@@ -74,8 +78,7 @@ src_compile() {
 
 	use monitor && python_fix_shebang \
 		utilities/ovs-{pcap,tcpundump,test,vlan-test} \
-		utilities/bugtool/ovs-bugtool \
-		ovsdb/ovsdbmonitor/ovsdbmonitor
+		utilities/bugtool/ovs-bugtool
 
 	use modules && linux-mod_src_compile
 }
@@ -100,12 +103,14 @@ src_install() {
 	use monitor || rmdir "${ED}/usr/share/ovsdbmonitor"
 	use debug || rm "${ED}/usr/bin/ovs-parse-leaks"
 
-	newconfd "${FILESDIR}/ovsdb-server_conf" ovsdb-server
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
 	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
-	newconfd "${FILESDIR}/ovs-controller_conf" ovs-controller
 	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
 	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-	newinitd "${FILESDIR}/ovs-controller-r1" ovs-controller
+
+	systemd_dounit "${FILESDIR}/ovsdb-server.service"
+	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
+	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
 
 	insinto /etc/logrotate.d
 	newins rhel/etc_logrotate.d_openvswitch openvswitch
diff --git a/net-misc/radvd/ChangeLog b/net-misc/radvd/ChangeLog
index 3f7ad07f139d..065eaaa4db21 100644
--- a/net-misc/radvd/ChangeLog
+++ b/net-misc/radvd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/radvd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/ChangeLog,v 1.123 2014/07/30 22:12:53 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/ChangeLog,v 1.124 2014/08/22 04:36:54 prometheanfire Exp $
+
+*radvd-2.5 (22 Aug 2014)
+
+  22 Aug 2014; Matthew Thode <prometheanfire@gentoo.org> +radvd-2.5.ebuild:
+  bup and possible fixes for bug 518814 and bug 520332
 
 *radvd-2.3 (30 Jul 2014)
 
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index e454f37cd650..d99daf762b6d 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -7,17 +7,27 @@ AUX radvd.service 356 SHA256 72ead1c1da904a1e890de37fe8976304d69c4cd60fc528641f0
 DIST radvd-1.15.tar.gz 185528 SHA256 ba2e16bf0b2ac0030aacb0927304603f7ebbd317fdf30a24ee6f9ba06428391d SHA512 39d7ad22b25b36ab8079e9a48f50f69ea2be8a02d2e76638940c5eb769bf9291f28d275d7799296009e3c61bcb106c276bc5c60c9090951ea9f2dc7e00945ba7 WHIRLPOOL 3620518e71a243335cf8e064b4f3c45d80ec2e2d94748caa8ccaf3e0f317ffb3244ae719f07008abd65763f3ebc0110e2d5d5f570f1569b8377f70e0a9dfecc4
 DIST radvd-1.9.8.tar.gz 176288 SHA256 645ccf1c9b16e769ff4179813712e580e2c8786d64a888d8afa1e296c057c1c1 SHA512 25ffa2fe1289ee826432ade3846aa5008e34ff9f0cbe954bf44ebae22198de59b40b7b4a70d19c74117b3280a7ca6a4bf740536f4a08e0bf169e760748548971 WHIRLPOOL 228182cb6fdc6065a728f679ee6d93286c48f186b209b6ff8d553f06317d0e799687c5abf0179cda5c42d2ca72ca32bdacbc31e0a14a06d18316a6538eb09017
 DIST radvd-2.3.tar.gz 200688 SHA256 d48e1262f57deeef8939d1a1b33a31e52bde754b367a55012dcf77d538d1c834 SHA512 e64b9e28b27e965f756475d0a96a6910be7d078f01d07c8d94b0003921f5a8eccf354d643a2fbb576c79ef720074e75b6454d9fb000d0811ebe9df4dae5d3c31 WHIRLPOOL 8f9710644198bd59a2049787b75733334da0c2402f12a2da67120b7c2434a0fc4185f12531694f95b7808cd08ee8e7b3d0dbbfb2385200a988b748c39c3b3a5c
+DIST radvd-2.5.tar.gz 201436 SHA256 942fb19342390045019f168535eadda268010df4dc9534fd46adc1a858418e1e SHA512 f1ff5bb3ae37dad76fce5937d2101cb88fa12938b8ceb950f22f7f5c5b7d1565a52ca0527892fe279ac7c0540d26652c2634f6aa674396efe6d7836dbbf4574f WHIRLPOOL cba6f12c2df48b32d21cc664e5e06a7a3958e29f141700f3b0774664746583639eecb50eb56440e64ab9ece5cf8b8d167032a277c7b03d2a7acabde26dfdef85
 EBUILD radvd-1.15.ebuild 1655 SHA256 2448ea641c091d1bd6ad9fe9cab60aceeb5c081f8521835bf2f6270c3196eeb0 SHA512 18f98d52187b206febb28444e4cfe01a441f7a3cd3e53d64e0932af5ea830176be1189699c7259450256fef8e2814adc7f5be4af33a654161355bb24ce2df5ea WHIRLPOOL 0ab296ae89d6bbb40235b2a6a072e8c3e60d6952a16e46d9ab8571abbb5783e85c7d71969e6e5cae54de9e67ef3a4398077419ec3d4d57c30c21e217185348b4
 EBUILD radvd-1.9.8.ebuild 1621 SHA256 150a4296e662ca89c5181256fd978df42d01ba9f2af2104bd5fd5f17fe6e5bcc SHA512 acda29962cc16d3d2bc9716ae41ed6295741487b5b195cda1e8d0733bfe3c974fd97090b5793defd66417e85bff84990258f96103073d0ed1ef2365999f0521e WHIRLPOOL f2cd282bf328347b97a7cd21e025f24146dc173ce0b9724da5f66d1954481edff6b5b4a7d958c029ec8eaff0635f93d7636a2f332c35b1897250239c5336d995
 EBUILD radvd-2.3.ebuild 1668 SHA256 140cfdac2b025aca038c05593f061b33e41af50acaf41373441e0088fa34d641 SHA512 53c031779de5dee61b3c4af3b22643fc8313419046521aa20421f9a4c5ba41ffc0949894587917e2b0c6a18127b0a739eea827d64f23b3102620d3878331d212 WHIRLPOOL 45dbb050e9c056aaf2a53e231fac931279193c81461454c619ff36460741dc922b68e9efcb5a62967c814d61cd152b8bf074ebc4a50d7dc536452d46980e8257
-MISC ChangeLog 15783 SHA256 27712f5d8f6b4126b37cd72fc151a2f8e0944d668da0f94ceef7508279ea8b33 SHA512 bba648f32b00d3965a92fd74d640249fd81292efc88a7a9d9e5de895116953167b585fe3ad340cf0dc14532ec9b4248d2dc1bd2c1fa467d026df2a22f9497877 WHIRLPOOL da7e65aea9620e1e68da8612f26d38c6bee6d6a861cfb2c2df53971731bc3084d6b1c08a8ecaf9811ee505bce35eb7a06a9ae4c37e8c29bca2b6418fbada3d3d
+EBUILD radvd-2.5.ebuild 1679 SHA256 3e34e5cc0b1ad6c284f55acb41db85e952380cc71e0573820b9257b3039155f8 SHA512 8078065b578bdb8efe309ab92cafd1a4e03e0fde4a1f6c438c14c411c30813f08e078ae19437c8249f6720b9068d6f80cffc8de82bc55951d17a4ec8a569ac16 WHIRLPOOL 3521f9fc331ee0688c59236ecaaca31a542fee6286f71f806a4068be4ff96c527fac8aecca7baff3ec2b653a368ae47db712543fbb2b26cf0ea1090a42996f12
+MISC ChangeLog 15952 SHA256 1bf6d43b2c1838ca71dfe5c1ef6817578d39503a79b528bb9500752fb3c3fd8f SHA512 e3f05ee725cfd4bc1be65d79db8cf56cd3c0974282eb4d2e5f11cfa553962ef073f00a156ddc4c64d63c050fc74c409fd27537e8cd31de71451662e6dfa96d9d WHIRLPOOL 1481b471d5dc2bb9eda0a1f86901855ba13be5d6795b21307cd1fdc24d069ce5cd3629eea153d16ba9c7e4a271be2f039027188002f39c25813903beb8526185
 MISC metadata.xml 330 SHA256 40f8466e0dfb2770a66eddc657185e34a39dc389419a758b183a1d229a47e0bd SHA512 e8bdd24745abdcf8129f8fae83b8397bc762ae1cc1010b271a7f5647eed8ccf65a15f7b761d32fb250676a3e081dbe3395fc82934276b73c5595b35ff2e8da80 WHIRLPOOL 2ec6a85e151014a9156007b3e9fc9d3b43aa43dcbd59aeec6de21c94df4e2a4e1b65fc828905c57a62b06ace6aaf1b3cd23e314426d4a0a719b1f61bfccd5ea9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iL4EAREIAGYFAlPZbelfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JDB5gD9HeYIQWer6TMucqhR8jk4u7Up
-1OXdAMxmQK2YPC/3OBcA/1Y/+yQfqu7aWikQnalXpzDsblTyTe87m6zpmLp3LEmM
-=7UTz
+iQIcBAEBCAAGBQJT9sjuAAoJECRx6z5ArFrDikwQAI3IEU0iugwX1bZIOrm+ZkDc
+3wYyVl7rYYXzqa8WsBYHEjqHeuRFQy/uIM3OhPO5ZIsdzS7vBZ1xKYZn5bpuHFq2
+/XfvxO9NTr5jJ/eOO/dbuh9fqtpnu9XPgvjxzO1dqiCIJwWOzKKl9pmeG8vxuB7S
+Hs/TTsvPieLuzmfxOyWymUPhjIDJqXQyMC3Uno1ZXSYXC4wyZNbLkoZHgEZ7y3zt
+w8D7JwnJ9Pt3aK+tVR5ZLtbHyyypJaGrTDxR1fMB54OzJcv0GoDtfY/Wg+zVx3Wx
+IJtAj5Xbeb/30bQLCNCk0WV0YePAQ5F23MEPGzGodabkgG0Z1ooV3k51v9YG1IdV
+ZgpC5BHBGoAhSIada1+HUOb2t8Mw3nncCi7It+WISjZ9jET1KM2jIY+wQ9NcZHL0
+2xmIZYBvIeq3EzXMpCjomJNohXHY1aG+cbEXSwgbwfxuADuSaHEV/7TtPVIyOMMu
+6OWJ4UKTrkOV52j1ZlrMsO1soeItnCTCLOj2CnopRGRaDM0mYNhTzCuzUkWn1KgY
+uesG3OpM26qwOuuVmjNv5WG1lycyQji0qu19PgLvC73J13Oc7Vwx/fRKufkExJsp
+yL4M+10AKrzxoha+dgluf1SIb1yUFE8gCxXlA//80MBZsVU0g4JX73SVScj4DJuk
+nmF1oAeJWrsLi/X3sz5l
+=hY4A
 -----END PGP SIGNATURE-----
diff --git a/net-misc/radvd/radvd-2.5.ebuild b/net-misc/radvd/radvd-2.5.ebuild
new file mode 100644
index 000000000000..dc149f478504
--- /dev/null
+++ b/net-misc/radvd/radvd-2.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-2.5.ebuild,v 1.1 2014/08/22 04:36:54 prometheanfire Exp $
+
+EAPI=4
+
+inherit systemd user eutils
+
+DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
+HOMEPAGE="http://v6web.litech.org/radvd/"
+SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="kernel_FreeBSD selinux"
+
+RDEPEND="dev-libs/libdaemon
+	selinux? ( sec-policy/selinux-radvd )"
+DEPEND="${RDEPEND}
+	dev-libs/check
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DOCS=( CHANGES README TODO radvd.conf.example )
+
+pkg_setup() {
+	enewgroup radvd
+	enewuser radvd -1 -1 /dev/null radvd
+
+	# force ownership of radvd user and group (bug #19647)
+	[[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd
+}
+
+src_configure() {
+	econf --with-pidfile=/var/run/radvd/radvd.pid \
+		--disable-silent-rules
+}
+
+src_install() {
+	default
+
+	dohtml INTRO.html
+
+	newinitd "${FILESDIR}"/${PN}-1.9.1.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	if use kernel_FreeBSD ; then
+		sed -i -e \
+			's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
+			"${D}"/etc/init.d/${PN} || die
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	elog "Please create a configuratoion ${ROOT}etc/radvd.conf."
+	elog "See ${ROOT}usr/share/doc/${PF} for an example."
+	einfo
+	elog "grsecurity users should allow a specific group to read /proc"
+	elog "and add the radvd user to that group, otherwise radvd may"
+	elog "segfault on startup."
+}
diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 7164557e5592..ceff8404131f 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/x2goserver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.44 2014/06/26 14:49:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.45 2014/08/22 09:26:25 voyageur Exp $
+
+  22 Aug 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  x2goserver-4.0.1.12.ebuild, -x2goserver-4.0.1.13.ebuild,
+  x2goserver-4.0.1.15.ebuild:
+  Add some more missing dependencies, thanks again Stefan Radermacher
+  <gentoo@zaister.de> in bug #516234. Drop doc USE-flag, it has been useless
+  for some times, thanks Ian Abbott <ian@abbott.org> in bug #519424
 
   26 Jun 2014; Bernard Cafarelli <voyageur@gentoo.org>
   x2goserver-4.0.1.12.ebuild, x2goserver-4.0.1.13.ebuild,
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 74931a750177..514d1af708c7 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -4,17 +4,15 @@ Hash: SHA256
 AUX x2gocleansessions.service 198 SHA256 e06420fa5fe526c9ff616af1976840136ef174b94e8876fa6a2d32ee1d111ab8 SHA512 45f29bdaa70a91ccdd129158511f78f85b01aeb1ef874b087e3eb96000fbfc104b1c427a5ad5dab65e66624151988bb2fd75c63d4f5033b76bd19849b0986bd5 WHIRLPOOL c9485457a052188ef83aa7b15d4df69c2584ddc023248b7b7557b2d61a310f23cbae60a265e1e74c8be4a6d3a3cb54212452ff6c3905bb07e9e93389057cda71
 AUX x2goserver.init 563 SHA256 c051f263ad2ad9b6064ce12098ad0c3d48b2a83a2c02ccd79020e0ce4be3331c SHA512 cac89ad0032b56188dc30f09bd461762934d5fadf53ccf361125dbefed3c09000b9b00684f7823424340d290c759e112e618f4d4e9d7e739c79702b70a6b3b3c WHIRLPOOL 0f134b9aed4e60f48e7089f97ca6d183387049d6f3ff44c9e8fe476acf3aa5cade1f205ac1d8c1905cacb1c58ea13e1c14545dc993f4dd59cf5a4d36c3e0a511
 DIST x2goserver-4.0.1.12.tar.gz 78958 SHA256 447c5e7b47e6b2bc087731ed26c827020130cc8530ca020a03f7f3ecadc308cc SHA512 30ce6c20cf0bf67ee162cda5d0cbbfd994ac47aa140e3c4cd6118b594ed8fbf83dbc961f2323694206c705f647f32dba8a7fc7bde4ef22be2d4936642865a3d3 WHIRLPOOL 9d4887a1dd701d361311850a8e936d7f22ecf76e1b4ee78b11feca6ec25d02419221b0fb2e72c440394f81e63ffa73762b33bd58123e7bd441e32446ce40814e
-DIST x2goserver-4.0.1.13.tar.gz 79103 SHA256 c3e78206d564a16d67ffb7702e4d59fbcd1dff36a6daa37978eacc5bfe345656 SHA512 322c4158e62ba02eb67e79ae3e56962f7b15c5905555a0efccbdec1b6d7b3b84fa3ec8f6fad9056a02180dd2355c51a579d38e44216f282110b3cf8d73ef621d WHIRLPOOL 11248906d89f818a4672e5e924834e9b075a20ef1c551ce11b430417de283dcdd5da55b5e05366738b425fee17b972d6c02588981cff737e404cc78e9734beea
 DIST x2goserver-4.0.1.15.tar.gz 76128 SHA256 46c0fc2303014db99b138a352a7f3df89c4f7cfabc11dc0aeea4cdc76253bdfb SHA512 ca806c39d2536e7962540733e85199fefea54e80695c6f1ca736cc1998b411524afa8d9cf29c26855fc3373105277daa4ddd69cbcd05c2bbecb01ca5172ba05c WHIRLPOOL b06ace09acf14a0b82b0b5b8f795823d7997c99a4a78bd120ecadedf3bbb8c0b6ad371e8bacf1c080e5d6b45d9760cef8c04f69b9a86a1b2dceb3ebaa450bde0
-EBUILD x2goserver-4.0.1.12.ebuild 2415 SHA256 d5462971afdba08a3f17d42868f2850d758f858d329b54c1586c39f9572d9321 SHA512 4d169dae7874207d2f4a542a4bec5e460f2abb6324342649d12814d777ae3a7c24ffeb943e08479db53a0dc3469f7f7387d5e33fc801c3ff82bfdc46c3454822 WHIRLPOOL 2015f98f368f77d660d321ae8d44c3f1238b0e492b9ad09787fe3056974b688bfe3c9dceec1198ad071cb43e03e124c59c62b82c9b143962cc366208a6263d8f
-EBUILD x2goserver-4.0.1.13.ebuild 2417 SHA256 3835cb7553fa7bd6043cfa3b349242ad9ae15bc271183ca7ad65dd554019fce3 SHA512 b67a8e67c50588a8b719a8c000934713dda2c572579bb03c39585e4740492ebc3baeefdcc52eae10da728591c64f0c12a113c27f5e88dcd624154683cd17ef6f WHIRLPOOL 8a98788bd7d77dab1c1382d6ee532374ca55c30c60d27adaa77e09e7c2da517871529f9d5bfa14eee5615d6f18caa525c4c6dcedaf9c3335645f424d2487664d
-EBUILD x2goserver-4.0.1.15.ebuild 2484 SHA256 d829d68e2f7beee0ad3f41303bfba6e1c760291dbcc5d8aad6bfbb94dcdab0cc SHA512 f36b6df1e069984ebe87dd7c207050694d775722b83d5b1812d10b05faa6de39b7120a50110589a7422f2385e2ee0c5c66332b3d709d2658fe2f8c9b791fa442 WHIRLPOOL 9bf1b141a8098be961f0e2b8c6472604c38e3a8d8deab30626ab84a175a0dc7c66909768cb40e5d0fdb94a1aedd70a1d0a808ee6b2a6943ca2c0ccea1c130caf
-MISC ChangeLog 8649 SHA256 9f108ef872d1d46d9e15cc509497822f0e2577fad6d6e93bfd3a70bb68a638c5 SHA512 6d74f8453e9d727bca6325db0cf03b8fb0ebf8c70b41744456a0d78ed1c7dd6250d3fa3e7120f48213e5915a9869fa2ecbe759db3ffa69da9d9de0b9810921c5 WHIRLPOOL 3fb5e38671d1d09cfd27a96ca02f43801dd5c3c8e992d07be3070aa5c2bf0204341e6879a73b514d3c854a74cf3dbe238718713ae1f023e4cae38975d6f88daf
+EBUILD x2goserver-4.0.1.12.ebuild 2457 SHA256 53a66ac9d11d7daa963d68fb79780cf71a09acd0659cbe3710be64858086ba52 SHA512 45aa05ff4ce06a6b8029719814ea54d6f323bfd73249e354d902bed1817b8ed5ac531d27771e38ea6744256700234b8d8d6f6417d79de5ec3453b6de593c1bdb WHIRLPOOL 1ff40b74e404b7fd680c3460c7313904bc54b64cb37e045a1348fd13543f74bb989e6d520badbcdbcd575e5fcce6338b750687dfe08625d70554f68993b24bad
+EBUILD x2goserver-4.0.1.15.ebuild 2414 SHA256 a49bcda8fa31b8903803bf92414c036f61c81d12cb3600da6553da1fa2603549 SHA512 7702c5b40d32fac4dd2db5f8652d2ff543b87185f8d4da9b483e5d61e2261973344e4542976fd1d5503efcc2d7e40f072b326f9f6e69d9d97f5b09861e1abf12 WHIRLPOOL a4db93754cc0d224d8a2c76d58fb6a078f0165ff0d7c7f8f578b7fe5981b5630413ecfadaa80075aebd4fb18d215f965e42e4309293ac96ad52cdf80cf1f1a49
+MISC ChangeLog 9009 SHA256 f371a2373950410aba026d98075825573278f89a5e629398d1536ff2b8e56106 SHA512 74be67a5b161a4b15505cb967ae9b76cba775131c902a16307c0f3035a8382263c65b3032ec7b99d4f0c94484f59ca0d02336a47d3ab067a70511a6da25d2376 WHIRLPOOL be3df7432189087279b52ec917b6debb125fdd6d319312e7b3c7d7df5da38e13124f9b9005015fe044493b7fa6f38d2a7ce64213b5286156ce972353626ef026
 MISC metadata.xml 307 SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 SHA512 05ebd620c55763866f5be95eeef6c46ceb2f424023df9f0f46a4d675bf06efe95120ecc5bd3f752c6f762c11b5c4152005458cac3dd5797a4b52def34729024a WHIRLPOOL 5441c1a1e9879a9aac8481ebc51821a5ec2f4bf896eb8a7a8d77db4534edd310e314852f234311b6f4c05f6b5947eac7f7a3677f195c056252fed5c4c411f6b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlOsMvEACgkQFYEBGcdFJfKK8QEAq7ZV1zebl4tzkzNKPjWZ91O8
-TbRniCX/mndhlD0qZTUA/0tuNr2aw4nMpHyKVZ64yyntha4CeL0HDUAokuvyQ8+9
-=pkLl
+iF4EAREIAAYFAlP3DMcACgkQFYEBGcdFJfI/1AD/cE5JdvAg4gh/L4hkPLtCoQza
++X4oHCZMXUDO6CXkaBQA/RrvJecqsJW0Wz1cr1GXaDLyJWsT3tXbmZVeBL7TbTd1
+=WTbb
 -----END PGP SIGNATURE-----
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild
index bbe105d77fd1..c2d580287e81 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.12.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-misc/x2goserver/x2goserver-4.0.1.12.ebuild,v 1.4 2014/06/26 14:49:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild,v 1.5 2014/08/22 09:26:25 voyageur Exp $
 
 EAPI=4
 inherit eutils multilib systemd toolchain-funcs user
@@ -20,6 +20,7 @@ REQUIRED_USE="|| ( postgres sqlite )"
 DEPEND="doc? ( sys-apps/man )"
 RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/Config-Simple
+	dev-perl/File-BaseDir
 	dev-perl/File-ReadBackwards
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc
@@ -27,6 +28,7 @@ RDEPEND="dev-perl/Capture-Tiny
 	net-misc/openssh
 	x11-apps/xauth
 	x11-apps/xhost
+	x11-apps/xwininfo
 	fuse? ( sys-fs/sshfs-fuse )
 	postgres? ( dev-perl/DBD-Pg )
 	sqlite? ( dev-perl/DBD-SQLite )"
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.13.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.13.ebuild
deleted file mode 100644
index f183a6670879..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.13.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.1.13.ebuild,v 1.2 2014/06/26 14:49:16 voyageur Exp $
-
-EAPI=4
-inherit eutils multilib systemd toolchain-funcs user
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+doc +fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-# Requires man2html, only provided by sys-apps/man
-DEPEND="doc? ( sys-apps/man )"
-RDEPEND="dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-ReadBackwards
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
-	net-misc/nx
-	net-misc/openssh
-	x11-apps/xauth
-	x11-apps/xhost
-	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
-	# Force the group creation, #479650
-	enewgroup x2gouser
-	enewgroup x2goprint
-	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
-	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
-	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
-	# Skip man2html build if needed
-	if ! use doc; then
-		sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
-	fi
-	# Use nxagent directly
-	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	dosym /usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
-	if use sqlite ; then
-		elog "To use sqlite and create the initial database, run:"
-		elog " # x2godbadmin --createdb"
-	fi
-	if use postgres ; then
-		elog "To use a PostgreSQL databse, more information is availabe here:"
-		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
-	fi
-
-	elog "For password authentication, you need to enable PasswordAuthentication"
-	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
-	elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild
index eff30d8eea07..8cee8f3e6b9e 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.15.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-misc/x2goserver/x2goserver-4.0.1.15.ebuild,v 1.3 2014/06/26 14:49:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild,v 1.4 2014/08/22 09:26:25 voyageur Exp $
 
 EAPI=4
 inherit eutils multilib systemd toolchain-funcs user
@@ -12,14 +12,14 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+doc +fuse postgres +sqlite"
+IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
 
-# Requires man2html, only provided by sys-apps/man
-DEPEND="doc? ( sys-apps/man )"
+DEPEND=""
 RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/Config-Simple
+	dev-perl/File-BaseDir
 	dev-perl/File-ReadBackwards
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc
@@ -27,6 +27,7 @@ RDEPEND="dev-perl/Capture-Tiny
 	net-misc/openssh
 	x11-apps/xauth
 	x11-apps/xhost
+	x11-apps/xwininfo
 	fuse? ( sys-fs/sshfs-fuse )
 	postgres? ( dev-perl/DBD-Pg )
 	sqlite? ( dev-perl/DBD-SQLite )"
@@ -42,10 +43,8 @@ pkg_setup() {
 src_prepare() {
 	# Multilib clean
 	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
-	# Skip man2html build if needed
-	if ! use doc; then
-		sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
-	fi
+	# Skip man2html build
+	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
 	# Use nxagent directly
 	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
 }
diff --git a/net-misc/youtube-dl/ChangeLog b/net-misc/youtube-dl/ChangeLog
index 50685d60982e..aa8f8af9e891 100644
--- a/net-misc/youtube-dl/ChangeLog
+++ b/net-misc/youtube-dl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/youtube-dl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.372 2014/08/21 18:36:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.373 2014/08/22 08:01:01 jer Exp $
+
+*youtube-dl-2014.08.22.2 (22 Aug 2014)
+
+  22 Aug 2014; Jeroen Roovers <jer@gentoo.org> +youtube-dl-2014.08.22.2.ebuild:
+  Version bump.
 
 *youtube-dl-2014.08.21.3 (21 Aug 2014)
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index b873fd50a0b5..47f89f7e08c0 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 DIST youtube-dl-2014.07.15.tar.gz 881673 SHA256 2274535bb4822af0c6a384d352b85d7c724fe9bd371d9bdd428bba4b1493bd02 SHA512 f1ec3b368559ed79c8b03621f6a27344069af9d4bb62023de5a30dfa571f863d0fc50cd874db63d9867e1c1b04a79a7e127cc13081c73705dcdc17b624fd986b WHIRLPOOL e1954e4a3217ad3a248eb7996169fec5e545fa56d60db7359a159df7a2c4da521a2e27f0eedf08ba90db1379f1248cb5be09f4daffaf58fb82ef143980cfaa3e
 DIST youtube-dl-2014.08.21.3.tar.gz 943061 SHA256 6922e0d1f3e0562afe50dd5c980f987aa15b952e4a45a7a58f3e9b3ec8f22085 SHA512 cdd0ab508936c6a36a42e1c65e65ed1a397b7ea28c7c49b97c9d078283d4d9060a7cb47674bc7c3bdc4112d86927d1d690563d9e17502cec80af113811dcd388 WHIRLPOOL 75850e05cf89021bd902de40ceee73733670399e903eefa8ecd460495c2cc2c76a21c9a58adcef6a37d5a732da4d32a33dc5e24c677eaacd1b9bb1c658b6511a
+DIST youtube-dl-2014.08.22.2.tar.gz 948382 SHA256 6739eda66840bb742c1053701db5c9722f93c42b85408804378789f551d26032 SHA512 17c49845c8c1fe87c12be4ffbddb0712e45f0377de983e687b5a15f73ffa23bdb6ef82d6eea6d96c28d732388a155d4f053520fd8b6ca23dc7f1ec925c4af7c8 WHIRLPOOL e2a1a969b01cbc4473df39d6df07c24788840f890366416cfd11562d66a1f7fc6e14e70b555e00cda04a4fb6c30a82dc67c483b17601ee3b1a23dc34fbd298f0
 EBUILD youtube-dl-2014.07.15.ebuild 1585 SHA256 f8afafedd70401a1c04ad6c487c768253160448299a9255d012f7bad8972ebe2 SHA512 e682dca3add25bb49acf1338a13d12bab8b5b76a944f1eb0669e32620742d26c983e9d116be6878aebc0848c7eb06ec9fc1f159f5c28206ab36f713346c734dd WHIRLPOOL ddf8b6015f3215dcd05fa6e1a66cf6a2e12febe5dc8413ec1ea48003d4686e6eb5d4b381c396fb35d669f57ecace6a8116a6d57b2b259b58c44b43b94266ffcd
 EBUILD youtube-dl-2014.08.21.3.ebuild 1588 SHA256 62afd89d7b41f78941b909497c6e1cf844c96091a8df4458449ae4f4c6965226 SHA512 27be97b076e3fced82401533aa38bc7d8214877a9a081f78e4c6dbbc826250bc0ee4f977642986ac24699a832a3d362b2fb854042f137e39cca7f1c164c351be WHIRLPOOL 7dc2b7e5cd488f0613dcab9f615e71732bbee3e0a46e26a0d6a2d18c311d5bfa9550037763e529e515fb783e33da75a5f171ce0a8c535326d705f4406db091f4
-MISC ChangeLog 55653 SHA256 e3cd21e6db52d5972b283b9b7eb0df218db2687f31938a042d33e8f288a68c48 SHA512 97b9e85db6800b7fb833fac0ca2d0709308e57cdb54477c11025ac1148a9ae56ca0298cb2d7897dfe153978241fe3e23d8a4b249779a724c19c0fc0e48d46141 WHIRLPOOL 886da5c9728807ab3d545f45497f201b581fe94c15ff3ff12864b84871180b2866fd09cdb6328083ee23e31b4c90d2d00393287023234369f3129d485d064b4c
+EBUILD youtube-dl-2014.08.22.2.ebuild 1588 SHA256 ede4414be15f12c6fb9c77cf9e1b21c98148f4b599be94cbf58bffc04a121d69 SHA512 0740f5e4e5350ae486b4050f7cfda8f058dc9341dfd1172e00ebb4e1572f998d12ab08be5a9ab3529f755b6eb4a21ff124c8d108aba15122e87d6cf116b21d44 WHIRLPOOL 395a0599eb02a190b42bcf42c5df4112eb1c1282ae83a4305ed1941408ab59545b9e6dafaf1c0627f9e23f662be5a8c8beb878aa39ee91b2f55aea5286093be7
+MISC ChangeLog 55790 SHA256 c9005068a26dfe9fffe3ff48b81b4c2fcb445b2573780ba164ee872ccc8ec029 SHA512 97cb1451a7c7d41150db29fdad5441ec88abb5b58f89b7a043e85aa1f25dd265d104c178781fd4de5f77a30ac72f5ab52ea12cf76da1693f05c45e6b186710df WHIRLPOOL bc0bc88b8cf3a2deac3ef5d07c16eaa7bf2a7d78c863ab51cb2cb199fb34851bcbf2008f4ddda9edbb0aade61aeb8f23f2393e98666dc53267c747e7c4a2073c
 MISC metadata.xml 274 SHA256 2b4f14b46d21b004377e745db520f7961bc4163b23e6f3d8bbcab508272b1f69 SHA512 acfb3695928ebf2ee87c75f06c7ab47a65f4aa8564b1426ee523a1a5c853ed56df0de4cba186ac003383a27dfa9d21e4f4ff44b48e152c406a918f1b01ca358b WHIRLPOOL 0f245af71a769b0d4eb9bb57a99599a0875ad0373a830ff9e8215a077d3d2f02e916b7b25d275b19b5139810608abddfada68d3d0f2e9191351d26ba716b623b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlP2PDwACgkQVWmRsqeSphPWcgCePDGlmpj+nJzaSrDGf+pDmpvf
-xVQAn0ngPXgmAQYbkAJnYY4Wdh3FhLTE
-=J0Vv
+iEYEAREIAAYFAlP2+L4ACgkQVWmRsqeSphMZoACeK2X/1rMc9PLeC6rZhUUYa2BM
+ySEAn2INn4b7HhkYDZP7rsDd/1MH1NNg
+=Vqxm
 -----END PGP SIGNATURE-----
diff --git a/net-misc/youtube-dl/youtube-dl-2014.08.22.2.ebuild b/net-misc/youtube-dl/youtube-dl-2014.08.22.2.ebuild
new file mode 100644
index 000000000000..a82bc151ada4
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2014.08.22.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.08.22.2.ebuild,v 1.1 2014/08/22 08:01:01 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_6,2_7,3_3,3_4})
+DISTUTILS_SINGLE_IMPL=true
+inherit bash-completion-r1 distutils-r1 eutils
+
+DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
+HOMEPAGE="http://rg3.github.com/youtube-dl/"
+SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="offensive test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	if ! use offensive; then
+		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
+			youtube_dl/version.py || die
+		local xxx=(
+			extremetube fourtube goshgay hentaistigma mofosex pornhd pornhub
+			pornotube redtube slutload spankwire thisav trutube tube8 xbef
+			xhamster xnxx xtube xvideos youjizz youporn
+		)
+		sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
+		rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			test/test_age_restriction.py || die
+	fi
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	python_domodule youtube_dl
+	dobin bin/${PN}
+	dodoc README.txt
+	doman ${PN}.1
+	newbashcomp ${PN}.bash-completion ${PN}
+	python_fix_shebang "${ED}"
+}
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 101d67a64a4e..ef5e306271cc 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1655,6 +1655,7 @@ dev-lang/php:opcache - Enables built-in opcode cache, replacing pecl-apc et.al
 dev-lang/php:pdo - Enable the bundled PDO extensions
 dev-lang/php:phar - Enables the phar extension to provide phar archive support
 dev-lang/php:sqlite2 - Add sqlite2 support. Will be removed
+dev-lang/php:vpx - Enable webp suppoprt for GD
 dev-lang/php:xmlreader - Enable XMLReader support
 dev-lang/php:xmlwriter - Enable XMLWriter support
 dev-lang/php:xslt - Enable the XSL extension
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index d9b8c2fc7406..c6b8fe1805de 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.303 2014/08/20 07:44:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.304 2014/08/22 10:22:16 mgorny Exp $
+
+*systemd-216 (22 Aug 2014)
+
+  22 Aug 2014; Michał Górny <mgorny@gentoo.org> +systemd-216.ebuild:
+  Version bump.
 
   20 Aug 2014; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
   Handle IDN dependency for resolved.
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index e66b75e2e673..83692f2c5351 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -8,27 +8,29 @@ AUX 215-0002-endian-explicitly-include-endian.h-wherever-we-want-.patch 1485 SHA
 AUX 215-0003-udev-exclude-MD-from-block-device-ownership-event-lo.patch 2892 SHA256 6f2a59488e384aab809a4d31df0b088b2f052f53d68a6fe34117c3af336c9e1c SHA512 4ec1f99760a416f7825e1ab760779ce1be70d2c6c583dda7d3b22b076507fc26209d04a6a8312d73db74a65035dcc5c5147d6784ea7292be402ea565919ef59e WHIRLPOOL 11d9df38a05e0bc8c9ff3a48dd34ffa91277464d1c5f874e19cb2c1f152957ab88caf520d079671bc907adc6a546c279f7e54dca33c2e0e502fc3f6593ebbb0a
 DIST systemd-212.tar.xz 2722692 SHA256 652906b43704fe705cb47757ea9bbbf3c1ab4a1d55ea38b0013a6f2d0863f2c2 SHA512 3e6dac77785cb2f928886886f92cdd11ed00a4db1453699e0102d3ecffa03d1795f44df10239105e4b2b039f0e3e4b5d44c9f876f25c10a6dc4f7e1fbf87c333 WHIRLPOOL 31d1a967435963155c60ca5016f207aa105e9ddcb7d73e9fcde20f7e1fb66701384b81ee01134bf4d75dfa1ea0d412bb352ff11ac6f8c05e836135baf94bbe37
 DIST systemd-215.tar.xz 2888652 SHA256 ce76a3c05e7d4adc806a3446a5510c0c9b76a33f19adc32754b69a0945124505 SHA512 58de0bf7c43c309c2f8e4b7af16b46608a4ea39cbb280496fe5d43d76ea25545484f4ef62efce18be487c69134e4a038d8787f2c262484f92f7fc6feb3ae2f11 WHIRLPOOL 07389822b9f09cd91f360f3cbdcd0b5bf46ba1750dd1a4ad44fd2813436ef40b447b954d33582ffe83aebde618ecbeac4d2f3231d8afbf3975caf84f52b1053a
+DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494
 EBUILD systemd-212-r5.ebuild 14258 SHA256 3d0a4025ce2237d29697069777126959691aa9629e85386c78909a28b0263c85 SHA512 50439bcd97b09bb0dcae71f8d59bd4fd904faf0289d79051682684232f0fb254a1c87afc75664ea322acca7541a44b9efdf94d780f3746669a34445538dd129e WHIRLPOOL 10400375411c8b4051aff266a628b1cc2be111af059093e1219cc78042d838cb64ca94c99fec4cfdb9ad6d4562d34568e2ce17efba7aa17062eb9fe99e4d2992
 EBUILD systemd-215-r3.ebuild 16036 SHA256 9dcde80ec6c8bf2abb809e8974c56f685078dd8c98a9ffbc0fa0d78d45cdc577 SHA512 1ea0e60ec515832ac73c1ccdf35b34c29ab847aaee6ed4992b498303418fc56bac0e87ac27d5b1457b557c34b0f45b1f75f30eaeb4f7dc87088fd08ab9cb4b79 WHIRLPOOL 5f2162a7167f2ebcd2b24d103c30ee83697d2e5db141cd07b1477f50c0635c67de590dab0a42e85a8edcc8c639a9fbd7a00e38fcec1d9a7512f64c0e83bf5099
+EBUILD systemd-216.ebuild 15387 SHA256 9908d8c86782b11741efc9f0b05d83595d50f4b04475ffb5e685af2956031cd9 SHA512 00afac33428fad5f19624667a7547145f829889ac26c4e29dc106ba463ba1a495934a0733957174ba00ba20f5af90f19d78990cc94956c18ffd7c3b77f6db4c6 WHIRLPOOL 9cc6ab5ad3291176f7a277df293f65ca1eafc4ea7a5021f3e9154d9c24cba0750d9451704b4a395949f8f355694b3564e184c7d4422f6add2953d0a2fa732c4b
 EBUILD systemd-9999.ebuild 15908 SHA256 efae9f3f46f30ab9fde23da8827179936970edd8b49230dbb3021ceb80c013dd SHA512 18d55cbe0f28b8b3686d14d17a8b2f5692c25c8be2de0501a02c3b438bfcd08cac82fa353c277c07a0e7075a7e3e6115dc59b9b31d72952962c36f83b5431c2d WHIRLPOOL fdb9346546a1b0dd793b0b3d57522de6a234331d2222d8f352d3de3ea3bb318960f01a834f641b8656caf049fee2e4af61ba506fbe252d375f589e27a4da91a1
-MISC ChangeLog 55028 SHA256 e7d072ff97100864be8f300a10459c387c0299fa61cd5a45234c8b4d4ebe6ae1 SHA512 77f0af86250a4e6aaff998ffcea6d7a98f5951fab797658565b98bd7276c3a83c9dbc60073b55f50b1a18e86d64c34eb5a53a1d160a5f2f21130da3ad7f38286 WHIRLPOOL 113260dd66c6d58e9ab45fac27e3bca556569d2bedefee02b154b2f753fd37550bf161f5707c6b1f319b5221937ee8bcce70aa57c645260fd828a161407dfd09
+MISC ChangeLog 55144 SHA256 aae4d20b324e9f1593769e56be47b3e6338f2cf49fc539fbe48afb7f9f4c8a27 SHA512 27405f82401ac65d7861d532e780073b97a24b4560a747e1f55c4dffdf6dd7b11f319edb418678b9a3cc1c18e5e371c36df3024f381c7011f9c73ded7d97eaf8 WHIRLPOOL 0b36030d278fc1bbea7847658d52036d04a09e53a1dc7c228b64e916de533ea59d62b5d1151f1ea6150842a8d293f3634becd0fc20815e10f93aae6025d6ef93
 MISC metadata.xml 1274 SHA256 ada019b0ad28087994a013b50abf20e59351799205882cae167c9ceb5005092e SHA512 a912ef156eb1c925690be27ae2d9c3411c6ae5ea2eff035e3e1e15b84d12956911004760036b5b54fc34416310ef23b34f5e92115645e8ed6312f5471eaa800e WHIRLPOOL 51756b380a09a3a0f8bdec94f5dcdbb5c3960fd71878a9e7b0b920e06ff37a2713cac928588d75e6bb94f7b9e32f564a353d36e690619e0b2b245c77682ac0e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJT9FIYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJT9xnhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+wQQAIMrSz3sYfj1xkbKUj9co3p3
-puoAKCy6nQhHwLcyKjb4QyleGQ0qIYvP/zyR9fEJ3NYgmMfDa9LEWqY6X1923yzy
-2+sU56xL1DG9Gp3T5GJzhYNOrQfbVOUwCKYZvBQSNNzbwPnJdkCZLh/GmUz6f5Zi
-gbUs9f6hrGfc0EkQQr8N77BlQnWFBoavTVKkNukRk579EB6ttB/FJdyTWRI4VRRa
-AaRFLMuFxBemOfXfg20amIRWRsdqpiUYBXKkPLSord1xHOHnUySxVY2u3Smj4PCd
-MOxNaVylsUncYsKCOt+zxX33aqoD0c6wOqTbf1n0WgoPdJTjrEc68O+K374KE6ZM
-83Q6XxXLNK2L6Lti0lOTvQLv8RKcsGO9kaZc0OKxyJ9hs56HL88sdgmkTif0/syO
-apuKSPFJORPCdArBoo/ICdrVvrL++DdUOEvFEF3e0Kls9mBJjn260A6GSmLOD9rU
-OLIs0UzRSYs7/RIJ/LfSDRYmoNkHjVTUKaNqSze0UcETATN/BwZ22MxKYpxcvl8U
-AgSktlb7khhQxmFFZafizgSjTcvZhszl7qORkfVJ0g7v7N++Pj0lOcXmqsFbHBc7
-Qa7mEXoN80K4Ftc8CoW50uGiQSAHuu+E6owNgP3grwZF4zR+wWJSFGOVI3uPy3jt
-r85VyFM9zqa6Ag6V9ccG
-=P7TZ
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5P8QANXDuOxrWbswQDxLhfzT3KLn
+IIe5Mh74ltnE01YsFNmIt18avXPv3YedxclgpWw6xqdl3jA2u31VOnkXV5NGoH7k
+AUMqDPWvmsSgfZC1dUgeNJ0hBdw0wdvDoLsFPFsEuDLnxP6bIuFGb63CNbwqosuB
+Vu1bvv2iWeBiaomRvzmKEjg6knFIj7+XO514MojWC1zwMU9eMpWRqgixDTQ7WTdd
+HuvllpiOALCAZ+DsbiuaIwjHkyry99zgTVm8z0JM935d2rrzd4B5KxmN50a/Ufhc
+Pcz4rrvOdlX5HhGLMhZDWVWaLPFmCNAXOTAgcZHgS/1skp4vw49BV8cEMs+mjOQW
+ODvbRW0bMZjW8xbzicFY1ifEX+OvgLMLjMFC6rVCN7FV6Kk4UGGkxjOGfqJE2qzu
+k0AHp5+DZo6KNZDA+zzt/fQywdwEHQKCfVv1TNl1hYrsIbv+8slr6UDFM4PeDKsn
+cj6ax04kpb2hAWMZS7uPHKmkvh4L4QgmhYyV83VkLtHfsBwHM5sVSQJra2a+N2rI
+EWFes02VSFI7xdOuDX8OhyEj//BZ1uUphR2PMwCbymgZ98n3OflhbgLlKdtXmLQb
+BbBxkL//xc8D86gd0laJMhPkQCkrQbEMlBEhfMowfz91QHOCiDIS4QKWtWbLD7pr
+TIfjnnIMMxjdB5goTwut
+=Aqor
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-216.ebuild b/sys-apps/systemd/systemd-216.ebuild
new file mode 100644
index 000000000000..97adc9644b3a
--- /dev/null
+++ b/sys-apps/systemd/systemd-216.ebuild
@@ -0,0 +1,493 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216.ebuild,v 1.1 2014/08/22 10:22:16 mgorny Exp $
+
+EAPI=5
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+inherit autotools-utils bash-completion-r1 linux-info multilib \
+	multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
+	user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="acl audit cryptsetup curl doc elfutils +firmware-loader gcrypt gudev http
+	idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
+	selinux ssl test vanilla"
+
+MINKV="3.8"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
+	sys-libs/libcap:0=
+	acl? ( sys-apps/acl:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gudev? ( >=dev-libs/glib-2.34.3:2=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? ( net-dns/libidn:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	pam? ( virtual/pam:= )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( sys-libs/libseccomp:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	|| (
+		>=sys-apps/util-linux-2.22
+		<sys-apps/sysvinit-2.88-r4
+	)
+	!sys-auth/nss-myhostname
+	!<sys-libs/glibc-2.14
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.6.8-r1:0[systemd]
+	>=sys-apps/hwids-20130717-r1[udev]
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	>=sys-devel/binutils-2.23.1
+	>=sys-devel/gcc-4.6
+	>=sys-kernel/linux-headers-${MINKV}
+	ia64? ( >=sys-kernel/linux-headers-3.9 )
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.18 )
+	python? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
+
+src_prepare() {
+	# Bug 463376
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+	autotools-utils_src_prepare
+}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
+		~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS
+		~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR
+		~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
+		~!GRKERNSEC_PROC"
+
+	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+	use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
+
+	if linux_config_exists; then
+		local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+	fi
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if [[ $(gcc-major-version) -lt 4
+			|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
+		then
+			eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
+			eerror "gcc version using gcc-config."
+			die "systemd requires at least gcc 4.6"
+		fi
+	fi
+
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		if ! use firmware-loader && kernel_is -lt 3 8; then
+			ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
+			ewarn "require systemd with USE=firmware-loader to support loading"
+			ewarn "firmware. Missing this flag may cause some hardware not to work."
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(get_udevdir)
+	# Fix systems broken by bug #509454.
+	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+
+	multilib-minimal_src_configure
+}
+
+multilib_native_enable() {
+	if multilib_is_native_abi; then
+		echo "--enable-${1}"
+	else
+		echo "--disable-${1}"
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		# disable -flto since it is an optimization flag
+		# and makes distcc less effective
+		cc_cv_CFLAGS__flto=no
+
+		# Workaround for bug 516346
+		--enable-dependency-tracking
+
+		--disable-maintainer-mode
+		--localstatedir=/var
+		--with-pamlibdir=$(getpam_mod_dir)
+		# avoid bash-completion dep
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in $PATH
+		--enable-split-usr
+		# For testing.
+		--with-rootprefix="${ROOTPREFIX-/usr}"
+		--with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)"
+		# disable sysv compatibility
+		--with-sysvinit-path=
+		--with-sysvrcnd-path=
+		# no deps
+		--enable-efi
+		--enable-ima
+
+		# Optional components/dependencies
+		$(multilib_native_use_enable acl)
+		$(multilib_native_use_enable audit)
+		$(multilib_native_use_enable cryptsetup libcryptsetup)
+		$(multilib_native_use_enable curl libcurl)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable elfutils)
+		$(use_enable gcrypt)
+		$(use_enable gudev)
+		$(multilib_native_use_enable http microhttpd)
+		$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
+		$(multilib_native_use_enable idn libidn)
+		$(multilib_native_use_enable introspection)
+		$(use_enable kdbus)
+		$(multilib_native_use_enable kmod)
+		$(use_enable lz4)
+		$(use_enable lzma xz)
+		$(multilib_native_use_enable pam)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with python)
+		$(multilib_native_use_enable python python-devel)
+		$(multilib_native_use_enable qrcode qrencode)
+		$(multilib_native_use_enable seccomp)
+		$(multilib_native_use_enable selinux)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test dbus)
+
+		# Disable optional binaries for non-native abis
+		$(multilib_native_enable backlight)
+		$(multilib_native_enable binfmt)
+		$(multilib_native_enable bootchart)
+		$(multilib_native_enable coredump)
+		$(multilib_native_enable firstboot)
+		$(multilib_native_enable hostnamed)
+		$(multilib_native_enable localed)
+		$(multilib_native_enable logind)
+		$(multilib_native_enable machined)
+		$(multilib_native_enable networkd)
+		$(multilib_native_enable quotacheck)
+		$(multilib_native_enable randomseed)
+		$(multilib_native_enable readahead)
+		$(multilib_native_enable resolved)
+		$(multilib_native_enable rfkill)
+		$(multilib_native_enable sysusers)
+		$(multilib_native_enable timedated)
+		$(multilib_native_enable timesyncd)
+		$(multilib_native_enable tmpfiles)
+		$(multilib_native_enable vconsole)
+
+		# not supported (avoid automagic deps in the future)
+		--disable-apparmor
+		--disable-chkconfig
+
+		# hardcode a few paths to spare some deps
+		QUOTAON=/usr/sbin/quotaon
+		QUOTACHECK=/usr/sbin/quotacheck
+
+		# dbus paths
+		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
+		--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
+		--with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
+		--with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces"
+
+		--with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+	)
+
+	if use firmware-loader; then
+		myeconfargs+=(
+			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
+		)
+	fi
+
+	if ! multilib_is_native_abi; then
+		myeconfargs+=(
+			ac_cv_search_cap_init=
+			ac_cv_header_sys_capability_h=yes
+		)
+	fi
+
+	# Work around bug 463846.
+	tc-export CC
+
+	autotools-utils_src_configure
+}
+
+multilib_src_compile() {
+	local mymakeopts=(
+		udevlibexecdir="${MY_UDEVDIR}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}"
+	else
+		# prerequisites for gudev
+		use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
+
+		echo 'gentoo: $(BUILT_SOURCES)' | \
+		emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+		echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
+		emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi || continue
+
+	default
+}
+
+multilib_src_install() {
+	local mymakeopts=(
+		# automake fails with parallel libtool relinking
+		# https://bugs.gentoo.org/show_bug.cgi?id=491398
+		-j1
+
+		udevlibexecdir="${MY_UDEVDIR}"
+		dist_udevhwdb_DATA=
+		DESTDIR="${D}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}" install
+	else
+		mymakeopts+=(
+			install-libLTLIBRARIES
+			install-pkgconfiglibDATA
+			install-includeHEADERS
+			# safe to call unconditionally, 'installs' empty list
+			install-libgudev_includeHEADERS
+			install-pkgincludeHEADERS
+		)
+
+		emake "${mymakeopts[@]}"
+	fi
+
+	# install compat pkg-config files
+	local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
+	emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
+		pkgconfiglib_DATA="${pcfiles[*]}"
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+	einstalldocs
+
+	# we just keep sysvinit tools, so no need for the mans
+	rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+		|| die
+	rm "${D}"/usr/share/man/man1/init.1 || die
+
+	# Disable storing coredumps in journald, bug #433457
+	mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
+	rm -rf "${D}"/etc/systemd/system/network-online.target.wants
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+	local locale_conf="${EROOT%/}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+migrate_net_name_slot() {
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${EROOT%/}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ -e ${net_setup_link} ]]; then
+		net_move=no
+	elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
+		net_move=yes
+	elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+		net_move=yes
+		net_name_slot_sym=yes
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $? || FAIL=1
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+	use http && newusergroup systemd-journal-gateway
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${ROOT%/}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	# Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules
+	migrate_net_name_slot
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+
+	if [[ ! -L "${ROOT}"/etc/mtab ]]; then
+		ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
+		ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
+		ewarn "and 'mount' to not work properly. Please run:"
+		ewarn "	# ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
+		ewarn
+	fi
+
+	if [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then
+		ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable"
+		ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf"
+		ewarn "to /run/systemd/resolve/resolv.conf"
+		ewarn
+	fi
+
+	if ! has_version sys-apps/systemd-ui; then
+		elog "To get additional features, a number of optional runtime dependencies may"
+		elog "be installed:"
+		elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
+	fi
+
+	if has_version sys-apps/openrc &&
+		! has_version sys-fs/udev-init-scripts; then
+		elog "If you plan to boot using OpenRC and udev or eudev, you"
+		elog "need to install the udev-init-scripts package."
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-block/thin-provisioning-tools/ChangeLog b/sys-block/thin-provisioning-tools/ChangeLog
index c4a99b47951b..d9db8e9765ef 100644
--- a/sys-block/thin-provisioning-tools/ChangeLog
+++ b/sys-block/thin-provisioning-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-block/thin-provisioning-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/thin-provisioning-tools/ChangeLog,v 1.48 2014/08/10 20:22:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/thin-provisioning-tools/ChangeLog,v 1.50 2014/08/22 11:53:52 ssuominen Exp $
+
+  22 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -thin-provisioning-tools-0.2.8-r2.ebuild,
+  -thin-provisioning-tools-0.3.2.ebuild:
+  old
+
+  22 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+  thin-provisioning-tools-0.3.2-r1.ebuild:
+  amd64/x86 stable wrt #493892
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   thin-provisioning-tools-0.2.8-r1.ebuild,
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index 6005f2d9dc1a..9dfdd36ea1c8 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA256
 
 AUX thin-provisioning-tools-0.3.2-Remove-ambiguity-between-boost-uint64_t-and-uint64_t.patch 6866 SHA256 377c4b1b2caec23243e3cab6660ea736006a3c859e1a1b49831a481b631b230e SHA512 1f52f99d5fe41718b45558270b59be882cab54c962db2048fdb934321b5753957587ac62a9507fd7a89e45fceaeda1d8f2189af28188e2c8742783be1dd1421b WHIRLPOOL 0d5f856f23e023a696041b28b7a1ae39b28bf6bb7b2a82ccf30db98ea817fd5bd37676c7f046d0451db303fe2ecc54fcb5922da02856cba13455d3c9d275659b
-DIST thin-provisioning-tools-0.2.8-boost.patch 3011 SHA256 abda9d732a1ea988c16e60131e76175fb2dd27ce4c197f571eed1563b5a5080f SHA512 56a08698e63be57b9fc742358e22d5bdaf1470cb42892c98d0296b0c6e85ea92f69d9056cb34b19762f12292c5fd81476e2a880a424d9fc9dc7e49d6df6824f4 WHIRLPOOL 059e94e6c1563cac4f387133fff7901eae6b55e9b69f31c0eca36df1a511844090c073054ce8912656b6f7f40b517812be71e630a8fe628235d3e42013dea8b0
 DIST thin-provisioning-tools-0.2.8.tar.gz 158332 SHA256 8a5d87b929095a383594b7141b89e51ae42046d7dd254d544330d789b6744344 SHA512 6534bf42ae936f6f32ce05b89eaeb731938b3761e74366d21282a69d74875d1f9d5084590b19969894c9908726e96f17714f051f050a040dd934533830eddfa9 WHIRLPOOL 16bcc268b450938ccec450323ce6dee97a4851c97438115c250c674b930ef8dfd0c7f6507d6c5204b72250da685d35ff57cf72f297abeec6704fb09520307ef2
 DIST thin-provisioning-tools-0.3.2.tar.gz 175049 SHA256 1b9d8e9269cffe06f3c87214d35436225e12599debefbf1a50194c69cc3404ca SHA512 d6e18c303769b39c5bd48ef30d2819adc57d2d87b3c9b56d5d72468fb35f9b7b2309d35c6c12eabc36d653dd85338b9ad2fca9eed5c738a87b932b71f3a6da4f WHIRLPOOL b1bd87aa1995ba0616001837247c962c492d0029cb8a89b97aa326eb63d8a89113905f5d34490593e0cfcca33ef074e02a50679d22c3b1859d8fe5b97368c608
 EBUILD thin-provisioning-tools-0.2.8-r1.ebuild 1373 SHA256 d0eb87d9e534cd4204310233cefaa41be51bed71545856d170cd1e464453598a SHA512 1204e284156d45a66eabb71fbe20de31e19e1befe282091689e1976a4c1caa6e7594e86e7c08baec33d4efec16b688ce8f3a146d78b0a9a0d2a0086c747a97fb WHIRLPOOL 483d718555c5f606f5a58a6eb55180c3caeb4dab40e75a240de68376f95e4f38fcfaa646b6044af79368fbdd9c07de967c757ebb5b7d63b74d59675604b3c17b
-EBUILD thin-provisioning-tools-0.2.8-r2.ebuild 1632 SHA256 57f6a6b6090ebbaeb18ed6f0c233af513dd657af41f443ed8fae6c1a2592ba82 SHA512 4ec12ea527d2843a2ef0f5f6be93bdaa6daf9a3b9a0ae52598b78a54823f0909562363f344b6bf84f05e67241aa7d121f597aa87603ae8a13c50066cf73c5001 WHIRLPOOL 13eae21de1adef1fea7f8f43cb12990606e1b1acf7e12f14acba40d849eaa2e52ed2e8383b27762930d203c070764addb1d1ec8deab22134ed6da8c01bed7d20
-EBUILD thin-provisioning-tools-0.3.2-r1.ebuild 1503 SHA256 47d0464c9d7b29b67fd2ea039b61ca9d43e8bb4db5f31e7a97f82d6a32d66d44 SHA512 b0d99c33eb7dd85432e34f647b1386453c3e515c0b181b7d3970ae6f78b96c71b7bcd0b92e3e1e6d283ad72c3dd8aab059ad4d438be5e705274c6cd675efaa2e WHIRLPOOL c71779babf0127ff32cdd3f20aab090006df1f705c7a9604d4dff23b6943bb6b4e689ad107e12b137a6eb3aca4fdc80121cd3bbcf7e11dce3b9a83c6e37c10d6
-EBUILD thin-provisioning-tools-0.3.2.ebuild 1414 SHA256 b39aafbc200a4e124a616b11269f4477cc16818abc2722b64a98ea244631a951 SHA512 79e555942b7ffa45e595d7dc462dc042571d340b4dd13ec86652a57d44d8809bd0658b90dd93074fd4709cdff4b698a5d8f3a9e46927e884a81fd9209d538006 WHIRLPOOL 7ec804d29f073f56a5e9b3c1e3e9dee63cbf1948e7a4ab6982cfa110292c58dbf5dd5a7918b897471784a69d266b8942f6e1598c1b82a2a4266b858d27703563
-MISC ChangeLog 7926 SHA256 8358744c35401a1dab54787a8da9e66881a4d986f620da594df3144062a14961 SHA512 75433f9a10388425553167ad2b656437d3ef603812f7857e6ebb89ecb34545b970cf743b322f1051312cbe3654a26da6cec418f9c2093ac5ce4b07bdfead5f82 WHIRLPOOL 9bd94ba9ee0540278a66ede74532b704b16db254e95ca04f1918068ed469b487a944274ce472333efd6a848e495bbf9255eb54e9631349f0304ba801c99901a7
+EBUILD thin-provisioning-tools-0.3.2-r1.ebuild 1504 SHA256 09f1f7e59e2cf8d004e7af4d2b9c26e182e73048f16b27ddb0850d4aae089210 SHA512 1e6e2f1888c55e84ea8dfef6a2d9714559b0f736387a8551cec1afb21b304fb05290aa78ef98e79ceb984669de2d479f428492b8b5ef22c42b094bd16af3b8bc WHIRLPOOL c6e01d5eb68ff8431c44f647ca9fcf83a9768149d695eeda80f96f354ed8cf2d12f552ec8a929793cbf56eccea7baa19a021c273400dcb970937ba9cbd7dadf1
+MISC ChangeLog 8204 SHA256 2f956da1ec3a590feb6b62f8e241a8da99fa3e7f9928e56ac3ab6bc7bc34289c SHA512 54b27da53f5c98af65e53bb5ae8fdcd5aec2c8947d5df20a5146f2ea8c90d36b6bf8acf447ce8e53c58474803e20e8c62adab193e616bca8ae972b2472dc4db2 WHIRLPOOL b0922dd1c37b02461091be1899dce607ab336c81f1d8337fddfdd9352173d369cd09b433d62d3704081e44899106241506632fd4d1aa46aeb2e8735a6d4952b1
 MISC metadata.xml 352 SHA256 5c0043176bb3aa5f86c10eda3e3aae3d71374de82b47f7cb07cc4e76337ad4c7 SHA512 8356301004ee2f61b15eb94aad63d7946af41d1171b9b95a4a4bbb1c1bba7670d70b47a81b2003ea80fbd6a7378c2eaedfe4369cfe5520e737324223546dd7e2 WHIRLPOOL b0f917ec1b54c8f3c20bdf6fc15d9d5f23273cf37b09a96f0d06ed315b22c7218ddd4b3523ec8b93ae70bb891202ed72b7fd53741c6ce72b6b4f216ea10dd884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn1JoACgkQcaHudmEf86ogSwCfQc8/0MmGngFzm1sevy4vE6+c
-KbEAn3L3sJehSWpZ3klBYHvQx7VTNoKM
-=Vktj
+iQEcBAEBCAAGBQJT9y7eAAoJEEdUh39IaPFNg1wH/3LgOfjx4qiUFLtrE5w188gw
+Ih3TYJprYWi4SR7Aa1Poc31m4TqdMjl+eNYNJMmLtvXXDj/Qrf7FEyQhKrolBwbd
+YWILr7FUC9yooNWeB2OQqgfDa95vdgQsfv6RdQID5iuqbrwny8VoIPjlGKL/7qwZ
+5Ru2QcROuwpF7IZVe/XG+yGvErwsmIwF7JRIyKQuRf/HYzftsy6ZG5ku6uWoyKGN
+R/ioSAID1bkUq7KdmrqddJ5l7mNg1ajjOWFl45Gumg4QEw5KVjJhzYskRu+6ISdM
+ViBXRMKbaSypfvythnyqr8nf1PbMyHnlizepvBwKBChZb7/QIQ83TCpvxmFBovM=
+=WGdC
 -----END PGP SIGNATURE-----
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8-r2.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8-r2.ebuild
deleted file mode 100644
index bf9d00a06ae8..000000000000
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8-r2.ebuild,v 1.2 2014/08/10 20:22:49 slyfox Exp $
-
-EAPI=5
-inherit base autotools
-
-DESCRIPTION="A suite of tools for thin provisioning on Linux"
-HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
-EXT=.tar.gz
-BASE_A=${P}${EXT}
-SRC_URI="http://github.com/jthornber/${PN}/archive/v${PV}${EXT} -> ${BASE_A}
-		https://github.com/denys-duchier/thin-provisioning-tools/commit/3a4c06b772bc8ca27bcf7c2d82abc46c65c23795.diff -> ${P}-boost.patch"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-libs/expat"
-# || ( ) is a non-future proof workaround for Portage unefficiency wrt #477050
-DEPEND="${RDEPEND}
-	test? (
-		|| ( dev-lang/ruby:2.9 dev-lang/ruby:2.8 dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 )
-		dev-cpp/gmock
-		dev-util/cucumber
-		dev-util/aruba
-		)
-	dev-libs/boost"
-
-PATCHES=( "${DISTDIR}"/${P}-boost.patch )
-
-src_unpack() {
-	unpack ${BASE_A}
-}
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}"/ \
-		--bindir="${EPREFIX}"/sbin \
-		--with-optimisation='' \
-		$(use_enable test testing)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" MANDIR=/usr/share/man
-	dodoc README.md TODO.org
-}
-
-src_test() {
-	emake unit-test
-}
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.3.2-r1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.3.2-r1.ebuild
index 162cef18bafc..bff8915f81a0 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.3.2-r1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.3.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/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.3.2-r1.ebuild,v 1.2 2014/08/10 20:22:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.3.2-r1.ebuild,v 1.3 2014/08/22 11:52:56 ssuominen Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -13,7 +13,7 @@ SRC_URI="http://github.com/jthornber/${PN}/archive/v${PV}${EXT} -> ${BASE_A}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-libs/expat"
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.3.2.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.3.2.ebuild
deleted file mode 100644
index dcdefaa9ccae..000000000000
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.3.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.3.2.ebuild,v 1.2 2014/08/10 20:22:49 slyfox Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A suite of tools for thin provisioning on Linux"
-HOMEPAGE="http://github.com/jthornber/thin-provisioning-tools"
-EXT=.tar.gz
-BASE_A=${P}${EXT}
-SRC_URI="http://github.com/jthornber/${PN}/archive/v${PV}${EXT} -> ${BASE_A}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-libs/expat"
-# || ( ) is a non-future proof workaround for Portage unefficiency wrt #477050
-DEPEND="${RDEPEND}
-	test? (
-		|| ( dev-lang/ruby:2.9 dev-lang/ruby:2.8 dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 )
-		dev-cpp/gmock
-		dev-util/cucumber
-		dev-util/aruba
-		)
-	dev-libs/boost"
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}"/ \
-		--bindir="${EPREFIX}"/sbin \
-		--with-optimisation='' \
-		$(use_enable test testing)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" MANDIR=/usr/share/man
-	dodoc README.md TODO.org
-}
-
-src_test() {
-	emake unit-test
-}
diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index 02126ff06e14..f9285c98f1bc 100644
--- a/sys-fs/btrfs-progs/ChangeLog
+++ b/sys-fs/btrfs-progs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/btrfs-progs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.81 2014/06/20 06:00:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.82 2014/08/22 09:36:50 floppym Exp $
+
+  22 Aug 2014; Mike Gilbert <floppym@gentoo.org> -btrfs-progs-3.14.1-r1.ebuild,
+  -btrfs-progs-3.14.1.ebuild, -btrfs-progs-3.14_pre20140414.ebuild,
+  btrfs-progs-3.14.2.ebuild, btrfs-progs-9999.ebuild:
+  Add slot-operator deps. Remove acl from RDEPEND.
 
   20 Jun 2014; Mike Gilbert <floppym@gentoo.org>
   +files/btrfs-progs-3.14.2-install-man.patch, btrfs-progs-3.14.2.ebuild:
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 2ad2b08638b5..1480560b7062 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -15,9 +15,7 @@ DIST btrfs-progs-0.20-rc1.tar.gz 246563 SHA256 73383b6de89dbd1e93b45ecd8db99b3b8
 DIST btrfs-progs-0.20_rc1_p358.tar.gz 326938 SHA256 42dabee7c5cdcc353a0aa5d3244a920949557c90bcd5dd94f98df95c5a0ccd8a SHA512 9fe3c18975f4f80449b0296d9d19af6f919c56565dfd7c33e7fa142635a5b46bc9759ee116dc2a09c3392637e461bbfd5434e60bece0e6b707167c30331eb82c WHIRLPOOL 53b7161d185b2340c291a8057b3f9610c84af7efacee1aad34cd92674802b87f3e272054fd305f35e517c9036b5c1f0765a1a151a32945ef46c81098075efb60
 DIST btrfs-progs-0.20_rc1_p56.tar.gz 252929 SHA256 dd7746524465f47cdb740a5e46ebf2d1da4ed4631ddba5d4d550547828726d50 SHA512 bb47f2f5d30222fc6dd8b558de4d56c5f39d2833519af5fda595dbc67907133853dafb240baf65f6e0d344d7a80c0571e16db888b884e27ca1a75333b3556890 WHIRLPOOL ad5d59ad3ebc07489dadeaf769fdd6955812eb913ebee5b40419bf7607590048be34906b3b416539807223be06f0587d14d28278716d9c54ddbfe09427c6089c
 DIST btrfs-progs-v3.12.tar.xz 261220 SHA256 097e63561c91c1fbfdf99e7a60ed55b51fa0f057b3875c08413e362c93938cdf SHA512 655e8d9ecf297281d07312bd19a6ab942f354a370147e0ca46a22e5bcd7485ed0d415247ba21162617a23b7f9def202cab3bb5dc23ccfa96496043b48dfda785 WHIRLPOOL b8e50c90c2a5f5bf9f5db7a1d7ea841b767fbb4ffdea52d913f7365965f6c58c612388f5b95a8a190826f9bcc6af783e09d4867a4b153040462b3ed353d56050
-DIST btrfs-progs-v3.14.1.tar.xz 271480 SHA256 19e83ff22c0ee3c01d10369cf7c37f1927f1307389d371744000dfbb4344dbea SHA512 65c5ae6dc8302a8ca2b18c1b3d776462e9ac583e5e059574512056f92390fbf02c83e8c5ce5ae929e1ed46a84bf8a1768774c4b7283241fb1c0512ebd264cfd0 WHIRLPOOL 6381fe68af31ff56a2961c33639611e7363d53e1007fc3470c643e9919129d8e3ac2ffea42878003a261d70835a9c45d00c777899c3c1dd7d161184ba4ca369f
 DIST btrfs-progs-v3.14.2.tar.xz 275372 SHA256 70e1d0ca887bfa5062dc74cc5d4556c19adb08453fbfa57edae6802d9c917793 SHA512 02f0cf7581b41143707769e53debecfdd3f5a1dd717530c33d4a657b09feafd73bb43408516a58fb6d2754365803018673321c7c1898b81bb36194f05a0d8955 WHIRLPOOL 4561adf84b6570e165be04c8c7b014646f4be11b7f9840a5929103271cb7e121006b515645968f9a4b7cbaf8b0a407c2e74b82b91bd6688b7f58b06fedf70e95
-DIST btrfs-progs-v3.14_pre20140414.tar.xz 271452 SHA256 8de4be03beabf6df9aa4a31114a77cfd68e0730b8a1f0dc371bdf570a837ac8a SHA512 556ee86eac6616aebc3d83d43a0603c30d82f482d40fba0cbdb125523d6395b16c19d9f5f2e04c844fae089d9323241e868e41fd89b9f557f7399fe7aff0d20c WHIRLPOOL b1f89253ab76f8a25509ca18217ebdbee9b1c4abf4f2091690aadc0a6fbb5a33f79054ff99b72f7c19419b6a099bb61109218c715294dd1370c9b150a8593bea
 EBUILD btrfs-progs-0.19-r3.ebuild 2733 SHA256 77ae329be086d9d70848c9f63ecb46dc6f820ebacba9e3bf094c092094a0ff8b SHA512 97d92488a923e1efc938f8bed4ece3f6893192fd16976dcb24bf28a778e319dfd4442c8660e9599d73a97ca4e269a416364422a1d7c80868938a4e23728152a8 WHIRLPOOL e1d4f67116c48aafea82c96bd5fb895dac531f6aa62ca225b8e14df10feffda0a7e5c6ef5563992bf20d14e7ccf7e1df035ab8561849e4d9a48b9579a14e7e5b
 EBUILD btrfs-progs-0.19.11.ebuild 1687 SHA256 93e3661de2904fbc30d6a553b9bf580670b31976daa00b972844b473a1f9ef73 SHA512 1812c567a8382ea1d0ef42866303afc44fbbb685e98a78f584bd7c3f73d9310ebf4891d22f24efbc0cee0729e8595da2481e244f6651dd843303d47dc46d494c WHIRLPOOL a406c5d018a2412f20fbf5bc53218fbe211d35a2777533047872dac2372e7d811308890d04e22dbabb23a9ceff3233d1f0512622ec9205d9225c4b8cc7ba3d8b
 EBUILD btrfs-progs-0.20_rc1.ebuild 1572 SHA256 72aac33b871a604d5f668d2fabcc4e546535410e678d273c8f1ae1864c588bd0 SHA512 b24cb1f56c64fd6bd670ab513be418f8fb59e0d66b9ca74a1f952451a955ac2c83bcb625c12b892eab2b1ea517edd01a24f78c5fa95ea73f9118c052e050f0a8 WHIRLPOOL 2662118584242bc0a39587951946752447fe8f535fd33aa581bd894450a110e7b700009cf6e13360ec1611798845f722a7ab3d75126c274a4e87ecf6c9b94707
@@ -26,17 +24,14 @@ EBUILD btrfs-progs-0.20_rc1_p56.ebuild 1039 SHA256 494a3ed6440764f689beceaf5dee2
 EBUILD btrfs-progs-3.12-r1.ebuild 1296 SHA256 84d42770173fa071eea3c274ee3805a478cc2a6bdfe00a43849158edcc393708 SHA512 46e3730a69b3d31eeada7312d09c31e631a30829c052d165d3cfb0907ce6ecc529727e369c93725b8f7b8b6eb2f2ffd7d63baed3c19f9bf9846415ad158240b0 WHIRLPOOL c1ae28044d953987c5af0d73caf98fe9d520962b6ef69e5f00f181ede182b777f383668af955e1b401210bcd4767f1217c82e3b37eaefd17cc823beb7e2ae3b5
 EBUILD btrfs-progs-3.12-r2.ebuild 1352 SHA256 aa54631b74410214e3e66c0f1e9bce461cbb4964e6bf8e71153fdd2eaed4f175 SHA512 bba56ff199039b7465efa6c9354aaebbb65d9a79f247e44ecc41aaa58e3da910f8d93a76a8767248a7aa073753a2c17273886fa1e1bb1feea39e8135691fb461 WHIRLPOOL 646a0c19c228ca95d8cdc5c0b91ef4d600575e1eed50238ea958e38b51321f089f9bfebb49f86d343ce78b9539082cb1a5c8eae079b854f312db5f1c78efb4e6
 EBUILD btrfs-progs-3.12.ebuild 1245 SHA256 8f801a7d5de7b9fffc6f312618a5beeec25d4475d3671faf0a288f757bc22086 SHA512 44ea5d9cd347badfddcbc06298634338c0a492a15083e2b36320de905f38a1c912fd30c37878ff3e3b8753f822a15f2b61b008e5759ca4e5b97cc1935146e978 WHIRLPOOL 7a441dba6b985cd41202256f2fd07d16952244c451bc381fa69a0ab117f3c6587685af755d1ae4958f627715ce5075b736d391631e6b17fc5a055401ab0f7502
-EBUILD btrfs-progs-3.14.1-r1.ebuild 1297 SHA256 19770b96213d3ef8cf7b54924698c183ee76b3e45d94f40412ef60e21c73bb2b SHA512 61c0a4b5c26698371c76c9ca502493687d190e28cc2c440eaca16c3e77229fee192645d854498bc3c4476988e3c2483c3e58f075de98e354e83197e63662aec7 WHIRLPOOL 733e4b07334c2476fe7e3ecadcafb08326bf3b918f6bbcc101eec3ec9f10b835eb70a8fcfa036a5121f8644d4d73c9ce6e041274846a1ce8ebce74b6edd535c0
-EBUILD btrfs-progs-3.14.1.ebuild 1248 SHA256 a125f1df1373fc9f265408fdc00d78ad7696e2a8802002420e6da661e9664872 SHA512 bf1e23362d998c46cc32b34b01727eaa24de60f21768e80d047e31ae1605cc11b359ff4d8fbde42f75efaea92023329fba671da9e5d7b42205abc6ed3fd5f994 WHIRLPOOL 7537764f73d37209ea1ac4f12afc493b330e2cddb59bafacc80e522af67a7fb60bf3c5d5c09fd476f541705cd92c35ff7bb0ced01f62393fc2539ea5c0800f3e
-EBUILD btrfs-progs-3.14.2.ebuild 1368 SHA256 6e04120f723c3e124e1ab4f24d8b111415d63e69eee85110a611796dfd1367af SHA512 9472bcd69598c25ce72f47e9ca22aa66862bfa728462cc5931f2e2c8855b730044823cd8b305baa538e803c2c0c4be23a54d52635db3f447995b125b49a4f2df WHIRLPOOL 8515dd9efa5306e1132db59abc7697984e96f79dd0b82ae20fe672d0e2e10fcde91038dd3b71d8fe48ec6dac90cd1060c8371f1215a28e66085fd38e8990ca0c
-EBUILD btrfs-progs-3.14_pre20140414.ebuild 1332 SHA256 828cd875d6efb2dbdd946e05c4bad0a117b4a9b6af99ed1edb18733485c0b72b SHA512 a699c4309ee30ad07157bdda5a1428f7ac48ad77f0a0c0438eecd6f95fe45bb41bf25918076577af88a2e7109f642edf4565727a441bcb39057064da396914c1 WHIRLPOOL 7b50e18d93c22a650b943e6e3320fd5e5423a648f769838570a800da62b8a6d6fe97397b2ab92c190ef1900ac2bf83fe9691027e322af06c80215995fea09652
-EBUILD btrfs-progs-9999.ebuild 1314 SHA256 7e01c3ffc619a97587012edb6058d3dd35aef0947a8e50d301296862773a89cc SHA512 82f9a59a04507c11f8a6894c62dc2029947b921f53ac5aac093ad8c5658de87be404f7f1e6dba588fdc800feabed743332b398b4a54ff5a35cbccb8a16d88070 WHIRLPOOL 312dae44110ac283b10ef61f0fd9a5620fca1028616249b10c5b8ba323f03885f97a88074e9a527b78389e15b9cc9709faacc017287b51f7dddba3e747dd1d39
-MISC ChangeLog 12575 SHA256 d713bca4911bf97975d4f1de76601561c3e29f6e5ea69d60a274025adb0127d8 SHA512 b60627f31d12dc9ac08d5a1d933cbf85fbc2c87cede0b8cffe0502155b914b08a65fb0c9ff6d05d38ed77b9bccb44b90a60cb979a7f62d824d5c5c8e40bf5e0b WHIRLPOOL 17126e6186b73345e7f8f092b9c843427e541987f2b96baba729584525bd2340e8e7f9afe40496265de6010304bbdb7f53784afb9ef2761978f59b9356e61837
+EBUILD btrfs-progs-3.14.2.ebuild 1377 SHA256 fcee2b1f7bd98f67bc40bd16be3e15c625f2b02a552b202bb879e506855c5d5e SHA512 954d2090abb0f4a26fcdf783177236409b851e08add95072f5de04e22c92a0a7c868e63157acc807f3d7f848cb03f90083fd40caeb71b00203c56662962862a1 WHIRLPOOL f76a8c8148f4a283efc1357fb2f59fc5f0111ed477fb59be2b2b53a6bcc2eafb2015e214d8bf784ec9bc2c92ba54a5804e9c2e4a6f2482f0fadb4e65a5d4603d
+EBUILD btrfs-progs-9999.ebuild 1323 SHA256 48531a2d5f61a45b5650c093189883fbbdf7b1739f1a7fcf5999a013d61c272e SHA512 afddeb592abb9f77917f53b96197c2bb1680f487b7b701e2f34fdc12157c0b1990285aa7d230a96c37121e3162d9eda97e62479666c3ef57e21cfd0add10c441 WHIRLPOOL b62aec4303c8ee8a3152bb91ec794423b6101c433404566980276ee32b570d91edd1c6d2d1b859df14e8a7b31b499418cd008297584577680956511d9d7dfcd8
+MISC ChangeLog 12829 SHA256 0a46d028d4aeb848198976bfa4cccbdb81a5f7daadd8e97ebdc3c770aa3cff5d SHA512 4eaa7308f5ab34c193f178a7d39e5105d27210e2ff54609c89b414ae3672a4730a418cb8cf95cb3445768e87ab1a06264e98807b2eb09d6dc6754981d0984cd5 WHIRLPOOL 5dc044dda03b6b8e0e009ee011c2458409f8f667bab51ab0bb95d901aaa2bbd9a14dbeb5d5a2b4149ef3a0591745b2ca4eba35f159006cd61657fd4606284b05
 MISC metadata.xml 432 SHA256 45049c27e84490ae5258d3beaa9c6defe80360aa7f03733da492fd38d026a5e0 SHA512 1dda7aa3a62062d6b42579efff9468c08fcca001b28e180c8257291332ac1874f749a19a4053daec072d7b878c13873557f05d82ad42428f105556c4cd304460 WHIRLPOOL 970b4a981f1afbe87ad4240fc2dd5ebfc4bb134a2e3c188519ecb6a87d230b196a902381de3e6346855e68c6e92f883c4d6b4aa01bcdb090e2de8f230e1cecff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlOjzeoACgkQC77qH+pIQ6TJkAD/ahj8xKSJd52qa6rZTbzwaX4n
-ecMSvk6D1C8iy0NDnk8A/irV127x8sNcQtYSzOEJf25562SR9oM1X1L3tJhGshN5
-=F0Xy
+iF4EAREIAAYFAlP3DzMACgkQC77qH+pIQ6RH/AD+JFDXvhH8eriCJMZBZZyF8u9n
+fQxxo21SxbW+pp/OASgA/10AvPBRksSQr2nONnQstR2uo5Mn/hRL5LkKLFYFuqlM
+=uEQ8
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.14.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.14.1-r1.ebuild
deleted file mode 100644
index 38a92808882f..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-3.14.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.14.1-r1.ebuild,v 1.1 2014/05/20 14:47:03 floppym Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/mason/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	inherit git-2
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
-		https://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE=""
-
-DEPEND="
-	dev-libs/lzo
-	sys-libs/zlib
-	sys-apps/acl
-	sys-fs/e2fsprogs
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-arg_strtou64.patch"
-	epatch_user
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		BUILD_VERBOSE=1
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		prefix=/usr \
-		bindir=/sbin \
-		libdir=/usr/$(get_libdir) \
-		mandir=/usr/share/man
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.14.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.14.1.ebuild
deleted file mode 100644
index 4696da1356a4..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-3.14.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.14.1.ebuild,v 1.1 2014/04/29 01:50:12 floppym Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/mason/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	inherit git-2
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
-		https://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE=""
-
-DEPEND="
-	dev-libs/lzo
-	sys-libs/zlib
-	sys-apps/acl
-	sys-fs/e2fsprogs
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		BUILD_VERBOSE=1
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		prefix=/usr \
-		bindir=/sbin \
-		libdir=/usr/$(get_libdir) \
-		mandir=/usr/share/man
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild
index 47499a7201fd..2c2a1142870e 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-3.14.2.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-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild,v 1.2 2014/06/20 06:00:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild,v 1.3 2014/08/22 09:36:50 floppym Exp $
 
 EAPI=5
 
@@ -27,12 +27,12 @@ SLOT="0/${libbtrfs_soname}"
 IUSE=""
 
 RDEPEND="
-	dev-libs/lzo
-	sys-libs/zlib
-	sys-apps/acl
-	sys-fs/e2fsprogs
+	dev-libs/lzo:2=
+	sys-libs/zlib:0=
+	sys-fs/e2fsprogs:0=
 "
 DEPEND="${RDEPEND}
+	sys-apps/acl
 	app-text/asciidoc
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.14_pre20140414.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.14_pre20140414.ebuild
deleted file mode 100644
index 9026dd65fbc1..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-3.14_pre20140414.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.14_pre20140414.ebuild,v 1.1 2014/04/14 20:26:56 slyfox Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	#SRC_URI="https://www.kernel.org/pub/linux/kernel/people/mason/${PN}/${PN}-${MY_PV}.tar.xz"
-	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	inherit git-2
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
-		https://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE=""
-
-DEPEND="
-	dev-libs/lzo
-	sys-libs/zlib
-	sys-apps/acl
-	sys-fs/e2fsprogs
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		BUILD_VERBOSE=1
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		prefix=/usr \
-		bindir=/sbin \
-		libdir=/usr/$(get_libdir) \
-		mandir=/usr/share/man
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index d5d714a7864f..c43019b7b633 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-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-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.34 2014/06/19 21:05:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.35 2014/08/22 09:36:50 floppym Exp $
 
 EAPI=5
 
@@ -27,12 +27,12 @@ SLOT="0/${libbtrfs_soname}"
 IUSE=""
 
 RDEPEND="
-	dev-libs/lzo
-	sys-libs/zlib
-	sys-apps/acl
-	sys-fs/e2fsprogs
+	dev-libs/lzo:2=
+	sys-libs/zlib:0=
+	sys-fs/e2fsprogs:0=
 "
 DEPEND="${RDEPEND}
+	sys-apps/acl
 	app-text/asciidoc
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
diff --git a/sys-fs/cachefilesd/ChangeLog b/sys-fs/cachefilesd/ChangeLog
index 842fc2d786dc..06988f981dfd 100644
--- a/sys-fs/cachefilesd/ChangeLog
+++ b/sys-fs/cachefilesd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/cachefilesd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cachefilesd/ChangeLog,v 1.12 2014/06/08 13:13:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cachefilesd/ChangeLog,v 1.13 2014/08/22 13:41:39 jlec Exp $
+
+*cachefilesd-0.10.5-r4 (22 Aug 2014)
+
+  22 Aug 2014; Justin Lecher <jlec@gentoo.org> +cachefilesd-0.10.5-r4.ebuild,
+  +files/cachefilesd-3.init, +files/cachefilesd-tmpfiles.d:
+  Create cache dir on runtime, #520500
 
 *cachefilesd-0.10.5-r3 (08 Jun 2014)
 
diff --git a/sys-fs/cachefilesd/Manifest b/sys-fs/cachefilesd/Manifest
index 2839bed57701..ab77b8688e36 100644
--- a/sys-fs/cachefilesd/Manifest
+++ b/sys-fs/cachefilesd/Manifest
@@ -1,30 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.10.1-makefile.patch 393 SHA256 7e855c5fa9099ebb5b088fb2f6f66eaed4479ba622daf9cfaabc2a052a2e2335 SHA512 51d1a9d61cf3042ebb911cde623be796e662e21d04c4ab13eb42fe518e547067c3ac6799ab65aec740d60631df42d003671a49721d902dfa3630355e6e5f1fa6 WHIRLPOOL 6e3522b8daf0bb079d589d490cf59d2b10bf6d43181278179c3d410767fae3b189a91a160176c0654f6fd8835f61723afcfce2f5ba9e7607884fdc4ab0495bd5
 AUX 0.10.4-makefile.patch 628 SHA256 615df8e77a409f852749cd607c6a4efc03780c2105bd0ce8fbcb1b02df87fdc9 SHA512 b6092b5c98c63b8479af22c6bf1812da9124a54c8e51e9e7531bf7984d3816090cc0a0126d6d506f8d42bc19863b2ba486b373d5c5577d47369cf3a1b2c78e72 WHIRLPOOL ac74923fd47026cf643fa1036cd79a80f08fafae6f0a606075c296f922218d16c2bd1f1e7267bd84566d023491fe092b3db69a559c93545f9d2c4c683c7df6cf
 AUX cachefilesd-2.init 1772 SHA256 1022120ed7f9a13b2088ab355028441814661c2f97d924381bed21df908933ab SHA512 31b35dfba6edeedd63b953a57e98ebd6424dd99c72cfdff8bb13820376923d6376887dfdd93ac01a55050b4ded57cb8b9a9531ca4e804ca519c89640618c0fcd WHIRLPOOL f3feca4e7c5eaadd236bc1a55b25c5eb7441b128497ca841062a88fc90aa41342498b28fe8731678f6e69136eb70ff683b4ac4eb4c29d0f3d7b64dabccd1930e
+AUX cachefilesd-3.init 1792 SHA256 4bee5cbc158e89967766dd5af18ab6255ed06d9d24352a164f3a20e685bf775c SHA512 5681a0b36bf66742c00068947060fe998ba2dd5dda1c35575a87d0d5b62a2e521954d5b5ce25eb011815d8d40f08ca33470169fd609078185ca7b792ac3e6c30 WHIRLPOOL b51d338ae156a7eaae8121173dadbea8fa92bf175c7ce4ee854c554b8403f78c1a99da20dadb5998a7491d9504c98c18b1e1b86f52c7f0f87466597df659bb40
+AUX cachefilesd-tmpfiles.d 32 SHA256 8908a4bb666be2b28ff867e7df23c9361357f0b4cde59f59abbe0390653b6188 SHA512 37ddd3a452cc1d639b3ea3e98fc528c4552dd7f768a05fd1e4ad1821bbd6a0092f1cc5cfa4e7e41664952e4fd06001724fe64f6a16115fff15c542732d2ffec3 WHIRLPOOL 04cfa3991da0a8d46bc2e034d29526c31cfc3bb28ccce5115be1591e8bae3e043e904b93362ef7ac43dbe2ec38325068057aa116c8db3eaa248c1bbcea1d22fd
 AUX cachefilesd.conf 410 SHA256 138297a340a6437cc39d2634b0d74d3efa13a29a7077d7e2dffa8197a24007ad SHA512 5fffae419680b8385836963c657bcd5b891d82f2c6c105678910ce2448d2990182e477a852562162fc5017ff021fccd1eaaebfd8da768f7132e07f999fe8c0ec WHIRLPOOL 3b629bacfbcb0313eb34049159b29c7c48e9a085761db02943ced6330a0d5585cdf96d075bb2ab7481354f99d37683ef3a5c835379b1832983f0e73348506827
 AUX cachefilesd.init 1660 SHA256 9f3cdd4e2641ec24ab0b6aa6d23d04eaebe976bc6fb804c2f438309e4ce35d4a SHA512 595718e2875124a24ec7983e7e74eebd5739c31d87d803c943accc865b9387262ab84b7d67ec8b2e0d1b64629e704c2318ed6173564ba937df1a97760bf49ece WHIRLPOOL b4ae8cc19d3f735c2f8cb7050e855cc5dec07fa9b67128b6733d0ca4743e9b0fda7c37cbca3817758421a18bb54b3f7905a81017195b757452725b48e5055c3e
 DIST cachefilesd-0.10.5.tar 112640 SHA256 125ea4f6aef4bf8e936a7cc747b59e074537a8aed74cd1bab3f05d7fbc47287f SHA512 996e47de40cff4d2c0d265689ef3a33aee6ef0d0432a03d7428133c091e77b0e099bd1346b5638bf2d9df6bb47bce519491b420d5916a3211c4e04e158ad92e8 WHIRLPOOL fad173739c307629ffef091a0cad890ee9bb3b133471de1fe9bb43cc06ee46a051fdb97262f9380a8133fb49cd87b9cbd3ee71205867046bd361f890c2645f1e
 EBUILD cachefilesd-0.10.5-r2.ebuild 1576 SHA256 bee8fb88568d51d319475b77a4faffdad6e08cfb0d4bac43205cbfe904701ecf SHA512 e937bc91136e0a1363b2c73de1df4c7966a609f54638a006700bb744a3c35406895d15446e688f3cf724ba32779c3e12ba01934f2db20a254c9739df67e81308 WHIRLPOOL abefd0151dd84e1065a201d9a400e050c28d7b97c30ece6a13176a30562a2632a860b1b57b4e704955b2e9af16e4407f393850002838ddf9a1f3e18add4f0da6
 EBUILD cachefilesd-0.10.5-r3.ebuild 1580 SHA256 1113f2afa9e7351aed46f973a56064d818b44d31c0312f777e140b84bb6c8c4e SHA512 d5914400685db76a4fa1c1b7b353dc0c2eb1ff1470cf9b87758271f31ab833dc7370cdceaddcfa9f7f6d978d2fdafdd975916c68dcb9f21bcf8f923587ee06ab WHIRLPOOL 3e6a51d978bb8914f73d2803da2641d18786caa7ac42a935c0579f2ce83cc48eb6724bd41d9babdc5d9d017ffc61251f8c29296a37599327471697ba722dc342
-MISC ChangeLog 2216 SHA256 35742ea6c73e718b62477fcc028ec975409b97d8d38f53c9f88e12376cffd693 SHA512 60872f9d90f40a624ba41d15a3a257542633b90c6282997bb841b5fb4c2edb9fd3a862b5195ac0c98ce4a40a2f88b35e8366f85acd308e483191b6ff93887892 WHIRLPOOL 792990a546f9b7af2ec8f48f5445c83e637a3785076644a821609bd7035cc44206b4a93dcef76712ac743ee06da6f93ddd533eff2926d51ed7c146bc94d20b10
+EBUILD cachefilesd-0.10.5-r4.ebuild 1614 SHA256 8d305743e32f1e7cfc6ffc82c2a4bf3b92ca48c2730ecf41c6765f5ec534b50b SHA512 40f71a8c53357d2e8d64a8efc73dfb21cbeb40fe238013a3c17d89e036d977fd16a0a471fb2a53aa8a863c766dbeae79c65b9b6f53f9e82ee36fcefc0977e594 WHIRLPOOL a08b72635195ed293a298995960a02048cc281321d3aa26c779d32a66d28cf9b9d04a6814e03e0cab475d85db6374f81ece447013be00bcf0c319d5b2edb23e2
+MISC ChangeLog 2431 SHA256 64be5c334e259d735ba3957b405d77e1224681e9e3fe7eee6ed1c21d9f1e379a SHA512 865eefbdd53b7f0055e8ad4fa5f893a205e968b410c3209cea04329b4913d094776cbcc72981809848656e1c478a37b1335d6f1070532adcb3a6cc1ca82ba3de WHIRLPOOL 8f773631644f414819796531291f29768c85ba5446a56bfaa64d737e34e4151ec4cff3daf9847e1f4660617f4e1f1ce4f2d4b2b28e76340b5370d65187343c2e
 MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTlGFXAAoJEC7dUkA7aK9HN3UP/2Si88PwCczmYbjHHZf//f39
-r1q7vnaDXSxMsoRkdYgcL0JsJKk0bXv6GhuHlYsPrBlitp4y5SksABgmFGdGf475
-TOtuO30NGmRzFfSwINzuafrw86X3xc4H4P746bFluS3BfC496hI83t2Bx4FW7r9u
-hZgnB4X2tHpY7+6JAZBnVP2I7f4pgrtjsQmRV52p+/RyHjsaMmpBdyP27DOiWm/7
-MQmkFljasLcJFSEzIrTBPrHaa0QwKEa5P5/tDlR8SrebfKD56iP4H4vAYHSF3nRY
-dB1joegAHbnba9tVdLV4B0hsDmnpOR2ejf5do8A7FcdnQXSbek1MCdXG3iqMNEeB
-SyA58O1nKEbLKCmNQHqVKPup9T6Oc45vxoZF0Wc0yT7qJMM6qK6+wt1qjI5ac8x2
-DNlFlowMvWnQWtl2qTQrbPTSKgVsOMT+odzfCo0RJDVE8pPx6jRh3JWRcEU6+k+T
-HZf3xJaOLva6AQg5+oJzE3vFkX03UGn8fARe89rBoyWmmnQ1rsEPjdGcXaUNqSx+
-YbJec7U+Vd+Hm5epGksZu6pstEHgoffinfSgeqQR9sv4z2/pwsRl+9hdV1ccM77q
-K+w1ySLwjbHQVgrwD/Vo4+TWMKteWU7aNEbdrGH4PTRmuLigyM4TCrswru4+WLnF
-tDEIc0iSD3Tyw86EFz79
-=u2IF
+iQJ8BAEBCgBmBQJT90jRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirY9kP/3Tys1OGETo6rKv95iU2r5Fm
+pF/2wQuXCayarjiRlWrdIseO5GPEC910jWc//MiQDZ+6ai9QeacqngrJNHBGSP1M
+fn35hP4neJEzzPVkl9wN2RT5ZEXB30U1s8TdlJWMkpKS8JLaQ5/NZGJLO/9D0Y3M
+INl9py3Su/DZ6kL/eIYqBu572mFqKoVw/FpdF6FNz69qzfWpV6y5WLKe0AEyy+Jm
+zpdotR+q7Gcwx6fixGCo0joT5W8+qI8iA9rA9PzWutoPZnlQrfMDk+EJKbSvgSqx
+IO2u5W2lJHKkWcJTVPChKm2VD8aI/1P/WdxFyVCVcfGAJomIo2NfkDDFieT2oz4Z
+1tUVAzjhfvv+kqVcjzT3rYoiwZi1shOzyPwy1QU5LuSBgIAS8QJgaDpaam3sSs+n
+Bs9uhq4PFkkX70WS+4T0ioq0tluNTpEPaHPiqnI6Bwd1WgUCpa1NEffPeA/fOvJ/
+CHdfIg9UYe0rSYtgzyoD0q8Qtffj703UocncgdoYE3rxB1GDGW+PJrhbDGPiS+PH
+HR2WHis5WK9zzDWDp4cyYeGvTzc4W4ex/SFs34DwnLTnpIIYDrOxv4v0XZJrNRJJ
+1mwSvHY/LJNXMYeAT0DvsDtEfkLUZjaSZYtpsXrNfHX9ZyxXN3FTsAsidL0z9Oth
+nxbNQrslVkP5Rh9zyxTh
+=U1zx
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild
new file mode 100644
index 000000000000..b67dab943990
--- /dev/null
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild,v 1.1 2014/08/22 13:41:39 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Provides a caching directory on an already mounted filesystem"
+HOMEPAGE="http://people.redhat.com/~dhowells/fscache/"
+SRC_URI="http://people.redhat.com/~dhowells/fscache/${P}.tar.bz2 -> ${P}.tar"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc selinux"
+
+DEPEND="selinux? ( sec-policy/selinux-cachefilesd )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/0.10.4-makefile.patch
+	tc-export CC
+	if ! use selinux; then
+		sed -e '/^secctx/s:^:#:g' -i cachefilesd.conf || die
+	fi
+
+	append-flags -fpie
+}
+
+src_install() {
+	default
+
+	if use selinux; then
+		insinto /usr/share/doc/${P}
+		doins -r selinux
+	fi
+
+	dodoc howto.txt
+
+	newconfd "${FILESDIR}"/cachefilesd.conf ${PN}
+	newinitd "${FILESDIR}"/cachefilesd-3.init ${PN}
+
+	systemd_dounit ${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d ${PN}.conf
+}
+
+pkg_postinst() {
+	[[ -d /var/cache/fscache ]] && return
+	elog "Before CacheFiles can be used, a directory for local storage"
+	elog "must be created.  The default configuration of /etc/cachefilesd.conf"
+	elog "uses /var/cache/fscache.  The filesystem mounted there must support"
+	elog "extended attributes (mount -o user_xattr)."
+	echo ""
+	elog "Once that is taken care of, start the daemon, add -o ...,fsc"
+	elog "to the mount options of your network mounts, and let it fly!"
+}
diff --git a/sys-fs/cachefilesd/files/cachefilesd-3.init b/sys-fs/cachefilesd/files/cachefilesd-3.init
new file mode 100644
index 000000000000..f076c39bab64
--- /dev/null
+++ b/sys-fs/cachefilesd/files/cachefilesd-3.init
@@ -0,0 +1,56 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cachefilesd/files/cachefilesd-3.init,v 1.1 2014/08/22 13:41:39 jlec Exp $
+
+depend() {
+	need localmount
+	use logger
+	before nfsmount
+}
+
+checkxattr() {
+	local testpath testfile ret
+	# SELinux requires xattrs, so we can assume things work already
+	[ -f /sys/fs/selinux/status ] && return 0;
+	testpath=$(awk '/^[[:space:]]*dir/ {print $2}' /etc/cachefilesd.conf)
+	checkpath -d "${testpath}"
+	testfile="${testpath}/.tmp-xattr-test.cachefilesd"
+	touch "${testfile}"
+	# creates a file in the testpath and tries to set an attribute on it to check
+	# if the support is available 
+	attr -s test -V xattr "${testfile}" 2>&1 > /dev/null
+	ret=$?
+	rm -f "${testfile}"
+	[ ${ret} -ne 0 ] && eerror "xattr support missing on the ${testpath} filesystem"
+	return ${ret}
+}
+
+start() {
+	ebegin "Starting cachefilesd"
+	checkxattr || return $? 
+	# check if the cachefiles modules is loaded (or builtin)
+	if [ ! -c /dev/cachefiles ] ; then
+		local ret
+		einfo "/dev/cachefiles doesn't exist, trying to modprobe cachefiles"
+		modprobe cachefiles
+		ret=$?
+		if [ $ret -ne 0 ] ; then
+			eerror "cachefiles modules cannot be loaded so cachefilesd "
+			eerror 	"cannot be started, aborting. Did you build fscache in your "
+			eerror	"kernel? Note that you need a 2.6.30 or better kernel"
+			return $ret
+		fi
+	fi
+
+	start-stop-daemon --start --pidfile /run/cachefilesd.pid --exec /sbin/cachefilesd -- ${OPTIONS}
+	eend $? "Failed to start cachefilesd. Check the system log to see the error"
+
+}
+
+stop() {
+	ebegin "Stopping cachefilesd"
+	start-stop-daemon --stop --exec /sbin/cachefilesd --pidfile /run/cachefilesd.pid
+	eend $? "Failed to stop cachefilesd"
+}
+
diff --git a/sys-fs/cachefilesd/files/cachefilesd-tmpfiles.d b/sys-fs/cachefilesd/files/cachefilesd-tmpfiles.d
new file mode 100644
index 000000000000..11da15afd7f0
--- /dev/null
+++ b/sys-fs/cachefilesd/files/cachefilesd-tmpfiles.d
@@ -0,0 +1 @@
+d /var/cache/fscache 0755 - - -
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 31e4b3342f26..e49a4291e501 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.362 2014/08/20 14:23:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.364 2014/08/22 12:03:31 ssuominen Exp $
+
+  22 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/lvm.conf-2.02.67.patch, -files/lvm2-2.02.105-pthread-pkgconfig.patch,
+  -files/lvm2-2.02.105-readline-6.3.patch,
+  -files/lvm2-2.02.105-static-pkgconfig-libs.patch,
+  -files/lvm2-2.02.106-static-pkgconfig-libs.patch,
+  -files/lvm2-2.02.95-lvmpath.patch, -lvm2-2.02.105-r2.ebuild,
+  -lvm2-2.02.106.ebuild, -lvm2-2.02.107.ebuild, -lvm2-2.02.108.ebuild:
+  old
+
+  22 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> lvm2-2.02.109.ebuild:
+  amd64/x86 stable wrt #493892
 
 *lvm2-2.02.109 (20 Aug 2014)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index a5bb27b53ad4..9f2fd8ba2a06 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -10,16 +10,11 @@ AUX dmeventd.initd-2.02.67-r1 683 SHA256 0c051388991ba69afbf2f6baf36ba227d7c26fc
 AUX dmtab 416 SHA256 e2e22bbe13fb97ec9a68659daa275b1d22fd0a3fd21e76b1f4bfba504a8bd7b5 SHA512 392b4bd85745bc774245195a1c416ae68efbe5f7b2498f6bfc40021cd2c9f6372fd1c3d346198c7749635b5d9b3f66ba1b963a2e144b4f522d87016ab4777de2 WHIRLPOOL f48c0fda382c7d57bad2ad4a8155189735236d13f24f39b3969736c3ad54d28f92c82174cae5c6775f8bc58506f19025f2cba6433f389c84505552fc8b4d3ed4
 AUX lvm-monitoring.initd-2.02.105-r2 1088 SHA256 d7655cadd3a3a9d3683a540413365310ca9503c38fd21a9bfccec40630ca72f1 SHA512 3c3f7ec1868e3634be3bb82689d30065dbe0fac3e2dfa22a14acb76c82b102022c280f995f82a1f7c91c905c0ba961bbb2707ddf60ad5fa9d717acdf942855d5 WHIRLPOOL 92e7eedf6add5cba645f74281912713928f694f18155db222352ba8e4a70ac89696f9db3cc2c9fc79fb9ff0f98cb176da8aedb1c5b7b47eecd4ee36360df41f0
 AUX lvm-monitoring.initd-2.02.67-r2 1183 SHA256 b89971a4f163e1a91df2416ff442cae7209f8343e6c8612eb3174ed8f5c5c788 SHA512 e99d8e0ed2f22e8f3f1e36581ce92bc2196dbebdeb7c301070c5f2e78079804de3ac782c732929e23a3a01536a270236513c849ec1574ff4c72045b8f69c98ed WHIRLPOOL 71eb7d1203bc2b6be22ebb0eb20e3d2e0786036bea9f0beda91c517f47b99374b52ca4c7d5cd76ae6338ddab187b68a7a371a437e5501996454e125e12e998a8
-AUX lvm.conf-2.02.67.patch 1676 SHA256 0d36c4de0503739d822b3103a62dc0110febc3c56cd25d04443b30f54da6d0cb SHA512 59cb4a4625a7a18ec81b10f4b70a1632cf608d30b1fd827cc7a97692ab3cbbe2e0108001952f5002f1ffe6b354be7b96430e5ce86ed183885afdd1b5f0aa76e4 WHIRLPOOL 71c42b80f390de73b116dbe4808b44559196175465126393128b87826248ac5a34d79c4f64647d6b4541288ae4d25669168120ce8889deb08bfb7919dde249ed
 AUX lvm.confd-2.02.28-r2 173 SHA256 28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844 SHA512 67b153cbc5c2327c15f042b3b5590c1d8fdf9823efb19c80192ac4dcf98e530efea8ecae0aaaa4a54b0e3e4907565aa21455b364df1dbe8f2e7dffa1c5d355d0 WHIRLPOOL 06467b28ad2acf36984eef1b7b7e3d88277505760f848a808d85820cd1cccf6bb7397c00624d36961d9bdbb994e55de03444a7cfc97ecefd9bd3b785a3c6fdbf
 AUX lvm.rc-2.02.105-r2 3071 SHA256 a5754ffa0a05a0c29a9f6b5acf1b21dd313581fd6156c1ef722dc620e0114676 SHA512 9dd321b6d76628376b324de1ff47c4a37b98d3bf406abbf1b1755e20d957a9f1d77ff2e50a99b0c77ca8200800cd6071da5ab83c2f5afb9ff97f31e75671a617 WHIRLPOOL 6ba25a5152bf6f5052481e6ad2b1dc3ea65a818d11bff49e9688f537245c471f5446d4b8d381dba69ab8ece8f16340220f4c8173be096c7cb3d7c4c7fd10cebd
 AUX lvm.rc-2.02.95-r2 3001 SHA256 66844a70cedf61b2cd3373cdbd8f8c1afa817bde0764fdf5cf488857532d4553 SHA512 e5d34447db2fc050256222eff427703341b839a80c833c8ca2a814663b790bdffad967fa41bda8c182d5217dda629057a571520cb0a2e4cb06d5a8a241746ea3 WHIRLPOOL 102baf82bd5573ce90bdb19307ccf71026b6e03fd9e471a123f17072e0ac3785ecf017bb2cd81adf7a5332f33b42330e7c484c8804ed57d4ad6fb1cdd4c119f7
 AUX lvm2-2.02.100-selinux_and_udev_static.patch 3223 SHA256 15c20b1e16443932c560164ad9546ab01279601b0f0dd7fdc54f9cf3cd3ffee3 SHA512 232dc2908073254e23878098734cc65449c7be0707f7f0f7e73561e7b204bf71cf75ff5ee143b0f9f301ddabac1595c59cb0ec80c665464e8fe3f1b65a3eb0c2 WHIRLPOOL fdd908aa01cc3790be4ff8e7b2180cd526065c826657924edfccdc53f5c2266a12911c1ebface9de649b1974ff77401e94a64de507b5c72415614e5726dd4a2a
-AUX lvm2-2.02.105-pthread-pkgconfig.patch 1277 SHA256 29cbbee5b78b248eb1e92b2ad1d90ac115e449b56c50b9cc6dc5dc4e463d16d8 SHA512 8092b9e972f5a7d23666898f06041ed4ef3cf66f824df8dbe9405cbfc0f58a71953d66eb7dae91089f6a00395b8e2fd402f2a77c2d0238934ec5c8dcd0bff25b WHIRLPOOL d0c25bf4b1beeeacd9afb4716870563316321091d412ec481791d96e59b0245b8beff5c34dbfa297cb620c31cc59454a007090df0fa7aabb2653fe64eba76bd3
-AUX lvm2-2.02.105-readline-6.3.patch 1606 SHA256 0c599fc01ac3a83a0cf16ebbe110854268ad5d8d3019c8edc4fbb80267d3a364 SHA512 f55a9a311a457f4aaafdd11e0a9beda1b9a34ae8c93b313c6d53e25085093ac0755bc416baa6dcd9a4d21713bf94efc6ae1269ca6410ad8de956f6c641912d50 WHIRLPOOL c67c1a20f0abff39c7b93c21e881c97590559c391a540738aba381dee8009044d537c9ab078d2db01992b4e2fb945d9c7f159d2af9ac8cc88d4c64a3eedc38cf
-AUX lvm2-2.02.105-static-pkgconfig-libs.patch 3382 SHA256 cc3cbe1b1511eac87a4915f18206d045f6192d9815580088bacf760ffee06c4d SHA512 3b2bd8b991c380dee73f848a794fb1c53ef601fbaea85185d2494040c6e70519727211cb3adffb36bb115c0eb774d4e4c1298b7d151b21d25924b492ed51034b WHIRLPOOL d4a8d9448e80148f321d46c55daa662735c9b9d9cb758b944eea8a213e60d270676bed610e9ec22dc970b38424465c12d840aeb9c7bc585b8cc07210cc365828
 AUX lvm2-2.02.106-pthread-pkgconfig.patch 615 SHA256 a33febfc3afbaaea1806afd252c28e48c7359f6136a1353103ac94d7a681fd71 SHA512 44db7e1c2b19d458d6e71519b1a3b878c20265e0527fb5edbf3874ed1c529383b888568af10e6a2099c3cf683384cc106aef0c392fd60d48a18af8cee89f360c WHIRLPOOL 544c51e7a305400a41869447e0e9bfd015f5a64437acc143ceb1dffd98a05846fdd31f07d0f56028fb6867e34237a487ace16e6afa692e3126e3353ce1e34f10
-AUX lvm2-2.02.106-static-pkgconfig-libs.patch 3151 SHA256 5215599d8b83e3a73782255747e8fb98faacd6c6606836b4f2ea5ccfd1e98066 SHA512 a00c03a3deae2898f5f3692aa797834601066fa1b444d0606a08e6ed6cfb57e41843da9bda41d2489bf206c6a13149e90d199e75a97ecfa5a05f612a770f4c7a WHIRLPOOL 315daddcd1135d68c0bf433ea913741985d3af1784d2658df02c7c46c5e452c18a6069dfc0ee2261231eedbdca2dde9f2c468bbf177a2135080be058b074e6ae
 AUX lvm2-2.02.107-static-pkgconfig-libs.patch 3607 SHA256 b3efe76e670fd45e363c62bc8a9965eff4bb1c12e98b6eebdf3b8690de24ddca SHA512 6cd6bbe2ff2dbbe012c20043f3b31e42cacc3379838358c58891ec8ce9593ced29a14fbb9e96b9c76e1b245c5aec2e38a26d3a599c78ff18c3d920e89f1d2f72 WHIRLPOOL 4acf0777694df20886b4e6bf06c91a86041f6e4d888c49dc26f582cd6220504550f54ea5d94c220a3a16b4768933e45e901f274dfaf616083db741aab81b612b
 AUX lvm2-2.02.108-example.conf.in.patch 1681 SHA256 c9e0b46965f68c25495e21ca9504699031ed88dbb69407a08d53569ddc88ae4c SHA512 b4e983892b7ff47e5e7617376197daa62cfd063cf398235dc4a436fd9025ec4b1e263d7418e2c2943d53be494cba4209e9d4230d54a78762b0ca526f92e9746c WHIRLPOOL 0fc73d8e6f47596fa1789118aefebf931fb217342259da838d701bdeb96f21d7de59f29ac81c3c0f4a00db711e86b9fac6b4c889cf05ffc90ad8fd5a9ef77cd1
 AUX lvm2-2.02.108-static-pkgconfig-libs.patch 3302 SHA256 5cbdb4c4db1a77767a8cf3a89490eb0e21a2d4cc7729a8ffb099e4d0746e2775 SHA512 246f1029f9346d6bc57c2062c8a223535d0b832fa6bd86947b8b91b094dbc388706a9914f9ca0531666f77e73544612e2819335435b7576b4e91cdb1b0e4f041 WHIRLPOOL 53e723bdcfe07f668abf6fe9e6093ae38d81b01bd10ade0b40a037d44c367a6945ed86d14d70c2af8af6e7063763fd3620591b5c7384bd255b98cceb7ee192f3
@@ -28,32 +23,23 @@ AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 SHA256 1c498b5efce77ed16bbb
 AUX lvm2-2.02.67-createinitrd.patch 660 SHA256 d59f5642fff9d9575227bfd0b3d103d928a6f7b08b417d6c458704171f11da39 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2 WHIRLPOOL b358a31a9ee669a4fccf42280da5342c214932bfd83deee92d41351eb37dc6c0b2e5dc7419f2304128b5d285fed92db5b2e1634a71bbf1310d36b54d1a353bb0
 AUX lvm2-2.02.70-asneeded.patch 326 SHA256 b0f84dadc213a9daaa97ae7815f624f0bcdc883d627659c7fcf8b7131538b43e SHA512 e38d8ef5d13c8861f7d1ca5c16271b3da138e8747ba01442de3f55aab45265fdaf42513e596f5af1d024fa2cf0c959bd3e47da52bbe8b13c75e665dd95f81279 WHIRLPOOL 77143f2dafeca221f8b3cda4df1669111de44a4ae4916d9aa2228aa76d94b4d1c556cf90a6f90cae2f1938f7474fb678ec6eab1b4e57f7fd20eab473de667cda
 AUX lvm2-2.02.92-dynamic-static-ldflags.patch 3031 SHA256 90b880572186d4d1abf049d39e5f11e4cfedb3707c29eeb9740ceccdb3b62468 SHA512 edb78081d12bebaccd31c2474cb531563b729f1ad966afaff7892556177ee7a68217cc699c65383318066139ba62183adc8334f46f8f8933d62b6b5dcd11a023 WHIRLPOOL 6880a29dfb6747f167c41506e1472c0d48ef7af3a545238c733949f85f3f8f36110fb6908c6f626260f7ed975e56a4e8ccf42ece4d758fa3570154cbe970f2a3
-AUX lvm2-2.02.95-lvmpath.patch 1247 SHA256 48d65570cbf86dcf749a0e77a1c57e26170ee90ddb8d8800988eab451f402456 SHA512 92b104476911882d0dae97251942a0dbf6c58d6d5c5af77e74b3e41de95a155966392fb539affef3de6def107168b436c54e5ee000bdff0c4701748481940eb4 WHIRLPOOL 26d00f35cdd4a0bbdabdda0a5a69956e7c7ed90dd3e774cfac46c4eb0e339a09e03dcd617b49863a550e79c72d327b3007ffa17ecd27750bf3a759058c4c9e7e
 AUX lvm2-2.02.99-example.conf.in.patch 1489 SHA256 55273a2bc6df33057f4efdd947b75f0282a7993acd5e57f0019f8ca57ca7df38 SHA512 0c92a0e454505219653500d4fb2ee57626bb30375782be941bda17d7b841cb05eeebb87bfc4f7aa397b26fb4908bcbd0f69d2c07e63bf4f070756a1894851869 WHIRLPOOL 3f6c94dd63fcf5e2d1406aa074aee27997fa6d58da3db9d22281b3080ec36277bc5225c3b62f042b38f5d0870fb1e3e19433f218f01e03323c7ad1210d45d4b3
 AUX lvm2-2.02.99-locale-muck.patch 395 SHA256 14e7c65fd9aa71b7f09cc1aecfaccb3048dbb09dd4eb4c342556708aa6adba77 SHA512 4014abbaeb1106dbaa360e2573340651adc0cccc6c0c05cc57695e74e7a3d0b5a73e2b72242bab0d0a10c2506a7c30c2a4de0275c0f81a14dfb068ec91492497 WHIRLPOOL 3383e94ca4dbaefd2c628d3a95b17a14602481c98425caf48f490185289eb3f1af2ef234ff5b5c431ea4624edd8e48764252bdf5b7159ab3bbbad699c3f936ab
 AUX lvmetad.initd-2.02.105-r2 405 SHA256 60accb4b6114753232f2db0adf3fc3f46d4459bfedf79b888801a13c55d79fa9 SHA512 d9c6f6c68a83b8f391ded7ebe900009a61ff06e92eb68ccb3dcdc8f41e61bbcdf47246e523ea8cfd6e71790376b316b219d4afaf66cf11477e2b54d526b74998 WHIRLPOOL d959d8c8b5f4ef84c26f8e585fe1761ef9bfd37f590e783e937679a863982e7cc4a4e320c3e2e3bd635dbd3486c15baf7c24e1a21325521f4320e643a57fb0e7
 DIST LVM2.2.02.103.tgz 1343887 SHA256 71c5a2e8842ed2f13f52e02b44eb183110a3410dedd1e117348e4eecc29d3c2a SHA512 1a9920947312e3e248bff7ff5d5eb54dec3f3b05eb3388fa92f95369b26ae8e6838186f87d817b09e8c635ddc3cdf51bc1d07c2a9d65fd7eab33598998bb7afe WHIRLPOOL de96dd8b7fb46ec777f34169759852ee5ef03ccdc93e110bf63c92dddb9cf4f805635444ceeead6b581610d2a23217d3b4729c286f016623f73b99c0b35a42a0
-DIST LVM2.2.02.105.tgz 1374752 SHA256 d0700c7000ff6375c1c36cb2a89b97b9ae6757f4219fa9ec65f313d13d71e51e SHA512 fb2f4eaceb8e643c7e081b6d8d77daf387960c39f880f5600df40c7eb32d7908835114b8619805a814fc1c59ce920fa36d9afa72314dfabcb69ddf134833e1fa WHIRLPOOL b0dfea302e0afced489d96d14a04bddc48cfff540d26f69217787fe95b571d5600647162da84a95c6cb42e02fb83473a00257ab73e920b9a1b3c46f5ab12f02d
-DIST LVM2.2.02.106.tgz 1426030 SHA256 6c83df279c2190543be750cda278c7d3e875dcadb5cbdc44c19f6040d718285b SHA512 52cfbe86ec89cebc639c6446195bba546fc5576165a38c5db6adf0d8aba6309a3140562d9c6a8bdc4ba415d91bb307989cdbb787cf4ec68dcacdcccbda71ae07 WHIRLPOOL 5853cd3e64ede16e21ee66a664cae222f707406e85379e051e72bf9264c8b6da83af9be7634d8d93c07bd772c395dc278ff37b55adc40f50b6e4c432e8e7a593
-DIST LVM2.2.02.107.tgz 1462424 SHA256 b1d6890e7a23c7a0bb7ed6be7f17a5e8f819da71d93f4a0b123661fe0f028820 SHA512 896c0f34d0134dfd985345e42e1381865e27ebdb7fa33b1e4ccf0b4dbd00bc708931f6827756778567092376ecb7f77bade7f93461a61b5e1e6b15c40b575bdd WHIRLPOOL c85c82e875c52a297cb8fd02eb7942906fee369506e5c51888a06c8c29361f5db2b59161d36ea085326fd83dc6371d6573bf298bd2d21c3aecacfcab674ebf6e
-DIST LVM2.2.02.108.tgz 1480663 SHA256 84056902e616fae83eeb4f405e45cec4862c3e73da124af4a1748e1ff071aa66 SHA512 a55cb6e0ae9d57374b7a4dcc30b6b7607ab7657d19317f50254abc68bdbcab8d16ab70d7503858e94e308e52d6f565d105f69173b74e8afceeec7aca275fe771 WHIRLPOOL 07da7bb48457dc0b12e74a91dac6d8f37a2c183bf30e3f9faf5116263c5015814ab70c3a71fa837dfe1bba3775443e511586940e09089269a0ee4152a1ce88dc
 DIST LVM2.2.02.109.tgz 1482167 SHA256 7bc95ba5209c8aa5bd492167b2e2797f156852ed11cfc63fb783070ade8e65e7 SHA512 210645cccf297112ffdbc63e0336385c31b2d17d226ae10813ba8ffd4f01ce07af44a4134e60644283e4360e10e925113e867378502ae0166f3fc91258caea68 WHIRLPOOL 7f2d91446f502440b2ed73df0f2ce29069364bbb198e675223b61c17e5cc6e1c162ce60a977cb07b71e44d672c688bbbf0247380f1b9c5adf325cf324f4c4bb7
 EBUILD lvm2-2.02.103.ebuild 7448 SHA256 d1ff4dabde2e227336466ab1d375b746032f2ba394614fd2aec2ab074e7047de SHA512 9d5b0f2df95d7c248ec92e1826f617f37c8e1b486170df09c923ef54e92977207db9134b975554f3720db19aee9234caf6a637bb706a6f69122595b900ddf474 WHIRLPOOL e718bb0a35fc3e25707c30b008d4a32e12ecb71dcb5382e0bb29eefe06999a4a6f322df39b935fb606d7396db6e4cda7dccd5b0a588a7910846ffc0e7da8bfac
-EBUILD lvm2-2.02.105-r2.ebuild 8555 SHA256 5ba0aac1f3c71cf15d3b70afe31def4e2c51522b4318d20295481c2ecdd2d10c SHA512 251e86f609afd4bb8a1411baa4e4a7c73ad51c85ec5306ca61ac3070b9a24d52c45e36abd4684a58b5f412ba9bf9e933972980cd35726007221edb9ef454097f WHIRLPOOL 08dd69200aa5935fc64202817cb03fdead45e57c72b31e810963ca08199815180943d09bfdfd482116a5a7fc94b363e02232fba21465bc24000136322f9618ec
-EBUILD lvm2-2.02.106.ebuild 8877 SHA256 bb64d77e77467621a3a5a0abf9a36f33a1a09509959ec8ddee4e8e7e87ee4d5d SHA512 6dfa85812bb031ad5d45224ef2bfad4823bdc4ce9fe44c22052727014d613afa96b224b2ce3f8639a8fc337e57797be0bf321f6bc4fb9d57f3f15c277cbb0b7c WHIRLPOOL ed225aec81e1d5bf6d1a94de85ac8fa4d6722f96fcaf30c46efb4db75e98fbe6ea4b1adc0526cf928fe21fc7b1c65051e6fb505cc9ad7fa58fd2fc7872199ec4
-EBUILD lvm2-2.02.107.ebuild 8877 SHA256 877984bd63305ea69c90da5b7b2d6f783fe0941605e5f295344a09d973582bc5 SHA512 53a7f1a3148afb9ae8f4aad6e659239e0793d0337e7f6818b1b7226c9ff857237aafb01f37cfd3a65630965cd232c4fb7b2178aa8a0cc4bb0f2db247bd48c235 WHIRLPOOL 8f9dfc55b8ef013ff7ed063cd028863d6277e32dcb1684c93a77437f155d3a72c1d0b17b475170098799c0cac861c048cdc6242e289ad2b40684fac07bfcac35
-EBUILD lvm2-2.02.108.ebuild 9092 SHA256 4c9ebc1094c336bdad381fc48cdd9cc02bd6d961e02d303fcdbdb01fd4cfe8bc SHA512 29af7e4321433de0d440783471e67532091c5f15d74f1240c2af8ebee4b0a6065f6300cf1570a63b3cbfaa6f94a77fe189de321d5c6038c26566ed0a4b2b82cd WHIRLPOOL 2923f6cd918e0f5b24bb313e0e6862a382aaec2ac473cee1b6c6cccf08b75442e7dac8afa82feb5ea9175186f2d16cca3118da99f1ba3541d06113952693d0b7
-EBUILD lvm2-2.02.109.ebuild 9095 SHA256 26defc972bfe3249d1e03c7f6f911bbe15b00e5e1a2279f38614adb80f89a113 SHA512 4ee6b385e870869ba9f0fb1cedcb765406ac138fd813cd1709e66e57962624f4e9fb65923daaa38a9d783d56e0f9e00bd494187f69c214281f238531733dc369 WHIRLPOOL 116a89407b003ac3dcb96aebc8a3b4d7f603790ed5facdb3a714ada14fb7e02d242bccf35204b77d4d5d64384c96984aa1bc6778dcb63c483a875d6257cae389
-MISC ChangeLog 69965 SHA256 87b613ac9f3485a7ab8dafcfb1e3efd508ca2b89a44deaab6362e43e7baf2282 SHA512 749dc11994add16c41b619256c7a7495872f71162c112ebaa6f029216325eea679072e9761c132425bead2a4f9d66db66f8935902ad61e8258eb9e82f6d0e09d WHIRLPOOL 3e53a064770354b3b511bff400d05192ab84ba27080b04834681f208b4244ba1971359d6fbc54bf6066b0d01a9da7384292cc6d84fab52e226cc60a54a152597
+EBUILD lvm2-2.02.109.ebuild 9093 SHA256 09f61034cfd1e7ffe5bec9964e1fd173419f12fafacb977a4012bff2ecd315f2 SHA512 00b42e2f35ff3cafca67e91c858d3a2b313e5bfd1f99311fdcd7b1f0cf9a7df5dd23e4b5603dfed8ec8f3f2fd4f2e6dae3fe61d39f760e6d6b6bc78a5093f65c WHIRLPOOL 9e2f7d1299caa44ec019f44da6b6f845a7fd2e550c293b8ecdbd8902236fe63abde3dfa87b9804c48baf91207dd603c4a49dd2e5c382fb4aadc201d81eeaf1ff
+MISC ChangeLog 70494 SHA256 60b606499071d757658ba2448d3a9b5a1010507223a9f84a926f25c5d116f069 SHA512 8c848f665610ba7b7cb0d4905408ae0727ced2639a6c88d569ec1abcb6f3f4d6d673e9bbdcd0122e33743634465142167405578968b254651266d7c58e9ec0a7 WHIRLPOOL 89cf55b2d0ee7453167837ea20f18a9098cda48b711c885536ea81b53b12f545b25f1ae97c61bbc13d761160e3112b032e222173339e6d92bef90a85aae7d3a0
 MISC metadata.xml 995 SHA256 a2be36b695dab8ef65772af8d808cdc7a5c5855e2c9104060e7232e21b984216 SHA512 642abe2a196ffeaf3a67530befa8dc123f1e3e1238bf55d38c0affea82ab5b2f9e56da6b303410845c625494a59323ac8570f40e0f8a406db76295059958361a WHIRLPOOL cba3a6dd12fafc4719050082ee740d03ef0ed68e074b556a0c1f15f4a7b328d9b826d2b7ab3d3f19546de92e907a3fd466792db67423cb8630d5313154d5b6f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT9K8VAAoJEEdUh39IaPFNqkYIAIbzVWnexTFi9DXZDy1EppiI
-LcZ1rrvSFuH6ob8dkSdowudpwsMa8v6G+Nea9w8D+On5q2T59FTLTa9FQa/4k5ns
-aytfHu2CRe4GKou10Uez5r0c1q5nE8vdD9nxfnE4eSIRW6Q3buY5XZze4vCLsqAV
-hS5QlINEqZPWmzRaeZVoVKBRoRGTd7VuLD/6M4N04b090ZqX0CBcIKjl316MmMeV
-KZxrqWwdV920nKVwyAV7cYWr/wgaUECi4hq3lZr4iQs8ffSJnYkyOvMQkZH/sDQl
-eYouSY7FPrdbxJh9ZbWCviqJPmTNWFLyo+Pe4pvjYZfQx02Ln24GdzE1sr4gpvQ=
-=LFCs
+iQEcBAEBCAAGBQJT9zEgAAoJEEdUh39IaPFN4GsH/jiU00dzznE7+aG9PYizfGrG
+kuIc5Lr9rT0W2JhBtb6UHYAWeS5k0Uo6wgfuUQ4rUxbbPP/xMRbbbo8qv4fIksG9
+3ydgBhETUDEpZeoWPriOLC8ElRlC2V2SG9vMtMHY5+fLb7ZpiNE17mUZcQqZwWnl
+Kh1TVIzgzmlG7wKR6o7FZqaAIabwz6wXSoGFlqNlrARB73p8zVReNFKHKJU+MH3m
+XHG92jJlq0RpKidMswCx4OzX3IlY7QcI5d5vvankl5DG13cOWDEfQ/3XCdIW3R0/
+qNUUn/fjfw/KbcaZN0SCUtDewD4qH7xjb897YN+2yKZkuZXLm+yD+vxA5MSCTOU=
+=ewf9
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/files/lvm.conf-2.02.67.patch b/sys-fs/lvm2/files/lvm.conf-2.02.67.patch
deleted file mode 100644
index 547963c7fffb..000000000000
--- a/sys-fs/lvm2/files/lvm.conf-2.02.67.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nuar LVM2.2.02.67.orig//doc/example.conf.in LVM2.2.02.67//doc/example.conf.in
---- LVM2.2.02.67.orig//doc/example.conf.in	2010-05-20 13:47:21.000000000 +0000
-+++ LVM2.2.02.67//doc/example.conf.in	2010-06-07 18:43:34.099693472 +0000
-@@ -50,7 +50,9 @@
- 
- 
-     # By default we accept every block device:
--    filter = [ "a/.*/" ]
-+    # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
-+    # noise when you probed while not available.
-+    filter = [ "r|/dev/nbd.*|", "a/.*/" ]
- 
-     # Exclude the cdrom drive
-     # filter = [ "r|/dev/cdrom|" ]
-@@ -259,6 +261,8 @@
-     # the new lvm2 on-disk metadata format.
-     # The default value is set when the tools are built.
-     # fallback_to_lvm1 = 0
-+    # Gentoo: the LVM tools are a seperate package.
-+    fallback_to_lvm1 = 0
- 
-     # The default metadata format that commands should use - "lvm1" or "lvm2".
-     # The command line override is -M1 or -M2.
-@@ -449,12 +453,12 @@
- 
- # Metadata settings
- #
--# metadata {
-+metadata {
-     # Default number of copies of metadata to hold on each PV.  0, 1 or 2.
-     # You might want to override it from the command line with 0 
-     # when running pvcreate on new PVs which are to be added to large VGs.
--
--    # pvmetadatacopies = 1
-+    # Gentoo: enable for data safety, but PV resize is then disabled.
-+    #pvmetadatacopies = 2
- 
-     # Approximate default size of on-disk metadata areas in sectors.
-     # You should increase this if you have large volume groups or
-@@ -476,7 +480,7 @@
-     # the supplied toolset to make changes (e.g. vgcfgrestore).
- 
-     # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
--#}
-+}
- 
- # Event daemon
- #
diff --git a/sys-fs/lvm2/files/lvm2-2.02.105-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.02.105-pthread-pkgconfig.patch
deleted file mode 100644
index 4911bbafab3f..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.105-pthread-pkgconfig.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Make sure that libdm usage always brings in pthread libraries, both in
-pkgconfig and during manual build.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar LVM2.2.02.105.orig/libdm/libdevmapper.pc.in LVM2.2.02.105/libdm/libdevmapper.pc.in
---- LVM2.2.02.105.orig/libdm/libdevmapper.pc.in	2014-01-20 11:25:30.000000000 -0800
-+++ LVM2.2.02.105/libdm/libdevmapper.pc.in	2014-02-01 14:50:58.805455421 -0800
-@@ -8,4 +8,5 @@
- Version: @DM_LIB_PATCHLEVEL@
- Cflags: -I${includedir} 
- Libs: -L${libdir} -ldevmapper
-+Libs.private: -L${libdir} @PTHREAD_LIBS@
- Requires.private: @SELINUX_PC@ @UDEV_PC@
-diff -Nuar LVM2.2.02.105/tools/Makefile.in LVM2.2.02.105.orig/tools/Makefile.in
---- LVM2.2.02.105/tools/Makefile.in	2014-02-03 18:33:19.032894499 -0800
-+++ LVM2.2.02.105.orig/tools/Makefile.in	2014-02-03 18:36:41.738459116 -0800
-@@ -86,6 +86,7 @@
-   INSTALL_LVM_TARGETS += install_tools_static
-   INSTALL_DMSETUP_TARGETS += install_dmsetup_static
-   INSTALL_CMDLIB_TARGETS += install_cmdlib_static
-+  STATIC_LIBS += @PTHREAD_LIBS@
- endif
- 
- LVMLIBS = $(LVMINTERNAL_LIBS)
-@@ -118,6 +119,10 @@
- 
- include $(top_builddir)/make.tmpl
- 
-+ifeq ("@STATIC_LINK@", "yes")
-+  STATIC_LIBS += @PTHREAD_LIBS@
-+endif
-+
- LIBS += $(UDEV_LIBS) $(BLKID_LIBS)
- 
- device-mapper: $(TARGETS_DM)
diff --git a/sys-fs/lvm2/files/lvm2-2.02.105-readline-6.3.patch b/sys-fs/lvm2/files/lvm2-2.02.105-readline-6.3.patch
deleted file mode 100644
index c96b7ee67ac5..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.105-readline-6.3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://bugs.gentoo.org/503234
-
-From 216c57eed72fee52e99bb5d014c9de535e631f58 Mon Sep 17 00:00:00 2001
-From: Zdenek Kabelac <zkabelac@redhat.com>
-Date: Thu, 6 Mar 2014 16:04:19 +0100
-Subject: [PATCH] readline: switch to new-style readline typedef
-
-Based on patch:
-https://www.redhat.com/archives/lvm-devel/2014-March/msg00015.html
-
-The CPPFunction typedef (among others) have been deprecated in favour of
-specific prototyped typedefs since readline 4.2 (circa 2001).
-It's been working since because compatibility typedefs have been in
-place until they where removed in the recent readline 6.3 release.
-Switch to the new style to avoid build breakage.
-
-But also add full backward compatibility with define.
-
-Signed-off-by: Gustavo Zacarias <gustavo zacarias com ar>
----
- WHATS_NEW   | 1 +
- tools/lvm.c | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tools/lvm.c b/tools/lvm.c
-index 51e9293..f9ab438 100644
---- a/tools/lvm.c
-+++ b/tools/lvm.c
-@@ -27,6 +27,7 @@ int main(int argc, char **argv)
- #  include <readline/history.h>
- #  ifndef HAVE_RL_COMPLETION_MATCHES
- #    define rl_completion_matches(a, b) completion_matches((char *)a, b)
-+#    define rl_completion_func_t CPPFunction
- #  endif
- 
- static struct cmdline_context *_cmdline;
-@@ -185,7 +186,7 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline)
- 	char *input = NULL, *args[MAX_ARGS], **argv;
- 
- 	rl_readline_name = "lvm";
--	rl_attempted_completion_function = (CPPFunction *) _completion;
-+	rl_attempted_completion_function = (rl_completion_func_t *) _completion;
- 
- 	_read_history(cmd);
- 
--- 
-1.9.0
-
diff --git a/sys-fs/lvm2/files/lvm2-2.02.105-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.105-static-pkgconfig-libs.patch
deleted file mode 100644
index e6aa60beb372..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.105-static-pkgconfig-libs.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -Nuar LVM2.2.02.105.orig/configure.in LVM2.2.02.105/configure.in
---- LVM2.2.02.105.orig/configure.in	2014-02-01 14:53:32.167236743 -0800
-+++ LVM2.2.02.105/configure.in	2014-02-01 15:01:45.893192059 -0800
-@@ -994,6 +994,7 @@
- 				])
- 	if test x$BLKID_WIPING = xyes; then
- 		BLKID_PC="blkid"
-+		BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC`
- 		AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.])
- 	fi
- fi
-@@ -1022,6 +1023,7 @@
- 		pkg_config_init
- 	fi
- 	PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"])
-+	UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev`
- 	AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
- fi
- 
-@@ -1265,19 +1267,31 @@
- if test x$SELINUX = xyes; then
- 	AC_CHECK_LIB([sepol], [sepol_check_context], [
- 		AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
--		SELINUX_LIBS="-lsepol"])
-+		SEPOL_LIBS="-lsepol"])
- 
-+	dnl -- init pkgconfig if required
-+	if  test x$PKGCONFIG_INIT != x1; then
-+		pkg_config_init
-+	fi
-+	PKG_CHECK_MODULES(SELINUX, libselinux, [
-+ 		SELINUX_PC="libselinux"
-+		SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux`
-+		SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS"
-+		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-+	],[
-+		dnl -- old non-pkgconfig method, is buggy with static builds
- 	AC_CHECK_LIB([selinux], [is_selinux_enabled], [
- 		AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
- 		AC_CHECK_HEADERS([selinux/label.h])
- 		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
--		SELINUX_LIBS="-lselinux $SELINUX_LIBS"
-+		SELINUX_LIBS="-lselinux $SEPOL_LIBS"
- 		SELINUX_PC="libselinux"
- 		HAVE_SELINUX=yes ], [
- 		AC_MSG_WARN(Disabling selinux)
- 		SELINUX_LIBS=
- 		SELINUX_PC=
- 		HAVE_SELINUX=no ])
-+	])
- fi
- 
- ################################################################################
-@@ -1592,6 +1606,7 @@
- AC_SUBST(APPLIB)
- AC_SUBST(AWK)
- AC_SUBST(BLKID_LIBS)
-+AC_SUBST(BLKID_STATIC_LIBS)
- AC_SUBST(BLKID_PC)
- AC_SUBST(BLKID_WIPING)
- AC_SUBST(BUILD_CMIRRORD)
-@@ -1684,6 +1699,7 @@
- AC_SUBST(SALCK_CFLAGS)
- AC_SUBST(SALCK_LIBS)
- AC_SUBST(SELINUX_LIBS)
-+AC_SUBST(SELINUX_STATIC_LIBS)
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-@@ -1695,6 +1711,7 @@
- AC_SUBST(THIN_DUMP_CMD)
- AC_SUBST(THIN_REPAIR_CMD)
- AC_SUBST(UDEV_LIBS)
-+AC_SUBST(UDEV_STATIC_LIBS)
- AC_SUBST(UDEV_PC)
- AC_SUBST(UDEV_RULES)
- AC_SUBST(UDEV_SYNC)
-diff -Nuar LVM2.2.02.105.orig/make.tmpl.in LVM2.2.02.105/make.tmpl.in
---- LVM2.2.02.105.orig/make.tmpl.in	2014-02-01 14:52:26.779050860 -0800
-+++ LVM2.2.02.105/make.tmpl.in	2014-02-01 14:57:45.642834111 -0800
-@@ -44,7 +44,7 @@
- 
- LIBS = @LIBS@
- # Extra libraries always linked with static binaries
--STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
-+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS)
- DEFS += @DEFS@
- # FIXME set this only where it's needed, not globally?
- CFLAGS += @CFLAGS@ @UDEV_CFLAGS@
-@@ -59,8 +59,11 @@
- PTHREAD_LIBS = @PTHREAD_LIBS@
- READLINE_LIBS = @READLINE_LIBS@
- SELINUX_LIBS = @SELINUX_LIBS@
-+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
- UDEV_LIBS = @UDEV_LIBS@
-+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
- BLKID_LIBS=@BLKID_LIBS@
-+BLKID_STATIC_LIBS=@BLKID_STATIC_LIBS@
- TESTING = @TESTING@
- 
- # Setup directory variables
diff --git a/sys-fs/lvm2/files/lvm2-2.02.106-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.106-static-pkgconfig-libs.patch
deleted file mode 100644
index c824a6af4ff9..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.106-static-pkgconfig-libs.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -1040,6 +1040,7 @@
- 				])
- 	if test x$BLKID_WIPING = xyes; then
- 		BLKID_PC="blkid"
-+		BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC`
- 		AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.])
- 	fi
- fi
-@@ -1068,6 +1069,7 @@
- 		pkg_config_init
- 	fi
- 	PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"])
-+	UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev`
- 	AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
- fi
- 
-@@ -1312,19 +1314,32 @@
- if test x$SELINUX = xyes; then
- 	AC_CHECK_LIB([sepol], [sepol_check_context], [
- 		AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
--		SELINUX_LIBS="-lsepol"])
-+		SEPOL_LIBS="-lsepol"])
-+
-+	dnl -- init pkgconfig if required
-+	if  test x$PKGCONFIG_INIT != x1; then
-+		pkg_config_init
-+	fi
-+	PKG_CHECK_MODULES(SELINUX, libselinux, [
-+		SELINUX_PC="libselinux"
-+		SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux`
-+		SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS"
-+		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-+	],[
-+		dnl -- old non-pkgconfig method, is buggy with static builds
- 
- 	AC_CHECK_LIB([selinux], [is_selinux_enabled], [
- 		AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
- 		AC_CHECK_HEADERS([selinux/label.h])
- 		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
--		SELINUX_LIBS="-lselinux $SELINUX_LIBS"
-+		SELINUX_LIBS="-lselinux $SEPOL_LIBS"
- 		SELINUX_PC="libselinux"
- 		HAVE_SELINUX=yes ], [
- 		AC_MSG_WARN(Disabling selinux)
- 		SELINUX_LIBS=
- 		SELINUX_PC=
- 		HAVE_SELINUX=no ])
-+	])
- fi
- 
- ################################################################################
-@@ -1638,6 +1653,7 @@
- ################################################################################
- AC_SUBST(APPLIB)
- AC_SUBST(AWK)
-+AC_SUBST(BLKID_STATIC_LIBS)
- AC_SUBST(BLKID_PC)
- AC_SUBST(BLKID_WIPING)
- AC_SUBST(BUILD_CMIRRORD)
-@@ -1731,6 +1747,7 @@
- AC_SUBST(SALCK_CFLAGS)
- AC_SUBST(SALCK_LIBS)
- AC_SUBST(SELINUX_LIBS)
-+AC_SUBST(SELINUX_STATIC_LIBS)
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-@@ -1740,6 +1757,7 @@
- AC_SUBST(THIN_CHECK_CMD)
- AC_SUBST(THIN_DUMP_CMD)
- AC_SUBST(THIN_REPAIR_CMD)
-+AC_SUBST(UDEV_STATIC_LIBS)
- AC_SUBST(UDEV_PC)
- AC_SUBST(UDEV_RULES)
- AC_SUBST(UDEV_SYNC)
---- make.tmpl.in
-+++ make.tmpl.in
-@@ -43,7 +43,7 @@
- 
- LIBS = @LIBS@
- # Extra libraries always linked with static binaries
--STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
-+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS)
- DEFS += @DEFS@
- # FIXME set this only where it's needed, not globally?
- CFLAGS += @CFLAGS@
-@@ -57,10 +57,13 @@
- PTHREAD_LIBS = @PTHREAD_LIBS@
- READLINE_LIBS = @READLINE_LIBS@
- SELINUX_LIBS = @SELINUX_LIBS@
-+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
- UDEV_CFLAGS = @UDEV_CFLAGS@
- UDEV_LIBS = @UDEV_LIBS@
-+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
- BLKID_CFLAGS = @BLKID_CFLAGS@
- BLKID_LIBS = @BLKID_LIBS@
-+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@
- TESTING = @TESTING@
- 
- # Setup directory variables
diff --git a/sys-fs/lvm2/files/lvm2-2.02.95-lvmpath.patch b/sys-fs/lvm2/files/lvm2-2.02.95-lvmpath.patch
deleted file mode 100644
index 7ed9794ebe4a..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.95-lvmpath.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/udev/69-dm-lvm-metad.rules.diff?r1=1.3&r2=1.4&cvsroot=lvm2
-
-X-Gentoo-Bug: 409921
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=409921
-
-===================================================================
-RCS file: /cvs/lvm2/LVM2/udev/69-dm-lvm-metad.rules,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- LVM2/udev/69-dm-lvm-metad.rules	2012/03/06 02:30:50	1.3
-+++ LVM2/udev/69-dm-lvm-metad.rules	2012/03/12 08:59:55	1.4
-@@ -19,7 +19,12 @@
- # Device-mapper devices are processed only on change event or on supported synthesized event.
- KERNEL=="dm-[0-9]*", ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="lvm_end"
- 
-+# Set proper sbin path, /sbin has higher priority than /usr/sbin.
-+ENV{LVM_SBIN_PATH}="/sbin"
-+TEST!="$env{LVM_SBIN_PATH}/lvm", ENV{LVM_SBIN_PATH}="/usr/sbin"
-+TEST!="$env{LVM_SBIN_PATH}/lvm", GOTO="lvm_end"
-+
- # Only process devices already marked as a PV - this requires blkid to be called before.
--ENV{ID_FS_TYPE}=="LVM2_member|LVM1_member", RUN+="$env{DM_SBIN_PATH}/pvscan --cache --major $major --minor $minor"
-+ENV{ID_FS_TYPE}=="LVM2_member|LVM1_member", RUN+="$env{LVM_SBIN_PATH}/lvm pvscan --cache --major $major --minor $minor"
- 
- LABEL="lvm_end"
diff --git a/sys-fs/lvm2/lvm2-2.02.105-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.105-r2.ebuild
deleted file mode 100644
index 9093e6ce28de..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.105-r2.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.105-r2.ebuild,v 1.8 2014/08/10 20:20:05 slyfox Exp $
-
-EAPI=5
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="http://sources.redhat.com/lvm2/"
-SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
-	ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )"
-
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
-	readline? ( sys-libs/readline )
-	udev? ( >=virtual/libudev-208:=[static-libs?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	!<sys-apps/openrc-0.11
-	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/clvm
-	!!sys-fs/lvm-user
-	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
-	thin? ( >=sys-block/thin-provisioning-tools-0.2.8-r1 )"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig
-	>=sys-devel/binutils-2.20.1-r1
-	static? (
-		selinux? ( sys-libs/libselinux[static-libs] )
-		udev? ( >=virtual/libudev-208:=[static-libs] )
-		>=sys-apps/util-linux-2.16[static-libs]
-	)"
-
-S=${WORKDIR}/${PN/lvm/LVM}.${PV}
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.99-example.conf.in.patch
-
-	sed -i \
-		-e "1iAR = $(tc-getAR)" \
-		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
-		make.tmpl.in || die #444082
-
-	sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
-	#epatch "${FILESDIR}"/${PN}-2.02.100-selinux_and_udev_static.patch #370217, #439414
-	epatch "${FILESDIR}"/${PN}-2.02.105-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.105-pthread-pkgconfig.patch #492450
-	epatch "${FILESDIR}"/${PN}-2.02.105-readline-6.3.patch #503234
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -flto
-	local myconf
-	local buildmode
-
-	myconf="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	if use static; then
-		buildmode="internal"
-		# This only causes the .static versions to become available
-		myconf="${myconf} --enable-static_link"
-	else
-		buildmode="shared"
-	fi
-	dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
-
-	# dmeventd requires mirrors to be internal, and snapshot available
-	# so we cannot disable them
-	myconf="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal"
-		myconf="${myconf} --with-thin-check=${EPREFIX}/sbin/thin_check"
-		myconf="${myconf} --with-thin-dump=${EPREFIX}/sbin/thin_dump"
-		myconf="${myconf} --with-thin-repair=${EPREFIX}/sbin/thin_repair"
-	else
-		myconf="${myconf} --with-thin=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${myconf} --with-cluster=${buildmode}"
-		# 4-state! Make sure we get it right, per bug 210879
-		# Valid options are: none, cman, gulm, all
-		#
-		# 2009/02:
-		# gulm is removed now, now dual-state:
-		# cman, none
-		# all still exists, but is not needed
-		#
-		# 2009/07:
-		# TODO: add corosync and re-enable ALL
-		local clvmd=""
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${myconf} --with-clvmd=none --with-cluster=none"
-	fi
-
-	econf \
-		$(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--with-confdir="${EPREFIX}"/etc \
-		--exec-prefix="${EPREFIX}" \
-		--sbindir="${EPREFIX}/sbin" \
-		--with-staticdir="${EPREFIX}"/sbin \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-default-dm-run-dir=/run \
-		--with-default-run-dir=/run/lvm \
-		--with-default-locking-dir=/run/lock/lvm \
-		--with-default-pid-dir=/run \
-		$(use_enable udev udev_rules) \
-		$(use_enable udev udev_sync) \
-		$(use_with udev udevdir "$(get_udevdir)"/rules.d) \
-		"$(systemd_with_unitdir)" \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	pushd include >/dev/null
-	emake
-	popd >/dev/null
-
-	if use device-mapper-only ; then
-		emake device-mapper
-	else
-		emake
-		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
-	fi
-}
-
-src_install() {
-	local inst
-	INSTALL_TARGETS="install install_systemd_units install_systemd_generators install_tmpfiles_configuration"
-	use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
-	for inst in ${INSTALL_TARGETS}; do
-		emake DESTDIR="${D}" ${inst}
-	done
-
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	if use !device-mapper-only ; then
-		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-		newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm
-		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
-
-		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
-		newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad
-	fi
-
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
-		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		dolib.a libdaemon/client/libdaemonclient.a #462908
-		#gen_usr_ldscript libdevmapper.so
-		dolib.a daemons/dmeventd/libdevmapper-event.a
-		#gen_usr_ldscript libdevmapper-event.so
-	else
-		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-	fi
-
-	if use lvm2create_initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
-	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-	ewarn "# rc-update add lvm boot"
-	ewarn
-	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
-	ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.106.ebuild b/sys-fs/lvm2/lvm2-2.02.106.ebuild
deleted file mode 100644
index 1f758109130f..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.106.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.106.ebuild,v 1.7 2014/08/10 20:20:05 slyfox Exp $
-
-EAPI=5
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="http://sources.redhat.com/lvm2/"
-SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
-	ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )"
-
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
-	readline? ( sys-libs/readline )
-	udev? ( >=virtual/libudev-208:=[static-libs?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	!<sys-apps/openrc-0.11
-	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/clvm
-	!!sys-fs/lvm-user
-	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
-	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig
-	>=sys-devel/binutils-2.20.1-r1
-	static? (
-		selinux? ( sys-libs/libselinux[static-libs] )
-		udev? ( >=virtual/libudev-208:=[static-libs] )
-		>=sys-apps/util-linux-2.16[static-libs]
-	)"
-
-S=${WORKDIR}/${PN/lvm/LVM}.${PV}
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.99-example.conf.in.patch
-
-	sed -i \
-		-e "1iAR = $(tc-getAR)" \
-		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
-		make.tmpl.in || die #444082
-
-	sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.106-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
-	# Upstream never tested with USE="-thin" wrt #510202
-	sed -i -e 's|_man7: $(MAN8)|_man7: $(MAN7)|' man/Makefile.in || die
-	use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; }
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -flto
-	local myconf
-	local buildmode
-
-	myconf="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs"
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	if use static; then
-		buildmode="internal"
-		# This only causes the .static versions to become available
-		myconf="${myconf} --enable-static_link"
-	else
-		buildmode="shared"
-	fi
-	dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
-
-	# dmeventd requires mirrors to be internal, and snapshot available
-	# so we cannot disable them
-	myconf="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal"
-		myconf="${myconf} --with-thin-check=${EPREFIX}/sbin/thin_check"
-		myconf="${myconf} --with-thin-dump=${EPREFIX}/sbin/thin_dump"
-		myconf="${myconf} --with-thin-repair=${EPREFIX}/sbin/thin_repair"
-	else
-		myconf="${myconf} --with-thin=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${myconf} --with-cluster=${buildmode}"
-		# 4-state! Make sure we get it right, per bug 210879
-		# Valid options are: none, cman, gulm, all
-		#
-		# 2009/02:
-		# gulm is removed now, now dual-state:
-		# cman, none
-		# all still exists, but is not needed
-		#
-		# 2009/07:
-		# TODO: add corosync and re-enable ALL
-		local clvmd=""
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${myconf} --with-clvmd=none --with-cluster=none"
-	fi
-
-	myconf="${myconf} --with-cache=${buildmode}"
-
-	econf \
-		$(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--with-confdir="${EPREFIX}"/etc \
-		--exec-prefix="${EPREFIX}" \
-		--sbindir="${EPREFIX}/sbin" \
-		--with-staticdir="${EPREFIX}"/sbin \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-default-dm-run-dir=/run \
-		--with-default-run-dir=/run/lvm \
-		--with-default-locking-dir=/run/lock/lvm \
-		--with-default-pid-dir=/run \
-		$(use_enable udev udev_rules) \
-		$(use_enable udev udev_sync) \
-		$(use_with udev udevdir "$(get_udevdir)"/rules.d) \
-		$(use_enable systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	pushd include >/dev/null
-	emake
-	popd >/dev/null
-
-	if use device-mapper-only ; then
-		emake device-mapper
-	else
-		emake
-		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
-	fi
-}
-
-src_install() {
-	local inst
-	INSTALL_TARGETS="install install_systemd_units install_systemd_generators install_tmpfiles_configuration"
-	use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
-	for inst in ${INSTALL_TARGETS}; do
-		emake DESTDIR="${D}" ${inst}
-	done
-
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	if use !device-mapper-only ; then
-		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-		newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm
-		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
-
-		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
-		newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad
-	fi
-
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
-		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		dolib.a libdaemon/client/libdaemonclient.a #462908
-		#gen_usr_ldscript libdevmapper.so
-		dolib.a daemons/dmeventd/libdevmapper-event.a
-		#gen_usr_ldscript libdevmapper-event.so
-	else
-		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-	fi
-
-	if use lvm2create_initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
-	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-	ewarn "# rc-update add lvm boot"
-	ewarn
-	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
-	ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.107.ebuild b/sys-fs/lvm2/lvm2-2.02.107.ebuild
deleted file mode 100644
index 3a18daacdd23..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.107.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.107.ebuild,v 1.3 2014/08/10 20:20:05 slyfox Exp $
-
-EAPI=5
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="http://sources.redhat.com/lvm2/"
-SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
-	ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )"
-
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
-	readline? ( sys-libs/readline )
-	udev? ( >=virtual/libudev-208:=[static-libs?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	!<sys-apps/openrc-0.11
-	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/clvm
-	!!sys-fs/lvm-user
-	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
-	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig
-	>=sys-devel/binutils-2.20.1-r1
-	static? (
-		selinux? ( sys-libs/libselinux[static-libs] )
-		udev? ( >=virtual/libudev-208:=[static-libs] )
-		>=sys-apps/util-linux-2.16[static-libs]
-	)"
-
-S=${WORKDIR}/${PN/lvm/LVM}.${PV}
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.99-example.conf.in.patch
-
-	sed -i \
-		-e "1iAR = $(tc-getAR)" \
-		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
-		make.tmpl.in || die #444082
-
-	sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.107-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
-	# Upstream never tested with USE="-thin" wrt #510202
-	sed -i -e 's|_man7: $(MAN8)|_man7: $(MAN7)|' man/Makefile.in || die
-	use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; }
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -flto
-	local myconf
-	local buildmode
-
-	myconf="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs"
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	if use static; then
-		buildmode="internal"
-		# This only causes the .static versions to become available
-		myconf="${myconf} --enable-static_link"
-	else
-		buildmode="shared"
-	fi
-	dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
-
-	# dmeventd requires mirrors to be internal, and snapshot available
-	# so we cannot disable them
-	myconf="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal"
-		myconf="${myconf} --with-thin-check=${EPREFIX}/sbin/thin_check"
-		myconf="${myconf} --with-thin-dump=${EPREFIX}/sbin/thin_dump"
-		myconf="${myconf} --with-thin-repair=${EPREFIX}/sbin/thin_repair"
-	else
-		myconf="${myconf} --with-thin=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${myconf} --with-cluster=${buildmode}"
-		# 4-state! Make sure we get it right, per bug 210879
-		# Valid options are: none, cman, gulm, all
-		#
-		# 2009/02:
-		# gulm is removed now, now dual-state:
-		# cman, none
-		# all still exists, but is not needed
-		#
-		# 2009/07:
-		# TODO: add corosync and re-enable ALL
-		local clvmd=""
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${myconf} --with-clvmd=none --with-cluster=none"
-	fi
-
-	myconf="${myconf} --with-cache=${buildmode}"
-
-	econf \
-		$(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--with-confdir="${EPREFIX}"/etc \
-		--exec-prefix="${EPREFIX}" \
-		--sbindir="${EPREFIX}/sbin" \
-		--with-staticdir="${EPREFIX}"/sbin \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-default-dm-run-dir=/run \
-		--with-default-run-dir=/run/lvm \
-		--with-default-locking-dir=/run/lock/lvm \
-		--with-default-pid-dir=/run \
-		$(use_enable udev udev_rules) \
-		$(use_enable udev udev_sync) \
-		$(use_with udev udevdir "$(get_udevdir)"/rules.d) \
-		$(use_enable systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	pushd include >/dev/null
-	emake
-	popd >/dev/null
-
-	if use device-mapper-only ; then
-		emake device-mapper
-	else
-		emake
-		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
-	fi
-}
-
-src_install() {
-	local inst
-	INSTALL_TARGETS="install install_systemd_units install_systemd_generators install_tmpfiles_configuration"
-	use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
-	for inst in ${INSTALL_TARGETS}; do
-		emake DESTDIR="${D}" ${inst}
-	done
-
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	if use !device-mapper-only ; then
-		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-		newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm
-		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
-
-		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
-		newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad
-	fi
-
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
-		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		dolib.a libdaemon/client/libdaemonclient.a #462908
-		#gen_usr_ldscript libdevmapper.so
-		dolib.a daemons/dmeventd/libdevmapper-event.a
-		#gen_usr_ldscript libdevmapper-event.so
-	else
-		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-	fi
-
-	if use lvm2create_initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
-	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-	ewarn "# rc-update add lvm boot"
-	ewarn
-	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
-	ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.108.ebuild b/sys-fs/lvm2/lvm2-2.02.108.ebuild
deleted file mode 100644
index 9ab395050397..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.108.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild,v 1.5 2014/08/10 20:20:05 slyfox Exp $
-
-EAPI=5
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="http://sources.redhat.com/lvm2/"
-SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
-	ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )"
-
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
-	readline? ( sys-libs/readline )
-	udev? ( >=virtual/libudev-208:=[static-libs?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	!<sys-apps/openrc-0.11
-	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/clvm
-	!!sys-fs/lvm-user
-	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
-	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig
-	>=sys-devel/binutils-2.20.1-r1
-	static? (
-		selinux? ( sys-libs/libselinux[static-libs] )
-		udev? ( >=virtual/libudev-208:=[static-libs] )
-		>=sys-apps/util-linux-2.16[static-libs]
-	)"
-
-S=${WORKDIR}/${PN/lvm/LVM}.${PV}
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch
-
-	sed -i \
-		-e "1iAR = $(tc-getAR)" \
-		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
-		make.tmpl.in || die #444082
-
-	sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
-
-	if use systemd && ! use device-mapper-only; then
-		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
-	fi
-
-	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
-
-	# Without thin-privision-tools, there is nothing to install for target install_man7:
-	use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; }
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -flto
-	local myconf
-	local buildmode
-
-	myconf="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs"
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	if use static; then
-		buildmode="internal"
-		# This only causes the .static versions to become available
-		myconf="${myconf} --enable-static_link"
-	else
-		buildmode="shared"
-	fi
-	dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
-
-	# dmeventd requires mirrors to be internal, and snapshot available
-	# so we cannot disable them
-	myconf="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal --with-cache=internal"
-		local texec
-		for texec in check dump repair restore; do
-			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
-			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
-		done
-	else
-		myconf="${myconf} --with-thin=none --with-cache=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${myconf} --with-cluster=${buildmode}"
-		# 4-state! Make sure we get it right, per bug 210879
-		# Valid options are: none, cman, gulm, all
-		#
-		# 2009/02:
-		# gulm is removed now, now dual-state:
-		# cman, none
-		# all still exists, but is not needed
-		#
-		# 2009/07:
-		# TODO: add corosync and re-enable ALL
-		local clvmd=""
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${myconf} --with-clvmd=none --with-cluster=none"
-	fi
-
-	econf \
-		$(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--with-confdir="${EPREFIX}"/etc \
-		--exec-prefix="${EPREFIX}" \
-		--sbindir="${EPREFIX}/sbin" \
-		--with-staticdir="${EPREFIX}"/sbin \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-default-dm-run-dir=/run \
-		--with-default-run-dir=/run/lvm \
-		--with-default-locking-dir=/run/lock/lvm \
-		--with-default-pid-dir=/run \
-		$(use_enable udev udev_rules) \
-		$(use_enable udev udev_sync) \
-		$(use_with udev udevdir "$(get_udevdir)"/rules.d) \
-		$(use_enable systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	pushd include >/dev/null
-	emake
-	popd >/dev/null
-
-	if use device-mapper-only ; then
-		emake device-mapper
-	else
-		emake
-		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
-	fi
-}
-
-src_install() {
-	local inst
-	INSTALL_TARGETS="install install_systemd_units install_systemd_generators install_tmpfiles_configuration"
-	use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
-	for inst in ${INSTALL_TARGETS}; do
-		emake DESTDIR="${D}" ${inst}
-	done
-
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	if use !device-mapper-only ; then
-		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-		newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm
-		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
-
-		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
-		newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad
-	fi
-
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
-		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		dolib.a libdaemon/client/libdaemonclient.a #462908
-		#gen_usr_ldscript libdevmapper.so
-		dolib.a daemons/dmeventd/libdevmapper-event.a
-		#gen_usr_ldscript libdevmapper-event.so
-	else
-		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-	fi
-
-	if use lvm2create_initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
-	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-	ewarn "# rc-update add lvm boot"
-	ewarn
-	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
-	ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.109.ebuild b/sys-fs/lvm2/lvm2-2.02.109.ebuild
index 15671863f033..988cb74e82ca 100644
--- a/sys-fs/lvm2/lvm2-2.02.109.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.109.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-fs/lvm2/lvm2-2.02.109.ebuild,v 1.1 2014/08/20 14:23:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.109.ebuild,v 1.2 2014/08/22 11:54:27 ssuominen Exp $
 
 EAPI=5
 inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
@@ -12,7 +12,7 @@ SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )"
 
diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index c8949721ca2f..f3970e776e02 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.186 2014/08/21 12:04:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.187 2014/08/22 11:47:20 ssuominen Exp $
+
+  22 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> mdadm-3.3.1-r2.ebuild:
+  amd64/x86 stable wrt #520342
 
 *mdadm-3.3.2 (21 Aug 2014)
 
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 6e8f757a5b90..4c7cef7b206d 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -23,18 +23,18 @@ DIST mdadm-3.3.1.tar.xz 407964 SHA256 d8c74112cfd77bdc1dbc1291fe8d9243c76d91bfa2
 DIST mdadm-3.3.2.tar.xz 410628 SHA256 0f3a7e1a76b13892b79f9fceaf99ecb23513260389a768ac644ffa3ae06e5b8c SHA512 204363e41ec544ac44fa40ddf2758e31cbc1a88d7f038fa32a90b494b07be8e025be1bea8623029847ae495aabe3d1f2c503480db087d8a3dacd240003174936 WHIRLPOOL be7a7b77d6b53decfd03b2171e368d7162e48fe23835e664891acaa8cd1808236f9e34c27c573839c0f613be0e17ea94522df01a6537243eed132e87d3ea8d88
 DIST mdadm_3.3-2.debian.tar.gz 127889 SHA256 c38b155e7395b35380d506458d979b82c5b853de996f21ccab50b1202d726301 SHA512 92e4c403542caba4b9afb870ba803e6bc7ade143b27efdc27e03b3407f322722a635457cce9e8c195a3ecd7cbce66fdebdd6046fc4f36836e56e27d5d838c037 WHIRLPOOL 8f8ef1142a79044093a5f55b181dc35a142b83041a59a9b71945aa6fe84cd089a7e1b183ec6b5db210a0d07e94efad0ab3a0d0341fc6cbbbf4da9d0254b5c737
 EBUILD mdadm-3.2.6-r1.ebuild 2061 SHA256 dcee1c9b4ae0f6c9c05c754fdd958e23bb8efca6bde82f3452a9f0a91a7e621e SHA512 4e64f5b0fccdada51e23e1ab1187d3be05300b4f08751432ac35603aa698800a67adbf483de3729d9a1f3d3ac5d579ed1dc3e02dea3555387f21d066271dd523 WHIRLPOOL 50f2a0714081ede4de6c4a4334be7cbc42e98a8dbd365479314ef76991c7d3a6d866e8527d1f3e2be30936b544fd131cc4727bb907ec7124f6595556932f1680
-EBUILD mdadm-3.3.1-r2.ebuild 3001 SHA256 bdda3400dda4574f5abfe478c4f1a25f62057d31e957148df293f5158e4fb2a7 SHA512 230a31fbe9cd89946bd8cdd7ddd0c4ecbfa5b9d8e20edfc268655fd09660040630b7ec103c44bb2e8af2a2ebdc061018c84055621f1f6f37e3681396e46b5e76 WHIRLPOOL 2a5ebdc4bbd389cf39077781f859e3e7bae17ce0362708fc9b9bdc8d6936c8d796787ad85b24c67bfcf5182608e7b7430fcc6a6858928ba07cca206e597ab3e9
+EBUILD mdadm-3.3.1-r2.ebuild 2999 SHA256 d58c443c2bbbe640133cec21c1a780baccc3af39f7a1e15cfbbd9b27daea2eee SHA512 af299f2da7d73072d0566947edd295fe29e331750430fe730ce09a9818a8319ab7790e84048535a34ac906ce7d5736416d60ee8f37df2add61d1dd8c337a05d4 WHIRLPOOL 38f1fc534477f53f380732c916a4d9f37c42169fe31c90eb38a4b22273d503a5fe9b3a17e8e43f3fe967599b669d087024255568a5233ff8f739e00e6bda2cea
 EBUILD mdadm-3.3.2.ebuild 2178 SHA256 877bedf7b1de6fbc55acc39c7930a092e67b374a3af0a9c2bbd7fc67ba043e47 SHA512 aad53e2b44586cf446ceec58419397048df58aa060b3d85d16ebc920372d4ea32a117f8d6e122a9814350ab9c596e5e365d7fb118258606215e8927d35bcb375 WHIRLPOOL 4eaf9f975283c8e077189aef1426899e8c7d306c04b84c6e12de5a866f41db76c91713e351738e519ea6ee937702e0e10c53ff57eaeb04075396ef44a6e0cb23
-MISC ChangeLog 29922 SHA256 36a5610fda980a89ea54ce6d0d5717d86fa6244dd3f2178e556277b6e3609bdd SHA512 62e5b621307d41ae8bb326418f50f7a8aae2919c88c43b5daa2b1541c3337b19f62438780e2bbc233fac579f073e94858291b2d2331476642bfa1789ebd217cf WHIRLPOOL ecc4a5eb9ddd96320b3423fedc2ccc0de0ab6ac136f1ddc47905c8965d28e131e2d91d6b1e9c4622c195fb88a1ba4ffa7cd50a4c99645b3b7a99ab99a328b047
+MISC ChangeLog 30031 SHA256 fa1ad7dfb3b8d9124fd59c66005919430cfe3aae83c03fa4802b8bdca1bf997d SHA512 7d9349bbb31e0a0597ab311240c0f45b969c1c9ebf5f470c03211b6129bc7f8587d6cfc5feb0961b163d4e007c9e28559462ccf6db39b7e7c406672c08e9a117 WHIRLPOOL c06453617da2ca0d54bdf8561795f79e8f82053afd1adab0dda7daa40a33826c543c17f7440a905221d4bafb2403991f189e3dd58ce3bc4f426246da314b84a2
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT9d/JAAoJEEdUh39IaPFNi6MH/3nm5KUhrOuJIwA1WsVuWh+A
-pzdwWH+UB3It4heu3U/Wz2nhPnifZrvFm4IFeVbRUqzuQuMjPPXF0oJrfy2b7Ehw
-/NtKBnrMnghIi41AfV9D3SE2wkKeFTahKFy090tfC+l4WvvxHRNVnMZGmp764i5C
-M0rAtG7i6l87iBL2v4l62CjfwZg8Po7Ty2GFSC0pdG9/PkclwguLC33V4OMGDMiM
-kKMabHXqDN9CeOv309kcCPAbiJhUD8L1Ff7/1eBzVyygeMRO4wND7noXtDTyl/T9
-FPcEIGhRpHWdWqrB6HbIBCwiqKftgQtvr9GYrJQ5KbxPUDBdWnjkY41GWXqAaOE=
-=C1b4
+iQEcBAEBCAAGBQJT9y1VAAoJEEdUh39IaPFNkbQH/iT6USpl2Kx842Fv2bedviQ7
+M5Rw7moeN/pUQ2HEysJRtvo6E3PMp7ekT2VNvAv2K2LwGtAhaT4bMBghKE2VTEBb
+R+176LYSHR4fiUgGsJ9ax1XHAwDdX04BEe2Yd5NpI4eNX5tyXyvDqKfvUMQb5hFx
+p1HmmvXmqLsC25NFBbaynWtRW0sUyn4oIdZexeQZ/vTkDQttz80zdTtvVm+o6YtE
+s+N/O8FGF4w2ivTf7FLekHbWrYgBPAM/hLq/qXTm/X2dH5oxEJBY2zCdBNacxs4R
+/z3fazIxz1On32KPU3quraOMIHXQk/loTsPruMAEOVYmZuUYgSREr8BDJJfRv0E=
+=ArL1
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/mdadm-3.3.1-r2.ebuild b/sys-fs/mdadm/mdadm-3.3.1-r2.ebuild
index 7177222d4de3..407752517dfd 100644
--- a/sys-fs/mdadm/mdadm-3.3.1-r2.ebuild
+++ b/sys-fs/mdadm/mdadm-3.3.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/sys-fs/mdadm/mdadm-3.3.1-r2.ebuild,v 1.4 2014/07/18 15:32:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.3.1-r2.ebuild,v 1.5 2014/08/22 11:47:20 ssuominen Exp $
 
 EAPI=4
 inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="static"
 
 DEPEND="virtual/pkgconfig
diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 3a6ec95f173e..d5959aa37132 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/hardened-sources
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.1122 2014/08/21 13:29:29 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.1123 2014/08/22 11:20:44 blueness Exp $
+
+  22 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.13.10.ebuild, -hardened-sources-3.14.13.ebuild,
+  -hardened-sources-3.14.14.ebuild, -hardened-sources-3.14.16.ebuild,
+  -hardened-sources-3.14.5-r2.ebuild, -hardened-sources-3.15.6.ebuild,
+  -hardened-sources-3.15.7.ebuild, -hardened-sources-3.15.9.ebuild,
+  -hardened-sources-3.2.55-r7.ebuild, -hardened-sources-3.2.59-r5.ebuild,
+  -hardened-sources-3.2.61-r3.ebuild, -hardened-sources-3.2.61-r4.ebuild,
+  hardened-sources-3.14.15.ebuild, hardened-sources-3.15.8.ebuild,
+  hardened-sources-3.2.61-r5.ebuild:
+  Stable on amd64, x86.  Remove older versions.
 
   21 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
   -hardened-sources-3.14.17.ebuild, -hardened-sources-3.15.10.ebuild,
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 8518f27d5bef..31f5b2651e21 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,94 +1,59 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST deblob-3.13 122060 SHA256 8fc8f5242cd58f8560d1caecdc6ab786d6470660280f910a8b70bc47fae5eabb SHA512 90c329c7b2e49ca8e51b3ccd5ede999f01a70ce1b227f958f34306d32414787192d51481a22ae831c30179e2ef83bdf4eb5c356b49864ab8d7b5a9ed6baed294 WHIRLPOOL 56a7dc599ece173ace43a633ddf2d1fc4876b392e8cd31dfe840a6109eebed18a8a9c33c7e191ea9cf0b605818a59312c76787c77aa479b6c84feb23083c0fb4
 DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c
 DIST deblob-3.15 120796 SHA256 d24f4b0548f42e7e83695919008cb75c70f5a7cb9c8a10824ca3c5c51fa62eaf SHA512 7815575001e48569268e60248da2768c6ee81982761420068ce16e6282a9552783595712ae4d937bb62d7e5f33e62b5daab0da35c8bb49c5d94ebde42f030495 WHIRLPOOL 403de2590101bc30408750a7a4eb1bdd6effbc5e2cc5c0615feff34abea649d015e02c4e54ddbb3dc33864c160f516a5e1e526162bdd0176944b382e9a52f425
 DIST deblob-3.2 107602 SHA256 5db88405af6d51a77d84354afc3b2bdf673b1a5dcff37bb8db4ccbd12d91db20 SHA512 f34b7128adf716c908cbbbfefe72149fcd88b727d27edab43be65d4e6a55112b6d937d5c2bed86454d58781f3766ba4cc6db668cb6174a6039d276499da37cb4 WHIRLPOOL 0922457f7ca413c9d8115182964a7c051560799c4724452f81cb4c0383cf62c45b0364d6e639bd9d2b9000411d8773cabd2e8af99e8b0dc7f7bdc886db432d6d
-DIST deblob-check-3.13 612002 SHA256 55a9264ad886259c9b20f1365245a993482a0f593d01e1824eddb748bc57e271 SHA512 64d93694acc9dd1046e967b0d0f285068cc248815a3c84c58aa4cb3b6bbc3fdcda4bce3b119b44f522a9cb6cfc10a0992cb5d19f880c7d6055c5c0ed3201905c WHIRLPOOL 1b196a945f5f07c78eff5e8742472b0d8ff570c7e11e2cd3d4d954f8fbd260b27b2779f2d794a30992e4d492b873d5f73163501a0c04372e0167e98640d587c5
 DIST deblob-check-3.14 613747 SHA256 e1d5ced14e38fd415eb5a9a50e180cfdc63b2d0f0350a6d36645b82ef0351304 SHA512 f5901a7c41db34ea3c29e6c6f6fa1afacf4edca1cfad901599b982fd66b5ce3894aa9075b5d15b7a8a6c9694833752fb609d98889b5de39ab59aea7d024a740b WHIRLPOOL 5064bf7423a4703a976b4342da5b3cef65584ee701462e261398170b3e5189036327e114deb15a29ded79541dbe084fa86b08b8c293d4585614ac09f791d7f60
 DIST deblob-check-3.15 614485 SHA256 a594a31b5c0a7bc544d2c5158a16d4565de4e45b14f3fc309cfcf91bf46491e2 SHA512 f85e0d9ebf25b37fd9ae765cb2d5767ac475abc72d8b6bb5ed775f03efb216d53cfe1d86bd2945642274cd2c3ddd6ee0ded05019bde7bac71733c96b366cabb7 WHIRLPOOL 8e8e6cdd41313f61a7f9aa4630185f06e785ad951582165d0890596a3e59f8c703a658bf75a36359750eddb9a8b3edb86656860a88dc47b722329aff4cdbb7ef
 DIST deblob-check-3.2 423268 SHA256 9e67dd0885aa8ef356dbc15d487c8dea5a54f74c5b03a5d7946b65ee43f12638 SHA512 3abb9968ef4750fda90e4e2283981fd4691b7f9854244413b31d17bb60382a6d809fec929d8d3f9b52397dd9f9fa26783f4c3a25f3f4115b76ed585ea68e9916 WHIRLPOOL 891c3f809af470d680ae896c843c09612fb5124f2805e03d67b28ec4353bff0bc346ae9f680d900f0f63e681be86a0195f9baab7dcf3b5accfda739b106766fa
-DIST genpatches-3.13-13.base.tar.xz 284344 SHA256 b74916bf239655bb9fc368e10a3d9d62e6afe8878a9c5dc5f65f712823e80ba0 SHA512 861272348cd8743b6575826e34a01d8bc89cfb5249b24213bb49a0487490a3d240a215534e5b31142ccd98eed8c6c148d1a1b668bff2f070fa449f393346a8fa WHIRLPOOL f72bff2fb3caafe41aab882f17aeb7625c4b9920c5b01cf3a48946fdd20888ae9fe247dcc466cb8b6d7618f3db81a2efa783621bc85c8303cc363b32e154a3f0
 DIST genpatches-3.14-16.base.tar.xz 339044 SHA256 42fd8392ccc0473eb733b88e19cfb854db6aa4a8630a83ae442e296e52d5ad92 SHA512 25ae8369c415381b7aaefa57a5e365e08aafa8585ffac06d1a59525ba4605c7090c738959868928822dbcf379f47ca6e03231a59226b45beeed8adf1a03205b1 WHIRLPOOL e53be63616e542c2dd2a4765fa27403ef14cde3226173a7fe2d70edd2f2c864186c53d7879e13da6f9fe8ba30b2c95c1db97fe39ece5dd9f5d555f04ee60684d
-DIST genpatches-3.14-17.base.tar.xz 354008 SHA256 857ad9a4ba1512f18b1404255acb643a2e2e43fa78a06e07cf702dee868c1920 SHA512 3587e516c239dfac0e98942059eec04b3ca3ab12c5375b3e1144cff8462df1fbae74cfbb05c469b50d2a9bdfcf5cf0b960ce144c86092fda1d31f2e75ad7b687 WHIRLPOOL e29d6f9e58e59d0acc2dd389e8481bf13835d1509b85434c3e8758e211555387396de6809d8ae1a92b00b729a29726a03ca65785a440693f9001651396d3e737
-DIST genpatches-3.14-18.base.tar.xz 374116 SHA256 ebc2d8db2b3236250e2c8187f6d68be965e1d9987b4f37a2f8de8fd52dd0e0c1 SHA512 70a44ecc4d2643f47e5eadc59a27d7fd0c02a8513efe62f19255f4fc16b30d32134e6daba261422585ecaa630b9aa2fd176e33eddc4fa7efd64a71d4cd527643 WHIRLPOOL 688e9447773193a865d28f13bcc42563f384538acaeeffd4460c1efee9b77e50b98238d0f781b29addb17bfafefa73f40fe5e8199706998a1848a506c7a0fe0d
 DIST genpatches-3.14-19.base.tar.xz 380480 SHA256 cf2c3129968a8d88518cfc1ab294299acd6de5a02115a1a75633b7524b72c61c SHA512 fef278958c09a7c8d80fdebdb29c83146e91f429343e21f513759c86068bb10fddfdcd8c96efcb607764e41754151bf7edf1cae0de5661b5734d5a7241a0a1dc WHIRLPOOL 62ccb101caf86862a7d0fe37d907ad9d127a9b0a8bcb00fca48b474d6f1295ec9d15731857a801b530dfc08d9bff21b81d2016987c7b90007888df5358b722a6
-DIST genpatches-3.14-20.base.tar.xz 394304 SHA256 57604d7dd33a32060ee5f2250685de62cf88740ff26f2bbc91713f23ecd4543c SHA512 9b5588f75771acec85cd6d5c5a4548d6c409d2a8f18f350ae19d2218ec4eafe44b16466a83ffb162ad178b4dd7b6a6ec3845025ed7e0f728359b215d277e487f WHIRLPOOL 1597022623b3d4117cc939bef0d2adf76586d6710ab9f6487005a88ba5b093dda8134081da71ebb408c8bab18d1771f246809011a4f25941301619c42411aa9c
 DIST genpatches-3.14-21.base.tar.xz 408212 SHA256 1d53fab58d454bdf5c4f880c4d412ccebde0e2992c69efd2d5e5a520354bc4fe SHA512 993c43c989042fa4acfe22c31879a7272d6a4d4d5f2baadeaf6c300db7a7cd5be77dba0bef4e7ce87f0854605284e1eb029e153c4b43d5979f8218e7c3518d8c WHIRLPOOL 3142686b9d3445cb88bd4cab846e5acbad12e5deb9c9fb5e0875f870308077f182d0cb7fb49d9c4cce83c7d91202cd03fcc4d7500c24a6ffdf78cfc02f46c1eb
-DIST genpatches-3.14-8.base.tar.xz 150768 SHA256 bfc60e9af49bc0a8b9ddb6ef38050ec8d06539f83302063ac5d19c8ec606760d SHA512 1688742ff91a54500b05ebffdb15730623e7f7850f16ce56698e9cfc3bc1309c058d2d5d5c3590bd296345c300de2a1c43ab1ee2f1dd9c03d2f6d11784cbb495 WHIRLPOOL b97b90bbd08500d0977839a35cc722d27c0cbdb50ebd74f55ed652b37c9759d5409e4e50d2006eaef8f49fea39a2bdf442185bc3d6374192e9da8121f0a8227c
 DIST genpatches-3.15-10.base.tar.xz 189084 SHA256 634c7e8c2bf946979041b2b1547dee4b0ea25e4013a2335482b2194d718cdba5 SHA512 6c8ed9aede214b35704cae851882f52ce6e0769ddf88f946eb9ee506a9bcb94c267c57d0521bef75ae794b2957ca4d262d716840297bb2ec37b4dc0a35781c71 WHIRLPOOL 9648843018ba183bd7b752921720d3ec2bb8c11194f96b10d69624e120495a8cad94c33ce6dfc680ef95176ac79fb7294f42d890ed749b38744ab643fecb56f3
-DIST genpatches-3.15-11.base.tar.xz 204552 SHA256 b258eb058d17664cc119f0e3f510e133e7377de5032099547113e45b25386b2b SHA512 69bbc49607701c618043ed20295caf237426d947c8ab6a080de543894841f705189054367f3f97c2839a93e0ccb110446a83f01435afd43daa1e6272db746b44 WHIRLPOOL 416c37ce7f5097a9c7ca2518b7e3f2e00f084f3a5fe4732d5c08f18ff34c1125e7828e71b3558e96080b197d81885ffcb71c244e86893862f3ecb8a43dded2f1
 DIST genpatches-3.15-12.base.tar.xz 214792 SHA256 28f0f807f768d5e8819df4be70c74e8ec01ff8c1a4917a0908cf75b8e51825fd SHA512 0f3e9fab4531bc36820c4ee681e9da7ad1bf79859c822ee40f0285120515d4b18a3558f2ae9d8fd22e003492d9f8f6a38fcd8a5ea00984350340f5054b8e7ebe WHIRLPOOL dd5ec234e088d2a9e0fe6c74cc84275e2f532bb4783bd5100c79d15364c9d082029db73e3241aac5f82a106bd5fa88c637ff8eb2bedf33c44243c7bf590af1c0
 DIST genpatches-3.15-7.base.tar.xz 129444 SHA256 ac36954acce2fe6065ede5f82bf9d554469b26eff80a03ef7261cc3f2c30fa59 SHA512 eb1b8bf726ae7c019968d42e411aba203c6d17c04866a0ae4744b5df648de69b35f1d462606c6a474ad2153da9e8c6616da59e696a10c1c9b2aa5a418bc86dd0 WHIRLPOOL 83121ddfa40fc1aa59090f7b4d00b55cea06dd003e5839b821bcf9257569f6daa765e4e9b088448b5406dcc4c87e28b788bce3f23864eaef6b7620d8c222512d
-DIST genpatches-3.15-8.base.tar.xz 152608 SHA256 22a03917ed9bf8ae9eaa59e2f3bd8d0d892ff0a4dfebaf53d6be2c923889e946 SHA512 9495805021c2f269466f88c0c78d55878302eb8b2c477eb8d811b1ecb46f9f268b55edbd74d7bac15224eb7aec08d1fb7021e927bbf1e0b8ed06ce729e5ce3dc WHIRLPOOL e6e37b77879017424fa424125815144cd0407d04df756923bba5a3e75a79e482b917e17e73c1675d547f30fb6d5492599216216e5eff0e329fb8368e932e484d
-DIST genpatches-3.15-9.base.tar.xz 181112 SHA256 514dcd1b0901a84fb52e85b7536d14386e2ddca6657338807fddd12ca873beba SHA512 2e9818c38f9d42964fad853c801419026d456d8c21ae74f5c4642f092535bd7b2a244916a991fee7efdb88a3bf92ba1e2cc0568b7eb43982cdbb956e11d18d59 WHIRLPOOL 70d9dd22819b4a5a724684be1729e618bd25a1f6c0644e476c7675c6204b0fe659d73e574b6077428cbe073969acd368fd626cded8c16767adf19f6d88a0f019
 DIST genpatches-3.2-16.base.tar.xz 410332 SHA256 d3ad97b119c5b8cfd8e34f1cf118dc7d5bbe61fe908a5627f8ab6365517d7190 SHA512 6c917efbdd26dada3e68241c4d55833968e8ee7044ea7fa2edeffdd4d7eb0edac157057abb75da09ac6d2b5368d228ecd1c2ac6006a9d45b91dbb264eae33625 WHIRLPOOL 155a5b3297ec53a6bdb76e20c8c89d4f4c35ed2bb47e20281ce305bf9edd413e4d89168e250a699ace0561c151ef2f484c05e59013dbd971d43184c5f072a71a
 DIST genpatches-3.2-16.extras.tar.xz 16764 SHA256 c3f5adba6f1700c716354b91bc624115c6f5cae6f8fbdc51d07a76d4546bacaa SHA512 e3245c05f3385bb27852c00a39a898c91b3c0006e19c5db561f3e41f9bef7e97012ed29ddf9b0e2bd1ba1fa16590e516fb00ce754a84dd5c653c046b9f4e63f9 WHIRLPOOL 3c1ee6db88607ed91366067217d4a556fb5516ce8bee2859e97be7e214a05609e2d36ec27ec413154baa432a984f53cf69cfb94ae65ec4b8d2e9a86641d77a0b
-DIST hardened-patches-3.13.10-1.extras.tar.bz2 806948 SHA256 a3eb7bb199370da6139d70489b009e93b2539cd31bf4540d0d4c60f72925020f SHA512 991c190540981bcf34c62ae27ed241ceb41848d479b332c9b1de83b498b86df9bf0d264a6b6e0c252c3460ae3446baf3a92d635027aae5440126be0cfa5c2915 WHIRLPOOL c03fe49f18bf9c735fdb616619c7892d3dfd868f59d2032d58f549b85dce0dcb418a8b0b3fd3fb283ca9a7c348efe2a4d5fcef9cd04b26305dbe185dc4c2e21b
 DIST hardened-patches-3.14.12-3.extras.tar.bz2 823544 SHA256 a77cd6bec00c0d527deea6cdf636a62e20f52056d49ffa9e949a354783e66199 SHA512 4b18896851194750221a2e31cea18c3ed826c036a8953d51f17a64fd676e69be0ef2c6e7ca0f13aac0d43a81f8a454ccf92ec5d6472fe0b1867d077538a43767 WHIRLPOOL 482252f1bf192772696e86697f3b5df1ca319f5be6a40df3a4748064b2115d2e2ff33d2af2e069e1f0501551d65e739e7885d14d6d60614852edfe4cb1c738ae
-DIST hardened-patches-3.14.13-1.extras.tar.bz2 823885 SHA256 febb376021178ac81dd9b5086b2ba7005c133677e4213a932ca043fb0ce80950 SHA512 c8154b0d7c374272ef5868eac06627ada6d0cc69a5ca1fe8f3b9babebb4113c9ac7f9ddd3d3c3abcb44fb43280883dfc8d4c6f0cef17bd44910cc4734010b0c6 WHIRLPOOL 13f49f052d762e417bb6fa8049f9cb2176fb61d0e438da07be669ca4ea479084605fc615285ee4912dd104d0593f4d388487d51e24e2009072e25ef351208958
-DIST hardened-patches-3.14.14-1.extras.tar.bz2 822030 SHA256 c076d5cc9669c67d46d13baba85ce54f731c1aa907e6a41ca287f82192c3b054 SHA512 5b39c13a8b56206e7293dfcc659cfd1fcb068e32d79cabb39e3670f4a2004d1a2492f4c34de5800c86a3306b040693065104de885663cfd9f181a0c922483aa5 WHIRLPOOL 92dd649d260bbc7437807e8572022fbbb8e39e139cba9721e8d96b17d52686639d046e11afca6cba8442695a695da9c1073420e90beef956b5880b6e28d9329b
 DIST hardened-patches-3.14.15-1.extras.tar.bz2 825255 SHA256 30aa6cdc6ff55bc7a0869f52ec25cec10f34b1caef76a2386035dc1109cf4f38 SHA512 f9054e81608ffe6c115d61a091d0e0189b9d2b2c69b45aeb79f456fa9b0762b27078aadcb247445311f60cff6bfcdd945dd81417e26bbda99bc8537ceea4fe9c WHIRLPOOL 81e5b2e8de7bf36d8be6f8c587afa80a0277ca60cd155a4fb5d1429699604323cb9f2e5bb1a0afb0cf7ab19390e92a9403dd4340975f2890677fddbdc927f98a
-DIST hardened-patches-3.14.16-1.extras.tar.bz2 825608 SHA256 5be15a8f95c586bc0104480515b3fa9c265ef664499df993bb3bd179213eeb4e SHA512 b75bc8eac200fb87120d0c92ea22f0f86497d76e02393a5bf87bcfd5baa818f5b7d12fc8b3d5eab928603ec317b566268b641456467012a2c9e77ccf378304e6 WHIRLPOOL 62127503871ebc8298eeb42ca02808fdf826b3abbe730027db7e88b07ccc19990af2963c3e9db66e9c694d7d4a19f6e316331b51f3fe81161bfd456862f5b594
 DIST hardened-patches-3.14.17-2.extras.tar.bz2 818505 SHA256 31e805406120a7d1282e908afed60dbe0454cfb03c3c9c9b0691410917b491a5 SHA512 212769e39479087b888dde9e754c11f2b1382692815169d0437aa3bd75852a2b618efde423f9ac2cfec808c46100a47313bacb78e08ce914342268bd1ceb04f9 WHIRLPOOL 2e88eeb0f0d382d1d89db612f22922080dba24937a51f6273552a0ef946aa859a5ea52c8fc5c66a8ce2804b425dd18f48e2bb3c05501072183254f2ba318a265
-DIST hardened-patches-3.14.5-4.extras.tar.bz2 821438 SHA256 75ded742278c10071353bf62589413389ca1ee3db900441f946441959864b175 SHA512 832e52399b9265bca612291cef4f1a19b9db31ae3a1adb6d06f97ccf3878155113911287c06b379c14c5bf2974512d41de474ab379ab895a62c7231ab3480c06 WHIRLPOOL 5be37b567c482014de8e43aede3d192b5952965b0bd2cdf33afceb24555d511efaba498046ca2a3f8e822147b2d88d6086fca33721310078cb20ca416d657ff2
 DIST hardened-patches-3.15.10-2.extras.tar.bz2 816776 SHA256 649b7533d1275a21d189b29ce8cd9dc17338b759dae66366efbf1bae7affdf31 SHA512 79278eacbec8b1454387a229f599fa460db048e838dd6c43a1ee890fc2e52208c6266be9d4c9a6ca2170d6010ffc14b79e59d1b5aa5a01ec2eefba6f5554539f WHIRLPOOL 9eeefaafbaea703573df45ed74146f084af6f897d6b11934163ab10d4e68489f5fa7e3fe8bc6cf6e7caf6d5fb252d8baaf0325cfd7157da6f6cb1fd528f35de2
 DIST hardened-patches-3.15.5-3.extras.tar.bz2 818477 SHA256 560167f6edd63ac7af76973aaafa29d0ef8c2122c487a5f26aa9dd43d8ab7b8e SHA512 228df8ece81750c2d7c68e02cd2f8003f7d2270d0029099b89779a546b0435cdf309906c29b772a7c4f1d70d3a5b461df0513ffbda538ecc898994e0f32b2c50 WHIRLPOOL c8dfce8337a6005b47123ed9f0537284a10d8f5c5ec1700ff75bdbb7cbbc5ea28239b979bbc5d614e5d3fc3c7e632e62daf493f5909c679d2bf13018f1531307
-DIST hardened-patches-3.15.6-1.extras.tar.bz2 819906 SHA256 48fe84ca81419fb819b9c72586c3a9d42e9b23bc5eb86c9596bc375028063dd5 SHA512 7806c90332d0a0fb911b42d5d9a12af1acc1f6fb527e43feeba9aca4e541d544da223535a7507ce6b13702101a6c04b0d575050e53bfcd059eb31d0ca4543120 WHIRLPOOL e5b439671e4e07f7e22f23522bd019d4c112a6704ed4cf4e2703b27171ecfd22e5793779d233604f1b092d4b281af3dc30e8be44036053f900af89de9079a1e4
-DIST hardened-patches-3.15.7-1.extras.tar.bz2 817680 SHA256 9b3b1f6940779754d3eb6a15b40bca2ea91af786c0a28fc5de00937fc3d1ec6c SHA512 d37e7bb4f3d1128c484ada131ce1d3be78e4dd320e9d2b8dede61b9fd6febb34e60ed9556079af021b45362143a09af7e4a380b44f62d7f3c703b5fc87de3df9 WHIRLPOOL 027baa334b791dcb866e1435bae54e3708f3ef5c819a7292496d0a34bee59b3306370a97ea1e33816e8e4fb485fc9cba275947b852c126e69e1b2dab2d26ee1c
 DIST hardened-patches-3.15.8-1.extras.tar.bz2 821899 SHA256 a5ce9537ec1298820e777c967a01b4fce589c3e37983ca9b530a1f565e05ece6 SHA512 a01fcd95b30b4d06a2eca2a887766fb427cafa7783f996af73bb7d9b0561727d924159457d6b5f2ec794a9df1fbb3a2791a8950a8588af0b418cf70ddb6830aa WHIRLPOOL 1c25e65b85253493ad9adc5ec5eea1613eadd4f99d771a0247b70276dc3fdc89323199ec1da853259809e26a72e3dbe56b7709bc0637bcade9f04e1a75ed875b
-DIST hardened-patches-3.15.9-1.extras.tar.bz2 820899 SHA256 d7a035f473158ee6e45e2af1dd46061640fe0b69bb88ced6e83c97e5e2d19c38 SHA512 63fe757da9aa983b9d696fdd2bd14ddccbb3c4219586ed902befefa0d1fc4147de6ededb791468eb5d1adfc5f093ada26bab6cfb2266ee25fbadd6ed2d635a8f WHIRLPOOL 4d74a3fedf1b00f1c7f94ee83d098cbbb9f4fb82c9d97cc0fcbe75eb97fc34067b3cdc4d5c38c23e55406d739daf1488240e41809636a85e41ef6a16d5d0c3f5
-DIST hardened-patches-3.2.55-8.extras.tar.bz2 1798078 SHA256 d7ddc2b8984aa6cd57c5b188fefe60acae2f90ec3a6badbcda899bacd04dc0c2 SHA512 fbdae9dffc1d035a73fa7672734304b06d94e22407f37d9960b549cb6ce864546afb2a50a3f6da36b58eef2eb611d64ccd8e87ff0bb5e5118ecfe6171464331f WHIRLPOOL a1afae9d5b533c6a3c6d3ba2d72c344f17464e2077231f42aa3b2514412df0d6ba98227431fb0d7aa42e2c9e95e34550a74920c590b44a7188dd41ae67c1458d
-DIST hardened-patches-3.2.59-7.extras.tar.bz2 1906081 SHA256 dd3631c2bc027d689aeb7846f5e1430e51a9829f4dfc5c6d77ff2f1ec389aa3f SHA512 a09d1ff7eecac76f17a823b45ded69618fd354a3425472fe2dfb546028a6b7f537fd6e55063b62e51cfce97a334d0f51067c76fd8d6526ddffae711ee988b113 WHIRLPOOL 1b502546ce349a75b0916d41539a56607765985649809328fc396ebbb110e16c7f87379c0aae45a7962d2da4acf5b438b1c71151f3df4fc7872242d4a3dbcbbd
 DIST hardened-patches-3.2.61-3.extras.tar.bz2 1977203 SHA256 05ea23b56ab10d2405e6ca3a2626f66b006e4f44b3d58fd70bba8246f2f64e70 SHA512 0bf93ac2869285fd9e6a09fa4ebf2eb4452a2b1eb19c243c7b7a749bb0d3e367bce80fccbaf9ebccca605bb653195de575dd0534aae4caf673a5fa348a30fe65 WHIRLPOOL db3b1b808e78b5865efd86896777bd6131f3668c3749cd50fb85ca02f4d87b253a55f6c64ccb7b90eec4bea165458b81351ae5181f372c4eb980a7e64b70ebcd
-DIST hardened-patches-3.2.61-4.extras.tar.bz2 1974739 SHA256 568abe6176ea6345b37f2217426c0d7dc197b4d9dc9845ae4d7d15d01a89de1b SHA512 fcf3b8b9d2d9d301ed2493d6eedf9dcc02a385d511411b1db25ed5e63b3c771e05a8fda52c6025b478f47b193813ee8f0d73702a3fd44858e03459353d6f8e2c WHIRLPOOL 053f30b016abd6b137dd951cf577ab0b556bcc3406300e318ef66c4ff401f1e098eb49d8f5f5ada6871351d7215e35ac35764bb88a9073026063a5761197c1ef
-DIST hardened-patches-3.2.61-5.extras.tar.bz2 1973815 SHA256 fb64c84c65bbf24c02a0d22e18d9bf4826644fb1d8cfc0e3663611b49a9bbba8 SHA512 316fcad1af48dee84e0e768bd801366a44eb00f379fc446f3ce6ec540adc5ecc962999d403cf2ab021256bc80c347352e4eb4c9ecc2dbb027855632fe050b40e WHIRLPOOL 855d8280b250665047867e0f87845bbb153fac67ab5d69f40b65bcc072832a7513dcb690cc8bc87785625b4a5c0c8d36cadca1c599bc48aa64b6bf899954b541
 DIST hardened-patches-3.2.61-6.extras.tar.bz2 1979554 SHA256 21f0d36821edfd21395d95cc4eb6a191396d5c801b67d4c23c854c3252644bf9 SHA512 051cd727e91906790a873ed4e2a1f5e1bfc7b4aa07adbce39b4af63d1418994b4b7476ab8e3a6fae2e162bac6ae909f86e894e201c1a74edf50408e908a26e92 WHIRLPOOL 863acafe49ee222b1991e4bd7aee4a0e8633ccd77bfd550d6d481964f5e322900393f5dfe64ce9dc86819e7e1237b4e794208b47e202903fe6bebfa2c4ae106d
 DIST hardened-patches-3.2.62-2.extras.tar.bz2 1999227 SHA256 c157586de4d94d5e7c710c9a9427a171b7225ed93b5587aab678f32761feaf04 SHA512 9206d66df4f218c9a36b2be11333f11da395774443264b1f8bfd3e5ed4693be694e51468d29b1cfa20db956ea759199df483e56d9d2b65b6f3d886ffdf3c2660 WHIRLPOOL 6892ec3ed7455f5e572fc35a0a9f6110be99d51da359a837cbe707af8a0985d577876d1893362bfb1e2e14c3bdc30c7f46ed3ac80c752ba99121027c60f64923
-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
 DIST linux-3.15.tar.xz 79676484 SHA256 c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794 SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02 WHIRLPOOL 7f3dfde1a23aab75b7f40770ae2ca77c1b28f845e4abe6296b2aec9b56fe94f7afa76b00eb6cc7475305c31b726ebeb4643107dd48c12ac04c933cf1856b8e77
 DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
-EBUILD hardened-sources-3.13.10.ebuild 1403 SHA256 18f47f428a32642a06f7bc2e0226dc1adf1dc60f76cf0866e854cc28d93983c1 SHA512 958faa7648846fb72d40f9e89492d5e38ad5ab9ea4a8f26c63cfc55e1dc91effdcaffffe241d8abb8ae7a74275953d74e803c1a01b0d5266ec08b418dfedd4f0 WHIRLPOOL 59f4503e2c3dbc7eeb931caeb6cbc995ab8df40be83b52c4cce0d7ddfecb8e77f59801f6f221be36f2c67554439a507b36270f98e60acd99c576ecd4dd4f7a6d
 EBUILD hardened-sources-3.14.12-r2.ebuild 1406 SHA256 56afb78f817f47210166813bc3f7acf78ca367e679b98c0836a2fef716d23690 SHA512 de4e300dc559e161348044e7bcfb065ca3c5fc69e37823efc139d3f1bbadae4e13b6bb5a2f162b944127173b03d81a9ee07dfb21eda33470d063050a8cef7b74 WHIRLPOOL 9bb112deca70e20648fdc2bce5c503295dad1650d8ea1b3670eb008fd3bbe0bc8e5d75b8168f6d971097d558c97eb7d510c14f0727e7f9cca4140a89df90ddec
-EBUILD hardened-sources-3.14.13.ebuild 1405 SHA256 dee75ffdca400de52de54a23773ee84e0ac7e23d8054e66c52e2573296da006c SHA512 8139be12383d8402c72f16411af787a00944529996117182df05ec94d74a01cbd1b8ee902c4afaa59ff779b6b6c1812e7d2c5d9c3950b330ce1b7cad005e4fda WHIRLPOOL 8487f5075b1e85b7e1797ddbe53e7c92cfa434a29a92ef9330a955f3b5ab97fdb94653b6c36eba7853219d7d1f2452a240c9117309aff9616b49a316d5380575
-EBUILD hardened-sources-3.14.14.ebuild 1405 SHA256 5669725d3ec4640a5439a466de8627ffe028752112bae3a917251234e1d73e24 SHA512 95fe7a7d3afd37f82a7a3209ce48a97ba77ac341d8c6445c77e9604e5895a239d3ff1f3e380c7299f7f2862423cb32529160cf23cf73436aef0d83d6aa30eb35 WHIRLPOOL 8d3173c2c928623141b42ccdb333570ad3f376fb149f68bb679c3b09f571da8e992fe9240be7298b7b047f506916af3a7770c639bcdca739f46700f22eace465
-EBUILD hardened-sources-3.14.15.ebuild 1405 SHA256 cc8eb4520d15ac630d78f6d78f1c73cb606b9941b0bdc4de4dc12c1d05ed2a18 SHA512 948bd12c2e8cdda8baf24763c63ef4695a372516797c8f9dbf7c5aeb631415a357ef9cccc410cb0f3b5344f557d2b7428ed94b6ad10348212c83ec7a7e169df7 WHIRLPOOL 441d4d3ae643f203d0260894d36b50300f2321c3018dc8175dcc58464b9d232f17b0e68909a9dcc06d5bc2e3cdb1f638f513b7e6bd9cdcb25f61d1003e50b021
-EBUILD hardened-sources-3.14.16.ebuild 1405 SHA256 445a7511afe4e7e8a93e232ffcd6d0ea39f76de82e74e033635ccc57f2ed4cc7 SHA512 57451fac3e2e81d6eef1381d0753665991bfda251642951b5a47b67b28c11183cb151f9a07d0e88ac939bab3f431545aa1f78cd82bf033b7a60cc7e24bc61add WHIRLPOOL 421df09e3b48a757ba2f0e71826a207784a6a525947d4c7eb31aee017c427f6a18e0c0df1790a92da95d25eb2228f527e2847b32cd3271dbd1cd480658a28beb
+EBUILD hardened-sources-3.14.15.ebuild 1403 SHA256 969070c3db326cd68cf4863a0d934abafa56eb409255f1a3f4753d94ebfd22a4 SHA512 cdb0815e77c0e4f893acd0fbcb8847a62117a41ac907c6a8cb256241e908cc4d324c57ea4837830eea2d9a694142f0ab7a24a7e00db6c4f986196a18fc1e3a4a WHIRLPOOL 5f5be58ea2110688c2cc114cd97990501cf51a57cecd7305777c410168742dd842e9ec955f219d1c03726b651e586f7a9bbfdbee55349e3c2e4ebbd7f1c0cc03
 EBUILD hardened-sources-3.14.17-r1.ebuild 1408 SHA256 3845a872bd1552cc4e8b5cfd88399099323640ff9353c05fc2edb42e653a9fde SHA512 a62207e3c8b353c83eeaf660303d699c2a56256d99d501043dc1fc37cc085d061dab1b471c0eafe7c49a7bfdf864a4338d83720cd8caa6d33615488e561dcc16 WHIRLPOOL 6a0f67f63d9275b377a4c17e31834adc65a218e74c03888d45500b354e7b290dc30e3387e01ac33f4fac0a75a6e5e03b43067e2d0ab5b4138ed815c36ac48205
-EBUILD hardened-sources-3.14.5-r2.ebuild 1404 SHA256 ba2ecd4b1d3e5c49ccc88a540cc1d702c625c082dad0e2d9a4f627090bd0d86c SHA512 391566e1879975f78c97fea62715ef12efeaff6f7e536ef61c5dc90c2789a763826c30587a409d86d44673296e20f4102516e7ae6839bb012ff31010c1e72bff WHIRLPOOL 1095fe01ac3cfc76a57497b912bf5bf743007381aafb1108ffbee3632d9ac3fe33ef5872b510562db5e21eb07b6d26add260249cf4efe43bf31e8815dda191ec
 EBUILD hardened-sources-3.15.10-r1.ebuild 1408 SHA256 109e1f551d4a53fbb1808601ea761d7af2bb38b77a9c938d53ca4e7295d9f9ef SHA512 b8387babfef9ac1e1faaca573ef6029790562761772895996ed4868569f0bb07fa17adba56f8f558758382e5ba2f6c7b01bdafe322b24e859b3d9db910b962f2 WHIRLPOOL fded31f789881e65c802049aa9e2ad057a6b962989ef007d95d79f7df6db3197fbf74907de16c087a037c53f1c72d5e3d5dbec5ff76e10aa30ce40ad04deb2f6
 EBUILD hardened-sources-3.15.5-r2.ebuild 1404 SHA256 e124e81e5137de958e1dbc8b748ed5a88102dd2eb44e20d515780ef9ae5a6e6c SHA512 4aa158ee042f934dfc7b38c04c7710d45244c49bf0c24602e1ff48d7bacf94bf8bf524507aeb7321a1ff5d048efa745cfba6147cb1a752c042769d0f7404b0d9 WHIRLPOOL 6596055772f6cd0c7e09e09565cd5866b74eceea7746a495d7e57965ff3dec1e3403ebf5a366562022b5b5f1e5e7f933240dc1d470b00e26786a1211f75a1fb8
-EBUILD hardened-sources-3.15.6.ebuild 1403 SHA256 a40ec068bb1c58427ca628e13863efd5922c9a957379748fd611353b571b89ec SHA512 8a04486ba7d733eb8c02055df4024c82984eabc3f78c5b838868fde942b4a5b54e82898e0246e0b3925be0fb8fe714e33ef02a93a3f0f84b475970fc96cade02 WHIRLPOOL 564358346a66aca3179277d346ea71ea75e0689cc07113fd171067c7d458d5a413197a219eb0afb0ad21bb6017c85f445e156a3b35556a0e2b90c75f9fd060fb
-EBUILD hardened-sources-3.15.7.ebuild 1403 SHA256 337db8315ec79c85dc1bd8d8d5dcad23ed977648259fc414dd69f5614b63036a SHA512 56d1cb3041e76b24f2ad9b73a8a86c96f70153e6300b4ef32232f8136617d1d18997f966eb21bc749880f9cefbba5b9ea9af00eae41917de88223cc470721b45 WHIRLPOOL 163d8700fe2b68cfe658d322b72ffc8fca9b7b4712b1295e95ba7d3e50e7b5aeece430a14248eb299df52b99e97d0b392eadaf1acad26e717469efca66f1bb33
-EBUILD hardened-sources-3.15.8.ebuild 1404 SHA256 511eff0f26fc8f4bb8d2acaa8fa1ea07054e9995ad8e1ccc729532f70b96be06 SHA512 ce882f4a6b0e821c4f48f6ba1509e75bd14095d5f96c2b779eb8a1c189f7a876cdef22a21f08d162dff0ece7087bd71cb659f5e705c15ac63ba85750c9418e6c WHIRLPOOL a45ea1802ca33e1c3abc95556ca3f77e7719180757f43b6e22eb707420c0e564f7d746cea91b9cc3788ac059e2546d503ebea809ab1b786d0a8665018f6a7786
-EBUILD hardened-sources-3.15.9.ebuild 1404 SHA256 5f2d450495af5c76455665e340330da28e9b2ff240036b04d9fc9eb7cf6fe123 SHA512 8d2b52547853d7fe8d25e9998f4264f14e2621144603de1da0f7f143ef30c5e3334ced455137a059f69e81bd81e29deebe0cacdbda242acb9a956c9d6dafd4b8 WHIRLPOOL 0a60cff105e3026b54f62edb8b6127b779a4c3a05ce872b2450a9a984baf0b85ed506d5598f7994084a9f229c7e244499f133d5660db0888ee25d48a57024b8c
-EBUILD hardened-sources-3.2.55-r7.ebuild 1373 SHA256 54ad969183bd1a51b66b3e4197dd24659949630142c45a9d63790c7f6efdf313 SHA512 885c73436af9476e706fa4fca7e08fb59e3b1b70a2f16227a3c53e2988d61dbb469baba59e57cc0c8d4b9bece114e574b480c6c220f3233fec451dfe8399583f WHIRLPOOL b392a5f23d2de68feaf994df8765ed2b8289b79a519bd24d809fc2b81f4bbf29d169ca16dc018897c3ca1ba116e9da503a8611dc996cd7077adcfd759b3e406f
-EBUILD hardened-sources-3.2.59-r5.ebuild 1373 SHA256 5c6fc5f141d7865deb37093bb986e528a164f82693658dc3a4ee59a21ca499e3 SHA512 8fb8e9df93388c2c644207c225a1fc72baddd4ab3512c25332897ca1c13d1839f2aa5c6b8cc5e0ca66587f263db04c2de7c7ebad986b737889d2eacde468179a WHIRLPOOL b4ee0bb2035275c540cbdc0b91fedc7de3391d74bd46b499a4e0b95243bb3f6ecc8dd7ed37ef63912c995663e0b6a145049a462c06028b52aee4132481646c88
+EBUILD hardened-sources-3.15.8.ebuild 1402 SHA256 d540d0d7c4dfb9ba7ba0d5c5446b527a67db1aca1ed1497201194771dda6fc6f SHA512 c07318350557625670c8978a000f1dc8cbd3a149adcee3c430110dd98b788ae4002e6d6b0bd1fdd3a2a4956ac1aa4515a64a8195684af562908b4941e2d6c801 WHIRLPOOL 93f1681f2d03ad0b6a4a05affc9ef25c416264e1130dffceb47ea98d243458dc9f9b22a75ea002f74f3f42e841d5007edf1ffbb81b30d5a7e72452b141dcbf3e
 EBUILD hardened-sources-3.2.61-r2.ebuild 1373 SHA256 5ce43391d05b4bbbfa7fc484c917720438be89c04264441265663a64a0b54994 SHA512 a2c977c5b00328ebba3890a156ee824fcd769f3a3607903565c73eee914fea4004f74b4e3b5660a0e7051da3eaee3a20dc2a0c433ce4c7ceb850cc198bb83484 WHIRLPOOL 4a59eba274cf88af90fbb3a3e059e1b9154b917b2be80c840a2501e69f0d1f56c91c8ae4dc512ce49e547539411de2afc893da7f62337ed032988eb2b6fb4aa9
-EBUILD hardened-sources-3.2.61-r3.ebuild 1375 SHA256 3b7972e7601d8b0dec8af8760086412623e707483523717a71e728731a1b0c3f SHA512 9d64265df51a371a306430436416f7179c6f8853fb22800ddf90cb36c8a6ef20ae0cd6223d8644269d6d1af9eebcda1d9a1b84a8996efe6845b30bfbc30d3961 WHIRLPOOL a23627f64a2f33d15f0f4dfcdf47311f5a86eeb3b977871297c5aca87f28992ab16d806ec32bbc744dc11a4d5d16ffae33cb2d0a5fe4897dc38e3f64a7e611eb
-EBUILD hardened-sources-3.2.61-r4.ebuild 1375 SHA256 6e3430e005cbb7def5c1467c4113d021527a8e2c71607ed0efd629dd4e737623 SHA512 d278e3480cc4b1fbf4affeb97b573ce17c22f593da329166348934b313a69f60cd0b3b037a87d98b164d221fdbfb27bd1d628cb0aac71debd90ec26b0b402c68 WHIRLPOOL a47bbec2c256489eb94e467d3cba3589f7be0a5a0088bbbdef2e06c1b1251222e52daa1392e79061b15a62bec97328921219a4a68a308bb0716dc42d727fb8c7
-EBUILD hardened-sources-3.2.61-r5.ebuild 1375 SHA256 41a7b546345d5608a6ed1ac85dd6950344acfb07c214c82ad0f15eb5bbfcda3b SHA512 71787d18c68a8d73d2ccff37a112332c73a612771ab055aac5d02052b6a67c5478f599d3e6db3376238b7ded0d64f3f92396c8c161759ff0355c465c6bff398d WHIRLPOOL a5fedb3aa952f87023e7be876499cd668f39ef1b80c03e385b3e57c9d4c1f7ad7d70c8d8918df6c96745871c563b0d2242b2b5e16e00588190f1bdaa3c588f71
+EBUILD hardened-sources-3.2.61-r5.ebuild 1373 SHA256 92807196bc36ad9af7d70fb318ca7866e5e3f8fae92dd042ddd3fe051aefae88 SHA512 d64158987c1fce0f28b24753ad5ec5a550ec32cb556099aaa0beaedae496cf1bfb1b45e30eb97e5f4e9f195141a492e1ab09990fe3fd7b9dc785fc1d3c49886f WHIRLPOOL dfb4443f255dd50a2a086041153ce11a0eec48e0ffd31edd6630f45e8bc1fdbfb255b96049517dc940f435c639fb9a4a6f76e588383aa25d28123d67572b6f38
 EBUILD hardened-sources-3.2.62-r1.ebuild 1375 SHA256 aacff108bb7cb8f57be591bb5fa3f1bfb45e408ea9c9d90002b61ef6c952b51a SHA512 a2f956359565d84500edbb1a0d2b024c60ce75a05097e3aa5b2add7a9765f8763ab7e1e8c409325dcdbe661823e1d6de1e11217090adca68f6dbd093cfe803aa WHIRLPOOL 0da848757e42dffd0cf18f959ebe9e0e603f3d60e85cc106633483aa602b613460ac51f3987aa38af056c88b3f998bae8c3a7154b603d85ee926aedb14ae6b13
-MISC ChangeLog 33272 SHA256 2757f26177ca3616b70f3db674b2cb0cf1eb0ea2d8b43f70d15b01ebb72501e5 SHA512 4c56385774197a8717a3c50c1190e370724fec14437ec56d7071ed9deb8b2e7fb94702ef570a07688eb2bf3ce9db03d8499f76d7e25465fb570fc09a9f439b7e WHIRLPOOL c09bd946ca8a769355c84808ceae38c9009aa23f8f0207abb88c7655b9e7498f38118f53239c68ab54dc6152d78fd398d4b4e977e1a6560cb31da5cabf8f4287
+MISC ChangeLog 33907 SHA256 6b26cd58a6b279b0e0cccabaadfef8eb77a009c95991d2d6f42dacc3e9009413 SHA512 2810da7d3b0cfc37e6c1add790d50a137a69d1f98e64d4213b79ab3c15fa52d3da43e9b4e8643661031e5ce1304814dc921dc1b7bd276ef9c50684fb6bcdfacd WHIRLPOOL c6ad63b2de777409190ec0116672b1b78d8f7ad7b6443d8e316bc8727ac610ec9e8673d7e4d156e183cb4c2e66ff5d0a9868856b0b4d692ca48d316a9da4d552
 MISC ChangeLog-2011 112069 SHA256 39bac69a08709be5b79c6e711fd94aac7e53191b76fef64f9b3d09f7b5ac0f82 SHA512 3d66e844a3f619a530e7ff236cbbb095bf9150e1542048268646468afe09d1fb20da3ea8dfa4b80812f35f9eeed1e399a115ceb573cce43f34f1c30c0ff67ee5 WHIRLPOOL c55f94fc4655b77b9db447c8f315af698e5c180496f9a333e22aa16c57c172e26bf9dbb0a70d7319c1a54943bce4756d11679f3c3435cb90bf427a64e49ded34
 MISC ChangeLog-2013 103203 SHA256 cfb8a9a5ca8cbc986810b1f82bdc05240105e74c249216e766e8a130df09bb6a SHA512 15b230e910293e7d142906c22327bb24eb4d7214f94bd7058de1d21e91eb24bde9727a968749858558e214a1af48a590e56621f09a26b31f1cc7cea91498dc48 WHIRLPOOL 187f4b375446d2a30ed504cd71ddc7698c99e693e656b4db79a67736a2339a9fe890b601f479f351a31ce3803937009cf8d5eaeaa19a3d1d8b52edbf2c40287a
 MISC metadata.xml 576 SHA256 53e0d3bfb958bcbf62457a89abe76a7a6f5a2b1df5decb04bf8b840184cc5828 SHA512 aabb8324fc608a74fecda5e4fff0f29d47d34ff20bdea2af8a69726772268d7b3b9d2639cd9c2308b3c79b89d9e923d2a96b212e7cfe59a0bf0008e3fb1c7e6a WHIRLPOOL 11fc891bd478667fe4ca5d203b366fdcf1680dac31bf997ea7c707c6f00a1c03b6ca7a00045b75dc1604e9eb57c2cab03a12f46318320ed6abdb5d6feb06b71f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT9fTPAAoJEJOE+m71LUu6DfEQALXNASnFWH7XdywztuKIFsvP
-G8e6NGRzYhixt306MCqpG8BeGs1DLrFhNr4IFqykdY64wlTDOgTqR/Hh2Ewo9QCm
-H4+RIPfd4g2PHnPVIWR0maDgd3kEKg3plajBIDe20jvKjNMzzEqGVTUbctl+CHxM
-t6ILIbjulgouFAPSKWaMGp68dFUHLKIFhlyU4e2FaNAmzOBWczyoiPa919tk7Y1+
-AL2qZ/BCQNoV3O3iyhAKkU7PgqJfXCZc0Wm6TnNvaJxBTZ5TdRrFhZYSW4N1mD8T
-b8RgSCDT+zQCxRL8R2S7tWfmVGYnESXt+80puj56ngANuPPAvN2QxNuads+tNaGL
-wk56kavP8dP6bSwXV774Vn549gCkoyPVDzeq0W4tmcep2WOPu+vLZnl8VGCTEDHv
-8XO3wjhRBtySwwA1Spy0iVIQcqzy+ns5CMNsFhR23NJ4sqQa4rQTx/BM/EEj/RN8
-VqOQYSMHXQiiIEqrWpSokzjzmDlrosjYMRzmufsiGoMLfciVc7lrWS2CY2GA8ChQ
-204i100qzve7dyZnN1lzS4MiHdkZ8zOBmI8JpHZbEl/7LmlkIsQu0PBys1aGgPiz
-9dJT6YUGQjUQRVmvMADgGcLuDDeRdPQNAN+Yj8R/fkKilJK11rkDKXMHbbgSzyMm
-laZpIVGzY5Qc2sDUra2z
-=UmSa
+iQIcBAEBCAAGBQJT9yglAAoJEJOE+m71LUu6sZIP/iRu2hqqQM0xRcHdUt8rJMqE
+9XPE0QJXtnjdG26Nq9tCFXuATcrjIsBB2mn6apKhMKprH3ohJNEbFCelzWjhfanE
+WbJsLMVU9zB7G4QRL+XElXBFvca03RpEN6qIHUAZYkjHRdWZFrCBro+chYkOCKfN
+zvoo95x9nhj1w7LjiU5TVIX5wdEyQgLx/OOu4429lB7Qg6ZR654+bF6EB0xbt5aM
+Gx9wKuMrZflGeINGKWv56zWL4E+JT10I0lB/b3gYW0/iIgSKvTluo/RSDqKhCJFM
+3M94HE5EM06lO5+RrpH7hsxOfmf9SPPZPAXnt2sxWx9xLV/fRkZYmDFYYfgn8xhy
+QJ8ASVAZ/d6NBqLmTdv1hDnveXN/v3TZXWf5T3+OPXf3QFcEXZ8Hwso6mc3JgLIw
+SPJrP37UBu/dzwZJ65B+VzU/fXn8GO5JoFvMVVmGS+HPvlHvYgMwa7ZOMc8ecDht
+qAXAIsqhk4yfdQw5xvEs47WcLnzsIBdqC9auIKO708p6Cj1rgzY2PSb6b/7TjTQ6
+Si7UGHJiqBAw/8W9HZVoAg84S1mXnqidt3RGvYTa4Alb+WALb9ShYn0DQJbFy88D
+OanLu3vY7LyxqevCmS6DSCkVVyAhTdserPwTRkClBgw1Aupo+SL3oghwEt9jwEQx
+Z0YmvLlLx91G5eP3WJdo
+=c25G
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.13.10.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.13.10.ebuild
deleted file mode 100644
index cc4c9661d382..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.13.10.ebuild
+++ /dev/null
@@ -1,45 +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/hardened-sources/hardened-sources-3.13.10.ebuild,v 1.4 2014/05/10 23:58:36 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="13"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.14.13.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.13.ebuild
deleted file mode 100644
index e7eea4f8d6bb..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.14.13.ebuild
+++ /dev/null
@@ -1,45 +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/hardened-sources/hardened-sources-3.14.13.ebuild,v 1.1 2014/07/25 20:26:19 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="17"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.14.14.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.14.ebuild
deleted file mode 100644
index 655ba527b27d..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.14.14.ebuild
+++ /dev/null
@@ -1,45 +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/hardened-sources/hardened-sources-3.14.14.ebuild,v 1.1 2014/07/30 14:33:25 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="18"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.14.15.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.15.ebuild
index 245169103b84..1b9cd131793a 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.14.15.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.14.15.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-kernel/hardened-sources/hardened-sources-3.14.15.ebuild,v 1.1 2014/08/05 11:55:34 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.14.15.ebuild,v 1.2 2014/08/22 11:20:44 blueness Exp $
 
 EAPI="5"
 
@@ -25,7 +25,7 @@ DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=sys-devel/gcc-4.5"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.14.16.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.16.ebuild
deleted file mode 100644
index 2daa6ec71708..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.14.16.ebuild
+++ /dev/null
@@ -1,45 +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/hardened-sources/hardened-sources-3.14.16.ebuild,v 1.1 2014/08/12 01:02:47 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="20"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.14.5-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.5-r2.ebuild
deleted file mode 100644
index 61acc8f0f671..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.14.5-r2.ebuild
+++ /dev/null
@@ -1,45 +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/hardened-sources/hardened-sources-3.14.5-r2.ebuild,v 1.2 2014/06/10 10:49:13 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="8"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-4"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.15.6.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.15.6.ebuild
deleted file mode 100644
index 98fa9ea20a3a..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.15.6.ebuild
+++ /dev/null
@@ -1,45 +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/hardened-sources/hardened-sources-3.15.6.ebuild,v 1.1 2014/07/25 20:27:59 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="8"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.15.7.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.15.7.ebuild
deleted file mode 100644
index bab6249221a1..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.15.7.ebuild
+++ /dev/null
@@ -1,45 +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/hardened-sources/hardened-sources-3.15.7.ebuild,v 1.1 2014/07/30 14:35:26 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="9"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.15.8.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.15.8.ebuild
index cc0c2e1f4238..0bf307b0b8fe 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.15.8.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.15.8.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-kernel/hardened-sources/hardened-sources-3.15.8.ebuild,v 1.1 2014/08/05 11:57:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.15.8.ebuild,v 1.2 2014/08/22 11:20:44 blueness Exp $
 
 EAPI="5"
 
@@ -25,7 +25,7 @@ DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=sys-devel/gcc-4.5"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.15.9.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.15.9.ebuild
deleted file mode 100644
index 1c8aa29c9bd8..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.15.9.ebuild
+++ /dev/null
@@ -1,45 +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/hardened-sources/hardened-sources-3.15.9.ebuild,v 1.1 2014/08/12 01:04:28 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="11"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.55-r7.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.55-r7.ebuild
deleted file mode 100644
index 8f00aca4fa02..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.55-r7.ebuild
+++ /dev/null
@@ -1,43 +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/hardened-sources/hardened-sources-3.2.55-r7.ebuild,v 1.2 2014/04/08 12:48:15 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-8"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.59-r5.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.59-r5.ebuild
deleted file mode 100644
index db23c3ebf2e7..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.59-r5.ebuild
+++ /dev/null
@@ -1,43 +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/hardened-sources/hardened-sources-3.2.59-r5.ebuild,v 1.2 2014/06/10 10:49:13 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-7"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.61-r3.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.61-r3.ebuild
deleted file mode 100644
index 5aa24cf17ca3..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.61-r3.ebuild
+++ /dev/null
@@ -1,43 +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/hardened-sources/hardened-sources-3.2.61-r3.ebuild,v 1.1 2014/07/25 20:22:54 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-4"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.61-r4.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.61-r4.ebuild
deleted file mode 100644
index 233ad2501be1..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.61-r4.ebuild
+++ /dev/null
@@ -1,43 +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/hardened-sources/hardened-sources-3.2.61-r4.ebuild,v 1.1 2014/07/30 14:31:24 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-5"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.61-r5.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.61-r5.ebuild
index be4146b4281e..301a63aaccb2 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.61-r5.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.2.61-r5.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-kernel/hardened-sources/hardened-sources-3.2.61-r5.ebuild,v 1.1 2014/08/05 11:53:41 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.61-r5.ebuild,v 1.2 2014/08/22 11:20:44 blueness Exp $
 
 EAPI="5"
 
@@ -23,7 +23,7 @@ DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=sys-devel/gcc-4.5"
 
diff --git a/sys-kernel/rt-sources/ChangeLog b/sys-kernel/rt-sources/ChangeLog
index f05b8dd57d63..b0945421e955 100644
--- a/sys-kernel/rt-sources/ChangeLog
+++ b/sys-kernel/rt-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/rt-sources
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rt-sources/ChangeLog,v 1.26 2013/08/19 12:09:31 psomas Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rt-sources/ChangeLog,v 1.28 2014/08/22 11:39:58 psomas Exp $
+
+  22 Aug 2014; <psomas@gentoo.org> -rt-sources-3.4.57_p72.ebuild,
+  -rt-sources-3.8.13_p15.ebuild:
+  Remove old ebuilds
+
+*rt-sources-3.14.12_p9 (22 Aug 2014)
+
+  22 Aug 2014; <psomas@gentoo.org> +rt-sources-3.14.12_p9.ebuild:
+  Version bump
 
 *rt-sources-3.10.6_p3 (19 Aug 2013)
 *rt-sources-3.8.13_p15 (19 Aug 2013)
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 599df48d111e..137230732efb 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -2,29 +2,23 @@
 Hash: SHA256
 
 DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9
-DIST deblob-3.4 109026 SHA256 2fca296bccfa7dc25447f36975971597f67730168a9bc4db0853e55347950680 SHA512 7e6263e265dba957e966b76366566c5b318322c33ec60c9f268af1a375271cd1c1232749902832554f93451225bf61c967f314a48c2890984974d30a984d2e01 WHIRLPOOL f3d8d76078b4a372277926d1d4f3d449968acd64e57a5fbe8fc1c3057e8a9893ba1d580418598089977bb808d9a351de04181dd7f73395e99b306ba8d4886160
-DIST deblob-3.8 113867 SHA256 883e8f003cabd9168659b4a6c2549bf22f64b8dc7ca9ff106335cfdff23b890c SHA512 acdaecb5a371489f8d0c2cea4776584eb4a76db0ea5dafc363881f2c5bbccd212d98429c2a559e697f0485329d51f1c01ba2f6c82ec703ad6bca9b8d9097a452 WHIRLPOOL 40c723ad41434aef0d30ee5e0ebcd5476778c70bf82043241522ea389a3d5a66a5cd0480722f019daf3eba97a0f30eade1741af0979be956644cfb3e24ee90bc
+DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c
 DIST deblob-check-3.10 565672 SHA256 748df2cf5c1f012f9942948827e57b12bb05c569cae220416b3c0339520d9855 SHA512 341ea8a755c4f1f42ddbc4e7dfe8d786e8b29f497bee3fd72154c8c1c0bcadcb9efff04f2663090bd8741e5b5baafed26a62b9d16c31f3b31665cd3cd3e779d5 WHIRLPOOL 7e6c8eefa9b44e7d50011a9390baf7999533b4016122992c0ac0722cce05dbb8e4b7e96f1f05e9bfdd2ce3e4c08f0e06c8955b68ed8c044ff75f3a314a405824
-DIST deblob-check-3.4 448778 SHA256 28ce952c082e765784f9e5b63f5a3a4fb93545e5e788dc94d094c0b3ae8ea3a0 SHA512 f8f47a0adcc1b9a16c155d89d72d91a02d47bdbb3ac3a353be3873dc868fa44451367b7bb3906817d1ca8f51b64c99ce381d2fa3121582b70c7c2efb18dfc579 WHIRLPOOL 37d219204e15e0c81ac43faed93f7a5051735c474efb2b5167117cd463fbe81167267b756e8ce546447a30ad5bac651c943401ed98ec61713e20af89aa4fb957
-DIST deblob-check-3.8 539625 SHA256 df1f7ebc09f93ec51c0d3755b5454adcdd271e428573014d13f58638760863a2 SHA512 1c27b2df8aedd93da153d8dade37384e59862dac2eab948802744fb1c5cdc7d141cb2d971bbc448e723f15c14f1646a1cc695f20e64150b26dc26746601d1d17 WHIRLPOOL a1354cfcad7d40e8e811882f2715a71f36bb18c99c6c5277b18aef7f738c41bbf5c7099735b6de4a37b22868dbf96a5405d0b21c16a5709d70a1d0b082a57594
+DIST deblob-check-3.14 613747 SHA256 e1d5ced14e38fd415eb5a9a50e180cfdc63b2d0f0350a6d36645b82ef0351304 SHA512 f5901a7c41db34ea3c29e6c6f6fa1afacf4edca1cfad901599b982fd66b5ce3894aa9075b5d15b7a8a6c9694833752fb609d98889b5de39ab59aea7d024a740b WHIRLPOOL 5064bf7423a4703a976b4342da5b3cef65584ee701462e261398170b3e5189036327e114deb15a29ded79541dbe084fa86b08b8c293d4585614ac09f791d7f60
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
-DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 SHA512 1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c WHIRLPOOL a36e62fe197ba7c08d498a79034da58091a94348f69542241067c9ebef683f86371b2c0a3b3fb6c4611e2fb885d9b74eee5c1f46a493c72dfb76c5665f0b8a6a
-DIST linux-3.8.tar.xz 70989468 SHA256 e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b SHA512 10a7983391af907d8aec72bdb096d1cabd4911985715e9ea13d35ff09095c035db15d4ab08b92eda7c10026cc27348cb9728c212335f7fcdcda7c610856ec30f WHIRLPOOL 0c633854ad9c06df1b1d832aea9bbef76144ba88c8fccf6a3f8729101dc36838bcda6ccd444451cab19177608e7f7866f4f79cff1a8ef2bd0c893933d7f1f44c
+DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
 DIST patch-3.10.6-rt3.patch.xz 140584 SHA256 b3c8f3757e4a0b4010e3d3320358dc04b873881dcaef8330bffd133c51815b09 SHA512 63097ab7ff11b5b795fd4398101f207baf71c8d5a1930d9c8e89b2c0864e0fed7d57874d7fb614618f68a4685acb6f9317ca13f74446c9a868c1327d518f0285 WHIRLPOOL d60c61f244ed9762427b3b0970b334437fb601a07faf77a54c4d016c0b27b7098cf1b57bcbbcc0940b32007f337294d80d1a7c45d4ce7b1e31e0047649e778c6
 DIST patch-3.10.6.xz 151356 SHA256 e17be1ccd6b904d70e3be2b61c16bd4346272c86b5ee1a12ab8d80dcdc7b1487 SHA512 9e0cc15f3613fc523f3a58a3eaca4aa135aaea2abfc4ba50db4923bb470d41e4f49192b967c9c489e81d0764f6712e9217b026e4e5f1472cf644bf0bcbe438fa WHIRLPOOL 7779ab4dbb4a39b04eeee70ac93ad03b5a8a76aaef49038e30f523f628bda71b54dfcf18b8a1241b333a5619acce33cdcdf10edbf4521061f37d7c9e6084361d
-DIST patch-3.4.57-rt72.patch.xz 130536 SHA256 89d904253658a135a1da87c39aa380723e704899916813ee0007bb95974e27ed SHA512 2a7d2e88a8e73714bf7e7ae08fcdef0f5b9c4ad2f974fa88b6bd3d293e59cb2b80aaf016e68c8b490aa9a1739720d3cd95dbb11ff3e3ca163914290ea0462552 WHIRLPOOL bbe0acbf94a26d59be6382d35391a3a07a3c261673216f3dda95d1cffb8c52fac56edb0e4719ddf87cb32ed37f966a421930cf0cd17cbf43a40a245b0f3773c8
-DIST patch-3.4.57.xz 727660 SHA256 8e7e75ae628864fe77eecee81753eeb6768a21fa5698ca559f740de16d9cd102 SHA512 e794aee74c954cba5557489432092829e9ce1ace53d90fd0c84033b5101c88d2c027ac7ea20c8d02d5ee1cd2e0b1f2a9bc7b6be1f005dc217f9509b5e4df7632 WHIRLPOOL 59fe10e3b036d5bb056798807c2d6adf0056f7384d4f80e3e7448cacf537f2f1ecfb6f3636948c4ba1dbe48a0c0b02684f30ec6df697dd8bb7d4501ecb7f36c6
-DIST patch-3.8.13-rt15.patch.xz 158044 SHA256 a61b23f3e795534b53ba0a099c816b3e6091fbb3f95aea957366edc2bf305d18 SHA512 71b5a7e8fb8d1153d201b3b7714bcaeba243a1bf750f582a386214b7aa9f054b6552fe424b7cafa7dd35083fbb52f7957aad38d4cd67ad0abce3e71c4ad32abb WHIRLPOOL 5496e00f263d6e0a0e1aae1e13b4da9137e4fc99f0712286c8e522fc0dd73d00055854099437c788855a9ed6669de3506fe0fa2c761e3f7ce9982fa709c031d8
-DIST patch-3.8.13.xz 285296 SHA256 abc523f59e4c7a4c8ccadd7fd3cd03b7ae8788b399040a1c949c4232601cfd5b SHA512 baa9ff60b1b43f5d496afbd75bcab5d58590c574eea2ddb96c35c6451aed4893685db24ccda2b69e8bb247d053db1d5926944125a9614fa4c62e83b2be91ff8d WHIRLPOOL 7b67a06f49301c37b3cfd460d4e449d7d55ac9620d9b6ddc52f6a9eddfe98710a9bd81e1b0c4f52dff9d64a7141d694672110cf10970858a63931207f70170f9
+DIST patch-3.14.12-rt9.patch.xz 138436 SHA256 aedc16bf897b0a1b0789158afad9ffed92be30eaedf8fe2f27cad659673dc93e SHA512 99c2d460863af6c5fbd39c953e7afdb6ed0af403d097c5ea74f9101be867a42f348e2f59db5cbf3a0c01f7b4e25c75e6bb349f940c80a492632d5630de810a23 WHIRLPOOL 47148973b1051f7a4e8b7313db21830dc52a6fe1cb4fa7e441e2eff18cb3e270c8a671fdc7f59ea92a947a85bae2e71e4291c332fdbe3f63e184814129fd5500
+DIST patch-3.14.12.xz 324672 SHA256 b50d9569bc2e47f3be996fdbcb043e7eace9c92cbcb77d825dd1493f2d399475 SHA512 d5be9e74c530f1b48fd7fb38c91d375fe60c1d71e165b0cd7a39f49e7b79c0261c8170607e6fd67ef154273601fb5a8f078ee6deb1f973c180e39762634126bf WHIRLPOOL 15e2de869ead61583fa5c8509d07e2377dbfe9c7bf66ad5198d97cbb2008ef8f20c636664b3e345285f5948ce98fe26a5f292adc51af22ba903a508556b55c28
 EBUILD rt-sources-3.10.6_p3.ebuild 1411 SHA256 ffe483d41b4627b84218da85d99ab4749d6e4d0c3eb03d59f2c47f494dc91d3c SHA512 28a816b317cfc7d9b72b395431d1a61a0ebf6e2085b6b305f6b6b7b8f37abacf4d720b17a85a354f1e5aa3955494a0cae886ddaea3b2b583ea04220a2e7dbcfd WHIRLPOOL 38379a07f8a698a1bead99e363fd7b8e3c8c7903e1886712ed2d029b38454ec71e91b09a1b5c725ff6ec850739aac6d22de340d8dbeb2cff4c20e1c7a558adfa
-EBUILD rt-sources-3.4.57_p72.ebuild 1418 SHA256 3d947c003f02c2981afc05906a036dfa43a6189aa469095895c91ec00f2aa0c2 SHA512 e3927f52053a9e1fed1402d1c0f0189c91c3270f493164acdb9cce825517bc974552ad485ad942847b38e7a71a7a95bb84a124225c44cf23f6753aa6a750ed5a WHIRLPOOL 0fd0980bfdf1c90531692270ca3a50211d306c5cf92d436fd1d3258b6bf64412f14495e803128de59b25478c1527bc1b6649d08e621d3e9efbad0683f5cc51e9
-EBUILD rt-sources-3.8.13_p15.ebuild 1412 SHA256 2b47a8d600ae394f2864ab4b0d94888ca396f3472b8d26b823dcd129bbc884b9 SHA512 4ba06e68110bd24653089de3ca09f861aee811d3338035d8ad0f17e12995e1b0a495de75901db5f052e3e4b4c8f16908c42ab1cdccaa38270ab8a9ede22a5971 WHIRLPOOL 4ba628218213c874e2ebb38eb1a1779dd9d0cba59aaa2df961104c0d9391441e40cabcd86bfbae94c4c6ef91d78c77ce84b7b3c807351181d24cf90397afebec
-MISC ChangeLog 4597 SHA256 88f72c654259aa98dd7c50e606103e2d6aa875cdf20f49aea0d4ed7300702fef SHA512 a3e4027bf0c5d51ae7ac6128997dea50a5af0c3ecf2ddb053f09c6e9e705554fe24e3510077de47b607db1f50c87b1cab2ed0d64e6d80d68a863a3d55d796f37 WHIRLPOOL 45cac482d798c1ec1c79cd15f1e6c7cb6973ec131dd7b10ad8875afc8de81994694f49e037ec84d376aebbb780d856c5653a5c782cbf851c96bad9ee95423449
+EBUILD rt-sources-3.14.12_p9.ebuild 1412 SHA256 7610cf217dcc8b977249b35038ee1bfb662e1582cf9ea439830ca424455f619a SHA512 9716ef0beddceb3f9bf6ffa9f832e12e61a31e2d75b1c16a4d31c7ddff4b8a5807bf77cc3d8f5fb986504ea067e5ed1dc1e2f918c19ec5b5fdeae0f59738b5ef WHIRLPOOL 5b6d369cf8c1aded5c77cf15af9e3686860ab1d7986e2feb209d14e781a29f960715b540b90afac61bed962c1ac85a793fe7459ccc887de476eb13be0216140b
+MISC ChangeLog 4838 SHA256 4f05fb9ef92e9359be3280af24560fe1718f6d8928505db0fb3e04884c05038b SHA512 ae4bc065b4aefee5421fa29fd09dd4882c2179110c3cc7e082f6fbf5bd573cebbab9c89bc34c5dd239c6bde29980441e43dedfe3953c97aca26caf296cc67ee8 WHIRLPOOL 0a0ce55b13ec615b4c7f72a919c34fa366e0bf0b6ea1892364a6e0df638a75284d4712396d01c239c5d4543cd8c2a773f5bd17c606e1c36125c06ce4a5e7cf19
 MISC metadata.xml 662 SHA256 3fb8f6407713f9a2662a531b584a84ccea35e657aed210b8ed047b7a66f09da6 SHA512 71013f58e3c63678d4da044ea6728205d9142ae81de6dc6be9363449db5a090c825b42a6a6cd7c612738aaa7238a9cf34a75aefc745e77c70a9c5389d7133570 WHIRLPOOL d286dd4b965cfe8a820be51c59c5c45de35968848b22a704a327aafece37f3a450f06de458b9fa5f011161206df30ac2b115b6b5dcd0b2269461b8c241483752
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlISCwIACgkQucywv7w11zf+4wCeIeI7Z6me0cZR8OWyBDTLGc2A
-9ZkAnjxveKq5VfzbJi2o4I0BTmeuSg8H
-=b2MK
+iEYEAREIAAYFAlP3LBIACgkQucywv7w11zeFWgCgm0bWG/xSHmAvTaNC67lh5+5X
+CYEAn0S3c3vl3kW1LB7avIoah0xMKKJ1
+=2Lms
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/rt-sources/rt-sources-3.8.13_p15.ebuild b/sys-kernel/rt-sources/rt-sources-3.14.12_p9.ebuild
similarity index 92%
rename from sys-kernel/rt-sources/rt-sources-3.8.13_p15.ebuild
rename to sys-kernel/rt-sources/rt-sources-3.14.12_p9.ebuild
index 1b5b9763a529..75d46406538d 100644
--- a/sys-kernel/rt-sources/rt-sources-3.8.13_p15.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-3.14.12_p9.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/sys-kernel/rt-sources/rt-sources-3.8.13_p15.ebuild,v 1.1 2013/08/19 12:09:31 psomas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rt-sources/rt-sources-3.14.12_p9.ebuild,v 1.1 2014/08/22 11:38:12 psomas Exp $
 
 EAPI="5"
 ETYPE="sources"
diff --git a/sys-kernel/rt-sources/rt-sources-3.4.57_p72.ebuild b/sys-kernel/rt-sources/rt-sources-3.4.57_p72.ebuild
deleted file mode 100644
index 2f9a8d8767ca..000000000000
--- a/sys-kernel/rt-sources/rt-sources-3.4.57_p72.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rt-sources/rt-sources-3.4.57_p72.ebuild,v 1.1 2013/08/19 12:09:31 psomas Exp $
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64"
-
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/projects/rt/"
-
-inherit versionator
-
-CKV="$(get_version_component_range 1-3)"
-K_SECURITY_UNSUPPORTED="yes"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-        mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-pkg_postinst(){
-
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 6306a114af6e..7d6cea2a7c27 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # 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.1120 2014/08/19 17:38:11 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1121 2014/08/22 07:06:01 phajdan.jr Exp $
+
+  22 Aug 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-37.0.2062.68.ebuild, chromium-38.0.2125.0.ebuild:
+  Depend on >=gnome-base/libgnome-keyring-3.12, bug #520078 by Yuriy Rusinov.
 
 *chromium-38.0.2125.0 (19 Aug 2014)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 136bbec8444e..04be02b6ba29 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -48,26 +48,26 @@ DIST chromium-38.0.2121.3-lite.tar.xz 229671460 SHA256 cc949dfc901c187be7005d8e6
 DIST chromium-38.0.2125.0-lite.tar.xz 240854272 SHA256 8e7c6828daa42d871661835a64e7f7555a0fb4eb408bf88eaa5f5b7b232ac8b9 SHA512 bbc60eb03654947bf4fe01e4323e44d2c63a47ae93993fef4fd2d12abcf100852d6df128dc55fb775a34fbab3f3fe95bd212b8e47cae574efebb5b76f38bf5c4 WHIRLPOOL f4e173703c83c1af5b7f723f8b4ae1b25a023eb131c5ef43aca01a7cc84f19b02082e83fa9e26aff806c48bdb3cc2ab784c78915748c84d043cd6f265fbeae1c
 EBUILD chromium-36.0.1985.143.ebuild 20024 SHA256 1263170531138f9902dbd7cd19fe72981faa6340f249a23df06b16b7178a88b5 SHA512 f2301d5b4ea84ea099321da425ac12cfe64981cd60b363102c19a73782cfff54b8967cbb7201e5f788de3a4a7c4dd40459063827e3c134d19368cc4fee7db286 WHIRLPOOL 25acced43e55f7bd48b1750f8f218e180bd4dde31d639cfd3b300bf90d9e83cd583d9b7957af5dd3e1b5150a5f6fbd559cf21a69e590645cb25f35ed5c18d697
 EBUILD chromium-37.0.2062.58.ebuild 17702 SHA256 53ae7801b55bf637c69512e1191d73486326b2cf0dfb4aff249cbb5cf033591d SHA512 e9e9985fe9fddf4ebc6f5c312fee4d7915dd52d16060faaf5199e0b156d017410290f4d1bd41e39f1a2e1be490865d3a38804389c62f8a507adf021dab063dcc WHIRLPOOL 9147dfcd2c8a97c7b9fdb2c23eae4a7369eda5189d557a8c99dc7c85a3da4dcb230e139d1b88d30252ce6eb9a6651d70f0cd8fc56f207d0974ddd2d954ea66fb
-EBUILD chromium-37.0.2062.68.ebuild 17702 SHA256 396066ae3faf329f27d4e433797164b07ed5cddc75fadce3101001d6af0a04c6 SHA512 39c59a84062ae4e8f2bcb27ab78bbe2c66f53679b1df19df92ebde9f7cf3228c0696f424b7a8784daab9d5bb2f3d02a59df74f500b9131c1ba567992b233b445 WHIRLPOOL f2d807dfa0b1ba959967d8a9d99a711bb7bafa8edc0c16263f82f1a84fcf0ca6b7269dddc91ae497e3c657c3740e6ee2597114f464ea6e7a3454b86b61bd881e
+EBUILD chromium-37.0.2062.68.ebuild 17712 SHA256 28c3684becc192b9752b1740d456883d7aaa36ac1c2a3a9a598edec3280f5164 SHA512 a6a34b713381a9b4be6b7f71f64c0c6a76e93e0aff9af0051ae4f77498d1d2630cc88c63564c543a64f34a3e60a2d00c6512e5ad7daa194c1040efff585f7985 WHIRLPOOL 34d21c277bf7207bfe9272bf35be6487f5eaa5bf79d5a087a5e56f55d1c4d72c4c52583fb59f25982bd88f3cb4aea8c5b3299c2f09e49d7a94f7bc2daa57c530
 EBUILD chromium-38.0.2121.3.ebuild 17647 SHA256 671704d7223cb56a0668cc0781d1bab3d883be8554f9dce8480acb157c398d99 SHA512 1e4174c457d01fa4daf909b664c7bf086ad40060b2fbaf3f02e43941793263af0a0efb7c1c3ca767d0bc8c121111b69f1e035d6a80b1d1afd02d0bf1b40226f2 WHIRLPOOL 92a7be1f857ecf7c9d7eb320810958de2d16a0e83b00ba3802a39c65dc1224f516667798a829938f9aa01fde89fcdb550f555bfc47e15a2492d43e9a0ec94e46
-EBUILD chromium-38.0.2125.0.ebuild 18282 SHA256 0ed13e0704e518e4efd02eb93cbc6c9cf08875102d7f7cd94a42b911e343b9ff SHA512 33f0d97d002396efe4b664edd03a0bcb088f8f55a547219e9f92c1c44b74e5c0f61720c8479902bc7f57268fb8ab96bdcc439118da2719cee982757b58000eec WHIRLPOOL 9767cff3ad365cfe2117db912dd44f146f1257969550291f02d96c84ddd267792fc4239e8b688e583f8ee629c3bc89c11f25665ef9192d3974ca2aefb2a14aa9
-MISC ChangeLog 113185 SHA256 c4bc9446f80b4ce43038454cde39456d1de2bc1660f3fbc11e66085a5a190a8b SHA512 d55fc4b3bd3cabe357f9d57d839093778a2ea673ea4359fed826a191bb57a4b5d4dc8415bcf88e76dd746f696c6b98089183bd9fd71cb3366dc0ccb209241789 WHIRLPOOL f89b703ae0514a65e27f439936396cf3ed3a608ea46e11abc77a841326e566443e37d6d8d6ff6cbbd57f8a825b3c43e7aa6f6c7d71664bbc63bf7a87a4f093aa
+EBUILD chromium-38.0.2125.0.ebuild 18289 SHA256 c3f626f4ecee6dc96b191a7fe70e375cf01a8459a104d833a1b64b87082a09c0 SHA512 9562dfb85d48146e7ae63ec9615e8be1c8db7dca69b7e25fcb1ec4ac976197fde84721eb6c2248fbc5610d525883e68b219b438e0c0fb3227cfa18eec3edaf82 WHIRLPOOL 75c50af5d2679a6b5993db16dd38aa222ab4be91ec74a6edd412e91f27480fa4ab02de9c49370a5518306d0848043ba46b628d19eb0aabb1b1aeed529e242f1b
+MISC ChangeLog 113380 SHA256 8b8c95a9216904d08ae5589839abfe2c3d0bbff931fd192a922f395dc9bbf64f SHA512 2b105418a6e9a1e4eb3eba568477bc1e8a4cdb347f28c411d6ece68b974b20d2f859056734236793f37a98009290de29b69cee8861efee80132bd1bbceba0eca WHIRLPOOL 98fae52ab725f70643c0dc092a9311ebed3945f47f80ab5cfb4a6e137ffa605ac1b71659de2bd7bca3f0905dbb82afd5fad25d780b08133991b258ad406cf6fa
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 518 SHA256 821944f32fcf203b2573c164aeaa52fbc69e5f651d366cdda66901633461f5ef SHA512 01d29c4ce93a8a624fc8926e7e72e8bf124b91ae6fdbf6e7179e9d6ddd6db33d73acde62541777118da1c9d197c83d6c615c247d785e76a8ab560f915abd08d5 WHIRLPOOL f9b21a0d032d1f78b6aeb78f759b9f126b1b1cc118a5edd3a08eefcb2d7b51ff406abb95323fe05b4c04468aca68dddd3d39ce7edfb9b352abc1bc3890d7e1ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT84uLAAoJEE8aJVXqcZkdfhoP/00/KS+x63ZFbMpjjXbJWI24
-3dVztoBoHPZt17VRtf8Xq2Zg2U47ZlPooBOsUrlfSx0fAL6bJ7JuY3/Za+x5G32k
-jz9FskptSpK37Q9GXwXlchUrjg/z5/cqiSj/nusmMPjw9tMb0Z8E5uJfWMIeSD65
-oJBBW+gcxggoR42B098bCTkpU3mXS+DDdceg/PPySAtvjRlV0cUkGdWR/xgMs2Pn
-8pzOXOs4SGtq21ClP5Pa4TGg/Pmp6qALzFNL/scf5SHIJjjCOwYy5pmJI3WGUoUH
-URPdr1UugDx0eDLRjWHnbLCdf3jd+CJGG2VOaI85f0HeRClOW9Out8pH6Mlr/bsQ
-IS695unKWEQyrRUlK/H+e3x5fYA/TOdSBBUixWPCRN4KQ5E9C6AM/ArYx8yhvvNY
-ItRl9EJtJ5prIt9/hRpjD9nneh9ZNVCuq5ZcGo54y+UvDKJiquwnGrlpzAVSmqko
-VapPKLuq9wiOn2aBZZzeqgq6LktWTFNe6T5Z3GLV1cEhDZBFE6Q9R44AhlhDXppe
-uKncP7Pup37FJO3NSUfD8scTyeuQDB6zuwbMtKZa+xuLZ6toRl9LtT917Oadw/+R
-4Jc8va3UoMEV1sB/0owVEWliFyOIbhECkf992ocBarXp2FYOlFcOA3DCYtdjE7Ah
-UnSke6ub34KzErL9MtZp
-=F87a
+iQIcBAEBCAAGBQJT9uvjAAoJEE8aJVXqcZkdkakQALtPpjvCqQBWdCyZpXqK6WXx
+aDm8WM0e+GsELpZqzGTsLO7UlDlbtKuJUivnuKp5Nfih81a7MlfG6llm6383ayCS
+DKU/sv6HqpLyRW6KVXLH9zugIrKTLbh0n2UacM/GAMiIzSB2Nq375NGFCKNwqNbs
+Hsh4Rm0HUcjF+LG7p4X425mguVMkL5TYoFV8fxaNsWs83LanHqX/3q0a7n2aSbfw
+Lbq1noqLynIjuSnanRpA618Ebdvt3xJjbtvkk3oCu0Y/N0JCi873O/iKDTFzaN/4
+5Xk2t5ii8BzqkC0VP+YyauXf7LvRs5R9SostP7MdkIdtBJyuIhUfmy4RqYPYg4Xz
+IRyqv3mxdVErJp0u54J1xsQptbj14hrWnRIn5ZpFrVMDVZTdzkBprIvmGSvq8ODx
+GkH8ofJVy2lsLrZCfklaSymtt1djZF9hVl6/+xhoZdg0vNDfBySO6vU79CdgJqxM
+nhEU9hZ2DhG7nsuOuo3mw4Nc80Q3GMpTDWptVmZ+7IBAhFT68kdol9hJHALPG7X6
+s9Sra7ACaj/X3MQoQ1pdeU6GU9Shu37AgNbJgtuBdcHUd0ZjlCUJqSFqEgU+jLi5
+ULShOSWXCzQdlmJfJLlQ4Zco7cnnkE55py5OONDpWoy0CERLCXr4AnenQbze3SHE
+I5pH7U0GTlGWhbC34j1D
+=/OAA
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-37.0.2062.68.ebuild b/www-client/chromium/chromium-37.0.2062.68.ebuild
index 821366cfc8d5..0ab5d9ed4818 100644
--- a/www-client/chromium/chromium-37.0.2062.68.ebuild
+++ b/www-client/chromium/chromium-37.0.2062.68.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-37.0.2062.68.ebuild,v 1.1 2014/08/08 03:01:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2062.68.ebuild,v 1.2 2014/08/22 07:06:01 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -47,7 +47,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	>=dev-libs/nss-3.14.3:=
 	dev-libs/re2:=
 	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( gnome-base/libgnome-keyring:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
 	>=media-libs/alsa-lib-1.0.19:=
 	media-libs/flac:=
 	media-libs/fontconfig:=
diff --git a/www-client/chromium/chromium-38.0.2125.0.ebuild b/www-client/chromium/chromium-38.0.2125.0.ebuild
index 2b865404b6eb..2a3270772c69 100644
--- a/www-client/chromium/chromium-38.0.2125.0.ebuild
+++ b/www-client/chromium/chromium-38.0.2125.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/www-client/chromium/chromium-38.0.2125.0.ebuild,v 1.1 2014/08/19 17:38:11 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-38.0.2125.0.ebuild,v 1.2 2014/08/22 07:06:01 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -47,7 +47,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	>=dev-libs/nss-3.14.3:=
 	dev-libs/re2:=
 	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( gnome-base/libgnome-keyring:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
 	>=media-libs/alsa-lib-1.0.19:=
 	media-libs/flac:=
 	media-libs/fontconfig:=
diff --git a/x11-misc/grsync/ChangeLog b/x11-misc/grsync/ChangeLog
index ffb1faf44913..501b78d62104 100644
--- a/x11-misc/grsync/ChangeLog
+++ b/x11-misc/grsync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/grsync
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/grsync/ChangeLog,v 1.35 2014/08/18 19:17:19 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/grsync/ChangeLog,v 1.36 2014/08/22 07:52:33 voyageur Exp $
+
+*grsync-1.2.5 (22 Aug 2014)
+
+  22 Aug 2014; Bernard Cafarelli <voyageur@gentoo.org> -grsync-1.2.1.ebuild,
+  -grsync-1.2.2.ebuild, -grsync-1.2.3.ebuild, +grsync-1.2.5.ebuild:
+  Version bump, drop some old versions
 
   18 Aug 2014; Christopher Reffett <2011creffett@gentoo.org>
   -grsync-1.1.1.ebuild:
diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest
index 3b8f8e6f3e0e..f1c2cbb918f9 100644
--- a/x11-misc/grsync/Manifest
+++ b/x11-misc/grsync/Manifest
@@ -1,10 +1,16 @@
-DIST grsync-1.2.1.tar.gz 299857 SHA256 4ecddd34f62ccac6d6ce9b17467f017b7a5230fde0767e6e8ad46471e8d71567 SHA512 a81f06a1b572bcf5872121e51dd2cbdc14cf27237ad836491ca9e191c6b1e0c0fd309273b2f0101c1e52dc60a7df73c982e11180ede63167787311b25c3893bb WHIRLPOOL b05373b957aa0354813bc2f1d351c53a01f7efa1593431a8fb927e3ceadf76f4652f99d6a1172ad080c4c0b5d9ff6fb092f9abe9919818c4280a137243e331a3
-DIST grsync-1.2.2.tar.gz 306519 SHA256 127522720fe96e57a0fa4c024a2b26a31de4cac75c3381cd7973876d416582fd SHA512 6d43545bf29f160c27f95a6b5bcd2fd8ec6b09c891ae64c308ca812731f1bc9f5b30c2e4a841161a318acc7cb1db543f7f5944d62f521d565b66c46071fb4071 WHIRLPOOL 71b3355ab48b227bf554b8c7c4d743d1f2b7155526aa4b38c8dfdab3369dafed8b04327dc2eeb4ceb9fb996990563cd0bd8fd1566e706b3545a49eac06a8acac
-DIST grsync-1.2.3.tar.gz 306590 SHA256 953000037750ca40e93406d47bbd02189175d57ec6a4a9d1a76fb512f5e2ee9d SHA512 743ff9c17a123efd85397e7e9dd3b763970132b90ee2d2de0163032dc7b5e0f9288d9ce2b27fa96ef9b746c8886647b179799ef477202f7198b078d004552f8a WHIRLPOOL 1ad19c8a30c11c8f40d1137684004dbd8074c8773aa36923d1ddeb25a999440080bd32c6d974c16d919dba8566deff855203ae980da0e12f2ab8372e568a92da
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST grsync-1.2.4.tar.gz 311561 SHA256 5e74819a9188a5f722b8a692d8df0bc011c3ff1f1e8e4bbd8e5989b76e46c370 SHA512 303541eb89a279f05bc63975d28c4d197fbb852da316bdad4a294abd41caebf7bf6d1fcb33988fe03fdd04176b6a98eeb9e9a89caf01adcc2b0a60001f78270f WHIRLPOOL bd776a939a5f7d7baa107d7f4b3aa598fa61bab56a9d2db8e3fa08acdee9ee26c3f5e81e170d7aa830d890b1e02f82d60ce37c1d6c850cc4194c4a4748785ce1
-EBUILD grsync-1.2.1.ebuild 622 SHA256 c4d6f505e377442a08184cddedb98ddf54ac581456d95b77a02948489c91ce60 SHA512 8039f224c7ff04863ec1a85f5e3f2288f7d1e02fc657bc828024279624043f6a94292750c878dfeded1a1f9ddaaede4501bed50ebcc67ae728662944f7fa82ca WHIRLPOOL 9caaa4a2c0541d29c24f78a93093905d1857362ee4e6f178f6936f17d27f3aab29c55df88ecd2b5568cba935867504cf0cd01a714b45684c0e566272ba2a84a7
-EBUILD grsync-1.2.2.ebuild 624 SHA256 3bf3508928b2542a2de4d3d13ce94e74394e567a37e66765a9e51fca4b0e1b63 SHA512 06aae989fb5137ca703af3219636759a18d6a0cccff0a46b91b024ad393eb604c568a62bb0a2658d2351640809d3f726c2e183a3a435986afe6640e10ccfce9e WHIRLPOOL 575f122966fb4857f437cc6eacbadda3c30c0826312855a7d4fd5b64717a5d58ac07fc384933fb44d1d064faaabe943c95d933ed8395174ee18757e32dbe5331
-EBUILD grsync-1.2.3.ebuild 623 SHA256 631665b2a918738f50eed4c02364143aba67bb36d6d2dd0f1d451bff7319721e SHA512 0bf416c92cd17562e2efe8bddad20f2e8928956f72933362503608ab28ee4005ab302b52b6ea479453cc580841e3068e109d5ca4a6c588ab2048cb2663e9b6be WHIRLPOOL 5e765118ff7e765174ac4586a7aa9fd2c08acf70b85d5b027cdc603961ec196d816612e43d0fde091b4f78b8811a6d95d9a01b8937bc1b26b37463a109069611
+DIST grsync-1.2.5.tar.gz 324655 SHA256 4f1443154f7c85ca7b0e93d5fea438e2709776005e7cfc97da89f4899b1c12e5 SHA512 68000d729d8c15ac439fb8b66df80892c8df3acf8497635836b3be585ba3028a95d158afe6ca63976f8d893af2da209b567e1ff61a6e008dd16e498d83882e9f WHIRLPOOL 08a0935168ae570327cd5763307fbcadf48730984b08d4ad4dc1a66d5734c265d6c316969005b8afe9facc5487750ceeca25556fc53b48aed7079f7348b90323
 EBUILD grsync-1.2.4.ebuild 618 SHA256 c834b3abf986ffd7b9a5f356adf1caf8df3e9d5767213ae5c12029f87380cfbc SHA512 b5d7b9a5def3a4526d1f2fad063fa735f68b75b59013966d9d35d8db28c2d4193d7755d27323217cfea52c2ab0417ec7654fd265f6d1ee876eeea05fbc5d7652 WHIRLPOOL 9c7337a745b8040fb0b348ebbb2b3431c48d708f6cb911e0c8d46f58f8297c3535d4527b333fdda3d8d3109322aea90a5d6a7f6251a87aadc814e224f8eb116e
-MISC ChangeLog 5081 SHA256 1a69ea531fac4e55aaba41d2a61334f15215c1a9ba9d7c072e7eeb2f1b603cf4 SHA512 a0c978b5fec161238d9a9c3b7728b2b6927ade9f164d0ed09733cad5f92d30ab727c63f163ae2008ca1887135ba938e6d08f301178069574652aa964cf6d4e44 WHIRLPOOL f817f908e0868bac33184c41e46a253a12988290869fb32eca9e015b43221dbf3e9514770e29e042e49925ce55c063d93dab51956233e68dfa9399038b3e5d7b
+EBUILD grsync-1.2.5.ebuild 623 SHA256 ecb61b932385cdeb7a8bfdd604e2a33a5f75d2d6d5e4f4ee655335fc0bc57f7b SHA512 dc63b460cf6652ae9eaa60e995827b730fe65667e87d3618f64f766292deeea56656ca9756b127d4cb503c9dd695318c91606ff7265e1fdc65add8cdfdfe71f3 WHIRLPOOL 022907332a08957582b1d7c7f09bf53fdc46fa3339a5f148fc3e851dffc979292b5f4e9cbea28907c147ca1b1ad58e68a797d2d0d4f9df12d95fedc805057196
+MISC ChangeLog 5295 SHA256 47deefcb4d2f293f86e96b8a887cf3f2b2fb5b4f99fa40fe38ba0ae7ab77487f SHA512 b8fd609dcea814eeada5eab9fbc1b2d07e72841997a8c0b887f4678599a1facf983ccf2d5cbad6863d2f06fc988ee89936c122e25af429bbcd80aee35b16dfe7 WHIRLPOOL b483880e016683e633a3c76c275c2ec1458a9abb3dd4166f7d993dc5147bd4fea82274cc3135e997a60c695f60168a8b540fe36c8bbd60b581c1f4a9206770d6
 MISC metadata.xml 244 SHA256 36b08c765e981dba26b747c7d09a95d974abf52f10b5ca25cd9873ae7cb8ff83 SHA512 b8f45404359e2d30772590b7fba1fa9df95415b5c16b5c19ae68323b8e8b7a6f83c758591ee40852cd6d6420ac6ff3b222b758992303fbce43d29467bd2f1067 WHIRLPOOL 0a13fb78cf37342d5963cdd2dad357767c6b4b71b8a07c731742817a26c76c9fe749f2837d2b1dbef4ad017e1b1c8614974a09a2c8dbc3dc7bc3323b7cdb9fe7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlP29tAACgkQFYEBGcdFJfKi1wD/SEmk0k8wlGl2qIPAF1MLGOWl
+G653tdD+D6Qn6DSM+ioA/iB79eqAASbwWkNOlr9Jq7D+oi1GnCIyMobp/YQWnQt1
+=ytQs
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/grsync/grsync-1.2.1.ebuild b/x11-misc/grsync/grsync-1.2.1.ebuild
deleted file mode 100644
index feaf8d09c274..000000000000
--- a/x11-misc/grsync/grsync-1.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/grsync/grsync-1.2.1.ebuild,v 1.2 2012/05/05 04:53:41 jdhore Exp $
-
-EAPI=4
-inherit gnome2
-
-DESCRIPTION="A gtk frontend to rsync"
-HOMEPAGE="http://www.opbyte.it/grsync/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
-
-RDEPEND=">=x11-libs/gtk+-2.16:2
-	net-misc/rsync"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool"
-
-DOCS="AUTHORS NEWS README"
-
-src_configure() {
-	econf --disable-unity
-}
diff --git a/x11-misc/grsync/grsync-1.2.2.ebuild b/x11-misc/grsync/grsync-1.2.2.ebuild
deleted file mode 100644
index 528b0ddfad73..000000000000
--- a/x11-misc/grsync/grsync-1.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/grsync/grsync-1.2.2.ebuild,v 1.1 2012/10/23 11:54:52 voyageur Exp $
-
-EAPI=4
-inherit gnome2
-
-DESCRIPTION="A gtk frontend to rsync"
-HOMEPAGE="http://www.opbyte.it/grsync/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
-
-RDEPEND=">=x11-libs/gtk+-2.16:2
-	net-misc/rsync"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool"
-
-DOCS="AUTHORS NEWS README"
-
-src_configure() {
-	econf --disable-unity
-}
diff --git a/x11-misc/grsync/grsync-1.2.3.ebuild b/x11-misc/grsync/grsync-1.2.5.ebuild
similarity index 75%
rename from x11-misc/grsync/grsync-1.2.3.ebuild
rename to x11-misc/grsync/grsync-1.2.5.ebuild
index 799a10168351..a7b74ab8db0d 100644
--- a/x11-misc/grsync/grsync-1.2.3.ebuild
+++ b/x11-misc/grsync/grsync-1.2.5.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/x11-misc/grsync/grsync-1.2.3.ebuild,v 1.1 2013/01/17 19:41:29 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/grsync/grsync-1.2.5.ebuild,v 1.1 2014/08/22 07:52:33 voyageur Exp $
 
 EAPI=5
 inherit gnome2
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 94c0a3452e40..9609b58f449a 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.366 2014/08/20 08:30:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.367 2014/08/22 07:19:12 jer Exp $
+
+  22 Aug 2014; Jeroen Roovers <jer@gentoo.org> xscreensaver-5.29.ebuild,
+  +files/xscreensaver-5.29-pragma.patch:
+  Fix building with sys-devel/gcc-4.5.4 (bug #519856 by Ulrich Fieseler). Add
+  epatch_user.
 
   20 Aug 2014; Jeroen Roovers <jer@gentoo.org> xscreensaver-5.29.ebuild:
   Really remove append-libs -lpthread.
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 7590c643b003..b1bce3bf085b 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -7,16 +7,17 @@ AUX xscreensaver-5.20-test-passwd-segv-tty.patch 412 SHA256 6abe35c0a28f7cb7aa9e
 AUX xscreensaver-5.20-tests-miscfix.patch 784 SHA256 3cbc3af757f4ea362e7059ebf696aec155681684ecb1498cb0bf09892e905ec3 SHA512 ad1bea7367d548b5b8600bcfc5399c575d467135a327d303ca88b7cdd8572767001c690a9644b0df099086f80b2c946a9b3d742c9f1030f1d710c500c08057a2 WHIRLPOOL df8684942655e66c49ab127580aa2324b785c80afb7c76625f7101621daeca593dba0624bb487af57f204395ab72e4dfde165f643ebf09d5c70d4998d404a42a
 AUX xscreensaver-5.21-gentoo.patch 3109 SHA256 05edd9c8a57c441afd317fd4c40dbfc763c11831c1696505c67d1efab737afeb SHA512 13a1beae2812dc30855c3fb0a5fbce126969c7caa44d19dcff3a4ccf18a2f282faebc2c73f4ec9c4bac07b30097b942ee4cb8beadb3a315a4fef5b167ffb11da WHIRLPOOL 03a0fdf456fdd9599d94652ff61a8e0170d36429de4d0f2f03509910748b09627d22c9b62c467bb18eb583c315597db05736d48397c9f98a09354f3031e1cc05
 AUX xscreensaver-5.28-comment-style.patch 698 SHA256 d219ece42590e79f0f958312ec83fd4afbb3fdaf0a2e87a7fee85185d89a57f7 SHA512 e6c6a3200ffbec930df9cf4974f109cddae2faf43e95797336c3ad17d4867629c5b15c05dbdd547d22083da096ef55efd15c3d22c26feed92ad3b886651d740c WHIRLPOOL bdb8a8626cd7f48760be61d509b092d1f01f9e892144eb6c4569b060bb506b64080f2a77f9ad7317729e0a3022124ad61e129c3839a1b3fb1a3ebf1cad37948c
+AUX xscreensaver-5.29-pragma.patch 504 SHA256 73363c3917a0c81e122348eccf187a15c7915904e87b8f3dc24d6c916965c2a1 SHA512 fe61bb9b9f75c850f9f53f8b2891630ca1017ba8ad8ffce5ad05719f4a02081c48abe7c4874abc6b9fa5f2737787563ef8e704dd12df06089b99b79d7d9ea522 WHIRLPOOL c33d396db5a8a644a1f342c4f293ba8ff86d4f2b9f51db41a38b115f1217cc37bea4eda902f6df4ef0563183eedb5392e6e538ee0ea9f1182358310a78e5a7a0
 DIST xscreensaver-5.26.tar.gz 8760550 SHA256 2ca4dc66e11947396124d1f87dd2787e0d8dd8dd1ada8871b3d8df40fb4f1b55 SHA512 2b14c7b64c13860b7cb7ca93ae5c28c787d3aa017f1d7185d93c3db0a52fea4f97fd2a79bfc0c5f657541417130587865e5f4447bd54983a59bf3db7e50a2936 WHIRLPOOL 576c21e35679356b21689dfdbcdda8538de24112767e83c0fbf85a6bca251f478acd15493a7548d6d712ba797421b16cd32759dce4a56dc9cc935f9b367f14f7
 DIST xscreensaver-5.29.tar.gz 8774562 SHA256 c418f5750696b578df6d4fd62c8260c018667653ece97f2bb90612046bf0f294 SHA512 4eff49f58f9159d86ef765a6e5c3355d1d337237cd938fa5c486cb2b019acdf231047e8f51425b9658e7447023d2a71d8d790ee8205f9faa0c7525a2e3af320e WHIRLPOOL 7f635083ee040af26bc2b1b6aa333b4fb3f0413dcec62f25466c76a3d0ccdc1dbcbd86250fe669cb0af5681a233d81cb536f6fc01081eb99969bb333f2d33951
 EBUILD xscreensaver-5.26.ebuild 3441 SHA256 a0745469d64b423b034476aa11c06c6de2c5681572ca1fc0c55a77dbf6ca10d1 SHA512 2f8a0e753dab303f8aca2376da7e004339c55e2084767090d0317fd1bb42ecf4958321925751a1b2282575bf6f3b7d826a99afb5d0ded5ee35829a5d5d254714 WHIRLPOOL fd7ecc3854e4e0684ed70927a512bef4fdf942174e55c5d2b7dbcb6e7db2ae96f4b6f3efbca536063b3f90a1f7278ffd242e93a0a632b17c13f9de50f4f5c79c
-EBUILD xscreensaver-5.29.ebuild 3490 SHA256 0e40d3954e2685b8dd8ea940ae6468ea0cb3cbc56ebfe3304bb7d09f7e5ed52f SHA512 a03cfbe5c9e153009ee441bbc3a0f5e2d4e3d0723223964dda46935457be509474df611bd426ec7e3078e2d39da7c34074d9816ffd7a25ce8d80c4ca1a6f99ec WHIRLPOOL fae452e61da3fcf38d58c4d4089c57f8b78f54da7295379a0bb3a6d5d1ffd2260f0d0362dbf84bde244feb2dba665ed3c2752a7d0426bf88effe2e99da678ab1
-MISC ChangeLog 57587 SHA256 f813354207e09956d895f8a08ecc451a303f630f0ca0cee62f365ec8f886130c SHA512 101fb53f765dafaa74a8f26248171bc7547a40d65267b0ba6d35ba677035eca1419f8f992339dcb0c511a564643a4384bf3d81e64d5d4b1e8d44d6757d52e856 WHIRLPOOL 10a16894ac67060bc644725c0d931b3c7161662de48ed13b51bc8f993ee98327fe354bfbea78e2d0baa6253745e40674764d12fe1736c1fbe544af627f5bf4f9
+EBUILD xscreensaver-5.29.ebuild 3547 SHA256 0e2504af95b9abc9efa4f6140c39d58e6f6ff0c2e593794f0fae2d44e689fe00 SHA512 b1e1a3231fdd2d32cae3d67747ad9f543ad48332ded4992ae8280b90b82ec23c784ed532e1b4f57143d709960dfb223bf81f46b18f08782f5300b5c1b1b9162a WHIRLPOOL b7021e3ad6a237fa7fb2d282460d3c6e81161bbc984d0686ee96cd6541695982455bd2928eb8a902a5356256660ec89f8e2e44a675c510c0aa8dfac97ced2574
+MISC ChangeLog 57795 SHA256 d273cf91b9d8e17e7a43cc169323f1fc5ae67bee25318ff33b03e8713e8deaa2 SHA512 389bf0cf96ac17da84206b7f97be3f320e13de42a9c5c2b5187a9e10c2c83450a4901d1f2bf924b12eee6bfabd02a5b15c5b4dbe200d23ee58eb15167fd1b269 WHIRLPOOL 5e19a67dfc7c08a86b287bcebe059a6e161a56b82148131b78fabbe36c2ac4af58de1414e965eb21c28c448987b0df48a0679eb299228fdfcab91e96b700a856
 MISC metadata.xml 581 SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19 SHA512 46d230f1769dc7bcf962511fbc808e60e241966238a3cb15bfa6a86de092046f00ed0665fc81028c91b436464968688cddf178a75f4e98932c0f1a6398734ada WHIRLPOOL 0ce50d9f73b5d4fbe45eb07086f5aa4435c6583ae9112346037f1a11297c385cb8361325e2fe9be90378b8d99c443d1bba55f67fac3de28a08f067e2102db3cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlP0XL8ACgkQVWmRsqeSphOEUgCfbhLVm1IiuCJ26PfS8Z6twlD0
-Y08An34v18tNlXeWBmzZ7cKpQmbhwZmX
-=slBM
+iEYEAREIAAYFAlP27vIACgkQVWmRsqeSphOjjgCeLfZD4qFpYMnnFAva/nesZCQN
+pbQAn0+UfN5LH/l/URas/7zRNDVWTafr
+=h2Y3
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.29-pragma.patch b/x11-misc/xscreensaver/files/xscreensaver-5.29-pragma.patch
new file mode 100644
index 000000000000..c5245f0d2e03
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.29-pragma.patch
@@ -0,0 +1,11 @@
+--- a/hacks/memscroller.c
++++ b/hacks/memscroller.c
+@@ -349,7 +349,7 @@
+          from earlier days before the advent of virtual memory management."
+             -- sbrk(2) man page on MacOS
+        */
+-#  if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
++#  if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) /* gcc >= 4.6 */
+ #   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #  endif
+       himem = ((unsigned char *) sbrk(0)) - (2 * sizeof(void *));
diff --git a/x11-misc/xscreensaver/xscreensaver-5.29.ebuild b/x11-misc/xscreensaver/xscreensaver-5.29.ebuild
index 9aba7838de39..6c4702703587 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.29.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.29.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/x11-misc/xscreensaver/xscreensaver-5.29.ebuild,v 1.9 2014/08/20 08:30:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.29.ebuild,v 1.10 2014/08/22 07:19:12 jer Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic multilib pam
@@ -73,7 +73,10 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
 		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
 		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.28-comment-style.patch
+		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
+		"${FILESDIR}"/${PN}-5.29-pragma.patch
+
+	epatch_user
 
 	eautoconf
 	eautoheader