Sync with portage [Mon Oct 2 09:00:33 MSK 2017].

2017-10-02 09:00:33 +03:00 · 2017-10-02 09:00:33 +03:00 · 1a5909ea90
commit 1a5909ea90
parent b6330e31c9
271 changed files with 3007 additions and 7692 deletions
--- a/app-mobilephone/dfu-util/Manifest
+++ b/app-mobilephone/dfu-util/Manifest
@ -1,7 +1,5 @@
-DIST dfu-util-0.7.tar.gz 125356 SHA256 f52a2a5489fbf9f3204a6ada05e0b47ee322e19d81c712e0c58a332d80ec3eab SHA512 df5227655d2d39e8c0323e87a97e38e86481b12ef91528045e8a5a2009a3fe3b6f09acfed8612756c3895253075dbe958aeaf1c9c50c2266efeb22b88d3842e2 WHIRLPOOL 9c74edd96e8f85dd86e0c8a5862a1277cd74b0821b73823f1ecc86e046fdc5cc6ac5fa45cd67de6a65d73ad935b58d0c4109362c2650ac233e18d6727e0ac944
 DIST dfu-util-0.9.tar.gz 138397 SHA256 36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833 SHA512 caa7148b7a9004e2b1f7bc4f1a26b48abfe311743bc0eeed1ab57459910371affc39b6fe7e74b7cac6ca9de41a9901b7a970253ca92d7d66d5008f8a11d2c952 WHIRLPOOL 5eff75635854bb77ffde458b7c6c3dbe7d366207eaf340a5a6a8db132d34ca86d545c87a38c97c1c9bf109c2218b2499aa4c3dce374da5def952a39c7d893391
-EBUILD dfu-util-0.7.ebuild 831 SHA256 d083c338ab0d44a6ee4f8f4d1ad9fd368df524922016d1e09f9aa46f09fb13fe SHA512 9fe6a4ca6d444e489d2edd7f90fb611316bcc21573789af1056a0c182f3fe9ad942fd50b5863bb43848267d17db1868d0850bcc989cdfbb79c2292316d6ae56c WHIRLPOOL f83090381d110b791ead8a62f842eb47c1179a0cc87f5d953717a5f339a2a7935207fa4ebfe135e14fa1580354204ed5784cbf77b3c3e93678bd77fbab8ce03c
-EBUILD dfu-util-0.9.ebuild 613 SHA256 eae66d3962740cc5268ec2ff33741ccac4d28bb5712dce5c552842e96e6efa55 SHA512 6cf5538e2f99326a922767631402887324a7395788bc3435ed410d65b8fa0735ac6fb9414e1ff61f8584f128ce1a992dc3ee1df4c97fb1cc540b7db1edd98727 WHIRLPOOL 618968ebeb55a1ede65547fd589e00f536feb6d2776c8c7ac0ba59c8504e66f7fcbad8acff4b75742cb4d831c119d3b75f7f1ad6fa4e49442b0528af1e672b51
+EBUILD dfu-util-0.9.ebuild 611 SHA256 bd9b4d1a70810c8c9366aba3f03c3a7235b5791eb10307f72cccbcfc3a3cf204 SHA512 3df4947a9180bdd44cf3125dfa3d4f8cf4aed05b45397a7365a42de045dc7ed3ce12e2f6c1ae5f0fa5b317fcd0501ee8a40dae514af6baaae48df39cd9eea46f WHIRLPOOL a2b0314f3e62ed10ffe676da4577cabb4fca84f13479ab80bae21e3568c9915771406464c9ba1b50725db30fc2f13067f7c2484d62fb31b40a0b05d6567bfe68
 EBUILD dfu-util-9999.ebuild 613 SHA256 eae66d3962740cc5268ec2ff33741ccac4d28bb5712dce5c552842e96e6efa55 SHA512 6cf5538e2f99326a922767631402887324a7395788bc3435ed410d65b8fa0735ac6fb9414e1ff61f8584f128ce1a992dc3ee1df4c97fb1cc540b7db1edd98727 WHIRLPOOL 618968ebeb55a1ede65547fd589e00f536feb6d2776c8c7ac0ba59c8504e66f7fcbad8acff4b75742cb4d831c119d3b75f7f1ad6fa4e49442b0528af1e672b51
 MISC ChangeLog 3254 SHA256 a40c8c1b36dbf1ba60bdf1f1c0dc26b8b397645505979379353bfcf87e4a998e SHA512 8fdfdaeab4d87235cc4c748f8d1dccc783598b9b3491c717864e75bf3c5bfc5978a6594afa234437a3127c895174cf28cdd67d5392a82dcef406d46e59cda4e3 WHIRLPOOL 1a5d711d9b67022bdee1829c370efe6de492e2740353b80ffb841490e47afed3a7459059bf1faebe805d1bbd7f06ce29075d181da1e6bc44ba1e9247dc19e4a7
 MISC ChangeLog-2015 2348 SHA256 d5338e9755d84e54b70b0cb6ca1d26dd2ccf367f27046cfdecc538f73182b1bf SHA512 d47500808fbeef9d2b7766570de3c03e89aa5695eac97a5e6f2d7cfbbdf57e3da3662f742184e3084b9cd74c7f07b6752ac4452ad6d159b09fa151b659fe1cf4 WHIRLPOOL e9a75a42d925a70da71c40b5144f9fda0784ffbb22d380e37ce985c62e5d9d3cceb0019a7a5b4411f9b14c89569ef9529df5d5c77c009a9a356925dc1131c07e
--- a/app-mobilephone/dfu-util/dfu-util-0.7.ebuild
+++ b/app-mobilephone/dfu-util/dfu-util-0.7.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.openezx.org/dfu-util.git"
-	inherit autotools git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="http://dfu-util.gnumonks.org/releases/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol"
-HOMEPAGE="http://wiki.openmoko.org/wiki/Dfu-util"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_prepare
-		eautoreconf
-	fi
-	sed -i '/^bin_PROGRAMS/s:dfu-util_static[^ ]*::' src/Makefile.in
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README TODO
-}
--- a/app-mobilephone/dfu-util/dfu-util-0.9.ebuild
+++ b/app-mobilephone/dfu-util/dfu-util-0.9.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi

 DESCRIPTION="implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol"
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@ -7,7 +7,7 @@ DIST mirrorselect-test 102403 SHA256 add93012c44824626a7e05eed2186dcfb60e0b696d4
 EBUILD mirrorselect-2.2.0.1.ebuild 867 SHA256 524d3c915ee61f7412e8e50417acc8a762a620c9c6cd2ee7993c3ffa9da1a726 SHA512 ddc4aa350d3f829b898537f50522f37dd5207b5032e9a18696c71ba472d6822a5c33ce63bee185c1201fc47d62fe2a150fcb5ea7137615ccd23b61ab5b9c853b WHIRLPOOL 3e4c13ad15f6d71c9d87379c0ad70e16104b3e2ba0433dcf03765f8b0bc6a7f5801f60b9472b8a0e5203870be46ec0c09ed70614cd85cacca98f5c8918b0d4f0
 EBUILD mirrorselect-2.2.2-r2.ebuild 1132 SHA256 51c42c18e87c40736a4511f1820ce29cff897c2f9e9b89ba4b1818cad840a2fb SHA512 42ad846a47675f9fcf9290b09941ef161ee5b827e42025e81937a502ecb39e8d6e597c206f9b55b28f12fce2554a1af14890cc43ae85f373e5ccb1171f8aea8a WHIRLPOOL 2681fbd5ad9a1b32c681ac7676ba696f3ee74973e4a84b95c5aa58929b7ab13fff7995137a60ddd0e0b7fa53e72816577ff69071f1258ffeb7556a70de96fea5
 EBUILD mirrorselect-2.2.2.ebuild 1018 SHA256 fc222c999b977535990cd4b98d05f1b6dc581278aa93bd10454b7034ed682893 SHA512 95b12638b7e49a49597abedffb6e09c412237714ee649a10360c595a38935512644988b226afde7526749568938a1453aaff03c28d7ce77c623414476f94597e WHIRLPOOL ae5fe5c551a9a989e8e56a2c3407572099c71638156a91790ba360cab71b1af50aeb4e83f5f9c1ab253c03f55abc05cf939c182ae2cc6283e42027dc6ccc6ab1
-EBUILD mirrorselect-2.2.3.ebuild 991 SHA256 bd34ac944d1865a2d03cb3927b075065fce8addf4d22b200eae276b362576952 SHA512 62867847f82753b40d11fdc8262d431b2b80e79de788a7a28a0dfbe90f4ed961f43c8d13ca51ea0f6754ae425437c67de5514780dcbd8b500b0de112ba51b421 WHIRLPOOL a94883027f8378afd2c1016c9078b220d167bb2e7650bf34302ac0295a61f4fdc85b20cc23ccdd17b938753114d85cdff86950c5a53ec3f09d37b261ae499e15
+EBUILD mirrorselect-2.2.3.ebuild 988 SHA256 92cc1fc31b2a202275efe6ced974a668204f354e750148bfdebdf7c2e23fc970 SHA512 0bafbd1ab5d24c6a3526ed2d4dacb0201e00a467f538f86dcbfb16a462a7c7481326c37f70eb21e03d39dd61543fd3e15b102c0daecb6c30d77fda8846b11e45 WHIRLPOOL 216e6f0bb27421efa9b1baa4040bda57b31aef431dc5f94af5e1ef6dfda32322eac248cb6afeebd0c00f73c9204079ddf852ee0dec94fe069ae0db130aae98a6
 EBUILD mirrorselect-9999.ebuild 1045 SHA256 f42f54122b83d979b529f2506cd7103036d310bd726e29c70434b96793737dd9 SHA512 8775aeacb9942cfa6761f25391843449310a9b540845b01090a7cca57b6d1b804e733e8429fe2b16139af346960884070e895284335683fdf69665cda60f04cc WHIRLPOOL 2f1705adc553e1becd1d4a1927ffc2b20b0b0de3543b0ff4d9db57285c8e9445a09b6d87425be81282d9063fc89a38c0999bed86fe4c4644b2527ff80a13ade5
 MISC ChangeLog 3234 SHA256 a470d0747ffc95fe85798b97765e57e0dc8d5cc01b9777ae4463ddb0777daa4f SHA512 9ad777fef588761c2dfc199d8e66f7a7694db354d854863721c9031974f4707cc5e76f0f0b5d88d279db820681d1a4cf93e7fc0e255e32b3ffe2f48463a0debc WHIRLPOOL e7f2c1bb7cc30476b714856543493cba9f171478b8352a1567c0ce82e4843086bc5d32d74c4a795dc7ae20d74d3bb3a9e8622e22fa2ca8c7bb19e5c03136cf81
 MISC ChangeLog-2015 26452 SHA256 aea6097654520a07a39f6d6f3ca0423244b4bbb64714ae013017b636547617d8 SHA512 2eadbd2b3bbfb96540f3ba9914590f18b69d10f9d68be4cd46b0f139f058ee0994607e35640c1bac3fc44863de2473a4f985c61f75c4c347980f0cb01180047c WHIRLPOOL 6964bb40d7435f8fa27e89cd2f9b3df1ec2821d1dee1a48a2c0bd3b4cb0d28b083923555d8277acd3793c4b03c255a648ccb3f36d92b8c6bd50d8ec8e60408eb
--- a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""

-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd"

 RDEPEND="
 	dev-util/dialog
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@ -6,13 +6,11 @@ AUX calibre-server-3.init 1796 SHA256 49d43520cc064781a04cf53bc33892c75daad7bffd
 AUX calibre-server.conf 523 SHA256 55b20e6a208f7eb7128e0f8e0f8ead83a55ef80bcb62737d1658074141a5b213 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058 WHIRLPOOL a4ba22fb5a9893c2db6254e2ee569514dd132284e0f4e8b62561ec3def773c917d17d6718975b1ecbd02197cb3330506e48b6dd656c20cfacfd610a680e34db1
 AUX calibre-server.init 1811 SHA256 52c42322c2766848384f1695d0ddd805fc6344984700e10678c991408d6839dd SHA512 760aa7a8f51b23b116ba07749855737869ff2313f0528d67e5a46bc362e5c0a04a7e1f46c32dd6e82add4fa5dc41d397db32dbd1a09c912008e0890d1a133eeb WHIRLPOOL a2d53be995c282c45d344002e8769fe73b9aa6baa4b53a8672e399e0155ad160aa45d74ff93c67c2f29e030acbba577c9e97427af406672ed6cf4eaeeb4d4404
 DIST calibre-2.78.0.tar.xz 38739404 SHA256 d2b0b0c5451d3ac05ce9de0b801ddf8de7664fee45f273d7ee8445a1ec2f898b SHA512 0779ac385dde45ac4baee7cecb0916e245f3e1cf20662bad9d9a4278265390b1aa89c2b478601b57113e7de08a69343288488ee299e8b43332f0129e650aa0ca WHIRLPOOL 325fc344445078ef0df0a29b4cd8e32445a881ede89e3db87606166ff0c8b7db10b7cc34432e63c2bb49382537a5107686339b987f1be807d59a1786ddfd4a75
-DIST calibre-2.85.1.tar.xz 37783284 SHA256 8c8db280c51b26284bff1c066fb503ecef9e1f15f7e2e7b4f705c817ee041abd SHA512 ce29924213fa7461bbf2fc62f26bd53e4eafdf3b0dd58e241071592be4ee038cdb3ac6ac2982229dd0e52595a93aca7d921640ea55796950d1f3ac3c2742af4f WHIRLPOOL 1432f71c19c8ff41dede3370287813281557f3659c862e7a9fe76d548bf393d8dd889aa4dc92d514244b2d35ce25b962c2942ef3dec2bf1ebaa81b1ea6bd0c94
-DIST calibre-3.1.1.tar.xz 35841216 SHA256 cfa00b953cf68f0760a4588c8adad066749cce673178e85e4c249790c07f01d2 SHA512 1da11ede70d93fa608873726fdcd9b39f261c045ea874521b45211df951bdb15e62958f50628eb6cfcfef2ff14b89da74b0f89481f3671480dbc9589b096d695 WHIRLPOOL fa85b83fc2502cdbdb12259a0d56cff9867606088f62b6a147ee4fa0f99174d5e74a396239b07441124da839aa1000d8ba146b588290b30a70a1caa1166003c0
 DIST calibre-3.3.0.tar.xz 36308116 SHA256 0cd42109f432995a75bd921a37444c142cc25d178083857efbac756f615403ff SHA512 bb63f83d5e35079daba9ec6e7849e6a65c51cf0b2da9fc45b86a2b64cc147f862f08413730f3d2710793de7b045fc73913534dfca11b128ad0ea72e92033f977 WHIRLPOOL 151c6633f53e75b097276f026fedd083b8b7aa28b28e4d2d0de587a3e8280e40f04a13998b8eae5a9f54f1041e7a8b85fa8de99734437b4246bf66664ce31a7d
+DIST calibre-3.8.0.tar.xz 37922608 SHA256 17bfe172420e55ff4f4b19b80253210bacb9a4d0f2fdcffd5b0f456cf5765c4c SHA512 db7ff5cb0ee82b3237090cbf6a13d13bfa5e27139dd067290ed59d407d2dbbae2ecd3dab338a0beed845079387a051b092233350091ef6ec82623d3a16b1d48d WHIRLPOOL 45e56c6157f9047ced7fd06dcf5824baaf0e85707d5c7617c196d0054e852fcbe296e629d30317b197772f5e1d637600a5bfaf54e363729df9fa6074fcc097ad
 EBUILD calibre-2.78.0.ebuild 8033 SHA256 ae79fb390f3eda82331c14638fd184f1388f92dc4a367349e2cd8a70e5b1e661 SHA512 c65f281218b26c1f77c6e226ab86bce7dab3089c99e5a8be39b52cf6f77c643520cfb5a1026d303a09964044bfe6c9ff2f5dc1fef1a625a61354a9d950d43487 WHIRLPOOL 084d6f160cdecf7d58405c8d98a5bdab410d055024a2af96fc9a1ca1bd47ca208c1960f74dc757a676569ae0b6beaa41a589527ec6a0976ed8783dc1e748b4dd
-EBUILD calibre-2.85.1.ebuild 8148 SHA256 532d74fd4221b749579452893e39ddc50124998733ddd0cdfa38ab80db13b539 SHA512 7ed1aa17e1d4b9efad1d2a3215433c76e384f77c1d75e49dc23c79fe4228d2176ee99aaeeec0f71732697773db76cb78bd15417be2670200b2532360979f5f48 WHIRLPOOL 5e2619d3ab333ae93dfd6bcd7907515a778e24cf9bb5f62629db63bff357d4b6676a9c3b8b165c538cbc29f824620865009527d3c28fe95b9bb6508dc450f766
-EBUILD calibre-3.1.1-r2.ebuild 8800 SHA256 1e37cd836f0bc2a6ea54e44df4df54d7f6161c6e354a3d0231b75379febbdb75 SHA512 581cb6b0331a058b013cf32de5b7d87b7ddf35482f91c62dbb947d392c90d46cf58690780534a1bb2c243dca2cee1b015b0ef361ed9763fe3cddd20ef2faafb8 WHIRLPOOL b9a9b502c578f30775aeca3bae247a12e56e2123144fd1ae5b1021dfd637b44b68b27fdfe36586be5f9b87d75f36a43990b7ae4972622d0517ba6a02e0d1e189
 EBUILD calibre-3.3.0.ebuild 8800 SHA256 1e37cd836f0bc2a6ea54e44df4df54d7f6161c6e354a3d0231b75379febbdb75 SHA512 581cb6b0331a058b013cf32de5b7d87b7ddf35482f91c62dbb947d392c90d46cf58690780534a1bb2c243dca2cee1b015b0ef361ed9763fe3cddd20ef2faafb8 WHIRLPOOL b9a9b502c578f30775aeca3bae247a12e56e2123144fd1ae5b1021dfd637b44b68b27fdfe36586be5f9b87d75f36a43990b7ae4972622d0517ba6a02e0d1e189
+EBUILD calibre-3.8.0.ebuild 8843 SHA256 47d8555cf9c7629a8b8d54272a25e95f81691900e7022511fe62d205e490b2be SHA512 41a12022df5a61a6b7308a65c34cb04eb25187d6da72691bfe6d60f39b7fe6e33ce48fe4fd03d576193df41e246bfc61c0086266f1584093739a0709602b949a WHIRLPOOL 933cabba789551404e05b1ff5a2a7ceb133669bc166c0dd974e145e5540bb3ea46bd668e088ff05f4b54693cec477602e2323de5a5dfad412e63f9888142a592
 MISC ChangeLog 8048 SHA256 cda01ae0e25d1044578adf6eb9110e044a61e3632007117c44a6c8450e3d42ab SHA512 eeeb0d3508851fdb0781c100a35949b7cbbca54b2db0d90ace1d7442731763d64c82056e0140525aa583bea2a5781a85da7cfb3d29221a4978d9831bc3b0f9ed WHIRLPOOL f75954b21b0c03f53e5506056d789a0005ade7453e394bf2785caa83ad7fe3f65e1d94270cafafc8ce0a61d745643530e484adcfd99f8dc575097b720a4a0c7c
 MISC ChangeLog-2015 55764 SHA256 646fbdf0734a1e0b37bcbe60db314ed6d429f00855dbc5ad3998b421dc770162 SHA512 e5e3b325fb049600e53d40b0b57bd9cea6e85c42079c7fe7a237f103ed9c3ab2a4efc4d6e0805a1a2aac369fce402b431c3406a89c56df16e05f83e8e7b9275a WHIRLPOOL 74cdf07d68112e9c4a59fcbe7211708184df32f9c86af748382e706b8706d26e8d0dda3df9379d8b6fbba4cca758dcf51883e51d34077202657922f10fac499e
 MISC metadata.xml 382 SHA256 bbd3bcd6ae5f8fcad12ba26cca6573afdd5ce30f6b49a6c1906962e41503b724 SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5 WHIRLPOOL 217d2edc15bb7a9abd41dfb48c0cfc6402145cb8b4b4a43493ea4b9f0df3c365b96918a092ec8f53b4f86fce229e5a1169949475f4299b628a88916e42232774
--- a/app-text/calibre/calibre-2.85.1.ebuild
+++ b/app-text/calibre/calibre-2.85.1.ebuild
@ -1,257 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-	unRAR
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2
-	>=dev-libs/icu-57.1:=
-	>=dev-python/apsw-3.13.0[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.2.5[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	media-libs/fontconfig
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	sys-libs/zlib
-	virtual/libusb:1=
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.4
-	virtual/pkgconfig"
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# don't create/install uninstaller
-	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
-
-	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	#dodir $(python_get_sitedir)
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
--- a/app-text/calibre/calibre-3.1.1-r2.ebuild
+++ b/app-text/calibre/calibre-3.1.1-r2.ebuild
@ -52,6 +52,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
 	>=dev-libs/dbus-glib-0.106
 	>=sys-apps/dbus-1.10.8
+	dev-python/html5-parser[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
 	>=dev-python/mechanize-0.2.5[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@ -15,7 +15,7 @@ DIST poppler-0.57.0.tar.xz 1703300 SHA256 0ea37de71b7db78212ebc79df59f99b66409a2
 DIST poppler-0.58.0.tar.xz 1710412 SHA256 0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee WHIRLPOOL 658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837
 DIST poppler-0.59.0.tar.xz 1712004 SHA256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e WHIRLPOOL 82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2
 EBUILD poppler-0.45.0.ebuild 4108 SHA256 fb29a6d15775c6029bcd3d2796bb43eac7120e3ac7304ac815714b24c758c903 SHA512 d0baeb8e0db1b7e0faf183b4913457d77a742981814a06cd1f75644b7238cf9f06fceccb9cf1c40f1e56a79a215dc2aab80da099f89fd300106ed383c877253f WHIRLPOOL c82e97dc8ea77ea41d9a224d734abb2a8b1137a6a49f860a8f782c9108bb7c7257338c60734c908009ce1b9b7e64ece124307b3766a67741330e5cdafc96c2eb
-EBUILD poppler-0.57.0.ebuild 3866 SHA256 2cade1bb1526307c28127eb4faaa3c7b236ef1f71097ddeb34d2e4c9923b1fa3 SHA512 0918e65ce998c2205ec85c90762a640654cccbcb7b21c87e15bd72e5ecb9099b7cb8d168ae3e909de6b1f5f742c22a016de570f3424ad25dcaad28aaa597c249 WHIRLPOOL 96bcae40cfe07c2b71fe7596b4f3513edc088e732bb23d86c656d27b9374220dbe0fde87e0addbc7e53c95d5bc41d230c20e63dec8500ea0d5c45dd26a522c78
+EBUILD poppler-0.57.0.ebuild 3864 SHA256 6dfefad874abeaccfde4c38776351f73c33000ac35662b3be3d7df505f78dc12 SHA512 198a663ed3e005d95a3ff35f4f1925620140b3a51c6700f3c135a526c80101e2198ee03119a5f3965fda60783e512187172c761579094b7ac6ebc293f3aa27d0 WHIRLPOOL b43278f4875ca431537152b457de960160c40d91de1f066e497379af45768d8dc034fd8ca54a5e5595d04b95195e9ad3c0cf1d21aefb2f30eae9abbf39583b47
 EBUILD poppler-0.58.0.ebuild 3866 SHA256 15b2567ab3f0406649403383c4ed72f8efa4a56a12fa8953dfc2881202782d2a SHA512 bc922423d817ad927ec5c25ec8504c187fd88a634fe03cf7b92d9c75342db7c92f65a1d37dbb134876d73b3f5a6261adc87b31639f642bf634682472b2a85218 WHIRLPOOL cb2c8b25c56519c3f8491084950d5f62205756078fc810e9e920bfe5f884e9abb15e4d0d1eee204699dd3701c8db3021ace8d6ddc21c2a42930d6a990056e59d
 EBUILD poppler-0.59.0.ebuild 3866 SHA256 025009ab5401a66987c0212a6db8e217ad30e0dbc71ef3a428bcee0fde6daaf7 SHA512 c888b97b35099c864d93f34cadec29db3d705648ecb36ec0d21622dbc58e2851eb59a0e32edf86f695b167ec9d89e008aaf4cc2ddfa1e5d702b79f635d667a70 WHIRLPOOL e4cebc30bd49442c22bd83a9c83da6911a9c6923ff42cb0b990831392ed29c33212d17ab8aabaf3a07e4458c0d1b31c9d223a0c99b75186f58a31d634255536f
 EBUILD poppler-9999.ebuild 3880 SHA256 44532c2095f94e18ef23beff067a2f25ffd25105018c3ba62cc0af76752f3d64 SHA512 8078921e6a0c9fd5014c36685c6cdb4a87667b593129f4a64bd8fcc47ff2996e625cd84ab991c5a03a7f826eeb1ef38e3f96a24e710a9ce6cee15de40527a734 WHIRLPOOL d6b97b04e4f8a3cb58ae16e7250c0f44809f1e56f76f6485df5e488c1595d867ecd8832329a6b700d95f3f3d1d8a5185c2b81f3f6212c591abe41c44f8246aa8
--- a/app-text/poppler/poppler-0.57.0.ebuild
+++ b/app-text/poppler/poppler-0.57.0.ebuild
@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/68"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi

--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@ -7,12 +7,10 @@ AUX etcd.tmpfiles.d.conf 76 SHA256 3594bdadb402b300d560fc23db53354c0ad73a78e38ba
 DIST etcd-2.3.8.tar.gz 2206562 SHA256 6a138b2005e42b0961a12886cc641b792e991cd631fdb502ec5c614b65231cd1 SHA512 4268de32797cab23e9e47784d31d5abd6982068c53d3cc9735a06719740dba45b73f4e067cbc7aa8aef5ca7c56d8be067f1076685ac82f64012b760d8b7f2bfc WHIRLPOOL 4db1b4fe6d0ff917adfc53bd959bb7ac2937da794483e4a4a95e5fb557cf4fbfd43d5bb3c5e21e499432f80f6606407accaa69bc03a3982621276deb529c07da
 DIST etcd-3.0.17.tar.gz 2208002 SHA256 c56c68a8cd5d120a51432f3a79a2c19082a6824493e4bb08c4e440aefbf73d8f SHA512 6eb6a61210f225b6fe7e911ad135e5014f80f71a04adccc3f382ca7b5e1b1b692b12dde26335ecac176cb8b8f4586732cb6e650b32730ec68ef7fbcbba7ab160 WHIRLPOOL 102dc47d120a1f4173b67168e5e51f64025da280ca41161131a6bd2ef9521605ef19e03166848f6c32862a3adbfc0a026f547dc7764018e85f6ac28f89c8d256
 DIST etcd-3.1.10.tar.gz 2532936 SHA256 22b25185571cf72409d35e28b9f15ea12cef02cffb552bc4efb7b74ffb62c0e7 SHA512 feb0745c2377248f9ad62359fbd6c2f0b3afbd94f89919963edf56965c98b5666f7b24fcf698599b35483b89b773dcbd647696eabc0436db6a88c68dbfc6dd6b WHIRLPOOL 0c922f1114753e126063689ebe722db59dace7715f7631ec6ca2f92438c405d9184bdebe277f2b808f5194bf2cf42904180bc7b80da051941ee3db2620b82ab7
-DIST etcd-3.2.6.tar.gz 2886557 SHA256 23ab4016bf0a057d36461cee001dc5b38d0d757fa5d9e8226833687dab06faa2 SHA512 3e26bc12cafbead201b41d7f25e247f24b3480ebcc76e94f2ae4e12e573a973b60e28f36fa012d1f7bc21edc670fd8910b33cd7e9f30c3a809a6f186af3ffc9d WHIRLPOOL 203833459801b18bd000bc1420f3ab14a7de601b3c18798c2537b75a510e720e5408424388bb7d643014a0de9870213533661bfad487ae30846969fdfa8efdf8
 DIST etcd-3.2.7.tar.gz 2886948 SHA256 b91a40102b944ba8e4dad439721c7068eccbc1d0cb0e7f2ded9dad134d2875ce SHA512 75d602d985d829455e7a10a0b347336104a0b8320949a73abd7963b08ab095e9b7cff58999ed2d365b965ba49705dff5e056e61e9a5018970a49e68278701618 WHIRLPOOL 6293415746bd6e4b943694d8a067acce59cb2850791fcef8e1a858a5b7199b9e7281228448783f1540be956e795a7a8fc729a6a4fe406b28cb1dfd5102b81cc7
 EBUILD etcd-2.3.8.ebuild 1379 SHA256 a155c628b920b29ce72bdabf20634e4664210802b6a324b48f416b2c132b4454 SHA512 ea3065641cac36b9011238603479967c1de5ab6f0ccb61dbc54b751879ff239b43065034b17045eb9467e1870878e4837af88c922f9034899da1359b69be98f3 WHIRLPOOL 7468aa9d7ba52fd5cb2f581ec8913eceea5e4c662593dc0cbe50b27aeb3e5acdf5db54d1d56655f4552151f5df393a6fae4ec3eb55c6b7a954ecbd63f459f729
 EBUILD etcd-3.0.17.ebuild 1437 SHA256 c3235200fff2d188e7ae0f13a00c1047e684e51030188076dd84b4031bd88fc4 SHA512 c250e79a7acb2b2b43a2e11eb953bef77f0ccbc49e88e7023a8359d53fc4fe551c8b3029f45d06b1b1b66096d07370db6501eb1364699d32f938e09c4233f53c WHIRLPOOL bb5c14b086ca5ce90f0e8f60d013cd7533f756bc66ef1e3ff98194950ef33943d7272fe01d2541535d51589c3eaf69727e21501a4452eec93c24241516847532
 EBUILD etcd-3.1.10.ebuild 1449 SHA256 2a1b2a248f5defc5bb15d2085ad2c40191824203b6fb53ca6ac02f68a3556b8e SHA512 4528715368900e1f3433ef863915b874675d27bed618063c8c316ba43f3db1960765093521bb67ca06fff0da52b5435b89d3e3ce9e71e61a9741801846b70f48 WHIRLPOOL 64e8dff315f3a7e281ee6f6e8e42af2b668d001c08b3a1d419c3bfc3021e25c41ab7c448c6e1fc114b679079f72c86ff7aa93f4c94f5d90b93585502afe20b49
-EBUILD etcd-3.2.6.ebuild 1474 SHA256 2c5cdb3fa0460133550681acb34ba45e9ecf929831b5b623ef4efb390bdf4839 SHA512 21daa3a43edf7cdce091e376302967ca86bf3d3d09babab7bb331b7efed065c6b2d74b7eeb74e010b2d4d84595776befb037dc78391b37e5c7bab8e67b5d7cd5 WHIRLPOOL a2dad1bd9c91a266cf4992e4d917ac8072e8eecec76084c7e57de402fa1d1f8b10118c787d66370bbb5d9307ac51f94a16270f00787b9eec85ecc1521aacc014
 EBUILD etcd-3.2.7.ebuild 1474 SHA256 2c5cdb3fa0460133550681acb34ba45e9ecf929831b5b623ef4efb390bdf4839 SHA512 21daa3a43edf7cdce091e376302967ca86bf3d3d09babab7bb331b7efed065c6b2d74b7eeb74e010b2d4d84595776befb037dc78391b37e5c7bab8e67b5d7cd5 WHIRLPOOL a2dad1bd9c91a266cf4992e4d917ac8072e8eecec76084c7e57de402fa1d1f8b10118c787d66370bbb5d9307ac51f94a16270f00787b9eec85ecc1521aacc014
 MISC ChangeLog 3997 SHA256 89726f1d48ebcdda7143b5bc4b79bf63b875877638e70c25fd91b074393a8187 SHA512 9d92e847ae61a4a8169ecc33a535c5119a19e4a6541a830f4aee0f935fd541d27f29ac4c016cf068d876d7108b781758d7e2a9ad979446c378538cee89d10b89 WHIRLPOOL ce3a507955d0ca316a5015e8e1d5827831582c41ca9df294cdf818090768b1fc569b67dcf09e11dff1bc91980165cc05060cf9951ce505cb42604b2ec0b0fe3b
 MISC ChangeLog-2015 958 SHA256 148c73d433247e8711a033ffa225469e78f875d5778f60fd9685bef5d678f4ec SHA512 d96c5afde74fd863fd0c69652c3b94cd022eaaa1eab53b1ff326f8dd1677bdc9e21ab34a261d403861a6b4d86a9cf66da0d614c4007772d0d21a470b8ca9a414 WHIRLPOOL 1333d7a44902ef017dc4fe3a8685170f852f68ee8e0db433af29133455b99aae316a893de0760db30f3f093d0539162b8baa741556e894945c5c5bfa92acfc26
--- a/dev-db/etcd/etcd-3.2.6.ebuild
+++ b/dev-db/etcd/etcd-3.2.6.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/coreos/etcd"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/coreos/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.8:="
-RDEPEND="!dev-db/etcdctl"
-
-src_prepare() {
-	default
-	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
-		-i "${S}"/src/${EGO_PN}/build || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_compile() {
-	export GOPATH=${S}
-	pushd src/${EGO_PN} || die
-	./build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	insinto /etc/${PN}
-	doins "${FILESDIR}/${PN}.conf"
-	dobin bin/*
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	dodir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-	fperms 755 /var/lib/${PN}
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	fperms 755 /var/log/${PN}
-	popd || die
-}
-
-src_test() {
-	pushd src/${EGO_PN} || die
-	./test || die
-	popd || die
-}
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@ -2,4 +2,4 @@ DIST mydumper-0.6.2.tar.gz 40165 SHA256 fa28563e8967752828954c5d81e26ef50aad9083
 EBUILD mydumper-0.6.2.ebuild 923 SHA256 6c52294cdff77ad253cb1efa360ed2aaea01896d34205b3c372ac5727ed8faf6 SHA512 9416dde31e347bad594cd54ae223ba00038f392d0fe372acccc781b4dbafce89a4113c09efd3ffb4a9973f0dbdacbd631d4229f0a2a966c0aaab047cf83d8f9d WHIRLPOOL 6e43db2d36671931bdde54c2f34ee500001f0ee05545c0c6a4ea5d36faa4164f837da29ed672337ca40c03072ff3530f253b046af7639ba90e7e99ec7f8cafa6
 MISC ChangeLog 2725 SHA256 d1ecaf2b0c71e99c461f83588d14e73b773277a4aecf10aeda571f84b4a342f8 SHA512 c9eb636071b042ccae43a5b8af330dfed81f2547467931146ad66a360fae0c058abcab3d9a18451d8e5d323c92fe5c8db1e4325b7b76c54477df94cf290a91c6 WHIRLPOOL ef094c02e8427ec6fcaf2e10b6e10e6dd8eb2045b69831de35711398607e28eaaf5b5c0ac76af0d6040602201c799208901f8c24bb75356614f6d2fbb00d7a41
 MISC ChangeLog-2015 1534 SHA256 c65362f5aafb0d2cafc22db7177e28dce95edd3f8bf5d38711440872c3e72c0e SHA512 e269d766dbba9ce8913397f4321d30545bb06e58042619eed88d2de19d69c9f21ec1a0146cc10e9226e6b6394d5b37469754ae1d27cf33a4ddf93a15f1d6ff9b WHIRLPOOL 6640ffed60e7253d2373db39d26c6459803387b55ffa10483d8ce0c69fbb697630e5e33f77904bb5c7e6b8c8c02b317ecf8541d3c958612792e8ed14979a88f3
-MISC metadata.xml 490 SHA256 cd34d6aac0c2bf0c81666358a681dbef6a69ff44f4c06312f5f10b610f27afc6 SHA512 64aba30cb23965080fdcc87c91ec50ae06fe99be5cc6e5305408630e3221b197103cd24240eb05bc91b1a56835b9799145dc1bfaa5e09caf48600ce28c67332b WHIRLPOOL edafdadbbabb44d1ccbf35274fd514ba398f62856178914c80f698ed7735c984d3722a4fba19cccbb661779b5c22b521c8129feacc98cc94acd0322dfe9ea40a
+MISC metadata.xml 242 SHA256 e7d72990bb6334f6abf68e268b473ac981bb8e0ba37ad3c1a147bff2146e4d90 SHA512 016f858acd9fc847a900491aa12bcdd0105ca1b1dcdba997455459e48c601056b753d0079cddf4823787c7b2426c79d75c597611ea106dbf6cd2f5d1d6a15fd9 WHIRLPOOL 4f8ab30000212a7a6675677fd440cc43558f626579bd50206b446ad5fdd1f2228678b20ab9d675c4628e8dc70a72bb13c1ebd053c6870750ca2af8fdccb68267
--- a/dev-db/mydumper/metadata.xml
+++ b/dev-db/mydumper/metadata.xml
@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>pavel.stratil-jun@fenix.cz</email>
-		<description>Proxied co-maintainer, assign bugs to him</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="launchpad">mydumper</remote-id>
 	</upstream>
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@ -10,8 +10,7 @@ DIST postgis-2.2.2.tar.gz 10071528 SHA256 40232391f8f66a6dc740ebb26088e568c8ccb6
 DIST postgis-2.2.5.tar.gz 10223574 SHA256 1fcd458c1e095236d38e52160be5be0c62163f135d4fe7e2554edee0937ce705 SHA512 13069d6e6c0429acff5d6475d6b75783c3e81bc61fb528c5eba28ff125c31513b8a4df1a0870c4c835560d310bba4abf5ac8b9aa4722731f0988d617eca78ea8 WHIRLPOOL 7b39674f0b85477ad759fcb4237d4572304eead8fec5676e2cd90221a5a564ab607890f44b7ab12602cc48e2345f4f017627ba5c379ae4ec484fcff607d751af
 DIST postgis-2.3.2.tar.gz 11336387 SHA256 e92e34c18f078a3d1a2503cd870efdc4fa9e134f0bcedbbbdb8b46b0e6af09e4 SHA512 d4503959c12e7e269817764e5fae4e567b1765ffe9c857a2382d072a0f159939ddb4f6a57c5ca34b822c585926d0f219f0d788b37e8b06a822ce7c0bcc4e88c6 WHIRLPOOL ff207196df6ab0fd858f93f2ac2b0f8863aab5ad12b0444817f99e7de2a618d6157929302b7199dc8c56d3b6b4b25e6c5bb964a129785e366fd03ae4616051f2
 DIST postgis-2.3.3.tar.gz 11342032 SHA256 723d43a1c8ca4cf06359ec0b7fd5521b355db4e37128a26fb8c661b1fe2fc930 SHA512 c0ec4b4b5c470e5f88d1bb72c528269a0cf954981385580db3333502c2da74e431b5a86e3d6427c839c3d4440122be18a69261c8205aa71c8aa4b790550c5e9c WHIRLPOOL 427d4637e0073ad549cd2e74d117b2dc2b0b0e5fff98f9a0bbee3514c00b3688dd56acd7bb3f1742eda61238cf8c5ab81cea6ead7ea5880261b753a86e0f847e
-DIST postgis-2.4.0rc2.tar.gz 12733657 SHA256 56ee34899a84e1b7bc0c207176f9fbdbbb67b61a74310d66fb87492dbca5b3dc SHA512 f09212c8db13c0bbb6bae7621ab78480c8948702b30158290d9364dd4bcff657f57ed35586aa2cfee48b147059481f9770f0698c518aaf4d1d9fc1b185667537 WHIRLPOOL ff9c073b0289db38426c307ab72be6c4c5e6c90a7ce9f4e89c198eccfb8baf3de04ef0446b21f56db35af37996b06de31ee6d2aaf43f4b8f8b6f05cccb4f08ec
-DIST postgis-2.4.0rc3.tar.gz 12577316 SHA256 5ef68d413b5954d33edd217bfb87438a8b197a18bfaf2f7b8a27272dbe96f888 SHA512 1f53b872bb89a7403e8945260b96b4580f40bd3cb5ade5a72fbfe0e63ec859d9fbe620503867597b18df87356613cf1beb10ad5a6e677846ac80f6686809b7e5 WHIRLPOOL b8a8faf036892a2bd9bc8a54463706c879e378700500cd02701424c28e98df96996f12a5496459bfb1681ab98d1d5d17499cc5c1a96916dc3a420e8710d0bb82
+DIST postgis-2.4.0.tar.gz 12576979 SHA256 02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29 SHA512 813e8e9feb75b58673afaec2dda3b5d8fc586a0f483c553795c8ae2b917bb67a9741e8c901787a0b914c327848323239346f1d816aa60b47d5a7065596de0067 WHIRLPOOL 75403b5d1babdc1d714d29a6c1f86dfcd1503997536d6a35333b6e19c72de44aa131cba3c6a9a4f2ced59a280eb0eaee41696fa8440c2028f8555d6a2c4dcd3b
 EBUILD postgis-2.1.8-r1.ebuild 7390 SHA256 01bef64e51011cd84bd937e6dc533c2fb9287931a65f0b7ca0e0f01ab546b253 SHA512 6dad9770243b9de60914373f24dbb27f40134154457641fb8882772a78ee99ec0651fef80bdf9683e8524fa4c00f6f3b0f01b1fe3459f6d87c45d529adbbaa60 WHIRLPOOL a3da1d97f2c4335e06d29bea1ffa7e5e0baaada850f5e0ae435fcdf390248c149d33c42825bef1da66af548298afe21602144cf138b146d102ebf1deebe240f1
 EBUILD postgis-2.2.0-r1.ebuild 3094 SHA256 a09159cf8057dc03950ce6046ec323e98b29c9cfeb9b66e978e738cd5c6fe247 SHA512 3dd2a224404b3d6ab0886b4e3d24815ae7fef6504f54aa1d14c982533ba648cae5d7fff9c7b693758a56aa126311851ffc141e9847853c58484ac0f5279c10c3 WHIRLPOOL 0df1dce7e889ed1226ea6a4a34f2d3f8f29d7dc6801d04d46fa4d74d02653e6883dc065957125fb0241824f902533876b251a8f50df543671bd230ee531e9411
 EBUILD postgis-2.2.1-r1.ebuild 3094 SHA256 a09159cf8057dc03950ce6046ec323e98b29c9cfeb9b66e978e738cd5c6fe247 SHA512 3dd2a224404b3d6ab0886b4e3d24815ae7fef6504f54aa1d14c982533ba648cae5d7fff9c7b693758a56aa126311851ffc141e9847853c58484ac0f5279c10c3 WHIRLPOOL 0df1dce7e889ed1226ea6a4a34f2d3f8f29d7dc6801d04d46fa4d74d02653e6883dc065957125fb0241824f902533876b251a8f50df543671bd230ee531e9411
@ -19,8 +18,7 @@ EBUILD postgis-2.2.2-r1.ebuild 3105 SHA256 51bad1e512a2873f4cf925d87d33766374f97
 EBUILD postgis-2.2.5-r1.ebuild 3105 SHA256 51bad1e512a2873f4cf925d87d33766374f97bd0ca0acb4093d2d46b808b3caf SHA512 120c7ea3b4811fe36d573f37a73fd4cf4284d2aaaaa55e987ab7298a4c25693b1280a316045f5ed9101d847b2f88b27ae2e71893ea125b7fb6fca9bae27a4585 WHIRLPOOL 3be4eae5500a0ee7f35913a5c611144903e377f6f98a0d037353f9bcb736ee763d3bc974292f3137b13cd6b13fcb7b16517355b8416c66e04f680f633bc29e74
 EBUILD postgis-2.3.2-r1.ebuild 3197 SHA256 617ec03866d32325a48bb34c60157196190b5ed29a6d965b935b6e22146a6cdc SHA512 e64e6cc9c43a7ef752ec16a381c540047ce550886ee70dce676c7bf1cc1f243be82573e7ddbf4faca601d580ed22cb4c4b229f6a5c85347beadc9664c80ed713 WHIRLPOOL 0d6aec082f1ea66f719aab0e023ab2f47a94f5125d5d803b6081e22b9670bb0da8452fda2a8d4185e99d986b28c3a61f21410b97722bbb848b2049dffb69a5ed
 EBUILD postgis-2.3.3.ebuild 2734 SHA256 0ede97176d14f51bfce0a63646327d759e7214cc50116ed469d0fa58fbc84330 SHA512 04b648cf53497cfb0f5fcdd7a3c033a01f62180f60d82d427d9a163a09484be8c09a63e188237abab37e5028fa36ac2075094d19e96211d50238bb8b95e1234f WHIRLPOOL 634cdce7b397b582194f4b8e050fa2b3e0dad71b855b4b167fa2e8d2811f8b08a8031738718f1785d7ac26c64ec2a84ffe5ec8e90a0f49cc19de06e99a0973a6
-EBUILD postgis-2.4.0_rc2.ebuild 2747 SHA256 a492aaf3832fc87f93d4498bc19235975670a22f0cad68af55ef1dc051e65ade SHA512 8281113aa9ff7b8b42f0bc22f6c6e5496c86267a2e327f55314d1ea01ceaccc9370277fd8fdfef50dac8b0fdc65787964fe661e4b4142f0c9a78c8249d7bf05e WHIRLPOOL ac7625871f87baa0f2ecebf19581d30246d7b9be59cc2f2b5a7889a5459f624f5b3fe67482019fa4ee8ea67c634169da2841aa016b1f2bba2ed1a12127dd5107
-EBUILD postgis-2.4.0_rc3.ebuild 2750 SHA256 4fbc0d09f265d858b7c5e4c9c3963610b47b2dde8513eb3dc39d0ea9bc478bdb SHA512 95d556bc14d8a8b89abba25fd32fc9c64c7d645e9b2e8f1895336e32a3b61119adf0030fa30924241d4d0d4b6904235599ea2c6763bdfebf5ec70260efcdf84c WHIRLPOOL 79d1fbb11addab444011375d9cd8d55c4b510835bc64f11f4c01032257141ab432e06bbaea47ec19b5de763371474a83a00a6147ee96aa136b2491eb1fa890fc
+EBUILD postgis-2.4.0.ebuild 2737 SHA256 fb130b6a3f58c723dd74f6fdcc7a554573d763c05dbfb3e8da9fde5310d3b925 SHA512 2bd729a3fb41cac6e283f045741de3fdfb5789849b025cdb76ff9ace385309a2838c6e001a110e853d0f98992d411265634af0526c7f7891ffe4a7269fb35cf6 WHIRLPOOL f00170fcfc1dc542dd852646a8fa1d066e8207238c34ae76c922dbf8b0887ef9905659c6948b1b8f9bf2e1ca86560e45282501b266266ef55463232a3703cd40
 EBUILD postgis-9999.ebuild 7419 SHA256 893b93de0f1ac2fc7b1de30d37d7007c61b80065079ed5adab168e85d67861ec SHA512 39b8b21f0142698fca9a411d35dd149e2a1756657a6d3bbee9b1a82f3b277572ca28a6ce41888635dd254bab425343eea6dd5a79a34cc6a1a000a8b8587b5640 WHIRLPOOL 747f28e96f2a10b3775a60e694afee5b28edeef1c78a38a3294c575188d3e6fd33a9d695084a4996f54a79304f2b48670ed32c8ae826b654dd95bb73b3024306
 MISC ChangeLog 6529 SHA256 27002d9667de8a361e347cc66c2fc804054e53b1834548a3229526d472d5c36c SHA512 e5011139d4d58675b1513bb128e07c589bfa65a8d6ac9e2d43366f50d8a8cd38f6b08d39b1b6adeff3af0579c22403a5b1643f4f290be3c8a8a08fbf33c00570 WHIRLPOOL 93ed801a763374b3a6afe680e8711fedd7a9e0a149ffb7dc8352664b1f1cc7284886415f879aa1ac2f5b12aec3591e032e1814559c0414fb5f13654c96cddbd6
 MISC ChangeLog-2015 15421 SHA256 0f3e682af97970b63f483d38082d202cad0ce391e805f545590a37fc9fc2c3b3 SHA512 71d3a8f9f00ecdb484fead44508a1f15674b546d60533addf7f91c94d028800b098f52b1172ec028b6c85470154a4b364f10c9e1c8e0e6d0d8139d1aac8b9c6a WHIRLPOOL 651c4e132f36162267fe3473136aecfb8f6266a22d2715989697ff8319c933b058fb3a9fdbcefc6abc9451e5b3da72d94c05c51e31dc90bf6a09dd9e166330d6
--- a/dev-db/postgis/postgis-2.4.0_rc3.ebuild
+++ b/dev-db/postgis/postgis-2.4.0_rc3.ebuild
@ -17,8 +17,7 @@ HOMEPAGE="http://postgis.net"
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc gtk static-libs test"

 RDEPEND="
--- a/dev-db/postgis/postgis-2.4.0_rc2.ebuild
+++ b/dev-db/postgis/postgis-2.4.0_rc2.ebuild
@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{2..6} )
-POSTGRES_USEDEP="server"
-
-inherit autotools eutils postgres-multi versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS=""
-IUSE="doc gtk static-libs test"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	dev-libs/json-c
-	dev-libs/libxml2:2
-	>=sci-libs/geos-3.5.0
-	>=sci-libs/proj-4.6.0
-	>=sci-libs/gdal-1.10.0
-	gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.5
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick[png]
-					media-gfx/graphicsmagick[imagemagick,png]
-				)
-		)
-		virtual/pkgconfig
-		test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	postgres-multi_foreach econf ${myargs}
-}
-
-src_compile() {
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C topology
-
-	if use doc ; then
-		postgres-multi_foreach emake comments
-		postgres-multi_foreach emake cheatsheets
-		postgres-multi_forbest emake -C doc html
-	fi
-}
-
-src_install() {
-	postgres-multi_foreach emake DESTDIR="${D}" install
-	postgres-multi_foreach emake -C topology DESTDIR="${D}" install
-	postgres-multi_forbest dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	if use doc ; then
-		postgres-multi_foreach emake DESTDIR="${D}" comments-install
-
-		docinto html
-		postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
-
-		docinto html/images
-		postgres-multi_forbest dodoc doc/html/images/*
-	fi
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-	ebegin "Refreshing PostgreSQL symlinks"
-	postgresql-config update
-	eend $?
-
-	elog "To finish installing PostGIS, follow the directions detailed at:"
-	elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions"
-}
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@ -3,12 +3,14 @@ DIST u-boot-2016.07.tar.bz2 11506848 SHA256 974fb7225c0af6a721307631f66b81e20dbd
 DIST u-boot-2016.09.01.tar.bz2 11783287 SHA256 95728e89dd476d17428f94080752ab48884be477b6a678941582aeef618b70bb SHA512 aa503acb1ce4f64a936fbc1292e80c54fe334fcfb1a0da412a755f9a56a24993178ad1a5b8a51f777388d8ce5a62b0626bb5fead503f9b118f7d9f3f1a7c07b7 WHIRLPOOL 35b6ecedcdf99eabfddc90157b1998be1732fbdf46b4ca1221f8fb95e47d6e5fce7725d6b72d04b973f05267b31b3fd9d9beadba9d77e3d4dfc1c0b09d396957
 DIST u-boot-2016.11.tar.bz2 12019669 SHA256 45813e6565dcc0436abe6752624324cdbf5f3ac106570d76d32b46ec529bcdc8 SHA512 d393b2aa4114a6de7f990efe370891376c934a1cfac9530c3bc44f988e7f2c9f0ec26653e3275c72a0a1c2f4b44fcd0afe8394c9ae3ca93fee1c689d870c063d WHIRLPOOL f9a7837cac2b7b4e1395350a9670e438396818bcb80baebbb9a65ebe739914319fa3e076c288bb3f10ffad0f954336a6a18ea5611824f7f05d7a1518bb65cdad
 DIST u-boot-2017.05.tar.bz2 11938152 SHA256 c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e SHA512 be270f9242a72b05463092a022bbabd54996762de1ff23bf7575124ac02e62f49572a4e2f6f571a5019047d40027e56e35593b5cc373c4a5a39b100c3377ba93 WHIRLPOOL 1e17bad773db4183cf3a290fd93c11f54cb50880cf608d43cb8e9c2de4724c6cdde97ba1e06dcc61a35d430c43872f33b393f9c973445ce80265a3d14d8af0b6
+DIST u-boot-2017.09.tar.bz2 11434323 SHA256 b2d15f2cf5f72e706025cde73d67247c6da8cd35f7e10891eefe7d9095089744 SHA512 dff6e793f135e7d6cb9d85d6ef8e4aa7ed5c1e20eece4f434e8c0a6039eb75c3f2cb7bc550121b1f5a5709e943c7cc5d6d8590e05a47a6b0d0d8f05185fe7ec6 WHIRLPOOL 229c7dac6df3b3762e3c39d1b605036738e0a9b00eab867c014795c4c90fb14ac3a81e591b6c05351f1fa5f50a2864cf5b3fcebf2322a5afd49e95ef306efedb
 EBUILD u-boot-tools-2016.03.ebuild 947 SHA256 8e4c10bb9dd953d8e1defe1653c95becd9040332da56a364ba0187f71b2775ed SHA512 d1f6ec3a8a150faf2a5b9e9c5ad902a94d59da34632472c91c0c37eef927bd62f12ab40eff654ed41b64950a28baff1e904beb93d5d5bb103fc6b4bb47ffc893 WHIRLPOOL 7f625d29c11db4f48bebd10c31eb77ff1923f279d275c1ea176a6b9f6fba75af3212a46ccc9d5724b121789b911675e5ea52d89e051c7cf227f155261295bcc3
 EBUILD u-boot-tools-2016.07.ebuild 955 SHA256 29d5921c97fa501186d3632a2cbac7c269ca1313fb98f5c3e675d0932591e73d SHA512 114839f5cee60d08a8ec807d626b19c060b9fe7a2f71573eea346f2c28a2be02392334f3921ff9cc69110eae26291d156fe47ccc788da6b3abdac68343b15313 WHIRLPOOL 986db29fb2e905b5a2d6c4e8a72b5ccd00ad6a149a50f846ddafb01cc3c1b9a96357194266f17b89a5c7bcc82a73856ce6a0ef4f8a9bd6cc50f4aded1c99f8c7
 EBUILD u-boot-tools-2016.09.01-r1.ebuild 977 SHA256 faf797684690c185d12249213eb5f11460981354193d39e2903f53035430cc97 SHA512 4ffcd4db167822aba087d4948b1e76def20f8fc505f3264e437c6b541828fc66579125f6220a3262fdf06570ed10fe7fbae9332de98636a9977a8a3cedad102d WHIRLPOOL 89b867e41f3fbd2d06e177e3d5494a82974c573aef39159cfcb91f0db48cfc1efbe0ce7e56435ce2a6a37ef74ce7e4a2194ee2b7325099c0cedf643d72fdf7c8
 EBUILD u-boot-tools-2016.09.01.ebuild 948 SHA256 a165dc59a71e3db6fae5c9575b4295d586c6213a760e096e13d7441e142cae62 SHA512 e59450e10f349f637d86767c423133798f44efa5d779e3efd03a56a35712c9e241b288957a88969a50af12990c29e21b7be9327957efd4c4ed01ad9eb0f0e7b7 WHIRLPOOL 13d77db71e9a758464daa78709f9ad413f6a0d2a21366c0cdbe51375b4f0d891b347c9cf5c2d768795ba8a17b33220e0698e1ad10a6e03028f240f767af450f8
 EBUILD u-boot-tools-2016.11.ebuild 977 SHA256 faf797684690c185d12249213eb5f11460981354193d39e2903f53035430cc97 SHA512 4ffcd4db167822aba087d4948b1e76def20f8fc505f3264e437c6b541828fc66579125f6220a3262fdf06570ed10fe7fbae9332de98636a9977a8a3cedad102d WHIRLPOOL 89b867e41f3fbd2d06e177e3d5494a82974c573aef39159cfcb91f0db48cfc1efbe0ce7e56435ce2a6a37ef74ce7e4a2194ee2b7325099c0cedf643d72fdf7c8
 EBUILD u-boot-tools-2017.05.ebuild 977 SHA256 f53d2bbd69a2195ae1787fff5d9c16eafc896deefc230fac08ac36eddc883296 SHA512 aad2f06cecf621b567727c1e72525a2145410337caedd849abc878dfa69741ee6c73587a728a178e48a6de6bf5db51cbef8f3c859391fadc6e36291b5a71156e WHIRLPOOL 8bfadf39cc77e142aabc68b512493f57fd8d34057572cc3e797f864b87f3cb7d898adb2e3418a133208d828bb195b9178e9554034dd6f1d9f3c5656f3c52fea9
+EBUILD u-boot-tools-2017.09.ebuild 977 SHA256 f53d2bbd69a2195ae1787fff5d9c16eafc896deefc230fac08ac36eddc883296 SHA512 aad2f06cecf621b567727c1e72525a2145410337caedd849abc878dfa69741ee6c73587a728a178e48a6de6bf5db51cbef8f3c859391fadc6e36291b5a71156e WHIRLPOOL 8bfadf39cc77e142aabc68b512493f57fd8d34057572cc3e797f864b87f3cb7d898adb2e3418a133208d828bb195b9178e9554034dd6f1d9f3c5656f3c52fea9
 MISC ChangeLog 3933 SHA256 4c8d3dea9fbb83b8880d3187f761cb576e267769871122b64fce493e555c5c05 SHA512 91900eb4361fa0b383e0edc3f18cc31c5a98c8fe770572eb8e30e0325137553e084fcd2273ca555d49098d33dcdcc8d3d0909bfbbd73635490a3f40520468e57 WHIRLPOOL 4f8380d08a99daf8a424127eebc5a43b4bcd415b50a1a1b42a800b8deee44ae5dbe2bac7473e54dac4f095763fb6e31a5fd6a47336317b65c622e54e3b3a414b
 MISC ChangeLog-2015 5985 SHA256 42713615155e36eef4d72dfdb4200b01ef285a4343145e8cf57d3a4023c290d8 SHA512 dc39ecc02c08703c4315f19e6d02fa5fb15b464d366a790ed9edaf8cff4fd3e30e810c32a9244cce452a010383479340aac4b0c29ce766abf8cc54d77d8eb20f WHIRLPOOL e55bd174beb38ad6f55f0a4a487af10c3d3321f198a0d7ea281fd8e1aeb57c034a6ce53a7b44c97b975cac6514e3223b688cd432db7e540d11bd9aa680125302
 MISC metadata.xml 247 SHA256 751aa1f012df292bed9716a5c6a7e64114b695d2ba0c0572fc7e87fc3bbcebc5 SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e WHIRLPOOL b6c074cf39f6ec1e2d085151836db47f9a4d71bcc9cc3296889bfa10172c7f07837ca79c8613f9c483b1332683e78eebe88e0a433a7caf801fc7ccac2552cd53
--- a/dev-embedded/u-boot-tools/u-boot-tools-2017.09.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2017.09.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P="u-boot-${PV/_/-}"
+DESCRIPTION="utilities for working with Das U-Boot"
+HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
+SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	# Unset a few KBUILD variables. Bug #540476
+	unset KBUILD_OUTPUT KBUILD_SRC
+	emake defconfig
+	emake \
+		HOSTSTRIP=: \
+		STRIP=: \
+		HOSTCC="$(tc-getCC)" \
+		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+		HOSTLDFLAGS="${LDFLAGS}" \
+		CONFIG_ENV_OVERWRITE=y \
+		tools-all
+}
+
+src_install() {
+	cd tools || die
+	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
+	dobin easylogo/easylogo
+	dobin env/fw_printenv
+	dosym fw_printenv /usr/bin/fw_setenv
+	insinto /etc
+	doins env/fw_env.config
+	doman "${S}"/doc/mkimage.1
+}
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@ -1,12 +1,12 @@
 AUX 50mercury-gentoo.el 130 SHA256 802dbbd82d775bba22bb750668e0a8462960d9e8b28e3731171cded00783d6f4 SHA512 e790f1b396f63bf36e57160d588b1377d3f889156446a7d26a6edd3f7175ee8ac5b8972ee4d0b6045b5442ae750341b5e06adc42f094fd6d08f2b519f4432071 WHIRLPOOL 60cf8dec8392b8d1245b72be2effec7910ca47a2a9db2e42ab1d47f194e20b04daa2e0f0cb6d5f68f9d6498d2ffa9e0e4332c286529e2924a7b8fa8567baafc5
 DIST mercury-13.05.2-gentoo-patchset-1.tar.gz 5622 SHA256 5a6559c207c0161beef2eb3bce6f890eadab7dd8fbc5909dc720085498c51777 SHA512 387956a120b2bbb7da1913e89cf33e7bdb8f205fe207701a33d19ccb667d1ae73a342955642120822448621bdba349ab628290d78fdef35c08b9ccbadda4177f WHIRLPOOL 9da5ec0cc6dba6f0ed98c77583213852bc94014c584eae22705c282cbdc137ee30efd83401f8e28c6320a4909c9abbc6d0cf8e79e953c2ce4cfd504156267c82
 DIST mercury-14.01-gentoo-patchset-0.tar.gz 5728 SHA256 43fc8145e784b9e09561fd2b7268cfd37151b134203785b9256b4b7fd87e3d13 SHA512 f1e375ac192e478a82863aa7b8e28c1044a490c41bb63f7842b16b12b7cfa9c85938eacad4c3eacf348aafd42dfaa0dea5324b734d0d2a7454e3e9334369658e WHIRLPOOL eaad62d89285404518e3dca7f98065eea5aaa2f8b46d8ff0f01a0a6b6f886db51800faab81b4e1cd89cd61b771d65562a75f28c399aef053e730d7975ac8f8b6
-DIST mercury-14.01.1-gentoo-patchset-0.tar.gz 4701 SHA256 f85eafed1ba9276986d37aa6fd0e1792037c9a6e42009626791cb1bc8a07c8a9 SHA512 5b9afda5361ce68b3c39e15764bfd066eff032b9e1a67d3a53f438b60c92841f304456c0ae7bfe04a7dec35c1c00a3bdd88afc62392814eea5565c1e1c90b129 WHIRLPOOL ab6c8746d5f4ffc0edac7623c6deecc65629fa09a5b8e02f101f65fa8cd54702a9a450c999bfd90f5a3177864f85648814604adf540e2344ff79711c828d6b61
+DIST mercury-14.01.1-gentoo-patchset-1.tar.gz 4397 SHA256 734ff72c9172f21e9299b553b1d4768515009db66fda183ef2f16e9edb7ff77f SHA512 6b4908e620d60c1745e311ac95336a008656c16a426b697c68cd417ba7eef8f9664f4c7b46e410fc33cfbc4655b8a2ff6ab48fdd979c6197b585c58a6e0346dd WHIRLPOOL 132fd89972c3628fa50862a6d6e134fc8d896f09e6d9241e65157e83ad1ddcdfdcc5d3ba74795e8ba98a771954311d6b0be6512528a3e5fc437e7446bad33447
 DIST mercury-srcdist-13.05.2.tar.gz 53847394 SHA256 8491cf419b996a315bf8664154dd91aed940274ded98e3aded733dbe1939f95f SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 WHIRLPOOL 2a81bebfd4b97b9bb1b0e174025e6050149c8e5f812cd97cbdc41818faa18c15f9494925f1f320682087cc45264bc00db07bef6862afef12317f77cc169a7f86
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 SHA256 98f7cbde7a7425365400feef3e69f1d6a848b25dc56ba959050523d546c4e88b SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c WHIRLPOOL 7b859eb5c7c1194d63c0aeeeeac3686c57436100b5618ae31a901119a33443363acb80a908a15dfdfa8b61fd9ccb4e552cbb972a3cc735b7a768ee7c9b1b6091
 DIST mercury-srcdist-14.01.tar.gz 52683989 SHA256 4446b7b4eafd35540495ef90ce93b71cb88efa2d744628aee80f76a694aefcc1 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f WHIRLPOOL a7123063590e39ae15222eb59a2c3681ae37bea211967c857eb8725090d342f0aba7a55446529f8608afb9895746581943527b1b3c313c5cbb96f638a3377404
 EBUILD mercury-13.05.2.ebuild 5136 SHA256 efa491dcb89166a524ebc83e92d824e5f35598b1a780b8532a7f30681484ca40 SHA512 50f0616352d68d71bdfd58a5e4fd4ad2c3e99f53489efa4bc48d761498f56bee0932eef5d4265e5ad1efd89262f9ee70438c0d9edb6ea58e8faa933876e52024 WHIRLPOOL 5211b51a18d73ab0f4d5c630aa9dd2fbabe5b8f15455ff8fb9f49059d45158f0738e57184d4a07a859cdf2658ac1dd9bf60b9c45740c9aefe3eb81e1861d6e9b
-EBUILD mercury-14.01.1.ebuild 5160 SHA256 00dc5dd46fe10272c183c8521b57df87f30474fcf3d9199e1f139c3a05c0d0be SHA512 d43799743c00770bc73b7253174fd79a6af586e4cf38a652facabbeab48f7d83484f0f479fb7d2f426c3ffdccfbdfc42e590d92b34fd5061c1be17b36d8b705a WHIRLPOOL d52265b512d977890bc6c42f906ecacfed6469c636189f22edef47022a16015a182857a73ebfa28b46d18f06aaae42b7caeeffaa2d55e379f066ceeabd9e5164
+EBUILD mercury-14.01.1.ebuild 5090 SHA256 bace56a940da02b66c45cfeb105e628d5694b59e697f75eb306f5aa130ec060c SHA512 3dcf27d20dd81ecd903594ddff6522c3af9737cd2f3d251e0ccc9f039dae38677982806d583f9e8145a9bb8df14574ad51916f2a92fbe6cc4c907927925b7995 WHIRLPOOL 7d6bfe405682240b5eaca67d359ca1093181c4c2e0f273a1881f3f1c0c9021fa19d312145155cc679d487adf3abccce37207efb6ff087bdee8d08636349761d9
 EBUILD mercury-14.01.ebuild 5210 SHA256 ffe77709c3336518e0b05fa3c8dbe035d39e1bbda81659cd98b474748eadb718 SHA512 8e90bbece1e04951b1db5df6e8c0a6250e516544a9083c15de4ddbf12084d2313cb7475d5136a73562f476df7363b55233ef879eacf0279bfdedd569a1b4e6a2 WHIRLPOOL 9cc0797df6fcb00a8f4dd752adfae12f239823a83d6de937d7df6576b40b1f3239781b4e2c69c807ff96f6dfb761219774e34dd5a4c9465e858177c1e37dabfb
 MISC ChangeLog 2905 SHA256 9b4f798026b2551131acf6f821c586327bbfc1393a0f1d3c193d5cc9b89362f4 SHA512 1639cbd3bf42102c81636f04e7592f73455faf19b34419609d634769f77010d938420ea67493837ada61b2cb1a285156942998bf212a8c651c3d328a97e392bb WHIRLPOOL 8a84824d97d22bb848e8ee73099ed8e89f50c4313e38698ffff9f74ed94b3fd9c8e9d67218d83d22e49f180b73c4c48df51266c6c6751279df1cb6b1f242a957
 MISC ChangeLog-2015 32039 SHA256 3b33aa9a7deab04f05981f124bf035ef0e4f774aa92f436a4b0436facd408dab SHA512 4b4792e019e39341a8c8a029fb67a724e1cf27731df49f3fd89c1e29896fa4d5d5e6cc854ab08598849b8c211930474ce3f8306138e75453f2343729a51a7ff9 WHIRLPOOL c8acb5745f7330cb6ce2b0ccecb66381f8c3173c494f81d5945e4b384000ae04874d6d3f60c11ac38aab874d0b412924df7808f9d3dbdb1df09d946fa3e28445
--- a/dev-lang/mercury/mercury-14.01.1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild
@ -5,7 +5,7 @@ EAPI=5

 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils

-PATCHSET_VER="0"
+PATCHSET_VER="1"
 MY_P=${PN}-srcdist-${PV}

 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
@ -69,12 +69,14 @@ src_configure() {
 }

 src_compile() {
+	# Prepare mmake flags
+	echo "EXTRA_CFLAGS  = ${CFLAGS}"  >> Mmake.params
+	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
+
 	# Build Mercury using bootstrap grade
 	emake \
 		PARALLEL="${MAKEOPTS}" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_MLFLAGS="--no-strip" \
 		|| die "emake failed"

 	# We can now patch .m Mercury compiler files since we
@ -93,9 +95,6 @@ src_compile() {
 	# Rebuild Mercury compiler using the just built mercury_compiler
 	emake \
 		PARALLEL="${MAKEOPTS}" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_MLFLAGS="--no-strip" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
 		compiler || die "emake compiler failed"

@ -104,9 +103,6 @@ src_compile() {
 	# the default grade now
 	emake \
 		PARALLEL="${MAKEOPTS}" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_MLFLAGS="--no-strip" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
 		default_grade || die "emake default_grade failed"
 }
@ -123,8 +119,16 @@ src_test() {
 	fi

 	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< WS_FLAGS.ws \
+		> WS_FLAGS \
 		|| die "sed WORKSPACE failed"
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< .mgnuc_copts.ws \
+		> .mgnuc_copts \
+		|| die "sed WORKSPACE failed"
+	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
+	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;

 	# Mercury tests must be run in C locale since Mercury output is
 	# compared to hard-coded warnings/errors
@ -137,18 +141,12 @@ src_test() {
 	MMAKE_DIR="${TWS}"/scripts \
 	MERCURY_SUPPRESS_STACK_TRACE=yes \
 	GRADE=${TEST_GRADE} \
-	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \
-					-I${TWS}/runtime \
-					-I${TWS}/library" \
 		mmake || die "mmake test failed"
 }

 src_install() {
 	emake \
 		PARALLEL="${MAKEOPTS}" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_MLFLAGS="--no-strip" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
 		DESTDIR="${D}" \
 		INSTALL_PREFIX="${D}"/usr \
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@ -24,7 +24,7 @@ EBUILD ruby-2.3.4-r4.ebuild 6876 SHA256 8a3ff8514248990c6382dc8a4985fa7fa94730a6
 EBUILD ruby-2.3.5.ebuild 6877 SHA256 606085306f6c2856331405a0f57a2936ed7b7f802628c552e3bbf310623c5991 SHA512 d2f77cccffdf41b8facd9a70d59e7bd61dd7fb25fc43691cde8561b4f1fac78fa7a45ea444c330de1f3fa8ab96a6bf5f741215baf5021b033642b5d53246b9be WHIRLPOOL e23292910b935ae5da21ca462d4051248c5194e96132b124b5f3318a3c60bb26791931bcf2e7c762a7ca22ca644f2243b3a7629f3bfd9d36e83bf305b07b4131
 EBUILD ruby-2.4.1-r3.ebuild 6971 SHA256 4e708ee16022944cb1c925d85028a41a2621a4cf2b737c394c90b83c76cd3d7f SHA512 d8e70c5281fde13058197a2abed4209c3ed8b52136df684246d1d0e36acc426faa413d860c8b75291d58ed0012081765e05ac3f137de3e22325ac64349756411 WHIRLPOOL f3f9a6ef7bae6202b571f97b6f47bbabe2bfd3bab304f6f7b3d106d23362257a9391f440a0317052080290498381953df9187a8c0434409580a8343cbf6b9c33
 EBUILD ruby-2.4.1-r4.ebuild 6971 SHA256 4e708ee16022944cb1c925d85028a41a2621a4cf2b737c394c90b83c76cd3d7f SHA512 d8e70c5281fde13058197a2abed4209c3ed8b52136df684246d1d0e36acc426faa413d860c8b75291d58ed0012081765e05ac3f137de3e22325ac64349756411 WHIRLPOOL f3f9a6ef7bae6202b571f97b6f47bbabe2bfd3bab304f6f7b3d106d23362257a9391f440a0317052080290498381953df9187a8c0434409580a8343cbf6b9c33
-EBUILD ruby-2.4.2.ebuild 6971 SHA256 4e708ee16022944cb1c925d85028a41a2621a4cf2b737c394c90b83c76cd3d7f SHA512 d8e70c5281fde13058197a2abed4209c3ed8b52136df684246d1d0e36acc426faa413d860c8b75291d58ed0012081765e05ac3f137de3e22325ac64349756411 WHIRLPOOL f3f9a6ef7bae6202b571f97b6f47bbabe2bfd3bab304f6f7b3d106d23362257a9391f440a0317052080290498381953df9187a8c0434409580a8343cbf6b9c33
+EBUILD ruby-2.4.2.ebuild 6978 SHA256 9f4d3b867a2baaef2cab06e96ebf294146c168f2d6b7d9e509d3e7319e069905 SHA512 eb98eebcc132410ffe3f13230d11de593f3b9d41887472d9878d17f8983e492031581a23af8d9b6aa200573f2b60cc23b9922525714c7e78ef5dc1a841fc4ae8 WHIRLPOOL efa06520bbd459ea2317a6fe4563d20a3ad9279e4efe0005b8da1e7a13226f5b0ef29b2a916ca1536da4c5dd1272338b1bc862c4ce15bbf937c994fb61196d7f
 MISC ChangeLog 14020 SHA256 f0339e6fd4cb9ef4a7b472031ac3c3ae21f60d574fa5db2e4e48577e73e53b7e SHA512 d7d9bc849624e4814b0b277924715d53479dbf15b087bec68ebca20c447ce9515993509efbc33d5f65c19268072d4f68ba2b7879ab91d1c12bd349445bdf3aa1 WHIRLPOOL 9c64ffb6004a17afcc4ea207698c233079026eef065cc7495de0f10af7a6ae62015b47be6e4a828a7d1d45d917be5b148fb6376a9deb9fe938048a58380fddb7
 MISC ChangeLog-2014 104250 SHA256 6587f8f101dc832a9f0c01b77a9d448b6a7b1c3c7befd1368e297bbe3dc41f1c SHA512 89ffec2164a619bbb418ecf43ecb0893a3f6a4846ff1ac403980e68d85efa7d502fa2f7338c80f8fcf12b56a1ed791c7d6d1bfc607f80fa88c1a88c3c6f93a85 WHIRLPOOL 47ced91b8df722e42d33773a243f89e57ca49f8942418d19321a1ed041fd9dabad747ff640fbb1f0de73220c23cd37778eedc44a14b8883b8220ee512089a823
 MISC ChangeLog-2015 5007 SHA256 daa966ac5d4e337b5ba0b9742196ad1e754936c4babb08c63443005cff904077 SHA512 2cc4ebfe1d1c0837d843d03ed7846b002bb89121c5849e1ceff9350b49a85933d397c45e356a567dcb3a7c36d1bd97002ab7d0f4a531bb9f8d0422b941ddc590 WHIRLPOOL 1324dfcd1444b05fd102f64e16678b7300ed8549e4e10a213c7cfab0692e7846ac4772624f6b5c787589908f1d5c884b443542a02f392c29d8532c84842e20f3
--- a/dev-lang/ruby/ruby-2.4.2.ebuild
+++ b/dev-lang/ruby/ruby-2.4.2.ebuild
@ -193,8 +193,8 @@ src_install() {

 	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)

-	LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
 	for d in $(find "${S}/ext" -type d) ; do
 		RUBYLIB="${RUBYLIB}:$d"
 	done
@ -203,10 +203,10 @@ src_install() {
 	emake V=1 DESTDIR="${D}" install || die "make install failed"

 	# Remove installed rubygems and rdoc copy
-	rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"

 	if use doc; then
 		make DESTDIR="${D}" install-doc || die "make install-doc failed"
@ -228,7 +228,7 @@ src_install() {
 }

 pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+	if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
 		eselect ruby set ruby${MY_SUFFIX}
 	fi

--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@ -1,5 +1,7 @@
 DIST libbytesize-0.11.tar.gz 68322 SHA256 3eff9a4b3350420b5e1ecfff523a739049d000b34485e3e1ccf4a4d7685490cb SHA512 3275116a74ead484508da494934062e77d19b50dcd124d7b309137e52a416474099685c39ddc63090d6ed124a667c7fc8c2a7a5844712b33f277703bb52d54ec WHIRLPOOL 717b33b11739747245f74cb6a9b33cbf6cc0e421c5464f253254642e82dfbf55dad26fcf440db3c345dfad7c721c10e0501be409f7b6f8ebcbc6bb0c276687c7
 DIST libbytesize-1.1.tar.gz 70495 SHA256 1d17e8ab347e0496d7976b840c9ce230896674b8dc913cad7a9faa3cea92c193 SHA512 3d376dd0f9a10974f2392e3417e8e99ac57313be3ec945eeb7c84f72ddd51a5f29b61c7268c8c870dbe941eebf8d9027f8f5b7e0140790510bd8fb6b2c8db35b WHIRLPOOL f0da803649188ad631f10948ab4795d19771ee88d74e7398b78c81c34f966584ef97a542d0d85d7dd8269dd001107bd5731fb38fb3949055dd11286b7814fd38
+DIST libbytesize-1.2.tar.gz 70598 SHA256 20b91adcb216b1cdc99ade5cfa953cd3e10f848ec21436df2fd68f6437c7b744 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2 WHIRLPOOL 4565837f8564e17a6a1b51d96f99d043bd7d859539692b1f52c39d18d6a5321554e11c04890e1faf83546033b2fc97e73855edb2b3167481a011b99f2de989a7
 EBUILD libbytesize-0.11.ebuild 970 SHA256 875298956f74e189447ff5a06a02ab651177706b160c0e2955784d292de10f0d SHA512 341dc58d09a0111fa11e58af14e982580cf1138a2a2e70d3e74779cca58bfbdfd4769450ec435f64d1ddb9de12a08794872e969df9101102c3a16f050c4c3714 WHIRLPOOL 49b6a5462595b5dd8a36b7d06b3880b008b28c5293e71bee48bd57989e141a4cfc552d22eddbad7cdf067268be9e5e9a8d78f56f5c5bc4bbae57e135d4861e38
 EBUILD libbytesize-1.1.ebuild 890 SHA256 6b9b281eb1336702e2a7da5e13e66ece9c3a16a6ec5dc55b403b647c1376930b SHA512 5f542290be53c702bbf8c7f6993e0a2e25488886a56a99929c5e05401012c26e313eda540154cb29c0534182892ccc9bd4a7ea2d8ab710069b1e88112be703fb WHIRLPOOL da110769f9114691fa63b7afcbadd3431eea028e49cb60562c4f78a5ac5adc19ca656221cdd541a0d456b03f9194db0e3b2d7832a99724fd627aca22e8cde331
+EBUILD libbytesize-1.2.ebuild 890 SHA256 6b9b281eb1336702e2a7da5e13e66ece9c3a16a6ec5dc55b403b647c1376930b SHA512 5f542290be53c702bbf8c7f6993e0a2e25488886a56a99929c5e05401012c26e313eda540154cb29c0534182892ccc9bd4a7ea2d8ab710069b1e88112be703fb WHIRLPOOL da110769f9114691fa63b7afcbadd3431eea028e49cb60562c4f78a5ac5adc19ca656221cdd541a0d456b03f9194db0e3b2d7832a99724fd627aca22e8cde331
 MISC metadata.xml 349 SHA256 a1446cb70ddbf6f5da81be1b63fd1fc1b2802b60d2c4d7d2324edfd8d1522f19 SHA512 c54a783eca349652ac007075ff736d1cb53647e702ca8aa12915ae1109e5aee536591afc0b9fe0ac427e41fcf5b86d9d3f47fa5570001c84301c5cba8bca7e9a WHIRLPOOL a884e864cbe77034f365f884d18094cab15b5a5844331e14b2551eeacf9cebc755ab261556ca296e631f435be212b44ef4030b64a6ce9709e0e417a48edde5eb
--- a/dev-libs/libbytesize/libbytesize-1.2.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.2.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
+HOMEPAGE="https://github.com/rhinstaller/libbytesize"
+SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/gmp:0=
+	>=dev-libs/libpcre-8.32
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )
+	test? (
+		dev-python/pocketlint
+		dev-python/polib
+	)
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with doc gtk-doc)
+	)
+	econf "${myeconfargs[@]}"
+}
--- a/dev-libs/libfastjson/Manifest
+++ b/dev-libs/libfastjson/Manifest
@ -4,6 +4,6 @@ DIST libfastjson-0.99.4.tar.gz 424989 SHA256 6339a67e680a8f6a6a0c179971118489cc1
 DIST libfastjson-0.99.6.tar.gz 431066 SHA256 95e3d371c82b5d85c7294d46c923b3fee0384e1541a1556f0ca185170eb27270 SHA512 b3b4a5ba959723ffbf8d8218c97c696ccbb781e8c2563ede6ffd7bcbdfcf75495deba5c2b8952c6c215b78dd9cfa728c95cf56bde9b1cfa7ebd6ba68b5b8f166 WHIRLPOOL 3debbb3cd1c67bce448ace69609ce398266d49ec1711db0501b9c617e814547b3757cb8e63d5691b858c0b468e387875d774a619363b4bcb6209bf3f6b435ed7
 EBUILD libfastjson-0.99.2.ebuild 845 SHA256 6b978cff919ea11ba752ac72d7b2dc8317086ca8865b6eb8b6f6aec23b43cc3a SHA512 2cefc049fdd49669a7c10d7dbb3e7f652575d28a0d342e5684afffdf1ec573dd460748d5b5b52c8fdb4165e73b8ef292b94effad0945543e73f1b770aeacc15d WHIRLPOOL dec839ad9d46b8b189b772824f65734ce906686bddcab4b7a8a6eb042f7dc688776ddb5c3cf6b64e828d10bc9f269c12edb4c6b7f34f16297bef5a79fff1614a
 EBUILD libfastjson-0.99.4.ebuild 789 SHA256 03c1d22a57d8c9207ae2a525573fbc804a683ab9f7556248795ee48665df8556 SHA512 b8c4fbe3608dc700cefcd5df756938ff84512b19d5645b9926d0049b6b27ac0bd560d8552d96b4534f8577e3e03dd76736f48c144089f51f7e09611158d46a8a WHIRLPOOL 06fffe16555b07b9b1dde174a7659ea74acc757f034c80507b7fba7b3f10869e6f92046778058247df9be6f70eee29170322ffa326ac8e62c720d2a57a0778a4
-EBUILD libfastjson-0.99.6.ebuild 793 SHA256 9949a0bd8c48da319cd2dc8d942ac5c91ef0faf48d9504fd68a430c701253f99 SHA512 ea8f26aa0d9c929d948c2e94bd61fb9db6aff99e16147fc77fd8409d10113b60f1eed8ddacbe3b8346093dc3d76132f118b3a3bf16055d0cd2d8d386bf5a32dd WHIRLPOOL 67fb774f12da550936fa874bdf7c077d2e6b51b268f124dbc9cc8bf11af9a328ebcea042604b0e0de5d07cbc7d4104e4ff3f8cddd61f601383b230222185637e
+EBUILD libfastjson-0.99.6.ebuild 798 SHA256 8aeda0ae87228ffbb40d34bd57ba00e1a8bd54b0ebc986d12a1de0e121b774ac SHA512 bf42cf408c173eeb17eccfe838be353334571610d3ff6c6d0de4af6339276d27cc5b87d8405b11310af639ee0ce3e31c4ad72dea51bc05fdb459eacd9f521641 WHIRLPOOL 23f7566ccd6a12b79304c410dab50208b454f745721a39dc418eb25452d491c2268685bdae4fdea8c867333f76a4e1ee00b50ec5fc1d59bc27c319da53882281
 MISC ChangeLog 2784 SHA256 baa3c11e7e2b9fd9dcccb0f6231f0b0537b01a8e9d05587f61f2d1e9ba06c9d0 SHA512 f64dfdfe2bd0a70b742b65a8ceb0b2659ec2ba8a42eb4753255a4b7078e0e7aeec0f248b8889dd28636baf840317df046299bb3858b0bf55b38f4dc681c07239 WHIRLPOOL cc7d93c6e518aaa584da93986e1ed77f8ee4d00f259be9f8bb7542038e27d72a00ce0370e2605819fe8866eae92ebd66fc7a26990fa268a57b51482a6ecee7f9
 MISC metadata.xml 475 SHA256 ab3416a2168c2f37fd61ce27661adf54e0bb4c2aded400cc88fd2f26deb5fb9c SHA512 e347c97a42efce88d50f71438072af0cc1c758990873985a6292606b6e2af8797a63c35ab549ace15c50dd0120d465d0f0b38b24ecf08160fdda45738082bf82 WHIRLPOOL a48b341b629328a5502fd97f45003c0acdd546ef07cc82a13ed92ee22c93c3aef8572c04b579878b1da27b10d14188cb3c995ea36637db12b012e0c90089ab1d
--- a/dev-libs/libfastjson/libfastjson-0.99.6.ebuild
+++ b/dev-libs/libfastjson/libfastjson-0.99.6.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="http://www.rsyslog.com/tag/libfastjson/"
 SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/4.1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa sparc x86"
 IUSE="static-libs"

 DEPEND=">=sys-devel/autoconf-archive-2015.02.04"
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@ -15,6 +15,7 @@ EBUILD asdf-3.1.6.ebuild 1180 SHA256 0c18e49f85ece4083bf61709cee42cbe53abd1e04ba
 EBUILD asdf-3.1.7.ebuild 1176 SHA256 5ae07f0442fb9f894b2dc0c7fd3dfe0823c82535688bbc659172e0526b75d961 SHA512 ffa2180e39645c19559b2e1bd116a858e8b052ce2f162edd02f7a5f62db92f3ef1d222126569ac10294f9a29aa1711225d4f217e8529748895ba2f1aabf6de7e WHIRLPOOL bd7143c032c9766fe4b9176fdd38945fbf8d2e2a8ef39ee5d38cc54d2bf93cb47b00d5e5998fddac8c720a7f4ba54ce4a042dd41fa6b04a4cfde22a70c33ed93
 EBUILD asdf-3.2.0-r1.ebuild 1217 SHA256 6a330421ea7a4186943f46a1bdff008dd5ac563a94f3e038dc8ae2b4bcbba154 SHA512 324b8406d9955edda267ab00f34d6e97fd490d48184d8c8bc925b63f73737d207b85a7b29770eb02388bdb07a9ef8d77fb7633b8cccc48dea43bcf1b4067725b WHIRLPOOL ade6a3f2c7f86f3700f392de58fd46ca9a049185a9d53d0e19cd8ab8f6c37960485ed24c81dab4f1b5bdd995aaf44633cc0354237f7c03eb6e33c79dbfa06cc6
 EBUILD asdf-3.2.0.ebuild 1180 SHA256 dca374f2f464fb8128062d9a4a7cfd29ca20f805c5a63ba137660db9ee3233e9 SHA512 7b8ba0ddf907f715c34f296f88fe0332cbe69b051304b5a61647411c7c3ca9d0fb8267d18d8301472a4152e10d3e65281cd616f92746dbd888ed379cd0dc1cb8 WHIRLPOOL 2502ab62e7dce45b06f0cc378a464ea1d83b82c68451b940d7e7c4df8e47b53e481f50caafe4dace57784789344b3cf2debc6939299afba3649216f294227dcc
+EBUILD asdf-3.2.1-r1.ebuild 1565 SHA256 6574c1e0c4d265433f4e5ab4252fa5a8f72e61ed57081bbf0818b578a0ffef58 SHA512 3832123b0ae4f5e99aa8603aa3165a61537ebd807ab9755dd7136d1adbe1fe593bfe2988f4e26814171909dd16923b77e1f445a42b5e2739e15cec0869076617 WHIRLPOOL cf1a07dd31d80e4e87d1efa0ff668adf030cfbf52ed8833550e82d2744a336e4547bbc682a742ff94a9a8ebf687a7492c8871c4b6b9b57361d22f1d51c197655
 EBUILD asdf-3.2.1.ebuild 1217 SHA256 6a330421ea7a4186943f46a1bdff008dd5ac563a94f3e038dc8ae2b4bcbba154 SHA512 324b8406d9955edda267ab00f34d6e97fd490d48184d8c8bc925b63f73737d207b85a7b29770eb02388bdb07a9ef8d77fb7633b8cccc48dea43bcf1b4067725b WHIRLPOOL ade6a3f2c7f86f3700f392de58fd46ca9a049185a9d53d0e19cd8ab8f6c37960485ed24c81dab4f1b5bdd995aaf44633cc0354237f7c03eb6e33c79dbfa06cc6
 MISC ChangeLog 3794 SHA256 8dd8375a341d0887e5e5f7c698b8f4483fd9da73927cdbb11a3093a04fac167d SHA512 ea5e83f11849e64b1390f0f33dbe9e5a2ee4266aa90cd94a188bb9cf9a4fc9044b483d4c0879e81bcbe2199027ceed46a2522e7b486484143cc9f6c8fe92a38e WHIRLPOOL ba5b6e9222b3b912c5f86c8ebd572fafdcb92ae82125d05d0c1c78c56620d4aab0824161eb4da711a232a71fc93bcdc17e44732d731471b9e090b59003074291
 MISC ChangeLog-2015 7148 SHA256 7e32561a57899ee6e5bb5f43d6db4d9a208a6aaabf018e233edfa8adb009d83e SHA512 0c0d65ecbd4b82f4c82fa52370cb2d6813eda9ef8ed2f9a956340da7e19e947eb181e5ac4297903b2c4fbfea099970a4c2b8a24446ab50b96ca6e0d626afed8d WHIRLPOOL 73084a5ac71679827d448b98497b6c78026aef4056a649724c2c9a08bfb8c1f6b1fe5608644d6bb76927d4c359db5da36c3c17a68c4ce7dcbe5bd2b04a40ef1f
--- a/dev-lisp/asdf/asdf-3.2.1-r1.ebuild
+++ b/dev-lisp/asdf/asdf-3.2.1-r1.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils prefix common-lisp-3
+
+DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
+HOMEPAGE="http://common-lisp.net/project/asdf/"
+SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="doc"
+
+SLOT="0/${PVR}"
+
+DEPEND="!dev-lisp/cl-${PN}
+		!dev-lisp/asdf-binary-locations
+		!dev-lisp/gentoo-init
+		!<dev-lisp/asdf-2.33-r3
+		doc? ( virtual/texi2dvi )"
+RDEPEND=""
+PDEPEND="~dev-lisp/uiop-${PV}"
+
+COMMONLISPS="sbcl clisp clozurecl cmucl ecls"
+
+find-lisp-impl() {
+	for lisp in ${COMMONLISPS} ; do
+		[[ "$(best_version dev-lisp/${lisp})" ]] && echo "${lisp}" && return
+	done
+	die "No CommonLisp implementation found"
+}
+
+install_docs() {
+	(cd doc ; dodoc *.{html,css,ico,png} "${PN}.pdf" ; dodoc -r asdf )
+	if has_version ">=dev-lisp/sbcl-1.4.0" ; then
+		(cd doc ; doinfo "${PN}.info" )
+	fi
+}
+
+src_compile() {
+	emake
+	use doc && emake -C doc
+}
+
+src_test() {
+	common-lisp-export-impl-args "$(find-lisp-impl)"
+	test/run-tests.sh ${CL_BINARY}
+}
+
+src_install() {
+	insinto "${CLSOURCEROOT}/${PN}"
+	doins -r build version.lisp-expr
+	dodoc README.md TODO
+	use doc && install_docs
+	insinto /etc/common-lisp
+	cd "${T}" || die
+	cp "${FILESDIR}/gentoo-init.lisp" "${FILESDIR}/source-registry.conf" . || die
+	eprefixify gentoo-init.lisp source-registry.conf
+	doins gentoo-init.lisp source-registry.conf
+}
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@ -14,6 +14,8 @@ AUX sbcl-1.3.14-gentoo-fix_nopie_for_hardened_toolchain.patch 624 SHA256 51b24b4
 AUX sbcl-1.3.15-gentoo-fix_nopie_for_hardened_toolchain.patch 736 SHA256 2bb64f43e3ed0500a2b1912c0cad0c764a744c1016b810f4f800508c0e144532 SHA512 deed8bcd778553afc198d59355c8130da1f1b6f07521bf23418bf104916731b23ff4d01c1c0d1b5f92d64300ed982907fcb0f9d235bb2c9b0026a3ece3745213 WHIRLPOOL 6eae7e0f63129959b5ee531e22b1cccddd7b59f092e3b6076c4493596c09ddb513554c8750d62a20af899b3e08eb7c71387c55057b58055a72d0127864eef434
 AUX sbcl-1.3.16-gentoo-fix_install_man.patch 433 SHA256 65205c558e49d3441bce5a8dd96ba487781976851276efb06a88ddb2c8264161 SHA512 2c50a257da618a303bc5060cf2119ca5d6a5f7dfe0e7d130a2ddb43e2dbc02de3dde0cadcfdb2d6c1ac5cc7aa5b26c5081aac47f11572295982f985473ac03c9 WHIRLPOOL 626e32a152b5049ce9217415d616fdb17fff2e83378a460bb71bc6e3ea61179af3e18d55658d171e65e08769b78a96a78af1607643f9855d5d94a0a3e477f915
 AUX sbcl-1.3.19-bsd-sockets-test.patch 14992 SHA256 57ee7c60ff25a2408e7177a535ca659192ca5a9a610ebd2b5c16be526a9fd964 SHA512 9c1d2558d25aa0bccc7245673a7e85f6b377f4a4e37aaa9417b838c2b602de527de9f1beebd75028d7a3bee2b11ebd6b23dd511436ec6c902c616ca13b502c63 WHIRLPOOL 23255d10be7865a85227342cccebbb08f2060d1d0e70c25d6a4cf86db4c75177095f993d8e7fdbd28fdcb614da722ef77b0306fa0a95879509275e5c28c2567b
+AUX sbcl-1.4.0-bsd-sockets-test.patch 15625 SHA256 caa71c71601d638c980be27aba3b5169251514b7670ec0a6aa86a528cc49bf1d SHA512 59120ce76dd3c24b48edebda4d4536eb570fa7fab67ef8e995d89b72c5702333943ea7f39c674091773996b67add22e6fff7abd041acbb0e83a3e0e002097d74 WHIRLPOOL 636a7661bbf50735c74ac1cf777fe76463dd22c265a77716d5bb456372e02fabb26d12b09869e3b716f39838ba094cfe1e5fa5b0c896a26318eb42c8bde4493e
+AUX sbcl-1.4.0-verbose-build.patch 936 SHA256 b01dff31eb52bc260bcaa08ff6eaef860eaa966602c2cd19542eb3e2bc2f4c06 SHA512 10b9e32a122910cca131bb5b4f1fbc098fa588a77b6cea2086a4f8458bcd70d5a7c2ad25018ac72b417d6fba8769d09e7debaffc23ef8f9a3b184d7f5729ec8d WHIRLPOOL 5c0438a04febc6ec09021996dc31925f6eaaa2e39d60314424048fdc8e85ad2577b0e12d7c3d69a3a16eeb551e4eb4bc0ea428f5f53f0e73aea21577965164eb
 DIST sbcl-1.0.23-sparc-solaris-binary.tar.bz2 7907803 SHA256 08b7c0f14b900d1d047c1a1e12632cde3c61b7fd489be512896faaa6adb4952c SHA512 d641d7859f0d60ce7dd684a0f21e62282a5a658ed6bb4d67d6b141b3ce22d9e27261efe7e5d0f752c30e467cf90d7c8a03ad2a04b3c60042f0ef0a4808a9c74a WHIRLPOOL 22e7714ea7104797bd533044e58da41b8bc8a4b8852e101a42663821334b9074477cd205a3ef2aa7e4e998e28e3d10c4972752e0a6ad2a1a775832280729744b
 DIST sbcl-1.0.28-alpha-linux-binary.tar.bz2 7573824 SHA256 0bd8125e1375a75b9dda286439dcbe9861d6df5c6fc8475fd217b8b757edf9cc SHA512 85ceb4d3bf971777f5444a63cbabd88ccfaf16ed3b3c86cc5ea6cb3fd3189c4cd5a5ebbf785c97366afb7026604ffc34a1129936291deede5993056e158125ab WHIRLPOOL 839363a0d2fcc7cf383143fc130c40bf6f03468a89eb4b5eecb39339ba376a6b3a2096938934a91cf689310bff20807d2ac24b99c0d6e3673729b26d9edb83aa
 DIST sbcl-1.0.28-sparc-linux-binary.tar.bz2 8032042 SHA256 a2e848ac11b0f16bb91866bd187949d908ad94fabb958a0b56320fc0e8b8923e SHA512 cea1ba06f85169fca9fe3026813c6e7e8e8209b874e048b7bd63cb3a1c5bd7c829e8dbb2c486977e190a0390d28e4845938a9e84378f4f2f16f72bf0b6f45c80 WHIRLPOOL e7f7e9bc7b43cab7b729792a22f0f41be12d8dd97a1c45fa039a49607865b977dd336fef8c7ccda087a9e9e32f92241c83e05da442e12cf883d3dfb3c2fda169
@ -53,6 +55,8 @@ DIST sbcl-1.3.20-x86-linux-binary.tar.bz2 10626852 SHA256 ad89c3079fe9e64ce35b0a
 DIST sbcl-1.3.21-source.tar.bz2 5901141 SHA256 684c51c0f041d78055053fbf350c10cc54f9aea4d32895901617eb5edd56158e SHA512 845f4977b46236b9e018c6c7e5cf5628aed6b75b0ec942cd0c54fb91b6dc7d46369e346cd3c3dbb3f4084e06ef81a168c5f5fec72c4ca649504aeaef4b71c1e5 WHIRLPOOL d4288ffc98acdc3b10c74277893ae8e61c915f6a796e55e57ac4fe8ed63deff5acb39eb946a0eeb3070df07053aa208c3b120a87802b9a320deb57ba2cccb688
 DIST sbcl-1.3.21-x86-64-linux-binary.tar.bz2 10633302 SHA256 c1c3e17e1857fb1c22af575941be5cd1d5444b462397b1b3c9f3877aee2e814b SHA512 a0ce82d35874344e72dd013df835000eb07656f3fcdb583e577f9d6ab37d7f81ab0c8c20e2f809d9d36c4139274fe722bb1e8a6ceb3f47d1f62bc3fc46c5cade WHIRLPOOL 8f5c911a6aced1818d384871cfc372e0d8bfe31c542bd7e6833335cd3fa4fba19a50de2e096042f1ed4289e45ad38545804413a8db1daca8b3ef3ed46fedf7c1
 DIST sbcl-1.3.9-armhf-linux-binary.tar.bz2 9161130 SHA256 da2d296a8ab107a7b2e10831836648d882b01193f60269853932af4f63a06571 SHA512 309e2ac7ef9ac95bf751432cf243af0de022c5b21054df2bf4e99da4ff087218af72b0ab3be69214eba3df1b6bbe707cc28840508e960c5d2ed2af0e86de3fdd WHIRLPOOL d2dde314d2b49e4246823032d953bbfe0858f7c69d0445da356426f9c5fac73036b32c1c048cf7f43615fa02707e8e434d8b085942e79d1e2b20f6fcb7e08919
+DIST sbcl-1.4.0-source.tar.bz2 5907661 SHA256 08d59ca79f78311304664d5093764cda94ff2693d92736d1321fa6074b570769 SHA512 fe22f06cf645b20445e55700cbb3a54d27de58f3cffafb67b0970a0f6962e9914708d0718ffd3dda0a75dfdf8c9f6830dd995ccf7e9c2384ee043eeb27bb3d1b WHIRLPOOL 2b229c0568b69ec9bd4ed74e37df88a9dedc1f4705747332180f730892ebca6943e118d1bbc848289e02168cb9e76e2c5f934087bfbbae5a2ad662c7f982790b
+DIST sbcl-1.4.0-x86-64-linux-binary.tar.bz2 10573661 SHA256 2b8d5256cb7e3057f47c3d81355d46dd96d966928652c011da613c519c532b67 SHA512 7cd8ea2a411b55a85df5113c0bcb63078d67c9c31edf12f3ee87075569436711725c325027b6bbdd6d5a2c79511da12a034278d734c7cc75c96f0a44941ee437 WHIRLPOOL e97ceb6736072d3e48885db92ccec0f153b79532c0ad6371c0cafa62f3d4d2f37984c92bfea12857f1f8ba0bfeb488e6332dac15c413e32f76b69905b13370ad
 EBUILD sbcl-1.3.0.ebuild 8434 SHA256 e288cb77e4f7d20b71c9435b59d01e1029438ceca656f4cd0e7d702808660ab2 SHA512 63362681e4d60dd2533f63f95de736d36d025b99076a1b570d51162b0d6ad490195dbcc5548751ca5eb69d4e3f3d26e2cb3fd2161a118802c8a3770bfb2dba18 WHIRLPOOL f7edbf4c7e32e7cb38c72de1cbd3f6f831f6746485ac99c84b056ac153763ee82f707e6925948501123af26629b0a60539873f5be076cb295dab42ab22324c18
 EBUILD sbcl-1.3.11.ebuild 8382 SHA256 251fec325de57feb97ab4635c615986ea4a0fc05807f64b14b73f7a495c2e3c7 SHA512 d6b00cc75cc3bc55be589d4e7690469e1ae8d8c00174ec67d83eff42f977e0840a97c22550be732ce0335b38d38b0429f0a47d9cf4de25402d91ea7814c3c351 WHIRLPOOL 952ff6a2fef1e110438b0e59e9eb684649ff4d514e8a8787c12609e8705039e70bc3cda4dc3c5139b5787ac7fb2f449514bc5e63a07b18e2b29bbd99c828081f
 EBUILD sbcl-1.3.12.ebuild 8386 SHA256 02cdc92a1c50bb9a8a7e3b8ffaf4898d38a02a31dc80c34a53f207b5e9fbd5be SHA512 1b373b2bdb4ef86b582ecd5d1126df113d3db29ff91a995cfd2caecf9a154983f7ef614216050b31d673a7ecf959afc92b05fdf3e19d7cb7bf5179143a5710fb WHIRLPOOL 800e952d20c14afc665c867066c852bb5c6872f2dbdb7d63301077aaab0c0254b31a6d98b61b24e58366e5521f53370588ff4ce89c1664a267a8b3b9020130c6
@ -65,6 +69,7 @@ EBUILD sbcl-1.3.18.ebuild 8075 SHA256 6f35890ba2eab375cdb70e626c985c635eb14d98e4
 EBUILD sbcl-1.3.19.ebuild 8164 SHA256 11a6409b81ca7935f045a5fc5a6639efd9771ac9bc172aefd051e3b4f7180f77 SHA512 c878588b4c15951c327981937b960a4649c1a719cdf4bdba4a4d125894963b5524323019fe4f58b9a4b923736ef41866e1a5b237909666c5aa823b0076229ce2 WHIRLPOOL bd87c481219a9ed4f7414784fcb94d2696a0af5a5e22c15752a6c8f7c7f1fffae0d3d8f99e87c2fb2005807a784b6790a0f26f9fbb3dc9d57a50bcb5f45dd0cd
 EBUILD sbcl-1.3.20.ebuild 8321 SHA256 a0b535cf23b959107df5bbaae02838fb098f34d54b1656906bba52ad7d61be17 SHA512 73405b1915e42e0aad14a8e4ed02df24a1230ee7be80c8fcfd99a8b43836a29c46ea68ba98c5ae793516aa685be115a263a5ac9eb79e738bd44c1d8a8f008fb6 WHIRLPOOL 27571a3f0a451257742e685ea67c3086d59b167b5b14d303e652fba589e3e68a2286f98a39f34dae313a04a3dbe45524f477989c3ba05003df0d36afde0a02ad
 EBUILD sbcl-1.3.21.ebuild 8320 SHA256 3118f5623bfb25fd40fff296029466a89ab6ccda8a67ce7b64b7d9c7a9e66bbc SHA512 b4f2a7c14f85a171dc3484e5743945493e9aab7fdfe848822ace3e0bd91e9c63840520af11a63a6c5371a055eb0430abdb76f338c30acbd2def16d9b323f0465 WHIRLPOOL 56430264a472acef6b2db13abd8bc323c0d241efc3093bb4f0a36a315e33b9f1af5edcf9fbb758ca801b977075c4776ab2c6e9c89498ef4aa051009c67ab23aa
+EBUILD sbcl-1.4.0.ebuild 8464 SHA256 ab68d98bf91b238678b1acf6165477f08e4a1089cfcb19b7c0c2a18e3d77fcb9 SHA512 c2cc70c76972d32852bfc6060d3241671e95619f043ba8c2f294747b884be9b42e9b73e18dc0d5c4a8e2d9d577cebe9e500c0638e83a565722b6beb11396e4ac WHIRLPOOL 4a6fb75ad6d0d3ba06bd05fb427b94d4e794f45a202c467b5482d0cbe3f430cbbdea6245b8ee84f344c171f7b272ea0b29e93cf7bbecb58b69eda9b37250bef5
 MISC ChangeLog 11602 SHA256 9af6af5a1bef12d483d7b86578e1db51636668715de7366070298478f11c52ff SHA512 b79217e2bc0f007863cdeaea277e0315eefec413eeba2a5b740e1b5760f6e10803009e005a5da5a97d7a754e456833454a7d36baa8442293f2ef4fb8a741ebc4 WHIRLPOOL 326dbf8f3d7cdad839af37e90b11a1aa5be1ceb58f2ff87024423c8cc67f64e2e980412ce644de04d17f6da13e78cfeebbe7591821a3580f025a69deb62ced4c
 MISC ChangeLog-2015 59251 SHA256 0853c0abb1c70d1f165f084a6d1c2927dca9a698e142457a391273cc59f9fb8b SHA512 de4457c148436f486b884367d526f4aab3a04e46d3fa7c2f13be5b469572cf6187024dd447114c7bdfbc587ae21889e4b5e54c091ba7110b55d542951b8ad12b WHIRLPOOL 809b96091fba9fd87c2fe31763714ddc15f699e96e9e202d8ea0682e3c937dfaf2e3fc8cdafde6a3e88bcff94f8fe2164494e77b6fe24a0bf8b16b0ddcc1d6d7
 MISC metadata.xml 1771 SHA256 8b4f304c48df97da17bf377fc6d2b36ca5778654cf34cea2e59ea1dd64972d5f SHA512 58c44f7632aade5faefeac78dbcdb09d8dc23d8913571f7022d2a9310e32c041f21589e4f9c80b44e9b3d89ea323fb19c87b49e401340584ae701dd4d39108b9 WHIRLPOOL 0f86b49ecc857531405619b0fbf81a79d48f43e7f409ca99b88b2fd260f3f81ca84f612b766405aa33042e1af4caffe5378e638fdfb614a5ce1afbbb4d6123a6
--- a/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch
+++ b/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch
@ -0,0 +1,383 @@
+diff -Nuar a/contrib/sb-bsd-sockets/tests.lisp b/contrib/sb-bsd-sockets/tests.lisp
+--- a/contrib/sb-bsd-sockets/tests.lisp	2017-09-30 18:30:58.000000000 +0200
+++ b/contrib/sb-bsd-sockets/tests.lisp	2017-10-01 18:45:57.132900158 +0200
+@@ -18,11 +18,11 @@
+   (equalp (make-inet-address "242.1.211.3")  #(242 1 211 3))
+   t)
+ 
+-#-win32
+-(deftest make-inet6-address.1
+-    (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
+-            #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255))
+-  t)
+;#-win32
+;(deftest make-inet6-address.1
+;    (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
+;            #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255))
+;  t)
+ 
+ (deftest get-protocol-by-name/tcp
+     (integerp (get-protocol-by-name "tcp"))
+@@ -35,15 +35,15 @@
+ ;;; See https://bugs.launchpad.net/sbcl/+bug/659857
+ ;;; Apparently getprotobyname_r on FreeBSD says -1 and EINTR
+ ;;; for unknown protocols...
+-#-(and freebsd sb-thread)
+-#-(and dragonfly sb-thread)
+-(deftest get-protocol-by-name/error
+-  (handler-case (get-protocol-by-name "nonexistent-protocol")
+-    (unknown-protocol ()
+-      t)
+-    (:no-error ()
+-      nil))
+-  t)
+;#-(and freebsd sb-thread)
+;#-(and dragonfly sb-thread)
+;(deftest get-protocol-by-name/error
+;  (handler-case (get-protocol-by-name "nonexistent-protocol")
+;    (unknown-protocol ()
+;      t)
+;    (:no-error ()
+;      nil))
+;  t)
+ 
+ (when (handler-case (make-instance 'inet-socket
+                                    :type :stream
+@@ -102,21 +102,21 @@
+       (:no-error nil))
+   t)
+ 
+-#-win32
+-(deftest make-inet6-socket.smoke
+-  (handler-case
+-      (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
+-        (> (socket-file-descriptor s) 1))
+-    ((or address-family-not-supported protocol-not-supported-error) () t))
+-  t)
+-
+-#-win32
+-(deftest make-inet6-socket.keyword
+-  (handler-case
+-      (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
+-        (> (socket-file-descriptor s) 1))
+-    ((or address-family-not-supported protocol-not-supported-error) () t))
+-  t)
+;#-win32
+;(deftest make-inet6-socket.smoke
+;  (handler-case
+;      (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
+;        (> (socket-file-descriptor s) 1))
+;    ((or address-family-not-supported protocol-not-supported-error) () t))
+;  t)
+
+;#-win32
+;(deftest make-inet6-socket.keyword
+;  (handler-case
+;      (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
+;        (> (socket-file-descriptor s) 1))
+;    ((or address-family-not-supported protocol-not-supported-error) () t))
+;  t)
+ 
+ #+ipv4-support
+ (deftest* (non-block-socket)
+@@ -125,55 +125,55 @@
+     (non-blocking-mode s))
+   t)
+ 
+-#+ipv4-support
+-(deftest inet-socket-bind
+-  (let* ((tcp (get-protocol-by-name "tcp"))
+-         (address (make-inet-address "127.0.0.1"))
+-         (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
+-         (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
+-    (unwind-protect
+-         ;; Given the functions we've got so far, if you can think of a
+-         ;; better way to make sure the bind succeeded than trying it
+-         ;; twice, let me know
+-         (progn
+-           (socket-bind s1 address 0)
+-           (handler-case
+-               (let ((port (nth-value 1 (socket-name s1))))
+-                 (socket-bind s2 address port)
+-                 nil)
+-             (address-in-use-error () t)))
+-      (socket-close s1)
+-      (socket-close s2)))
+-  t)
+-
+-#-win32
+-(deftest inet6-socket-bind
+-  (handler-case
+-      (let* ((tcp (get-protocol-by-name "tcp"))
+-             (address (make-inet6-address "::1"))
+-             (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
+-             (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
+-        (unwind-protect
+-             ;; Given the functions we've got so far, if you can think of a
+-             ;; better way to make sure the bind succeeded than trying it
+-             ;; twice, let me know
+-             (handler-case
+-                 (socket-bind s1 address 0)
+-               (socket-error ()
+-                 ;; This may mean no IPv6 support, can't fail a test
+-                 ;; because of that (address-family-not-supported doesn't catch that)
+-                 t)
+-               (:no-error (x)
+-                 (declare (ignore x))
+-                 (handler-case
+-                     (let ((port (nth-value 1 (socket-name s1))))
+-                       (socket-bind s2 address port)
+-                       nil)
+-                   (address-in-use-error () t))))
+-          (socket-close s1)
+-          (socket-close s2)))
+-    ((or address-family-not-supported protocol-not-supported-error) () t))
+-  t)
+;#+ipv4-support
+;(deftest inet-socket-bind
+;  (let* ((tcp (get-protocol-by-name "tcp"))
+;         (address (make-inet-address "127.0.0.1"))
+;         (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
+;         (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
+;    (unwind-protect
+;         ;; Given the functions we've got so far, if you can think of a
+;         ;; better way to make sure the bind succeeded than trying it
+;         ;; twice, let me know
+;         (progn
+;           (socket-bind s1 address 0)
+;           (handler-case
+;               (let ((port (nth-value 1 (socket-name s1))))
+;                 (socket-bind s2 address port)
+;                 nil)
+;             (address-in-use-error () t)))
+;      (socket-close s1)
+;      (socket-close s2)))
+;  t)
+
+;#-win32
+;(deftest inet6-socket-bind
+;  (handler-case
+;      (let* ((tcp (get-protocol-by-name "tcp"))
+;             (address (make-inet6-address "::1"))
+;             (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
+;             (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
+;        (unwind-protect
+;             ;; Given the functions we've got so far, if you can think of a
+;             ;; better way to make sure the bind succeeded than trying it
+;             ;; twice, let me know
+;             (handler-case
+;                 (socket-bind s1 address 0)
+;               (socket-error ()
+;                 ;; This may mean no IPv6 support, can't fail a test
+;                 ;; because of that (address-family-not-supported doesn't catch that)
+;                 t)
+;               (:no-error (x)
+;                 (declare (ignore x))
+;                 (handler-case
+;                     (let ((port (nth-value 1 (socket-name s1))))
+;                       (socket-bind s2 address port)
+;                       nil)
+;                   (address-in-use-error () t))))
+;          (socket-close s1)
+;          (socket-close s2)))
+;    ((or address-family-not-supported protocol-not-supported-error) () t))
+;  t)
+ 
+ #+ipv4-support
+ (deftest* (simple-sockopt-test)
+@@ -241,37 +241,37 @@
+ ;;; to look at /etc/syslog.conf or local equivalent to find out where
+ ;;; the message ended up
+ 
+-#-win32
+-(deftest simple-local-client
+-    (progn
+-      ;; SunOS (Solaris) and Darwin systems don't have a socket at
+-      ;; /dev/log.  We might also be building in a chroot or
+-      ;; something, so don't fail this test just because the file is
+-      ;; unavailable, or if it's a symlink to some weird character
+-      ;; device.
+-      (when (block nil
+-              (handler-bind ((sb-posix:syscall-error
+-                              (lambda (e)
+-                                (declare (ignore e))
+-                                (return nil))))
+-                (sb-posix:s-issock
+-                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
+-        (let ((s (make-instance 'local-socket :type :datagram)))
+-          (format t "Connecting ~A... " s)
+-          (finish-output)
+-          (handler-case
+-              (socket-connect s "/dev/log")
+-            (sb-bsd-sockets::socket-error ()
+-              (setq s (make-instance 'local-socket :type :stream))
+-              (format t "failed~%Retrying with ~A... " s)
+-              (finish-output)
+-              (socket-connect s "/dev/log")))
+-          (format t "ok.~%")
+-          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
+-            (format stream
+-                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
+-      t)
+-  t)
+;#-win32
+;(deftest simple-local-client
+;    (progn
+;      ;; SunOS (Solaris) and Darwin systems don't have a socket at
+;      ;; /dev/log.  We might also be building in a chroot or
+;      ;; something, so don't fail this test just because the file is
+;      ;; unavailable, or if it's a symlink to some weird character
+;      ;; device.
+;      (when (block nil
+;              (handler-bind ((sb-posix:syscall-error
+;                              (lambda (e)
+;                                (declare (ignore e))
+;                                (return nil))))
+;                (sb-posix:s-issock
+;                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
+;        (let ((s (make-instance 'local-socket :type :datagram)))
+;          (format t "Connecting ~A... " s)
+;          (finish-output)
+;          (handler-case
+;              (socket-connect s "/dev/log")
+;            (sb-bsd-sockets::socket-error ()
+;              (setq s (make-instance 'local-socket :type :stream))
+;              (format t "failed~%Retrying with ~A... " s)
+;              (finish-output)
+;              (socket-connect s "/dev/log")))
+;          (format t "ok.~%")
+;          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
+;            (format stream
+;                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
+;      t)
+;  t)
+ 
+ ;;; these require that the internet (or bits of it, at least) is available
+ 
+@@ -387,60 +387,60 @@
+        (format t "Received ~A bytes from ~A:~A - ~A ~%"
+                len address port (subseq buf 0 (min 10 len)))))))
+ 
+-#+(and ipv4-support sb-thread)
+-(deftest interrupt-io
+-    (let (result)
+-      (labels
+-          ((client (port)
+-             (setf result
+-                   (let ((s (make-instance 'inet-socket
+-                                           :type :stream
+-                                           :protocol :tcp)))
+-                     (socket-connect s #(127 0 0 1) port)
+-                     (let ((stream (socket-make-stream s
+-                                                       :input t
+-                                                       :output t
+-                                                       :buffering :none)))
+-                       (handler-case
+-                           (prog1
+-                               (catch 'stop
+-                                 (progn
+-                                   (read-char stream)
+-                                   (sleep 0.1)
+-                                   (sleep 0.1)
+-                                   (sleep 0.1)))
+-                             (close stream))
+-                         (error (c)
+-                           c))))))
+-           (server ()
+-             (let ((s (make-instance 'inet-socket
+-                                     :type :stream
+-                                     :protocol :tcp)))
+-               (setf (sockopt-reuse-address s) t)
+-               (socket-bind s (make-inet-address "127.0.0.1") 0)
+-               (socket-listen s 5)
+-               (multiple-value-bind (* port)
+-                   (socket-name s)
+-                 (let* ((client (sb-thread:make-thread
+-                                 (lambda () (client port))))
+-                        (r (socket-accept s))
+-                        (stream (socket-make-stream r
+-                                                    :input t
+-                                                    :output t
+-                                                    :buffering :none))
+-                        (ok :ok))
+-                   (socket-close s)
+-                   (sleep 5)
+-                   (sb-thread:interrupt-thread client
+-                                               (lambda () (throw 'stop ok)))
+-                   (sleep 5)
+-                   (setf ok :not-ok)
+-                   (write-char #\x stream)
+-                   (close stream)
+-                   (socket-close r))))))
+-        (server))
+-      result)
+-  :ok)
+;#+(and ipv4-support sb-thread)
+;(deftest interrupt-io
+;    (let (result)
+;      (labels
+;          ((client (port)
+;             (setf result
+;                   (let ((s (make-instance 'inet-socket
+;                                           :type :stream
+;                                           :protocol :tcp)))
+;                     (socket-connect s #(127 0 0 1) port)
+;                     (let ((stream (socket-make-stream s
+;                                                       :input t
+;                                                       :output t
+;                                                       :buffering :none)))
+;                       (handler-case
+;                           (prog1
+;                               (catch 'stop
+;                                 (progn
+;                                   (read-char stream)
+;                                   (sleep 0.1)
+;                                   (sleep 0.1)
+;                                   (sleep 0.1)))
+;                             (close stream))
+;                         (error (c)
+;                           c))))))
+;           (server ()
+;             (let ((s (make-instance 'inet-socket
+;                                     :type :stream
+;                                     :protocol :tcp)))
+;               (setf (sockopt-reuse-address s) t)
+;               (socket-bind s (make-inet-address "127.0.0.1") 0)
+;               (socket-listen s 5)
+;               (multiple-value-bind (* port)
+;                   (socket-name s)
+;                 (let* ((client (sb-thread:make-thread
+;                                 (lambda () (client port))))
+;                        (r (socket-accept s))
+;                        (stream (socket-make-stream r
+;                                                    :input t
+;                                                    :output t
+;                                                    :buffering :none))
+;                        (ok :ok))
+;                   (socket-close s)
+;                   (sleep 5)
+;                   (sb-thread:interrupt-thread client
+;                                               (lambda () (throw 'stop ok)))
+;                   (sleep 5)
+;                   (setf ok :not-ok)
+;                   (write-char #\x stream)
+;                   (close stream)
+;                   (socket-close r))))))
+;        (server))
+;      result)
+;  :ok)
+ 
+ (defmacro with-client-and-server (((socket-class &rest common-initargs)
+                                    (listen-socket-var &rest listen-address)
+@@ -503,8 +503,9 @@
+             (define-shutdown-test ,(make-name 'shutdown.client.ub8)
+               client server (unsigned-byte 8) ,direction)))))
+ 
+-  (define-shutdown-tests :output)
+-  (define-shutdown-tests :io))
+;  (define-shutdown-tests :output)
+;  (define-shutdown-tests :io)
+)
+ 
+ #+linux
+ (deftest abstract.smoke
--- a/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch
+++ b/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch
@ -0,0 +1,29 @@
+diff -Nuar a/make.sh b/make.sh
+--- a/make.sh	2017-09-30 18:30:58.000000000 +0200
+++ b/make.sh	2017-10-01 18:08:26.742909789 +0200
+@@ -24,7 +24,7 @@
+ # thing" when run on the target machine, with the minor caveat that
+ # any --xc-host parameter should be suitable for the host machine
+ # instead of the target.
+-sh make-config.sh "$@" || exit $?
+sh -x make-config.sh "$@" || exit $?
+ 
+ . output/prefix.def
+ . output/build-config
+@@ -76,11 +76,11 @@
+         $@
+     fi
+ }
+-maybetime sh make-host-1.sh
+-maybetime sh make-target-1.sh
+-maybetime sh make-host-2.sh
+-maybetime sh make-target-2.sh
+-maybetime sh make-target-contrib.sh
+maybetime sh -x make-host-1.sh
+maybetime sh -x make-target-1.sh
+maybetime sh -x make-host-2.sh
+maybetime sh -x make-target-2.sh
+maybetime sh -x make-target-contrib.sh
+ 
+ NCONTRIBS=`find contrib -name Makefile -print | wc -l`
+ NPASSED=`find obj/asdf-cache -name test-passed.test-report -print | wc -l`
--- a/dev-lisp/sbcl/sbcl-1.4.0.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.4.0.ebuild
@ -0,0 +1,240 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.2.7
+BV_AMD64=1.4.0
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.3.12
+BV_ARM64=1.3.16
+BV_PPC_MACOS=1.0.47
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_SPARC_SOLARIS=1.0.23
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-1.3.15.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch
+
+	eapply_user
+
+	# bugs #526194, #620532
+	sed -e "s@CFLAGS +=.*\$@CFLAGS = ${CFLAGS} -Wall -Wsign-compare -Wpointer-arith@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS = ${LDFLAGS}@" \
+		-e "s@LINKFLAGS += -no-pie\$@LINKFLAGS = ${LDFLAGS} -no-pie@" \
+		-e "s@LINKFLAGS += -nopie\$@LINKFLAGS = ${LDFLAGS} -nopie@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	# Use installed ASDF version
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# Avoid installation of ASDF info page. See bug #605752
+	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug #174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@ -3,6 +3,6 @@ DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d6
 EBUILD llvm-ocaml-4.0.1.ebuild 3035 SHA256 7001d6e93c538b67c9864fefc047fba5850054ab09bb688958247af2440bfa2b SHA512 ca97273920bd6ee717633afee2f94ae9bf04f0d16b6dcca9a9045784af32430a3825eb7658e64773dcb9be86624a801e1d08e0ea3ca0ecaf898cd4fd761c3ece WHIRLPOOL 36f503f0a9d8c192cbb453a23f9cda1af936645bae84667a68219cfbcffa298a5f37f4091f66cc04dc7a1c8fb660a07acf1af1d2ac1f9481436be3ec591c0839
 EBUILD llvm-ocaml-5.0.0.ebuild 3229 SHA256 742b12b44064f2b35b2f1b569d358f555ca1765d832ca00e9d524432cdc6f1bb SHA512 39b3cee9d7bb63d5974af7ff3237d283c551f37c6f43da20c901404ef01c6d144bbacf25e8eb4b4d8687d0106ebe3c74894957c719f129ad0a54b41ef8f49e07 WHIRLPOOL 6c1242221eaf07c2afbaa95065746ca79def83b6bbb88d94b2ed019b3926448a0614028a3d3eae53b0b6f47838352cdf9421f1b7a4b84b68ed8a3740cb6d1b35
 EBUILD llvm-ocaml-5.0.9999.ebuild 3231 SHA256 35fd17eb59c1b8c93fbf88f979b99366a4b76c1fec2727894a2f0d4ed164fb84 SHA512 9e41def8d16d5e491efd036fa97feb5cfeec92c1379426430195d79276fe5e5afc5b22e9a57956a73b6b92c8f5ba51f3bc6477bd5d27c0b1caafa8fd7a476260 WHIRLPOOL 9f2ab2bc0db7faf678a2d9f5f65d786f78e2bc5e5aa5088b69e9d58866467e99866482243c71cc5cc6110bf7b97991db6f21e2e7e775628e9cbfcbb0f2bf8733
-EBUILD llvm-ocaml-9999.ebuild 3457 SHA256 d6d721f5b8b99743a8637d4299b42b168c452f5d2d31259810c4f5ea8a7356bc SHA512 a919bb5ef73f4a9e4a2370fbf6b2c31aeb617e6460bc02dac09a6f3ec9d60218532594ddd9f30667c4e187eefe1d8b3a3a9c1b77b7d73da9011d45b9100ce854 WHIRLPOOL be434a94d913fe663e2aebe55b1af229d9452295480197d83097a67693865ee054bbaa78b7147119c3a95467a245aa877350265059b0bae14e370fce83c27bfa
+EBUILD llvm-ocaml-9999.ebuild 3490 SHA256 62d2137d8e8d9aa319caba933ce20849a99008ccd8d54147da6b5327de8f2ff5 SHA512 38f59400aa19712ef17b139e430fa3b4f33b2b2c36fbda30f2c5920790f1a980616a00162a45aa5aca33bd75d72dbd1cb59552fec7649968217afa818d137b95 WHIRLPOOL a7b812db5394111481c0b84eb77a46601b21bf18d4c7f518d673c7517c58e476e6d37027c2d9a22e0e05a12633a11f0fa7de81bd88f95d412f61b80b3b204128
 MISC ChangeLog 776 SHA256 0c84adefbb0526e08504b88920916d40a7a6967b03a3d8caa21f8086e7a04755 SHA512 eae3e59337152ce312edb15d9e533d089829c9ce6f0f149cade74c2ade6f2d600c51d4ac5f1d5503ca1029230bc8060874f207e695deff4e4afcd661518daa9e WHIRLPOOL 4f7760c023e088fe325b07b372e29efc422dff63b0872bc3f4a465299e3990b62a387a68f4cbc91627f96befa3df4a59bb9c3e9fd2780a1aa78c078efea04de0
 MISC metadata.xml 216 SHA256 e94ba81dd2791908508a3993afdebf723cc617314c53c273b9bcca15a9c48327 SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 WHIRLPOOL 29145f5721e079e0548c5ef22424c65e6a5b2bfc4428918e923fcfdfc37e9b8749fb63e3c2eb5773c17fab276f7513dd66e326b906f1848911dceba7ae4b419a
--- a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild
@ -98,7 +98,8 @@ src_configure() {
 	)

 	use test && mycmakeargs+=(
-		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv"
 	)

 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
@ -115,7 +116,7 @@ src_configure() {
 		local llvm_bindir=$(llvm-config --bindir)
 		# Force using system-installed tools.
 		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg || die
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
 	fi
 }

--- a/dev-php/pecl-gearman/Manifest
+++ b/dev-php/pecl-gearman/Manifest
@ -2,4 +2,4 @@ DIST gearman-1.0.2.tgz 30405 SHA256 fd4bb531b9dbac5d7816254ae659155baf43a53addce
 EBUILD pecl-gearman-1.0.2-r2.ebuild 383 SHA256 cec12908a7a89715bfbdd9104e8c4dacf3fe6c451346268d10367cc898181e90 SHA512 84ced4092be9d0912f50036c433557c219b782415f0d3b033e2517f04d5d1360799368b8193557b85e7f8824ccfbd14887f6f0cfeb5231936a3c4826e5be8db9 WHIRLPOOL 5aefce6a377fc07ed99f17d363b8e830c9a8fa67e2eaea28ffd1a02342ccbdd7dcecf8a7580260ea6b3c4caeaa32248471fb191e7fbda9b9b15ab33f2dc750b0
 MISC ChangeLog 3097 SHA256 db3a53b67b985961b2cf4b4dd995bdc592794b09fc63d10b59b7849ef5e2785e SHA512 dec639b95830063b81eefc96b76e4f92631f14d9132b8af3b1e993f7dd2a4c4775e3502071332c19092646b3d32b59726adf788633c27b89784e1dbd6a6f2804 WHIRLPOOL 7692e99f13b20c8a85fe1f429086e0081bfc9cce0b47db85b43486361987661c83245dc4dd298f20a267cd248a1ba740b8980bcfe84c80704d8440d34bb1bf91
 MISC ChangeLog-2015 2669 SHA256 30e7cd44157504d19b9428b3dafbe988e9eeba406568843ff9825112091efc0f SHA512 ca4e4ca26ff1a0a1f72b8a805bf55388beacb16b0083d84a70ca4f7a805f1c17b937ca08dc45ab2c345f05b875e9ba326f572a28c7484907f4c3a9f9eeccbde6 WHIRLPOOL 456b201da0c8cb16235819ba638affda41b1773434871caf487ddec324100da5b7f9d972758f5dc4d88308f1a51e724bd4ae99a721b1da42b33e5e3b325f3908
-MISC metadata.xml 424 SHA256 e2daa01b9627e112ceb45e6bac55294ab8d0d25842d5502e1ba93e3163d1f05a SHA512 88c6f6fd66e40eb0f7148a293848c445c1bac2925aed3a5882b64b0cf922335a948561822751c64a4b40282c9a2a220db6711ccd879be81f35a25792fa5bea7a WHIRLPOOL f41abdfca84d8297d04338750f40013512f36b3ba76a2f098e380be5c1fa9d7020e96de52a0c1fcf59e9ac0f3c0ddaa7c7dfb766d7d7d0c9560d5f4528855637
+MISC metadata.xml 167 SHA256 f96941509a22a8f847ec485da76e519ed70750aca4760ebc67ab96bdf47eef9e SHA512 dfe1e1241bcc5d7a1defa25846080d647f3a24a11a3dd88f55a1369179a492dc494c1fa57cc909fc351411fcf2f33fa34a991efb3cfde5280b2b5cba8ab95d09 WHIRLPOOL 5ef4553aeb614409a53b46a6e04ac6c274f9d5373367b563cb296b89206da8828b230102815e0f8342a6f02987f5ec4107f518f07b8b6f82b9c87446fb0f063e
--- a/dev-php/pecl-gearman/metadata.xml
+++ b/dev-php/pecl-gearman/metadata.xml
@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>pavel.stratil-jun@fenix.cz</email>
-    <description>Proxied co-maintainer, assign bugs to him</description>
-  </maintainer>
-<maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+<!-- maintainer-needed --> 
 </pkgmetadata>
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@ -2,9 +2,11 @@ AUX argcomplete-1.8.2-disable-tcsh-tests.patch 1294 SHA256 e1dcf6f627087954ad242
 DIST argcomplete-1.4.1.tar.gz 37219 SHA256 a7b5fa8d1acb69e49b3c6b3f6225bc709092e0c7f621311bac507a4f6efe609d SHA512 3e9fa64fca93baf14fddd653947ff0269004e8783de0567931dafb9e4d0dfff2e2450ef6df331a4d648f5ce1d817a422f52d8d30b94315cd54fd82102467ded5 WHIRLPOOL ee11a1f16f44b204502bc0a1246626305cbdddf8633608fbb5575270e3568b4995ae449ccf309f12225f29099dac117aa21c66cd14f53d0d90fd6abfc637d7e7
 DIST argcomplete-1.6.0.tar.gz 39685 SHA256 d37abde525436465a5126084a89630887bdafd03fddb1bd7b40efc01dbcff9f0 SHA512 6a2a6a4af3ddb5bea0022bf5e2acb123d4c0505d979887ebb82ed5c8a591d59d35b57084483428d030e0507f3cd149953146f49d4a7b0290bc88648cea3eb7a3 WHIRLPOOL 106a23798ebe624ed9548023f00d970bb119b7b35d763f57be694a032dddaba933622eee5c655b6ce321d7c7297604219ae2a0dd681e5ef836aac53db03713ad
 DIST argcomplete-1.8.2.tar.gz 53626 SHA256 7a2ccde074eb6631232b2f91f8d8d5985d5bebf0e36b091113096e3a0385546b SHA512 ed3ddfe402bd89b81da1935a105dcc1914e9c7b98590624ba1140647ce1322a71d790bf3d0e29fe745ca676aa22f99b9834b58a97c2b1c08ca4a32bab7f4c914 WHIRLPOOL 60f3aa3cb468ee34cbf0766628e927f85bb1693db4ce9d48db3e4610952e413197a794e096675879b4d0cc5b27f3c147f2db357ef03f04e2c7c40d2e259c0597
+DIST argcomplete-1.9.2.tar.gz 46445 SHA256 d6ea272a93bb0387f758def836e73c36fff0c54170258c212de3e84f7db8d5ed SHA512 174a4f7f1e24944472567c7cf2959b1bf1bf1d57f9c9d36469837f568d9e5db89d7055a2b93ff58e72fa5a78acb498833833a465da2b69bcf09fcfa2ecdad742 WHIRLPOOL d2259d7befbb4b5a0ad22b17e6a81b039bd9fd5798843b14566c7066b335b92c61758e4c4475dbcc377aa85bfd519418c98f81eb3c73ca84db00e172e8d9c349
 EBUILD argcomplete-1.4.1.ebuild 969 SHA256 00ee0182ece1e462d7123ef51c3012840680787e7500f9620bea51c41847b01e SHA512 0318d5717d2586a1090e660a8efc46a56066046e85862e022bf69c22fb7a4ba0acd9da58d51ea75fc38f3d4ae982698257967777c8324acc4ab97c0191b473a2 WHIRLPOOL cde2a7af0578244cc2318f16a5ee2374029c20519ca5dacccd00906a29e49f952274776e0b7a6337fd353e702dc3a5b8bb2b1b8454a05c27d620fbee9398ad15
 EBUILD argcomplete-1.6.0.ebuild 753 SHA256 f70aaaf60f8cdddbed3d55a34950e561e5e14c482bbd6ab26974acfa8c9ebe29 SHA512 d2b6de83703f36e1a98611610b132eee793f684f3b0826530c9319e1b11503c9991efbee673145a3bb78478b225f56b57fda5adeac76a6ab5e9f7ba71f0f1f4b WHIRLPOOL 80d3d13ed558f87c4fc5444d29794e790cea771042567d5d08667393828f1d5db74c65f0f6fd5dca6ceefa74842f3e999f20ba44ab88c77de001f0b8b665bbd9
 EBUILD argcomplete-1.8.2.ebuild 812 SHA256 6fbe6ced7641891a8e895a565d93c9c9cc4b8864d6ae27ae4a35b74f8075993c SHA512 2f9f68b9f6241c71cd4932613b8441ba5c4520ddbebe20163de962489bc985349914b90af3a7245cdd225d9777e9af4246af3f0fa8af0a2b8bbedf5c407ebcba WHIRLPOOL bc9ad27a7432c187cb824576483624720049350ec6716aef2576cf8c4f53aeb15374ab747798e6d31f10ce825fc8ef2a060c23c26d761b5fd55c6b544f21ad6b
+EBUILD argcomplete-1.9.2.ebuild 773 SHA256 dfa27b2e423056c9d882201fe06bc8698423271e174c8e821f704cda159a1117 SHA512 15eaee33df92399e24ec42b504735f577f0336780a1ffac591f04b8b5a083a58774dc530c77404113e87fe81de4c28671aca2cd73358c4d84fa73c7d6dc8a78c WHIRLPOOL 8704fa5478a16320fd8498c468a9197deeed27c0fcb7040b9296a543139d55e3052b14c36f4fd55efaaf457ab8a0a8065de8fceb8400ab5d7cb5510833b1e33a
 MISC ChangeLog 4276 SHA256 fcd4d6167221014866afa6804b629f0778092998fe930645fc05426bf1861be3 SHA512 2d8953a3f009c1ca4c05d9c7ee119ce2528c17f31f212bea19dd9a37ba7232bfdf6b0207d895cdb4eb60be7a62c3f37fb0d49eb082082bccb8c167f4225518f5 WHIRLPOOL 33358fce131c174eefdb69469f38a58453a57f4cc1cd312bb33a897d5023bd26e62f5a245110e12910ac4947fb376f298e7776f268e2f4f27611af9f131ecf8e
 MISC ChangeLog-2015 2243 SHA256 b4989afdb79ca125bfa748a239a7191a4158680d156d15cdd8750b52e0ca5bdb SHA512 99ae064aaaef3ddeb2c4a5fff2fdc69c593e6cf586fb7d88b36bac1615971382843825ef8eb14cdac9d1d0c075b5a9e4c4760885b61af6ec0fa6143074ab94de WHIRLPOOL 76291ff5bf67682ae2c67d61f629c32f54f98bd5fa3539458a6a81cb46baa292a49fc2782f426545777a24d0acc7b54710055ec4ebe2dbce0a147ccdb4e8a38c
 MISC metadata.xml 385 SHA256 0c336eb52193d785ea1d0eba3a37339ee308538d26fc144e6a657a8ff93f6a38 SHA512 125cccb9f83bacb68944c893b76905ca6db26c41f0e843bc3b2ed4fd8b18df4247696c0fb34acff77c41bd57fce517669878e071db6dcdcedde42f85cc012e5d WHIRLPOOL f08941cb18a6ae769a87ed3ef09e01174feb46267642b936785cd2a9e980ad8feda696782a63b513f58e2a7b23ba02f45539d89801b2c7ead393768c3a57a2d2
--- a/dev-python/argcomplete/argcomplete-1.9.2.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.9.2.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.python.org/pypi/argcomplete"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~arm ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pexpect[${PYTHON_USEDEP}]
+		app-shells/tcsh )"
+
+python_test() {
+	"${EPYTHON}" test/test.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp "${S}"/${PN}/bash_completion.d/python-argcomplete.sh python-${PN}
+}
--- a/dev-python/html5-parser/Manifest
+++ b/dev-python/html5-parser/Manifest
@ -0,0 +1,3 @@
+DIST html5-parser-0.4.4.tar.gz 267787 SHA256 b9f3a1d4cdb8742e8e4ecafab04bff541bde4ff09af233293ed0b94028ec1ab5 SHA512 3aaeb32f360d2c131ecbe11fa1dcd3dfcd62c9ca046fce7dd4ff8127d0e62216f666e83bb20c7809c6adc591e1fb2798e382e78a1cf6129b1f0a09a71377f8d4 WHIRLPOOL 924f71b373075fe9e103b961efbeb00347b007cbaf8aa6a3a03a2af22a6cdecdb2e2d6cb67aa8a75e02b660f93f5f84a7b56bb7f8bb30af7846faa80c9ae566e
+EBUILD html5-parser-0.4.4.ebuild 632 SHA256 d30437a706372c627d11f5ebf47ba57afbf1114327158c83d20913e8657ca597 SHA512 eeb52856f162e237ddf4a6c117188ac471f8abc3774b77fe589809e988fdeaa391c598fbe381cf7ef27b545c0b91db8bac42eacffc9fc613f0f93885a81ffcb3 WHIRLPOOL 809773ec4c238247feca08b99bf988eebdcdc9ef8c3aff6b9b80a035547d32cb27b96ee7ea970f3dabae88519bb4c21cc39002f99a5fe55ff88fee1cafc6755b
+MISC metadata.xml 356 SHA256 737c67ee6a44b79afc6e7c18921572a80d623313a57732d3bc8fc6f3533bfd71 SHA512 3452ea432c8187cf09b7ce3b70df1c951ae243c153300093583efc337d9f6c42c41082b34ff6a81c19337ef508c90cff4308d0da63a44f4976d11ff57779baca WHIRLPOOL ea63b7a89ae055b2dd032d8b843f477dfb107a0467968b5666129e9cb6153d6ead74e5d2b9f9cb3b34179a508f49aa41cdde29e71ef43c4d3a57a62f4cd44ccd
--- a/dev-python/html5-parser/html5-parser-0.4.4.ebuild
+++ b/dev-python/html5-parser/html5-parser-0.4.4.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast C based HTML 5 parsing for python"
+HOMEPAGE="https://github.com/kovidgoyal/html5-parser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2:=
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
--- a/dev-python/html5-parser/metadata.xml
+++ b/dev-python/html5-parser/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">html5-parser</remote-id>
+		<remote-id type="github">kovidgoyal/html5-parser</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@ -1,7 +1,9 @@
 DIST ipdb-0.10.1.tar.gz 8595 SHA256 bb2948e726dbfb2687f4a582088b3f170b2556ba8e54ae1231c783c97e99ec87 SHA512 81dcc80651f7aab54287c2b6b7a4d7af1afa6962382dbf0dfa4d436fa0002522bb3c87c82133fd2d9cbb83a4e471b611afb6f7e7c6bd6db8b0685d94d651bce2 WHIRLPOOL 3c11655ad445c0c4f985b110ecbcfe75cda84ceb2fb3aa7a4133467bae7171181a451a45c24f061f89bd41340618a4bef41e583a98160503228cd877dba760b8
 DIST ipdb-0.10.2.tar.gz 8827 SHA256 fffc45b615e46eb75becbd88a30c69c75e7164ecd0122f2c78579b4dfa41b8c9 SHA512 5bae921cf7eb8beefd26a0b3ed0969b3435d86bbff7289dd874d0a011c63c36c50683a2a15191c3d6f5ddc1d41d4ae812bbdd831c972cfbbc54258085765acbd WHIRLPOOL a0a19a56afcbe12c0910dd0b58e234b757717848b5b1f9bb6368c2620aa5e03833530959701816924fb86f90b64f6da1162c5d964f838f5b87255158ef5506a8
+DIST ipdb-0.10.3.tar.gz 9356 SHA256 9ea256b4280fbe12840fb9dfc3ce498c6c6de03352eca293e4400b0dfbed2b28 SHA512 5f704222ea4d6877bbf6a83cb528e0e975ceebd7ee0838cd7a01f167381b80c48d3c8fc06d13a718a08ec619bfe984fd258e86ce93dba571ebdec2539db543f3 WHIRLPOOL d627ca29f75a2779ff1923e88dd8b558948781e6df52b727df085fc2c6868ef481a2f77afc5d464c12339d464c79249ba806a17337ede214f9a4df3344ed41e6
 EBUILD ipdb-0.10.1.ebuild 651 SHA256 6ed3a36af4c605f356e3f357d9e6f96f2c722eb88221bb11e06556459d42042d SHA512 a32c3f0f1f5c332da3526f28c6a09798d30b04628ec937e914a48a5d695212c9d9a77d185db4dde7d3247af7ffe1029264f819e07774e3773f7543c04ba77bb4 WHIRLPOOL 9cf32df2f700c4615e3aebd1343cc6077fbf1bcc8c6b326f605f6b64fe01555928fd9d9d081919bf2a7162df38181f97dc48c90b1b92b6b97d350086df4725a9
 EBUILD ipdb-0.10.2.ebuild 673 SHA256 a093565589e9283a9c1194fa5473e7bdadde24ea7c8dff7eab41582ca79d3ea2 SHA512 b75d622cb243649d7657aa0beb918e73045d5f223b744c2faa79f37706db67b62e4822257efaf6181f57e41ff09a8657382d09c2c70fe9b7a31734ee9539de90 WHIRLPOOL f97f2e335bed2beedcadcfcb6bfc6c2376aa10539aa6d41a66450fe816b7b934ea781125cff261e2578df76dcedc9498c669c8b1b8cdff3856f6e40de49dd831
+EBUILD ipdb-0.10.3.ebuild 674 SHA256 57afdd11fa8c0b9cb72edeb2f11ec1d663605cc278b517237f1035bea248e211 SHA512 84ce629266f18cf3ce56098dac7f86ffff6d5732769d58d8346dfee3df5073371cea889978dea6c7a8040d477ed12a7e530001543140ed4d9042a92c9ae0d7b7 WHIRLPOOL 221f152556b105e0e908aa981ca3ef98b35b6e34f2b2ee27de8cb85d96aab27c7df7005f65013ac812cd6893f71729dfe31e40c55b1efc79128a1938488e1838
 MISC ChangeLog 3548 SHA256 4304de7e9252593b4bd71673909bafd77477666ecd8c8518e82307d02b3e32e6 SHA512 849f2bfed0f5f30ab6eb913df25845419182741b6647148c248e204c30f333583451d337b47fc502345b3f758602cfb54666e596b27c7180db189e67fe816034 WHIRLPOOL 6f5a7c7a1ecdde535ff0209a7159a3ae93a6147a9f8dd1fc95d301a9577a5707a03e2c754fcaa0a4d9156f0b021901630db55fcc815609929eb07b0965bc353a
 MISC ChangeLog-2015 2223 SHA256 17bed9d1f69aff52845a00336b5848ed9ee72cbd040c49215637d83cce32a1b2 SHA512 e1768b1fae0d854192fcc08b65d3bd218d6c8c339740091c6f5b8f900938afd21c9e3ccf66b14a48b2ca2e45f12bc7f1fa071a44c8efb97c152cb3aa17ca835b WHIRLPOOL fc3ca0a51ffc482a198adba8b394ed11dc11753bacd3e132fc3ef8ead85e87a08caa6e5b8bd20eee44814d7e6325806ec8b8530132f23486f9320456a2fbc33a
 MISC metadata.xml 307 SHA256 2ac7f841a64d98ddfd614c3f8565e0b385df43ef76e45615277ec2b59c66e228 SHA512 debb6af292a4b01925b248df604776ec21fafc3d3dca20373399a1481061392aa8e5313b07b586af6a9c2f429474d2b07fc1115e9c337c19fe0c38c489e774c9 WHIRLPOOL 2fe2ea88fb37b65fc745df23cfd64116440a5192a24d02e8b6916acb021aa9253b8cbb59d5cc54f4f89e1ec89fefc5b21cca6643e00c489e1a98f0cb4add573e
--- a/dev-python/ipdb/ipdb-0.10.3.ebuild
+++ b/dev-python/ipdb/ipdb-0.10.3.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="IPython-enabled pdb"
+HOMEPAGE="https://pypi.python.org/pypi/ipdb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' python2_7)
+	"
+
+DOCS=( HISTORY.txt )
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@ -5,6 +5,6 @@ EBUILD lit-3.9.0.ebuild 778 SHA256 d0350f0c473c5dbc586a547de40e6844abc0bb1e04ac7
 EBUILD lit-4.0.1.ebuild 746 SHA256 465dd81a9c08c27df9eeecbb60b9230cd7e17b2f18adbdf5c98852d77b708d02 SHA512 806d2a845240d2544c5550a9cf2f67846961b9cf70cd4e780ca4281ae88e000769e5b74e8cc40754ffe2615cc916fa9e1c4f254268e0a027876c8ddc96c4de76 WHIRLPOOL 370e50ff8976dc4d676a261cece8d56ee41072712419881e0d89d17a2b63efaa67622d56507f71ebcad9486a4d20b6b47e5c79a1c7b52cc90128036532d6c0f9
 EBUILD lit-5.0.0.ebuild 762 SHA256 fe797ddc5c2eb90c351f087a3f74678ad4bb7bf374b59d387250e47edaa62f45 SHA512 47e1442c6ec4005737145556d900fe0bb4e763c1042cc3014c7374b6dc9fd88b5ffacb50211f0a833de5b0dd7d2b869cb293d8da72405a4f827dfe59663c1fec WHIRLPOOL 2d071210031fbe086c031f8385242834ba68c6e2532c0f6358269265355f5970aa503133dbb5c9795617e9fb3ed6b2ce882924c9f0a3c705606de006f4f805bc
 EBUILD lit-5.0.9999.ebuild 782 SHA256 b9099610c0b9d57e497489bd91654ed44e86378595f2e2a1ad3b6a2e28886927 SHA512 e9657bdfc870359ff803e6dbd4670cadbd5f5bc474941b598aef3c96183a02da7d02a69afb46c2763674bc5193ebadfc4d5c3a8c026adec48fc4aecf0a0e079d WHIRLPOOL 509acd253b366646193bb7f8406ac009fb4a1253ca7d0fd6d3e2843a6dc5907c161b193ced31f23f61f976ee122a26d79b2407c44a8c030255baa06aeadf7815
-EBUILD lit-9999.ebuild 757 SHA256 d15e592064ab7bf06cd1e1c3548d8bbbb5f7a066131c4afbfb27b19ce6c04827 SHA512 d36fa6e873bf00bf99a153f9cab66849cab10a21a5b742c49d6971b00cda8df3839bd83de01b8cfc11dd2dee299acc4a8e6a784b0c067bf640dd696ad972afe8 WHIRLPOOL 43681975572427633ac0d36ef4689744844e828b1ee64f477053f8a4ddb23e589e5da4fc94b274e2f0e2aaea76690782d2a69442f7988cc64a2636ea88d235f6
+EBUILD lit-9999.ebuild 757 SHA256 92267bfb77662b054ce90d845348d49ddcad5706602a0d3043e5a6b70fc488e0 SHA512 3a4bdf72b99ec4de11874d8757ed75d3dfc0072dbcb441aff1f27c0c663a24e6e7063e0ed3a77a372ba177d3e7a0cccbc388361e8c46b52c66e08e8fca338460 WHIRLPOOL c9d48d9e499a16a21f38a18f59e0929e9629f5c499801772a6217055be4e18b46c6fdee8b0d68fd5bdc35b86e8f4bac6e419c2a8571e35ad7276daf202722cf8
 MISC ChangeLog 510 SHA256 e7c9cd6bc5b3a0aeac1970cbf158561915b48111102ac29e6d196bbe2d345b12 SHA512 868b7233b44e2b16b0b89d12ffdfe0961310af63c590433c1f763f5b8500c0a8c893c6d52b06ae9e63a7a11ead2db169906f6b035b55b713b37044dfcd3c8c76 WHIRLPOOL bfed991a7f04d70e20aac101573b890f5a3da80f2c54a7a8679ac9882c7b6f27ce188f0d1d72755f12fe76c919fb88f91f80843e59e319257af52ee4c358041e
 MISC metadata.xml 216 SHA256 e94ba81dd2791908508a3993afdebf723cc617314c53c273b9bcca15a9c48327 SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 WHIRLPOOL 29145f5721e079e0548c5ef22424c65e6a5b2bfc4428918e923fcfdfc37e9b8749fb63e3c2eb5773c17fab276f7513dd66e326b906f1848911dceba7ae4b419a
--- a/dev-python/lit/lit-9999.ebuild
+++ b/dev-python/lit/lit-9999.ebuild
@ -29,5 +29,5 @@ DEPEND="
 # TODO: move the manpage generation here (from sys-devel/llvm)

 python_test() {
-	./lit.py -sv tests || die
+	./lit.py -vv tests || die
 }
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@ -1,9 +1,11 @@
 DIST rpy2-2.6.2.tar.gz 171655 SHA256 2e28886b2a6a138cfc057f9b7cddade253e61c9abb43f0eae20dace58b6dfced SHA512 7a060ccc26a03dc93d75edb85d92f1ab31af96ba140932ff8e699cd5855e6078b1e0ffceed135d32deb6c8f273ebcc8b02be38e9b8fc66778cc2adab5745f542 WHIRLPOOL 26d9a9c13e4efa22a232507cfff0b13d650e0528f635dfa9fe464cde50462d2d94a668d1566b537bafaa5462eb66e96005296c6295308b1e3d1c5639da2879b6
 DIST rpy2-2.8.5.tar.gz 184190 SHA256 09c63bc934d666f4ec16e74caf52eb516e035557407a93591e8da694a1718ca6 SHA512 737649bea67f0cb2a73dfedfe6f342b52bd8e73840b0da6eb64c8a61d25665d74394df6070ed67ec7a59632798e12fce05225e5c1ec5de587f1ae40ce5074b99 WHIRLPOOL 2e6c449ca766ff73a20abff12ef6df5791a77d2ca3cf5e90862700370bddf20b9b4ded65c870ef84ab840bb282d66cffc10c078a4417a8e1074dfebc7d87c421
 DIST rpy2-2.8.6.tar.gz 191192 SHA256 004d13734a7b9a85cbc1e7a93ec87df741e28db1273ab5b0d9efaac04a9c5f98 SHA512 614fd404c2bcd51a503e05bd2ea51fe39ddf20b16088496e9d9f0017ccbd06707f26341243c33669ae4ddf5b37ed748546cab9d4d23b9c26fd39319d9831dcfe WHIRLPOOL ef160afafcec1db0c337ae53882586130f8e2d33c836633fe8fbeaf83202c525f1eb46b0ea944b2ef67446809c0cd1456f22bcce107e8157ef9de4a1daefcd8c
+DIST rpy2-2.9.0.tar.gz 193062 SHA256 d1e6c109093965f717293b6c3a8d22d9c172c3721b6a8360c84572dcb284112f SHA512 55be876fb7316a08f507f3a332ed29d71b52f733c1986482f141e694d66d0e01a51a9c3f0260f6fe0086d7bfbc1f58b678cda4570665e4f1ffdb120c793ef1b2 WHIRLPOOL 44610716904ec8e1f53b65b5a3ec1d9be3f492104c7b563867e4d1ea526148e8034c84441a8bc60957e41d662b6185ccd3477fa9baa77d7344fa5e0d5bbd3635
 EBUILD rpy-2.6.2.ebuild 1273 SHA256 4fa4bb5d3093624febfd6fee69f4e1bdc2f8583cb6137641ad125597921d6ab2 SHA512 bfe2bc4a599d48b8906cf971e471e09c59248a8969f82a0873a2468cff8875dc4778056ba7e6c8ca66b8ff42d76b23e98194307bea7a5300d6e9ff1e5932314a WHIRLPOOL e8be88d645bd53442d7eb87f5287505b7822de3e2471a8e2e87ba828953abe67b86ee46058ca1e1e906c1187d6adc7fddf4ae6cefe5b394acdb20f25633056e6
 EBUILD rpy-2.8.5.ebuild 1575 SHA256 3fa4500e6d17c628fc1fbabae093f538fabd0b678faadceed704b2cb0e6e1376 SHA512 5df98a99ec5598e938ee04c3fb751b7bc1377866de075f1254bd67ac3dbfc6cbf7c5335c71cd25f13bf97d91ce01a858d20e911835eddac310e093f2483417bc WHIRLPOOL 51c5959e65787f170d150c4a7e144bb0cfd64a659b91e3a0c76a74b0cfc7cde27dd14b603ce2d295f0e289f78c5f531e13a16bbd7c36db9c795cc7be5478b826
 EBUILD rpy-2.8.6.ebuild 1210 SHA256 2f13db7e160930120d98f9b092d08d02d2d6220c2e6a813fc356ee00d4f83d7e SHA512 6ac5507969b467fc9472a93a899bc273923a634a7c973f4a5c8f6d434fb1219d994b74e5cafb8bdf591a0d0f9da99e9eb90e1a80fda78e54570da733ddd229f8 WHIRLPOOL e1c44cbab416cd831605bce1a481f9e0889bd9721c6835c258e67a52dbde1e8d378bf26b431be1f5adbef8777168ccfdf441f2b2f16ac8e6973cbb866c43007c
+EBUILD rpy-2.9.0.ebuild 1200 SHA256 74ecd12e12527437745b2278964396f4592b0e8e3803f6a40a5791ec90a979ae SHA512 bf0c0f6a4f6b74a62c077e7423eaa4dc59ebeac673be3c8669c03dee08ddd28889c57e47a85e1bd37beca755d54fc1bfa869bb3848b383d34b876beba859aa09 WHIRLPOOL abda33b08f44a5dbadcd8b3b2d5ea68a3aca2fe396c1ca865633a4fabc0ff4109a36e0fa63b11824ed3d77d51b98ea514844a15b8a707b49ede4e0ad63449440
 MISC ChangeLog 5919 SHA256 c5ebc472bc6f1b501db13d587177f34106a3995e227a018d2fbaa4101622f1cf SHA512 54a286204a012dd8ac33ac7e805add23f116e7546038fa6c1e06ecdfe1c37cc0b0e8cb5685e1eba11a1b7e55533311e6d6f243d34eaed58c878e6ee40e69b11d WHIRLPOOL 1d1f5b4190092ef2b804b8af00ee2d23e5ac5cf23c3de731fd81dda00ce735a19e50ce9086860e76d6371d7351755ecc02d9a73b26aabd28e8f64333c9ef3412
 MISC ChangeLog-2015 13757 SHA256 1e85c2794dcd7ff5e38701e87047609508b0b30d8bdb95077ed89d427f0d21af SHA512 cda6e474e5b18745e021f3e6aa2318acae35d66b995ed3ef5b068f66f71cd0de765820147905f834f908d81ac9359b851c769fab752fab295d72e9dadd645e0a WHIRLPOOL 52f8f1bd2cb481a58af2daa76c204db55a219ccf695aa546bb85452a25fd74fe130b7351a781de1b2a475253cb64a46075b43045be609757ab88735313e5d49b
 MISC metadata.xml 700 SHA256 0027523e0654823f46a21711aa14da8aa528ae2e66e85efdb606b77df52cf536 SHA512 f70b91d3a53220b814460d8836d0d04500b0c9fa62395a8264d81a8d952ec8f2090d20cfa55cd60ccd2698a947b61c6284c036abc298a9c18a7807302c15d8af WHIRLPOOL bdc7bfccf1bdec4e819c6590684bada303e7641274ee5f3b2783cce71aee5d7b55f5ff8f783c08f11966503af1a034cc385c35685d58ef80872d30b57241a95a
--- a/dev-python/rpy/rpy-2.9.0.ebuild
+++ b/dev-python/rpy/rpy-2.9.0.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 flag-o-matic virtualx
+
+MYSLOT=2
+MY_PN=${PN}${MYSLOT}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="http://rpy2.bitbucket.io/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# ggplot2 is a test dep but not in portage
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-lang/R-3.2
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/R-3.2[X,png] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	virtx "${EPYTHON}" -m 'rpy2.tests' || die
+}
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@ -1,3 +1,5 @@
 DIST scandir-1.5.tar.gz 29351 SHA256 c2612d1a487d80fb4701b4a91ca1b8f8a695b1ae820570815e85e8c8b23f1283 SHA512 e6535e92011cc2c5f888ddd083a9dc48921609fd59d9bf9a4bcd596c055dc0510d48f6d3571605bbade3bd0e232e8bae94b44b20ba935e7ffdeec268ba3d2ee4 WHIRLPOOL 87808f7c76be95956a609ff1246fcd74103129883bad7300fbd5db7f743e9fcc93031d2d95d58cd36eb4bb6f5bcceadd5b77a4d2c2f3ce1d902073b9e55c4140
-EBUILD scandir-1.5.ebuild 547 SHA256 1061f5a801fc6ca9ab3ba01dd2c466a8b491cd1783b382b6d4f931c24e189a63 SHA512 cc758553369532297087e3cbdf700d66603dfa4aabc20efb91ba282cad3da88732f4f155c470fdcbaecc612d3f4e0d4459265838c8868e57a48acee14c255db9 WHIRLPOOL 0e6ca779e84da2e80a959cead856f88c40f623bc4b5ec1033e6a0aa36c81e9dd426d274d9ff7ac3018b8fe2a8cbf02ab511ad21ad3c91338a825bae555652d07
+DIST scandir-1.6.tar.gz 29670 SHA256 e0278a2d4bc6c0569aedbe66bf26c8ab5b2b08378b3289de49257f23ac624338 SHA512 d01e0551696787caded787a430eea787a69a27c725505277420fd607b3fcc892218377bb340651fd906bdeb3a57e99879df3c86aeadd2399fcbe45cb2118b9db WHIRLPOOL 1069eed1d89a56dcbf078c03d37a00e651e38d8692e7f55dbc350cadee94f4e93afb327515498bead20b54698143efe69d159bc222ed095140654c87dfe50f78
+EBUILD scandir-1.5.ebuild 545 SHA256 1d60b39a33dcd27f09afadcdb13d3ef25ac10e0e89a693cf1c72a127261079e6 SHA512 9900677ca6b68ce43222ba4b24eb50db03e012cc247d3f17326e73784e2de770ed079f51072aac89a342dd524009454d099122626d4694c4d7eca18a4fd67799 WHIRLPOOL c827e80632ffb78ae2552e711e60245e4f62a41bf11b150fdc33c5388098488348c8b2109ea52d002e180903eb9eef2c0b924c8e9080c1f0055cc3a9e36218fd
+EBUILD scandir-1.6.ebuild 547 SHA256 1061f5a801fc6ca9ab3ba01dd2c466a8b491cd1783b382b6d4f931c24e189a63 SHA512 cc758553369532297087e3cbdf700d66603dfa4aabc20efb91ba282cad3da88732f4f155c470fdcbaecc612d3f4e0d4459265838c8868e57a48acee14c255db9 WHIRLPOOL 0e6ca779e84da2e80a959cead856f88c40f623bc4b5ec1033e6a0aa36c81e9dd426d274d9ff7ac3018b8fe2a8cbf02ab511ad21ad3c91338a825bae555652d07
 MISC metadata.xml 495 SHA256 42a5686712a5f57b4f3572d572ece353d5baed8d8b85962c47084ceb24bbdda7 SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee WHIRLPOOL b4891db9b5bd0668add7316835aa38d764eb602aa3b3cda30d420bd5259ae7eda48d7b19f07261ee83956c50c5c1dd34891b43fe78e87fe963615e415b943e05
--- a/dev-python/scandir/scandir-1.5.ebuild
+++ b/dev-python/scandir/scandir-1.5.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/scandir/scandir-1.6.ebuild
+++ b/dev-python/scandir/scandir-1.6.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A better directory iterator and faster os.walk()"
+HOMEPAGE="https://github.com/benhoyt/scandir"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} test/run_tests.py -v || die "tests failed under ${EPYTHON}"
+}
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@ -2,8 +2,8 @@ AUX 1.10.0-no-setuptools.patch 545 SHA256 02d3be746002fff940528270efce49b6d51025
 AUX 1.9.0-mapping.patch 561 SHA256 0379b9cf39254db964f48ca52c6b721929ab17f2a0996f217db1fcfd01289070 SHA512 92d5bb1643264a04d5faf36bed16379e8844648a31739921bd97e2dd88e34a9b302c37a12a15a64aceb3d26c53f7cdbcbde2ce8d289a7a43f692af47bf05f58c WHIRLPOOL d9f919ac9057f416ce3c79b86eb8b33e07159a8297a2f1b6fb795861cbb744c4c8b6f50c6b7d4d41b4a96b009e4733534fa2ff54de995de1a959042e8c38206f
 DIST six-1.10.0.tar.gz 29630 SHA256 105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e WHIRLPOOL aad2fc7438b0df029bf477a783161dc169795c355be1281f1fe7aa4eb959eae5abf3bc96d097a221e0e5ad0b0494c29025bbe99bc28ff0c29ae1776e8691a70a
 DIST six-1.11.0.tar.gz 29860 SHA256 70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 SHA512 33f246a2e987141e17e5edad9d3537cf3aba0cbdd0bc2a907ea52ce0d674b1474f29c3dd5cc26605fd960396054b189ca5f501708333cad234c223131483fe24 WHIRLPOOL 08e33e1742d69558faa67fad1807b567595aa4c838bb643c993bcb88661246a0f14974ff89d1f9d25842212bfaeac0cb3a69272deacb8872b9ca3fb2f55570b9
-EBUILD six-1.10.0.ebuild 1825 SHA256 bceab1fc2822d4e3e99387b0f22b23a1d8f8bb035aa9ff7e6581ffcbc4f58424 SHA512 0309a29c59da1e8ab3233a07614667d3cb2c5302c5d3725896428133388ed9927e9f1f70d9f1b1bbbe4f2f168fe319e0c507cc06f86a792202bb90a9875f6ba5 WHIRLPOOL 0f0ee41001f31d3ba295d9529518522ce5c4c481c74a76ab42634ef30e82e7bac5813bab4a30ada09656288b0cd1cda72393caa19dd457a82eedf80ea26a77f1
-EBUILD six-1.11.0.ebuild 1097 SHA256 2c42e64893003f61c34255477ed2a0a3aad7d4383059fc1984d649961b0f5a94 SHA512 43e476250d19ea76f96e7c93d5fd14a64fc44a1ab34328f7d1bada52ebd772a5747df978be0e73f13961b4e8a894880f757837bf091eb92754d55d9bf6397f4f WHIRLPOOL 1b040b197cbe856a3a698fdeb36aec059cb1cd08b585f20378f495f8eef6e879a22a5405ba52bee7cf52db8cc248f3b60a21d54f63475026240b889b1b9f2b13
+EBUILD six-1.10.0.ebuild 1823 SHA256 e1b6c9d6b2fb0049ca606570cca61e264a454739fb1a0a437ef4d33f3a70ac72 SHA512 258b5e8d0d9221d916260a1c2053b90224109933d3c87054588c2253910fcfb177e4bc329da491987eb88d7d7ff85b13a0057127c285855c2b896ba9ed8b9f51 WHIRLPOOL a021d06f28d0df18cdee3bbb848c758574ae36d69c31f72e8375de5e7fa49bc9783f3f4ee589f511e9ee7b94344b64e14cbd8cda741fa2f56891d4842a6eb580
+EBUILD six-1.11.0.ebuild 1095 SHA256 a6aa44063bc7fdb29c3e930748695e03451d25dbb9048af4d48d2523529e2269 SHA512 87da6beb6dab97b5f20c6c84a69a7fc23a5f005958dd413ef299281db273691a6d97a3822619b12b5ca1bd47d36d0a9ba6ffa5c5c39703831709a660d61f16c5 WHIRLPOOL 7e8a261398432538d4accb316e34d0f69e582fcef50686076c003fd86abe06d95771f91dd6bd6932edd7bc260673627644e6a3b45b8b8dee5cb9333301ebc34b
 MISC ChangeLog 8947 SHA256 d3a119aace105921374185a467d3a742333228531a42764ed0a78bc62c821bd4 SHA512 cedc06f5593d8a2afdaf100e027ac1c14777fc0eee38e3a27d37a70f2130671c1f4c2315351863a5e37159282bf650466c94881ef37a1532ad98349c26747305 WHIRLPOOL 0e98fcef0240877282a14166874a4825f7575a63911bdf852e55863d129509a140f9fa3af33688678f32a690c8f7642fafed8603e783993a50af3d0037e8f376
 MISC ChangeLog-2015 8432 SHA256 f8702aa8815c9560e6ac791a0529133fba0550b856902065bc1c1050820f7a1b SHA512 b2795ad91e3be336a8af5b8199b22dfe9d3b8947578255f1dcb8f5a795574d852b7d7091e92eab7a6bf5e19f30a0c8e847c48ad4129d99f152e269b9a3360049 WHIRLPOOL 90ec283742f3afdf9b37e994931218fd0ebcaea89b8d018604598081257fb1209fcfa87ad9b642e1dcbefc57b49484d42090842893bb81354b8d95a76a3cf524
-MISC metadata.xml 373 SHA256 24d15670592163708c2d774b105edfb24662147fbb1b8032880207aaf17fff2c SHA512 13f285ac6a8c20fad92563e72f6b53b32411f2f0ab9ad9680e9fbc4f5720119a0a8acf6c701fc4b286fa10611bfcd0bdcb7c55731e192adbb917ef6556e06d01 WHIRLPOOL 26c68f4bd412f5159e298f456e905530c95cef6e200e02d01956bdf76a3e8972a5b9ab5dfacff6eb5898ca11b3c97191932b2eada8e53d8e3f398da08626db80
+MISC metadata.xml 371 SHA256 6ea4fc6d9ab2b7a3e2c8f9b3d71d0b8a572e71eaf12b715fe52deada60dcc0c5 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91 WHIRLPOOL 99972abe648415461046d57e7c70f3b7943b5632017ee4712dc959d1bf2e26a2a1f3ab23c1a4d13868efa6c15aaf153722c3c9b5674c339ab1506514b2b88a56
--- a/dev-python/six/metadata.xml
+++ b/dev-python/six/metadata.xml
@ -7,6 +7,6 @@
  </maintainer>
  <upstream>
    <remote-id type="pypi">six</remote-id>
-    <remote-id type="bitbucket">gutworth/six</remote-id>
+    <remote-id type="github">benjaminp/six</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1

 DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://bitbucket.org/gutworth/six https://pypi.python.org/pypi/six"
+HOMEPAGE="https://github.com/benjaminp/six https://pypi.python.org/pypi/six"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
--- a/dev-python/six/six-1.11.0.ebuild
+++ b/dev-python/six/six-1.11.0.ebuild
@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1

 DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://bitbucket.org/gutworth/six https://pypi.python.org/pypi/six"
+HOMEPAGE="https://github.com/benjaminp/six https://pypi.python.org/pypi/six"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
--- a/dev-python/sqlobject/Manifest
+++ b/dev-python/sqlobject/Manifest
@ -1,5 +1,7 @@
 DIST SQLObject-2.1.1.tar.gz 888532 SHA256 35675d9c6c5a373b68c1e597a51c2723e1a8471911f89b7ec9ab3cc380064874 SHA512 9f51452afb728b3eaa0b113aca7086af6cd858d3b6e84c557af56a086d9a04c7e061f1b45179d0c74ef6a175e593376e1ea3ce561a337d71df6eea0f7bd09fee WHIRLPOOL 0526d02b1815281724b1c5ad1fadf16a5dc3e765bb6c9e6b59db83e95a1f3bfa20134acad459e19583694739a38b3dece3bdc328ad7f57f09c95094759143a50
+DIST SQLObject-3.4.0.tar.gz 1269199 SHA256 cead8baf7642535ad68c1dce7bcba8ca4cc6e10913b82b35c5600a8d290d36f2 SHA512 f10e2b950d5e404aec57442acebae06e2a95adf386de57f73339f62fadd627965667b462055f12586cbfa9be485cc1ab46a21b8fa43da9d6696489d058421aca WHIRLPOOL 938a2a312b1c06903f8ab6ac3f89bac6464d4af625bc8f051ca99bf406291a4b84871f1dab0423f58f6769ba07550bea6194d99d68371e4ba816b0b42819260f
 EBUILD sqlobject-2.1.1-r1.ebuild 1065 SHA256 7dc3bd79dee7a67028640c5362ca0964eb39ccd053511f343f66443a6732ad87 SHA512 c167aee151c8b7c089f02aa7c499021d0ba16d3024e0d3725f422666a0a44ea6bb36412e22111fc47883b3ce81c8f459dd5c99f44388ce40347ecb471d354f87 WHIRLPOOL d69d369ffc8719714e718dfc841be8857e4640af5d6d13b31c9e1066ae6d6909b15c664b9959801ee604b43a148e4ec0f438c61f5b286613fd204dd54880b4b6
+EBUILD sqlobject-3.4.0.ebuild 1065 SHA256 2b6d1a1683f3ab645a13c4cb72aef2d1602dda55b056ea8097802da03b632c15 SHA512 2176e954d9f1fa4cb34e07302ad0ac50db543be57a269f6d98790934b7e1c9a60e4d80b59fb79140011cd77ff87b2552322f4fad2993f60b1bffba633a01a33c WHIRLPOOL fad8441509e09201a741881f994c6b864dcd02a119eb81ecb5c840ba3de9a89c798fa6340f5cfdb79f2c9920ec747169d7419b53a8310c551beb09c08b23e8f1
 MISC ChangeLog 2589 SHA256 0d97e56065138265c99213d27679b3dd403bbc844fd94974ff1d70a31f09d1d3 SHA512 5d69dbe8a7456c02b69eb1443618e1f9dafd8930b7bb1e7f9474bce63e1af0d4b52733e1b7fbdbce09c0daade2aa0a5bc4f83ed094c745a2280c079effe11d95 WHIRLPOOL 0bfe34af0add3ba6c20cf5e8c80cdd914140409acd1dd7af47cd1e69e7ed36f7908dae705fab72ae1ea3544db4b9a35702851ca65f38961d55d0dc20ffef914d
 MISC ChangeLog-2015 10305 SHA256 43cb8da7272b55877ffbdd8731135a52ec9f4bae4d189322112deb3adc8a4783 SHA512 1e0a5544bef8f97a57ee305bd0858726bc700dfe1601aeb8f446519ffdd5218e97a1664a5eafa064ef94d22bcbdf57434f2649345de7e2a83a13dcd496d3d8a9 WHIRLPOOL cc343822858a154b63faa4619c4c06fdc03840267ac8451410bd9be240ab268304260abbb8279061e3a12b2ee8639b22a03c9b899ce25f2f7b16ca7ca7e73b38
 MISC metadata.xml 820 SHA256 d435c1bdb05e269238c482c7284cb2cc68d12eb2f5c14b7d5d3a1cdb43daeb87 SHA512 7003895fa358feb4534bba81f634cd8eda7b3ddb94ab129da2b431ed0a44f0e7507fbf29059abe04908c217e8d342a7a035393e869b367b130a1405e41475601 WHIRLPOOL c9b8bd0ea922b550e695b0556b2e530d4329576694fd9e653e1b4adc7da099197c04803512d2f2a838617e2edba5cc13027df75ac7ef79606649e1a416a5ec04
--- a/dev-python/sqlobject/sqlobject-3.4.0.ebuild
+++ b/dev-python/sqlobject/sqlobject-3.4.0.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1
+
+MY_PN="SQLObject"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Object-Relational Manager, aka database wrapper"
+HOMEPAGE="http://sqlobject.org/ https://pypi.python.org/pypi/SQLObject"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc mysql postgres sqlite"
+
+RDEPEND="
+	>=dev-python/formencode-1.1.1[${PYTHON_USEDEP}]
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed -e '/..docs/d' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	if use doc; then
+		HTML_DOCS=( docs/html/. )
+		DOCS=( docs/europython/. )
+	fi
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@ -1,7 +1,9 @@
 DIST tox-2.7.0.tar.gz 120139 SHA256 9c3bdc06fe411d24015e8bbbab9d03dc5243a970154496aac13f9283682435f9 SHA512 96088a9f77e8b994d920a8c9907a0fa50d5e0fe918e5a67673d4c30810642be2872283810d1d8b5ae9cc311605236b64343248485c4d4067b54c7b6d9f31a4b4 WHIRLPOOL ed77717cfead6e98ff31fb773b31bcf55bb8c4892c281aae68d10459f4ffe0c386d5adc7e1dcaacfffe2a17e005231d1dc51f3ddb3900cb09547eba6ed444628
 DIST tox-2.8.1.tar.gz 125777 SHA256 de0abf4e8992c056bc22afff9d969e0cae2e39452a9650bdbcbe7154793537b7 SHA512 a230f7bc48f476825ca1a879e669288b311f266f1695bac4eecfcd44076731e5581a425e36555a0db54f8a0683af31abd77ab862aa40525387e6e436ba351c37 WHIRLPOOL 18f146f0b09e64fbc656fff9a8e098422cd8abd38ea6a09e29489c9cd3dfb3e6d4540922e5ea569d0dc3323c63f8f1c132fe75125f2e7ebb6d409ee086eee6e6
+DIST tox-2.9.1.tar.gz 1855982 SHA256 752f5ec561c6c08c5ecb167d3b20f4f4ffc158c0ab78855701a75f5cef05f4b8 SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066 WHIRLPOOL 3c82ba773ddb6fe7d72e0333d9175872e06ff4481752723bfd8720c485733295087ad8ccf3d8c6de79625fa410f4da34a82dd738bede7a0fad8811ef35505681
 EBUILD tox-2.7.0.ebuild 1241 SHA256 657694207d113803cebaeb5a07c9f21b34030e7f79b2c24d51871eb1e1ea0ce3 SHA512 58ccea388a480d5585bd3c82d9cd8bcd71933f5744fe271f9a97364d3f36fae3cd4fd0d3d77b42b9b444da2530d3cca127fb6b202f191251251f61f5bac78412 WHIRLPOOL bc4c575b2c89c87a12c12b5a26eaeccd66bb3cedb827dc388f7912e82e7cfa803aa77119783b7989a6f610c713693ce4383383a2d2e10791390d7c8e43ceb981
 EBUILD tox-2.8.1.ebuild 1291 SHA256 385b3d5fc226d9eda6ec97907eadaf161a89f2f7fa3de096b7b8c25afe1bb989 SHA512 09fa7910524b15c225995af3cd7541731de3c8f1bf038df591df6c3dbb1ff3c5c3e214ad4432559d87d64af1aafcfc2236a63df9370922f7729e25b651b049c5 WHIRLPOOL d62f63c1e62b5ae397594603774b74ff49527cd0161b4f8f70bc4e249c64e44aad545b82091762c89b12e4604bb2440d82b56a09efa9e853438d1f9fcd71f56c
+EBUILD tox-2.9.1.ebuild 1295 SHA256 87965419af82a289f972c46c1e9d8a18aa6e0c1f4e1e6777e8f40543c804025f SHA512 caaab65ecf5a786a6dbe5e99c3ef4855456eb726dcfbfefbb88fbc6f75645dec1f3b415eb19f93fcd343fac0ec96b601ba54b7cf6266b5f65bfb973bbf029594 WHIRLPOOL f96c54609b6a0ff4a5ab4ac4fb69e1987eff938d2e2ee47d1a45db2bb3304025bba3d2d4b6a81ad8c2a46d9a33229d6a0d57ae592287b63bc75f40026825f2d5
 MISC ChangeLog 3557 SHA256 9ba14b3f910bfbec716543f2b953d352998a5ffa1b861471216b356fb99f58e2 SHA512 0bc299692557dce5a8bc693a90edea1f60b2fba44ff9fb0eb7839558db8fd9c8028ad2132e5f2c14988a249a64b2bbb3cb1cb11bd07789d8e1baa1096ece90b2 WHIRLPOOL 56cd2505238b25f339ef9eedb2381106f4d751f25cae5159ab092216ec0caee55ed46fc8ffa26e27c54d9c7c6b639e3929a7b0e5a7100a464b309f65f6405772
 MISC ChangeLog-2015 3728 SHA256 65f67a42f86b059779c027f7f2a126ffc7df09b90eef30c8fb33e8d1c250e0ec SHA512 0495ee5612d1381ec4a3062e15322328beb9efe4d90ce3b769fd2171389b5e8f20aa6a745a67e2a72e0855c36d8840568ebee9c4c0dd74a418be7fc15f278b08 WHIRLPOOL 0848219920dd39b0ecd74ee5284980439a2b92513fe7d318b6680e21fc5cf634d12df8e9d4192386a38231475efcdac39df5d3362abee160a0e04588d536802c
 MISC metadata.xml 357 SHA256 14e7b094cd5c01229f88affc686b6e1575ee3b1f26af002788712cdc3a828bc5 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3 WHIRLPOOL 6accb01a71131b27431f6f7841e72a108e9321a77d5ecc02b051ab4bf0d2b02217022da03ce858d533d2b7b64bbcc76de9cab62d16e6bd28ffd7704cfd950960
--- a/dev-python/tox/tox-2.9.1.ebuild
+++ b/dev-python/tox/tox-2.9.1.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.python.org/pypi/tox"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc test"
+
+# tests need internet
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-1.11.2[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.17[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	>=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# remove intersphinx stuff
+	sed -i -e "s/'sphinx.ext.intersphinx',//" doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${S}"/doc/build/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py test || die "Testsuite failed under ${EPYTHON}"
+}
--- a/dev-python/twython/Manifest
+++ b/dev-python/twython/Manifest
@ -1,7 +1,9 @@
 DIST twython-3.2.0.tar.gz 33741 SHA256 ab0dec52286677e944ddc00eaf6a0eb89af48b1a6696324ea29351342d1c483f SHA512 809bc9fe3512b383b38e74929dadb4576bc9b51b0ce80ea444aadea44f95f2df0fc119bd0ea1982337e654bd5d92abb78671f20fe3b56e647f6caca00ec3791f WHIRLPOOL 5104295c2610ab76408047875aff2c7cfd49643344804676d7b04eb2e1727b2bfe4d70821505c7f7106744f6fb141adca7f78c19d6d209f3c54a220932a9ada5
 DIST twython-3.3.0.tar.gz 34164 SHA256 afe23e8a718500eb49d2e42375b2c251b58bf13a6f572d9e586fbeaeda18cf37 SHA512 888f37c37f39c603b08605d2e209afc329e079c405adbe3a03fde4dab2b76b07d2badf1956d255d4b7ff0bf2a4c308b20f2a3333a7ccd0e7b9c046e9172b1d5f WHIRLPOOL b1a3a4867bc82a3395e04c6a3a219e7482d585e5139fb5d25fd9eabfec9cc1c8d045d3f984fdb8aefb8d0252e946411bc6f03f196b0f61a682e78ca923f69697
+DIST twython-3.6.0.tar.gz 36268 SHA256 488908e38aeb843f2565e1e5c54378a6104beab3b1e12718bd69c0e44fa3c1c9 SHA512 b99ecb244598a489578e63cec8a470daca7efe019f6a5277a0fda70b3c61ba25b56688b0a383337ed1c46576e551c244da82cd808710c4b9bb8ba91c6bc29be1 WHIRLPOOL 72356c73cd081eef9ec6edaa340d1e8114ae30a78bebef7ee446a7f8e363b0f2cf1d7e92ffd182342c5bab4e2806e592866e988c0da2b71aa72c9c1ed40d7036
 EBUILD twython-3.2.0.ebuild 521 SHA256 0bf98c13a7a533d2f6d3949a947d24495c990bd3cf57445601768977fb1413df SHA512 ff8bdab532f3894111ed8c2b3badc034a819d3258e157603e30db8d659daca3c8a16584b5d05ed1b748c28a60b632446026f81f3ac76b6180e30482de8b2cd5b WHIRLPOOL 6541d6a04bbc6d17a6b05b60f8da876c8bdae30c46a1393e2cc8d1f363884436a67eb62e16b1e76cc0694e156f99b3ff871be5755dbbdbecfeaeefa647cc6bba
 EBUILD twython-3.3.0.ebuild 529 SHA256 681204c05e2d8eb565b30b39afffc5ab85497fd9acb2cb65a8388620c9491f00 SHA512 92dad9a9488ffa1429ecff35995c6c0ad7663f33553808a20fde698854c0b726a76c0029a2f2e8f6cd2398aaa1b3ff498d2069bed1cab82fc45f17ae995ae513 WHIRLPOOL 3feaf7557469ffad73cfd241d2f367926242b240f1fed1af0a8a73035f3cf02eef8e8b1cdf5260d81aac7c5bb7c545b75e38f8c0103ccfcf07b6561adaa6f17d
+EBUILD twython-3.6.0.ebuild 531 SHA256 f51a3c0483d2c4b57d594c5ea67d3b38b6a9c4ec7aa619a6ac67c0a6662f2c11 SHA512 362f7df075d4b5505c2060d558f14c5b2736ef095b0b53593e92471855af0af74a61c4d3613481f4a2fc56de4dd7872465b4d405ae60c9e7d50d4e7bd823393f WHIRLPOOL 5feb098c868c5876d0e6d59daddb7dbc8af9b77ee28e7c704887993bcdf06b72aabc10aa785ac5aa8a092f77c0567656ce63ecbbbf7e1e1c8a56638113c8407e
 MISC ChangeLog 2707 SHA256 cd10604436bb81d1fc0bcf47bfb591f8efdc7dfb474d00b8389c36efad4b6c6d SHA512 5ed0815dc1b01cb8b79ccb11dc4de331a022352fa4a67c214415d4b4b55af28c34f9e34a3d2d82055b6aaa48e224b19d7b1de25edb979fddb40b4abbc6f9c56e WHIRLPOOL e90df3bff06e73e0bfa6fc2046a3837424e308386ccfc95cf752b7d71169369ce74135354dbe1fdf8ebf4cbeed38b3d7d76b783b56f548efc2e3a743ec75c63e
 MISC ChangeLog-2015 1298 SHA256 873dc586280932eb4727178f281041af8d8d459327d0efb6f962a192acb1cf07 SHA512 5483b71e2344c36e19c7a05eac0a7525769bf4c058f127c05990dbb08ad14c3e16bd601854f8f3594b9faa5361f50ab9360a241f0fa4d3bc047235917b22a58f WHIRLPOOL 8a69cea6315e541854c2b602b571b5cb899631784618f67d1426940f8eddb14cbd835436462b2e7a4f7de6ecbabbccbb28fbecd8e35ef3134babddf286ee15fd
 MISC metadata.xml 494 SHA256 144894ec5e00278f80810460101ec5bd537845644f1f925582433058d290eeeb SHA512 4989871cd8997d2376cf0b8e8c29f4498688592874f584a306a2a8c5eb363e9fb3580efe3b609382a5e20b866f2734da668a9aa97d1ff73dd26eaf820e910844 WHIRLPOOL d88b900d6f54292cafb958543f25691c33d525858300b0f554e41dfa9abea48c35bb2d4e882fa847a94ee0a42b110029a4867cead98d1ee20bbf58da83e760fb
--- a/dev-python/twython/twython-3.6.0.ebuild
+++ b/dev-python/twython/twython-3.6.0.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="An easy (and up to date) way to access Twitter data with Python"
+HOMEPAGE="https://github.com/ryanmcgrath/twython"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]"
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@ -1,6 +1,8 @@
 AUX checkbashisms-2.15.9-command-vV.patch 1269 SHA256 bf03b1ea1966891657086566b1d136b34dc5faf49c5473c8818246dda52decf1 SHA512 7b7966b2c5fc672b0a83f7949076af536a56e910853374b2ee876ad5032f847bd87c7d10c7836d9699e2a4412709b02f5769685acd392e94704549de639ea995 WHIRLPOOL 3fd2df99d1d54483ac38042bee29eb8e752e00f8560a97c0af175c712afb1b07f08d8c4e88f09b2f7f5304f0999ecd75714d79259f40833ca0b71bd49979c165
+DIST devscripts_2.17.10.tar.xz 706396 SHA256 fc28882f4e6f6a0a74119b811df308dac758e1a097f947398ae895e574043aff SHA512 eb2bcd29237696e0e768d2513fa895891cb2b368c41c6d611ad7db815400b22317324b8326d4e71b1ab511a8a7abafdf0a2f2641da955034ae58b3d4aad3fc77 WHIRLPOOL 4494b2926f8f328113aa73c18fc3550721a7ac69a19cc986ea0dc69e9918c93e55eb387a8d3427126ac6f390973729c5f764dde8a632599d0e86f5afd1449cea
 DIST devscripts_2.17.8.tar.xz 696424 SHA256 7e39e296891d2d158b717c0c834cc0c5ab560e5c7d88910e42bf59cda10fbeea SHA512 1495a754346ec3903cb91d9d937b74a1d6a928a84028d19016b7a2d0df5c0f665aba7c777952ae57f5f8b421b696cf631c7a139ea68a98f31030c83b6e67d349 WHIRLPOOL d146b5e3317278b21c49c34af29877e0bb8f463c6bca9ec037953d0da9b53c8aea863d27691fe95667ebedc2d7b1d209d2593b51083537f9c0d8956a34b45855
 DIST devscripts_2.17.9.tar.xz 696500 SHA256 0ef164a9b8e774e8aef7a532302e7ce60ba10a72e56da485865222e68033b73b SHA512 00bc2fea2aa2f5806f6ecedee96c09c0ff31d99283e7b242f85c04a63310ada692df2bbef0cfde73dbcf3ac455026a5262b298fb2348528f2a9d7ce7916d97dd WHIRLPOOL 867d946c6d598ccb67e2e19a872c033d9c22b7b270cf2eadbc81da0d1d4a42d444cc705bff69b6b2e35006d72f6131ee101e34ced34faa8e89da7f950aca5c81
+EBUILD checkbashisms-2.17.10.ebuild 895 SHA256 cf558792f3362633fcb0e51241bdb0a91748ef7a1894b4f2aa864c82749701e9 SHA512 6ae231efbf1bae391b85ca23bf231c66205bd4349014ececb8d22691882d6dc6593787745a79eb686238df10f4921daa41b65b7fc3438cfbd975f0a39ee0f986 WHIRLPOOL d159ad159c7e040ccb3ac01a4e4b02a691bb6de415b6adb2fd6b55dc8f147809ecc1fc5b9a936200dd1c2bf4ec51e8775ffca14f6daee743af59c6bf777c52fa
 EBUILD checkbashisms-2.17.8.ebuild 927 SHA256 5881e71fd78de2e1203332f156cbfe70d3a5fb77728316ed5928c8837809bdaa SHA512 95bf44f663113e19b4f7643cc60c744d736cc02e5de900bdd039682fb9a3595f83595dc3ded1951b148b7387e62cd1377a5fcdacefe2b091032a40820133dcff WHIRLPOOL cf9e63b18391ea296d159b3d518c00b91e8a77859ca219f3bfa71efce5d4db260ea585a550d0dd39afe57d06db43412eb23c5f5263bf73b8e04c4e1100ec024f
 EBUILD checkbashisms-2.17.9.ebuild 895 SHA256 cf558792f3362633fcb0e51241bdb0a91748ef7a1894b4f2aa864c82749701e9 SHA512 6ae231efbf1bae391b85ca23bf231c66205bd4349014ececb8d22691882d6dc6593787745a79eb686238df10f4921daa41b65b7fc3438cfbd975f0a39ee0f986 WHIRLPOOL d159ad159c7e040ccb3ac01a4e4b02a691bb6de415b6adb2fd6b55dc8f147809ecc1fc5b9a936200dd1c2bf4ec51e8775ffca14f6daee743af59c6bf777c52fa
 MISC ChangeLog 6794 SHA256 bf844e52ac18703bbee587bd93ae53752e0b6d6929e57bcdecfa11c355bd0808 SHA512 ce65d2a8180155213e7524e1cf118e7488e1c6883f98444d8475327eaf0226a71e2889af26f56e89143260468cc9532a30d6936958bdeb373223f2e306c26261 WHIRLPOOL 01399247c2427a9305079d12ebf7301f3848136afc18b13697e43ab84cc727642f030862244152c712c96e96428330378de8c8f8ffa709a6476cc01321919fdd
--- a/dev-util/checkbashisms/checkbashisms-2.17.10.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.17.10.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long
+	!<dev-util/rpmdevtools-8.3-r1"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+	default
+
+	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
+
+	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
--- a/dev-util/icemon/Manifest
+++ b/dev-util/icemon/Manifest
@ -1,5 +1,7 @@
 DIST icemon-20140102.tar.xz 69212 SHA256 6af68804b554dd55fcd89aae8e4032a70df653dc24cb81aa5a8557c7733cdb34 SHA512 96ffa914fb02f4dfefe489b4a55d62db736d71e0df0e613f7d0135b477449e687919001711661f4892fde6cc0d58267ecfd09dad95a4fff84c4381aba705845e WHIRLPOOL bc5f35dd920a59a69849d1bdf5fd9c6e45ea86f6bd66c3abb050276feba984b3c385afc18a4ce08b58068742af867450ebc4a6e97b9af8d569a2361119012336
+DIST icemon-3.1.0.tar.gz 111139 SHA256 8500501d3f4968d52a1f4663491e26d861e006f843609351ec1172c983ad4464 SHA512 43b5c959cd66fa65cac25994e5b8f26646b49b57405bd80d6ddb12cc7ed5bfeb5f91f5816900883078075685c25159f5a19b3198594027b3a1b8b0c489237b39 WHIRLPOOL f796343ece42fa5c505bd39902d6198177bc4e61c0a888b6dc17cdcb426ce14ec48f3902a23e18f7c64c702eec40cbef990bf3b7dbbd8e38bb42cf04767d9037
 EBUILD icemon-20140102.ebuild 454 SHA256 76ce6313c6a7a204f3178536a3f5c3916b2d063953555d4c16b9dfd0324640df SHA512 5cdea935baa166f77c21948db0d736c3575ddab37f80f8366f18a63739b7a331587439968c34e77ddaab060deee171a195c2ce1f3f6e03d823822d9b6eb68146 WHIRLPOOL 0c99c68852ffb0691d98017c2c6b92a1f17d3622fc362ca499a74191f7cb009bb14e0fcd6e4d7c66ea1f116b76c881c000c8f0ef9189f06fc8f5166456460969
+EBUILD icemon-3.1.0.ebuild 683 SHA256 f05d91cd7e028a238e7477f9fac92e4e5e654295989f273f76a15b625a0572dd SHA512 dd6c787bf92df7fb1028478882e2c3ca6603fae7dbce35bd3a952122e155607f1928f106b88c4d4398df2432b91df664086b01c56aabc8013aebab79d1f0d934 WHIRLPOOL 4418de9ff0f16f1f2c478bcbe83a6be9b348a1808dd7e63cded9ddf9cb5af056b016816c4863f5a32a6d85f5ab42e4bb0044d6b8ced28275fdcd698f7cf9fcfc
 MISC ChangeLog 2430 SHA256 ec47110aa42f5f20fee6ad2a4a5e44f706869ce02dfe1c984884cbd59430bee5 SHA512 a254bde9147b64a8fccf8b830d528969b72734b65a85fbd7be88467197f39acf66bdb9b41a350475faecb3541010a1ecab05eb12885a3826702049f880cca800 WHIRLPOOL 47d9b0687280bec7cab2efdbb86cebd616909ae538edc25fa6dceb62f4e87cfbf64cb47ba4418362fafd68a291c6cff967c8b6c404c4507d231829f0ac65d129
 MISC ChangeLog-2015 755 SHA256 cdd38a839a444d13b62842c205768404f0b072a4743912f95b50333214deff8e SHA512 03ce2bfe54add0b8e30c1976272122a01847350af712cc0881e5496e6a631f0218e0215c0a6db3798db2e82501ba69a71ab2a5b82beb2a77a8f2659d90e83355 WHIRLPOOL 6447b06051537980a7992e6c5937d04a13f9e7d539973817f9b4973776034f05d913835178679b59e6bada1188513f4cb3b5122d2000a9ba29d7e5a9b24343b1
 MISC metadata.xml 346 SHA256 ae39777c2b553e55c845506b1449f8c05e3733e2f1ca3822df2c891d13daa184 SHA512 a5ddba80d3f325a9ad2855b0cea1af495e8e0e8b6aba731bb8765f7b3c54bd49dd5130d6860c620f56fa00b736c6298b5392db0f30d589edd807207eaafe0e7a WHIRLPOOL 62eff634c0da01c61e534d9d08de2ce6da14d0a9d212400844862dd0b9c984d6eb9daed313ad57c4978fa52177cf6a9b1e6a80d93ecc2fea6321890a2b8e0d11
--- a/dev-util/icemon/icemon-3.1.0.ebuild
+++ b/dev-util/icemon/icemon-3.1.0.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Monitor program for use with Icecream compile clusters based on KDE Frameworks"
+HOMEPAGE="https://en.opensuse.org/Icecream https://github.com/icecc/icemon"
+SRC_URI="https://github.com/icecc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	sys-devel/icecream
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=OFF
+	)
+	cmake-utils_src_configure
+}
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@ -7,6 +7,6 @@ DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d6
 EBUILD lldb-4.0.1.ebuild 3061 SHA256 2b5344d52b42017c07f98399302b4f9cb0283737baa273e905e0c980976c051c SHA512 d88dc965435cddf490e5fb7ba36ecb43cdc3c4ecf5865d531f3141f40226bba0cc63ff604d62e8e1d436da2c48c4f5a435e0561f265b0e2961423770e9edc43a WHIRLPOOL 8b71979e005adbdd507c4adef7f5fab0555a3726178c7197dd635bc265b29f011c50eb03edae04a04f7387aa62bc317a6975cde5baeb42aa79e07e88e38c3f65
 EBUILD lldb-5.0.0.ebuild 2811 SHA256 84ebaf8be3ca7cfb2538ea2aa360d099c6dd665a43fe2bee3d193c0070abb253 SHA512 e4b38ef25db0a8b764bc7b1540190024557ddafcae6613d3c55fb98b67ca72a922b5224b8f65144050cc3055418bbde6769ae30bd90cb5d30083c018e1fee8f4 WHIRLPOOL 3f70c4841d689de7861a6eae5a4b01b999e9a67311741f989462334805d8991110539f4d39a4988a5d6b8008f77e92d60b7200e372aa80df096f0221f995a117
 EBUILD lldb-5.0.9999.ebuild 2979 SHA256 65d38020b4bdc857d948160870a708d8a052c0d9c236765f6e6d7b6fc28e104b SHA512 46a0d9d7cc2d495037134f0ba7fd3538c974d9d1ba01290f893d2dddec4ab92905fb05c070a9b475f0a6d28c8fb132172784918ff03eccc0b2472573df05fbcd WHIRLPOOL c0948a0c48049a4e8e68305bcd13e650df058291e3bfd62f643f2401a2425bb98a9263a8f76c0012dc23b13255c8f3359ee78d484936c675401abc9d37cb72dc
-EBUILD lldb-9999.ebuild 2930 SHA256 8701813544da1cfcbc6474d23fba02352090f0feaca29f1953f80d082ff72f81 SHA512 aabf03640923107cf51379a402a97b00a55d7f108169466b725462d178452bb1d737283f85ed32bc570850565a86e13615ed3687a123dceb5b82eb74aea04246 WHIRLPOOL e51feeb84211f01c8a52e0f73c39e18913ce3600cf8c9f7b1b2d49786f3eb58c4dd311496a44fad244c9231e617ee84926de8a39793eb6487751af16a9d24edb
+EBUILD lldb-9999.ebuild 2960 SHA256 a93f53f6edef42d3e11e40fba7633116c99a0566030e4d25c0c2ecf31b89a2ff SHA512 9b0d27b2508d5814ac7643bf17bccba07ce3fbdddf1708e96971116b2640d6fe84642ff6356acb5f1245cbb614e93ab888c106dc063efc42a3eb87ce5d98ed9a WHIRLPOOL dc1fa2b7ef45c0fb8e7234a7c2edba0091c882ded2783d5da8abbe0a7512e3149e6b9cf489ffb172e23286df92c1ab4fb8f71b215ffeab57166b960bba508796
 MISC ChangeLog 896 SHA256 45fa8891008f733b1dc64963fcc074d79d910d3fa0247a5363c27a5629c28657 SHA512 0b80df074c10b4b65da01b02444386ebdd8f495605de7adc0ef57e8c40eb8c59b888d3d3b85bbc49d351715062b04e1d55ee304b3572592fef62c262546ed092 WHIRLPOOL 6c45ed0905574bb8ad09f56c073d35c1909f542704f6fced3a068e25e7ca00316d4659d5ed36d6a84b812a2a249c7cb9b5ff4764cc10eb9581690406dab761d5
 MISC metadata.xml 216 SHA256 e94ba81dd2791908508a3993afdebf723cc617314c53c273b9bcca15a9c48327 SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 WHIRLPOOL 29145f5721e079e0548c5ef22424c65e6a5b2bfc4428918e923fcfdfc37e9b8749fb63e3c2eb5773c17fab276f7513dd66e326b906f1848911dceba7ae4b419a
--- a/dev-util/lldb/lldb-9999.ebuild
+++ b/dev-util/lldb/lldb-9999.ebuild
@ -87,7 +87,8 @@ src_configure() {
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv"
 	)

 	cmake-utils_src_configure
--- a/dev-util/makepp/Manifest
+++ b/dev-util/makepp/Manifest
@ -7,6 +7,7 @@ DIST makepp-1.40.1a.tar.gz 278170 SHA256 eb9991e9c726836e9b214377976dc15f66f4f60
 DIST makepp-1.50-110621.txz 496296 SHA256 70d6af24020bcdc1ad4607817163e18c952792a39f67674ee60562545c940330 SHA512 fca88aa5abad01f02edd59060cafd0f0e1ecd4335c2af556e04890d07f48bc07027e9fe533ad2c0d125b35b2da90a775d09b6401fce22e539df4843fc7704966 WHIRLPOOL b55572e05b3152552fb9fbd2b5c80cde82d3006024e8763d1b7eba3873f5108a606bfa3dc420b36bafe8b1bd72f7424e226130fd6df9019637738c6a0a625fd9
 DIST makepp-2.0.98.4.txz 528092 SHA256 e37f6d4374c64f0ebe2146af044514ab531ad0dea5701b31ca059a337e935f68 SHA512 c04e67f62155ce398c1fccba350354b163367ef5a6db961277433a7c733a71512a48cf3427d02a7b6874ab33047f6b7082105ed78b8397dc430c9d6a34ad9d38 WHIRLPOOL f75be059e04aa139f2ebe47acb8f64815b6f0e95c3ade0a24d00bfb437962292eb2e264f774a4f4d3eee65aa836f7a129d97eeaf99a4439b0d1ddde42cb2171e
 DIST makepp-2.0.98.5.txz 529556 SHA256 ae62717cf37da1788b46fa7c90511e399a6e545798d8c12531d33b2be0ac62bb SHA512 f4ad5ab3800148fc4527558374be765e0b7ac731220192c1105e9c688c5961b8d5dd42ed2177db2aadc879b2c66e4bde14428eaf3055a6ba52163d908c576b5a WHIRLPOOL debdd1d25d1ab4822b38cda3a72bad1975fb759c6526332cea65b6dedc4644554662667562024949bc3ed725f03990cb647aa487a1c083e98d9411e0e4aff719
+DIST makepp-2.0.99.1.txz 532784 SHA256 6217553ebbe208b6e450affd77e6c82c0c928ab30f617d489ebbfa9cfd3b6d86 SHA512 457d64a2e9d2860dc2f7ad1bd4ef7df9fcd1563878dcd7b63e6f1d3fd6c03cdb89aab68faa018b3ef6b3009733a365fadbb49ad6c8a03ffe6eafcf867b765213 WHIRLPOOL 71b2e1037e5ca05976c766669b221234b4d21b3e8b8e43de311d56cb1a908ceeed5c7a5d4d31ed59638c5973d446e8d19506eb3d2fb9ca4db16a745c4f61692c
 DIST makepp-2.0.txz 534708 SHA256 0c617b1c23b537070d43ace2501ac1b30503b126a729206a7853933485d2bc78 SHA512 b8327fe475cb323352c6b89f1dc5e4a3fbbc71ee8b53777340449f610e3276465680ba3bc3bba905bb00754ca52ca56b82b9b1184db7bf7b272a47822b86aa49 WHIRLPOOL 79c69783a64c3f42184f5d72b19374251e8e88eab2e08c73e8442908eafac4cc7f3a8a64a36bf45c68d1a5d9b5eeab08b799e26a85a14f4bbfe320fd34a77ee4
 EBUILD makepp-1.18.ebuild 907 SHA256 1919841113ca4d8bf92fbb85c0a14c217454c9a0dbf8a27ceb32da1edbf8b542 SHA512 cf12ad152a900eaf3178879b18cc49c50d9f55edba7e873671355093af969678e30217f879357ae61d7a8625ded0f0c82214720e34873a034eefe65cd325de9f WHIRLPOOL 3fd128f10296c1cef133dabe090093cff51604e60b0a6cf96a36f55a1beacd325e356fd28342bd2a96d92e62b0fdcd61346cff689369c982f89cdd3110830106
 EBUILD makepp-1.40.1a.ebuild 864 SHA256 8ffb7b4ef6a96accf3e1594314635346ba8d5af739f789e31ecfd23a86723d0e SHA512 c9ddb8a99a226651bcf6fda665c6e92caa2fa0ca7264e4f9fb98bd1aa0d40cb54420d10c906dd220507a6a608b8736d63f8248cdf09433c963b8ae4d2e69b030 WHIRLPOOL 61889651f665182517077712ec91451a4f33a67b2b13f59c7badf723bd597677a5f8148829da4a1db0df6e9b529712cdd5ef14dd3a2f68977079958baa71a5c1
@ -15,6 +16,7 @@ EBUILD makepp-2.0-r1.ebuild 1101 SHA256 0da8d1715f6b715d808c6a1d01931dbdbdc58efc
 EBUILD makepp-2.0.98.4.ebuild 1049 SHA256 9d2f76f212a8de2472e2cc8787b095b31c2bfe9a28256de7d6623ab19c84f183 SHA512 872e6613230136f8fa8807720af8054086481f70fdc461fb08278adeb90f539e89f84a3b3cb3b7d08244f30153de5526b54db8406e15a1391e0e63f87c4dd49c WHIRLPOOL 235b8e1bef6a75680dbbccde19e5c399b4e37eec46ade74824c8e89a1130830eace860a04f44f51db7bae7c6deb5b2827dc67df33f65da77e1ea5d66e7cda403
 EBUILD makepp-2.0.98.5-r1.ebuild 1003 SHA256 f5e427b0e883e730dfa6d4c9be329155262e98d6149e2c76d0ce545d8f62051d SHA512 8541e1a75f5c8867bb9e5320090496d6f2b4b59fce8745aa689657c98f3bc782487ad3b48e2e6a29d0784c718c921cfff879ffe8fb64ec8cc4e96138d9d5214f WHIRLPOOL 4650e9cbd0fde1b8717228534bb4409510bf21a5c1277c63e7ffb2a29556accef57e7498fb20dcfd54b4a6c7306f068e60868f0351d2fb07dd9b5b40dc596336
 EBUILD makepp-2.0.98.5.ebuild 1049 SHA256 9d2f76f212a8de2472e2cc8787b095b31c2bfe9a28256de7d6623ab19c84f183 SHA512 872e6613230136f8fa8807720af8054086481f70fdc461fb08278adeb90f539e89f84a3b3cb3b7d08244f30153de5526b54db8406e15a1391e0e63f87c4dd49c WHIRLPOOL 235b8e1bef6a75680dbbccde19e5c399b4e37eec46ade74824c8e89a1130830eace860a04f44f51db7bae7c6deb5b2827dc67df33f65da77e1ea5d66e7cda403
+EBUILD makepp-2.0.99.1.ebuild 957 SHA256 580b4ee08d6de5b3de80e538a3bc4b50a33bbde8df2fc9e169b0f675032d4bca SHA512 2172c34461777f3ecde95e01e6dbd53a9d20fd41eeb1bb1f3bed86f6fd08762e595a203c3158917d55acca04177eaf089ecfbb967f28bc14c43c00b95baeda62 WHIRLPOOL e3973409fb8287719f54b4c5ab15de9ba9c67d0b2919c6abf8352a131d27986a2ade10ed6b1be33dafcab425fc61bae07bb5c8a951d835a9b4414513df290160
 MISC ChangeLog 2820 SHA256 41ea096c059ebea5235d83bb734126fab56f48e9d468ac825940631692c6927b SHA512 8fd98c90ab0d282c09de918f8a153ca21359f23cccea630751f1abef86d21d7f26d3d3c99d8f461cb487ef31c06a7b46c3523bed5a61318a4aa7838136ef806a WHIRLPOOL e3a6749ebe068422fd3033f65b4b36b17a24217b3d373eac3498ad45c96ca4b2e6b85af7a90ab20c12c1362230ff41ac2806211c5c4a62d6417281359a620dcf
 MISC ChangeLog-2015 1916 SHA256 0745afb4b7bab8a18a5861d4848c250bc074a54241718d9fe64a62534758de6a SHA512 ac7f15be9e5e5a9feb876d7edc6ee59d380840785be55d9ce2bce9343e8c96c389c7ed09db36bf3fccc1a1eba45e6e7febf693f7c57259568b3ee983f1828e5e WHIRLPOOL eaf41d90a0eb13df0ce40ad34c035b84a317ca51ffdcb02191d33a6186912bacd56525f6be5ee6ea85b5bd7e43d1c8e683edcb0191c6624582db9a610ec3ea72
 MISC metadata.xml 333 SHA256 b1b33c0a5c1941458064572b6f41827ac68747361bae4a1e30ddff47f9b54ceb SHA512 a4d44741093e730e73c16da4aef90a745a8f4a3e3f844e0b68e168788d934126faf29d598a17dc1c185a97d8a9611525e7ae0f1bab17ed20e25aa7f0e466ea41 WHIRLPOOL 0cc21d4823eb2c9d2b79ad621be0024b9bf79f37b05eb909db450adb7fffe8d3251986a4f0d8e6ad8368e2e02646887106db7b55386f9a28a59cb8da35923336
--- a/dev-util/makepp/makepp-2.0.99.1.ebuild
+++ b/dev-util/makepp/makepp-2.0.99.1.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="GNU make replacement"
+HOMEPAGE="http://makepp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl:="
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# default "all" rule is to run tests :x
+	sed -i '/^all:/s:test::' config.pl || die
+	default
+}
+
+src_configure() {
+	# not an autoconf configure script
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--datadir="${EPREFIX}"/usr/share/makepp \
+		|| die "configure failed"
+}
+
+src_test() {
+	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
+	export CCACHE_UNIFY=1
+	ROOT= default
+}
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@ -11,37 +11,20 @@ AUX git-daemon.confd 710 SHA256 4703ba2372c661fb674a29fea7f64983f8b1b3136d971663
 AUX git-daemon.socket 116 SHA256 66a064b67e441306bf765d3d3115ac55bafa2098400af134f852d4aecf8608d7 SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701 WHIRLPOOL 1098e46b6d2be3c8d758a087408aed91e0c01625542dfc90fbff80ed8b40d2a54ea4ab45b4d003ef0b0b8ed1411e1146a58076b68096389412a61fe2d09214dd
 AUX git-daemon.xinetd 260 SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c WHIRLPOOL 155bfca2c071d5368de09412d1d937cefd3b5cd28a991b99845551738440b92791c33a67ef41be711dbf06fc4faf4a299cbaf1f410b119fe5deb5a4cd741803d
 AUX git-daemon_at-r1.service 340 SHA256 980b2b2234fc672065286244cd4e690c92865d39a02001936801cb013b7d2dce SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9 WHIRLPOOL fd89d61e15bf499404b0a17a2e47257962c671cab09a3af53cb378758cf7a5f979026831a8da2270ea54fa8897e132def17307d03729ef2e30dfe7950c59b1b3
-DIST git-2.13.0.tar.xz 4744388 SHA256 4bbf2ab6f2341253a38f95306ec7936833eb1c42572da5c1fa61f0abb2191258 SHA512 709e78ce1a7396c021af5802a89cd4a90802781c4ce4408af50ad8d11a5fc394a108ef24843fb901321e2e0597018111414443ce0d166ca5b1475db503246372 WHIRLPOOL ba5c6b247ea5a92460a90f36920602b2c8134892d8d94291c8a4aac8012d560a5404a2819f33a23b927c7f0435bd928d54265ce182066ccce902e2d85f27e0d8
-DIST git-2.13.3.tar.xz 4754532 SHA256 91aa23be428f67eb19616f43fa0229d567e9acf4f08fba33eb0b627e4d323e62 SHA512 8a8db4d675c9d8d0e834620c5c7ce7937edd7f4bf1d8a176e1218e5773960e2635c48cb931dfe206b237e2da8371e521acf9c2776847605bea13f8a7304c9f9b WHIRLPOOL 117f84d13f9a6366f5323c136df0ae7aef7d038bb34c392f9852c5e38d2b98535a5ea9e77985aa0b25939eafc4a1441655bd38af007bb832e847ec4c6bcf4c69
-DIST git-2.13.4.tar.xz 4755472 SHA256 371a592a52d240a6350d4ec6b63cd8301e1fab6dd03388a339a8c7429305afda SHA512 dbe6c08a6cb4931f0d1c16dabc23595c8e328a397552817ceb29cb1bf38f546e3a6ec9943db06e3adb39b15772f9e79e94c08fb4cd1f1807663602cb132983f5 WHIRLPOOL 449426e629fb722a77bbaf4ca1a11d3712e82e31286f27d67b682cab9e712850e21db5f76beaa201a82c5e9dbf246a6008deeeb20c2b568f0280f8d33731fbcb
 DIST git-2.13.5.tar.xz 4756436 SHA256 21c9e29caac86d244ac7af78bc3422746dabb903cb3952a1ceefd801020ad1a1 SHA512 4a0b55d19f15cf0ca388d43b650c1ccadbc32964925e5d0a3107ae84c38506af957335ceb0cbb5468ffbe0f5283f8e188aa51c9e915b3249126eb37c304be9ec WHIRLPOOL 7a3c9971f37de366801be6a6d1d28a1d02b2f3fe98a508465c01d600913efd0ae4d241fb690686beb2ae9b0321ba4f7eb5b313ec47fb04eb7d0e0e51170c6750
 DIST git-2.13.6.tar.xz 4756820 SHA256 bce97e403bea34f50378e90ade10c12666b2382cc247551b63dc5604e03b2523 SHA512 ed39784205e1077f886eebdfb34a205fb0433071de29f673a79ea32bca31a2ba9bdabba208c9679ea2f6f295bafad52a7e7852b5bd2ccb1e6c99a1d2e76e8ada WHIRLPOOL aeadb595a3fc9b74b143478436f4511d15735e5e01bbaf84bc60ef6c3bb91d94aa29ea1bd700a08d3aea3341de4cee5c4d5ced0b550a223faaadd37774cd3492
-DIST git-2.14.0.tar.xz 4790932 SHA256 f93e6e6a307d2e953cccafd9f4003c62992628fa508d07586476c953c1655975 SHA512 4410ec9c40fed8efeba26ae57412975cfc4c78a43d89b0f1a2412e578a14b12e24ac7537f6b5efe83087006f27a49911facb4a9007fbc59e1548d15fd5f22dd9 WHIRLPOOL c2033fec557552b6fb18c921593dd444b6a427ba96912fd1516dd7a3dbda10cf47b8639d0fb50c403defeb12bf715458d5c34e6890317f50be40df99cbf2e051
 DIST git-2.14.1.tar.xz 4791876 SHA256 6f724c6d0e9e13114ab35db6f67e1b2c1934b641e89366e6a0e37618231f2cc6 SHA512 bee35ad9c6a0d0588045ec2fe5f6987cb1eeb3961cdf33cd9b51ae52017969131ea4ec09908f9b30944f85b0daa99614fb42c248c9c8dac5f21a90e2866c33b4 WHIRLPOOL 4ca338a3b39f3a787bc4054f26a4510918ef8dd1bad834e6fc0889358b56e22a4eb98a642fe7d96e60e210aa0e946da160d1716a1ee14e8c853ea6af15b609b7
 DIST git-2.14.2.tar.xz 4800208 SHA256 50e9723996114ad1eec4dda89960d9fe34461749ae42031008a261fedd03c7a1 SHA512 fe99486e0aef8d73dace3081bbd62bc6d08bc13868b98c905f7833458fdfc464eea504ae2961f4a2f38892cb0e76b533a50a2cacdf07c9ad9f8106e7ac1c353c WHIRLPOOL af0d166fc00aea8a4a77984e8bf92f6fb3abc854263316961683e5e27c8adbe1d73a3384b4d14c2ce762d75fd95f67da9a95a3fd3eca4d6747eb1850ab7b084e
-DIST git-htmldocs-2.13.0.tar.xz 1107480 SHA256 d5ddfb8eedd5a53c0e46e183ed1513dbdd4f5d5e7ef6624040ba0b7381221e3a SHA512 053b3584b1bdb6968ce54d97d9c58ec221c604f90c3953c9e850009e9263e71bf970f0f268a35769ea4f0e617811297bc771c20eefab8e600a22d1f4efe7f675 WHIRLPOOL fb5f37a95fc459dd96a8d811103886c0c308df38f57a63fa5b3db3e9d51c6024cab79df7a9e86772ce6a6b388546166a39a531e47773459482aa97502733dc2e
-DIST git-htmldocs-2.13.3.tar.xz 1109392 SHA256 c5f8ad546724b8712286dd7814ea46abf829b14f2de8f6e565b8775469880c66 SHA512 6ac9bd2f401bc3330d5a23a4f48afbe224c6d558154281737f6cd83b8ae6b73c32e7fcb491c642f926a9c5f95019964cbe7902c0ec18456b53847fd6c3b7e292 WHIRLPOOL cef80aa25644993fc95458fedcfde2672da22b8d9e5853e4149cc0196782812008f2876c32f6e857abc65d30545767c9b822913f42b1470342b72a7573347d90
-DIST git-htmldocs-2.13.4.tar.xz 1109720 SHA256 1dbb459cf47f0023456fde9d0155aa858540479e258fbf2c808c5c4fd9f44f93 SHA512 571c3366f35265e041403300dee37e518cd6a5812eeb670b7297b0c29c8fe4eaba405c5f68b38ff3dbd672b5697c5524c025106fb24df156644e73cf792e4708 WHIRLPOOL c9ec8b2dfbb22b4227e7032cd1ed8da6a52653b6e30cd8802320f160afda12d754927f9f388bfd32a1760f18aff06c834d9516ac74c08b6b26b3d3b1ea2446c8
 DIST git-htmldocs-2.13.5.tar.xz 1110236 SHA256 f5f10d821544446547dc91798772f36d7515a824c9a28f22521f0094e1a4dc08 SHA512 0ba006ddc35325052be4d969a3a966ec1be7954dcc1676b9914953720e56f3c9a4522541d964c6ff08a921c35f983213eacd00b99db5d97b97ea8f5c1181ed73 WHIRLPOOL 020963c8544dba6acc4b0e681a844b6a9f332b3b3469c056d678791afacab54f4badd956137b21d3a5d2ea465a83f05d815a2c066f71fade41a58e8f802088bd
 DIST git-htmldocs-2.13.6.tar.xz 1110668 SHA256 cdc39ecc8d1ce09f7b865832ebbc466441beb61d1aad4c7796514520220dabf0 SHA512 9eb26f04836620bf4486d3bb2a170ab2b0af319f7f53e2677f4c1445767f5c3521cfdbb274dcc4df2bfd2fc5bf0ca18c6a4a9ca0b9f957c53f66e530684af6cc WHIRLPOOL 126d8ae25c71dc4e6a6eb20ba611cd2eaf94ea8f4f89fde82b2d05044e93f425d9812559db5599b557a1a8f5832cc41d0651b421d265219c257351fe7fb41f2b
-DIST git-htmldocs-2.14.0.tar.xz 1114504 SHA256 51d6d51041bbfa4a5aab5762f1f87d630179ed30dc32773b38573258e1700de0 SHA512 e9d807073e22e72f3a0ca4c2bddb8df2f024c766b8e436c066dc3808e23f339322dceddfb9b16d25def511d46f7a9382dafd8280a2a8c5ebf24cba73f2da7cc7 WHIRLPOOL 63c1220ced7999ef1d1fdd1db80d7eeb7be8d287ac2c58bed06115ad9b3035926953b3e8ad9a2e74c56497e5645ad4059b96988fce4bfe6452f98015fee896ce
 DIST git-htmldocs-2.14.1.tar.xz 1115176 SHA256 9c1970c7f87f37c8b3044e01e0500d84d8bc4eb4dfa5ca881c32c351f20769fb SHA512 c4d8de9d402b00c6856936bbd1fffc213e156a7dee09d740159ee5de3231bcc3dee426c640e2dac6c837b7a3f69779be4093664fd55ef18e671f76e2d11280b5 WHIRLPOOL 1a85338c397ddedd5db01a65b0b173f4876551348b7892872c10b706e59419a2eb5937ca43df1018102a56e973ce756b6ca128e3df4e0e99adc1a9ba7719be52
 DIST git-htmldocs-2.14.2.tar.xz 1115940 SHA256 a36661e81e5b21e788cd84e11860bcd0cafa402eff06e6371415a5a0e0b80dfb SHA512 c5dda319713a98b9f655a04fbb4dfcba4cc60fe22586bae73a88111d96cd8da989060b8450549a32a5c5bf5bc8ce735e73055ce72b8bf5d3b4fcec2040fa196b WHIRLPOOL 1b47b798ae00f29e84862b973f4e284076eba84992f52b92903b56d50f0a463aac011fdcb3ea0b4859d2cf8661eb24c5faf4569ed22de952e293df95ca9a0438
-DIST git-manpages-2.13.0.tar.xz 407460 SHA256 8414f9c62e2b099cd0ea2ca22c55fb6538b13fc7a3ed1508fb9881aae42a97c9 SHA512 175ec2cd9293eedfbdb70445e19966f1dabdbf86beb220b3ed74862a36036101497bf9f322c3635e57bfcb7d2ce9d5efe8bdd6bb3ad73563dfa283c48da6bd1c WHIRLPOOL 11ba557437a2a93327406d3dfb69586668a0a34e20265bbb3053c10b1b37b5ad19fa66d9b0c2188268837acb5d56bd211bb763e0dc1ee8edfda5422b60cb4ed2
-DIST git-manpages-2.13.3.tar.xz 407640 SHA256 1128db0302a41b55132bfd507863a7921b995d9ad308396ff2c4ca91177481c2 SHA512 9c81335f3d882df1220801ea6fdedea90533c904a1e4dd0394b42721aa31392e6c923568a81c05479fe77a89a974e02fd40b4bcff397c4f739306ba4cb874501 WHIRLPOOL f735c2657fd63a2b7b8bca5e511c789680b615f519ac1d9aa7b67c0aead5607f534021494a03ade9752274c932a22eb82457d243c5328d3dbe8613ac44e8c595
-DIST git-manpages-2.13.4.tar.xz 407656 SHA256 674fa9a299cbcb91e49affd7dfd69952be1ee88cb7a3d5ee5b294e7da29b5d52 SHA512 ac6bb226a9425f8b949fe6eaf82ccc620264bf866308557906bff49e9c894c7ab9cb13351461db2fd073bb5835653dbaa6bb32487e40033d943d8f16e9a55701 WHIRLPOOL c873be52695a6b9df75b783331620ad98c3b2db9ed74e204250cff1f6807157f063fb6c25da86f9aeb66fcf0978d9d0693d4f286c8f68e6efa4473ea6dde2f21
 DIST git-manpages-2.13.5.tar.xz 407640 SHA256 1dde688dda9162605ae27e4ad1b55c65c056b3e7cd70972b7e1d6bd2b743394d SHA512 42637b264b4a1a73defe22f314cb8ca0bc171fd722252cd926a9fd74a8f89d129da0648ed85b72f44948795c6ae1f33f4f141f11b07688533c8654be0983fbc0 WHIRLPOOL 9b4a3440c4d1da7089d020e146de7401502cdbae0d82a0052f665cfab84d48de5aa5602d78b8d2f29507e280a16ab4bc2ea4a753fc948a7102eef0240ab3ab2d
 DIST git-manpages-2.13.6.tar.xz 407660 SHA256 9c92ed09c3343c770a1afd9dbb1192b00ebb1b3d3e25e21a2dcb1a4e9a494d1d SHA512 b24a96053e348e1d2ebf5c66d968074bc73471f07ac3a680d8b16fd211b69b5fdfad6a087473edf9941ad08493e4d7ff0a916b85ce40ebe19b3e3dad6a4baf5f WHIRLPOOL f25b4b20462806a722067aecb7aa0526f00536630c8f71bd7be1ecc0ff4fec07db2fa79d69d911f3e1a2eaca9fe73ad76e76e7ef7afbb83698db42a540e4cfef
-DIST git-manpages-2.14.0.tar.xz 410364 SHA256 7d653c68a27eb7878ad92c0ab4d4fbcf112b69b67d4c8a180779651a96b1824d SHA512 6979cb513d769debc12adb197d44e7334b174a8be6dfc9b20b457f247786691f1a18802d8f5247e1c8ecf42d05c42a03929cb5770990b181ee3476fa9a755a5c WHIRLPOOL 467c901cbd875ca16b44361e3da8c3edd4528bb893b6dae57650884c16b51aab3eb0bd16d47a4cf794ea3cb08380e228966353918558087bfcd931a0cafebfa1
 DIST git-manpages-2.14.1.tar.xz 410400 SHA256 7ebce1e0e862af1367e24f14765c7b67f08b63fb01b80949f55479c562d414f2 SHA512 53641232a4fa7c8e5da14f7ba46d84e6cc4281ed8e9979153e9de13ae6550d863e823c3a2f71ab9232a57314fb19b9443913518a3a072d227c2067430d5108f7 WHIRLPOOL 6b4796ebd3070c66404920091298717d1c743403454a62c5e49bd8f8af16b3dc47345a8c8e64fec670b8bd9ed34ddbfa3916f904696e9209522cbc8ae5dcfdb1
 DIST git-manpages-2.14.2.tar.xz 411160 SHA256 6dd350d1e9d00159a549f0fad08a9f954b1d12576fc8d5865fbed9dee15105fc SHA512 64f9e22ed98cde1dec9afb719c2f7254d5da1eceab2e7d3291d37792fa1b9fc83633ac42a4f47961a6721b325d58818e67ffb14085d5e8f9bed1b691f22d79d7 WHIRLPOOL 902889bed82289773c029ac7c9625f4972559e0365cc04dfb661ae14fd7e1757d3820d75b3591d72dded98107ad7a1e2e31590452699858ca3a94fcc375ac0eb
-EBUILD git-2.13.0.ebuild 18963 SHA256 ede0d4ba9ab4a6b7464eeedc872e4c48fd9d24cd213b8144dfccf1389f13dee9 SHA512 f7e6d1f9521cf441f0dcc2d380dc80dbdfad777c6a19e8d055990725f1efa51c93dde06aaba55f1e07654175831b0e109356eaf87035f4890f000d0dc5e403b2 WHIRLPOOL ab1cc98c75bb9e521ed835fc651c788125854bfb2f817056616255a22dc8f809be328097631fda3ed81b86a53b9f5d0fc9834d4e3930ae32e947d152ebcc42ba
-EBUILD git-2.13.3.ebuild 19025 SHA256 882b994c9d3bea2e432dffa0e945a6390b0ff919fed17cc2ea6658bf52f8f133 SHA512 5b844f245d8d58268667eaca11c75dac89ff7694f73f227bca25fd4892a4077e28dcff0ec6a38858eecf1c41f022729a1c1378623a2d458308e8c99f0487fc74 WHIRLPOOL ca77482077690eec572fb1b93a3be46a5e01872103e240b67119656a6b05d472343618c408ed645fc5fcf0959ccb4585951f406ce74222b82bce91b84c9b38af
-EBUILD git-2.13.4.ebuild 19025 SHA256 882b994c9d3bea2e432dffa0e945a6390b0ff919fed17cc2ea6658bf52f8f133 SHA512 5b844f245d8d58268667eaca11c75dac89ff7694f73f227bca25fd4892a4077e28dcff0ec6a38858eecf1c41f022729a1c1378623a2d458308e8c99f0487fc74 WHIRLPOOL ca77482077690eec572fb1b93a3be46a5e01872103e240b67119656a6b05d472343618c408ed645fc5fcf0959ccb4585951f406ce74222b82bce91b84c9b38af
 EBUILD git-2.13.5.ebuild 19016 SHA256 60f7549d88e55d94f090293c78c841565b8a11f8db61526abbd2c4de650dbac2 SHA512 4741a465efa6fbdc86775abc4088a9512971658988154a5da2f410e1e243b6f6a1e7c5bece23582f3a47e1ddd587685ebfc32c7b00c8ff325d2e92996e4d840d WHIRLPOOL 1372327523438351e0368978141e4c80d7ab3f0d3f816d9c2b749287caccab69870dd26db28b75f5244b69012fc0951b7894c442d5aae006167435511e5890c9
 EBUILD git-2.13.6.ebuild 19021 SHA256 96c6889db8fd3b04f64d93904217d9453a599deffab87cbd06291165e40e6e4c SHA512 c6e2305b6b82ddd5b973ce04fb063f255fbf748b44d35b07e218efb54c36cdfff30a27e5321f35998eafd9b46824a32d33f65fda8a4e3b7b726b0c3cc4e8d853 WHIRLPOOL 78b2100f695a144d318a42b79f59c82a53215ac25145698ad11087514de876b44b8f3f3e19e8743793b4e7a4d227a4b025faed81f80bdd1c46782933249b0684
-EBUILD git-2.14.0-r1.ebuild 19265 SHA256 34265ffa23f1510a16db45edfd2bdff89f6c8f8d70f7e6864616d09697974900 SHA512 3d8dfeedc02f4e0e1345596ff48e61ed06c4a436a7a4b1fc79eecb7ad3c7ae5727b4b594971a1838b090391285162593ec125d0758e0c8730c5052f381982a30 WHIRLPOOL e1e1077a538f39bb444e460a4c5a7f728c65328195ae491880fd78b64c8046778ec85eb507a5540017eb31022ca0f9a8baa9be43e285276b5420856f2fd78823
-EBUILD git-2.14.0.ebuild 19026 SHA256 fb77e6241b393a6048e18cc9bf79018cbe63685984d73b0d4163ee88ec819aaf SHA512 9676270321c3218c182ed113f631d244ea0f62b75918c7fcf58d8264553bb9c8b39a80310575e238c9aa44f6b77d6f3aa7d9a3030f5100b7d83e48c90dae64a5 WHIRLPOOL d708e1a249bdacc2634c0cd6b8d7a84d0e19d90987499eceb1c70249b2f406aaa44e0405f12813be99ad6cbe9b2b88028e1332a98d6676d6d017a01861df06a1
 EBUILD git-2.14.1.ebuild 19320 SHA256 1ecc45be91062d9442750bd22c8fdba490b5c7fff54368b4ab1e3d5e935011ec SHA512 a49a979067f1f7c9c207f1faf522229d3b2b4ae0cf04f7881822b486b6a891f2f5464fcbb6dde14b919c71c007f36e2892ef12bcd45e42ccebd82eeb29d28384 WHIRLPOOL e16b1d0ef5c946dfd2001b98dc2e89891dacf152760d2e095d24f10ef6c69193570bcd936fd666bcee7de90d2aa928b3ba7ef87028ddb9bba0360ae3d95402e1
 EBUILD git-2.14.2.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
 EBUILD git-9999-r1.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
--- a/dev-vcs/git/git-2.13.0.ebuild
+++ b/dev-vcs/git/git-2.13.0.ebuild
@ -1,677 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-# See https://git-scm.com/docs/gitworkflows#_graduation
-# In order of stability:
-# 9999-r0: maint
-# 9999-r1: master
-# 9999-r2: next
-# 9999-r3: pu
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_BRANCH=maint
-PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	subversion? ( perl )
-	webdav? ( curl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-	use elibc_musl \
-		&& myopts+=" NO_REGEX=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-		myopts+=" HAVE_CLOCK_MONOTONIC=1"
-		myopts+=" HAVE_GETDELIM=1"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-r3_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-libsecret failed"
-	fi
-
-	cd "${S}"/contrib/subtree || die
-	git_emake
-	use doc && git_emake doc
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-libsecret
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		if use doc ; then
-			doman svn-fe.1
-			docinto html
-			dodoc svn-fe.html
-		fi
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled=""
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/dev-vcs/git/git-2.13.3.ebuild
+++ b/dev-vcs/git/git-2.13.3.ebuild
@ -1,680 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-# See https://git-scm.com/docs/gitworkflows#_graduation
-# In order of stability:
-# 9999-r0: maint
-# 9999-r1: master
-# 9999-r2: next
-# 9999-r3: pu
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_BRANCH=maint
-PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	subversion? ( perl )
-	webdav? ( curl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-	use elibc_musl \
-		&& myopts+=" NO_REGEX=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-		myopts+=" HAVE_CLOCK_MONOTONIC=1"
-		myopts+=" HAVE_GETDELIM=1"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-r3_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-libsecret failed"
-	fi
-
-	cd "${S}"/contrib/subtree || die
-	git_emake
-	use doc && git_emake doc
-
-	cd "${S}"/contrib/diff-highlight || die
-	git_emake
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-libsecret
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		if use doc ; then
-			doman svn-fe.1
-			docinto html
-			dodoc svn-fe.html
-		fi
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled=""
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/dev-vcs/git/git-2.13.4.ebuild
+++ b/dev-vcs/git/git-2.13.4.ebuild
@ -1,680 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-# See https://git-scm.com/docs/gitworkflows#_graduation
-# In order of stability:
-# 9999-r0: maint
-# 9999-r1: master
-# 9999-r2: next
-# 9999-r3: pu
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_BRANCH=maint
-PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	subversion? ( perl )
-	webdav? ( curl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-	use elibc_musl \
-		&& myopts+=" NO_REGEX=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-		myopts+=" HAVE_CLOCK_MONOTONIC=1"
-		myopts+=" HAVE_GETDELIM=1"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-r3_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-libsecret failed"
-	fi
-
-	cd "${S}"/contrib/subtree || die
-	git_emake
-	use doc && git_emake doc
-
-	cd "${S}"/contrib/diff-highlight || die
-	git_emake
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-libsecret
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		if use doc ; then
-			doman svn-fe.1
-			docinto html
-			dodoc svn-fe.html
-		fi
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled=""
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/dev-vcs/git/git-2.14.0-r1.ebuild
+++ b/dev-vcs/git/git-2.14.0-r1.ebuild
@ -1,691 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-# See https://git-scm.com/docs/gitworkflows#_graduation
-# In order of stability:
-# 9999-r0: maint
-# 9999-r1: master
-# 9999-r2: next
-# 9999-r3: pu
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_BRANCH=maint
-PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	subversion? ( perl )
-	webdav? ( curl )
-	pcre-jit? ( pcre )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	if use pcre; then
-		if use pcre-jit; then
-			myopts+=" USE_LIBPCRE2=YesPlease"
-			extlibs+=" -lpcre2-8"
-		else
-			myopts+=" USE_LIBPCRE1=YesPlease"
-			myopts+=" NO_LIBPCRE1_JIT=YesPlease"
-			extlibs+=" -lpcre"
-		fi
-	fi
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-	use elibc_musl \
-		&& myopts+=" NO_REGEX=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-		myopts+=" HAVE_CLOCK_MONOTONIC=1"
-		myopts+=" HAVE_GETDELIM=1"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-r3_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-libsecret failed"
-	fi
-
-	cd "${S}"/contrib/subtree || die
-	git_emake
-	use doc && git_emake doc
-
-	cd "${S}"/contrib/diff-highlight || die
-	git_emake
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-libsecret
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		if use doc ; then
-			doman svn-fe.1
-			docinto html
-			dodoc svn-fe.html
-		fi
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled=""
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/dev-vcs/git/git-2.14.0.ebuild
+++ b/dev-vcs/git/git-2.14.0.ebuild
@ -1,680 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-# See https://git-scm.com/docs/gitworkflows#_graduation
-# In order of stability:
-# 9999-r0: maint
-# 9999-r1: master
-# 9999-r2: next
-# 9999-r3: pu
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_BRANCH=maint
-PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	subversion? ( perl )
-	webdav? ( curl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE1=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-	use elibc_musl \
-		&& myopts+=" NO_REGEX=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-		myopts+=" HAVE_CLOCK_MONOTONIC=1"
-		myopts+=" HAVE_GETDELIM=1"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-r3_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-libsecret failed"
-	fi
-
-	cd "${S}"/contrib/subtree || die
-	git_emake
-	use doc && git_emake doc
-
-	cd "${S}"/contrib/diff-highlight || die
-	git_emake
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-libsecret
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		if use doc ; then
-			doman svn-fe.1
-			docinto html
-			dodoc svn-fe.html
-		fi
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled=""
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/games-action/armagetronad/Manifest
+++ b/games-action/armagetronad/Manifest
@ -1,9 +1,6 @@
 AUX armagetronad-0.2.8.3.3-gcc6.patch 6419 SHA256 37d1632aafc10405607c28e35be826d3680a2d5f02844f22c9fb4a2fa1cc11f9 SHA512 ff56e2388b56736fddd1a4fba94914a3d327c11b25675a45f930b1ceab215cd197563194aa6485571ba5ee7c4ed6e2644da9f81f70cc686201a8efbed9149a44 WHIRLPOOL 2121a59a1199924cdd24a705b0dbd64202425b912fff59252e9b73dfe9faae5a3f59cdb0e206b776e280de426848d553bc7f70dbda0debc88ff33dd79bbb8954
-DIST armagetronad-0.2.8.3.2.src.tar.bz2 1841407 SHA256 f444e481de94e6c0e3933c709d46effd2adfe823f5ef44768adcc8003b8ba7c5 SHA512 ffe16d55d4ea3c9e3f4f8828a9ffb09274b20a33c6d5c91cccbe846fa93f7d1d78e565db3c9403debf9f7bfde76322477a84349d85b475ed20c184da281107a4 WHIRLPOOL f04902c7bf3b13ec35497202a658ef96846b59d4245c72a17793b186d06a8f2d2dc1960b563b785cfb46aa9e2252a8ba22436df44e4ccfa2e8c872b4eb51eb4a
 DIST armagetronad-0.2.8.3.3.src.tar.bz2 1857868 SHA256 ddf2d781b134392e9667f17e0319ae2117c20e6eb7738e3cacd701f3608ea5e8 SHA512 05dd7db10efdac0e681133d07384b0e3c2edea328433f1d906e36b5f70960bf502df8d496967981b6bd67e1a119af9a5bbd71b0c824f790921deb3165165dc3f WHIRLPOOL 731b3e8d8647948e016e4dbfa3733f666838d0b4e47f997e149b947741d3b566d9aa1492dc570064e0005c92b0c04f4c74ad4a0278ff7018b028d9c431af135d
-EBUILD armagetronad-0.2.8.3.2.ebuild 1510 SHA256 f655c498b8cc7e956578534b10613cfd68002cd805063f207a3325a26c720bc9 SHA512 722635e50ad693bc50c7d1d79937705579a991b77999f916e56794a4fe96d9009bf5b060802a24a8a8a5536cdbbb4fb5b825ee04ba4b115003c5f6ab95b0514b WHIRLPOOL 9f1e28378de55d74320eefd9225ad1caa9ac70e9dadd9e8546190bedb1aa24e07b5584a20a6dc57b48e3c87a712eb710e907e271f8826fbb4ff7c7d444b9bf63
-EBUILD armagetronad-0.2.8.3.3-r1.ebuild 1485 SHA256 db3f5e6e7372eff7f46261e21a105f3c01aa468f996b1c4a7e4a99af0aadc34d SHA512 84cacf55f04d3ec6d1ec61334d10013798d1774a52146f8144f9d356d1ed61737b6bf59a3cab2d1638c412042901099f020493ff07e5e61d04132f4921bb56a7 WHIRLPOOL 9abf36ce7112fc55d2ea5e5e48ac539a3f5ca28f8ba85894cad042cd140a23b186e3a5660db72f23892ad52bdec2fbf10778a5ac4b25ffe1afdcbdb8d9cf08b8
-EBUILD armagetronad-0.2.8.3.3.ebuild 1437 SHA256 e9454ae3df325a6d859c4ea3c83a8c80ac1ff87fadabec822804d0d30ba574d7 SHA512 70c6d1e2cd444653f4ec456b4c8cc9394aa4e37e4065fc1b0910e67684f9b576925db9be180f4d1f6e413676da88e31dad1bdc30639fbb2b937ea82cc29f3c1a WHIRLPOOL 7d8256a59b02e5be528266ec2ab771bb821b434ecddc3d4e0fd81462194debf75cc97533189a04975aeac8e4459251274b0a0496394ccdd601ed55d29f915082
+EBUILD armagetronad-0.2.8.3.3-r1.ebuild 1483 SHA256 2a9021e887b3cd1cc234b5c3b1932913af248d324dc2b983eee292fe85ea2655 SHA512 5899f409c1d761cece818ee314d7af36db9e7221f508076abb13c738138e2e003cd2b443ef6ffbb250eff03847bfe9907f2faa0a5d774661cef7505314952815 WHIRLPOOL 3affec05c5323766d4e521594c1e0538a1efb394916b4c66c6c1b76c1629805bf7405b56e0182f0613e35aa287cc68298292b19116b310d283ddf44cb8ac2314
 MISC ChangeLog 3575 SHA256 6ec87dce0132d641ce6b1dd9a6f69a0c24e5638cfdf283a62934c9daf630d675 SHA512 782b3120aaefc04e59069957624959469dbaec1710341c617a4e61e85d4d8376caf79374cadf1c15ffb96cad5db239caccef65fb8c0369e7509099ed12230eef WHIRLPOOL 69f886d01f7d28f6b15d0fa5ba48dfad0044d8a731996eaf60474c1da2552c1707b34a66af93d378317c5833a06c07b86b15220aa6cc2bb876feb21be6c35af8
 MISC ChangeLog-2015 892 SHA256 d6c76f15935c6095c7a3dd2aa7f71e93ba667e749f12e7e7afbfaf4cd4ac3a57 SHA512 ffb2f246907f010ee1ed760b4aea0e667ca2dd8e3a0d1e403299ea7538260ade921955d48158a14af87a4942e5131de1a8a600887c8114d8d61a8d4a9ffca950 WHIRLPOOL 58b8922d097a45ffa414ede2ad6d629789dc18696d1b60724e7a4e64b4cccda25bec75c8dd4a39748fec08670f1e4bf92213cbe1b4cea60ecef324906c1b9ea1
 MISC metadata.xml 333 SHA256 f4208adff17bdb0920d2c0cdcc1c3d004344d67364e979296867c74e07a8020f SHA512 ead9b44190ac80607b29eb37c771f7ce041cdde47e1e8203201d0e616ea78377312101dbf1ed6a508c64a884980506c96cf77dbd8a4d05f0a69ecd807fc40ead WHIRLPOOL 028e5ea73e2646689cf0661fafa341a925ea5a9d93dab619a0e3854c042adda3ef848a041645ad111b5ef8060528b9b06475bc0c1aa79d567fd387ecbe2c8c63
--- a/games-action/armagetronad/armagetronad-0.2.8.3.2.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.2.ebuild
@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils games
-
-DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
-HOMEPAGE="http://armagetronad.org/"
-SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV}/+download/armagetronad-${PV}.src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dedicated sound"
-
-RDEPEND="
-	dev-libs/libxml2
-	!dedicated? (
-		media-libs/libpng:0
-		media-libs/sdl-image[jpeg,png]
-		virtual/glu
-		virtual/opengl
-		sound? (
-			media-libs/libsdl[X,sound,opengl,video]
-			media-libs/sdl-mixer
-		)
-		!sound? ( media-libs/libsdl[X,opengl,video] )
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e 's/"png_check_sig"/"png_sig_cmp"/' \
-		-e 's#aa_docdir=.*$#aa_docdir=${docdir}#' \
-		configure || die
-}
-
-src_configure() {
-	# --enable-games just messes up paths
-	egamesconf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable dedicated) \
-		$(use_enable sound music) \
-		--disable-sysinstall \
-		--disable-useradd \
-		--disable-uninstall \
-		--disable-games
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-
-	# misplaced desktop-file/icons
-	rm -rf "${ED%/}${GAMES_DATADIR}"/armagetronad/desktop
-	doicon -s 48 desktop/icons/large/armagetronad.png
-	make_desktop_entry ${PN}
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV:0:7}.x/+download/arma

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

 RDEPEND="
--- a/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
-HOMEPAGE="http://armagetronad.org/"
-SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV:0:7}.x/+download/armagetronad-${PV}.src.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dedicated sound"
-
-RDEPEND="
-	dev-libs/libxml2
-	!dedicated? (
-		media-libs/libpng:0
-		media-libs/sdl-image[jpeg,png]
-		virtual/glu
-		virtual/opengl
-		media-libs/libsdl[X,opengl,video]
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer
-		)
-	)"
-DEPEND=${RDEPEND}
-
-src_prepare() {
-	sed -i -e 's#aa_docdir=.*$#aa_docdir=${docdir}#' configure || die
-}
-
-src_configure() {
-	# --enable-games just messes up paths
-	egamesconf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable dedicated) \
-		$(use_enable sound music) \
-		--disable-sysinstall \
-		--disable-useradd \
-		--disable-uninstall \
-		--disable-games
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-
-	# misplaced desktop-file/icons
-	rm -rf "${ED%/}${GAMES_DATADIR}"/armagetronad/desktop
-	doicon -s 48 desktop/icons/large/armagetronad.png
-	make_desktop_entry ${PN}
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/games-action/clanbomber/Manifest
+++ b/games-action/clanbomber/Manifest
@ -2,8 +2,7 @@ AUX clanbomber-2.1.1-automake112.patch 373 SHA256 8f3b28fbaf979bfb8483e0d2aae6b2
 AUX clanbomber-2.1.1-boost150.patch 1140 SHA256 2319dc865bd50c773a3c21709f73c053613fbad773806c355f9b6f38e8a616dc SHA512 cdd0b5ca38d6cee6f4e8afbccca956fb0dd8d2b84aef714cd2c8499a6b53e62016c51d58d389adcde95dd06b08b7b749428677d414ef792123d04e6cc8493806 WHIRLPOOL 7a0f36560de792e929911531abef6958e882a28b76378b06417e6826fb9462104b173fac2205b3ce292c741cfeaa1f881a853f9bdeba9bc75b3647c4bb983866
 AUX clanbomber-2.1.1-gcc6.patch 408 SHA256 318cf8a3ac8640b41e3dcfcae6d5c734364fcf634cdba9f94dcb56269c569445 SHA512 8f51ea2b0b9dc7323710b7a5e91b3622ac728f035c19d7e5c01731d87f0cce3f5c6d54905f42811f46b0a68e899aad0ad23d099039b9fa329c7245e27e2fadfd WHIRLPOOL 1cf2d684afd373b6cde244dbc9339248408a0f7754e8f0dd31ae9a8e2d514e6221c45d57df59c2e7ba8e8b6d4af11831c3e6bf18c64ee23bdc6b4bb8e916f84d
 DIST clanbomber-2.1.1.tar.lzma 2070392 SHA256 82aa263e6560f7e12a9bf590df1046cb4da8fc855162ab9ad09f89ec2e617e3b SHA512 b2d634c20d60cd7c080263a8ebea931bd623342c32380494c0076441021719135ca7861e0467e0c71cd46bb4ed85d3ce364dbfa2c8399eaf058f62f294a21c32 WHIRLPOOL d7d9c71ea20d8f1bcd1420156516c9f969880d4ba7907093361ee1713b8984a1fe1c11bda1f7f3f46a3503d257b180be8ec9e028a5b624531cfc7a493fa9c144
-EBUILD clanbomber-2.1.1-r1.ebuild 1140 SHA256 0416eaf8b6dcbde903af604f5d984e41427663b617736d4a150af4d92a7ca201 SHA512 ddb8593ec63f1ba04dfd954e5bd394685ad28c5ca91483415a8a82e27316527845521ceb078b5d8914eb2f0b59f284b7024f5334fca8b60520ad37637164da01 WHIRLPOOL 24dc9229d5e39a23e0fa6b51e35766db9ed75fe679c31a66fb89c451541ea5cd96ba572e0bfb91995d82ab24ce9e2fad93d7762c52f2e8aac9a8c0204c345492
-EBUILD clanbomber-2.1.1.ebuild 1122 SHA256 3596988359b1db5e2d51ff09afbc45bb912f33f86ad8d55de3806cb5f63c1add SHA512 f435810ba5c618f79dae2bc31409d7390c362de9b46bca4786489862f943388d61d1ef77071d1f8ea19dbd099a9d50adb961db773e34ef1f36ea62a079b1276f WHIRLPOOL de1333312c5f196b322f9596580b5b0ee3b64c4a0e0d76fd51dcae44918d71d3c184c820ff003d7c2c7921589137f9f66e2485a3d3068312e1f1fb42c552ae83
+EBUILD clanbomber-2.1.1-r1.ebuild 1138 SHA256 2e1fa34b459c3e569209f58d3e9fa2ea9622cfaa11283ef6c738cbde79709267 SHA512 eb5f8c9ab36fe09c04ef92ec9f7d86add60cc82e8d7930a22afaf9657dd03c971df0f3feb06cb6e2d09bcd10a8e59aeda6dfdf71452331bdfe88d183f82989c7 WHIRLPOOL 66b213b6b0a6f552d0dcaa288dc2c4fdf6a409ca90d5fcccd33cd636e05f870e90205e8669d2be2361918a1dafc42a32d1bd0d405ab51d950e8e9f8962fd82b8
 MISC ChangeLog 2634 SHA256 efcb44466695d9109d349b101e5e03ae9cb6b53cc9e826228802101697b78b56 SHA512 1b019a52e06e0b169f73aaaf1883e8c0ea72618be82d64f6eb69de9755efcc407f2d07c7568cbac02accb710daabb33eebee6850bf191834c41f408bf2e9be05 WHIRLPOOL c1c177cd8b4b2acb3e794886bf940b0eee292bf5b4a6a874b40c68eb10d5ef15c5c1f2465eec0f90ddec66637ad09fc57f2441dcef321c96e122b0d0262a34c5
 MISC ChangeLog-2015 3298 SHA256 f4e7b4d5a3ba9fef0bff67799916d7352b226475a7df40bae721b1463b0aa880 SHA512 6e405b927cda749c795af23c34555425ae8bbcfe689e3f4075d2a27a84b53640096d3931fd083a7ee88d3edd7a594ed8d9bcbb5b4f929c56578dbf6a2b996987 WHIRLPOOL ee9916b10f046333f42a83157fe9dff273b646c018ab22a17c9c569752c1aff075e4524acee1edf06fefe2e1d6899c4fbb34dcfb44ee32f1488db5ed36e9c7c7
 MISC metadata.xml 755 SHA256 57b03ec2d09976d0c22f30d160e261cc1efe9bdb21351e965c6e0cca3dc89326 SHA512 b46a19a5ba071d38cc18c23019d0077893ac8f1303aba357343afe129ad4f7f6e3b194f765485945712cef788291c93a105ba59c9e94dc507937d9f78f28b387 WHIRLPOOL a94ae6f82c30cf9b1c21bb91d7aada87e554955daf762f275e8b62513ac91d8b86e590a98fda5955ff95ab5aed36eb1fcfc802733d4cc072fd070e5dad94fd48
--- a/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild
+++ b/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.lzma"

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

 RDEPEND="
--- a/games-action/clanbomber/clanbomber-2.1.1.ebuild
+++ b/games-action/clanbomber/clanbomber-2.1.1.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="Bomberman-like multiplayer game"
-HOMEPAGE="https://savannah.nongnu.org/projects/clanbomber/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl[sound,joystick,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer
-	media-libs/sdl-ttf
-	media-libs/sdl-gfx
-	dev-libs/boost
-	media-fonts/dejavu"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog ChangeLog.hg IDEAS NEWS QUOTES README TODO )
-
-src_prepare() {
-	sed -i -e 's/menuentry//' src/Makefile.am || die
-	epatch \
-		"${FILESDIR}"/${P}-automake112.patch \
-		"${FILESDIR}"/${P}-boost150.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon src/pics/cup2.png ${PN}.png
-	make_desktop_entry ${PN}2 ClanBomber2
-	rm -f "${D}${GAMES_DATADIR}"/${PN}/fonts/DejaVuSans-Bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \
-		"${GAMES_DATADIR}"/${PN}/fonts/DejaVuSans-Bold.ttf
-	prepgamesdirs
-}
--- a/games-sports/trigger/Manifest
+++ b/games-sports/trigger/Manifest
@ -1,7 +1,6 @@
 AUX trigger-0.6.1-gcc6.patch 814 SHA256 e0168f80c799849c72d02d01c0f4b12a019af5d32dc924ff4788343f6d7976b3 SHA512 32e2979f09363010e252f436b04b888c7dc127e7b6817ea53ac400a1859c6d900990c284169a965bcd18388a972c9ed2c7a8e7f1c928147adbfb0007f7f50aa3 WHIRLPOOL 8656cb4744a65771d8d4679574bf096250d242d996ed1f2adf89b9ec9fdc4b30f709770808a418331d54fa278c269f543061fd61f625bc61d5e863bd41f67e2e
 DIST trigger-rally-0.6.1.tar.bz2 61083932 SHA256 00b22fd290420ed7ed217c3d0bf53b46ad2eaf4c691347f4d3aaca5b1384958a SHA512 9f7e57758ffa61002efff6c7ac4d69f53ef4769651bdfdd21b6a8d101f8fd06ba7dc5998a8877146f50e6124896300e3595b4b5fff4decd53b6555e622de85bf WHIRLPOOL 8b4553a3758f915a3da7d2f6d2fc38a42338e4262e44c0f83026240546aa30e4fcf18b5810436a03e9209d14e8ed228e353c60b32d92f647adcbb0f2e72d6808
-EBUILD trigger-0.6.1-r1.ebuild 1193 SHA256 80f829feda3a5f9c2bd4f8c2de0d3635a739f2928957e2c6f3e4c01a698d15ef SHA512 eb36f809f45f1b446f7c55451a8ed1289a4dab2bffc73f214ba37a11bc83bd599c30434cec762975abccdee01f4d2f6d4302f682bb149310dd7844ff3c41f95b WHIRLPOOL 3c972c04b09baa6305c2e356a30ed32b692bf7d4c27d29b2829698d299a64997eb1d415084022b44b38274e4a4e51429f91f72f2a18ba9686bf9477cde56262f
-EBUILD trigger-0.6.1.ebuild 1082 SHA256 83db4630b10eacd0634b122eb682a87eb79048865f2a314483919e48f31ca650 SHA512 01bb04bcfa7786ac659df9044f01881cad9c79cc036e4424ad261192ce03cbe24785a0628ed1d3d28b3266c88ff3805b2359c2f2dbc887feb8361faa722ee073 WHIRLPOOL e3f7e9102a42718415ddfa6a12c1bbaa938e45d8e551f9823d5662a26337e2a902cfd384985e919ec62dc0a9cf1a88e582fab318e1498f416b0d2a27b84eb8b0
+EBUILD trigger-0.6.1-r1.ebuild 1191 SHA256 c83acbbf09462254e845b1f67f9397c2121dd02223b2ab34997cea9dd8e6af1e SHA512 87e12e8c40c6a07ce0b151370d904a8b0a909324cdb9590f4e68d54140b18d98fa4b81be21b0bdd7b474b7630da09c2002d124f0fcc4af9a6054d420eaf3c680 WHIRLPOOL c6a3bfd66aa87de8c835cf225c407c43b4a2e14620ba5c503c7ff3047bbe8c06f6db38a84b17528812c122f4742deaef6dd66ee0b571d91ede262810fb869585
 MISC ChangeLog 2685 SHA256 ae41c65e0c75443de33eeb31c21fa67c57489ec28610d77ca10d2ae66ab3d4f6 SHA512 b1371e90ade932c7924a8ebd2cf662a1d7767a8256446c73569f88fe534738905ec0e7375efd085e6db49f7756b5a1aa1373c3e70778757c1f9881d9cec0f850 WHIRLPOOL f48dde76089ec02e4c7e88715d65061a4a9f393ff56edfee4c740d0c295a3cb71602d564fd6a03770986fe8a646d00699725b0650053709fc32a2c741a333e40
 MISC ChangeLog-2015 4426 SHA256 2e8d1032a7bc82c37ceb562affc68d96a39cf4bfe12b0a71ae0eee50ce0925d6 SHA512 284f20d919f03e2e9d01435daebcfe9041551f542d999ec8cb9fdde4a977abcffd4ff8f847919acaf12ed527cae0538fe4e11e1c9f826ddb605957413251ad7d WHIRLPOOL d9e766cb5ef46ff8df15e55da8f47e738baf49cbce4ef74b74b5eeec12b900ea84d5a7b7f0fb5b39aef902522dce165ea4d15e4b22b75c973fbc1bc8c8f77511
 MISC metadata.xml 336 SHA256 4c7fe81e4cd677bd73b2a92259b8c0ff1ebb606eb5d6ea1c17fbb3f8c2b26140 SHA512 9eb1580903ba730dbe8dd12cd1be749e0dcfbb577c8d2eb7de8e0999c5348f7baa8b5fa13664893b8b3365e6bd0603596097c43821aa40af534fba4818778305 WHIRLPOOL 98049c1ca3aaa3818db0c40fde3a97e6616f0eb7e6b26c35c8992c34e37366f892766026a05f85662ec071990488336e8b9ec79d433d5ec053c0e772d276d70a
--- a/games-sports/trigger/trigger-0.6.1-r1.ebuild
+++ b/games-sports/trigger/trigger-0.6.1-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"

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

 RDEPEND="
--- a/games-sports/trigger/trigger-0.6.1.ebuild
+++ b/games-sports/trigger/trigger-0.6.1.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-MY_PN=${PN}-rally
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Free OpenGL rally car racing game"
-HOMEPAGE="http://www.positro.net/trigger/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer
-	media-libs/openal
-	media-libs/freealut
-	dev-games/physfs"
-DEPEND="${RDEPEND}
-	dev-util/ftjam"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	egamesconf --datadir="${GAMES_DATADIR}"/${PN}
-}
-
-src_compile() {
-	AR="${AR} cru" jam -dx -qa || die
-}
-
-src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data/*
-	newicon data/textures/life_helmet.png ${PN}.png
-	make_desktop_entry ${PN} Trigger
-	dodoc doc/*.txt
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "After running ${PN} for the first time, a config file is"
-	elog "available in ~/.trigger/trigger.config"
-}
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@ -1,4 +1,3 @@
-AUX freeorion-0.4.6-boost-1.62.patch 3812 SHA256 d0df8804a5e77993363ae1c3efd03b8351581e4fe1f9827319bec7f7a30db332 SHA512 ddf57f96dd791a7f9df068affda6f67e610999f2ea60df88333f1d257dc94bf86f68c5167803534346b5c558d5e82d59ab7aab401769f5b2536fef1e70027b88 WHIRLPOOL 0be869c255275f7ec694c2509e1460ff7c0d5da911f7005ddcbd7ddd1b412266c7d774188383de2858382e5d6fb22e01e6e98e3d3b0b1a4d201a622a49ae2783
 AUX freeorion.envd 70 SHA256 8c4c6209162963803cc763b7f15fc9fe3b3c38cecab6802b7787ea31d5adb2ab SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b WHIRLPOOL 634f85d5d4fd269a1ce98c24ed04baaccc2a9ad55f83a2e9efbc200f418825fe4234b604cbecf6c898b123c68c85df401fe8e7ad819b15bae6cb57352f6e0a0a
 DIST freeorion-0.4.7.1.tar.gz 105942075 SHA256 924a88464e92c14aa8f6722b57f702e07d43c7257cf272150c98bc3c1124a87e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d WHIRLPOOL 87b328364320221715b1dc16154a40299229990b8726a4053ba875ca4fdc6838c354cae7d93036fbe92003e2f2158b9325715e20488e8af7c22723924ce3eec1
 EBUILD freeorion-0.4.7.1.ebuild 1679 SHA256 7595e0f8ac9886fe9f706a892c3532a481a41a02d6c981b558d0b5621bcb518a SHA512 88f9d3905770f0a97a3938d58bad1c6698c5d8b651718a19cb634aaef857582023051700bc692ae59a2b8ee83b1da6841fff1a576078f7df1705e388b6faca7b WHIRLPOOL 2f49d37a1b2d649a353dd64e3996f38f43bfa653f4fe67027ee5d12198b046b8cf04bb3d6f50200bd35f78ec5f1411ea0cfafb17249950090d499f855b7ae2cf
--- a/games-strategy/freeorion/files/freeorion-0.4.6-boost-1.62.patch
+++ b/games-strategy/freeorion/files/freeorion-0.4.6-boost-1.62.patch
@ -1,123 +0,0 @@
-From 6b971f65dbef4614cd0c9020bcc6670d3f11b961 Mon Sep 17 00:00:00 2001
-From: geoffthemedio <geoffthemedio@gmail.com>
-Date: Thu, 20 Oct 2016 13:27:23 +0200
-Subject: [PATCH] Made Boost version-specific changes more flexible, as they
- reportedly are needed for 1.62 as well.
-
---
- universe/Building.h | 4 ++--
- universe/Field.h    | 4 ++--
- universe/Fleet.h    | 4 ++--
- universe/Planet.h   | 4 ++--
- universe/Ship.h     | 4 ++--
- universe/System.h   | 4 ++--
- 6 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/universe/Building.h b/universe/Building.h
-index 18d4810..b34f400 100644
--- a/universe/Building.h
-+++ b/universe/Building.h
-@@ -69,11 +69,11 @@ class FO_COMMON_API Building : public UniverseObject {
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
- 
-#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- public:
- #endif
-     ~Building() {}
-#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- protected:
- #endif
- 
-diff --git a/universe/Field.h b/universe/Field.h
-index f1d454e..5cf67c1 100644
--- a/universe/Field.h
-+++ b/universe/Field.h
-@@ -48,11 +48,11 @@ class FO_COMMON_API Field : public UniverseObject {
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
- 
-#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- public:
- #endif
-     ~Field() {}
-#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- protected:
- #endif
- 
-diff --git a/universe/Fleet.h b/universe/Fleet.h
-index a6a1fe0..7b5121c 100644
--- a/universe/Fleet.h
-+++ b/universe/Fleet.h
-@@ -150,11 +150,11 @@ class FO_COMMON_API Fleet : public UniverseObject {
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
- 
-#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- public:
- #endif
-     ~Fleet() {}
-#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- protected:
- #endif
- 
-diff --git a/universe/Planet.h b/universe/Planet.h
-index 3b3848e..267e2b1 100644
--- a/universe/Planet.h
-+++ b/universe/Planet.h
-@@ -128,11 +128,11 @@ class FO_COMMON_API Planet :
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
- 
-#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- public:
- #endif
-     ~Planet() {}
-#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- protected:
- #endif
- 
-diff --git a/universe/Ship.h b/universe/Ship.h
-index 4881086..db0d5d7 100644
--- a/universe/Ship.h
-+++ b/universe/Ship.h
-@@ -104,11 +104,11 @@ class FO_COMMON_API Ship : public UniverseObject {
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
- 
-#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- public:
- #endif
-     ~Ship() {}
-#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- protected:
- #endif
- 
-diff --git a/universe/System.h b/universe/System.h
-index 1563347..47ee4f1 100644
--- a/universe/System.h
-+++ b/universe/System.h
-@@ -134,11 +134,11 @@ class FO_COMMON_API System : public UniverseObject {
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
- 
-#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- public:
- #endif
-     ~System() {}
-#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- protected:
- #endif
- 
--- a/kde-misc/kshutdown/Manifest
+++ b/kde-misc/kshutdown/Manifest
@ -1,5 +1,7 @@
 DIST kshutdown-source-4.0.zip 459493 SHA256 75733e5b55b36add775a2788365ee6f5fe8b3d21598e2a17e68b2f8dd62199fc SHA512 720ca297760bf0442fca10f64e966b16db32a0bdb5a6b456408a7245fba071b9bdb465bee312878b5cf82df0aa1e27566b06fc6fe5026edc3a84d2d8295ea6ee WHIRLPOOL 8b92e57d13aecc4a6caa2c420b40164a0ee6700a3eeb981ec3beef4e51bc40d2a1318d59157cbb5ef98b7ee429c275c265326f16a0207f1698f65ad631351293
+DIST kshutdown-source-4.1.1beta.zip 465923 SHA256 433bffaf37c7d60203dce3933a975dbb5249a681cd124cdfb426e4e77c86df1f SHA512 1d4d34e123e6a354b47771a9d79f00f8a5cd54e6886836b92a61925c1cc93090c51d5270c67e3ec53da21d8df9587cb0bc69ad329d17c833bb9dbd39e3138e56 WHIRLPOOL 495c98d77ffcacbcd810a0b9dbeee3c756bf3ac3e3746822e72a0195e0497818d7238d075a3b170c4a9ca33b883adf01aa6d7e9fe8e70aa8710c5a08a8c9ac37
 EBUILD kshutdown-4.0.ebuild 1085 SHA256 e4d9038408e69a281e6694ca8bca3fb12c11c2e28d5dd14d3494bffafcacb530 SHA512 541af89c0f568e3f017136530372b12f41433b565343bee1ab91d51bc0b7b62b76ee461eb1f0945c439b75e2fc257893e96b88b9d99c40f91a47b1136ffce4f5 WHIRLPOOL d39db227a9dd323c4205619e72321f8fc26e25ad5c31ab2861dc51c4e47c65c99c740a99ce3e1fde2a8499a3cefdbf46d307ed7e2f3d07b3024ebc09170828aa
+EBUILD kshutdown-4.1.1_beta.ebuild 1137 SHA256 7eadb3caedf4a622e9bb7c884641225cf8e512617864ddcee8f4b84ffdb7b447 SHA512 bee8ebfaa68827fd1b7671a7f34a9fea6da8a308e9305197b4613a328ac2b84baf503a8ffbb24ee6badfdb588d6fad6c681d72c43462e53dd8c9475075f1fe52 WHIRLPOOL a54e0c76feaa97fa20ab9c44e070bf8d11ccc8cccfbc7b2730b29fd133a9ebaf353a932cf39d97b0381e4e9f6ac92d06a67ad1671765726b815fe439d39c2229
 MISC ChangeLog 2867 SHA256 cfa9c94306194773a5a50c7132e0d68e7d48eb3016c4fd0ac89b2e621a4cc45a SHA512 1cec692b5a9bbf98a37683a004b3ea7a3d80ec0faf29f68955b7c1092a20799361daea12d4abbc41109393304238e25db98c005281b016706cade030d6144f23 WHIRLPOOL 1c937f0dacac305fbd67efba0d0e30275cb4963ba51db4f1d9d6aa23e299c10f3d26d4b23731bf38575cac02d423f12075eb59489db5068b0fedd9f021664d72
 MISC ChangeLog-2015 7196 SHA256 0e110db6723dc7bd3f0ad0fc934ea0d3a474f291935dadcff0ca0b342f6b7cc4 SHA512 991fe6f7d169f000d581a47cf660fa640285ecbe8840a2d3fff6bff48f1bfb7a58d30f82c7af524cd4a17aec534fc6f40c2b54ae5a2cfc4c95f9fe974bdd60ee WHIRLPOOL 4644e79f03b19ee61f57e1b97c80638626817335f42687945edebd95c8212f622724afb6e8c7cce510cc611136d4b836151207dd38c24417fdc15e7ea2c3848f
 MISC metadata.xml 328 SHA256 1df23c070a851ce55c3a0e6a3421829a3bb403a1adac74c5307d3a3ae9413198 SHA512 b26f71d9d8119e82c3f395850e2309f97edc6c7fbb201387ff0bd03c7241b3262218dd5baea6a438b649ee3c13d4061531b0234471c3d8b4b8349e658d5bd775 WHIRLPOOL 365fa1a1d59d01c5ae861f874aa3b8ef2d92a1f7b3aa3f6fc7d988cf383587f81aeb0e7b6defb7ff0790fcab0566b82316243facc5fa8a35f11dcd58033a972e
--- a/kde-misc/kshutdown/kshutdown-4.1.1_beta.ebuild
+++ b/kde-misc/kshutdown/kshutdown-4.1.1_beta.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="Shutdown manager for desktop environmenmts like KDE Plasma"
+HOMEPAGE="https://kshutdown.sourceforge.io"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV/_}.zip"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+kde"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	kde? (
+		kde-frameworks/kconfig:5
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kdbusaddons:5
+		kde-frameworks/kglobalaccel:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kidletime:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/knotifyconfig:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-misc/kshutdown:4
+"
+
+S="${WORKDIR}/${P/_}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKS_KF5=$(usex kde)
+		-DKS_PURE_QT=$(usex !kde)
+	)
+
+	kde5_src_configure
+}
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@ -3,10 +3,10 @@ DIST mate-screensaver-1.12.0.tar.xz 4868924 SHA256 198cb5159bd6321c90e0069115909
 DIST mate-screensaver-1.14.1.tar.xz 4912772 SHA256 e903932d9e3b01b527abf8b4957d68797afd1b6b035854bcbbd5e4e6934da5c6 SHA512 28b5834450da9d7d2fd3a77504f244e69212e751435bd41a957f30a5231db312dba37ee39442c63a40098bb3d1e1fade81ea423f9d59b29fc5d1201522d1d8f8 WHIRLPOOL c39b1f2ee9bb3082a038c765c9c007c500470ab4c73d5221d3d5e49de9c54fa950e9eeabec9f02f4791f7ade984076574ad8c25357af43bf5ff39d3623cff74b
 DIST mate-screensaver-1.16.0.tar.xz 4918240 SHA256 fda3051346f4d23b383142fe5a86abb7e745c4a3fbcd9ac0c449fbc8a1cb5aa5 SHA512 e25d654ce4090108a0d1c38c3a7d7315c3c3b6226f694ad1833c6d2d26c6682bf52450809b33c75b1276c3ad6cbfe709df44556cdc9a0c2e7faa66373efcdc9d WHIRLPOOL 6a6c43d6f628f566d90288b065d89980a9173395e14914962b60445f21d8161297de595ac5af8650ccf3dcfb21a44fcd13c928eb48826149aba4ad5f417e28b1
 DIST mate-screensaver-1.18.1.tar.xz 4923504 SHA256 32bd34ac058e4a9206da5eeea07902f8f9321e76961f766aded605a71c08d135 SHA512 6e41a44e0d12af6080e69461a86b66b8ac4696dcf2b140d8e31b07945f4ac8848c872e9b1c07a6cf706042d3254567848c177a726038a862514471104242e807 WHIRLPOOL f8cd6bac92440c0ee45a587cf83d5060ed6e48bcbe99ffe641c158672162a4f04d5f52dc0eb34d6d77bf861a2775add439a9e25c5b752798c61fa998b336b20b
-EBUILD mate-screensaver-1.12.0-r1.ebuild 3160 SHA256 6898b22801604de088610f8aab5bccbd0d11b910e7655defc0dfaa2189034101 SHA512 2f31cccec9fc91380cbc37e84afe2133581d4de1be744e454e40b867ee8c5814d005dac0a39fe52d3f057642c408ebe6b856f1bdd5f757ae1b5150ba3a9954b0 WHIRLPOOL f42732471666ea355fe152186b8201cb69f5c2c5da30e388cbb370c25316b2f120fac6f997b3ccff4235b22cc2cf56d058927240f836fb1db4fae7d98f0e0b8d
-EBUILD mate-screensaver-1.14.1.ebuild 3202 SHA256 3fdd2133073d74ac01f7e2c6016890725401957b2f82156d5aa3bffc9372b453 SHA512 7bcca47b042d0b51418695ff4efdffcac8a80f007f7c36eb71781bfd0dc27390f80c4689b6629e870d5515a9c72c8b88bbd5445acf799126102f27305cd8e88c WHIRLPOOL d357291d393abf782e13dc086ced5b1c9e0c11b03e19dec02911ef36938eb2cbb51a8864c93a2f39f2f448bcaf1af218c1f9ba1342b1843316a0adc2de2ec6e5
-EBUILD mate-screensaver-1.16.0.ebuild 3202 SHA256 3fdd2133073d74ac01f7e2c6016890725401957b2f82156d5aa3bffc9372b453 SHA512 7bcca47b042d0b51418695ff4efdffcac8a80f007f7c36eb71781bfd0dc27390f80c4689b6629e870d5515a9c72c8b88bbd5445acf799126102f27305cd8e88c WHIRLPOOL d357291d393abf782e13dc086ced5b1c9e0c11b03e19dec02911ef36938eb2cbb51a8864c93a2f39f2f448bcaf1af218c1f9ba1342b1843316a0adc2de2ec6e5
-EBUILD mate-screensaver-1.18.1.ebuild 3102 SHA256 ecf3eb194f9a29d61c390db150b30d2514ad8a82f53599220d5ff92c9c4750eb SHA512 8c37625d21791f6d3968213390187c8f0d1b2c93718a92a8f9c19a3856207cf202b79f5c7066d1604372f70267b2ec0729b0ec470bd620c40f40fd6e015dd989 WHIRLPOOL fadbbced08258fc3855f3dac4d8c9793f69cfc24ff0d9ab343109e83b41bf62095c6575120d1bccfe83e5f2796516d77b938aabc04c88b3b2e4595fecc0db625
+EBUILD mate-screensaver-1.12.0-r1.ebuild 3161 SHA256 df4e46de1b2441f9bfbb2056ef6931cf624fef0f6a9cd9f81c300618ee964c32 SHA512 98d6bbb3cb567947fb72c9f6f4c701efde4ca0221b2d67b1e07f6ff1bb33cda88d2499605314210d7e44ecef3684a4efcd330cd1fe773524aca2509a36479e50 WHIRLPOOL f0c7d57a06cff00ea5915e93aa2da82573af2abfdd3734c8f135dbef6f425003dd4ac8f26d9f4518f3966550c293b5cfe79dcb487e3f4fcaa44a62dcc2808c64
+EBUILD mate-screensaver-1.14.1.ebuild 3203 SHA256 1faa55c22b1be8e9d30a67a82b84cc04c53a8f856a77b79960523c249bbc9c72 SHA512 3a5e247804609e8b670680188789909c324182416dc7902db724ab265d86784d3f5ec89dc5b323a08e46b73bc976684f1f81e258c10ce974a678764ef9c7c1e6 WHIRLPOOL d71cbf81b8d257043218ce1a93426759b6d588e38f0cc216fb59803c4224e040d4d74eea21044102c20ea05b44e11852786e918c96fe7d4d4926cf876e54d20b
+EBUILD mate-screensaver-1.16.0.ebuild 3203 SHA256 1faa55c22b1be8e9d30a67a82b84cc04c53a8f856a77b79960523c249bbc9c72 SHA512 3a5e247804609e8b670680188789909c324182416dc7902db724ab265d86784d3f5ec89dc5b323a08e46b73bc976684f1f81e258c10ce974a678764ef9c7c1e6 WHIRLPOOL d71cbf81b8d257043218ce1a93426759b6d588e38f0cc216fb59803c4224e040d4d74eea21044102c20ea05b44e11852786e918c96fe7d4d4926cf876e54d20b
+EBUILD mate-screensaver-1.18.1.ebuild 3103 SHA256 e2af1d2531a06b36ed92c8813a6253eee1ffd48ef7c0732c4aa888e25c03b9dc SHA512 e88dab619e0cb8171fe9f1785bfa089a43ad65356b2d9390d9f0e7b6eba69aaf6a9f3a614aa1751b77756f930cb391a065dc7476ddb5098e6fe17ab7ebfa8ca5 WHIRLPOOL c34573f03737da790651ed78b81a8f1e0e8446139a24af6c5d6c33c8457f9f526e56e303338343b99efd92eb2aa07822e96cc5ba943e3d817f319f22046fdc1b
 MISC ChangeLog 6570 SHA256 4e8fa441f51ac3ba5e5e3bd06dcaa9b3915d860965e01f265e009b2874f06fa2 SHA512 b03d64dd60ce271f6daa271f9d4c8445026201886a29ed95cebb1c9771323dc0491929bcb95ac1162bd7b13633c7874e5263ceef0cfd84ceaa1595c640f1703b WHIRLPOOL 1a6e64933ed9466e37200d16332dd67ed08b8caf784cd85b340c1e582331de8924edea0f7085d11f5d46649f1c80926e0dca29406fbc05f624c9159594db7800
 MISC ChangeLog-2015 3292 SHA256 8cb4c78a7a90d1ae4da8bbb8de1a7a402a563b790a88c7098e9def8e62c7d615 SHA512 b4ff895b3b0e8dd573a9a95f8e6682800ad92a1d647b51c98c7df1341fb7900bf4a7c5755b7c900151a59303357005d4cee1970ac394468817a1affccb7523c5 WHIRLPOOL 9958cc43e7949ea316798491488cb43ad6ddd3be2928b8610e2ef7f33a1f1d7b89148a712f2c731f1ed7f1dd04a81d0172bd3e271016d25e30edc85263d00576
 MISC metadata.xml 508 SHA256 818913e7a6c5290f88a594b47ed24c64d15cbb7f8520f97a6f462c4ca03e1000 SHA512 03f079381cf35a7c0d33ec93f9aba9e8924dd010e1d67ea64508d1fca59fe56685ccc06b2a721006c1144e16a217b32156b67205c9ee8e8d39410406612cc3e2 WHIRLPOOL 11b1305ac55ca69d11f3c30f435b05dbe4bc1fdfaa9a3f34d277f04e91105801a948ec35aeb534554d2e564a7375d0d66a50484ffd34605f2e9d3964fffd6cb3
--- a/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -86,7 +86,7 @@ src_install() {

 	# Non PAM users will need this suid to read the password hashes.
 	# OpenPAM users will probably need this too when
-	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
+	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
 	# is fixed.
 	if ! use pam ; then
 		fperms u+s /usr/libexec/mate-screensaver-dialog
--- a/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -88,7 +88,7 @@ src_install() {

 	# Non PAM users will need this suid to read the password hashes.
 	# OpenPAM users will probably need this too when
-	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
+	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
 	# is fixed.
 	if ! use pam ; then
 		fperms u+s /usr/libexec/mate-screensaver-dialog
--- a/mate-extra/mate-screensaver/mate-screensaver-1.16.0.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.16.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -88,7 +88,7 @@ src_install() {

 	# Non PAM users will need this suid to read the password hashes.
 	# OpenPAM users will probably need this too when
-	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
+	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
 	# is fixed.
 	if ! use pam ; then
 		fperms u+s /usr/libexec/mate-screensaver-dialog
--- a/mate-extra/mate-screensaver/mate-screensaver-1.18.1.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.18.1.ebuild
@ -86,7 +86,7 @@ src_install() {

 	# Non PAM users will need this suid to read the password hashes.
 	# OpenPAM users will probably need this too when
-	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
+	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
 	# is fixed.
 	if ! use pam ; then
 		fperms u+s /usr/libexec/mate-screensaver-dialog
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@ -1,7 +1,5 @@
-DIST gscan2pdf-1.7.2.tar.xz 393620 SHA256 28cbdecbea19f99a34a29a365077f961f82395c6485cdbf1aa95ad3f942c1984 SHA512 67bb0e15b2b7a354609838a5f2826a2d91b8941c95dc7f286a87cf0ad37bffc94dd7593307251a44c9af8e5267d97bf70cc5da57bb41e0274ee3318abbd933cc WHIRLPOOL 5a6e446c3e9f67950f2b7514f10f22762399eea2cb9302c4de2e69e682204a3df1f4918aa621ce47ea83315ad5f23ce6d004055b1cfb4aa348e8d935404e040a
-DIST gscan2pdf-1.8.2.tar.xz 409296 SHA256 d9fcf230e2c24e2a3cec0578e34709b3b2b95e4e5d6f84c177091d652a592896 SHA512 c58615520072591ae3e54196bae01b6b04015be279a5f512bb03340fe051ce75ff85f54bbf357ccefddbf54b11765c2a10afd736697a99aa20b4b8e999aef82f WHIRLPOOL 21e5f125c2a986def6a41a386ec740141038678f52dd70c595e9b6875feaa840e9ad7f1fd35c9d8f41e9906e6e1aa6a32a8da7cbc226d3231bd491f533476b7c
 DIST gscan2pdf-1.8.6.tar.xz 402532 SHA256 0674d9f1decc84b0abfa7849a66d0d50fc508cef2b901a3806addb017c4e4645 SHA512 3d33d0666e452b313a8dca91734188ab268e2fae9f0e259cd2142661a61697302bba5d602ee7395c1ffd7c87e0c52b422f9201a2b70f5211246aed359ff4092c WHIRLPOOL 59ed68feaff638f24add40f1c931ca3bfe476e26edf9c40ce0fd22c21b7a0aa43711c205362506fae0a4b5c4bbab95edfc0c35f9c56e4f70c3c7d3ea80d231a9
-EBUILD gscan2pdf-1.7.2.ebuild 1589 SHA256 1a7bdde96d4150dae3010a624c6c59ee3da5d491485b46ca6e7031af54db3ad8 SHA512 ab5e886b653e9ee98d2c24e404f059a28837e3d166a4630841d6e9320aeb8b09fa3c2bfdfc0847b92b93f307cd1bd60d1700546049c238bf1a88ea7e8165dd2e WHIRLPOOL d667b25db0b32f32082eb57b83bda1a2990f89c00c07615f3b6a97d1a1a0eb0e80b17c48c1471412f49620f1d9158f3c83e8d27e2de08294ead4a1820dd195ed
-EBUILD gscan2pdf-1.8.2.ebuild 1589 SHA256 1a7bdde96d4150dae3010a624c6c59ee3da5d491485b46ca6e7031af54db3ad8 SHA512 ab5e886b653e9ee98d2c24e404f059a28837e3d166a4630841d6e9320aeb8b09fa3c2bfdfc0847b92b93f307cd1bd60d1700546049c238bf1a88ea7e8165dd2e WHIRLPOOL d667b25db0b32f32082eb57b83bda1a2990f89c00c07615f3b6a97d1a1a0eb0e80b17c48c1471412f49620f1d9158f3c83e8d27e2de08294ead4a1820dd195ed
+DIST gscan2pdf-1.8.7.tar.xz 403676 SHA256 91ac65d3a331109bcb4995e3a379991cb50815dab7f8e3fe68e055bbc271f78a SHA512 990338c9dd9bdd5685a40792803b3077e27296c5a3363471e55d3297a815e1c344bc94e3430981764531fb02380d7d7b1c253dda5e9e65e86e632ae8371ca72d WHIRLPOOL 2a1eb67942efb7ad703560a228d3a0cfe09081e30b688c68d2a7621a5ccfce73ae7711db1d6b02b9b57462ed0d94c7ff2a16da8ebd7a25beac08098077346768
 EBUILD gscan2pdf-1.8.6.ebuild 1670 SHA256 03dbd33510b056ac48912da6cb3f18c75b5c730479b692c95b9bd707d262dc65 SHA512 a67f54ab33bfc53571e4a87be08e9a561c731360fed7737baf13ec2696ad3b4a15b149e9be165742dc25b2829995f7e36bc0cdce58fdfba0e590f45a89779ceb WHIRLPOOL 16dab5a48dce34088b7230d27a447050a3eb6b1eb0cec789106efebf29e85ed8ef2641bde02a8efb48ba9eb9a6e4899e9f9a980043b26b0c4863e0890525f9e4
+EBUILD gscan2pdf-1.8.7.ebuild 1733 SHA256 4dd0e4ba6d019e7e1a320ff90aa717a94dc30fb14f4bf62e86063f88d81374cc SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d WHIRLPOOL 5df92c7c6507cd8d1f493ac23f9b773a7c698bb74bb3baa09c9b9525f34dc91b21089a3a5d86ffdc373aec68a31d676a838a6750b7a32087f8cdb72a18a941b6
 MISC metadata.xml 439 SHA256 fe0ce730516bb9a9d15b43abd2b150e5a37a55dd46fa74b16779cc7dd86c2e27 SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401 WHIRLPOOL 622d34572b44041a0763005814401166ac60342e4173987249dd5da9a442a7b0ca36713e59317821097066ee4e78921bfde26af33a4097c42396721bef62ff3a
--- a/media-gfx/gscan2pdf/gscan2pdf-1.8.2.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-1.8.2.ebuild
@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils perl-module
-
-DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
-HOMEPAGE="http://gscan2pdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# OCR tests fail with tesseract[opencl], not fixed by addpredict
-# and others on Wayland and the console
-RESTRICT="test"
-
-RDEPEND="
-	dev-perl/Config-General
-	dev-perl/Date-Calc
-	dev-perl/Data-UUID
-	dev-perl/Filesys-Df
-	dev-perl/glib-perl
-	dev-perl/Goo-Canvas
-	dev-perl/Gtk2-Ex-PodViewer
-	dev-perl/Gtk2-Ex-Simple-List
-	dev-perl/Gtk2-ImageView
-	dev-perl/Gtk2
-	dev-perl/HTML-Parser
-	dev-perl/Locale-gettext
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/PDF-API2
-	dev-perl/Proc-ProcessTable
-	dev-perl/Readonly
-	dev-perl/Sane
-	dev-perl/Set-IntSpan
-	dev-perl/Try-Tiny
-	virtual/perl-Archive-Tar
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	virtual/perl-threads
-	virtual/perl-threads-shared
-	media-gfx/gtkimageview
-	media-gfx/imagemagick[png,tiff,perl]
-	media-gfx/sane-backends
-	media-libs/tiff"
-
-mydoc="History"
-
-pkg_postinst() {
-	optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
-	optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
-	optfeature "scan post-processing" app-text/unpaper
-	optfeature "automatic document feeder support" media-gfx/sane-frontends
-	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
-}
--- a/media-gfx/gscan2pdf/gscan2pdf-1.8.7.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-1.8.7.ebuild
@ -29,13 +29,13 @@ RDEPEND="
 	dev-perl/Gtk2-ImageView
 	dev-perl/Gtk2
 	dev-perl/HTML-Parser
+	dev-perl/Image-Sane
 	dev-perl/Locale-gettext
 	dev-perl/List-MoreUtils
 	dev-perl/Log-Log4perl
 	dev-perl/PDF-API2
 	dev-perl/Proc-ProcessTable
 	dev-perl/Readonly
-	dev-perl/Sane
 	dev-perl/Set-IntSpan
 	dev-perl/Try-Tiny
 	virtual/perl-Archive-Tar
@ -54,6 +54,8 @@ mydoc="History"

 pkg_postinst() {
 	optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
+	optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
+	optfeature "adding to an existing PDF" app-text/poppler[utils]
 	optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
 	optfeature "scan post-processing" app-text/unpaper
 	optfeature "automatic document feeder support" media-gfx/sane-frontends
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@ -1,7 +1,5 @@
-DIST pqiv-2.8.5.tar.gz 108686 SHA256 7895fe0cb7b18d9e40d0353df2ec964aed4e1bb7fa7e1ea9a1e00858d3a89ce9 SHA512 dc3a7a49a781002e9234982405b3a3633673b523ab4db1dbe52b2ad3f3a859920f3087f0f492df5a54560c7048b5587bf976ae37db86669ba5941b81c2f21906 WHIRLPOOL 05077b650dd739634ab3b21086f926b12e6fe01b2c047d497241fd1a5cba4da22cc9ae68e560613b3eedefe0f90e76164aebe001981c136a11601ad852faebe3
 DIST pqiv-2.9.tar.gz 133823 SHA256 e57298ae7123bd6b01b751f6ef2d7a7853e731a3271b50095683442a406da99c SHA512 0a509d5d4b41682f86f4b813d63f3f7f8f3977ede0b8b1649a2adc188ed83923147b8bb741ba7f85b4c1dd7a9612fca3fec44169364042be4db44ef53d813ab7 WHIRLPOOL e40e4aab7b4df92cc7bed911531be4e84062196ca1fdae867b05da38f28c448a34475a31865275f0d38f3efedf1f07af42f305fcb6621a16a73f7050cb327652
-EBUILD pqiv-2.8.5.ebuild 1745 SHA256 37743b1e9d3035cabcd11532cd5eca22f97794a3019f403d3c16fe43381f94aa SHA512 cc46e5300fa64e815f11d8c544bdb8f4729dbfdadbbb796c9b6667ddfe2fbb66c1861a0f4a6b2ff8c5dd54a57a37cfe5026a5bc0268b1d9f4b21b1ad5bdb1f38 WHIRLPOOL ac07b8f4f74cedaa80316da2b00b0f290854a88c5627f3f6a5edce2a9cf8b43b4d8b1b4d8b8c0e7e3c3d21761faaa1852f7e5ce199f37f8aa48c83458d90ccac
-EBUILD pqiv-2.9.ebuild 1800 SHA256 e1a23c600db43fc1573ac75b1fffc3ffc4dd13da7d385aafd1d2242209cad62b SHA512 33ddac017e8c65c6df0b91ee20483a8bb486031c306e992593fb72f60740f8ad832eb8b8200aa52f89d9467dedf652bcebfdec5cd70a6063a25f5962c468288a WHIRLPOOL 75d39744d940eb1d7397d97726f1b70782dfbc3249ec6d0c4628b7e2326244d7bfe3980b305d60502b39bb9072358d17b6a781adab25622a2a01c43827713b88
+EBUILD pqiv-2.9.ebuild 1798 SHA256 ff4e3f73b73fa75cd0616c514c6090a115c16d4ace3b95ca23646b6061925d9c SHA512 1285d38a37bce7f5670f7e39136a834b60af8c71db12bf84a962636ca9da5c27e162fe71e243f9c30689f2f2eba5277c121305d8e4f11f50fddcf635a60dfae9 WHIRLPOOL 3816ba0dafeefc878cfce1db8f90e5d6d85ca69f6ca90d195e173f41263c8ba2f56dc5a5d4fa121d0c04df84501ac78d566f5e413593a282b850743b7416854d
 EBUILD pqiv-9999.ebuild 1800 SHA256 e1a23c600db43fc1573ac75b1fffc3ffc4dd13da7d385aafd1d2242209cad62b SHA512 33ddac017e8c65c6df0b91ee20483a8bb486031c306e992593fb72f60740f8ad832eb8b8200aa52f89d9467dedf652bcebfdec5cd70a6063a25f5962c468288a WHIRLPOOL 75d39744d940eb1d7397d97726f1b70782dfbc3249ec6d0c4628b7e2326244d7bfe3980b305d60502b39bb9072358d17b6a781adab25622a2a01c43827713b88
 MISC ChangeLog 2992 SHA256 41b025840c651ea0cf8c1f5d2e69867a40a858bc46ebe7692a03fcab32375f90 SHA512 e53bfc47eeb14806238b1ba22a4f3e3be0f195c413314659527b6448162405ba00ea120e6e9c6efbf8a614d7aebd74f62f40cfa142f91663ff21de3721c1d5dc WHIRLPOOL 878dbe91eebcbb9f4548475b6c24edd1df73d4a8adb63517c3c95d69de2d0178375f762da42746b2172bc212f708f5c1cc1240d4a7192e4e577b8151026300b4
 MISC ChangeLog-2015 5575 SHA256 09eaf4458d2024168f92bcf7ae67c19bf7c3821c3e3af394d21b113bb7d53696 SHA512 e9e7f185aeb9107c755879cff8ef5d495b6093d27f3082a5ebc8e8a1da971a3def1e3d6ebf50f8b47e0a6bb7bdacc8b02986911837cebfd69b95a9f2d9209280 WHIRLPOOL d3f691ace51d2e77df6e6bb632de242bfb396f9488abc71748d43fd616da3bcfbc826232df10c4cca7ed8a3d20978a1c2b0b1de4c73540a394100ed0b11a65c4
--- a/media-gfx/pqiv/pqiv-2.8.5.ebuild
+++ b/media-gfx/pqiv/pqiv-2.8.5.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info toolchain-funcs xdg-utils
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/phillipberndt/pqiv.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="powerful GTK 3 based command-line image viewer with a minimal UI"
-HOMEPAGE="https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme/Linux/pqiv/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="archive ffmpeg imagemagick kernel_linux libav pdf postscript"
-
-RDEPEND="
-	>=dev-libs/glib-2.8:2
-	>=x11-libs/cairo-1.6
-	x11-libs/gtk+:3
-	archive? ( app-arch/libarchive:0= )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
-	imagemagick? ( media-gfx/imagemagick:0= )
-	pdf? ( app-text/poppler:0= )
-	postscript? ( app-text/libspectre:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		linux-info_pkg_setup
-	fi
-}
-
-src_configure() {
-	local backends="gdkpixbuf"
-	use archive && backends="${backends},archive,archive_cbx"
-	use ffmpeg || use libav && backends="${backends},libav"
-	use imagemagick && backends="${backends},wand"
-	use pdf && backends="${backends},poppler"
-	use postscript && backends="${backends},spectre"
-
-	./configure \
-		--backends-build=shared \
-		--backends=${backends} \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--destdir="${ED}" \
-		|| die
-}
-
-src_compile() {
-	tc-export CC
-	emake VERBOSE=1 CFLAGS="${CFLAGS}"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
--- a/media-gfx/pqiv/pqiv-2.9.ebuild
+++ b/media-gfx/pqiv/pqiv-2.9.ebuild
@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi

 DESCRIPTION="powerful GTK 3 based command-line image viewer with a minimal UI"
--- a/Show more
+++ b/Show more