Sync with portage [Mon Sep 21 11:45:23 MSK 2015].

2015-09-21 11:45:25 +03:00 · 2015-09-21 11:45:25 +03:00 · c9138bd656
commit c9138bd656
parent a1471be98e
1343 changed files with 14757 additions and 8106 deletions
--- a/app-accessibility/sphinx3/Manifest
+++ b/app-accessibility/sphinx3/Manifest
@ -1,8 +1,6 @@
 AUX sphinx3-0.8-libutil.patch 390 SHA256 2bf2446f0a403fc660d3bd87fa99c3712675ccc87d889d0d950dfb717eb3dbd6 SHA512 cddb0e0378129f75f0d453c421a6e94e99cd9f495fb431d5bd1113471e77299c4ee5c42f3400f3998ab398db6cc8d9ae9d10e0c7a6c77610e29c8c1883ebd4b6 WHIRLPOOL 188613c8ac83b3e3404e9b03ff5ff4fabd7b19c170101bc5d062a472f20f44fdea1907ff388fd1039b9b1d24724d8b70d51cb2aaef08655fb7ff18f421f39536
 AUX sphinx3-0.8_heap_fix.patch 1475 SHA256 ade4d1bf57eeb4a182d917bf33ada2e9f681df0743a68fa7c8b592d850468b8f SHA512 7b709e1f3741fb3403bbb9ffda77feeba7ff8e5373d1b3e8e03247dd5eff5e1b0f90595d579e6216602da376d2f297e9a46aa2d0016dbaeef400781ef9272751 WHIRLPOOL 53cf9d2e04f595c50f005daf85b7712709bbbb4ef31746384312946244bec217d43ead73c338eb9d415bf494341a82a6b1d0bc94aff7d1b3f30022396173e3d8
-DIST sphinx3-0.6.3.tar.gz 26070353 SHA256 f6a070a67d91ccd00dbce7b6cc55242ed7a5ebaae6d6429eb0364657c4056ede SHA512 2f784459a18692594c0834dac1ee814eb663cca1e4b2906d31915f1e518efc83e760f5ae1a15d3b274a8e8e0ffbc43e56bb338f098a8abc304429b4d8262c11e WHIRLPOOL 4ba83a919a57f2c80450fe9b110179403e7e02adc930e749f7c331d393e71ce798cf194a768db7a735a9bc9879bd31294e471f34abc89ab8caa9bde404d2a84f
 DIST sphinx3-0.8.tar.gz 25226326 SHA256 1cf76a086f9b509e35f7226df2e61b0a0bf8b0858b9676e5b18cfc47b2ea2741 SHA512 85b8e574e2f92a758c8c56ef11b873c49ef8a376e964f30a12d75850d4a0db56e3108eaea25fa5587675ef2ffa4531a13f0f182a85cc8e434c6bcee42058e050 WHIRLPOOL 0f3604b4fa320f59e4ee65b79c4a779c48f2822a944b28b85a740826244f5eb7adc072538919c97ebf4eb270660fbe6f5b30b55cc67ec6276358063cf340aa7b
-EBUILD sphinx3-0.6.3.ebuild 480 SHA256 b27d82de12daa16212a400fb4cc9873c9c4e6ebcb87dfce91397ba0c81d57ac5 SHA512 9a9a1ddd17ed44e705205dbfc8dda7914aa90c5c456f26bb3c6d6a2c313e8981e1daa9aac7bbf2d85103222e74b9a213636759f663a632926af02db1f4d90e16 WHIRLPOOL 8a45fb52f4f7e4b4e80334fc0f0d900a46cc02693dde38e224a19b55c75d22b03220da8a17427a6d52c76f2bf8d5780a753f7e8ccfa46c97f0672ae6b33a8ff9
-EBUILD sphinx3-0.8-r1.ebuild 1244 SHA256 de60966e6b9ed3e70801ab09fd57965db812d15cb8de879d29bf2ee4cb2e1583 SHA512 fd894aa76198bfde9c5f1df537bb3336222243e3c126934c83b90cf1cd9e56f27e46e4614a2d8ec7657dea5e53a2b170dae6d3096e6073220c4a79837620cda9 WHIRLPOOL 68890e5b21ed931b4159bc2fdade1116f85022f92d6e4152e5d22fd9a5be2152bd429de1c3fd4d668d5d13f7712ec9548bd1b94927055a74b31613d052c677ff
+EBUILD sphinx3-0.8-r1.ebuild 1243 SHA256 ee66bacb308370172c995f5a56bfeef74724bed8137b0e31d5813c50cc65cb63 SHA512 998e88db6d557fb29d032bf2fe76543479825d97664aed946f922c6aa2ed320e6d9dea683218387586e4fbc9e6ec410d7d206e41c87f97e34dfb6e1b2a6c6905 WHIRLPOOL 56a76c1587e560a8c6244c5401a9a7d08b00eff25b9ccfad41076359eef5483ea2d27dcffe99baafbf19df348e2efced825b629f9faa821d5e8f20a8e83addab
 MISC ChangeLog 1868 SHA256 e3aa933251990810ea8909f2f6c80d6827609f603fd95c6e0b91c70b45f1941b SHA512 98904af0639af5dd0ddfba430660a63cee96029e85acd2ac6fad26da1bda0019cda4457376a1c4d91e1d7bed5d9f380d79dc842b80dab0f0e0f5ace747ff4e54 WHIRLPOOL 0faf850ada6239b9acf0744e4a2faa7768d3a222ede7720415a162a94228cb1640f367767649534d17b62c5d0401399f6a494e9a86c268f1de7eb1189d580da5
 MISC metadata.xml 246 SHA256 cb08f845726f1c8cf521dc8dd04388cba3c4c60c18f2af4baab27303ad7d766d SHA512 1f2c2eab122009a983c1c5e008aef8b1be029bb9c2913a97bf37c215b55f3c47a37a869abc616d7e0c805de3a696c47de18ef09494bdb715e640789276893596 WHIRLPOOL 236b910ce97a83e032b0bdd04fc21f62ddc95b2249de37c32e92e13f22e07c58f27fb5a49a3c432530ac8fdd688f005ca96094573f883df96fc83110eed910ff
--- a/app-accessibility/sphinx3/sphinx3-0.6.3.ebuild
+++ b/app-accessibility/sphinx3/sphinx3-0.6.3.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="CMU Speech Recognition engine"
-HOMEPAGE="http://fife.speech.cs.cmu.edu/sphinx/"
-SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}-${PV:0:3}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-	cd doc
-	dohtml -r -x CVS s3* s3 *.html
-}
--- a/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild
+++ b/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild
@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc python static-libs"

 RDEPEND=">=app-accessibility/sphinxbase-0.7[static-libs?,python?,${PYTHON_USEDEP}]
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@ -22,6 +22,6 @@ EBUILD logrotate-3.8.8.ebuild 1762 SHA256 7dde283524dcd9f3d9fb7b362375f8ce5e91c6
 EBUILD logrotate-3.8.9-r1.ebuild 1807 SHA256 9aa104f28e90b21435b6d9b3118b4b1d1009c33ba5e4f8730b9ef5c37782fb31 SHA512 9c17ee641ae58240daf7f2e81953d5072b12520583e5c19894b8e2ea11fe35e2c6a59bba9dd663112b8810a67c3ba86a2a8fa0dbf26c1ac77eb5a7234e9781b3 WHIRLPOOL c86a9a7ba325d4d277f466c5abc3a138bc2b7665f2e9d8a97aedf3cd6e992f4147b8939d9aee08b7928f85f000aa06c22ed7ae3cf68dec15259f4ba650a407a5
 EBUILD logrotate-3.8.9.ebuild 1807 SHA256 798fa3824fa06081a1756af088796a67f861391c4cb7127e5711b8cdf14ccb5c SHA512 7a77264f4aa193be1ad3f6afde463037a7bc2f35ef785cd2706d3a063b1ca78a1628ed57684e0bb65a07ca07760aeca76402d1e5f507fee3c7632b0e56d337e7 WHIRLPOOL c36084cbcdc8c9a6de2d08cf079634dd268f0ec6961231cb961c1a108d44527bde38fb87521803d6f4a648eacd4d7e297488ed658aa034b67da3c650caca09ba
 EBUILD logrotate-3.9.1-r1.ebuild 1849 SHA256 cf72b767215e4c50c43e3d151ed5ab33ca119bf1aa1cbb571f9a6a5933f7e052 SHA512 2ef72d2729fc5f52d4ce65c1c5f9fa6764e1a7b3b0f7ad5c316f3a09429fec93a367b94bbce7168398e9234f4145f1b3b1f928b5a45a2d066b16e9297f496805 WHIRLPOOL d9b49b8389731cb31e858fc58ba1b3c06667f3d6af29a5decdd9cd46ebad587e015f52cd74e89c1793d520c236f91331c8298dfc0b3c3693cffebd579b967331
-EBUILD logrotate-3.9.1.ebuild 1805 SHA256 40fd96a4d8faea0e47c66341835f1411e70b8b1676dcb1e3f9f8624eca18d506 SHA512 a2686ec142d1e959fe3aefbae1a5b3b631ab2ee1c9acfb75c786af5ed51ba2e84a0a5830f6795aa09372f1cfa7da409412bab6c8a5f363357fa64bdb43b851ac WHIRLPOOL aab0e6c745d6c94cc355eeb15ab2bfe869fc6a494c5861615ac4a00f691c22a0153d5f0aca9f98f233166530ea0f254530df90afea17d10f258f82e6f5035e4b
+EBUILD logrotate-3.9.1.ebuild 1804 SHA256 b18a090354ba1dc92cb913c760e16b3df09a9686c8e0ced48d1008ce62e2ff3c SHA512 4bb7351476df44c62dc55455a0a3b80fe7410d5bec779af4f6a86ba397a03e6e206098ee344352bb3ca2c79b510af1957d79954ad97b0c97babeaf1ccdef8e78 WHIRLPOOL e20adec65fd0794a28aa2f526c6f27e3bbc2ccd891920b3419d825b1c222e1aa004af789d3671c58a837d5fc37b27ff8cd3abd7d444f59321305e680e5645bba
 MISC ChangeLog 31549 SHA256 9a573fb1c828c7902f5b51a4f331a7df387a331c49509396799505c3e7c5c323 SHA512 13817496f0b30b421db6c36d2f044b7165a8282420d5124c52a6e5220cddc30ac774b63a43b395f0c0392339e67bcf6a855e16c666de34ad13004ec1d0f056fa WHIRLPOOL 4a957803bf090890dcb9ad77152e87bba98952493f97e75a00718ff024e5b774baca23c554e7ae2995d499d3791a38eb4b83f8126ab295fd2ed7c97652ed8687
 MISC metadata.xml 1021 SHA256 38ee9077db5b0f3223b2ea558b0c86fcb6c76fe2f1892c26d10d3b88c7e7b64f SHA512 dad453f4151ca9454c4374c6b4521e861b6adaa7352f147b0809e80ac2b6cafc51db04eca428754b48bde9caa2f54ed84d0b383c496c45684c0510be0a4ef575 WHIRLPOOL c260e541af2a735ec5bce0bf38eb060f002daa3ab4b41bd9c1dc3187c3ab669bed34a1bf5f4fe0713f80588bed6c703968302baf67022faf7fd80bfe07dda113
--- a/app-admin/logrotate/logrotate-3.9.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.9.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"

 CDEPEND="
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@ -9,6 +9,6 @@ DIST puppet-agent_1.2.4-1wheezy_amd64.deb 15187770 SHA256 a711255c7b5aab5f1a653f
 DIST puppet-agent_1.2.4-1wheezy_i386.deb 15122670 SHA256 33e9b16ea215089e7a89288faebd4767163e05d7c4a9d5c51ca71b041496c204 SHA512 944f6388d317fab9a2714a6cdc57e713a973d3c1df259b3358be3a0d737878df9f1d66186af8aea0cc768e55650f1dd1d3ef8682b942728fba45e7c0bca20867 WHIRLPOOL bd5710845a9c8f27fb566ead63e45649fb3854200df0259c76b9478d93792b453a9d5cf4fdc20112991d4d091c82143b7504b51be65815b2dcb67796f275303d
 EBUILD puppet-agent-1.2.2-r1.ebuild 1765 SHA256 c84d9ea2dc89e6c939639f4dd66fa1acfa1057474ddac0e3238297490234d8e9 SHA512 848389a090bd45f36dbc2e4e35ba2f418639eacba6167d7d2638246b50bf2388d38665a0e59521b9f2ab3290f35bc023a4618b80b9f1c851c15ef6268854cf3f WHIRLPOOL de47dc549d01ae13bc25c447659e251b6c6f55c0a3f2ff4ebc5f323e10f4cbc7f91ca48fda214dff12a487707be3dfc73f9c7a2e79d28eba23a4b41b0a2ae97a
 EBUILD puppet-agent-1.2.2-r2.ebuild 2227 SHA256 3ae63526d6604c3e7b05da87ca0bf338e10e7be1e647de2b54718ee355cdf236 SHA512 67b73134ec166949751c7a96725b473091aec8b5da961f8417e87e10f10d7af8c089f7180075fa91f9b8aaeac25a1b19da868d3d1e165d5bfc5c32f62121cb2e WHIRLPOOL b06752e8dc97326754fa544d55ed7751fe8711d72826c449438c78167bc58518ac352a7fc7db28c73888ac1947ddd7d5c57133c11fbd3cb5c65dc705cc7cf8d4
-EBUILD puppet-agent-1.2.4.ebuild 2227 SHA256 3ae63526d6604c3e7b05da87ca0bf338e10e7be1e647de2b54718ee355cdf236 SHA512 67b73134ec166949751c7a96725b473091aec8b5da961f8417e87e10f10d7af8c089f7180075fa91f9b8aaeac25a1b19da868d3d1e165d5bfc5c32f62121cb2e WHIRLPOOL b06752e8dc97326754fa544d55ed7751fe8711d72826c449438c78167bc58518ac352a7fc7db28c73888ac1947ddd7d5c57133c11fbd3cb5c65dc705cc7cf8d4
+EBUILD puppet-agent-1.2.4.ebuild 2262 SHA256 2fde5cc399f8ebd941f1be0d8500ae92bc2b7ab778fb3a2ae4a42d0bca03b961 SHA512 3fdeee72d654e41bf94fd02191dfdbe0dcf4d2f3102605ba7e4333be580deeedea1f751118179c28e4d00f5270b4219238180e41d173b5f870dfa44397a9afa1 WHIRLPOOL 229991f534451c4ce2c56ca9bc5122f53ea531211f20013846efe52268f057d7d52b40bea1e23f7fb5aa94eca0c22400dea80ce223e966a6a4ca2542ed2cb291
 MISC ChangeLog 1925 SHA256 14cec0025e9af42a203c9a087daf7d2bce1dd92aec66445814fe3ba58fb55611 SHA512 f5c921d2ee0079c50c6618d8efa13438d07fe0626133269c8be9b5dd7f7a3aa6d2d1643d445d5e1d527094b2d814c0d5858974e5b38dd475dcb9d0271162ec72 WHIRLPOOL 92882e38ab2de443b8c4edb81327915b6ac76d1df5bd4306827ad92704bfe844ceda17c4abc81210de36718ad6d51eade549d720035e46ef6e719262f0441354
 MISC metadata.xml 419 SHA256 56c6b62c6abdbdb0f136d0edcb3ed57abff0f54a632274e7f78b419fa0639705 SHA512 7e1b379967953ead9fa26f09993ae50cc2e4b9fda5d30c0a5be08f8707632daf837adac1faf96f0d29f91c8b12e61710ba88f174044e646e7e253a3dc6e7927c WHIRLPOOL 1de177d45780a85ad7f2f30692461cb55a31f3146a78feaa196ab7aef16cd30caa34ce5f0d63b597d8fcc5d83a16ee9042b142d1301bf1a79e624a04140ef1ca
--- a/app-admin/puppet-agent/puppet-agent-1.2.4.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.2.4.ebuild
@ -53,6 +53,7 @@ src_install() {
 	fperms 0750 var/log/puppetlabs/puppet/
 	# the rest
 	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
 	doins -r opt/*
 	fperms 0750 /opt/puppetlabs/puppet/cache
 	# init
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@ -16,8 +16,9 @@ DIST rsyslog-8.9.0.tar.gz 2022294 SHA256 eab00e8e758cd9dd33b3e2cf6af80297d1951dc
 DIST rsyslog-doc-8.12.0.tar.gz 4212441 SHA256 f88517c1e5ae3a8ba129d531b5b4bb79e80f70898a8a5b72a0abd7a8a0feb8f0 SHA512 a1b3907e1a474076dd11e76b267eff35dadbd5abaf3ab802a187ce045eecc6028c854ed8e661650e10c74c79408c6ded341d16af94a05f10c529faaa8f606afb WHIRLPOOL aa21ea93536bab4c9761bdbe2e6c67f650bf181f64cb7c4a78c646d319a5472895be2a118c90d7c42548575b76f62e5dc6b0c4103cf373ab9e3704a6999c6c1b
 DIST rsyslog-doc-8.7.0.tar.gz 4105507 SHA256 f131bfb963eed4fe74d7336ee5261876b436004b78994d47523a82c0f7d666a8 SHA512 9b5b6f28a55b58c956ca614301fc9667243d02c321f8b4071264e4040dd8fe79ba7eb5a08912e2a229bdcf12f68eec24f1c65ba7b82ccd60c8e70d34267b8405 WHIRLPOOL 386ad5164768a5a4919ba5acda29f3ef670b78cc9d6845e3c8ee252b43d6622c19c7f8ec1edd7d0f1d111bf2c06d29fb5dbf9af6b46c426932ae6caa0e63c30c
 DIST rsyslog-doc-8.9.0.tar.gz 4100654 SHA256 d3c6747439fabbfa976922ca26ffa695778668e757261e00103f2444cf153afa SHA512 dbc6dfc43f3a75ba671969d2fd59080d96e411a62a2ac91444d076acba548b2c87000f9822fa0af82f22b4f5c098273d407c1e665ce4b24a52dbddfdc9ab981f WHIRLPOOL 550d499ec556a75344d25331aa1df1855f6f70e2e702c086a8ecbf1817eb1f4bc3b94224b77491f3bc1f6c758a22475c248f8afdfc25816132dfedd81c6dfee0
+EBUILD rsyslog-8.12.0-r1.ebuild 11156 SHA256 e4b8555d89babd8d45f58cb8947c69fb0a366abdd23fb2dc6f6436b1c2ade977 SHA512 55d4e62813cc6ef85b8d0a1062125f502348464718f5e76a31b683ad22ede717da680a873e2c1fc520bbfea1a87ccf2de0afb6dee4f71136e283d8abe4111ef4 WHIRLPOOL 8cc64de17effbb8f3c86d39e3033cc949a8d658e14a1cff1e036200f2b7db8d7b127d3ce368964972458f78b32ecb66612b45e377bc1029eaf99ca716974d21c
 EBUILD rsyslog-8.12.0.ebuild 11092 SHA256 ae2756b23b50f4eeee1514228cb6ac2d538b0fa99ab7c9b45c5a3cd33fd00ad2 SHA512 e5b8f3fec73e36be0d669013a963999f189026826d761ca250cb4017e60c0c2ce564baadc4a6644686781ffa05180059e67d2654e378c5fe37c2e24553c0abdb WHIRLPOOL 4b97c580fedff7d19629a0d936764fe1fa70fe1639d17a95664c88af11c8087494a11830e1b52c873d4563310fa5de33773ff86abd0c78ab5b9b85fa9a0e0cef
 EBUILD rsyslog-8.7.0-r2.ebuild 11207 SHA256 a73b68efd1988651868125a8cd025888de5ff2fb98f1b15649c6e7d9daafbd4b SHA512 c4880b30a1ced29c7a035cbfe9925bd77258b51d7b96e4398602e49aa7f90d2c99cce28b7af13b0e2e1077dfa86693b779117422ac1dca57edfdac893972aa2c WHIRLPOOL 66ef08be5105b56c756747af343d04136fc647a05459c0e609c77898e72d3edf7dcf13ba8b468adc661e3c16605dbf88f4c0084b56007eabfb44d342849172a5
 EBUILD rsyslog-8.9.0.ebuild 10921 SHA256 e5ec4e44691b22561861747d1f2aea4608b37d731f82582b40ffc1a847c11b6f SHA512 8cb4954aadcdb6a861e3654692d3a2168bb781070758eb3b16497b23eee030a8f9a7eaf5eec40d27a2d6d2803f8f15ac25d3132fcb3ba19c6549aae19060ca2e WHIRLPOOL 5365a0b283f1f7acb8f7c2a7a7c995583cc408992691aec0fa92ace8656cb0806d95a653a6c2cb74abb7639a91c022c4c47b4f739e0bdcc438582d7b0d76bb6f
 MISC ChangeLog 26836 SHA256 00f62ec24e67a62edb77fa4d17812f6d736ac8ef3a20dce29bb2b78e575ece01 SHA512 bb52b5ffdfcbe0d1fc51a05dcacc042ff876b9669a875eafdd8e4c240c28a2902ef5200c4f8d31815ca45440f602fe85933d059b55b4f940e4b624c8340a6243 WHIRLPOOL 3f9e1c0cede4a17dbe03f1873fecbf0549a863800a80938723dd86214854f0e47c8d092c1ae381ee82644869ef72dd8915f1ceac5dc4676986128dca0e583bbc
-MISC metadata.xml 2782 SHA256 71c1f95cddbfcdd383e15a9a89cfed72f34d52e0f664775016466f424d975301 SHA512 4e49d87b5d64a15ab85206cc7592c76889bc91a2566d6de71348a86572e3ff731e6549d484ec61bec968d8f1c9ac844e919ea58a5f151d71e111e54444fa847a WHIRLPOOL 042a4e2ce4933d5721c8802b3ea81effc8a38e594b4389b098dd8901a8c8164740c70f577a176b82e0bf85c48ff0605c94f0b5727aeddf068ff2506076d1fcb4
+MISC metadata.xml 2953 SHA256 36fa293b06e7457f10ca56c31deaed4365dbb873224ea08c3632e76d0b6c303a SHA512 7158917da95e16d84f9545c846cd2a5271c49dbe8a478f0eede39e743ff5d2071129105aa80a4a3c171f60133d4cf1f97bb14304b2eb7183ef19967ace00df88 WHIRLPOOL 2380aeca4f845f280435837e8895097500ed0affc50a2726e46e1d0f0ad87cb6b983f969716293b277309dd0fa8c38a2a0ebe4d3eab2d8fa7204c6c70ce2c1b9
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@ -17,6 +17,7 @@
 		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
 		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
 		<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
+		<flag name="libressl">Use <pkg>dev-libs/libressl</pkg> for building the rfc5424hmac modify module (requires rfc5424hmac USE flag)</flag>
 		<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag>
 		<flag name="mysql">Build the MySQL databse output module (requires <pkg>virtual/mysql</pkg>)</flag>
 		<flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
@ -26,7 +27,7 @@
 		<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
 		<flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
 		<flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag>
-		<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg>)</flag>
+		<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/libressl</pkg>)</flag>
 		<flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
 		<flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
 		<flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag>
--- a/app-admin/rsyslog/rsyslog-8.12.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.12.0-r1.ebuild
@ -0,0 +1,417 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="http://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+PATCHES=()
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="
+		git://github.com/rsyslog/${PN}.git
+		https://github.com/rsyslog/${PN}.git
+	"
+
+	DOC_REPO_URI="
+		git://github.com/rsyslog/${PN}-doc.git
+		https://github.com/rsyslog/${PN}-doc.git
+	"
+
+	inherit git-r3
+else
+	SRC_URI="
+		http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+	KEYWORDS="~amd64 ~arm ~hppa ~x86"
+
+	PATCHES+=( "${FILESDIR}"/8-stable/40-rsyslog-fix-parallel-build-issue-479.patch )
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos libressl mongodb mysql normalize omudpspoof
+postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
+
+RDEPEND="
+	>=dev-libs/json-c-0.11:=
+	>=dev-libs/libestr-0.1.9
+	>=dev-libs/liblogging-1.0.1:=[stdlog]
+	>=sys-libs/zlib-1.2.5
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1 )
+	kerberos? ( virtual/krb5 )
+	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
+	mysql? ( virtual/mysql )
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-1.1.0:=
+	)
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 )
+	redis? ( >=dev-libs/hiredis-0.11.0 )
+	relp? ( >=dev-libs/librelp-1.2.5 )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? ( >=net-libs/gnutls-2.12.23 )
+	systemd? ( >=sys-apps/systemd-208 )
+	zeromq? ( >=net-libs/czmq-1.2.0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+# Maitainer note : open a bug to upstream
+# showing that building in a separate dir fails
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
+
+DOCS=(
+	AUTHORS
+	ChangeLog
+	"${FILESDIR}"/${BRANCH}/README.gentoo
+)
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [ -n "${EGIT_BRANCH}" ]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [ -n "${_EGIT_BRANCH}" ]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			local doc_tarball="${PN}-doc-${PV}.tar.gz"
+
+			cd "${S}" || die "Cannot change dir into '$S'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${doc_tarball}
+		fi
+	fi
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		$(use_enable test testbench)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug memcheck)
+		$(use_enable debug rtinst)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable normalize mmnormalize)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable zeromq imzmq3)
+		$(use_enable zeromq omzmq3)
+		"$(systemd_with_unitdir)"
+	)
+
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [ -z "${_has_increased_ulimit}" ]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv $FEATURES; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${S}/docs/build/" )
+	autotools-utils_src_install
+
+	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	doins "${FILESDIR}/${BRANCH}/50-default.conf"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0 ]]; then
+		# Show this message until rsyslog-8.x
+		echo
+		elog "Since ${PN}-7.6.3 we no longer use the catch-all log target"
+		elog "\"/var/log/syslog\" due to its redundancy to the other log targets."
+
+		advertise_readme=1
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [ ! -d "${CERTDIR}" ]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@ -26,6 +26,7 @@ DIST syslog-ng_3.6.4.tar.gz 3276432 SHA256 7be11df31ac7d716f1f952e22b5ae8e2049ed
 EBUILD syslog-ng-3.4.8.ebuild 3480 SHA256 e8b60a1f5f9e5282eb452a9691f0b97280520fc2a69885931ea27174b9abb684 SHA512 dad9d6335c246b6a727d97af314456cfbc70ec8a34cadb22cc9891831c4648840138e8dc7cb45cb397506d7d4790e908dba1af3ad806e12a80a07cb337549e69 WHIRLPOOL 4e9ed1c405bdfd914144f6d2daefebcd81ba98a6eb7db6824a0856fc4e2c67bcb4857b88e1109926be51a9963b31b7a2f533e1e83e275272a50cc0f7144be4c2
 EBUILD syslog-ng-3.6.2.ebuild 3675 SHA256 6385d3b1f09ae036ce41cdb2c51b742d067cdedf2c4ddb590688d7a34f4ca9a1 SHA512 abd481515e7e24ec77dbbcd0694b8b9e0ebcaef945bb65a080fd1ddc1753dbcfc19f2dfca5ae7321e5247809a0e1191a1b62490810f457b9f357738f68a23e06 WHIRLPOOL 2ef8915579a57d387c28e859a13c437a14480c095cf4e503ecae007ccd27632556d8afd7b6ed6ed1b1f7527a62888e40b8ef3ae03839b351c115c86975d6a8c1
 EBUILD syslog-ng-3.6.4.ebuild 3648 SHA256 eac1754c8f3c7a2ab1a16113425df7839da88549f9bf613e965e94e3f023b4ad SHA512 94e3f4dda7c9482b6588913c97fdad030112b91ed33e257b43a465d931acb94ad3f39122b239ba21c806f1f5075390ac5a81aad15055eb26880ec0f08bd719f3 WHIRLPOOL edcd72fe49e2f599f80fcb0a2a203b9512bcdbd62d079da14b02b7e46dc454d649a82e067ee5388566184637290f2337b9692b26d78cebf9cc56ab1a724cc112
+EBUILD syslog-ng-3.7.1-r1.ebuild 4008 SHA256 e656f8be0220b3a480c3beca3ba5cc2ef49fa2ef7e3664d7b8868853395add3b SHA512 07e23c842c5c7b8411c67420d6b033d41b2e2a94f8beb894cc65145a04ecc4fa5236723be8b514af745468b2d90e016a7a450bba04ebebf454a1801b5b6740b5 WHIRLPOOL 2da1f21a259fe6738645d760329945aa8e14965bb0be6455e5d6394030d80a0571d2791313b221cee6e45fd4f9623fac111e7d3a28305a7a390a47aae7cc444f
 EBUILD syslog-ng-3.7.1.ebuild 3948 SHA256 8bf5535f845e457a2aba588d8f9befcb20ba0f8524254bfd6e91e59611ad0858 SHA512 285b27e70325d27cc5e8ee53d454b44e3e152cdf254da55c8f5c00541a6e4ed7c9a969339fef9d1f29b88f61470bda9d95c08a45797130b500d0b1617e8f2092 WHIRLPOOL 2928952d49ab30a162875c85cc68ea7853295acc46c577552665227fe960e5765550df47f016431e4fa0a217833efc251808a5d6234e2cbc9398d27930812035
 MISC ChangeLog 61057 SHA256 563de14419f021b91a607c1a5193162c42d67ae088d195f07077784dfe150751 SHA512 5e4d4294d5992cad24bafed095716b370df4a1b1c04205b1f4e148fab85cd569d77612d3bfdbd0859e3725685351beaaf286a6c5a5d877ad90973d1344f0dc1d WHIRLPOOL ef7b0b186827097e1552db8469e38490261729752dd89c9b6b8f485aaf41c54faf038596a55a727ef07faab0e377cae30bfa25c8b3492357d660a2ca1f97d754
 MISC metadata.xml 887 SHA256 6f47da14a25a5b0067559026e0e699ad29ae29687330d512192ec57170d9375f SHA512 ae5084812ee5433ca1ab016eeaef53cfe0d2467a15aa89f84ef8c5aa0c3ab61178ff9dee27a5e8ca2a11744cc212f4cedbadd700d72abb8eab9f53da9b60bf39 WHIRLPOOL 0fa16d70ad8cbcd9248574d7bb7c095de8454b63859963f7cf2fcd330741d76292b4aac5da340cc08070ba716edc7f203a17100ef9e49045db465ab27f5ce936
--- a/app-admin/syslog-ng/syslog-ng-3.7.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.7.1-r1.ebuild
@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-any-r1 eutils multilib systemd versionator
+
+MY_PV=${PV/_/}
+MY_PV_MM=$(get_version_component_range 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+RESTRICT="test"
+
+RDEPEND="
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	json? ( >=dev-libs/json-c-0.9 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis )
+	smtp? ( net-libs/libesmtp )
+	spoof-source? ( net-libs/libnet:1.1 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	dev-libs/libpcre
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	>=dev-libs/eventlog-0.2.12
+	>=dev-libs/glib-2.10.1:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+pkg_setup() {
+	use python && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch_user
+	use python && python_fix_shebang .
+
+	if use !json ; then
+		sed -i \
+			-e '1 s/cim //' \
+			scl/Makefile.am || die
+		eautoreconf
+	fi
+
+	cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
+	cd "${TMPDIR}" || die
+
+	for f in *logrotate*.in ; do
+		if use systemd ; then
+			sed \
+				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+				$f > ${f/.in/} || die
+		else
+			sed \
+				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:' \
+				$f > ${f/.in/} || die
+		fi
+	done
+}
+
+src_configure() {
+	econf \
+		--disable-java \
+		--disable-docs \
+		--enable-manpages \
+		--with-embedded-crypto \
+		--with-ivykis=internal \
+		--with-libmongo-client=internal \
+		--sysconfdir=/etc/syslog-ng \
+		--localstatedir=/var/lib/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		$(systemd_with_unitdir) \
+		$(use_enable systemd) \
+		$(use_enable caps linux-caps) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_enable mongodb) \
+		$(use_enable pacct) \
+		$(use_enable python) \
+		$(use_enable redis) \
+		$(use_enable smtp) \
+		$(use_enable amqp) \
+		$(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
+		$(use_enable spoof-source) \
+		$(use_enable dbi sql) \
+		$(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+	# -j1 for bug #484470
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
+		contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
+		"${TMPDIR}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
+
+	# Install default configuration
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng
+	newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	prune_libtool_files --modules
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	elog "For detailed documentation please see the upstream website:"
+	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.7-guides/en/syslog-ng-ose-v3.7-guide-admin/html/index.html"
+
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		echo
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+		echo
+	fi
+}
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@ -1,4 +1,4 @@
 DIST gcab-0.6.tar.xz 316668 SHA256 a0443b904bfa7227b5155bfcdf9ea9256b6e26930b8febe1c41f972f6f1334bb SHA512 80c18f213b94402cbb4c19ed506f4a40e9c4f8deb9ddf6ee990214213f011f7638d83122b36cadff86330b524eef82969d1245b64d5d04eb5998f76cd2ca6df8 WHIRLPOOL 8e6140d6a9d11cf0ce249d15ce2fda21fbbca9c366cc938ff99398bcd32f375d07909c421ade7530611902c27e7c002d8f43ff71c04830c5062849ebe5c347e5
-EBUILD gcab-0.6.ebuild 927 SHA256 6b4b556b1882f1c24aedf7e0163fa0a2bd2914c846637d09a607cf687b9487dc SHA512 98d9af1305d777bc131ba206149130224a54a205de54d0000a607ddf8689520fff29ed0d00120e81801b4e2f998a8cf58223acd7a73b706208b1414c9baac67f WHIRLPOOL 0120bb3c82ef9a56056e97bac66b629c462b2e3ec39aba132ab14990495e92b38b23246e5b9aa87eb91e1952169d0e3e9dde9c668017e7305d8755329242415d
+EBUILD gcab-0.6.ebuild 934 SHA256 a47353fcbbefb5e5a95ae92fb66e088cf34a531f235a787bf34e63f35c92bb29 SHA512 04771b9d2945099be470863367c797d27772ee04fe471b568a6cb0675450896712672ed82418c406366fdbf48cbcb660ffcb7fc646c6097a1f59ce366d6a5f76 WHIRLPOOL 97f877db5077f793f6eb0538cfbf63e3c3dbeb8e3ee73e01c79d741e2eb10e157cc8b8aee7039a5858f874444a2fc2c4025c2b93d492306b1da0336ff4a6dd92
 MISC ChangeLog 739 SHA256 c8da0e3d0d1f017f5570e88e24266a97bcd549dc74409a30fbcfa5e5512304ee SHA512 53e7e332f6e3e15d141b962ed677f55ac1ed1e1352f3800562c9b5c3f6111adebf675dfa5da067a9683de4374b153b79d50de4c63745e7abccdca4c8346d2250 WHIRLPOOL 545c9264ecd4143084524367db7007dc9edd82ef6dab95c0fea9179c2f057aecc44f483b9011241a9e656e3342df654507a3a3ca35b29f0a26c2e97be425e517
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
--- a/app-arch/gcab/gcab-0.6.ebuild
+++ b/app-arch/gcab/gcab-0.6.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"

--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@ -1,5 +1,6 @@
 AUX libarchive-3.1.2-CVE-2013-0211.patch 1087 SHA256 6e9940a1b148f3ceb43bb172416b332ba922bb951e7832193ff997c2d9026bb4 SHA512 38ef32b30b3eb5a7c68e31086da64b871bae70002600080541ea6d0ea3680f68f9e65760f803a0e96d233e1a21858a83946c1fd63fd67d5eb030120940896c7a WHIRLPOOL 6c9a8586e011a7f392a925261adb9a5b5f8b5a9725b322bd6f8dd56fb3f2bee15b7651c0e6dd3c0a23ddc76c22b84fb6ab041215116076f015ba68aa12ededbe
 DIST libarchive-3.1.2.tar.gz 4527540 SHA256 eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e SHA512 1f3c2a675031f93c7d42ae2ed06742b0b1e2236ff57d9117791d62fb8ae77d6cafffbcb5d45b5bd98daa908bd18c576cf82e01a9b1eba699705e23eff3688114 WHIRLPOOL b90f336afb5264be91fb17d7dae3d5697e3f84e24d276af1d5ac076fe15ef6f5756488f09506fabe470473becb5449cd1f34865309dcf8a914e6e83506e8695f
 EBUILD libarchive-3.1.2-r1.ebuild 2493 SHA256 768556d2c75f7f4a341057d61c37fcae5a93898864196a0d3bf5b23620320d48 SHA512 64301bd3e1e6d7b900875944d076a5d1afc557f17797fdaa2c63920f76025d9712a71292176701f8cce3d979717a72e7e2266e337a6b0a9dd0324dd9d81f1674 WHIRLPOOL 6f6486c07f20514f6eedf25349da4f8e0a882a279146478e1db9acc19428f9df02a4275beaf6cab8349fb8424261f6e460b9ed534fdbef529aad4eb6e681df5f
+EBUILD libarchive-3.1.2-r2.ebuild 2565 SHA256 0653462ab173c03eb7d013767f2e4b9606a78854c194e4079905110861639882 SHA512 983905258bf0f01f21a6f52a7548594ca5b380d4133059f49808bcb193d334cb442408a4cb4b8b0af2e60cb004533d6d12a981ce7b7bdb059a4016c29ac4b629 WHIRLPOOL b70986af08f4948ff47f7f5095180b52b9663dd2ef47079d8efefa907b17ca0b19f1549c0def83c91a1b834b1832f1fde435afb81b900b9fa3e96cb32aae78ff
 MISC ChangeLog 35658 SHA256 5d6739081fe3df492178d0522b91f02761d0956ffe6cff8ea716b93519bd0310 SHA512 28edd8ebd92704e8e6388c261b82cbac5ffc33185c8b8666b44cc06b75186036c7e04cde6c7637411f717590aa41350dd588932c1474ceda1c5b9ad23828b02d WHIRLPOOL c7d02fd3c18ecff0ecd32d7865080c096e9469e07b3810c74c5d8894044e8df4088cc8ef8d898d3452cb86d760f59715bb41f58286b8cd4292fb2d8699f8202f
 MISC metadata.xml 1301 SHA256 2cc87bc829db8751ccf9b12057c05539fae80578f0325da9e15c7b4fb15797e1 SHA512 19dc1b85046b7f0da92cb3246c0ee7f58092202ff212a4ee64d27c53f718017f982946ee7db3cd67fff4888b5fa3b4cdd5eae10e5d49c832ffe2e331aa173efe WHIRLPOOL e61bc96069cf9fc659cb07506963885532bf0239646463965fb6840063a6a0b4007e4d4f68e7ce8d29b7c70fed168966a04e1e74de893d19bb45ace6f085c741
--- a/app-arch/libarchive/libarchive-3.1.2-r2.ebuild
+++ b/app-arch/libarchive/libarchive-3.1.2-r2.ebuild
@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils libtool multilib toolchain-funcs
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://www.libarchive.org/"
+SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo nettle static-libs xattr +zlib"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	acl? ( virtual/acl )
+	bzip2? ( app-arch/bzip2 )
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2 )
+	iconv? ( virtual/libiconv )
+	kernel_linux? (
+		xattr? ( sys-apps/attr )
+		)
+	lzma? ( app-arch/xz-utils )
+	lzo? ( >=dev-libs/lzo-2 )
+	nettle? ( dev-libs/nettle )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+		)"
+
+DOCS="NEWS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch
+	elibtoolize
+}
+
+src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	# We disable lzmadec because we support the newer liblzma from xz-utils
+	# and not liblzmadec with this version.
+	econf \
+		$(use_enable static-libs static) \
+		--enable-bsdtar=$(tc-is-static-only && echo static || echo shared) \
+		--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) \
+		$(use_enable xattr) \
+		$(use_enable acl) \
+		$(use_with zlib) \
+		$(use_with bzip2 bz2lib) \
+		--without-lzmadec \
+		$(use_with iconv) \
+		$(use_with lzma) \
+		$(use_with lzo lzo2) \
+		$(use_with nettle) \
+		$(use_with !expat xml2) \
+		$(use_with expat)
+}
+
+src_test() {
+	# Replace the default src_test so that it builds tests in parallel
+	emake check
+}
+
+src_install() {
+	default
+
+	# Libs.private: should be used from libarchive.pc instead
+	prune_libtool_files
+
+	# Create tar symlink for FreeBSD
+	if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
+		dosym bsdtar /usr/bin/tar
+		echo '.so bsdtar.1' > "${T}"/tar.1
+		doman "${T}"/tar.1
+		# We may wish to switch to symlink bsdcpio to cpio too one day
+	fi
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/${PN}$(get_libname 12)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/${PN}$(get_libname 12)
+}
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@ -2,7 +2,7 @@ AUX pbzip2-1.1.10-makefile.patch 263 SHA256 ea458b7dde5964718378ffec7e8b44bccfe8
 AUX pbzip2-1.1.6-makefile.patch 2066 SHA256 fb54c34c7b7fd64e5848e6ba49e5583373235305ff36ae26c32c76c3984cb58b SHA512 28b918fa76d1a352c67146ed0d59a80a8ee21d45fc7ad0c235812297725d37807c785baff45718ce3efc2b0cca6153bc7c188df537306e70948857f3df66279c WHIRLPOOL 493017795da1ec8cd43184cffd0cb5ed0f5503561a85cd4e6c874b7742edce0f198cd3b7f37b96450c002dd0950a72c44090f7675fcd589bba99609ccec101fa
 DIST pbzip2-1.1.12.tar.gz 47826 SHA256 573bb358a5a7d3bf5f42f881af324cedf960c786e8d66dd03d448ddd8a0166ee SHA512 bb68e87867295b89ee6fb76a8b72834daebf0ca6c16b2f10bce67fe7386716a728acd28bf46a9732087202ca0cc774f02c741b0b58801184bb7550f6fd119cd6 WHIRLPOOL e7e9cd45b51aaf227e5bcb6e8df37b2fc05b2e3b8b666fcf213e05dc21d6df7392918e97d95379d25231832a9cfae938fdf5590ae7a7d3e6ad1968a9b2c25393
 DIST pbzip2-1.1.8.tar.gz 54429 SHA256 d2da7e65d2a2ba5426d6d9bcd15d86cc5f90038efabd5dbc1ef9bded21371f53 SHA512 a3314d1f465e6016bf79ca8bd734fc1485515e9688319ee5a6a837058599546848018f28e2e2cef2afde68ee8f3c26d16e4e6da4c74c75d1cb12068f1d1e1a83 WHIRLPOOL bd24e6102db6425978c5ac8e762b37f4df4bcdcc84f44e06e6b4c652b1f9e3128382af1558a1ebc9f68dba3a89be08d42bf92577eab73b3d748f6ff941b415bf
-EBUILD pbzip2-1.1.12.ebuild 1076 SHA256 dd6391df49265e0d5372a052ce5c3a3c326d41017654c8a347fbf1ad3c292a7a SHA512 a6afb3184d4a304f7171a2e935a769067faae0e7d046738cfa8499312555cff8bc1714fc41faab5d2830f73782bd634ad91e1cdb1f381bebe2e91be67fa6c3bc WHIRLPOOL a4e88c5b91f314935b817800ddbe286bce2746939e1faa59ce85c8aa4d1789ae7fa77dc80f934d4b90cc06e7e08fe1d43497b211233cf376eccdbf6b41cd9e74
+EBUILD pbzip2-1.1.12.ebuild 1075 SHA256 2eae7655c77c105d17287bcbeb1473aca947dd14df4db5427ec9c02e132494d4 SHA512 4c0a86278df16addfb506f9db8f4d0c7237e76ef508d157974da67d8cee75deacad535eca87d11c29ede9881d605b4d122c775750c9738fe3567fce4f6e191e2 WHIRLPOOL 29f165ad6e55ceb9d408120c4a9179c7d3cd287c9b8a36f59dc469a939d23342353c0e447330eb2c92a6ea93709c43c60ed031b179af79aaa67aa47d89e7bec4
 EBUILD pbzip2-1.1.8.ebuild 1037 SHA256 2ebd39dfc01f0f871bb232c3af77620a6af65def754d19405c7afcd7cd36531b SHA512 0328a82648135639ae2472e72cb892d7505272d48ec5f0d3a7e7d790726f84815fcaf37460f0ca93cec4ed7f42feafb2d05def5491ccc71e77fc1a1f8fd832e0 WHIRLPOOL 0aaab843eab0ace9b608af6e002bb75236aa29c9888a30067824ae7c70a6ed2a8f51298c9d9165d7bbb58e838d1b2ec67f2a4ab129cc7263d61970807da1756e
 MISC ChangeLog 15896 SHA256 eb0dd316e8512bdd7421176aa9556f63b00134b4339e22df67dc658976ed4d3c SHA512 e7f43dca126df512f2186ea72433b2e9090de44ebbf2a8f00ef1b98f6870dcb2d3570da45fe3822d3f78353e2210d72a60ecba097dd593741316b8e155612e9d WHIRLPOOL f7c7e8402de8a831b10829148293ca74b56a87f30569a88a6b817e5a7559cb0a47d84174cd4d4a676ac021cd325fee0698ba336720e32605d4c6d0cef398a4f9
 MISC metadata.xml 429 SHA256 e0acfca31fd047350b074b596b893d0c2287af457d72d69fcd2bc7d6f01cd2ce SHA512 187ab5fa9df062530b6a171174a6bb11c80495951143452ed9940b1aa94279ee3539b78aa332b9a3363935e3d6745c06dad927e6ebc4cc904eec8ba5d80cb061 WHIRLPOOL 8e8d59d3106ff359c39a24677e4c154c0f29039557e035610a702f1859e66fbbd8a8798cf5d8ab292cfd0aed5fd9a50a2ee5b791fd90c5e7d833bf6b03dd1e16
--- a/app-arch/pbzip2/pbzip2-1.1.12.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"

 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static symlink"

 LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@ -1,6 +1,6 @@
 DIST snappy-1.1.2.tar.gz 1485435 SHA256 f9d8fe1c85494f62dbfa3efe8e73bc23d8dec7a254ff7fe09ec4b0ebfc586af4 SHA512 da0e80528dfc815d765347c60dc5f14bc7fb882cc6894b87d3a43dec1a127cf8bcfe46e6cb93e130790c0ebd67368a1042500d9080f844441803c1b69c3cc07e WHIRLPOOL a9cf520cc578a0a63ebb7fb127428b50d282cdf2448938ad88349f775e21b3dd27f2c6843f86dd749d66e9df5e29094bc5c67032f0219932fec69f882ec91246
 DIST snappy-1.1.3.tar.gz 1509026 SHA256 2f1e82adf0868c9e26a5a7a3115111b6da7e432ddbac268a7ca2fae2a247eef3 SHA512 4c4f47c657a072989179be9df0e5e98d14f4a67c27ec7ae0e5a15d14289a75d4e266bc6c5c89723f3e9860408ffcc7138a815f8ad9299407c4a1946fc00ab5bf WHIRLPOOL 97f82d1439973582f0ba3fde43ba2ee2c23b2512e0ee426b9e372fbfbba87921355c1f6bf0bf80671d7c4da26a23d480508cb7a188e414b9cb5d95996bfabe39
-EBUILD snappy-1.1.2-r1.ebuild 989 SHA256 cf0f9c6f1579ac96ca8be629b04b65d8135372ed9581470719d61ca67ffceb4b SHA512 33e0b9b3a24b744c45cb6520934a65254ad791e1854092f0304bc8bdad7b8c4191706761753386e3c01059c57332fd66e7a46cbddab09518f2d897010bde17c7 WHIRLPOOL 79b2babab0cadb26d89f849da889cdae768091fdee9b7c80a30a3da5ac473037798760d1b23c0672559b246a37520f40ff269876ba8ae6b586a24edb398d8f57
+EBUILD snappy-1.1.2-r1.ebuild 988 SHA256 12d849046e25e556d5e4bfc3679fd21c7bd0ae16ed31bb8495e89580c14df0f7 SHA512 ff7f46efdd09a7238ee43e3b7d1198585e403242c2d14c3612a875591db26f7387426bd41030d67d2c69a2ba1e2388fb57f8ce16e74be798ff691091a045c30b WHIRLPOOL 1f39a46917c666331c7251b481eb3cab77819ee7c0d10050b76f99b25a65e080c8eca29de5cb6b1622fc5d9ea2d9a1075e15aef6be0dba97c5718c4ccee44a93
 EBUILD snappy-1.1.3.ebuild 957 SHA256 21f7682839b7b9d9867a107fe13f1a3e92d089b1d64f6fab78d54ec342d058cd SHA512 889018a275976016e4e4b783b0f29fcd0fad3c2d4a3e1dd5bfa8e18a26d8db8503d6166c470c767cc62b43651d2f836173c0cb50dab05a51a00e8b7283d929b0 WHIRLPOOL 0e705fde53d9ae522a2daef3f0cf35504c31daf31ea7c84d10bad63e926fcfd4a0a9fd5b7010001bac2dd0e84854f5382f4e9bc8d6f36f398e6952e288990578
 MISC ChangeLog 3009 SHA256 496f7049cf9169cd876f483f36355d834dae5d53ee5e7d4ea832d94f8a91223b SHA512 16b814e292d70e3d7b8483c2e033810a0c92cdbc2f6916c3804129fbc06b19315dd5fafb0984c1ec34dd269b447465e07e1eb2513a7f2bce2e508f51c3794b38 WHIRLPOOL 89c95a8bf42c4ca793e68599238a4baee414f5537937ac58019410e2740e5aa881cb5a235caf3eecfefec7ca031a1f04d4808c5340bd42edd85547d9d6857664
 MISC metadata.xml 602 SHA256 9e46d4e88f58ef86c2b1a0eec48c8e41706c5f0d6a13c9fa1a43601b705a372f SHA512 330d469147ead71de59d51d6d4fc505dd45ee30ad59139fc9dc94fc7d47dd7dcffa7672a0769e523d307f5ca5d2ad67aa7cd2c43a4e3cb4f61fa1f109eb9890e WHIRLPOOL f76e4b927ac4b9c5531980183e25f0aa5c232af554be55ee6daabe558b8fdbfacd5074035f2c4f1e5187d201b0fc0bb42fc0decb9dfe7e02f6ae1e74aacc7827
--- a/app-arch/snappy/snappy-1.1.2-r1.ebuild
+++ b/app-arch/snappy/snappy-1.1.2-r1.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"

 src_prepare() {
--- a/app-arch/unshield/Manifest
+++ b/app-arch/unshield/Manifest
@ -1,5 +1,6 @@
 AUX unshield-bootstrap.patch 644 SHA256 6f86a978778f91a103776e571a24588077d530cdc08c3151dfac1ba106cbd614 SHA512 fdf6137dab6b8a0516e3319fe85ea475d29589d031156c264055fd08515a026a31de79071e7fc3b2b7566b484edd1017784e879d68ef92a80956ade8398463c6 WHIRLPOOL 47e92cbff46bace208e1df16006bbc0526b84f8786e94da8cac3952789b776ed718b959af8383fb5ccc079f7e14edf6c62f00859a4cdc5864e15c2dc7a512b39
 DIST unshield-0.6_p20120308.tar.xz 31924 SHA256 5f857a496ff54b9e1121b8ce2ceaba78133e91e254203e81340010ee05224da6 SHA512 7eec3c401af4c43f599e1b1abae3efdc6b91bd132a86b6658656bec4f00040eed2b0addede7b555953ecc7b1c976fa03013820a25a68a226cf1b973caffb25c4 WHIRLPOOL 12d307b8345b604d10c42b52c28e1eb4eb9745a7b542da188b2a24c4a993b45cfd98a01740f3f30362c9b2714ba61d5e4c6f66a26e599356b5cef5b76130fc34
+EBUILD unshield-0.6_p20120308-r1.ebuild 887 SHA256 0f0787602ca9254e976024fbb86b538ffb7fac1433b0514f978b123ea0ed31f9 SHA512 8ae0861e6d5668eee6421f5f839fd3733654757dd285b79d3eff51cd9d4228e16e12211c3246c295ba760177022cf1e716f4098a094aa9afaf8e65839c9dc7db WHIRLPOOL f14e3e627fa8b98f241aaa84a0e69384015784a93fffb861d1e056f8d4d20de2841785fcd623e28eb9fca5ce1a3401c9dffe4c7aa35cc841f205c675d10f834f
 EBUILD unshield-0.6_p20120308.ebuild 826 SHA256 596ea095580f6f25488a6783c6afda8c0775f624b04cbf105e940032ae6c4a9b SHA512 996d0da62cf6481bf2bf816196ed88206b8cade57f05f9368c87cae83373aebdb8e8be97833e85444c5136e057d4dcb2fb3c09bcc97670a231f364cd5264901f WHIRLPOOL 8f66f7e3c018407472bac6e1b80d22a231e6702c9b7a237a22da9e1a4826e08684c36ca6c5154fef5df16c3ccaa2de436394a2ab72241e2acb56714327b265dc
 MISC ChangeLog 3948 SHA256 1e3c07bd6e6e8736e66dc5ef1c511f3bee0ac43dce6d8f08f8c5b00346637bcf SHA512 f92a5feef0319fc288a62b8c025b7b4217571be0bd42a294cab498b4638eaec9003be893a7481154d1f99789daad25efa399a0d7b2a5aabc2ba51fc5737d561d WHIRLPOOL 495fd38350565d7907926822ed39ffaffedf4b0a6d9460d64cdfd0958f58f73f10a569ca7b912c1fa094ef295f4785479024cd8abbddc213cb913e41c87ac1bf
 MISC metadata.xml 347 SHA256 6b8f7c5fee3bf3ee969ff1d32dc1b748d3f6449f3f41795cbacd151d3a289138 SHA512 8c9041cd8cb8e0d4fe38f1d3e907180289f69174156d91f61d79e14f5dd8630e35b8873da7628a029a3e976b96c1c1dae2001ded8893c4dc37552bdaed040a96 WHIRLPOOL 3ecc7ca729a709a8f886e63e814ce26d273a66140ef08aa8101fa19a437c802951c68a8b72f4937521a6fdeacb7097480593d9e8af6b340e9050e91339f5d315
--- a/app-arch/unshield/unshield-0.6_p20120308-r1.ebuild
+++ b/app-arch/unshield/unshield-0.6_p20120308-r1.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="InstallShield CAB file extractor"
+HOMEPAGE="https://github.com/twogood/unshield http://sourceforge.net/projects/synce/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="libressl static-libs"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-bootstrap.patch
+	./bootstrap
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467548
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--with-ssl
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README
+
+	find "${D}" -name '*.la' -exec rm -f {} +
+}
--- a/app-doc/zeal/Manifest
+++ b/app-doc/zeal/Manifest
@ -0,0 +1,3 @@
+DIST zeal-0.1.1.tar.gz 914203 SHA256 f4e959f9bc66a6e350ee8a33d34695379633432d103db9776c0c7a76cbc5a9d6 SHA512 388f3fdeb373d0061e72395d0e11a01cbe2365149a697cc3291b76f76f56e211afa96e6e31660ad16c88b67d62218f3d3b7a762102c0df45280bf85e2bfdfe8b WHIRLPOOL 5a5b2ecc49b724f642cb1e658d742b894620cf33f3086d5984033d9aaa7606726ff54522d2f78f1c06b555a59875e0595b2402d045728f474dd7b41cd42be3a5
+EBUILD zeal-0.1.1.ebuild 1030 SHA256 16220363ec6ba34a514d226736d61d0515adcfe60237d1d36c325dba98634002 SHA512 bbd3f6220b7ce2ae4ea0d8814c1106f79d5845d0f17e2e3d45b10ba5a3282195a97aaea74fd0fc85a96f667ad8efca14b9794cdee7af7d284dbbdce73b223e9f WHIRLPOOL 66af45e84827d8c6aeec62f9834f8c665acf3d0d67267eec905a77bf13d39b4ff220481569fd9d7c4219ad3bc3286699035748b64e59db6ea09d0790a2d85c7f
+MISC metadata.xml 325 SHA256 674eaf7ab8a2a2b0d06e8f896c75eac007334731c0ca4b51c1be19b8792d58b9 SHA512 530e9bd0342b46690af7a24fe569da6eb45be326d2f0bc2f31c2285e86440784c5600b04e7204d5568955d90888f39e3bdba03ee109d72781d57b4777d026dd3 WHIRLPOOL 80727d8443281f9d555eab1e72e9fff46c7d145e41756ef31dee955ad4de0e437d71e0f38897fc93fa9e9f3f8653598abaa1873f074b6a473eb008af90090097
--- a/app-doc/zeal/metadata.xml
+++ b/app-doc/zeal/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>tranquility@gentoo.org</email>
+    <name>Ole Reifschneider</name>
+    <description>Offline documentation browser inspired by Dash</description>
+  </maintainer>
+</pkgmetadata>
--- a/app-doc/zeal/zeal-0.1.1.ebuild
+++ b/app-doc/zeal/zeal-0.1.1.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils gnome2-utils fdo-mime
+
+DESCRIPTION="Offline documentation browser inspired by Dash"
+HOMEPAGE="https://zealdocs.org/"
+SRC_URI="https://github.com/zealdocs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${P}/src"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/libarchive
+	>=dev-qt/qtconcurrent-5.2.0:5
+	>=dev-qt/qtgui-5.4.0:5
+	>=dev-qt/qtnetwork-5.4.0
+	>=dev-qt/qtsql-5.4.0:5
+	>=dev-qt/qtwebkit-5.4.0:5
+	>=dev-qt/qtwidgets-5.4.0:5
+	>=x11-libs/xcb-util-keysyms-0.3.9
+"
+RDEPEND="
+	${DEPEND}
+	x11-themes/hicolor-icon-theme
+"
+
+src_configure() {
+	eqmake5
+		PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" PREFIX="${EPREFIX}/usr" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@ -2,11 +2,11 @@ DIST emacs-25.0.50_pre20150523.tar.xz 25311384 SHA256 2dd6e7adb8e3359e00a8cbc15a
 DIST emacs-25.0.50_pre20150531.tar.xz 26741144 SHA256 ad984201fb56ca09f48a09fa2d3ae2cc151c31b724ffd7de3926780817f0e1b7 SHA512 f9f019a9cf53a33b9c2a3374fe132d321f4e39d3d46ba83c637aaf32d02bfbb518d0b392311e47cf1eba349fcbdc6fdf3d8bbb248afed587168dd5bff110563f WHIRLPOOL b3d42367f726c0bd5e8335c4925ba3e706b7f74679c76e655db94334a761085273d2d1279d4a16867fbf462a82ad504f60a17f0c2eaaa8444b3808045acd513a
 DIST emacs-25.0.50_pre20150630.tar.xz 26793504 SHA256 b2bac514c9f345ff8f515d8cbcfde7dacf69644bce9a1353c42d5d7940603f3c SHA512 9bbd7afe4a8053273b06b801b70c4397d4f60365ca50cfc4677224304ca79e0acb6d709c6de2461257f61befaa21f80311f82b5ca47f739193340c7c4bfefa92 WHIRLPOOL 7a9badcfa89a53557f255bc6eb28e03d364dddf6343e56bcaf2dd9229054c41e9b7c5b23440322ccd32950b2c7d7dd1edb6cc1ae5c7c82543585d21de8c29937
 DIST emacs-25.0.50_pre20150731.tar.xz 26825232 SHA256 80127a9d905918066c97df81f3e489dbd30f323e9dec2353d33f124522f91c81 SHA512 9834d191e98e780e8ba8f2fa07b50dda6d380a3e220ad0590bdc160d9e2c9cd3c0b0acd5e8d52f3f0f44070280e3686bd7facd78f9bd4b3f6ce0723f1b3311bf WHIRLPOOL 0c0ec4f99630771da61d5bc80b9001a61fa3b7f49f09b6e9a5dd402a383c4d13717c50d86da9d63ad01dd2fce5ac5d7812bcdcd3e31eefb5f0ad4b00d0cc342f
-EBUILD emacs-vcs-24.5.9999.ebuild 11822 SHA256 8cb7167afb9c452c60b90eb0a478302c4a4a0b1ff27671488d4377c75c6aa184 SHA512 b0e6f1437943f091c9b271f84c9be106a459f70f090ddff3b2b816e37ca90d4c143073d2064a57242f1d0a289a82d87d8eae0e246fd88946cdb12eff9ed77a9a WHIRLPOOL 43f9e601213e0b927b862ccc4da15b65daf2d9e563b3dbc6c8041b0687ce9b97fb263e910aef4c3333936e755cf244fcc87a392f8ed91f5c062e2a2c71f22ed7
-EBUILD emacs-vcs-25.0.50_pre20150523.ebuild 11821 SHA256 859aa14ef53761e7e149233e303def0794fa8d911cae346f89d11a5987881cbf SHA512 5339b2adebf3c96dc24b02f6e528a77ea0b80249dfecb1a606c85f072a8c7158a5ca4b77b916c0e435297e5cac1036de982a6dfcafbcf136cdeea5e6b337edde WHIRLPOOL 28079ed27f213610fad59ea68d2b21732ff8efa6d9e3a0328e2d4ffd318e017d81fdd5c17ce59e72795b87377b2bb5507b8e31303fe7cbccb075e70959f250d7
-EBUILD emacs-vcs-25.0.50_pre20150531.ebuild 12014 SHA256 b96e5267584340d070f73a874c3c69a0b4041797e54984a943325b639b7acf0f SHA512 cf43e82f4c868b7a6a05eb51e104ad2c5e7acb0a9cc5765690d1808653e535207ced7639a4325741046a6ad8dc2e48c2be665e2ea48346b651eec4cd3548e5f9 WHIRLPOOL a5052fea6d2bf298590dc3e01c48f2fcc0308dce376a8ea1f8e6ab917a36d68ff8401d75a601875e3cc9a1c200723328b6bd5619f1257786a7294986e5c8d406
-EBUILD emacs-vcs-25.0.50_pre20150630.ebuild 12014 SHA256 b96e5267584340d070f73a874c3c69a0b4041797e54984a943325b639b7acf0f SHA512 cf43e82f4c868b7a6a05eb51e104ad2c5e7acb0a9cc5765690d1808653e535207ced7639a4325741046a6ad8dc2e48c2be665e2ea48346b651eec4cd3548e5f9 WHIRLPOOL a5052fea6d2bf298590dc3e01c48f2fcc0308dce376a8ea1f8e6ab917a36d68ff8401d75a601875e3cc9a1c200723328b6bd5619f1257786a7294986e5c8d406
-EBUILD emacs-vcs-25.0.50_pre20150731.ebuild 12014 SHA256 b96e5267584340d070f73a874c3c69a0b4041797e54984a943325b639b7acf0f SHA512 cf43e82f4c868b7a6a05eb51e104ad2c5e7acb0a9cc5765690d1808653e535207ced7639a4325741046a6ad8dc2e48c2be665e2ea48346b651eec4cd3548e5f9 WHIRLPOOL a5052fea6d2bf298590dc3e01c48f2fcc0308dce376a8ea1f8e6ab917a36d68ff8401d75a601875e3cc9a1c200723328b6bd5619f1257786a7294986e5c8d406
-EBUILD emacs-vcs-25.0.9999-r1.ebuild 12014 SHA256 b96e5267584340d070f73a874c3c69a0b4041797e54984a943325b639b7acf0f SHA512 cf43e82f4c868b7a6a05eb51e104ad2c5e7acb0a9cc5765690d1808653e535207ced7639a4325741046a6ad8dc2e48c2be665e2ea48346b651eec4cd3548e5f9 WHIRLPOOL a5052fea6d2bf298590dc3e01c48f2fcc0308dce376a8ea1f8e6ab917a36d68ff8401d75a601875e3cc9a1c200723328b6bd5619f1257786a7294986e5c8d406
+EBUILD emacs-vcs-24.5.9999.ebuild 11838 SHA256 2efeabc9cecc44fd71f62450b7b47adf6d93b9ede16325fc0e0e71b2581453f0 SHA512 3214c3072f2f33a9d3b907b7702d741a3f92634a5e923de4a787dfa9cc49c32a1b5f4721bcd3a08cacb7c5452ee9fe8810a4589ada05b6f2d0089c2670ae4d8e WHIRLPOOL e544b28b9f3e81529774f8c953a1682a99f2a9d05b90cb705c2ac4ffebd72174ccb16c35d6d6e208e0f3d5dea40ae35c7fcec06b8f1cd6c17b445432001e966e
+EBUILD emacs-vcs-25.0.50_pre20150523.ebuild 11823 SHA256 82edd7d8b2e7980865329a71c5dd814e8bedf08155eed18cc11473097cea5ad3 SHA512 eb497965c17f7311b7aa4b61e7c51eb8cc71059cc7e448e588961f7b0d9b10c4b06678a590bfbad169141a1f2819fd60b7f713f8242808cc04d417747dcd50fe WHIRLPOOL d65d4a9e4e586fd50843beacad02ac8b131269f71eb2a23ba02492cd4b9a8a49fbbe3c10361c6a93aade2babc7dcfcdb2b1ffdc3073909db5996fe161ebf3d5f
+EBUILD emacs-vcs-25.0.50_pre20150531.ebuild 12016 SHA256 bae266f2b7480d8963cdcad9e8cb9fbf99fe101f295b4431a4d7ddc2e65f9dc6 SHA512 c9d5de1107a117a3e1f3edeade2cef17b580746bf183562820e6ecc383cac6086ef877fc4c51624feca53caae0aa76f26d81212c237f1b25329abeecd83258a1 WHIRLPOOL f4ad43a4623537aebfc451ca4ab53e519610f92429775e7ca61aecf2a8205868b514bc0caa61430e823fb959f6e10e0b47aa104efef47fbb1e26599b8b284ed7
+EBUILD emacs-vcs-25.0.50_pre20150630.ebuild 12016 SHA256 bae266f2b7480d8963cdcad9e8cb9fbf99fe101f295b4431a4d7ddc2e65f9dc6 SHA512 c9d5de1107a117a3e1f3edeade2cef17b580746bf183562820e6ecc383cac6086ef877fc4c51624feca53caae0aa76f26d81212c237f1b25329abeecd83258a1 WHIRLPOOL f4ad43a4623537aebfc451ca4ab53e519610f92429775e7ca61aecf2a8205868b514bc0caa61430e823fb959f6e10e0b47aa104efef47fbb1e26599b8b284ed7
+EBUILD emacs-vcs-25.0.50_pre20150731.ebuild 12016 SHA256 bae266f2b7480d8963cdcad9e8cb9fbf99fe101f295b4431a4d7ddc2e65f9dc6 SHA512 c9d5de1107a117a3e1f3edeade2cef17b580746bf183562820e6ecc383cac6086ef877fc4c51624feca53caae0aa76f26d81212c237f1b25329abeecd83258a1 WHIRLPOOL f4ad43a4623537aebfc451ca4ab53e519610f92429775e7ca61aecf2a8205868b514bc0caa61430e823fb959f6e10e0b47aa104efef47fbb1e26599b8b284ed7
+EBUILD emacs-vcs-25.0.9999-r1.ebuild 12030 SHA256 0cc76e9021eb3e5619aae1b1fb2f2e592de32704f5f4aa7f7ca40f4c97bb80b6 SHA512 3b4a3668705158a7b9c214b157a34333a94090aebce8f1295e790096443327acb60110e413d55edcbff5270fa3cdfa2ca48e3114d5c4d1ac86a1351addd34297 WHIRLPOOL 76f127a0ec18151afc0558e2828b4a46796f8cd0eaeafd3340b0c4256185f6bd3385e7c4d47bf7194fff432814c952447ee3bb639ab3611295424aa95377ffd7
 MISC ChangeLog 86237 SHA256 ce19205e1c53f0b9c690a754434783f4e5a8c3265f3ed3580e670dc14109c107 SHA512 fecc40cad7372dc11f3a6cbccfd369e4c75d92a3dd57c7bf671df624a2d120d8496e088a748580937ec7a68d3087cb2e7a3393799124a7ad991447badbf22e58 WHIRLPOOL e0d14721260bc439a87cc70e386a4a04607aa3b20d29fe1cd195a4c613427a1111daa7c808d0ffaf7dc3061b9299986709cad3a531d8793f134129c94482246f
 MISC metadata.xml 2489 SHA256 21b3602d37aa25bca31b05ea810b37ee2192f4e53b8f8daeb814d9dca59d03d7 SHA512 4f3d663cd61253ae3390c55c5974dd3cc22dbf1306a823c3cb71794d09eaf28d7727c7e24f66f02dbd8d3845894f3a8cafa5ddaf330c1bbb7f99d8130ece077c WHIRLPOOL bcefdded503fa9cebea943952d3f56847002cb5ddc10f5adbd774301b648d1b12a09da7e493694f9cbbb19e8b53b66132cbd2e0141ded41b226415cfdbbcf8f6
--- a/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
@ -32,17 +32,17 @@ SLOT="24"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"

-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
 	net-libs/liblockfile
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
 	gnutls? ( net-libs/gnutls )
 	gpm? ( sys-libs/gpm )
 	hesiod? ( net-dns/hesiod )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	selinux? ( sys-libs/libselinux )
@ -218,7 +218,7 @@ src_configure() {
 		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
 		--with-gameuser="${GAMES_USER_DED:-games}" \
 		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
 		$(use_enable acl) \
 		$(use_with dbus) \
 		$(use_with gnutls) \
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150523.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150523.ebuild
@ -32,7 +32,7 @@ SLOT="25"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"

-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild
@ -32,7 +32,7 @@ SLOT="25"
 IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"

-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild
@ -32,7 +32,7 @@ SLOT="25"
 IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"

-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150731.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150731.ebuild
@ -32,7 +32,7 @@ SLOT="25"
 IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"

-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
@ -32,17 +32,17 @@ SLOT="25"
 IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"

-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
 	gnutls? ( net-libs/gnutls )
 	gpm? ( sys-libs/gpm )
 	hesiod? ( net-dns/hesiod )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	selinux? ( sys-libs/libselinux )
@ -223,7 +223,7 @@ src_configure() {
 		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
 		--with-gameuser=":gamestat" \
 		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
 		$(use_enable acl) \
 		$(use_with dbus) \
 		$(use_with gnutls) \
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@ -7,9 +7,10 @@ DIST emacs-24.4-patches-5.tar.xz 6000 SHA256 967dac364282a51933f90c56f368bc3f274
 DIST emacs-24.4.tar.xz 39733124 SHA256 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd SHA512 f51f88a4736a3f153ef01f3ad710571e967cd3d0c0112b066169a4040725d370ec29b14a4ca8fa3e3f4c657c726ba8e64c3ac4e390b8e911ea47a3afb5ac755c WHIRLPOOL eae38c2382731fecf0ccf8f717f8c96cc130d01a893ff560caecde903294eb843660492761ea8cce9920b79bfc55e821921924e27c040f25355110f56cd2255b
 DIST emacs-24.5-patches-1.tar.xz 3744 SHA256 dbcad232dff47e5540fff33351d76a92165e3d379a9c1fe52c04268a1ae245f8 SHA512 0c17546211493a521eec026e05722ebfa0988d2d97c916f8ddbe4d54220fbb6256cb8ad76769a8832fe7028051ecfe04d8ac46da71d7c5a6d2906b57466496db WHIRLPOOL 29cbd3513a62b025994918c6fbf86d70e282dfc0b1fc70639afcf356946e7c46ecc099a552e3735346d6b13c494db93246605eff002c34f1d0859ac04f1025fe
 DIST emacs-24.5.tar.xz 39759804 SHA256 dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 WHIRLPOOL 3d9f8fb840f4c846246e642369f967ba0ec357c7cf718ed865523a3cd39605ba14b8c15fc9ae3f076c27e5b6e41fcb681d15f1c6ffc5934430c0a2bf47c233a3
-EBUILD emacs-18.59-r10.ebuild 4108 SHA256 d37e3e6f87bb979b32a183172d557bd46e940beaaf99524e9904312b0dea11a8 SHA512 51e01092ab5e47379cfb0401c8c3c4c74149504f09a8e46841e4235dea89358fa37e64816406f13956140d04d5fa7cbb35257e0614031da61acd79c2ed4028a5 WHIRLPOOL b52acb4034b3116888fe7c4c60f15ecd81e83bf9d811e440a1348c1414b57cb1d57a957057ee91c55bf5a709e14da765218bcb20b67a835b5ecd83c1872fd1a3
-EBUILD emacs-23.4-r13.ebuild 11201 SHA256 dc39ed807a174cdd6070ee7d0b742ca536839f8477c1306c41fc93c30f22893a SHA512 dd76a64376f4d95ece2570adf290975e50df6f0f711c63c22ccc6ec6449666df466d47e845d2d2040049e070b3d324f4f989c068a37b88906f93dd02be881d21 WHIRLPOOL 62f71a77d7d7654ff617a3e624cb6b0c5b6a2b3d33ec6c5657d656420879a8834f45bcb1c230d82d3aef8a22155f331d86ce85ebe62bbbb19861179c3b80202a
-EBUILD emacs-24.4-r4.ebuild 10561 SHA256 d3d5775622a5e5f7da9ae36fa213ef0691185da34e0bfacc7fc18fb5673d6e0f SHA512 d2b8ec8b803f972f6156236822641a191be70d9677d307128c4b9aa0dbf8ef5b41c02a2bbaa5a232f8acc47e5df0f072fb01f028e37316e267a106ac115c8680 WHIRLPOOL b5d766929cdc56d9a3a4d1fcc2e804ad5c144f7d41f5c23dcf16034fcb460e3b390631473a9d19f8c506837ab4dae4f1eb00c9c8ae1897f9b97dc13e3c05f350
-EBUILD emacs-24.5.ebuild 11040 SHA256 7f7f161c624a3ed79b9d0b5ba024754adf9f77294885c50566cda7618641cacc SHA512 b3aa730a4b238adac839a6a63774cf6b6c5beead4d9fe561c6e61571e1f2a80fd7e7b9d3df0a2388de92c18ebe7f3ff31946127e7deccacd423355fb8af2c323 WHIRLPOOL bac45ed220ae7f3ea61dd60d878cbcf2e57b84f7f4bc513788771d8110e4cf4d330e4b2c84990c4cfccb16c68eace2031460c230484212ba69c57a369fc0500c
+EBUILD emacs-18.59-r10.ebuild 4114 SHA256 83ae94e8051effaf69c632574f71bb89e7c3b9035ca34acadd7946e1e795eb6c SHA512 3b33ef097f37c8a85aa5ac3400aded4a32cb11e139971887f1d9c7bfe6519578f5d43560596ad6b31d64997e076df1631496b64b47bd5745f88c0a2491a334ab WHIRLPOOL 08175e8e97577f10bafe5946d31526bd8568cbea55ac9503a415bf9e33e097577fca4af0f354953257d73225af849034173c1db441e58567b5d80c2c8216e0bb
+EBUILD emacs-23.4-r13.ebuild 11203 SHA256 037784d9c161e9e2eded28ba17db1dfc3d0e3ffc1502f149c54eea7a494bf5ad SHA512 9209d04493a0dcafe595d5da6db39af391038bc23913519bd8b4b1ea2ee8a97acdb59ad4ba3d6b986c2066146da8f405de3cc68421587f57ea7e53f61718bc17 WHIRLPOOL 1764e8b39f9ab6abb4152828573447bbe1f020258a3e09c9b3f62a7dfde2c19edcfa1e9ac33129e532d0d4d285cdeec367c2a8cb7eaa324762f039f559dce95a
+EBUILD emacs-24.4-r4.ebuild 10563 SHA256 8a01e709379cd41280709ee7f5efbb62f1fd88700508565fcfa22f70cc53ccb3 SHA512 7c019a42e196986bcc0ff40186e3187e28341a70319568355af1e289d0884bcb17955f3f606dffe1fe6566a01691158dc964c594b7a3bab4182c236afc41f4fe WHIRLPOOL a21f1a575131844e7156003b8cb1bcdfa49f8d27203751ee5e638ae9a75b75f22a9c2d1a305aea965f9b65b399a263cbbbb3adbc51f19e54b6830608e3d2e3ed
+EBUILD emacs-24.5-r1.ebuild 11064 SHA256 1a0a8f8803855636aa431267043cd2516d208a79aca7277cbb77fb0e772ed9f0 SHA512 6cce21cb7cade22141518d0817ab1407f86274a35a94ce5805bbe582ad04345ed64e47d06c24450b7806deb0a549c25db25d1ee1c6ec90c9be2cf63c6d630967 WHIRLPOOL 6f2218997c89876a505adf674a2e8a89f624e8ade79975074273e265019364f185accbaa5db58726b5883184ced59b63bb71c25ad0a341e3c6394b69f2b57b12
+EBUILD emacs-24.5.ebuild 11042 SHA256 56afacd9b5bb479ba1f610004527acc2850e1dc75da9896c074b079e4f1e38c8 SHA512 0314c21df63bee3a955b9a1bdddee560c7d6e0186cacc99dfcc867d53735be250a349336e0d8f1cc818b70bef5358c10d62bbbe37bf5c6e73c647a036b51080c WHIRLPOOL 2a9d0a2beffdd2d319c1b22dbbbd04171f3585874868721eab594268047893672102a26c1c402df9bd77fe098425860163dc493c63924457ee1ba44eecec490b
 MISC ChangeLog 93870 SHA256 0de5747f6d5fff7e3dfca0a37269e4c804d6ab3c9fdb34d39e51b650ce46117a SHA512 d41a91ed0454ab885df588edc8a7ee1b97faed64cd479dc12fadbb8056c36b81aabd43ea521171db511e7061ccbfbaec4c443924528dd1779147a4cf5537bf57 WHIRLPOOL c51fbaa8eae82fb02fc76683b2cdf0de65321b07fc1f5b9c2d929a605ac48ce7354f1d4fdc9a7bf1833e9e7280f4cd62e9130b94107b5860890d255ba1b14ea7
 MISC metadata.xml 2489 SHA256 21b3602d37aa25bca31b05ea810b37ee2192f4e53b8f8daeb814d9dca59d03d7 SHA512 4f3d663cd61253ae3390c55c5974dd3cc22dbf1306a823c3cb71794d09eaf28d7727c7e24f66f02dbd8d3845894f3a8cafa5ddaf330c1bbb7f99d8130ece077c WHIRLPOOL bcefdded503fa9cebea943952d3f56847002cb5ddc10f5adbd774301b648d1b12a09da7e493694f9cbbb19e8b53b66132cbd2e0141ded41b226415cfdbbcf8f6
--- a/app-editors/emacs/emacs-18.59-r10.ebuild
+++ b/app-editors/emacs/emacs-18.59-r10.ebuild
@ -18,10 +18,10 @@ KEYWORDS="amd64 x86"
 IUSE="abi_x86_x32"

 RDEPEND=">=app-eselect/eselect-emacs-1.16
-	sys-libs/ncurses
+	sys-libs/ncurses:0
 	amd64? (
-		abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3[abi_x86_x32(-)?] )
-		!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
+		abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_x32(-)?] )
+		!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)] )
 	)"
 #	X? ( x11-libs/libX11[-xcb] )
 DEPEND="${RDEPEND}
--- a/app-editors/emacs/emacs-23.4-r13.ebuild
+++ b/app-editors/emacs/emacs-23.4-r13.ebuild
@ -18,7 +18,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"

-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
--- a/app-editors/emacs/emacs-24.4-r4.ebuild
+++ b/app-editors/emacs/emacs-24.4-r4.ebuild
@ -17,7 +17,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"

-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
--- a/app-editors/emacs/emacs-24.5-r1.ebuild
+++ b/app-editors/emacs/emacs-24.5-r1.ebuild
@ -0,0 +1,347 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="24"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses:0
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	net-libs/liblockfile
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	gnutls? ( net-libs/gnutls )
+	gpm? ( sys-libs/gpm )
+	hesiod? ( net-dns/hesiod )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			gtk3? ( x11-libs/gtk+:3 )
+			!gtk3? ( x11-libs/gtk+:2 )
+		)
+		!gtk? (
+			motif? ( >=x11-libs/motif-2.3:0 )
+			!motif? (
+				Xaw3d? ( x11-libs/libXaw3d )
+				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? (
+		sys-apps/attr
+		sys-apps/paxctl
+	)"
+
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-${PV}"
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# FULL_VERSION keeps the full version number, which is needed in
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+
+src_prepare() {
+	EPATCH_SUFFIX=patch epatch
+	epatch_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-gameuser=":gamestat" \
+		--without-compress-install \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with gnutls) \
+		$(use_with gpm) \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with libxml2 xml2) \
+		$(use_with selinux) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
+}
+
+src_install () {
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+		|| die "moving emacs man page failed"
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{applications,icons}
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and info
+		pages. Therefore, several Emacs versions can be installed at the
+		same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+		strongly recommended that you use app-admin/emacs-updater to rebuild
+		all byte-compiled elisp files of the installed Emacs packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+
+	local pvr
+	for pvr in ${REPLACING_VERSIONS}; do
+		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
+	done
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
--- a/app-editors/emacs/emacs-24.5.ebuild
+++ b/app-editors/emacs/emacs-24.5.ebuild
@ -17,7 +17,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"

-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@ -1,8 +1,6 @@
 DIST mg-20110905.tar.gz 138805 SHA256 1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229 SHA512 b490a5a3526d35839353e138f33ac924c5afbbf7e5c9faa20ceccb82e1dc1e6a3f0726b32bac7d43dcf8a410b1b8525067da5557cf669c52a9e32d1d2f45a8a4 WHIRLPOOL 64dd179462a8c9e53946c756a4975ffd2e5bf1758a300fa699032542a6e2470f9ed03f9fe1a88ac441cf17ac20c2575f9b6c5c1c396c5a7915564fbedfb1c854
-DIST mg-20141127.tar.gz 143364 SHA256 33cccebca1cb129de5f26d74750d5a1654bd461e6ab0785703de9f16c19b0ba6 SHA512 97160f311b0409c70162dc80d72370e828db6181fa4bf11a045f01b7df8c272edeade5d6f3e2af7fa74f59152fe69130d5638b2c184974e59c4bb6fe27864d40 WHIRLPOOL 5591e36139e5da3329d9fa7f17b2e21987a8674c7c3c8edeb17bbd8c93879447374d70808af86d38de23f28f6e3b491def437b9135193abec02dc9eaae691b0b
 DIST mg-20150323.tar.gz 142105 SHA256 d71b24d47d3e1426f162e446d92dfa457df96dd47c1289419cba9fd14c2c3afb SHA512 747a04c203509cdbe84d9cea6c5be93585cdd5cb855b556ea5dee273a2923a4a68bee3f952cf92d584fcdd682049cb4442c21888304ba036851127174457351f WHIRLPOOL bdba74b62034a6613434fc3efea7b56fa1599b6059ab97dbd760b013be7dc50ab13dfcee3f5fb1f41f4c26c3f0146583680134d3809ec7977a14a28cb345c6db
-EBUILD mg-20110905-r1.ebuild 1118 SHA256 9570f81fb9a779f58b7587e747de4d2283f7dcbaab6146eb7b53c443485a2ba2 SHA512 d5e263045a5e69ef491bfcb564c2d57ca25ee0a9ce13d537753aea8b784667709b89e0e5ff4fcf5b5c7b7473245b22f27ec74ccbffa9c351273c60b13d7e14cc WHIRLPOOL c00a08441ed3cf72b34c14c0efff68ad4d297bea28afa1e751894a766199c016e76a6a6dacfa0c140abb617b54248d4b42c39e55bed24b2e05fb7ccfb0b5747e
-EBUILD mg-20141127.ebuild 1202 SHA256 73919dc63253bcb0a5d1461bd36614db6063b4a5e91418f44bb4aee4d0172c23 SHA512 f488027337b3df1d3678add0cb798dc4f0808fb70026a5a2cafffcc0d53f92028e47e713843cff46e5d6d9f047def6b4310151d7994c64babd95808ca92c3dd0 WHIRLPOOL 938338dd65db9e33cfe81d21d2e52e3e4e7ff80568771703118678fdd4261b9249ab8af4e8118afa589fe90ec4b9547ae38162976666896b30ccf0e4099bad78
-EBUILD mg-20150323.ebuild 1201 SHA256 8a455602e9767324986e3285d9169e699dd79b65cad2e94aefb6ce98392c916d SHA512 24d9bf6d589192ad5696c07db74f00b701a3d5f9f381cdd321a6646f37f797b8c65c5605dc4d18811622f842d5e97769d3f87c1caa1d90e74d6599a1cd59e5d7 WHIRLPOOL 9135898bf3749312aba4621caf872ee883e2bd7dbbf72f53aff291f6fffddc56045501d8739eecd8a4362d5f69dd2f68ffd9b0c565c7b417fafdea64cd57c960
+EBUILD mg-20110905-r1.ebuild 1120 SHA256 9c10df6c016c61a21f80c65ba8ba51e464f4cf52974c97aaf0a546a316f5e5b7 SHA512 300f6fd1d6003d9f1ce742a993980bd746267b6da7e5ae3a8178c1fcc36adedd65e624f64e484be494fa879580da1c633b17ae94400f966009f7b6952c21b5b7 WHIRLPOOL 1592dfca2210e1c9a6b06d9111a2cc2153388a8806603a6b9f42051d9bb36a97daf3d2445d76aca9a94649f1633351a1367d17cec62846676342133e3641be10
+EBUILD mg-20150323.ebuild 1203 SHA256 579e7c9e92a9f979e010ce93d3ca2fd205e58dba16d0eea29fdfd5292eb9b1ae SHA512 3a5c9a717cc4230da1f740d8a6892200ecdce1d735223e3dc0dbb60c9aa18f50699eed371e308dddd580e7145a92d0ea6e0b1c1cdffa5a06b77c38153ec8078b WHIRLPOOL 41fa6386e0bfd9707618fd9072e0b234252cc79bc2a61c51a0f3bc0db73a66efd370f697a83bfa8a69b338fd5484b5ed5cb124d41aae2bbea69e673e9b81e652
 MISC ChangeLog 13105 SHA256 cace27ac64a502179a77766381bf98b078859762af50daa67b9d131d2d75d4f7 SHA512 057a9507201db1602e4fd0df06332ea74582c318102efafcc8a2750aa6f17157ce82288cb0e03b5cb62c04f812dd55e0e5158598d7dce98c37e04d891385662e WHIRLPOOL dbb8b7881a97248ed45ac6ab4fcbf09df44bd5dd91ba630dd2b883ea82ec62614c2ce979cd5de329e8a76b7b1d6a52661b2f4a0583b11830984f41b5730f0b79
 MISC metadata.xml 291 SHA256 65d24d4c0b435503345283db1c00cc7161174eddecc4d737cbf50d924145ca6c SHA512 2ba87a6af0cc36ed2e49ded86f81a6e30b2b9ca9e73949860db9f30bac95ad7374fe1e0c5e712f3c427a8a562ceb57c9693aea967f7c134d5858aca4ec704ba2 WHIRLPOOL 604f60f36640570753ef76af4f260e3103dc8cdfbb8dc00d585d864a6ce8fc3f573a95340720d00c9ebfccc817c13065419090aad6c281a96106b423bd88bd38
--- a/app-editors/mg/mg-20110905-r1.ebuild
+++ b/app-editors/mg/mg-20110905-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="livecd"

-RDEPEND="sys-libs/ncurses"
+RDEPEND="sys-libs/ncurses:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

--- a/app-editors/mg/mg-20141127.ebuild
+++ b/app-editors/mg/mg-20141127.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="http://homepage.boetes.org/software/mg/"
-SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="livecd"
-
-RDEPEND="sys-libs/ncurses
-	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch_user
-
-	# remove OpenBSD specific easter egg
-	sed -i -e 's/theo\.o//' GNUmakefile || die
-	sed -i -e '/theo_init/d' main.c || die
-
-	# fix path to tutorial in man page
-	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_install()  {
-	dobin mg
-	doman mg.1
-	dodoc README tutorial
-	# don't compress the tutorial, otherwise mg cannot open it
-	docompress -x /usr/share/doc/${PF}/tutorial
-}
-
-pkg_postinst() {
-	if use livecd; then
-		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
-	fi
-}
--- a/app-editors/mg/mg-20150323.ebuild
+++ b/app-editors/mg/mg-20150323.ebuild
@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="livecd"

-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@ -6,7 +6,7 @@ DIST scite355.tgz 2302137 SHA256 20515597ac986f1727c97bda2c27d88487ddb79cfe330b0
 DIST scite361.tgz 2347061 SHA256 bdffdc28c501dbb5e3dc6cbfe3808da2d574df983790c6ddfc2643040023a010 SHA512 5ead063ba98798ec5aa188735f219a19e788fbfaf12c84bce61a08c356e85e73cbbac412731cfdec02266bb8fa94d2a461239ffaba14b99ea65c31eb770dfcc3 WHIRLPOOL 8279b3fea54d2ef266dc5d5cb2b16896731e75d20bcdedaa59570e49d8b201fe7085ecac8f63cb06f2511ebd817d137b5189834d19ee7d4ffae43eaf06d465a7
 EBUILD scite-3.5.2.ebuild 2103 SHA256 bfea045eff5d1f62d6e96636e351500b808a3c1fbabfec01d8afa05c1c977ee2 SHA512 50b0a32e7ce7d96ebbb416ee846d8d062967c1d7d052e838b11bf8f4857558b044408e36bc88e356d1b7f33ed2960a8ecb52fdf0b612b9f7589b0ddcb06b05fd WHIRLPOOL 5956e5bd75fb84c9041a9f9b1d17a194a8c85e092e817f0673ef53ec3099245f68565e383081d6a1fcb2545c68e16ba3c2696e0309d9be0f8a14778425badfd8
 EBUILD scite-3.5.4.ebuild 2042 SHA256 e2b7e54035a81754889f546ef4c1fc24bed6c59d779ed536a201ad7182073be3 SHA512 b710846f3303d444058e2a26a0d526b3586bfc877999f2a25b16896d811b2f2f83a3c5f487568c997db4065f3b6c10f348e2189c653630578c22c7f4cedd5778 WHIRLPOOL c07962a35fee015a9dcc07872225ac689c5ddf1f52b774a04207f6fd0b92f12c172635fd5dbf73b4ffb7c374a0d2161a34619d16301ebb0e44007ffec6e6677d
-EBUILD scite-3.5.5.ebuild 2041 SHA256 c1a4a9abc34bafad2d5e2f6ca62673296ee34b03b49622321ca4db8e9d989a3a SHA512 f53c34215d146e6ae5c653b330c154f214e97e340039458420b695b049046e5944a33ff7e425388379b8ee78b3b87e83d66931b0ad7c186e9b7275c699b97b4f WHIRLPOOL d5dfde20b1c13a4edc7295531b04e76d3f425a3b7dec419437eb49c441ca1ff0d260656caeecf985791bd229f28683138035b7912b72aa882aeb09bf9ddeb1ff
+EBUILD scite-3.5.5.ebuild 2040 SHA256 02fa99f55f517c30722369274ecd9b3b7100d6b822641ff31c30d74ed105e300 SHA512 67ccaa4dedaf616e6861bdb559ccd5df76e774958716cd76fe0bcd1d007bc4f5c5c0a14d5b215b2cea955dd2db884e3887fde44d14dcf9424d77406b9d64a251 WHIRLPOOL 3fff6ff0753ed60103a53c1c9832e8a9f71cb07e9b6cd2cf815437bef5fb5f8c115e6d782cbfe9dd6a7ce8e443253f643a42089c790aa76e4e024a704f341e43
 EBUILD scite-3.6.1.ebuild 2042 SHA256 e2b7e54035a81754889f546ef4c1fc24bed6c59d779ed536a201ad7182073be3 SHA512 b710846f3303d444058e2a26a0d526b3586bfc877999f2a25b16896d811b2f2f83a3c5f487568c997db4065f3b6c10f348e2189c653630578c22c7f4cedd5778 WHIRLPOOL c07962a35fee015a9dcc07872225ac689c5ddf1f52b774a04207f6fd0b92f12c172635fd5dbf73b4ffb7c374a0d2161a34619d16301ebb0e44007ffec6e6677d
 MISC ChangeLog 25317 SHA256 3b1310b98327bf4b23c3acb7d15f883cd0a9d13cf2b6f92f97259f2b43da9fd4 SHA512 1f3c941c3475a4eba7bd4e7ceb3993f6fb625987d6e0a1689d3911331574ad5d1ed6b739dfd8ffb28f9b8f1a90d3ffedf6ecc2040678964db2ad049d30d19774 WHIRLPOOL 9b99f277b6e4f0b049afd7135a452c076d985c8d474bb9db9f9f9e847b99c417bbb810ce8e03468e4e1bd79a3424210108a1f9302d4b561942f40bcd0c8135b9
 MISC metadata.xml 407 SHA256 7624fe9a5e74e954ac0568c56995a44800533dc60f15da3f20b308d07a462ce9 SHA512 f03aedd04e7c2705e57bc27d1495d4c564e98c2e8b88beecda40b446076844a6a4c14caef4548fad8cb32667929ce639a916fefb0ec51d3cc147c71dba39f6d9 WHIRLPOOL fa0ac824adfd30964ec5147f1ca1c9f4da1d43729859210f6470db3164c08c5921ae09af68d54a4165a6ed9ad555dee5168d316c2d0707e30e3aca19a61c7220
--- a/app-editors/scite/scite-3.5.5.ebuild
+++ b/app-editors/scite/scite-3.5.5.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"

 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"

 RDEPEND="dev-libs/glib:2
--- a/app-editors/uemacs-pk/Manifest
+++ b/app-editors/uemacs-pk/Manifest
@ -2,6 +2,6 @@ AUX uemacs-pk-4.0.15_p20110825-gentoo.patch 302 SHA256 75281f6f4ea7057e2753b7e52
 DIST uemacs-4.0.15_p20130222.tar.xz 151928 SHA256 eafab30840c684006876133f5d5042df19fa31ca3cf69a4e38998d950d5ec5ba SHA512 1815acba3b5165c5df0f71d34d687cd0022e7fc812bdd2cdd6778e371dd0e08ede4f670b241cf75c65f16f63f464017b83a113a1db4f0265e81441cc6dec3c0e WHIRLPOOL 5767f13984e61c82e41e68c034d48dd11aeef67433be4918e7eaf2c6e2870b52a43d71994b106287d3fddbcbf78ad2dd4d9e5807384a1712930161f6f46d74fe
 DIST uemacs-4.0.15_p20141208.tar.xz 151500 SHA256 271cf8afde5e069d5b22dfdb93ace83367a89ab9ebfb753e62219d3003633a62 SHA512 a632c82275ee652412aec7d8f3549d80c5fd5bb1211675828ec4c58365bb7819927ff4e92f6fb7b5b9030b681062773ea19f1af345d4d3ddb652c3d68507bdbb WHIRLPOOL aba112d6142a40b439300ab78c206d2cd4271486d45530c9a1500705ba46cbca03df11f1d0242bed1dd7701394c86a8349eb5661f3145ddd01a8f45ae5e478e7
 EBUILD uemacs-pk-4.0.15_p20130222.ebuild 965 SHA256 de0d549b75e3c3510ef7533bcffa71653d17e49ffee9d194e319ef6efaa9f60d SHA512 7bf21577d44cddfa773dee96374a857d997839fa9bae30c2ff881b09e61c6248435a2d98d4d6bd02f91d182a5f15e52561a1b5cfe6575a4bd510d4ec7cb57f2b WHIRLPOOL 682eacba2b034af512a6e60f7c156fe9611ae5a646d87f53b521efb94af9542c9a1b3d3b7d4fa30195d40b60dcddedb4be0d1256c61249690092d2ec122fe4e8
-EBUILD uemacs-pk-4.0.15_p20141208.ebuild 966 SHA256 45bd00bd5c0e42eff1b4164e01fbf9ca6ef223b2a474b44fc288a1e2213f2d5f SHA512 9cdef12d39f9c5e2d25279f9fcca8fb8cdfbc190a82a2a4425370335f028a6067ff5addd3c6d13e59e3163c5ad012c17aecdbbe1f10681deff769e751751fbd8 WHIRLPOOL 7fe56b50fdf3904ce4d023c27fe5ac495ffd0af04d96bd8890fd5af1fe947a2c12e27289a27e7db7c99217a054fa7682b52395904bdf218449f506298861feee
+EBUILD uemacs-pk-4.0.15_p20141208.ebuild 965 SHA256 28aab957822f5d48461aa8a435bf6e9bb55d4fc9f7fff3a1b31cf4dcd34200a3 SHA512 6e8c3c8f7e37b9d01e340fcc83e9ab2f94656f4327c3975e9e661d5cae7eed721d1f36c8526901bb712c85de3e6078e410205bcb9543f24154c066f8cc208bf4 WHIRLPOOL 962c5c24070650d4fd826f4fc3f6482404de1e332b9ecd957c199f6d6104f62dcbc693770fabdda6a98c970671eaed751e9b3824d701ba55d9d507acd0380ed8
 MISC ChangeLog 4476 SHA256 6057a3189f703b6dce3b4f84cfdd0ebb15d7698c77a1888308812032d0e7235a SHA512 eec38c9aea5da658930ea8af85dcfa321d7609a3f65f4502b2e1695b32715d3a6d3f6dce7bfd17278588ae166b957c6aef65f122f545fc7a630b02e3c85f5a8d WHIRLPOOL 98b7e0ec75d3bfa30d2bfece4104763dcdcfc018508a88887dbfff29c8421513ddd0e614b94123ca35218f8c4c341c562064ffa7fd2953b5833f7722ae0055fb
 MISC metadata.xml 945 SHA256 20f67b1215ecb8d611237bcad8b1091fc0c62580bdab27ce6185469851365c80 SHA512 b7d4a8ed8cdea1d53e2f2f4c1633b4baab7271a42038fb6b51624f47eb6e8c317035df3c6fc20741328f929c02c51a05317e609edaebb55058304b170e59b3cd WHIRLPOOL db5215e876cd6577ce57659f01b7b40947b1b094e6136612e2ff802cb1c6eace62bcafa8fe484b2692852b375c6f1c2983451cf63554b30ccac85d5ae1fb3ff0
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild
+++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"

 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"

 RDEPEND="sys-libs/ncurses"
 DEPEND="${RDEPEND}
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@ -6,7 +6,7 @@ AUX vice-2.4.20-autotools.patch 353 SHA256 5d9232698424a6c98ed27e3206fb46a120936
 AUX vice-2.4.20-xf86extensions.patch 314 SHA256 033ba98a8f2cd274a7ce59b5bb21c33024fb3cc4356c45baa0380fe6bc8d951c SHA512 dfdc0a84b48eed8bb4dd07ffae985c55087c8bb2377577c11db997f2391456a9ea94f88e174a7734610b6273cba9636b21f610c7f041d3a305bf2143e6012590 WHIRLPOOL 2a726ed22e9eb5a9730e5375a45607dc607aff1ee467b1ef880dc9a526a076988eb820b49be9a861221afd72b2e2cfffd6da0f56e6c220cadc26fe1fc05cd488
 DIST vice-2.4.20.tar.gz 25156408 SHA256 e5d3d125940f0fafe409aabeec9de4e3ae8d9c19a731aa7ec6a57f6d2b897c5f SHA512 a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76 WHIRLPOOL 5f25bfa72ade54dbe09699b5932df2c37017c3993daba048eb09f723a4351300b6722cf06ceb264202459051780a775f45b787b6ea60db78560d5c65da684541
 DIST vice-2.4.tar.gz 13656511 SHA256 ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10 SHA512 ad197fc35eb80c9738b7f4f551d350dbb4440c7c8103e5d472b7f7ea5106c1356e9d6e3f481552a028a313129ef233833d3147e03f6f00b9890229d5708e3ebb WHIRLPOOL 80f89f7c144fe1ef2305e109049b49e47dfa4af9b69d0d848bf7b06bd0f2d210669acece363b550abad1c50f53dd45a30397eb1bfacfaa443c9e865c686d0823
-EBUILD vice-2.4.20.ebuild 4154 SHA256 bba11cc0467aec80c04cc6aa0b72295c8b79d9e89153ac16f444d144f77baa04 SHA512 f7ffd7434b2467c749ed1cc0f7083b32f02fb7c26ca4930cb013f9c82ed33eb1380a6dfa53d7a1e05f746a86d8753a3880536199bccce608170202b7e46514d0 WHIRLPOOL 020da4401ce3158f085d66f409e24556f0daab76e675de2357e67c950975566ef1a53a693aa45a34aae6e6e15282652eda3a5cff22860681cb382bc98d58c60e
+EBUILD vice-2.4.20.ebuild 4153 SHA256 d027b44cc53acc24027c083385282d85521500ac3462e66bd78548d95dcc6da7 SHA512 9c68e48fc79358807dddf8ca665fc8dab626d7f0b25ad9356f8ffab40c5cf3fe484d29eac303ff721c4995ce50658ea6f0a8cac4566ac5d87e7296d634f361ee WHIRLPOOL 57ed1ef272ae6eada0d5e61576fc4efe2e3add214278049c32a707e529c5b084d0c264ccb0bf855b2eda33d78ec98c4b366cc2e5ded40ae1e803f9c83b9916b1
 EBUILD vice-2.4.ebuild 2934 SHA256 775f78d13b0263b0435ce4782e6425da806ac36d2acb470027a0a84089e79dc8 SHA512 b48c0e6394a6632b0c0aba4452917a706ae5d81995ce4a7e0f6677baea7d725020b4392319364e0a55892a869570631b74a2b7595096ac81df4d32f141f65028 WHIRLPOOL 1af44d7672269c4a218def15ac82a04fc4bcfc4aa61feb42ce67c4ff8aecc1e3372bd2e8c71882000f802aa0cfc3fd73bbc5e52e359de0c2824208e9c2d3d83a
 MISC ChangeLog 14136 SHA256 c54d5e83a4cff6844319dbae3158ef50022f55a9693e2257373bba6b41419974 SHA512 671441c3d99f95380e6bcfd65804a75b8b26eba1430316f96d1b8f66bdc3d5fb71a18b671d538c3a7a4cb48cc62aefd64009f18964ca8fb440108d652ce68fc6 WHIRLPOOL d5d9a9222909585a69dd6688b7fa266ad81da394d522baa7479c246072ccb0ff6ab90907e69049cde941bab9e6534b128fc722331febcc0c542e582b605e9a17
 MISC metadata.xml 744 SHA256 f915b91ce18e4df59cb8e8c3f9964c86d50144d0b74f6d63edd51e476ebf5803 SHA512 d611f1b94eb12d5ff22ac6f9205aa3e918c8d9c2af2c11fd2a1f37addb1644eaf4dfaa23a20b48e12ccce24eabdc7fc0b0f34aa0654a9bc1bde43cc614514ffa WHIRLPOOL a22647cf85776df5a0285836487825738927582c52dfcba16e4625e49053ba07ae0701315123b999d201356cc4830d9acd794ae409ff5f86cb363ec5fa627c21
--- a/app-emulation/vice/vice-2.4.20.ebuild
+++ b/app-emulation/vice/vice-2.4.20.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk2 ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"

 # upstream says gtk3 and sdl2 shouldn't be exposed yet.
--- a/app-misc/c_rehash/Manifest
+++ b/app-misc/c_rehash/Manifest
@ -0,0 +1,3 @@
+DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1
+EBUILD c_rehash-1.7.ebuild 862 SHA256 003a2839003fc0753573876c422a54cd036dfd2ed1cf28c9a22571ce7ecf2d90 SHA512 cb1b6c69c814a0c81bd44a897ff199e2d472f45d1393846d7213f9c6bc17688cb4edda9b4b41118503138c3097bc89057f2198a19a69cac1f1d9d9be8a36a3e1 WHIRLPOOL 8b65c782a84bf7aea5b6bab312520622b75f66fc5159fde2eb027defa9a3b4b61dcae774f5122692fe4c9bdf87bc6c9e673fbe6f78f9350d99c2d1579e3434a9
+MISC metadata.xml 234 SHA256 c4cff9874b0aee51bf55a8619e709beb39e4e479e0dfe494e5733fe3fccb644e SHA512 86d9726cc7afc9dae93786d092a32fc954bf376994c24beca21d95dceb3cdbeaa573c3a252acaf85c8d1a7a2b783b5b70f7d73935db8cccfd6725e218f94fdc6 WHIRLPOOL 4a587d464123e0cf60f725b499b0403c9a482e33cc38d545a24f16c9b73464ded264366e426eac9c8fbc6b1d5294da6573811357bf415995c38fdc0887fa77df
--- a/app-misc/c_rehash/c_rehash-1.7.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="c_rehash script from OpenSSL"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=${PV} -> openssl-c_rehash.sh.${PV}"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+src_prepare() {
+	SSL_CNF_DIR="/etc/ssl"
+	sed \
+		-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
+		-e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
+		"${DISTDIR}"/openssl-c_rehash.sh.${PV} \
+		> "${WORKDIR}"/c_rehash || die #416717
+}
+
+src_install() {
+	dobin "${WORKDIR}"/c_rehash
+}
--- a/app-misc/c_rehash/metadata.xml
+++ b/app-misc/c_rehash/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+</pkgmetadata>
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@ -20,6 +20,7 @@ EBUILD ca-certificates-20140223.3.16-r1.ebuild 6158 SHA256 2355ed478c7aead3506e3
 EBUILD ca-certificates-20140325.3.16.3.ebuild 6155 SHA256 3a8bfcecc6902a7e6e34e7c4c4939d7c9a259cc79d8d1bc71cf4295612d795d5 SHA512 91b04e8b8b04d7cf357e4b59e75254d6c1b4131ae946c04e7275b8420ca72c777cb48a5515353d347b4dc8aca9210ea5d1b4e37249d55baf36c280ed48455d7c WHIRLPOOL eb4e58ee566f49902a68f5396484cb47fe1521fa2e2c13fc2b6715434fe9edcd488d81379b5fbdf39f2403bf5a06c8ff08cc3ff67a67d08c27e625d1dc6edcf8
 EBUILD ca-certificates-20140927.3.17.2.ebuild 6169 SHA256 d2a885e11a1bfb7eb8215269902eb832a3890b952b60923a451edb9c4da661f4 SHA512 4215867362933bc6335941ccf7730f0017c1a1df3adc836a49f577000c679d683039084b95416788e9d3b82b4965e75000d76a64abce079912cece004483a5f1 WHIRLPOOL 0aa0c14060201dc4ea5a681ec844d8a56ea0db13678bcd9def24559f5ed73018687e6ec08ec6a2843686440ac073d244073daf9fa3406fff5643e50a1c87916b
 EBUILD ca-certificates-20141019.3.17.4.ebuild 6233 SHA256 c716708e254aca20dad7107d2207cc22b6564d7cd98666870877cd821cb636f6 SHA512 a7fbee5fdf25775a1f747a84903eae53f60a85f851bfbacd26645166f597744164cb33934cea21136b527a50ca134d5f87b219b38bfbbda11a04ea6812aacf41 WHIRLPOOL 2d56e14f8b0f39761f954042872b47815cf9b7a1fa27165d1cbcb798d4a5fd8c2f2fd71e3e951ba2d2284ba4e979a61c62441d0ae1c2811c1761cd27b4470da9
+EBUILD ca-certificates-20141019.3.19-r1.ebuild 6313 SHA256 9a2331dd5254201e2fe3066a68dc3a62a60b0795449a3f2a8e1ffcf0056565aa SHA512 3557eeae6097411ccb7cb72888f08a7dd8a65ce24083450229d32f6834cafe4a3afde579fabc2a1c9322900022054b848024bc9840838540e89013cb05378fd3 WHIRLPOOL c85d95ddab237390ae7bab12575d8f75e733dfeb89197747362c2ba694a2ab46e47f0badc7cf0091920b5b1c4c8945f98bf0c3f20b02914c883880bbb7695a00
 EBUILD ca-certificates-20141019.3.19.ebuild 6232 SHA256 c489099aa6494cb5f6aacb619042ab2645c0148f6e81c018b464d9f724701a39 SHA512 f1ae4a512b62edbc2c5a54e944b9afb6a21b03c9dda5ea795fdd13132d9887646b4711f8d850d342fc5841bb37eae1444a4e90ba76b4db6282d8ffedb75018b2 WHIRLPOOL fd5f1cab884ba195cdbf4003f279d1f22e4cd6f631c34b323e5bb0d65db099529b64235f0f12e40fe1b0b6a158bb862465ffd49e38bb0d4fdfb4a7ebeacfca9f
 MISC ChangeLog 18522 SHA256 79448844b1ba037ee3e6776a0fb72f52f4183900673949aeb28c7b2922f7b739 SHA512 9878595d40dfe3e6eb2acaf5d63eaaf8ed626abd7c2a57621feb26b1bd470ff45457b0abae297fe5fcf335bd968a73a4b051b72471cb671f81539d17f1919bf7 WHIRLPOOL b9d6560a5791537e4a18a9d66463fecdd2f631c3f73dbda40596438b4e4dbcac40a36a321b149d704b883ecf96039275ec2df7104a69b9234c971cba801b7347
 MISC metadata.xml 336 SHA256 fdf5cec1ac32794a8546a8648132707b49c1725721f8648c53bc87ec8829e921 SHA512 769047824b6c9670f35c74f3f20de4b0f4c1bf49edb16da80a38e50f4be3fab19d3dc2205efa1d44a8a8b07d278c3c15168d42d864d46a3b64b86f271f812e71 WHIRLPOOL 52b6e80d3fc61e58b00aa930f8acab2f52ee97160f02162619933047ced8fe32542a6ab3ab357265154b9aec67c32a69b89b23e41b62323389b1077637681115
--- a/app-misc/ca-certificates/ca-certificates-20141019.3.19-r1.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20141019.3.19-r1.ebuild
@ -0,0 +1,190 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+#   Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI="4"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+	inherit versionator
+
+	DEB_VER=$(get_version_component_range 1)
+	NSS_VER=$(get_version_component_range 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="http://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="libressl"
+${PRECOMPILED} || IUSE+=" +cacert"
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	# platforms like AIX don't have a good ar
+	DEPEND+="
+		kernel_AIX? ( app-arch/deb2targz )
+		!<sys-apps/portage-2.1.10.41"
+fi
+# openssl: we run `c_rehash`; newer version for alt-cert-paths #552540
+# debianutils: we run `run-parts`
+RDEPEND="${DEPEND}
+	!libressl? ( >=dev-libs/openssl-1.0.1o:0 )
+	libressl? (
+		app-misc/c_rehash
+		dev-libs/libressl
+	)
+	sys-apps/debianutils"
+
+if ! ${PRECOMPILED}; then
+	DEPEND+=" ${PYTHON_DEPS}"
+fi
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	${PRECOMPILED} || default
+
+	mv ${PN}-*/ ${PN} || die
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in $WORKDIR.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}"
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin
+		cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null
+			epatch "${DISTDIR}"/nss-3.14.1-add_spi+cacerts_ca_certs.patch
+			popd >/dev/null
+		fi
+	fi
+
+	epatch "${FILESDIR}"/${PN}-20141019-root.patch
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		python_setup
+		local d="${S}/${PN}/mozilla"
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs etc/ca-certificates/update.d usr/share/ca-certificates/mozilla
+		if use cacert ; then
+			mkdir -p usr/share/ca-certificates/{cacert.org,spi-inc.org}
+			mv "${d}"/CAcert_Inc..crt usr/share/ca-certificates/cacert.org/cacert.org_root.crt || die
+			mv "${d}"/SPI_Inc..crt usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt || die
+		fi
+		mv "${d}"/*.crt usr/share/ca-certificates/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+	echo "# Automatically generated by ${CATEGORY}/${PF}"
+	echo "# $(date -u)"
+	echo "# Do not edit."
+	cd usr/share/ca-certificates
+	find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ca-certificates
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
+		# if the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	local c badcerts=0
+	for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do
+		ewarn "Broken symlink for a certificate at $c"
+		badcerts=1
+	done
+	if [ $badcerts -eq 1 ]; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
--- a/app-misc/fslint/Manifest
+++ b/app-misc/fslint/Manifest
@ -1,6 +1,4 @@
-DIST fslint-2.42.tar.gz 111520 SHA256 babbef4a34f42ab1d396152fd79b4353adc114b2e8d68b838e20a8067c5a3273 SHA512 e32575827769a6e0e1847f6edb4ed5337fc5705d65f327e93510af29cafe11df175eec9924f15e9525ff7c320048940e9341e9e62b4ec717b2630aa405a484e6 WHIRLPOOL fc74fb8ddd9d03283d6f7ec7763c2efef9036242ab5ba487046af14f880f0bc8661cec07614fc61fcee684933614abe49142f6dde4c3ef1d42d0f5292437be67
 DIST fslint-2.44.tar.gz 116654 SHA256 8491a9cd76725e652ac8fe07288ba1f896d9331e30593c0ff3ab9e82e863f0ae SHA512 9ebb6d23186ed9a7194c854c3f3352cd787f01a71d6197aa0c53f5ff0dcb2e24004cfdddee3345655ae179f4397eba95120a5c08f25c5c0f807dab486226844b WHIRLPOOL d06bfdd29ce00a052de89757244f823fba2a30ef51c09bcf58248f73d2ecd33c859a52f172cf2c9f558d00274011083c2851bf47a5e40771fff6d4a0ba081f9b
-EBUILD fslint-2.42.ebuild 1357 SHA256 0aaad74d909966e6a830f619eb66cdc020be82f8bd69ebde0d51052f74426076 SHA512 2c5745f34986c991918ed1bd2c433ec979c31fd4c166daf2e8b773b9eca48305c7387ffd8c6675dff38fc5ecf91c967133d58795bddc62ae1790476995fde8b0 WHIRLPOOL 63399537a3014fc14b150475b9e693e22b7c0d7f607e6803454ab00e45c8dc2ee282db68d5887e9a122cb481f36a02c7c1f0d0e6f762134f3cbc1b371c79b48b
-EBUILD fslint-2.44-r2.ebuild 1737 SHA256 c65a333d2d63c77de144b88f7279c1a792163d18a152f12020f149f8d3d37143 SHA512 21708fafc6aebbf454e453e697f42b5ae09729be7afc2ba03c7633cf2a9338432eb75b571ccb902745c926534f93897b40fc24f50a585c4faae4d2dc21dfb906 WHIRLPOOL af0351e25d4c348493c7933e39160bb1c428dbbd99fcb7af513482b845f6bc5346182f1b6f5bd4d6ae203c6697b6675aa4e20719342c029cd2b1fc6753102ffa
+EBUILD fslint-2.44-r2.ebuild 1736 SHA256 1d49c161e8c93ab102604d29cdf46b2274b60fad6779a646ac75d53a0bb4a1d3 SHA512 817cf02a863659a09cdd689671a0ecf02ed4709333f4010d4fa4286e87e88ef188571605b8d3c362cb7aee47d6b830280550f37b7eb439ebf80c1c8bbd843e5c WHIRLPOOL fb3868207b8abb57f40c3ebbf58e719b0710f5544c610dc7354baf35ddf7900987b9362834998df0d42d940fd07c8ce64d52155241ed1568e32247309572a574
 MISC ChangeLog 2291 SHA256 c9cfa07dfa4a1b0a92d69e7fb4e651f0608b7b8feb0560ef9cd0142b0babb771 SHA512 d3b1ee413784f3ee00e4243bd6ef5f00906d425e8cc77d9f66858f0dbbfc8b35049b285e8d01e7ae953f5f6e6b45ca677500f8580409a43378f10bfdb11968fe WHIRLPOOL 4d0a983b7255fea7bfc507367119f3896a5d615e7fa2ba80cc90476a5f8965f7e2d7827e350da90b16600ca99c6370bcd42873184fa578cfbe3b5bdff8215fd3
 MISC metadata.xml 218 SHA256 b9c4e078e790c79cce33647ee3c32d0a0f3fdcb3723ec172ea56b7fdffa63a27 SHA512 5cda51f3b38c3b59e7023f1ce4ce67b96b58eb56c7e1e2c1b67c27e233b892e25dcad50921646d9fc760fbbc7be4303071f0bb617f0a5c435d65a2a4ec76104a WHIRLPOOL ad97de623f02ee9d1c8cd81708a7fe171a93ccff7c6912534f71373e1b9ee7796a1411d3df445acf5df061cd0198f28d3e0624f89baffedd6362c969587c81f1
--- a/app-misc/fslint/fslint-2.42.ebuild
+++ b/app-misc/fslint/fslint-2.42.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-DESCRIPTION="A utility to find various forms of lint on a filesystem"
-HOMEPAGE="http://www.pixelbeat.org/fslint/"
-SRC_URI="http://www.pixelbeat.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="dev-python/pygtk:2"
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-
-	# Change some paths to make ${PN}-gui run when installed in /usr/bin.
-	sed -e "s:^liblocation=.*$:liblocation='${EROOT}usr/share/${PN}' #Gentoo:" \
-		-e "s:^locale_base=.*$:locale_base=None #Gentoo:" \
-		-i ${PN}-gui || die "sed failed"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins ${PN}{.glade,.gladep,_icon.png}
-
-	exeinto /usr/share/${PN}/${PN}
-	doexe ${PN}/find*
-	doexe ${PN}/${PN}
-	doexe ${PN}/zipdir
-
-	exeinto /usr/share/${PN}/${PN}/fstool/
-	doexe ${PN}/fstool/*
-
-	exeinto /usr/share/${PN}/${PN}/supprt/
-	doexe ${PN}/supprt/{fslver,getffl,getffp,getfpf,md5sum_approx}
-
-	exeinto /usr/share/${PN}/${PN}/supprt/rmlint
-	doexe ${PN}/supprt/rmlint/*
-
-	dobin ${PN}-gui
-
-	doicon ${PN}_icon.png
-	domenu ${PN}.desktop
-
-	dodoc doc/{FAQ,NEWS,README,TODO}
-	doman man/${PN}{.1,-gui.1}
-
-	if use nls ; then
-		cd po
-		emake DESTDIR="${D}" install
-	fi
-}
--- a/app-misc/fslint/fslint-2.44-r2.ebuild
+++ b/app-misc/fslint/fslint-2.44-r2.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://www.pixelbeat.org/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"

 IUSE="nls"

--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@ -9,7 +9,7 @@ EBUILD mc-4.8.11.ebuild 2537 SHA256 5ef76677a0b715ef89d8636acc00e1194ea93257ff7e
 EBUILD mc-4.8.12.ebuild 2494 SHA256 bb6da066769df9ce46057e9529e4328485ac58707164336f87013eb1c1498b20 SHA512 eccb8b5a45c9bf7b8aa226b4aa61d474f7b986952efa6dca35bcd395dd5c801cf921ea14a97f423ba5bc023049e70a0c5b5ede5a716576c353c3429a2e805a9d WHIRLPOOL f97fa7cdaee067894b99c2f0d3c45ff48d6e3433a5f48f5f058ec7f735b2f69340ccde4d8c56e78404fe66b62e58de2fea7a25e312df306e460b0c679c5e9284
 EBUILD mc-4.8.13-r1.ebuild 2617 SHA256 c74c9480985919642150678a2d1d3ad53d5330659e4db3bb1a2b8901fb1f468f SHA512 155df3045002053b50003d1d08da0d41cfefa6419bdc618529e8813a302a0dfb31ba48806780799b033d02db23f3e9fef7243ff6284f40bfb58d1ceee4dbc267 WHIRLPOOL 92f45b2f353bc43d9f0e16826de43d644536762d11b7416f199b6f3f671b7ed85a6f7ebedb0de247923eee1b0e449bfa0dcb4d82e4f065987656df1023e5a81d
 EBUILD mc-4.8.13.ebuild 2548 SHA256 3235daf9c0062157a3d1939b1837df83a854d79f315962c453e6afb01ebc04b9 SHA512 a5e37211486d0b77b6f3cfc577ff4ac690151979ca585d8c9154866135c4a275c68ba5113d4907b551c19171470bef0555030e6ec1390e59c9827fa58bf8ab24 WHIRLPOOL d45981febcf385aadadea80a2b8dac0dc2e87fb90abf68a299faf94c13edc20ccefea039e8468e438ee9d57b358aaa6f96071f83ac08326ec13a426e9378e506
-EBUILD mc-4.8.14.ebuild 2576 SHA256 5dcef8e95a87524d93fa4a9b8eabc0eb9a8fa3fef8a5e9827238d5a734bbdf2e SHA512 40d3b10a3e5115192db269ec2d30297c2a6bf70b050cf523d7ba714caea4e56dcb5c85771d0a1e6cd8cf427ebd6a0d37ffb8b2513d26e50efef7d53bc98f5e14 WHIRLPOOL 47500ff247affc89072488a51e3a401ced7fb6e7a93ad7f0c6f24e4ff5fb717644b8a1b5f26adddf54e7048a92092084fa2c400e5e4fecb6ad6fea0c1461802f
+EBUILD mc-4.8.14.ebuild 2575 SHA256 9edbb43eb64e48c9a7b7c762060843373c0284f31848ba1460bb3d533f21139d SHA512 278e0a0a65a4bad1801575be5a287b1fd0b08218fab11fc591b1ee99ed2e8decf35ba681cd8a823024be9e50c1a9cbdb9b46e2323d0c6bc9e695955ae1e59a24 WHIRLPOOL 5226e7a38b250e29105c19e29cb42b2b0a72333a18f8a7d4b92d70629a0f426a4faeaa68bd0c82ad72953a023ba597f65d90d323f03e46d450ba18306f0d945b
 EBUILD mc-9999.ebuild 2789 SHA256 e43f6d72f9df633d9fffc7b30b6a413afa9e26c9f23b9bc0fc14f40a28772ad5 SHA512 a9202caebd5348ef6def646bcb79b1b047b8c686d08ad8300fe9981e1f86c33dfc82536adfb8a261a6e949160682dcad708b66a8f2592aaf0e852fda3a26d14a WHIRLPOOL 30109ffcb89f709d9561092039c2e9fc82473fc9f7fa1414e5e4d7ecec2d4b86339a4fe161c44ea26ee3bf75d90f8832a9beb75d67f70a1fd1a43adbb18803e6
 MISC ChangeLog 47956 SHA256 ad72d366219015c1a10a0cd495639e64b5fc33d5ece8eac0ef8c7d7e0991bba9 SHA512 ba9b5ea1a0073925045818863c3d684f7916b4ba0702566fa539cf35e5d990376daaff3beaecc0c0b7497de7f06c79f2114231f28917764f7db4d32ca7ebd819 WHIRLPOOL f336d08537261dbb79f33958ec01dabc5d45782472a2520125f21cd91e71b9346a0abcb0eca09ae27b9d660f35e097c8c5c52bd03fcb17a9618c446398ede4ed
 MISC metadata.xml 950 SHA256 7a5f3db095ee82a58da8299170da072eb298919ae2beec7020e2ca12982b3263 SHA512 9143eda1ccedb0613eb915f30e70259c32b5075669e256c43c488c1baf34ffecb3210583144bf0389af463fdbc98f60f5d781b6afa77f1951cba11b16555132b WHIRLPOOL cbcc220f6ba1de379b0225d0079945991362aadf88df2aac225994841ec7c81f5132ef3a0b506433d46abe445673dc7dc406fce37dc5e04a17179c6858a3bdea
--- a/app-misc/mc/mc-4.8.14.ebuild
+++ b/app-misc/mc/mc-4.8.14.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"

 REQUIRED_USE="spell? ( edit )"
--- a/app-misc/reptyr/Manifest
+++ b/app-misc/reptyr/Manifest
@ -1,6 +1,4 @@
-DIST reptyr-0.5.tar.gz 16150 SHA256 b58bff5e06096ce4409983cce85fabc1280ed4115c478c0fec968ce2a4dcec1c SHA512 d38d5986b38c643a2c04429e23d5af0cbd7280ed709c441cf0e217f4fe0e4fd19d7ecb76817aedcf9a2092a8041e22aa77828c07e0cea010478192085b1d8f4b WHIRLPOOL 19fdb5f35b05c2f03ab5af1cc2e2b1510733f1b54d6af6bb14db31185f432df5ff7515b1b36207b976ca5beb2649ca7a1c51d52cb0827280e62bedd05e965726
 DIST reptyr-0.6.2.tar.gz 28533 SHA256 c73de510eeedc37a0aac63ea4be9a3c841bbbda029232f871b15d53733a0ee1e SHA512 ad0b378d3c30bbfaa30dfcc06c405c375c7e9bcc3bae2e7fb97b8c3f88f482f461c9c846df0064cc842149b07b8a6b616d95f74cdf38f1b2a5011f6b9328c327 WHIRLPOOL 47cd5ffb5f0b02df218a8af67c0458e9b69bce5172d30f36a692418437363a585ab345e556de034703ca5ac9826a8bd086b85aa492050551e9204a99700fd1fb
-EBUILD reptyr-0.5.ebuild 699 SHA256 f6c3b8683178186946a94477f756376f21f971a31a8f0b057bb3d16bc663b2fc SHA512 4bfe311b2b731849674d51e47ee9d3a0e20b4b41adf396c3a7370d632c28cd813ba06bebc0ebce16b194ecf9b0d9100089f0532e8d221d61f7eb7dd036798f78 WHIRLPOOL a4e01b7c8b31de217f0e687aafb82d56e09c82a4b9cbd2ff20106f10d014daa3ba8deb92b1a66310f1542f6cabc3dc5a1f68b3bf0691dec9553905091fbe4a41
-EBUILD reptyr-0.6.2.ebuild 717 SHA256 d35185264a44848d0c9d6c7181764be068dd3853eb88cdbc42de0fa1ecc67bcb SHA512 78472087b45e63ea4d0e1d0f08fdefbc1f1b935bc31c9fec0b8037cf96f54cdfd6122f2b574f6aae9c46e6d0d148b8606bef6fa1b531a6fe807652840b1a7ec6 WHIRLPOOL cae79a4324ad58abf123573f361e59a84d4cbfa6e267d9b99f335f1c86730084e0f2b10e231d3163ba5943ef9711412fafa87fcd94dca84ecd002e788ef6ab11
+EBUILD reptyr-0.6.2.ebuild 716 SHA256 53098709b2fb4a58150b63e8cf54431f01863800b4fddfd4ca328f96d5aaf07b SHA512 62b80a8f49e6641b18747b59bbff45caba5dde368cb90218c24ee6f6984b7da8c40b24d4d2763cd1baa966c259c18a6af3b337ce3c6731593f9b71a519623f91 WHIRLPOOL cebd90794a3c5ecd04cbf8062b6d7c22a4ebfaa344384b1ca1cecdccb67906a64f260590af08ac815e76810e961bc7bffff15a2c75d18f2f58dd726342ee49fe
 MISC ChangeLog 2173 SHA256 426163f201b8f48e6c9dc23ddf0e0ae068f9719bcaa5bcc4f714a0258fc0fb09 SHA512 bb37cedd777baede1efabe7b719ad2d1de15a7b274416ceb566aa803d02d6236c36891b8072825670e44d97335156d687607e2a0ae3ee20e41d214e541e66144 WHIRLPOOL d4e4b8115a530d706b5626068be0a23034a625694cf5e72daa626e170a3c927e48f6d76d9f8bfc8536a01ae3a05ed6dd11f2f6155d6e7e36e88d1642b505036f
 MISC metadata.xml 353 SHA256 843f003acd44d22b6afc07de8adbd03dca4e8c422c9a3f84630773c09e30dba2 SHA512 a4a3abeaef695e25d32fa9efdb22c1e621f2477115189d8d0dcdc874319e2be52116214e8afbb85d4695584524e841ca029e8829fc5aed71a2fffe066b5f465f WHIRLPOOL 30116877f41521e4e54069274bbaf4797c0efd3e18594ef39c5c3f4bc23b51dad32604b8e3b10decc69be5b0833ecbf5cdd2b9d26ce69ae824ebcb6f44a99514
--- a/app-misc/reptyr/reptyr-0.5.ebuild
+++ b/app-misc/reptyr/reptyr-0.5.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit toolchain-funcs flag-o-matic vcs-snapshot
-
-DESCRIPTION="A utility to attach a running program to a new terminal"
-HOMEPAGE="https://github.com/nelhage/reptyr"
-SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-
-src_prepare() {
-	# respect CFLAGS
-	sed -i '/^override/d' Makefile || die
-}
-
-src_compile() {
-	append-cppflags -D_GNU_SOURCE
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	dodoc ChangeLog NOTES README.md
-}
--- a/app-misc/reptyr/reptyr-0.6.2.ebuild
+++ b/app-misc/reptyr/reptyr-0.6.2.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"

 RESTRICT="test"

--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@ -6,6 +6,6 @@ DIST vifm-0.8.tar.bz2 756795 SHA256 69eb6b50dcf462f4233ff987f0b6a295df08a27bc425
 EBUILD vifm-0.7.2.ebuild 1478 SHA256 bb8889a297a146b05c3b3f88b481a28ad3c3a45481e65f0df1083a3c54d16eb9 SHA512 84b837120af41c4dc1b8c6b65ef5bbe7f88b71565a9447a080a0fa399e039ee493356f52bddfe5f9d0d250ce0486ae173b84a9109b8bbfa624b4e0796f3563c7 WHIRLPOOL 8ab665f1ae8ab456f457533e050d969f69309e56ca1ad1627bc1d3d532065c1b2fdb457863fdc10d432c8850907c4aff99486d42e44df5a51ff7e4c0b3e47884
 EBUILD vifm-0.7.7.ebuild 1777 SHA256 64ed3bd4c1ae3b8d19d6f4b414c995cf9fcf6cc2473d7d1e6a4898134a896fd0 SHA512 5132f036c1da903687c16af24eec630c840ccc5e70e90c71f085af1b53b04fac3fc9d049842a50c439380efd2c22f3055da801e282a4dc337d72feabcb0b0e70 WHIRLPOOL 1a2c8c4051584fe2c23e85d7d473263576e1441131a4c6ceb1871677f64538fca39b47c7b1338d9962bcdb1ef7b88e228ee337408638955ed10d448a09d0db7f
 EBUILD vifm-0.7.8.ebuild 1908 SHA256 16c739df67372d1b563681b0e08dd077b6582e400f761ad089c06a423b77c81f SHA512 e18b6faabd72bdba67e3e98aa19418e95f985d555dd0a0401d7b7b7c4ef816b0c86a462177c9d20f896c1b009081b3c4c206d7ad0a39a3b457d014cb89abd2b4 WHIRLPOOL 6e60a8e50c48bd196e977c53a301b416640a4b14f566fb2cc5e1292464312643d554ddebd2804dea5d033dbc11a7fe1037fe673c0a0268a038fac59a097403b5
-EBUILD vifm-0.8.ebuild 1851 SHA256 6097c0f6a6882c672809a70e6fb7e26a06e25b282055f5ea4502b7a546e54030 SHA512 b7b2dc9399f4533c416500d8d116eb238bc24e7d4e7239c273979b4b017ae0b5da3c5342fe4ba2cf2b8c883222b6904eddc0d007cc0ebff4b473975ec094ea30 WHIRLPOOL f9a19e5f65789f33998ec3db05353332f92b1b3601a506349aab96a8b9480ab941a91e2d2e281af069dfe9726c34df66fc1123c2eae32bf963407bd84c5f98ac
+EBUILD vifm-0.8.ebuild 1850 SHA256 417d68425613be2596eaf86e19422fe2602e24fcc435ee17b429816b4710672e SHA512 de4c1967c863131c52b8c925a365591e4a0f0b1f355352510f6c6e03e6e64f3ef9350a81b914fb6cfa81d48921aaffd1768a1ab7aaf75ebff4c783dac7f4ca05 WHIRLPOOL 18e567162c61c139c8da7c3a95d1adf7e09304fa8f4d65535ccc6139e0ad9629af65cee6c087f16157da2195679a5687a2fd190475f0caa0de5fb00b834f1286
 MISC ChangeLog 6752 SHA256 1e2ae5d0b54d899cf66508ae29596bfbf2f079689aaf354ee52509c0fe9e64c3 SHA512 1656f6b5d0a94e79e3889408c32b31e08cc1442d2f5d4cb036d7d8b893f88e5793daf01b86902d3b2d01d2e107281221056068e651c21a001ce4f07f8fa7b76f WHIRLPOOL 285435f8b494bc944513ca179b7c975e96e9f42d8410590ebefdfb68c868cf661749da6c205241741f920f39a99e97a02d0ed04a9c7c0b48f91121efd279f030
 MISC metadata.xml 1443 SHA256 5c3208c60d17b5634c6ac8f8f135151ed15875e2bf2eb68b144f21833f24954a SHA512 8c7c316bfe7fd7c57f90f2f44b779e81c5ad2835fce35f2564c14465593f5b77d0fec5e21d128e30e7e603a3d66a9680ad5b0ab44578528a46c4b33010a686dd WHIRLPOOL 4e87c2b624cb78212d65a38f109df92cc093ee6433a79f35f5b69b20c7200ff28cfa92ba5e29c533de24330859d3f1b4010322a4b32f9bbacbd8a9133e0f74ac
--- a/app-misc/vifm/vifm-0.8.ebuild
+++ b/app-misc/vifm/vifm-0.8.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~s390 ~x86"
+KEYWORDS="amd64 ppc ~s390 x86"
 IUSE="X developer +extended-keys gtk +magic vim vim-syntax"

 DEPEND="
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@ -1,6 +1,6 @@
 AUX akonadi-server-1.13.0-mysql56-crash.patch 1520 SHA256 e54b17ec4312321260794214a72b8070af4eae8ea37bcdcb5e79073ad1795d9b SHA512 2a2686bace71d4f8704137065ff2d39da25462365b33c712d1cc30905102313149d6173ee4acb641550b05556f2dc5063e85f52706fa098d983d63a353e8892f WHIRLPOOL 216dd9bcfd7f9bbbe3bfc6cc0cd6575d4e550d27943103f7db7884a7c66832a56611a3e8fb519aaa6627804e015ba03dfb797305637e6b85bd540ef70c8d0543
 DIST akonadi-1.13.0.tar.bz2 294198 SHA256 8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2 SHA512 4bf2026c3807b5493c9f63d0c2bff2e6db00fbe97a4e2c2f707aaa3bf4a848b70dd9657d8fa1743690e8eeefd967de4895c1329c6bb817a1d023fe398285222f WHIRLPOOL edc18247dd864af48395f4e3187f6a52cdaf4737959b317e3decb10caf138b97258a661eeb11a2ad11f2365fdd053a7c6fe63097ba71c24a12417ee71de54afb
-EBUILD akonadi-server-1.13.0-r1.ebuild 3216 SHA256 6f61f3218542a9264c371d393cbe614535a19a43d76d97d841490b0cd13512f2 SHA512 58d9fc14da90e0155d554a0af41ebae9c10aca0607700da8d13e9e3ba2bed8df8c909cc2e49b3965cd2042378b25c457188df4fa26202ab295b17e2b041d795a WHIRLPOOL 0601b1b6839af31733c0be67f08b04e3de788b716a0195f68cd476a847ee0aeb7a7af4bfeaf7eb373abd4305528a2e7cc45ebee38a5036e0e03604733e1f514a
+EBUILD akonadi-server-1.13.0-r1.ebuild 3215 SHA256 7303c71e7ec5a39723f4425ef6c800acd331200ce6b1b8e30bd352a8c95e62b2 SHA512 4cc146bd144e9875e428e2f22452c2518d67aac2fdd61fab6326a63104ce7b4136cfdcb3eb3cb34393f9636f536986bd776caa030b7ed4644384fe8d85504b32 WHIRLPOOL 0149738b71cbfdca50e82aaa510c43ed9e413ce5d20c075f1c777ff9d7afda69c11fcb6502944304295beab0b3e80a9d6078a48995f4b131ce491a63d2007700
 EBUILD akonadi-server-1.13.0.ebuild 3162 SHA256 1dc8125205c856c21448042d184be2a5b6bbf8049887ef8f6285a54b365d8a00 SHA512 dd6260ebc3e81ff61b8e5c45c6f93600d2ca6298d3d14d385ba504f3bc1684902f66cb5a2fee06e0cf74ebf33c61be6e2d22769f24b39d90f1fd803c618cd516 WHIRLPOOL 71ed4d6fb6b1937caa04a5ca7346c04b5b18e998a08a93a19090e1b18fb9b6d496bb25eedd37dccb87587c08f38f45b4868c57234701163773196684142364f3
 MISC ChangeLog 23435 SHA256 feb058b7d757c8026aaad964e51e8cf6b728fa008a7f5d1b7cb461234212b1ed SHA512 c628fc01d19b4c0d03c632bd5b31a87f4e0f7ab427630a57f39d7aaa3b398b571753e9f366d555ff27e04d31e9fd6ea413f89d13ca406927b0cfde5c66bbf56f WHIRLPOOL 3c2a68b84fdcf4a0793fcf975bd7d6ca7391966d21cf9b1c998aac430e9d1423de4ec73c8b302e085d2233156fc0f11a3883162482f02013cec0eb121685f5a7
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
--- a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
@ -11,7 +11,7 @@ if [[ $PV = *9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-	KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${P/-server/}"
 fi

--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@ -1,6 +1,4 @@
-DIST kmymoney-4.7.1.tar.xz 20152980 SHA256 7749cbae146eb4adf5c92162c841ae321f971c5720bc32d0227a42a4dd4acfc4 SHA512 e1abc00a39051d4797a177dda353af251dbc79dac97e4f4443df015f2f18f397672e59d6bf74baa6e94f18d4f26f1aea27cdffc37a1d1e46a146d22daed9fe7e WHIRLPOOL f2e698a39204338aeccd8d3d411f2d36a76a68a7b314a4ad47798a305c3432f5dd5c51d35616d8ebdefcbe6b92b55d6fcabf661067bcf2b2e401f51006b8df04
 DIST kmymoney-4.7.2.tar.xz 20391472 SHA256 bfb2c29ff30988f46324c2dae197a06b58d07336a1947adc22bcfed3e554393d SHA512 43db5b3e52d21dee517c8fadccf120aed5854dc16cbd7e265c327149c3a0c900ec02de06a56a9f5b8ad4d04c15730916c79238a3cf2778911e9d8cc4a65afbb1 WHIRLPOOL 461ce894aedb653e696572068ec7a006c3c3fcc2c7493caf634052393bc5874d19e3a6e87e73fd6100316d9bfbfe65eba4d6c87ea2f3b11ea4b354fc91422db7
-EBUILD kmymoney-4.7.1.ebuild 1517 SHA256 d2b85bd5566becd169f4e997ddbf294d3197102bcccd7b4b59314a7de6cea030 SHA512 a01c06f5886ff05e7c80b7a560565225a8afea5385f74f6e1d7c28a030df97fec2cf7694a10100dc4b34b712a7cee47f200b762a2df04f8ad66b03255ba9a5dd WHIRLPOOL 4cad3dc20e65dec3db47284058292c7a04dcf9478700cb89e2dec2f40a90bc1d4dbde8ff433afe19092f302fc4f6a5696fd058822b407194a358b3ce4ac08d64
-EBUILD kmymoney-4.7.2.ebuild 1530 SHA256 7f913c9d2582f7afd5d0e6153b72f3998ea6f2dfa4f2900a63f0829aa8d34b5f SHA512 82d7e41f6335e043bd479614bc089f08e59aae98eeb1667ded98e8a27381892be8395f0ad58eb9e16aa8fefe6a7ca980f46f5b46cfcaa9fea890a603853424bc WHIRLPOOL cf2bcc0b229bb238f9fd18734a15c7ea0d164957dccaa977386341ad8c19dbbcd54957bb9f5a628f65c33270e6832e3219b4d0b8076fe1b34496b74e25ef8d52
+EBUILD kmymoney-4.7.2.ebuild 1529 SHA256 e4c42421501fe846ab7c1c037fe25f1bfab224c0c79d600899e2df9947d6e0a4 SHA512 a3875916d221efeec6f23f7e6526be8adba1e2b557d25e89a1fbdda3a1aca6a465caeb43fe605d4e6facf5b1e4c07a6ef4dd27e4162fcd2def4093dc8d8f9ea1 WHIRLPOOL 137b056fffc0746e06eed8f9b2f599d584e39fd50735122d1278ddd43e82c055704a45d0c0b237d1dde0448225340b83d91bc6b67dbca24497a30b9e1ec10419
 MISC ChangeLog 8457 SHA256 2582e98eb7536147ea28b2a71cb0a1a779523c062372e1e0737fc893f06bd86b SHA512 2461320ccd8bed67dd135627efaafd466eee7b5c95d142b7f90d53affa65cff24dfafa1c3583997f6ea06feb912f3bcf3413f2dc9a1599018892b334b4214ac8 WHIRLPOOL 6ec23d745285fcba6e2e7588da1029c0a86742651b349a4d5dbaf58be761b8ee41e0494abb7afa7c245b469485b79333979ce14252d160af2f57517ed61f4cc1
 MISC metadata.xml 320 SHA256 4e8886432ea24978556c47629bc1dbab6d04fd8c2f5dba50b995bc6a95c2500f SHA512 d125d89769cbe6c3a1b3a661ae1c74977aa30cfc9c4a2ecd2f65548a5fc6ed6d69a1f87a71356d85819c1c3c05a225f0b3e669d25fdb2d6f1a61a1bb40494494 WHIRLPOOL 14d10a26d04fd59e46eeb122ee93dd42a97945b04a5f9c92f05cfc75b9e06e6d316388f630e668970951532526af56d662fa00701467c42a529d6c7d209d2f3b
--- a/app-office/kmymoney/kmymoney-4.7.1.ebuild
+++ b/app-office/kmymoney/kmymoney-4.7.1.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr gl
-hu it kk nds nl pl pt pt_BR ro ru sv uk zh_TW"
-KDE_HANDBOOK="optional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-base
-
-DESCRIPTION="Personal finance manager for KDE"
-HOMEPAGE="http://kmymoney2.sourceforge.net/"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug calendar doc hbci ofx quotes"
-
-COMMON_DEPEND="
-	app-crypt/gpgme
-	>=app-office/libalkimia-4.3.2
-	dev-libs/gmp:0
-	dev-libs/libgpg-error
-	$(add_kdebase_dep kdepimlibs)
-	x11-misc/shared-mime-info
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.0.1
-		>=sys-libs/gwenhywfar-4.0.1[qt4]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	quotes? ( dev-perl/Finance-Quote )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		$(cmake-utils_use_enable calendar LIBICAL)
-		$(cmake-utils_use_use doc DEVELOPER_DOC)
-		$(cmake-utils_use_enable hbci KBANKING)
-		$(cmake-utils_use_enable ofx LIBOFX)
-	)
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-
-	use doc && kde4-base_src_compile apidoc
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${BUILD_DIR}/apidocs/html/")
-	kde4-base_src_install
-}
--- a/app-office/kmymoney/kmymoney-4.7.2.ebuild
+++ b/app-office/kmymoney/kmymoney-4.7.2.ebuild
@ -19,7 +19,7 @@ fi

 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug calendar doc hbci ofx quotes"

 COMMON_DEPEND="
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@ -1,6 +1,4 @@
-DIST kraft-0.57.tar.xz 550736 SHA256 4e8ad3b0db57dd03b10db3d4df4a89a3bcdd95beecc23adec352b517fffff63c SHA512 56f5fd6aa0c369e9baad5b7df5d74b1f14a6810cf976757d031702ea29565b0bb5630c172d0ead2bbcc3e39afd402fc15f8ceb079615cc61c9ff547703330438 WHIRLPOOL 74e8bce1027a4ed767a2bb67dd6f7ac27f561671ac9f157d91ccd69dca5a2f1b3890af8c92db4c1696883079d662ab8ed3f22496fe8fd2104bcbefa63b44a2d1
 DIST kraft-0.58.tar.xz 556404 SHA256 12c92dbdae05d01a491111ed42dfa6f487ec477f60e536e5a80efa6592997524 SHA512 450d68022f5ea1a19b6b9461f3db65233cdc6939cae5367a4c95d22eb6207881cbd798d723a87d43d3f20e84d8ffb2d601a3245324fa1c10078300c5b8e06845 WHIRLPOOL 60371a2db0bc6b39d3c6ce0f20922e8749df3ae74bcafb7a43c5861b9715dff7aef8407f2446702394bf697dca647e3d61989fa733e0b40514e493ecd25f93ca
-EBUILD kraft-0.57.ebuild 726 SHA256 e19ac68bcbbd6294b48197ece0bad967f5d51fdbd3d54a33aa8e7cd46efad248 SHA512 9480da9d358ddf2ee78fa80a9225a8b18e5e1d541b0fc6b84b58526209584a5bd1bc255894bfbec952781874e511b66630dc94c432a3b2715922b00340f31ddb WHIRLPOOL cc128d5fc602ad90b699c12b3a1d2c060f284438a94eee1f25d548a3e7751ec9cc3733d10a747778d407ea8e334c1f6154bb9fab4a0f6aba9429f490404a3065
-EBUILD kraft-0.58.ebuild 731 SHA256 60be4ab5bf30eb26060c488b1f640e5a4a3bc703677d831353e69aebf0d1ffb5 SHA512 1716bcff819e2fc9c095ec1c675ae5ad6d6ffbe1a1a708e47edf066b890ae5213a6d9164c9a8a746b36e7777e9601575073f1ac0e33317c492c59e33ea415911 WHIRLPOOL fda58ebb6168e579eb505d0078f37f8abb705033b3cd6a957677a67eef551c6a0ae0615c6d900e8fcef53528ae3c77ce57aaf2490c3eee72bb49cade3dc1d530
+EBUILD kraft-0.58.ebuild 730 SHA256 d86cc73a9d947d9b56c06ddbcce440d12877b59f3556fb45c5d25469d92512b5 SHA512 0d27699ea5e670a2c3a44dee5e13847a158154d03679e56f16c4931f42e0f702a5f58a3bf961d0f5a40b6e60a4d4e6c7ee2025034e7b16c8ea28713b5c0eac42 WHIRLPOOL 29eb5ff24dcfd9d1e64af431d5e1384e1264764104b6a20c90a90f3bdd6385ba4b2e345dea7ae7f712fed33582b0c62bea4fa04b9293030a673039441dcf5d1e
 MISC ChangeLog 2564 SHA256 dc0f232741405c27b965d900725fc52ff1035e110c83e362f8bf2c6ce61dd3bb SHA512 df98953b22a5fb9850533946cf689a382cfdc62f8db15a1e43b8541b08b47261fdcaadb71c9dc32b7e7b282a1d9ac48d0b223bd3c061605ba0d4b34aa67f6f7c WHIRLPOOL 54119dbe54926341cd1c35b9e53d4b06abdd8faa507b328970d0eccc6a1c62b2b8d3b6db8366b19187a5561259832e2d6e6436df68bdcb4dfce0b19474313f2c
 MISC metadata.xml 232 SHA256 188f81f663ffa951801f67081d697cee3394c8114cad54194a89c65be0a6fabc SHA512 5b8a09086d0b6012b9f87e7cf01c35a7a6183f957336173ad607996809d6630ba13d8a70a186ebdf1599c82b8e299824a3debcc2506a022b8cae2b121d479ae8 WHIRLPOOL b84a646348315b23e950302e452c56be9d89a7b5a146e8de81f40cdda501576b7c012435aad852f6d9af5874819728fa655c301c30f40e06012ca3f0233edfa5
--- a/app-office/kraft/kraft-0.57.ebuild
+++ b/app-office/kraft/kraft-0.57.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bg bs cs da de en_GB eo es et fi fr ga gl hu it ja lt mai mr nds
-nl pl pt pt_BR ru sk sv tr ug uk zh_CN"
-inherit kde4-base
-
-DESCRIPTION="Software for operating a small business, helping create documents such as offers and invoices"
-HOMEPAGE="http://www.volle-kraft-voraus.de/"
-SRC_URI="mirror://sourceforge/kraft/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	dev-cpp/ctemplate
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4[mysql,sqlite]
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS Changes.txt README Releasenotes.txt TODO )
--- a/app-office/kraft/kraft-0.58.ebuild
+++ b/app-office/kraft/kraft-0.58.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/kraft/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"

 DEPEND="
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -19,15 +19,18 @@ DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac0
 DIST libreoffice-4.4.4.3.tar.xz 164365608 SHA256 31ac86daa4f842fe825c88262b99a032ba3c0620f6e01cb22a54af14bc3dda72 SHA512 fbe97d4f8db92348927dc7c8412631ad5187968357ebdc57f22936cea84c76ced3655aac4c6ebc936b0f96d3d36bafe163eea05ed2dca02e53724bd5a0396513 WHIRLPOOL a7938d94b8644cd736a7213c0c4931a9d857da7005972bc751f6157445839ce395fdb1b6b057dc6fd681cf86143cfe96c9b2126fef2d5de5ea000eb15c5bdb35
 DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
 DIST libreoffice-5.0.1.2.tar.xz 167364360 SHA256 0751b9caebeb54e2c6702a58aae66a29ac59414088ccd4e7d84625d02d0fd21a SHA512 d58d104705fd80425a00ce61771dbd4bef74cda20028fb2afcc1ea44aa304048b8e96bf654ecc2619362a09d05801212bee1e9bc9c80e693c986021a55c0e725 WHIRLPOOL eadd72f705745632c05efcb2e4c85c3440be18f16f16805f241a653c39f204145a10e6e2cbb432d3a4801e652affd677756ee1f6cad1db120c5ffc47843a89f6
+DIST libreoffice-5.0.2.2.tar.xz 166869100 SHA256 01f0680709432039762fa608bcb1240786d2b6549099a96095aab92dcebbc176 SHA512 7a72ed01b0f9fc131b7241ea4d1bb70bc813752e33d8e823e91a769d77308d2eec2d32a0fac61bdb41fd605a6f91dbaa3d5478a0b150e64fa9f7e47724f46cce WHIRLPOOL 85a592a0f478b1957d22d932adee758d48084c0c7ee00c0549fa8c956fd30f5eead09f6fc802d22d9613bda8da0c708ec99fb6d10fd82e0922c6da96a326a14c
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
 DIST libreoffice-help-4.4.4.3.tar.xz 1876068 SHA256 80d2cb4c5ee1d97218741d4e65351763dd74a617df7a51fce275983bcc5e6bc9 SHA512 b3d05ab85b1c25c3cc045c7d5217fb61b8dfc54b58c54a04b442c678d2c51975e5aadf3e28ac3f17544dd7afd6770fd8115cd05e3878b80c378b8fed6bcc2b22 WHIRLPOOL 3204cfac0ef6d2cd741e2f319242da6943b46c82ba5635df45dc1f99c3049a542df00a31c4b48092bcfad1a6d6f5d4e3c1ba0a3248331c324c08d728f909cb27
 DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
 DIST libreoffice-help-5.0.1.2.tar.xz 1884112 SHA256 c71db94564307f4bcea4d556a37d5ea946c87007fbf03fc7801fbe7bc197e947 SHA512 edea7ade0a4a742788b8ceba627e9afe7ed29b4feaf6d091023697fb676421ee0a191e592991c6627d22ba7a41af2d847b188c23e42ef25f1067533b5d2a80c2 WHIRLPOOL fc54629ee68f7c22ab07295b2569313a129f63850e67f1f3bd50bdc20a3d494ad48ca14f14f0a440fef78cceed2117ba31cac0930ac5b0382f285a31acc77b86
+DIST libreoffice-help-5.0.2.2.tar.xz 1882964 SHA256 4342a5593ba8a33b1d63549f256a4127a0b51cc1a53faffdc2708f04fef5f094 SHA512 1000423578211dc843dcedb9f864634235ab09d5234f8d8fe2897065207bdf6cd3bca7cdc1b3c012de0c78b585978a25c0df5048779bd0b9a734c9160064e313 WHIRLPOOL 8b92bcd19487c1c286a477ff0dc1b7e6bd9aaf862cfe002fadc25d461add4c4f2f8ee1e45ac0426dc2d27a6322317cacb7f65e9d0a6e6d6dad01075d18476363
 EBUILD libreoffice-4.4.4.3.ebuild 19021 SHA256 19dc85543f863d5085c0dc1f1dd261ad79baf9c0e80414cb2f206f9ec04a520a SHA512 3d72dc43d7861b050f496e639285997557dc057cb0e6951ac8bc47f2fdbaa04d7b5b3043bc41b70dd3ad917c0d868364090ce56945517b5e791b9f14b4c3f9a2 WHIRLPOOL e866cb59833df33924e9b658537bf40003a29f40087ea0403a9f924e8e36fb05c23ded8df60aa54b494ffd164e5ee264a6d6234885ce9b5c66361fdaac87add7
 EBUILD libreoffice-4.4.5.2.ebuild 19103 SHA256 8b9f82f4ba05c3e88c910bfe357db003df1b718a9b47cd0d5b9cbc6588b48e1b SHA512 d80e51bb8319dd1deeac8f24a933c480d69c2473e4539b2b50971ed32cc8474089e52cd04064f8f6dd471b993370efdeda941faef3b1c694d5c4f70dd8a2b607 WHIRLPOOL d7f990ce29a39403111ff296906e73aad4d4b1b177f1ee1f6b8840fdb7180a3218a8c9e079751d1fca5e84b939203b1b286d4d918854abe9cc854fcd7cd8e6eb
 EBUILD libreoffice-4.4.9999.ebuild 19105 SHA256 bf0f68ce25cbf74606cad3dec4bd78fe293759819ffc251a76d4fde17c2e4613 SHA512 ad84e49821f48e65189ef8cf432d3371f1d95416e78f2db105b1cc9f2ab2b39cc36058455a5d6267b2297fc3ea7935de880d6907863ccaeccd7e7bc3943bba78 WHIRLPOOL f5f8da15b04734cf995856850c7b05a8d9ae73172ad234e55a729cf5809e7f27358c3c866dff7d25283f306d3640f8288a672f5f957a4f4d8a55cacb05964b30
 EBUILD libreoffice-5.0.1.2.ebuild 18639 SHA256 e17070fad7848d9df9ad00707c967b6d9dfc5492f2334e02a9e42dd742f98422 SHA512 94d72b7e0f54eb951b7a7c6225e546fcecc2153cba8595e81e5fd1cf3600e2e10a71c3ba069949d8019061cf1f5e4be6b90402e3ebb37e836ed2908fd7e6247b WHIRLPOOL 60f3770244ba827fef826463ae5344caf1fa38bcccdb14d8da99a23249b3dc9328b966d15f75721bd8c3e074f991c236607d05a1aeca0e49787898c6d0b51bcc
-EBUILD libreoffice-5.0.9999.ebuild 18639 SHA256 e17070fad7848d9df9ad00707c967b6d9dfc5492f2334e02a9e42dd742f98422 SHA512 94d72b7e0f54eb951b7a7c6225e546fcecc2153cba8595e81e5fd1cf3600e2e10a71c3ba069949d8019061cf1f5e4be6b90402e3ebb37e836ed2908fd7e6247b WHIRLPOOL 60f3770244ba827fef826463ae5344caf1fa38bcccdb14d8da99a23249b3dc9328b966d15f75721bd8c3e074f991c236607d05a1aeca0e49787898c6d0b51bcc
-EBUILD libreoffice-9999.ebuild 18664 SHA256 ae8ad79c7d56ee09d8825b03ca72cc31a00723d0426997df14dcddd023a4cac0 SHA512 4866917104a02c46c180920ab12f1e323ca33128343afc164081b69a540242ca46ae4781236bd0e8f60c50ec987709e43162e7a87e24f9bf04f7e424ebf7bc36 WHIRLPOOL e9953e07c5c51e9019dfd40f250237f5f80a410b750d36bf200267a549c205099cc28d5c03e10e47edbf13f525cb983464413bf9f4ee9eeebe5a541b6cbb9215
+EBUILD libreoffice-5.0.2.2.ebuild 18652 SHA256 8a19c562c18651a90dc7205307dfba794eb5bfc6a8c2599ea598e56fd5c9f2a9 SHA512 3b29e31d4bc14f476295fa6533112db9f750fa1141a991432ca78653791b002830aac7a4971aa9d33af1bb88c62830f9423dd2d4cc50c4565372af9f71a42a3c WHIRLPOOL 09857752099ba4c8dc60939882d12b5985f396080029da42931a820f0e8411a66cb43a352a3696af31c1b006f4cb19ef8184f921d4169a5d8587a97aa9a504f9
+EBUILD libreoffice-5.0.9999.ebuild 18639 SHA256 80c631e04f31483e4ad81e3f5fef8176df2d64e07cf46b7c58ac09a8624fc253 SHA512 d4208c53ee540417a5ecdae3708d1f8026985d986d694826f477b94f19e2b8114777746886033cee058501d8fbe6bb3af64a99b471e6e7eb68f22b2f5d8d213b WHIRLPOOL d7b5ff62174c3ce880d3eabe295bd2a70b8352ee20f204699c631941f4ac50019c6d430651c708929eb838bff68ad5f3878442ee4640a41e77aecfb8d3eaaaa9
+EBUILD libreoffice-9999.ebuild 18515 SHA256 df977adc744615d3bc6e451d23dcec5b0223aff0bd15a13d56876818a89731f6 SHA512 b2a4db02790a37ad663d94caf3b0079d22dd22dafbdf85920d3befd7df72000bf62142edf408aa637db3350652d65221626b87ab8d39e2753a44421cb8f6c3be WHIRLPOOL cf6620bb363235dee102ece28a181bd3b495589658c04e8d6ea8cc1011cefaa959c6b4dd963c62e18807bea9a1c6ff7ffea7ad6d91ef61d62d95c86d42bb47be
 MISC ChangeLog 9339 SHA256 efed9b1e7f6ed3ce24e8351037daeb8b050089969bf6ca5e5c013d42ffb2fb88 SHA512 7b58f85ea022bc91f78c812e09381660c25fb054b8f4e53e17e81161db775c832e441c5c64f50ab3d0093edc627a6bbc54c53f3fc75470d149ccb7ab92beba39 WHIRLPOOL 90c23e45e3afe143983ff60c5ca561f55169014d80d78e7d67b4342c2d7c71a0cf5548ed6316cc98366c3f205f506374a9643d22697e542c83243ca5bad1c78c
 MISC metadata.xml 1170 SHA256 94d12aad619c0489c65857246c536b65ae98f1cd7fd698fc0cc3a59972887c6e SHA512 3baf086b2cb75fd88d1044df055e443d46824041d9741172769707f25b7e284ce96dd16292454c1321e0078546dd694770c4111669a4ad394cea7c5e4b5e1a5f WHIRLPOOL 4c326355000a944206b8b85a8a40f7467fb6012d38b2934c8534003e4a4c20046363fd6fa07f189a5cf082887771e581a28cf2910d78a1158f11be37324f7c87
--- a/app-office/libreoffice/libreoffice-5.0.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.2.2.ebuild
@ -0,0 +1,608 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+	IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS=""
+#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libabw-0.1.0
+	>=app-text/libexttextcat-3.2
+	>=app-text/libebook-0.1.1
+	>=app-text/libetonyek-0.1.2
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.5
+	>=app-text/libodfgen-0.1.0
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	=app-text/libwps-0.4*
+	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	>=dev-libs/boost-1.55:=
+	dev-libs/expat
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1.1:=
+	=dev-libs/liborcus-0.7*
+	>=dev-libs/librevenge-0.0.1
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+	>=dev-lang/perl-5.0
+	>=dev-libs/openssl-1.0.0d:0
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/glew-1.10
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libvisio-0.1.0
+	>=net-misc/curl-7.21.4
+	net-libs/neon
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.10.0[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/glu
+	virtual/opengl
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? ( gnome-extra/evolution-data-server )
+	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
+	gnome? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? ( >=x11-libs/gtk+-3.8:3 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	libreoffice_extensions_wiki-publisher? (
+		dev-java/commons-codec:0
+		dev-java/commons-httpclient:3
+		dev-java/commons-lang:2.1
+		dev-java/commons-logging:0
+		dev-java/tomcat-servlet-api:3.0
+	)
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	telepathy? (
+		dev-libs/glib:2
+		>=net-libs/telepathy-glib-0.18.0
+		>=x11-libs/gtk+-2.24:2
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!<app-office/openoffice-bin-3.4.0-r1
+	!app-office/openoffice
+	media-fonts/libertine
+	media-fonts/liberation-fonts
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	kde? ( $(add_kdeapps_dep kioclient) )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-0.12.0:=
+	media-libs/glm
+	net-misc/npapi-sdk
+	>=sys-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-devel/gettext
+	>=sys-devel/make-3.82
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		>=virtual/jdk-1.6
+		>=dev-java/ant-core-1.7
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	gnome? ( gtk )
+	eds? ( gnome )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+CHECKREQS_MEMORY="512M"
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	local pgslot
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check-reqs_pkg_pretend
+
+		if [[ $(gcc-major-version) -lt 4 ]] || \
+				 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
+				; then
+			eerror "Compilation with gcc older than 4.6 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# Ensure pg version but we have to be sure the pg is installed (first
+	# install on clean system)
+	if use postgres && has_version dev-db/postgresql; then
+		 pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} < 90 ]] ; then
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local mod mod2 dest tmplfile tmplname mypv
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	use branding && unpack "${BRANDING}"
+
+	if [[ ${PV} != *9999* ]]; then
+		unpack "${P}.tar.xz"
+		for mod in ${MODULES}; do
+			[[ ${mod} == core ]] && continue
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+		done
+	else
+		for mod in ${MODULES}; do
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+			EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+			[[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
+			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+			git-r3_src_unpack
+			if [[ ${mod} != core ]]; then
+				mod2=${mod}
+				# mapping does not match on help
+				[[ ${mod} == help ]] && mod2="helpcontent2"
+				mkdir -p "${S}/${mod2}/" || die
+				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
+				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+			fi
+		done
+		unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
+	fi
+}
+
+src_prepare() {
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	base_src_prepare
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		-i pyuno/source/module/uno.py \
+		-i pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e 's#all : build unitcheck#all : build#g' \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
+		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+		Makefile.in || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local lo_ext
+	local ext_opts
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+		if use libreoffice_extensions_wiki-publisher; then
+			java_opts+="
+				--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
+			"
+		fi
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-gnome-vfs: old gnome virtual fs support
+	# --disable-kdeab: kde3 adressbook
+	# --disable-kde: kde3 support
+	# --disable-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-mergelibs \
+		--enable-neon \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--disable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-gstreamer-0-10 \
+		--disable-report-builder \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-online-update \
+		--disable-systray \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-parallelism=$(makeopts_jobs) \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable gstreamer gstreamer-1-0) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-connector) \
+		$(use_enable odk) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable telepathy) \
+		$(use_enable vlc) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with collada system-opencollada) \
+		$(use_with gltf system-libgltf) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${internal_libs} \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=icon-themes/galaxy/res/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+	rm -rf "${ED}"/etc/ || die
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files for support to old installs that can't parse mime
+	rm -rf "${ED}"/usr/share/mimelnk/
+
+	# FIXME: Hack add missing file
+	insinto /usr/$(get_libdir)/${PN}/program
+	doins "${S}"/instdir/program/libsaxlo.so
+
+	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	use java || \
+		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@ -159,7 +159,7 @@ COMMON_DEPEND="
 		x11-libs/gdk-pixbuf[X]
 		>=x11-libs/gtk+-2.24:2
 	)
-	gtk3? ( >=x11-libs/gtk+-3.2:3 )
+	gtk3? ( >=x11-libs/gtk+-3.8:3 )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@ -161,7 +161,8 @@ COMMON_DEPEND="
 	)
 	gtk3? (
 		dev-libs/glib:2
-		>=x11-libs/gtk+-3.2:3
+		dev-libs/gobject-introspection
+		>=x11-libs/gtk+-3.8:3
 	)
 	gstreamer? (
 		media-libs/gstreamer:1.0
@ -437,9 +438,6 @@ src_configure() {
 	# --enable-*-link: link to the library rather than just dlopen on runtime
 	# --enable-release-build: build the libreoffice as release
 	# --disable-fetch-external: prevent dowloading during compile phase
-	# --disable-gnome-vfs: old gnome virtual fs support
-	# --disable-kdeab: kde3 adressbook
-	# --disable-kde: kde3 support
 	# --disable-systray: quickstarter does not actually work at all so do not
 	#   promote it
 	# --enable-extension-integration: enable any extension integration support
@ -466,11 +464,8 @@ src_configure() {
 		--disable-dependency-tracking \
 		--disable-epm \
 		--disable-fetch-external \
-		--disable-gnome-vfs \
 		--disable-gstreamer-0-10 \
 		--disable-report-builder \
-		--disable-kdeab \
-		--disable-kde \
 		--disable-online-update \
 		--disable-systray \
 		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@ -4,7 +4,7 @@ DIST eix-0.30.4.tar.xz 556632 SHA256 4c753a82e15ce0f8bbdd74edcebb7bc23bd3de8dfca
 DIST eix-0.30.7.tar.xz 558144 SHA256 ed000a8430ffb1c9087807d2ef686b10252d9b199e67c88f7bce11077a371473 SHA512 babb23176e68d47bcc5d899090abb326eae6b3ce4c587a6cf977c6216d193f4cf93dd54a647e50f08434440e022f117c8e5f800f1db2c048220bd229fd6cd4f5 WHIRLPOOL 0a27efa1c8003ae23ab96cb93672f38120828dc75cc333450e19026b7505c19ee411b42261049192c009a57b22c15c9ed5c9b7875171a039b21bbc142d220904
 DIST eix-0.30.8.tar.xz 559076 SHA256 525c5d0276b8d40de012668af36042ecb674175c3b92fb9214c3f1f1b0dacaec SHA512 ee1901037507d3e527d5e37338efb4b9c38c4d42efae042918d0e24e8bd08ece0064ac2efec960fc3280bc2bb14b46d87b66d6c04aa634c8737276321f580255 WHIRLPOOL d29d6cf704ef331621cf9b6e37433de643b43cc8b079295cbaa6f25979a399ef0b5e72ddaee3de205b8dd831de946e16b96d5c1f9b63666027a5a9b8f6d24e08
 EBUILD eix-0.30.10.ebuild 2386 SHA256 06b2962330d56dc873936b20e94f6b2cf972357e23e9fdcfd4bd191a67cc7bb1 SHA512 747d5d4fe6563ed809e17365b54e57a0006e7d37abc2b0088ae112338b9a1b3609b4acfd647fd11c40c573da61b135dcc1a6497ab3ecb721863be00e436e108b WHIRLPOOL cc6730f8af963bcca9a3f433d9fe2cbe9ed1aad23be55fcdb72d5baff059a99555e4c5b32a6c355f34c6bb2407b9ec1d1356290fb772d8c8be2c6e8e55cf2866
-EBUILD eix-0.30.11.ebuild 2386 SHA256 06b2962330d56dc873936b20e94f6b2cf972357e23e9fdcfd4bd191a67cc7bb1 SHA512 747d5d4fe6563ed809e17365b54e57a0006e7d37abc2b0088ae112338b9a1b3609b4acfd647fd11c40c573da61b135dcc1a6497ab3ecb721863be00e436e108b WHIRLPOOL cc6730f8af963bcca9a3f433d9fe2cbe9ed1aad23be55fcdb72d5baff059a99555e4c5b32a6c355f34c6bb2407b9ec1d1356290fb772d8c8be2c6e8e55cf2866
+EBUILD eix-0.30.11.ebuild 2385 SHA256 ca76c7b53e0bbfe137d28fd0546a9132126d32e57d58f1814ca088b7604b85d1 SHA512 44545c59b8b4a72cfd32dc419d95028a07bb2d63a2a0d90265ea0737c79466748b602f156cdb1a1f049d505958036d334b1449dfdc84cb2bb5a5c5a587c33874 WHIRLPOOL 36f6afe6f688d214ad8320b7b0767b2974df38720f80c7ef52c40b03dc706522d3a77b3c14af9f6331d00eb4c717914b3dc885c59aa51c76b3c52d8fc0579921
 EBUILD eix-0.30.4.ebuild 2360 SHA256 dee4e1706391baabbb6bbc2c22bc7e15e9063bf1fb5032aa93abc47a7c14a394 SHA512 f2c91a8cda18f4cce8036dee19d913be41bcbfaed0df98e8da8fecffb7c57f7a8e780a7ea6d32946cfec56f37e9e737d2db3144d75c0424df6081557def29806 WHIRLPOOL 9dd4d0bb6043bca6032bc063d5be49c6a638088e651e2f86cfd6c3d6ec16b398c4c40cc98d8bd0089b2198c9e64f2fd5dcc7933711755f1ce7b00bd5f2628835
 EBUILD eix-0.30.7.ebuild 2369 SHA256 34c3857adae96433e57a1a74fb1a88c26ee5ab536d1030c6602f7eb709c6dd32 SHA512 3ec75f652979f0eda20e7b492b68b883fa63f55d8d24d771d0e3ea8597203e5b55f3c1835b534ed9ff14eb84e37e7b418c1f6d9191bdd55ffc7a25357a3a3b7b WHIRLPOOL 6f725f3f9e486340c6663d908c2cb2f9522009fe9658367989223fef484d98852a86b0afd2cd89ddb5fd54027b67b9ff44a78e9173502f20524dadc8b546dd52
 EBUILD eix-0.30.8.ebuild 2369 SHA256 34c3857adae96433e57a1a74fb1a88c26ee5ab536d1030c6602f7eb709c6dd32 SHA512 3ec75f652979f0eda20e7b492b68b883fa63f55d8d24d771d0e3ea8597203e5b55f3c1835b534ed9ff14eb84e37e7b418c1f6d9191bdd55ffc7a25357a3a3b7b WHIRLPOOL 6f725f3f9e486340c6663d908c2cb2f9522009fe9658367989223fef484d98852a86b0afd2cd89ddb5fd54027b67b9ff44a78e9173502f20524dadc8b546dd52
--- a/app-portage/eix/eix-0.30.11.ebuild
+++ b/app-portage/eix/eix-0.30.11.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools"

 BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@ -6,7 +6,7 @@ EBUILD mksh-50d-r1.ebuild 1091 SHA256 19d748ebc03bc3cee337318e8a51d45a2ad682cad1
 EBUILD mksh-50d.ebuild 906 SHA256 0a7ebe33bbdcfd43460e12a3a38065f6dadd78a09cee546e11c63dd63203cb42 SHA512 ffeb673c34bebb776c662f982e90044c404d458a754cc291ba770695df09defbf6c3e9c74d8f81f3a5db091f8f1d55f7b71741c4b8fdbd7acb2db1156ccfd897 WHIRLPOOL cc312822a56b0edab6ff3d093908b7b390c0efc7bafa09d1cbcefdb63dbe6033b8aff6dc4c3895533dcbdac6df1949e40ea1b5199eac92fc9bb3122761eb5616
 EBUILD mksh-50e.ebuild 1091 SHA256 19d748ebc03bc3cee337318e8a51d45a2ad682cad16a76bba1b47e37beae4753 SHA512 f536bf56b6e43f2387b20151d7f71c928a1346d86a17efc45fff1afae657355d3198c6b29bf84f9f9afe118a2e91fa46c2b5d70c95c57639c0282df48f751049 WHIRLPOOL 876cb179bc86bfa9feea823af75998f2caa401d055e4e4f237c519f9317810724a589c33482eac87fafadfb3729a2cc2b4b85ac53a9c0dddb271bf2c6abb2bea
 EBUILD mksh-50f.ebuild 1091 SHA256 19d748ebc03bc3cee337318e8a51d45a2ad682cad16a76bba1b47e37beae4753 SHA512 f536bf56b6e43f2387b20151d7f71c928a1346d86a17efc45fff1afae657355d3198c6b29bf84f9f9afe118a2e91fa46c2b5d70c95c57639c0282df48f751049 WHIRLPOOL 876cb179bc86bfa9feea823af75998f2caa401d055e4e4f237c519f9317810724a589c33482eac87fafadfb3729a2cc2b4b85ac53a9c0dddb271bf2c6abb2bea
-EBUILD mksh-51.ebuild 1090 SHA256 0630b341eca8b5976bab12b53498fb1ff5b79208779e37e3d645b7305bf4dc06 SHA512 f8a5a9ae09cd75157dfe25aec82bee92a5bd5e6a142fc4b2756775bb65798b3aead9b38617ed24bf618d1843f7ef5d5b880e28cbffdfad4396e17fc266173f66 WHIRLPOOL 4cfaefe1787b81323dd28a2a21b0b82f1d9ba60c8f0d74496b5076850c5d50d2ef25130409a9e707c0f23ccd093a2ef4a74ce8d597eac33da084dc0c84a2b11a
+EBUILD mksh-51.ebuild 1089 SHA256 e6dc20a959544005d7bd24bee40154742de7eac903e211a469f4183b10aaf4ba SHA512 c91f8caf2c1ab357a3fc3807beffe701da82ccdd4bdbe8c37a4155f3ab8695bcfa2f4393f000f8e373785547646f9cff68761b469a7951c344c50aae103302ac WHIRLPOOL 97d08eb600585a4deb281fd452afcbdba8d3203e3966d84b00b6e692103d7613dfc267c02006cf427d6e2d362e510bbe1e2ee4ad87c70a3067224ad0f1873049
 EBUILD mksh-9999.ebuild 1251 SHA256 2cfbe456f4a82e4ebb601fd4f13a2c1ee0caae8da4ccb1e6a13f0036b7132e6b SHA512 90e06223633c6351f3fa314d54a0bb72f9229f785f3739664c5356d6b6cf874188975da846bd353f14731394ae920ca0061d8ac4623625d9a64a0067eb280783 WHIRLPOOL 4916499129dbc06e3f581bad23abaa09c7e72102cd694d12e1519698757a75c70bcce3f20063d1605050ea281e146c1342a4c07e33fb3a5387768da47c377c79
 MISC ChangeLog 7876 SHA256 bc953a7275bc4b75e035e84bc08a4388b99d185fbaf941728966f0e96744eae7 SHA512 f6da6050c3e21df922f1384fa7a96c29ce1d2de1e1f687ff63ab81ac9669ef16bf211d292b438984636b4a32d22f38157e651bd0bc9f33cfdfa811c4e2cc8a94 WHIRLPOOL 5ce9d1f9c3dff8740e73cda2e53744d01c2ffb6d6af784eaf0a4f4924c6aa6729c1c3c0fc8fd9f622abb9329ae52951b848bea2c7bf5aa5232625e41d9097abe
 MISC metadata.xml 196 SHA256 e8ef5daeda229c876fcf81068b64452d16ca1674618ee72fe8c294f6ead29445 SHA512 ba2a04029fc9fd51726e618311fc0d5ca87333acb0c067a353000a5e0cd31a9f4095adc14faae4d1f14409303051f381c66c3a4cd6ac6699a9476193ac7030f4 WHIRLPOOL 002f8951fc98cfd1917aeef67a1ef0fbc7b662f4cce3c4d9735f198ec8fcaa7e258524a80dbdea1eb485db6faae224dfb317af827582c0777faeba8cd2950ccb
--- a/app-shells/mksh/mksh-51.ebuild
+++ b/app-shells/mksh/mksh-51.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="http://mirbsd.de/mksh"
 SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 DEPEND="static? ( dev-libs/klibc )"
 RDEPEND=""
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@ -2,6 +2,6 @@ AUX discount-2.1.6-portage-multilib-CFLAGS.patch 1975 SHA256 a24fc76d0c45c3afd34
 DIST discount-2.1.6.tar.bz2 83823 SHA256 702bb29e17e387f82e40fae062d5e4939bc6fb22dcf53e6109982a5faa110796 SHA512 75e2fcc31f670bab77a3658a684054971998e91ad14743814480a4d24a59285dea1fe922d16c8d1c868250c417963a80282b8fe278021240ba424b840dd4df8e WHIRLPOOL 9f519c44df4bc5300729dd0f51fbcb20f957da68d03b670307bfd51c0d994b5d2b765eac6e17bba8119bb095277ce5dfbad185599bdeca834c4982eb813d7a79
 DIST discount-2.1.8a.tar.bz2 85161 SHA256 c01502f4eedba8163dcd30c613ba5ee238a068f75291be127856261727e03526 SHA512 a1eba7076a27da56136b8057189c5474a36bf11f8233cbae270c8a0cf9b070332b4dcdbbbecfbfbe1d8c19961ccaf87cee27ebe855c6bc6558d8ccc423553c96 WHIRLPOOL 5d7148f6c4e9f84a5290fffafa417c4684517df6fce0deec773beb2f89b4416b7849aa50351c27338653b8950b68c3c49ba223d31e347ad7562b0cb040761114
 EBUILD discount-2.1.6-r1.ebuild 2051 SHA256 4598839490206f7ce7caf90caecea71097bff0ab300f2019ddeba3a2e9be7d21 SHA512 1d6b3500b14c14761e89cee57406a67e33c707229c956b51e803754477c9ee73b3f86ab30d057655c5abcda0a772fe57b5e2768f4c8b81a6a95a2445d10c2783 WHIRLPOOL 2d9ed7d4b62507d39c1270e7f602a52adcbde98fd5f3e04ddc0ded2bec8c4c6a6caf18edcc49075017a24b6f7979a33f487820b21cc8fd276e64296fc3dea174
-EBUILD discount-2.1.8a-r1.ebuild 2439 SHA256 b950775dfc4a07c09d46a27a2c43f7babf06f33e619206027d9c0506010d57a8 SHA512 99e02a4244b9df841fe89fdb42dfda0f9c1696f741b30d34e528820058236e0a0799c4b62c57955a30f0fa18a81788f04808fa4ed10a70a699f852ec72f32ad2 WHIRLPOOL 6e8a90ad53aa04a98434feb1fcffb89dcbaa816d59c7690bb0a0298107c613dee7f45c9c3a4b191c2e43465463e4e46bf05dc091799e1ea5be76fd5a04411bbf
+EBUILD discount-2.1.8a-r1.ebuild 2438 SHA256 3cde976dbead07aa2a4d282566e358bd80e1a1c71d897a9840b21485e8dcf0e8 SHA512 876d018d35cf1018c1a81ef0944e391affa1f292ecaceaed357ee19f986a4c98766ff6f0d53451ce07fa501b1693352b35a75e9c9f076c265dfc1f2feab8134b WHIRLPOOL 557a7ec65443e0c6876f0edd4e6ac7b09de97d97b748ea1860b964fb253cefc837d326a688a19c06e6192db3c612d1db0ed7f12bb8535c0f1f968927feeb55d8
 MISC ChangeLog 2472 SHA256 7e63434fb1e7db783a0d961204a17cfed6790b3dd940fd238fecb5aa966520b5 SHA512 1c296077c16676cedcf2db0e4de5d17204ef2c496fd1145084be1be3aef8b711fa2c48ca287f4e04a51b6b5b02304bc6cb0a69976b05a22e8ca9d4ffca2675f8 WHIRLPOOL ebee3ca9558584c36adb5a61f11a955fe993a540f8699addbd2260c2fc39f19202128c7f54e213f0988de735619439a91fb05804f365ddd00c9d597c20ac2e0d
 MISC metadata.xml 244 SHA256 f5bde347c36c74889cbb32d29f06766c08eb3df6e0c468f00295681382c48457 SHA512 100f9b2326c73dff673bda4c5dfc0dd28bc756d80a039c1d3ac19124599a99e18b841ab28da191a79c6498c2dc157c0fed7639c855e2520cc3933f03e3de8a21 WHIRLPOOL 409c270895ffd477768bc9c329c9297c106d3f9572b84051ae66757f4d87c6f0a0b7d71aff602ff41b14400fc0afbf3990cbf1768a63f01fda6854043b66a35b
--- a/app-text/discount/discount-2.1.8a-r1.ebuild
+++ b/app-text/discount/discount-2.1.8a-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
 IUSE="minimal"

 src_prepare() {
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@ -6,6 +6,6 @@ DIST multitail-6.3.tgz 155410 SHA256 1ba6afc2d0322bc09024664762a2fc7b8055c1d8ceb
 DIST multitail-6.4.1.tgz 155717 SHA256 8a6baecf3537c791f70645f3613bfea0c91a22040f2531bfe03b6d0cdd112134 SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b WHIRLPOOL 467d9fd6d089aebe597475d07217baadcb280ea952ae731310365a55046009c808b16657485c037f54dd746e2103f318c3555de04d4e14f2ab2ef19bbc408543
 EBUILD multitail-6.2.1.ebuild 1117 SHA256 df91c321bc07b28c633d15cafe05c77b8cab53e8164a9a525b74bea8d5660420 SHA512 94a479c2a12f4334688ca19722fac0de21be9c1b6432d6ef7a545061d2fa67cb18137809757dae27dc224642076ed75f0d3404754df559b5a433d42f98c290e1 WHIRLPOOL 520ca3c8609a5c2e1c4b7ba515a74c9bf2f554f281310b17082fb8a1e700a571f0c0f0cd25cce16a5633ab774a0affd8a23da6a7d3f500095499fa254b719d72
 EBUILD multitail-6.3.ebuild 1322 SHA256 2810f83a13c2373baeee3cf738aded1c972814e951f4b863896e91719255e2a6 SHA512 759ef9fc88a80ebe4b08ed68a1080b90297f7a06b6cd2323d0ac4e56c13a4caf607d55d80b5c2b7852819f1e9c09b2a566e52d0881e0f1f2403450cd2e0c8fcd WHIRLPOOL caa82b1bd07af4b71fbbf515dccc979578f3ed9099ff831fe9fc3a61d734d4fdd46c09bb538f066c9aa122b12db398d1c4432bad62bed98602a37810faeaa58e
-EBUILD multitail-6.4.1.ebuild 1305 SHA256 9940a72787a4782f5810925d461d3b081378850c063cc7cc00bdf1f852b1a79d SHA512 eba19842f06750d5629a45c3d3e53adb0027efc24c502cccc44dbcbe2dff30932280b6d854092669d5fd83f326bc2754f67be7f010bcc8f452a68bb6f3a23f2c WHIRLPOOL d79a0fa20b792a6d19e5294185424dbf634a6093fe080931f8fb7cc9f514527b4ed9f8a27718990234aebde57eb69c6f25eb85d79187bae99d741df930e3f4f4
+EBUILD multitail-6.4.1.ebuild 1304 SHA256 176119108fa3233bdea90b83423aead32d8e307d2935b17b2e4674942421147c SHA512 15f5a193e878a7e44cc512396a524fd58593344f56caf6257e174b80fb84500453f53584575e343efa7db39f3af40169dc4869fb7a53f9a307a59cd3aa622d13 WHIRLPOOL c21991f3aad5013c095f77394dfe7ae89fd0d55f4d93789509f6ede3c3b4b48bb9d309983c971ae43ca1f716b2641335f35681f8f98235c51e138ea9cefcbd70
 MISC ChangeLog 15651 SHA256 8eb84796a812f13620b25cd3934b3c9450fd06e13f5502a601280095cd2d55a0 SHA512 8847f9389f21ad9f067d0ae9009409fdadbb8a9f2a088e8070f5c5943b130d0141a3d09688ecaf0186f321a95d61173e306655f50853fbbaa7414bd319785e94 WHIRLPOOL e52612777fab0373c736fa3a733a4faeb49f58934eab39780fec01293076463bf8fe2fee79509ce558314ae2c7adcd714d2d432484c2f245884e299df8f8e70a
 MISC metadata.xml 319 SHA256 becb3d73a94717c596b82746022803d99fe5f8cda1244512c9faa8a7b1c74b66 SHA512 bb561b88d4a4a4e7812eebbaf842cf65d81c7c90fe475793c944ea785715323eb386ce32e8a5759e7580089728b47fe0e1e47b8e05449a781a8a6ec5da2a82bd WHIRLPOOL 12575f9318912d9e8ef1b3bbc91f7d0da0eb3ec2d1ac9126e3981991c691ffacb22b30560a4ea54249f31fb62653efdd0a0b3e6fae828304096d4b1bbca78b91
--- a/app-text/multitail/multitail-6.4.1.ebuild
+++ b/app-text/multitail/multitail-6.4.1.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ppc ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="debug examples unicode"

 RDEPEND="
--- a/app-text/pastebinit/Manifest
+++ b/app-text/pastebinit/Manifest
@ -1,6 +1,4 @@
-DIST pastebinit-1.3.1.tar.bz2 35582 SHA256 0dcb6c4820f49cc7f97a7804254df1ae848cfc4fc63e08ca89a525b909709e29 SHA512 f9c4eafbe194dc7fe85ae37005846c38fe9863ed18406953fa6974d979592d74a01eba4dfde3e91da121d36355d87fd2464b565d0eb6aa0091b2b338989567bf WHIRLPOOL 42c58f5cad96361c7f254a17db5a14304ec523b1a50548f27c0a77336e9384f971267a753c1fbc538301dee6cd1d228333976d96618dec8d33539a3e85771525
 DIST pastebinit-1.4.1.tar.bz2 39202 SHA256 c23720ff19d239f7ae62dd7dc28f453aaea4823af29b1595ba2e58fe232988e6 SHA512 40cfdc22a9d168b239c799ecefca8b9a4f873edeb868803d8de4e57b291f695b9aa3f0b04d87b29ca1777917a53f0c210f20fa8661673630e9a29331e10dc065 WHIRLPOOL 49425b36db3477cd141eee676aa256c8d65567c189dd2cf90bfc53a29824f9611f5d9e54d1d470fdd747bacf141198fe49df7c25c83c96c98da85e3026af3056
-EBUILD pastebinit-1.3.1-r2.ebuild 1255 SHA256 bb9d8e0fe8a05e967fbeb4da3b7c1f21247312a41da6bc5ab5495baf26d9d9de SHA512 d15fc93bb7a23ae137b25b3c54b5484f77ca020ea7e0d4784f3a5ae52349f867adf91ad2d8b882ae77a57073b9c601cff8518ce120947e96b6cc60a3be06a547 WHIRLPOOL cbf6591a6bf28d5ccf6e89a12baa951e525b0d0b69336d848fab79a494ec0b70672b40ed11e6032abbce5f4af563dfd63f888deac65875911cb43f6fdbac39b1
 EBUILD pastebinit-1.4.1.ebuild 1366 SHA256 040b0c3b8659551b4933bafe415c0a5ad90cc8339bd9a341561b926a40fae381 SHA512 bd8fadd668cea1979e8290fa853d4a9931ffd6093b11b3ece8c177a30081c4da1778c4e456959c1a80ee9106a850301bc3f8af362e2252c9d2036d45fd4adf7f WHIRLPOOL 1aa26aa0ae02cbd27f8478e8390cce01ef88dd6408d24680da8a465151e207fa9cde336a23ab16378e5c74ed5409958bae9cac9fccd123c3bba7d9bfbee9abb9
 MISC ChangeLog 1760 SHA256 62cf3a38a86df230064778c80ae052c732729f2ef0dfe4b0ce6767ff955024c5 SHA512 e55b8950c931deefa717f39f6d7d71772f83e934a36448f9bf5337e5cbce22f09f5647ea4c955379f0a13e01da811810f525d1be87f39ced7e132f7d0c2ca264 WHIRLPOOL afa1a90d51ed2b327218dfdf0806959955f2a463904df6fc2f610b752dc37b5d3ce2032bfb31cd843a44751db369bd4158cfd260f93dbf48b2c3bb2f1d8233ab
 MISC metadata.xml 396 SHA256 4eb8078b678f7a25266978d3c7dcdbc66371bbeebcf6b83ba139b0c5b2b8a208 SHA512 7e63773764d67006f2abf67c2c78f1b921c58f4a79e03236d928b42a193ba28d032a8c58248e5703262e8ca49271b642a0af7bb629d5acc56b0cf5b61eb3e7cd WHIRLPOOL 6b69d6c661b8856129c4ae7e0c3c670c295ca77961c602410b13f6f33ac259f7d90a1d65add51bb47c3ddc71c3ce972a0b9cf14e5a252c74e868089fccb544dc
--- a/app-text/pastebinit/pastebinit-1.3.1-r2.ebuild
+++ b/app-text/pastebinit/pastebinit-1.3.1-r2.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1
-
-DESCRIPTION="A software that lets you send anything you want directly to a
-pastebin from the command line."
-HOMEPAGE="https://launchpad.net/pastebinit"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="crypt"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/configobj[${PYTHON_USEDEP}]
-	crypt? ( app-crypt/gnupg )"
-DEPEND="app-text/docbook-xsl-stylesheets"
-
-src_prepare() {
-	local mo=""
-
-	for lang in ${LINGUAS}; do
-		if [ -f po/${lang}.po ]; then
-			mo="${mo} ${lang}.mo"
-		fi
-	done
-
-	sed -i -e "/^build-mo/s/:.*/:${mo}/" po/Makefile
-}
-
-src_compile() {
-	emake -C po
-	xsltproc --nonet \
-		"${EROOT}"usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
-		pastebinit.xml || die
-}
-
-src_install() {
-	dobin pastebinit utils/pbput
-	python_replicate_script "${ED}usr/bin/${PN}"
-	dosym pbput /usr/bin/pbget
-	use crypt && dosym pbput /usr/bin/pbputs
-	dodoc README
-	doman pastebinit.1 utils/*.1
-	insinto /usr/share/locale
-	[[ -d po/mo ]] && doins -r po/mo/*
-	insinto /usr/share
-	doins -r pastebin.d
-}
--- a/app-text/silvercity/Manifest
+++ b/app-text/silvercity/Manifest
@ -1,5 +1,5 @@
 DIST SilverCity-0.9.7.tar.gz 278396 SHA256 5b226e71d75c0afc4434c6fbfb44214e8728fd69703045b2134802f71ef049bd SHA512 230c4ce61a0dfef36ba63dfa2d290c2368ae0a1055445b1e17cd12ff436ec80ec91e5a8ff47870c19a3f7a50f958ce59bbe5be06aa07dd0bf0a70038ca3150b0 WHIRLPOOL 2a45f0952adf8542d04aef0111dfc926b5019108d739a168d591f8bd57c3064b7d6bc5f05a9d00d7939c42a935ec0d4b80fa14ca34107fee26dfcd8613ce6b2b
-EBUILD silvercity-0.9.7-r1.ebuild 944 SHA256 1a42c3d63040f895b8603a542199e6b9d07ecd779f108ce504b7ae0ffc6de1d6 SHA512 08a5476ad7c9a2a1f5992780ccf25224b555655c60ec49a508eff90a476ac9fd06fb395a788244d32224b76c0c08322a373d197392e10f6e27a0dff9706d58c4 WHIRLPOOL 41951dbdac1de40733f9b3e94edff0cd4d9269cafaed4e49d1f713f62c0eebc41a7deb4ffec533d531207452078a9071d8d01073cc3b2c96a0d37746d9557533
+EBUILD silvercity-0.9.7-r1.ebuild 943 SHA256 a2861724dc783b22fc090641cef56ee1a1d8e00dfbdfb9c153cc795781f4d3de SHA512 b136242103433766f09f72a9b74df642963da6fe00131550f0bc3efde4019a90e3e92d79e001df8a44b397ae38dd74c933d3579de73202969d49ff39d3946a4a WHIRLPOOL 907c3ea3dba96d1eeb93976c7fe186e1b362791d116fc257b6544cabb504d32d521ecd0b6a88a975792a5c48b15b10b5951e250b82fbb75f3c994fb510fecba3
 EBUILD silvercity-0.9.7.ebuild 1059 SHA256 ba0cb83177bf83a7d0d0dff76f2100041dbfe776dadefb6ce9c8d11fd95eb4bf SHA512 af5caca33b1886d7427caa202adbd964c576c5dbb838ea8db9e8f7721a72a6d35580fe5560ce081a1203636f30d8060b3afd3b4364a4f1c40bae9ceee453958e WHIRLPOOL 212c36e67d6300bf2e19e4679895f8175cf78565626f02817702acb9204bf0a5f96bfd0ccf7a0c18830ae3dfb18d3faffe8a53a4a871c390c14049a132b0c3f2
 MISC ChangeLog 4237 SHA256 ceb6c5b6301cc14a25cf7e6a53d7e2a876bc9e4f4b3f2c8ff29e33ed0751a557 SHA512 e2e7e82a9ec6af8fa37da6a792a633729c781daa741bb000dfc7c0c2da7ca11d661f228c4949400c8cf5c26c9f47b2ec5d3e2996700f5edf8392a00dac9cb431 WHIRLPOOL 3d274bceba8eb807600524e2ca16c6c0d63f69ba39fa955539737fe4021d70b2e4b49f595238f856ace30d2e2972eb1a67cfd6372c6218eef7b34759f3037bd8
 MISC metadata.xml 242 SHA256 920a06ffc4e6789a33da285732e48bf581b9319f662d077385aa1e0cce73f03d SHA512 2f37eaadeb7bebc27adbc33cb2ab809323bdca0d3f5dd6f08c2f13c1dcd7e84091dc13b1cc06b630f17af5d097645c02d6893313ffd7f14f09127f7821687a3a WHIRLPOOL 89b7c07b4b9806e94387f222beb43a2833a2e20215f3a65b6ce87deb6d065ef478e77359d91a4dfb727ac9372a7613529399f8eb0710953fc9e82cc8e1c06992
--- a/app-text/silvercity/silvercity-0.9.7-r1.ebuild
+++ b/app-text/silvercity/silvercity-0.9.7-r1.ebuild
@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/silvercity/${MY_P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""

 DEPEND=""
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@ -106,7 +106,7 @@ EBUILD tesseract-2.04-r1.ebuild 2631 SHA256 7a1fb8e69f55736003790bdb3c077dd4c435
 EBUILD tesseract-3.03_rc1-r1.ebuild 4193 SHA256 f26842dcb0a9694d1153bdfc5d8b83e3debd7076c28becacaec8f0f7c7d7872d SHA512 38c963890dac40e3c2e13774ada044f2c5950f1aa8dc255f3cc335bb7330805c52a25bb882dfc9950f95c7af51b9715fc47dd30fba891ea35e58075b96241b6f WHIRLPOOL 7a122450213ea80872f5a3b8c682926d830771279e21384b6c8d09d9ab833af0d4558bd6b288803325506ba6284f8484414e4aec8c3ec24598cc4d624d6ff3de
 EBUILD tesseract-3.03_rc1.ebuild 4050 SHA256 a82cf0e4960d49c479a64c5f740b115c0f3155d67f374f28c1cf9e62fbec0d76 SHA512 2dc4b4127e830c25cae946b672d1473e99e50ca68c6eb563c8460e052dacfbffbdc923cb12cb1caa66ab6befcfdc58bbe51e694ff63c9fb4acee8750ea114ab4 WHIRLPOOL 7582df51c34eb1e5fc2cc768f067e055a466845e45f46e057b0187a27bb164351c39c0a3ee6db1081cf11ea32c729d75ebe774f7e4cc9f19be58045d0e216878
 EBUILD tesseract-3.04.00-r1.ebuild 5185 SHA256 01cf25774c2ef1884f89446a8b218a6bfb1448d817f6bc923edc5edbec9383f5 SHA512 91414cb9bbbf6d22c0c82b9fd8bf5e55b3896086b10e6854876c5a0506eca8dc6b0796475845134387c742d7df1ff1013418a3fdabd525f339990fe57a0793c8 WHIRLPOOL 1549d2ffbb7751f02efe637607618069b931a098820a2c2dbf7fafbbaf4635671c10a42222d197d3999e50df0f10e69689de7baf29a6ce6e46a1a929b43a7de8
-EBUILD tesseract-3.04.00-r2.ebuild 5433 SHA256 1a0bbec03da88ba93d60df5fbab8e22464d0dde78652c684cb0fb2607382a026 SHA512 f56735c0d7b3b380472d9120d82792f71d913c9891c9cc242bc29b8460ee49cf8b77f03b3bfceaef1a079a0ec894703940240777ac509aa672d434087b2270e3 WHIRLPOOL 352fa960a251255d15f7dc8875ea5e60cd5c038174c526e25ab2596b0878bf1f1c2936f8a79970f9c0018cf2146c37098b00ed5f164a1438379229329de82084
+EBUILD tesseract-3.04.00-r2.ebuild 5432 SHA256 abbb3d47e7da054e18c730da0ab9255f4c2bcf42341829fde18fd6f732708171 SHA512 8b659eb27b41fa1295d9e48610309501911ffd36dc414169ceeefe3aaf32a9fa0a798054b944a23b8b4e333d1b4df2316b093f35f0ad939653f8124c1a227c96 WHIRLPOOL 349124b03c688927cdd554c649050611954a6cb612ce8adc75d3517a39da26655858a77824db809ee62c8e6db0a3e96281679550defa1b3a478489e575479ec7
 EBUILD tesseract-3.04.00.ebuild 4197 SHA256 44d8403ac07900e9b6da0c71b7cbc986508ec6e910ae7e0cae50e9c01303b0ae SHA512 05b0635c09832eee66e392415725df45f9c96911a7997b980c414c82f3b5cb8773824d2a6973f6e596cb0fab86e97ad53d9d07abbe4ba24d6c35de548b312287 WHIRLPOOL 32c0f04836cc593c588368c3d5abfa5ded271c1a5841f5be5ed9118d90ba3344e06e6a0d02c8ab1c7f85ba94cad6660fca305eeea2b666b9ce2415fb9a5062ae
 MISC ChangeLog 9372 SHA256 0e3db28103b0954119c44be961dfb06f8a62d29f67f6e314f05ceb30aa8c0033 SHA512 bf33c8ca4355633528881d07197ec3fcfda79a9e6f7823edb4f41ba2eeef7ba76c065030bc2d5e347af3fd96d2b6522037a4174ca09f38129ad3c878d544be8d WHIRLPOOL 41c75f4a74b577dbe5c4a187ec3abe959ef0b42d5d7f95c5c3dc51bc91885db0bb3ca1f5e4f1aad5bc96d53f656929e8bcbc6d8011ece93e876d3625924b7513
 MISC metadata.xml 1308 SHA256 400d80805f79bda23c11745901a2fdb8593dcb8a212d7357db4a3c4f930880a6 SHA512 cce79cbeec4716cc5072e23c9a14dd0239faf50293f84a7658687ea4cc334cefc83526fdf088766d16d041b4ecf7c092d472524714ef675cbc3a012a591392f9 WHIRLPOOL 73cbd065ad36bcf18e1923637cc457aa7415fb1a9855953afcf13c3de90c0c56b754fbe6332f7e0ab401a1c072aa5c58fd8f9f715c36661ca69f515175d91104
--- a/app-text/tesseract/tesseract-3.04.00-r2.ebuild
+++ b/app-text/tesseract/tesseract-3.04.00-r2.ebuild
@ -59,7 +59,7 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ppc ~ppc64 ~sparc x86"

 IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff training -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"

--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@ -1,12 +1,7 @@
 AUX tbb-4.0.297-underlinking.patch 475 SHA256 489473e0f30a53d13bd508d3d720df2e6db24b1348470febd162d0834bf6a3de SHA512 26103f87299e56e08d404e0cdda47f3b2be89e770ea12e84ee7f681050364e674aca1ba8326b81db0a73c2f53e973b89b97af3f36c7e762d4699767481b64486 WHIRLPOOL 10e6e3f886dc1a8638f1788254e38f7f92ebbd9deab645e215e9abecfe871e8918de490dc0612de276829e75571db82bd04fe1a8606a50e5f2a6b938821a25fe
-AUX tbb-4.1.20121003-ppc.patch 895 SHA256 762ea4b118ede189c9f527d8fbe4bdad2fb3814729267dc0333b03a5f1056923 SHA512 1b07f84163a1f372519b2a44ce1ed355c5d9bdad1987f2b2efcd5a85b599624b37d907d0dcc0c1d2254b619803edbeabdc5cbb7d933986b78b77081ecd4a23ab WHIRLPOOL cbbe2829f4e829867b4844486f07ff0be509f6b850332f5ee376e86519e0eb63598a2179c687199ad5b16a67ce74080f178940c8ac6bff354bf66dafb7192b06
-AUX tbb-4.3-build.patch 4729 SHA256 325f4b13ec59a042f3e92b83bed99b564a305e451c9a4a3dfc7c80a5377da40c SHA512 0542541a6cbb360a002770a2087519e41b7e20e4dc84a4255ba4ad8b9444a26d25e7a3047d08106ddfe0151704aaddad06fbe49fcd9cdeeced281294e8462e7a WHIRLPOOL a29ea567eee7147ecc0aa40c84ed35d7971e14f3a7aae23890d18997b9a880ddfc5342d0cf8504efa2c0ff083e09f88c0db96d7bc4b15b46d2bd50bc17042947
 AUX tbb-4.3.20150611-build.patch 5291 SHA256 048cb0531e39f4cfe7044a48fe1760dd4d78f8da2e0c7a71478e9306ef9b147a SHA512 1648810b9ea89a904eaf2d15168dbf51abefb8ad337aad561f4b93691163ffb9bab52ade91ed71abc2305a60294c33254603ea60f4255fcccf92a2906d4c09a6 WHIRLPOOL d99b55ae96ebbbbc8a5a73668d797dabcc59bd0c662336bac26af9c1871f206e8b182bff3d8a48252476c613c0b73026e49db1f7b9f7975a66564253f0fbd9ea
-DIST tbb41_20121003oss_src.tgz 2250789 SHA256 5383727b9582a54cf4c4adbf22186b70e8eba276fcd3be81d746a937c5b47afc SHA512 fada6e32a09be2a151746caf3a15729c9ec6043b17e2f0aeb1bd903542310cdc6fe9ad85017ff5b2cfb16ae955c81c8b39ad8cf97f871bfcbd19d4948ef1d821 WHIRLPOOL 6c2a094e1dc6efed7189903bf8a6bbb8688ab1b15134c9f3c09fd5ed6a72315140505f5df410c89b65cd160a896222d71e01b3bfcbcd933281fb18a69eaf33f1
 DIST tbb43_20141023oss_src.tgz 2777177 SHA256 247a8d22d6850caa37d376aaeaf8bfcb06525ec5561fb6f6ed09cdad2c1f6414 SHA512 0718e7bf5f0b9525da9eb45beedc1c3832ccd813d72b10a7ed7c6a281d342325d04c65f797c29e2551d4f2bd470e57c81f38db0d6bd983f7871a90f2b5fe5020 WHIRLPOOL 7a6bc75e9404cbfc9f1e1bc53ff195e63c605aae1cc2883147d69bdd394694d21f916fa6d1c2708ff397a01c620fdb38966d0da5085df6d23dcba235de18c6a8
 DIST tbb43_20150611oss_src.tgz 2757631 SHA256 221f85fe64e11c9638e43b3c57d5750c26683905fc90827c0bcfefdb286e79c9 SHA512 83d5d827706b774ef5cd6df8082e5d7f48683388684423bb40565dfc25892fc2e57c382f719b78087d83e51edb3f7f7215f33d8b5039b55c32788d80efa6e0b8 WHIRLPOOL 8e98162b2307c759fb26923d76ab784dea81e166c8bf5323869d234da59641c333e5ae30b4a224bccbf20d4f5f6b75c658589f519a165ea3ad7658322f148c72
-EBUILD tbb-4.1.20121003-r1.ebuild 3244 SHA256 df0d540ada9c29a5e39be61d197b74f3c2f4c13233dcfc831810be23b792ff7c SHA512 22fa0f2837f5b6b9f099ca89dedde7d786113ae96f233247c08b57fc88d5067cc91d6fbb2fad689238268f8675300fdf18938c04e6a20b499e9b1a0b4702631c WHIRLPOOL 6b506dddb6ebe7b56edb50e3e83bde7e61d2b91080f265dc2ab2941cb641abfca890526bd65d860f7bc59376d84c825d7edfc99bb5480fda9d93328859a4eae2
-EBUILD tbb-4.3.20141023-r1.ebuild 3152 SHA256 c21ca4bc79ec8ea3e78cd4dd6853c9623149c68ccb84b35dd5daccc9c1f5543d SHA512 0c226dec16e8a068ac0000baa87d6e24dde083cc98512f1c31e5d8be03556d0b2126a949c73e807a77149f84f3af45397adfecaca1400f712cec63ff08a21664 WHIRLPOOL f3fa3b93490b7823602e9ed083aa32793599a5118a73e2034c492ebb0a53e1503975799fdac08b7bffd34d9b884bcfe2de8cfcada5fb2b91c78044634df8f003
 EBUILD tbb-4.3.20141023.ebuild 3417 SHA256 ef84595a5aa28ce0ca681f005b81411174b4f8533e2df3a12bd5192c847a2bbe SHA512 dc9efb5d8c03bcce02c0c9214db77d7a27d8b1083a0d214a7414bb494979b3d6d7309d12e93ca980a42d24adc1777db1294330351f1b224db45a23823949c3a5 WHIRLPOOL 21a4b63ab293c3de39a7205dbe2415220c6a08006326a1b0b47fccd9e669b1d9fa6bd0b7890d6e8c07991ef641197f81f8ced2bb6a8f3079f206155c11cf536b
 EBUILD tbb-4.3.20150611.ebuild 3144 SHA256 f458f8da0bc8cc984ee396dfe01809f77746cc849cafe0a35397d49c910f63f3 SHA512 c2227070af466884ad18babfd4110f930d5600a72e6ed9e1e1948eb58acbc3651af202a37458f972800141c3ad858b6899769444f60d71142b345e5a0b3cff7c WHIRLPOOL 85199577a8db84ba1189a552c2889a5d46a37497f6e652866ceee353073d2ed6314cb934ce299e6df3f288f51a443e7f9b848a428f62a569d3c6fa3aa71016b8
 MISC ChangeLog 9605 SHA256 983718319f403f3a8c2491adc27c5305969abca0d2b0f865448065dce5b6f3ca SHA512 c44c4345ef7e3dc26db537f04b5d95d3ad2e17eda30a2c6ea94eac9d4213680724cd5dc094eb57c9c55796d7731cdafd0c88ed36bf0e54a26e9fc53f451c1054 WHIRLPOOL 2f5f594d55e6e8db91348950f2db010e6174421bab1df1ad1f2b3bbbdab751c6066260103406c24dbea4f5dc8f9f779fe7369f8f37418a0122ad640adec53b51
--- a/dev-cpp/tbb/files/tbb-4.1.20121003-ppc.patch
+++ b/dev-cpp/tbb/files/tbb-4.1.20121003-ppc.patch
@ -1,16 +0,0 @@
-diff -up tbb40_20120408oss/include/tbb/tbb_machine.h\~ tbb40_20120408oss/include/tbb/tbb_machine.h
--- tbb40_20120408oss/include/tbb/tbb_machine.h~	2012-04-20 09:21:57.000000000 +0200
-+++ tbb40_20120408oss/include/tbb/tbb_machine.h	2012-08-28 13:20:42.150456167 +0200
-@@ -373,8 +373,8 @@ void spin_wait_until_eq( const volatile
- //  - The operation assumes that the architecture consistently uses either little-endian or big-endian:
- //      it does not support mixed-endian or page-specific bi-endian architectures.
- // This function is the only use of __TBB_BIG_ENDIAN.
-#if (__TBB_BIG_ENDIAN!=-1)
-    #if ( __TBB_USE_GENERIC_PART_WORD_CAS)
-+#if ( __TBB_USE_GENERIC_PART_WORD_CAS)
-+    #if (__TBB_BIG_ENDIAN==-1)
-         #error generic implementation of part-word CAS was explicitly disabled for this configuration
-     #endif
- template<typename T>
-
-Diff finished.  Tue Aug 28 13:20:58 2012
--- a/dev-cpp/tbb/files/tbb-4.3-build.patch
+++ b/dev-cpp/tbb/files/tbb-4.3-build.patch
@ -1,185 +0,0 @@
--- a/build/linux.gcc.inc	2014-10-31 09:08:38.000000000 -0400
-+++ b/build/linux.gcc.inc	2015-06-08 19:22:49.855807841 -0400
-@@ -32,12 +32,12 @@
- EXPORT_KEY = -Wl,--version-script,
- LIBDL = -ldl
- 
-CPLUS = g++
-CONLY = gcc
-+CPLUS := $(CXX)
-+CONLY := $(CC)
- LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
- LIBS += -lpthread -lrt
- LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
-C_FLAGS = $(CPLUS_FLAGS)
-+C_FLAGS := $(CPLUS_FLAGS)
- # gcc 4.4 and higher support -std=c++0x
- ifneq (,$(shell gcc -dumpversion | egrep  "^(4\.[4-9]|[5-9])"))
-     CPP11_FLAGS = -std=c++0x -D_TBB_CPP0X
-@@ -54,7 +54,7 @@
- endif
- 
- ifeq ($(cfg), release)
-        CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
-+        CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
-         CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
-@@ -74,24 +74,12 @@
- 
- ifeq (intel64,$(arch))
-     ITT_NOTIFY = -DDO_ITT_NOTIFY
-    CPLUS_FLAGS += -m64 $(RTM_KEY)
-    LIB_LINK_FLAGS += -m64
-+    CPLUS_FLAGS += $(RTM_KEY)
- endif
- 
- ifeq (ia32,$(arch))
-     ITT_NOTIFY = -DDO_ITT_NOTIFY
-    CPLUS_FLAGS += -m32 -march=pentium4 $(RTM_KEY)
-    LIB_LINK_FLAGS += -m32
-endif
-
-ifeq (ppc64,$(arch))
-    CPLUS_FLAGS += -m64
-    LIB_LINK_FLAGS += -m64
-endif
-
-ifeq (ppc32,$(arch))
-    CPLUS_FLAGS += -m32
-    LIB_LINK_FLAGS += -m32
-+    CPLUS_FLAGS += $(RTM_KEY)
- endif
- 
- ifeq (bg,$(arch))
-@@ -99,12 +87,6 @@
-     CONLY = mpicc
- endif
- 
-# for some gcc versions on Solaris, -m64 may imply V9, but perhaps not everywhere (TODO: verify)
-ifeq (sparc,$(arch))
-    CPLUS_FLAGS    += -mcpu=v9 -m64
-    LIB_LINK_FLAGS += -mcpu=v9 -m64
-endif
-
- # automatically generate "IT" instructions when compiling for Thumb ISA
- ifeq (armv7,$(arch))
-     CPLUS_FLAGS    += -Wa,-mimplicit-it=thumb
-@@ -113,13 +95,7 @@
- #------------------------------------------------------------------------------
- # Setting assembler data.
- #------------------------------------------------------------------------------
-ASM = as
-ifeq (intel64,$(arch))
-    ASM_FLAGS += --64
-endif
-ifeq (ia32,$(arch))
-    ASM_FLAGS += --32
-endif
-+ASM := $(AS)
- ifeq ($(cfg),debug)
-     ASM_FLAGS += -g
- endif
--- a/build/FreeBSD.gcc.inc	2014-10-31 09:08:37.000000000 -0400
-+++ b/build/FreeBSD.gcc.inc	2015-06-08 19:24:51.385810060 -0400
-@@ -27,14 +27,14 @@
- WARNING_KEY = -Wall
- DYLIB_KEY = -shared
- 
-CPLUS = g++ 
-CONLY = gcc
-+CPLUS = $(CXX)
-+CONLY = $(CC)
- LIB_LINK_FLAGS = -shared
- LIBS = -lpthread 
- C_FLAGS = $(CPLUS_FLAGS)
- 
- ifeq ($(cfg), release)
-        CPLUS_FLAGS = -g -O2 -DUSE_PTHREAD
-+        CPLUS_FLAGS = -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
-         CPLUS_FLAGS = -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD
-@@ -51,22 +51,12 @@
-     CPLUS_FLAGS += $(PIC_KEY)
- endif 
- 
-ifeq (intel64,$(arch))
-    CPLUS_FLAGS += -m64
-    LIB_LINK_FLAGS += -m64
-endif 
-
-ifeq (ia32,$(arch))
-    CPLUS_FLAGS += -m32
-    LIB_LINK_FLAGS += -m32
-endif 
-
- #------------------------------------------------------------------------------
- # Setting assembler data.
- #------------------------------------------------------------------------------
- ASSEMBLY_SOURCE=$(arch)-gas
- ifeq (ia64,$(arch))
-    ASM=as
-+    ASM=$(AS)
-     TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o
-     MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o
- endif 
--- a/build/linux.clang.inc	2014-10-31 09:08:37.000000000 -0400
-+++ b/build/linux.clang.inc	2015-06-08 20:24:29.785875376 -0400
-@@ -31,15 +31,15 @@
- EXPORT_KEY = -Wl,--version-script,
- LIBDL = -ldl
- 
-CPLUS = clang++
-CONLY = clang
-+CPLUS := $(CXX)
-+CONLY := $(CC)
- LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
- LIBS += -lpthread -lrt
- LINK_FLAGS = -Wl,-rpath-link=.
- C_FLAGS = $(CPLUS_FLAGS)
- 
- ifeq ($(cfg), release)
-        CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
-+        CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
-         CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
-@@ -61,24 +61,10 @@
- 
- ifeq (intel64,$(arch))
-     ITT_NOTIFY = -DDO_ITT_NOTIFY
-    CPLUS_FLAGS += -m64
-    LIB_LINK_FLAGS += -m64
- endif
- 
- ifeq (ia32,$(arch))
-     ITT_NOTIFY = -DDO_ITT_NOTIFY
-    CPLUS_FLAGS += -m32 -march=pentium4
-    LIB_LINK_FLAGS += -m32
-endif
-
-ifeq (ppc64,$(arch))
-    CPLUS_FLAGS += -m64
-    LIB_LINK_FLAGS += -m64
-endif
-
-ifeq (ppc32,$(arch))
-    CPLUS_FLAGS += -m32
-    LIB_LINK_FLAGS += -m32
- endif
- 
- ifeq (bg,$(arch))
-@@ -90,12 +76,6 @@
- # Setting assembler data.
- #------------------------------------------------------------------------------
- ASM = as
-ifeq (intel64,$(arch))
-    ASM_FLAGS += --64
-endif
-ifeq (ia32,$(arch))
-    ASM_FLAGS += --32
-endif
- ifeq ($(cfg),debug)
-     ASM_FLAGS += -g
- endif
--- a/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild
+++ b/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild
@ -1,124 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils flag-o-matic multilib versionator toolchain-funcs
-
-PV1="$(get_version_component_range 1)"
-PV2="$(get_version_component_range 2)"
-PV3="$(get_version_component_range 3)"
-MYP="${PN}${PV1}${PV2}_${PV3}oss"
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="http://www.threadingbuildingblocks.org/"
-SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
-LICENSE="GPL-2-with-exceptions"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.0.297-underlinking.patch \
-		"${FILESDIR}"/${PN}-4.1.20121003-ppc.patch
-	# use fully qualified gcc compilers. do not force march/mcpu
-	# not tested with icc
-	# order in sed expressions is important
-	sed -i \
-		-e "s/g++/$(tc-getCXX)/g" \
-		-e "s/gcc/$(tc-getCC)/g" \
-		-e 's/-m\(arch\|cpu\)=*[[:space:]]//g' \
-		-e 's/-\(m\|-\)\(64\|32\)//g' \
-		-e 's/-O2/$(CXXFLAGS)/g' \
-		-e "/^ASM/s/as/$(tc-getAS)/g" \
-		build/*.gcc.inc || die
-
-	# force 64bit where applicable, 32bit where applicable...
-	# built-in detection is based on running kernel, which messes up
-	# e.g. in a x86 chroot on amd64 kernel. Bug 462130
-	# see build/linux.inc for values
-	use amd64 && export arch=x86_64
-	use amd64-linux && export arch=x86_64
-	use x86 && export arch=ia32
-	use x86-linux && export arch=ia32
-	# no idea what to do with ppc but so far it seems to work
-
-	find include -name \*.html -delete || die
-
-	# pc files are for debian and fedora compatibility
-	# some deps use them
-	cat <<-EOF > ${PN}.pc.template
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Cflags: -I\${includedir}
-	EOF
-	cp ${PN}.pc.template ${PN}.pc
-	cat <<-EOF >> ${PN}.pc
-		Libs: -L\${libdir} -ltbb
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc.pc
-	cat <<-EOF >> ${PN}malloc.pc
-		Libs: -L\${libdir} -ltbbmalloc
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc_proxy.pc
-	cat <<-EOF >> ${PN}malloc_proxy.pc
-		Libs: -L\${libdir} -ltbbmalloc_proxy
-		Libs.private: -lrt
-		Requires: tbbmalloc
-	EOF
-	use debug || sed -i -e '/_debug/d' Makefile
-}
-
-src_compile() {
-	if [[ $(tc-getCXX) == *g++* ]]; then
-		comp="gcc"
-	elif [[ $(tc-getCXX) == *ic*c ]]; then
-		comp="icc"
-	else
-		die "compiler $(tc-getCXX) not supported by build system"
-	fi
-	emake compiler=${comp} tbb tbbmalloc
-}
-
-src_test() {
-	append-cxxflags -fabi-version=4
-	# avoid oversubscribing with -j1
-	emake -j1 compiler=${comp} test
-}
-
-src_install(){
-	local l
-	for l in $(find build -name lib\*.so.\*); do
-		dolib.so ${l}
-		local bl=$(basename ${l})
-		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
-	done
-	insinto /usr
-	doins -r include
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins *.pc
-
-	dodoc README CHANGES doc/Release_Notes.txt
-	use doc && dohtml -r doc/html/*
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples/build
-		doins build/*.inc
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples
-	fi
-}
--- a/dev-cpp/tbb/tbb-4.3.20141023-r1.ebuild
+++ b/dev-cpp/tbb/tbb-4.3.20141023-r1.ebuild
@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib-minimal toolchain-funcs versionator
-
-PV1="$(get_version_component_range 1)"
-PV2="$(get_version_component_range 2)"
-PV3="$(get_version_component_range 3)"
-MYP="${PN}${PV1}${PV2}_${PV3}oss"
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="http://www.threadingbuildingblocks.org/"
-SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
-LICENSE="GPL-2-with-exceptions"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug doc examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.0.297-underlinking.patch \
-		"${FILESDIR}"/${PN}-4.3-build.patch
-
-	find include -name \*.html -delete || die
-
-	# Give it a soname on FreeBSD
-	echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >>	build/FreeBSD.gcc.inc
-	# Set proper versionning on FreeBSD
-	sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
-
-	use debug || sed -i -e '/_debug/d' Makefile
-}
-
-multilib_src_configure() {
-	# pc files are for debian and fedora compatibility
-	# some deps use them
-	cat <<-EOF > ${PN}.pc.template
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Cflags: -I\${includedir}
-	EOF
-	cp ${PN}.pc.template ${PN}.pc || die
-	cat <<-EOF >> ${PN}.pc
-		Libs: -L\${libdir} -ltbb
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc.pc || die
-	cat <<-EOF >> ${PN}malloc.pc
-		Libs: -L\${libdir} -ltbbmalloc
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc_proxy.pc || die
-	cat <<-EOF >> ${PN}malloc_proxy.pc
-		Libs: -L\${libdir} -ltbbmalloc_proxy
-		Libs.private: -lrt
-		Requires: tbbmalloc
-	EOF
-}
-
-local_src_compile() {
-	cd "${S}"
-
-	local comp arch
-
-	case ${MULTILIB_ABI_FLAG} in
-		abi_x86_64) arch=x86_64 ;;
-		abi_x86_32) arch=ia32 ;;
-	esac
-
-	case "$(tc-getCXX)" in
-		*g++*) comp="gcc" ;;
-		*ic*c) comp="icc" ;;
-		*clang*) comp="clang" ;;
-		*) die "compiler $(tc-getCXX) not supported by build system" ;;
-	esac
-
-	CXX="$(tc-getCXX)" \
-	CC="$(tc-getCC)" \
-	AS="$(tc-getAS)" \
-	arch=${arch} \
-	CPLUS_FLAGS="${CXXFLAGS}" \
-	emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" $@
-}
-
-multilib_src_compile() {
-	local_src_compile tbb tbbmalloc
-}
-
-multilib_src_test() {
-	CXXFLAGS="${CXXFLAGS} -fabi-version=4" \
-	local_src_compile -j1 test
-}
-
-multilib_src_install() {
-	cd "${BUILD_DIR}_release" || die
-	local l
-	for l in $(find . -name lib\*.so.\*); do
-		dolib.so ${l}
-		local bl=$(basename ${l})
-		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
-	done
-
-	cd "${BUILD_DIR}" || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins *.pc
-}
-
-multilib_src_install_all() {
-	doheader -r include/*
-
-	dodoc README CHANGES doc/Release_Notes.txt
-	use doc && dohtml -r doc/html/*
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples/build
-		doins build/*.inc
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples
-	fi
-}
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@ -2,7 +2,7 @@ AUX percona-toolkit-2.2.7-no-versioncheck.patch 9310 SHA256 4345de18dcea0243fa99
 DIST percona-toolkit-2.2.11.tar.gz 1389718 SHA256 848a8a57bf04dc1b2cc2ab555dd594a2c708b76656042ff38b1a91b8ccb1df4b SHA512 d5e34fce1b6b69dfc1a8ecd7bcbe84e586e950976553f4fd30afb887a850770c08990216e41fc194bdd0a5642034905ee2d69c2f8b3781503c9b4aab47017cdb WHIRLPOOL 79e02087c97b86e6e282215cf73c89d7d6842978a1d40d3b9e2a484437e6939a9957c7028feb8690ffc8b915c26627c943204f230f4cb09749bb3e22ec4189ff
 DIST percona-toolkit-2.2.15.tar.gz 1401540 SHA256 ad9fffcee66852ac19c5d138e17474ff48af0083bc0fd8d0a6fb9400bab130f3 SHA512 b7035701909c3587ded1438bef7bdaa4ca1f40b339dbce001826aeadff46335ff39023a020c05ebd3e81a9ede70de26a162c48e5852e47577e7c6b3ec49a57c0 WHIRLPOOL 782134712d7562699f6e1f60299852d67e1bb1193c846c4cf48dba666f4fac44da655157bd2d5dafb4ae89db64e371d8e2e875d0397b8d2c3f257302928873d4
 DIST percona-toolkit-2.2.7.tar.gz 1451687 SHA256 49ed1fa6d46b8211ba82355ec3c9dd0614c3b29fd31993123f2041e85a38891e SHA512 d3d7c4162de08c381810b815600effc683d1b79a8df2ccacd16e2b333924b6634c135f08387784c88867c90ce4ee1b334eae6d7f974e9587008da30b7206c5d3 WHIRLPOOL b6d02d5bc0aafbd8fdabc48efb4fa8e0d04634d31185c2c12c2c2776e36e80f138f7bcd1a6fcd2c079ca0cd25c56e79a6aea0e1615dfc7ad26a553c60716674d
-EBUILD percona-toolkit-2.2.11.ebuild 1270 SHA256 924c3f34e7faa104fab79dc63b4ac47f8888153142a14023768a323c864b1c11 SHA512 2cca67bb2fc74fef9ebb361960db197844e7a8edaf204d9b3db011ff74e2bfca710d6e985b220b349d755d4fc06016fe74cc80af61fc4527c5e439d874068a23 WHIRLPOOL fb17d648229d0f5c26f3e30df580cddf6539cfd721c42b5769ccdc55aed8c1e6d918193ed913ef05c905b1f8d5f0a85edbe44ef84cfe0d5e7373af8ee94de4dd
+EBUILD percona-toolkit-2.2.11.ebuild 1269 SHA256 1a3413ca95c84ee86d8cba681b55ce52e2f8fc9eb5eb50ed9a0ad0db8e71fdb3 SHA512 e501f3c121db39d680b73d08f97ef9c2d4590265a3e65729367f89a8d919468db66876dc3650b932bad491d2a85d789254538226453b113ac91b0ad0dd43d6ac WHIRLPOOL 07e99ecc5e0664361f1da55c537bd62c14c958bd9806b62b53255e6b8a0abc9546ce06b9ef80cb38aa7629a5a5dac401ffc52267c6d2c2e82cbc45b42b204fe1
 EBUILD percona-toolkit-2.2.15.ebuild 1279 SHA256 aee1f1992b4fff0f855f7ef39c3cad85b5658c1964889c4a2944f575b19958c6 SHA512 7dd382c0bbfba84fc68650676e5826f3163ce5029f0e93f8714c454779866b30ed8f6db6524be771c78f4e4826fafda3221e5fa6bed28bae2e7ff589b1c02068 WHIRLPOOL 49d5c51bdcc0d54b91ad83826d30e484bad3bdd94924bbf5f46f2e63eeeda0fa020efa0d8c1aa6a2487d98bc1a040f307e8c806e6f38b373e7b41740e13ec1c2
 EBUILD percona-toolkit-2.2.7.ebuild 1262 SHA256 8eb1e38487b6890216d1d68d88c05da1901c6ea4a5f5262ef33ca87321cad90a SHA512 5a878a80dee6b99fbce6e6bc8e540f313c42a3658e3b59ad5f34ad0b772ed9259ed5e8b79c6ed26d2f322f815b671397a73a21f27410e1de78da158acd4dd8d3 WHIRLPOOL ea838f2bc234151647415d5c269692790f26674a34f217465f66549d6a340d65573cc025318c318664e044d198f71fd800f8d3ac4413c41186823ac2b4e0deac
 MISC ChangeLog 2400 SHA256 51b0155c3bfc573a6d71ec920ab34bc2ff47435a04578a387bdb0546b11a141e SHA512 20d89950b2bcc9dcadefdae797fa75cade211082a48c74c0dd3c1a4e9cf405c59f78ed7b5cae84f5a4e9b35b3c709c91d4a37d648564a57101e468f69099b743 WHIRLPOOL efb33bce25c9a0913d122d610db1e2262f169a57c34254d7a23c09527819befe3e4758ab8b161ba2538da8cc4420f8aa9f4609d12c26da2183d34c7ace3def44
--- a/dev-db/percona-toolkit/percona-toolkit-2.2.11.ebuild
+++ b/dev-db/percona-toolkit/percona-toolkit-2.2.11.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://www.percona.com/downloads/${PN}/${PV}/${P}.tar.gz"

 LICENSE="|| ( GPL-2 Artistic )"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 # Package warrants IUSE doc
 IUSE=""

--- a/dev-games/goatee/Manifest
+++ b/dev-games/goatee/Manifest
@ -1,6 +1,6 @@
 DIST goatee-0.2.0.tar.gz 76171 SHA256 288526218177cd340360c2861f03163ae9e1c1df6c937b5d4f010350766f1b53 SHA512 d731c6f96edef4717f137a37d73fe190a4620b9f328f1cf9ec50400bd74f7e6e0ef8a60d8e9b64472b66670789cab82a1ece8019eb0921d38644875fbfa59079 WHIRLPOOL cae7ab41dff84f5abab4190e37cf18dce44228fcebba265e3af1f0ddc95dba1a25b728cc59d9ffcc3e645b599759c74b0c122f321dee40dbd69a55962eabb66e
 DIST goatee-0.3.0.tar.gz 83679 SHA256 4d2ca32cf42161e18d3c528c24d0ac16a78b0e331759ce97714d5abcab65c0df SHA512 57c5340ba6aadbd4fd5d328702012e02a5e36c50be7f714bc1f8adedb3270c2174ad3c60d30dd7b93b93b4a3a3e6436ec9e5957561e13046dfde869b71ec2cd6 WHIRLPOOL bff45c30c33ea0e2e82fcf138d2b99de96b459c67fbdf952c4cc94e115e416b0733751dafeacfbd3738a7295dc99583449f2a56db9f50eb2a039de0981870eae
 EBUILD goatee-0.2.0-r1.ebuild 774 SHA256 ac123fe73114022ad8dbcc302846086c5b098001ac68e753539aba45b22ee536 SHA512 7de0fe75fc2d100658e16d7002cef3699908f74516917bc5460dfc57d40fa074482cac98915b76fc94e680c793232a8f17856285488dbd9d2ef4e34068a77928 WHIRLPOOL a657126ad780fcb14b1d83a5a85fa103604ddb86d9c7e59ab6baf9dff6355f33127c3e6e359b768b7f361af0723c0cf386bafb67e680f6b7f3c888fe6dc8dc50
-EBUILD goatee-0.3.0.ebuild 775 SHA256 ff8cb116bc03d8cd5d6accf6b09251572eefd3ed7608cfeaca1d736b1d2e1730 SHA512 44affb8e3b3b8c7b4854cb15a589bb2dcacd9a96fc8805bebb4f3b661c0bda441d9921796dfb449515d3fb599d51e109b636e2cc1b523bf4f02acd6517e60126 WHIRLPOOL 2f9e6b5b372211947f6fb67b2a3ed839486a65820c30cc60ce2671fa3097ea828bd1e84bb388fa3c3649ae3f27aac62581118568a796903c021e235a8cb34f37
+EBUILD goatee-0.3.0.ebuild 774 SHA256 ac123fe73114022ad8dbcc302846086c5b098001ac68e753539aba45b22ee536 SHA512 7de0fe75fc2d100658e16d7002cef3699908f74516917bc5460dfc57d40fa074482cac98915b76fc94e680c793232a8f17856285488dbd9d2ef4e34068a77928 WHIRLPOOL a657126ad780fcb14b1d83a5a85fa103604ddb86d9c7e59ab6baf9dff6355f33127c3e6e359b768b7f361af0723c0cf386bafb67e680f6b7f3c888fe6dc8dc50
 MISC ChangeLog 1091 SHA256 975e9b03577e97a08d44b544f3eec0bc8522d42afa9ca1d684f0be78ccfbd54e SHA512 ef8fc3d95f676300f88aef2c9716285c2ed0096b42bbc5e47ee8e2c001bcdc2fe6262836397ca0d534edb1800f8f092bf7475f5484503a69f1ead94434772b0b WHIRLPOOL 3fbbc5301680de702442d84966f93675e93117186991f124554040dd2fd89deb71a7844e519fa0554cc4de68ee66deb1a712209b2161ce6edddab087ce7a4029
 MISC metadata.xml 633 SHA256 52d6c2507cc843486938407a9c1320aa8853729808e8c915ea8e66ea9097b86c SHA512 93468892da6b2332b2aa9a3bebff71086b0ea6c1b6d98e1c27376ef357465b6f1110d1fa70bdb1e75d6b64c8bd6a254c1c4b3a66f2bbe6829e8e7f0b6bc8cc42 WHIRLPOOL 1e39c1fc1811d5fcc08007bd6d8351d70d77e21ab93590748035c3aca3a3bf2e438307719aecfeea53645495a964637efddb1914a5a024d8120c7dea8fd47d06
--- a/dev-games/goatee/goatee-0.3.0.ebuild
+++ b/dev-games/goatee/goatee-0.3.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
--- a/dev-haskell/base-compat/Manifest
+++ b/dev-haskell/base-compat/Manifest
@ -3,7 +3,7 @@ DIST base-compat-0.4.2.tar.gz 4094 SHA256 3e7faa1bc4f079d3afc223c6dab441b9545ae9
 DIST base-compat-0.5.0.tar.gz 4342 SHA256 a1058da0ff74d88c8724917fc15903a6b025108259a5a060cec86165dd7597fe SHA512 d591c96922720fd42ca01744f289b4ef2e228704bd2cb4b7aac5bf5a0de3b5ad5eaf46fe5f2a56e903e3a94ecf228ed494896f8a491173f9077be35c834a0377 WHIRLPOOL efcd8856e4e7e90bbfe674bee9872bb0fc378a13882b853be9b14fb48ab70a37ff734c6882f49075691704a478412e17aeb405a68d380466cdd0374343cb0030
 DIST base-compat-0.8.2.tar.gz 16053 SHA256 3810c7273168a66e4b8f1051ee0c144c6728607382b17eae658bbcfe3e1ca90a SHA512 3942ba0f03a2ee979130d185321f6f48fc3e71a610fb0e65d0b4cfa1ff0112776670a4322d141e9b6465060b44c2d5cf4acff3928648800927b90ce36c2b3760 WHIRLPOOL 6fc9e1830dccd4dedb43aaa555d7db69e0e6925d4bbe9b6be62790272d662014ecc703cb7d0fbaaf1caeb64ab81d577c18dcac32bfac8c23f418e91b5589c167
 EBUILD base-compat-0.2.1.ebuild 624 SHA256 c637fba79a165fd915a2928ec3f31cc1bd87b714e6083985c2ced910aa259e42 SHA512 49d55208e0e37587ebca5d040755e3c5336353feb0a075cf1531bacf698f915ae4649050c328c39ff51982a68a62316d6eb2fc6fcad8bccc8b599ffedf3f910f WHIRLPOOL 1d32a0cc01979488f6813be4d547feaeea1f113ca58501785a024c18ad3b70ac10d92492aa0ab2b784cb8bf19d9326bc08e39efc16bcec26eb8e63c293da189b
-EBUILD base-compat-0.4.2.ebuild 681 SHA256 77194cfb595567fc7c1128ce05f3de51e8ef7780d726889cf37543e1325d0a62 SHA512 5a89055cc51102276f4a31ef39b4c777f4a6689685c1d908622f61515545360a1e22be9898ca4fe160d9295aae3ffb37d48401f142fee1b352000ddb41ddac4b WHIRLPOOL ee16f4f4ed52696b366b008401360717f4753fcea5aa6a2ed5614a1d123f69f36a85f62d96262205328d9bcfbb857685abe6f6fc8a38dc1bb98d134dd1822b8e
+EBUILD base-compat-0.4.2.ebuild 679 SHA256 3f5a649f74c17487ea7ff73542f2bdf1e5029d0f06e825248942c027332de1fe SHA512 8611a825f2abc27866f2ca2ff856a9ea9e379a196afc4b1c911a57803755f3311846d26ec36fd383002404e3da43c9e293a025388019f6b8dcacd235c15c67b1 WHIRLPOOL c208145d400f93578602e81a15fc975db035c26a9d722b177e7bc6b4127e34ff049d4379e4c26ceee1487810719f03c9c7b091e6a8b3cd2d265abeaa431b331a
 EBUILD base-compat-0.5.0.ebuild 706 SHA256 d86378fff30b348f49ab5aa347461e150cc7ed7b002e9dadb61728baa924565b SHA512 f1d1e61eb31eb8b9adcc7d61fb8ede193f771b734f6f0ef035330a46b7d2958af107a909999d5a1dff9f614107cc274001dafef841a6cff6d1fe50e394a02d02 WHIRLPOOL cd5f865b62fe74120562352b1abc477fa30794617a079d1b8df53680679e6d1e1d531fbfd40f49f344189cba0abe5ed346c66317e7b1f384c6acc33d73cbdb20
 EBUILD base-compat-0.8.2.ebuild 626 SHA256 1ffcaae4d3954c11f04c6b44a3f1b5abce3389792f8f6c72a1b70234efdcca17 SHA512 e77a66211c5b0c6bd39f1a49bd21a83807d9a8df399c68f8b017c15dd2fa321640b1522d93bb423c98650fa699ff91651cd5ed69df8604aa82c961272d502f81 WHIRLPOOL d2011e3da38434d2210be9b22f26eac1b1743617ccc28a3122aa2410e24c222e68d0377817d1302abce3d675d030cb8dcaea122834e3c3855311f143243dde26
 MISC ChangeLog 1211 SHA256 a829381cf343c28b921821aee48db9ebcab99537aca106d3c0c6458bdd97917b SHA512 dc9725a69229e3f983aa31a395f698c3bd5b262e8cb83c1459e13dab8b3844b3664f4746cfd11d1e18997e5c4e8fcf10fcf87336620a965108d7f16cc180a311 WHIRLPOOL 9f695cd1d9f9b15f64dc93b4238c82432f1a5ce90bffff9a22b9ef16d0c6cfdad3b5431c8c90e3679cdefc023cbcdc029e8155ce18f456d5f184130f55d020ba
--- a/dev-haskell/base-compat/base-compat-0.4.2.ebuild
+++ b/dev-haskell/base-compat/base-compat-0.4.2.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 RDEPEND="dev-haskell/errorcall-eq-instance:=[profile?]
--- a/Show more
+++ b/Show more