Sync with portage [Fri Aug 18 09:09:09 MSK 2017].

2017-08-18 09:09:10 +03:00 · 2017-08-18 09:09:10 +03:00 · f7102fe02c
commit f7102fe02c
parent 252a663aa7
10343 changed files with 34090 additions and 28941 deletions
--- a/app-accessibility/simon/Manifest
+++ b/app-accessibility/simon/Manifest
@ -4,7 +4,7 @@ AUX simon-0.4.1-no-qtwebkit.patch 639 SHA256 891927d6d82325b94821ba65e4c5d050445
 AUX simon-0.4.1-opencv-include.patch 729 SHA256 69cc66f5ca2ad9157f6182ba4230b0b6d59890394e64d318b3157e73bc421fa2 SHA512 f84629d51a241589c9977dd2ab412dd155435a27cb5544848b6fe73d2a292bf3aef2b07ede226e5a89d616a50f50fa6d505a281118ea7f6f333e3479c423ed0a WHIRLPOOL 15a949f7cdbb3374235ab4908aa3ade16848fa0caff935bd22fe9437920ade18560e3de8f3056b633906be5c8aaaa4726c34dc5f484fa82358e867c1d12b0594
 AUX simon-0.4.1-sphinx.patch 881 SHA256 10afe6ebfa671d689e1eea9721d885c6092888c13390ca237d681eb960559df3 SHA512 93b0ff4ee18a51b868a89a4baa93a0b4f19ade6e0b3b7ed876f128eb3de480e8df8625abfb31d586cb0159092cac4e3e911cfcef47c5242c138019ddfb87f6d8 WHIRLPOOL a6c1663a946d27c904ac0456c3427039c3526447ddd69670bde5bffb45feb200b19d37ad51d444a7f188490f30299df279cacbdea0038d80b184fd479502052d
 DIST simon-0.4.1.tar.bz2 23856024 SHA256 8d55bc3f607a89e15efd51b844d93daf67d9967ad243f54efae324754859342d SHA512 d7349af3ec2482f18d8407891eeea7beea75630cc85aeade9f4105e3b84e82fde6284338688bbf84824d43c68de102eb34f3c21068cbe8a3307aa0586732b30d WHIRLPOOL 4c512bdfed8676cb5cfb896eacb14c66e3497abebe97a4faeb6804feb8ba36ed9101bc79a6efa573470d4a4d7eb6dfc94e3315dac488554563d35a397a066acb
-EBUILD simon-0.4.1.ebuild 2171 SHA256 e57cbe6cae33ba27f0a03466ba5379ee36616c2b3292848dc336900a433c8a2e SHA512 276bdc4cc74a1f7251f5806badc167d75fbffae665df690d1cc55ede23bf861b9927043f244662bc909f20acc1c334c5a8155ed7b72bfc9649a6447e54d6676d WHIRLPOOL add019b3c54df30d8d3418c9b48298ddf29cb968edf6d0bc23624474ba6b683f10c110426d8888214ae94d5f0c921410626b47101f86aa79e07f2a1eda4f2da1
+EBUILD simon-0.4.1.ebuild 2182 SHA256 9dca97fadf33ec765a4ec99653cc4a584e1cb025a2ce805fe25060e7579c87bd SHA512 d522067cf366df0c7710d0e2d133c55dbd05661dbda010e0f5c49b5cb80cde91dc16412492447414ba8f2be0e523a2cf4faefacff2d7835198645ff39884ddb2 WHIRLPOOL 70ea3d897c680d923cfa3c6619d4c9a0646caf12b8148fbfa0b937767dd607021ed4ac41308c7ea5d06e1b8989c68adce91d784589ccd34a65213b7a0b782544
 MISC ChangeLog 3884 SHA256 6475fca89f717ceeb8f91444b7acbb53ea8ad8c5355e5665d64ce3eae3a564b2 SHA512 baa166764a18557217ef43a672ab94d0304ee4e610a78367f1f98bef5cbeb1f4b41af2f680a71b1d1a7d7786bbb3823e169bc8771c8fc921a724dc3c8d2cc043 WHIRLPOOL 239a781e70b4f0fca6c4efa238dc44898018256068d6032b21f30ad416c4b1076f863da0240bb141d6e08aa5c3d497f10a2563a191efa87ba5238d81534795b3
 MISC ChangeLog-2015 1665 SHA256 190fb29a5103cf15b43d90f21a5614ff5058703f4e8dcba6ed600d43b9326597 SHA512 9c5fd52a816da3b906c29526bc3a3fa9b728661ee6c77f2e03677b384afc6e371aeb14fb85d768b8c4176d9e5188e2b29f618fabf43b8afa47d8c5bca2c513fd WHIRLPOOL 77b3a4ddebb29e739c219610510074b2f9f793c94052efab156a096e48f9f416bf7e5a68d5707597bff0ba88b6f5261ceb1b240ab787688c720bc93548278a59
 MISC metadata.xml 512 SHA256 600b3a2b87911853417d35c5bed0ddd920fb46c4c365be123350192f68232be9 SHA512 38a193010a16aaec6a89335180e8cd2d27f4228c9011c88779fb3eca0cfb6a182e8268d30b31b94fbf39c7dc93159e31ae0295a3d3e7bd0c20946d5725a4779b WHIRLPOOL fc2b936dd60dc5606be9a0b091dfafc4c9d50b467428ae5f2296995be34aa6238a4357defd5b2ddd4c136ed0a2c1ea8c6a771c3a09a7214abf49ed826b93d629
--- a/app-accessibility/simon/simon-0.4.1.ebuild
+++ b/app-accessibility/simon/simon-0.4.1.ebuild
@ -26,7 +26,7 @@ RDEPEND="
 	dev-qt/qtgui:4
 	dev-qt/qtscript:4
 	dev-qt/qtsql:4
-	kde-frameworks/kdelibs:4
+	kde-frameworks/kdelibs:4[plasma(+)]
 	media-libs/alsa-lib
 	x11-libs/libX11
 	x11-libs/libXtst
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@ -2,17 +2,16 @@ AUX augeas-0.10.0-gets.patch 548 SHA256 10b57fbb769625d8677bf07f400cf94589b15a2f
 AUX augeas-0.10.0-libxml2-pkgconfig.patch 635 SHA256 ee4aea080eca0e1de6b93fc7ffc9e4105bafc9625f67d77e3490ab43f58463db SHA512 69d8398e0a6dce8959af0a83ab3e3767be1a9c5dda9b3ba03e6305a79b05df04652f76ff087dd5e82a2d46af9d042df0937b2ec885ca39ca2a05ad4df1fb84be WHIRLPOOL 7db91af93c5bf6b62a0ba808a2f01325e93e5719a58ab8591da2f035001544907c56047151641973c9a542d3e04cbc67de1c2794abfa000b58c54c27889c1669
 AUX augeas-0.10.0-test.patch 1991 SHA256 42fcbbc1c8dbbe5c5ac3d1e04bbcb3eccce460de491dad4f8142f35f6fdaf33b SHA512 42e1c1b9024aab5f6d425c9fe421a3d5a81fd2e47908ad489aa8ea5044006b6c664810c9f8a12ad355217d4614b653f2a34000cafa8985ddc42632306cfb04a8 WHIRLPOOL 2ed6d9c3537eea7e3de425fc1084ac1b803c4ddf19d9fee7e26ea3796dac43d623a1a6d9f6487537fcf33e242bd35e2e4018ede2b9ddb5d24c24373e079c0455
 AUX augeas-0.10.0-test2.patch 1713 SHA256 d8efe22028a65fc5346742fde4bf27550db06c43a030da83f7c2eada54cc0b0e SHA512 8c8b5d0e1d182a30db1cbb1c61a7594109e569dcb280433314eac4879ee6fc10bb415ecec1d10f7b0e85e5b0c1703774a16b9d4662e2b6c18767d94f37d60eb2 WHIRLPOOL 889923e71151c24b2742307bdead8bfa2c49f70689567028bb9b204c98883510ce046d432f9e7893f58db968d6c239f408b1c0fbca18eb7fdced898393a592dc
+AUX cve-2017-7555.patch 5771 SHA256 c82638220c1136000539db1e084abf10efd0d41e0d02a226e6b6bb8f5bbcce6e SHA512 209364d6d8af5b755f8675b2eff8fa8e240ec364fc97e7a4644f320aad94f64600120d3da7d67a7a4f243acace4a41d13b1dbccfbe0c2021853adb7f3949c8b4 WHIRLPOOL 7714fa4be323f5ff7c8b50fedb48c95bd9f10f2ad26d0480ff2a73eaa3785e206963cc3e44c2ba1207a6e05ddc18a85bd65ca68bc40ec5108510c5ed7f64a74d
 AUX cve-bunch-of-them-symlink.patch 2415 SHA256 4db27194c976fedec981d8db6129422ad03456d80026d4a707b7ebcf74af072e SHA512 a702cce3f448cef9ce42e56d3ce7e6ceb8c5054031e6b1a9465639b4462ab4c7427f826a2783e12e4dc90f2bc6896f473ffc0e4d8d37e6d55cdb0192315eddb1 WHIRLPOOL 2791834ba2eed688451983c4a2544198e81d1fdf16cd6a9fde811cbb075643e0b534006e06561c6125543db1dc00731bc297330c91e1e4dc0367318e96c2a188
-DIST augeas-1.3.0.tar.gz 1983656 SHA256 80763031af76515a8ea66013ddc3c466742a15d2e907c7c8e2e3b7410262e2af SHA512 92cc2cf83faa42e83621fe0f73fe9f7247d802f17da781e51d068056d20b1645de1f0ea0d5070c0d5729a3f6554d64a95e31111bf3e44b959386559619843e79 WHIRLPOOL 4e4c3374adca662ce90f94eb204028526ec0c3a9b0bc6644515994b88e289f3e1aa5f2b6ce7c28103a2a64e5185c8ba64d55e1a448e14f745d53aec4bf20e8b3
-DIST augeas-1.5.0.tar.gz 2072169 SHA256 223bb6e6fe3e9e92277dafd5d34e623733eb969a72a382998d204feab253f73f SHA512 4683668c6562e14cd39bda69f2fa7f6db5f5a76386521a9b10c41fa2031c10ff158f682b56066d0525554c4229677c64e92f6453f75d185d367bc7481fc10695 WHIRLPOOL e4bd492320cdfcf5c8470b8e4c0fb35077b1190bb8c18b245d54f532badc4975ac564fca97ec6f8f039a77a771b16d0354ef53d02ccd5c912ab9f91ca391d282
-DIST augeas-1.6.0.tar.gz 2076723 SHA256 8ba0d9bf059e7ef52118826d1285f097b399fc7a56756ce28e053da0b3ab69b5 SHA512 c07f8638b9d22ceedb2951d658eb578d5757376e0cda8d7d0e075ae0c3347ef98542fb99e18956d404588befe1c92702388cf33337f4b4ee45f830d85c04b06d WHIRLPOOL 39698ab73e2828e906b9a508643e25ed08beea1464821fb56012ed3c0b721aa8c2feacdfa6254f93eae1963d1d2ecdf2b3aeb75897722243f6b9662ecff8bf7f
 DIST augeas-1.7.0.tar.gz 2156168 SHA256 b9315575d07f7ba28ca2f9f60b4987dfe77b5970c98b59dc6ca7873fc4979763 SHA512 d2a5580ffa69c0229cfae85261cf7740b268ceac35f076aef6a7e8631497e5726530adfdb85f715ebb102f28af98861b4fa29d7e3eaa37a5dafff8eaf817befb WHIRLPOOL 29a8aca382592a4492e0d5153525fe26998729f1a7a482dede5275af712dce49ee08f700549dc8f96790ec6031a0a32e5017e059cf4feea0067f1424b80021d5
 DIST augeas-1.8.0.tar.gz 2164146 SHA256 515ce904138d99ff51d45ba7ed0d809bdee6c42d3bc538c8c820e010392d4cc5 SHA512 bc7b450b7ef20b7c5bac1b500c89569673a164d32e0f29b5ca100657d0100fcdbb14027d559e206b5ada2c389ac3641181a97cc0c5dcceb1ae1e9932b2decf2c WHIRLPOOL 5f5dffac092bc241bc81b853ce05dd57530aab54e83668007e67dd29ca95583d7dfaebae75f96a822d5231d6bfd16aca30dc17b5b4d7ee6c2096fb9b917a4536
-EBUILD augeas-1.3.0.ebuild 1114 SHA256 505d21a638f53da4f7a7181adcb96bbecffd7a7d8168f7fe208a2047b3737902 SHA512 281df63aec57f8c8530a44181be25f1f75e8996a1ed9152a3c4fd4adf9ffaa22c2f5261f1ce63036bd497dec681248c0361d2f8030f8712ab8c46ebec632185a WHIRLPOOL 111c4f6882e432dd67c5db60b90283801f141698e8a1df0064d5c230cb0b205e577bf70748fc10b2b1b7c0a697d9b0be4ac03667138be0747fb81b02a0784cf9
-EBUILD augeas-1.5.0.ebuild 1121 SHA256 e48192d10f2bac7b90f06c54659e2a3c8d140ad8749122ae3716e2eded18b1a0 SHA512 6ce6e8f8c4ac6bd8e259993ad5b0dfa2838f0b1e1461a5f80fc0d42e17bdd6e4793f63122b64c087da164f028d69727486cd74ccb70c3a683bd6c64d071bcf4e WHIRLPOOL 2aa59013e199eb2790e6e0f80cf00b4701cf4d7da78d89157e92bf0d20134be27cd91df994deb5420444cc026a8bbe8360382e05a51de76e271d1691f297abd5
-EBUILD augeas-1.6.0.ebuild 1122 SHA256 1ce96cbbe1ec455d8e4c68ac20c1e3578c1c50cfa96e58984c96ae3ad6a6ecf4 SHA512 12361c95e4908fb67f2570eea8df1d959a1065fed0091514df522489b54227af1debb9e9f64802805c65d5ff077f8eff53da31e704fb5618f824e35897b7abcc WHIRLPOOL 4b0bdbda012b70501c8c04d508f21f2e9974a42d1551e0e924b32bd0f7bb5ba13317ee9949d3ba36c12c479b8d3c5c1424604fd66ced251292f5e0ea4a269b58
+DIST augeas-1.8.1.tar.gz 2165325 SHA256 65cf75b5a573fee2a5c6c6e3c95cad05f0101e70d3f9db10d53f6cc5b11bc9f9 SHA512 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b WHIRLPOOL 71955a1a42294021f69bb9715439b248f341d06b7c2d72a72537abe3f77c8e990453a12ee99ab3ba0c979ad6fd21ef5056c6e85dc8bc01a2e9c5405389030df0
+EBUILD augeas-1.7.0-r1.ebuild 1170 SHA256 0432c3bdfd73a440ce3873616a9d6a9d48a0687cfb1c75f1a0d866abc29f4faa SHA512 9062ded3c443b8dac190875bb5da2f4cc34f7ff0d1104a98c9099874a891e954eae42e09747cdde53ae7bd3af8a82090d4b3739405945e387d8ddd6621fb09df WHIRLPOOL 0493638832f0513c44c26727c0134285cbbbe106a9e57db4b8e4372159ad887dc4830b1eebc447715aa24257382bd642552c28deb589cd40bcae5965af6df1ce
 EBUILD augeas-1.7.0.ebuild 1115 SHA256 2761bed4c806366633eb5edee079a21b9418967b78701b5c11c2a3d6d0c8dcd9 SHA512 0e4dc7451ce05186ff17d922680663cde318714d0e5b41bd3e32d01c75cc58f8cb212a942fd5a415b447f4f9248e850f51a18a5033f05e44e1e85ac9c82ffd13 WHIRLPOOL c94314c26316db85e98e5698efcb16000052e1d243d7036e541de54875b92167a8ebeb2666cf5ad3580da56f1372ea809ded873519a72e9834d4ac3a86421b74
+EBUILD augeas-1.8.0-r1.ebuild 1037 SHA256 79964179da157f1a2e18f8b6c87b3a14644c750115a8dcd0abf684e7ed4b45a2 SHA512 74c1fa2664b4181b3dfbc09303e2d67a6a02e05583dd908b440671f16cd419641f1a4d7c0c21f076a1838c6ff1e5018af4a3eb80847bf889aff68b56aec86d17 WHIRLPOOL 15f4e28d89e832831af92f5b9e364af2dc224bd7d75b5f5239a8864fcff460a74c7fe289c9eda8aadd63d6a2e56335b373f4afd24058e2b439bb2c336349e053
 EBUILD augeas-1.8.0.ebuild 962 SHA256 50da0692da3b7e89743e6c2a174d9575368f3889d711c0f6bbea74f7fff56238 SHA512 af15f06ecdb8f98214e2d99923cfaa57e7154c9b1995a59e9c1fd52940a65cd817ed2e277d302d3ad8680a5755393fe9e0dc8a3defa03626f351fec0dd6908d6 WHIRLPOOL c999185e2a597931fc805417089e51c6225ca0016262184b602441be35be4ca8bfa7e9c8a9b1ddac182f44954768d4aebe6e4ad92a5625f29896259ccdac7973
+EBUILD augeas-1.8.1.ebuild 1002 SHA256 4a082ede1be63757ca06d2313fb849fe8edf9f80ec2a86f6d3d49f9bd8b02bdb SHA512 29fb3331e5e4b0a128e3226f8c99047a4de333a6a1190ba53df9a580596be775f2dc6c98b72c7fb7691228bd6fd6eb388ea4a4e5d4de6a094d02d6ef333856cf WHIRLPOOL fc2e6a8dd28a5d4926fa4652f8be11f55d34eb406fb7d62e7daef18c3926e5658f05d75ae9f28dcb4aa8e790de2db18d3f82e606445c69d7dd6d2c967fd40bfa
 MISC ChangeLog 5096 SHA256 a43458b42603d43012d5331d5e373c03b92a75c3b88b9177d1238bf283bf17e1 SHA512 bf7e92ebbb1d714c13995ff12020d08d990a359c2772269d39869dba387e98b37caa4802ea14a09540ac0166b0a5d43dcef83961bfd74f2e2dcbdc1332995340 WHIRLPOOL a724244353b9c7cbb239cdb9e18c04fcbfa27e0c40990c3ee58c21389b8ecb7c3ac960ab2ed8861da2902be95d6cb1b062f0a2ee02ebdbba58dc87b9bbd9af75
 MISC ChangeLog-2015 7867 SHA256 2179c62fc1afc98a4902b960d3b945c6107fb5c7c12588bf81063d81f9d386cd SHA512 1467fb11d900332b57f356b58c470f7fcba3ff8b17a16b744cdef519922c561099a2c5c4e7c0dd0763c2333e548c8fb8428eec644944c241a639055788d35daa WHIRLPOOL bf03260b28195b879bafe06f584f824c24b9c353f9544baeb559f9f30dd20212ded555245b03e4ef16088bb7f249ee23485f4829920a37ace2d54d0e3ca04c6c
 MISC metadata.xml 693 SHA256 555de5a52dca8c4c99b3d03a5d62bf4c266e38a1ab1bb83d12efc105660a5f9a SHA512 1fcdcea259ed6cb652d08e763ccc67bee7bd5da9a7d3600dd492beaec7300868a47a7afdd71950ca8631886042428fce36cc17602a0776a9fa489f0fa2d27436 WHIRLPOOL d9cd4eb749649994fabba2e927139fa3d7a64cd515082996bcd0e2baf59d4dd6ceb1224c8f2424ad72f5da72cb6fec6e4f6ae62e6f2b2b15a4e4dbfa4fff7142
--- a/app-admin/augeas/augeas-1.7.0-r1.ebuild
+++ b/app-admin/augeas/augeas-1.7.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -22,6 +22,10 @@ DEPEND="${RDEPEND}
 	>=app-doc/NaturalDocs-1.40
 	test? ( dev-lang/ruby )"

+PATCHES=(
+	"${FILESDIR}/cve-2017-7555.patch"
+)
+
 #PATCHES=(
 #	"${FILESDIR}"/${P}-gets.patch
 #	"${FILESDIR}"/${P}-test.patch
--- a/app-admin/augeas/augeas-1.8.0-r1.ebuild
+++ b/app-admin/augeas/augeas-1.8.0-r1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=6

-inherit autotools-utils
+inherit autotools

 DESCRIPTION="A library for changing configuration files"
 HOMEPAGE="http://augeas.net/"
@ -11,7 +11,7 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"

 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs test"

 RDEPEND="
@ -22,12 +22,9 @@ DEPEND="${RDEPEND}
 	>=app-doc/NaturalDocs-1.40
 	test? ( dev-lang/ruby )"

-#PATCHES=(
-#	"${FILESDIR}"/${P}-gets.patch
-#	"${FILESDIR}"/${P}-test.patch
-#	"${FILESDIR}"/${P}-test2.patch
-#	"${FILESDIR}"/${P}-libxml2-pkgconfig.patch
-#	)
+PATCHES=(
+	"${FILESDIR}/cve-2017-7555.patch"
+)

 src_prepare() {
 	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
@ -36,13 +33,15 @@ src_prepare() {
 	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
 		addwrite /usr/share/NaturalDocs/Config/Topics.txt
 	fi
-	autotools-utils_src_prepare
+	default
 }

 src_configure() {
 	# Needs to implemented
-	local myeconfargs=( --without-selinux )
-	autotools-utils_src_configure
+	local myeconfargs="--without-selinux
+	$(use_enable !static-libs shared)
+	$(use_enable static-libs static)"
+	eautoreconf
+	econf ${myeconfargs}
+	default
 }
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
--- a/app-admin/augeas/augeas-1.8.1.ebuild
+++ b/app-admin/augeas/augeas-1.8.1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=6

-inherit autotools-utils
+inherit autotools

 DESCRIPTION="A library for changing configuration files"
 HOMEPAGE="http://augeas.net/"
@ -11,23 +11,19 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"

 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs test"

 RDEPEND="
 	dev-libs/libxml2
-	sys-libs/readline"
+	sys-libs/readline:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=app-doc/NaturalDocs-1.40
 	test? ( dev-lang/ruby )"

-#PATCHES=(
-#	"${FILESDIR}"/${P}-gets.patch
-#	"${FILESDIR}"/${P}-test.patch
-#	"${FILESDIR}"/${P}-test2.patch
-#	"${FILESDIR}"/${P}-libxml2-pkgconfig.patch
-#	)
+PATCHES=(
+)

 src_prepare() {
 	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
@ -36,13 +32,15 @@ src_prepare() {
 	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
 		addwrite /usr/share/NaturalDocs/Config/Topics.txt
 	fi
-	autotools-utils_src_prepare
+	default
 }

 src_configure() {
 	# Needs to implemented
-	local myeconfargs=( --without-selinux )
-	autotools-utils_src_configure
+	local myeconfargs="--without-selinux
+	$(use_enable !static-libs shared)
+	$(use_enable static-libs static)"
+	eautoreconf
+	econf ${myeconfargs}
+	default
 }
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
--- a/app-admin/augeas/files/cve-2017-7555.patch
+++ b/app-admin/augeas/files/cve-2017-7555.patch
@ -0,0 +1,159 @@
+From 4cca923b732990bec0c699b2e69911c2221b2498 Mon Sep 17 00:00:00 2001
+From: David Lutterkort <lutter@watzmann.net>
+Date: Fri, 4 Aug 2017 17:13:52 -0700
+Subject: [PATCH] * src/pathx.c (parse_name): correctly handle trailing
+ whitespace in names
+
+When a name ended in whitespace, we incorrectly assumed it was always ok to
+trim that whitespace. That is not true if that whitespace is escaped,
+i.e. if the path expression is something like '/x\ '. In that case, the
+name really needs to be literally 'x ', i.e., we can not trim that
+whitespace.
+
+The incorrect behavior led to turning '/x\ ' first into 'x\' and then,
+because we assume that '\' is always followed by a character inside the
+string, when we removed the escaping '\', we would read beyond the end of
+the intermediate string result; if we were lucky, that would lead to a
+crash, otherwise we'd continue with junk.
+
+We now make sure that escaped whitespace at the end of a string does not
+get stripped, avoiding all these headaches.
+
+Fixes RHBZ https://bugzilla.redhat.com/show_bug.cgi?id=1475621
+---
+ src/pathx.c        | 27 +++++++++++++++++++------
+ tests/test-xpath.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 80 insertions(+), 6 deletions(-)
+
+diff --git a/src/pathx.c b/src/pathx.c
+index d292cb30..9a2f9c76 100644
+--- a/src/pathx.c
+++ b/src/pathx.c
+@@ -1710,6 +1710,16 @@ int pathx_escape_name(const char *in, char **out) {
+     return 0;
+ }
+ 
+/* Return true if POS is preceded by an odd number of backslashes, i.e., if
+ * POS is escaped. Stop the search when we get to START */
+static bool backslash_escaped(const char *pos, const char *start) {
+    bool result=false;
+    while (pos-- > start && *pos == '\\') {
+        result = !result;
+    }
+    return result;
+}
+
+ /*
+  * NameNoWS ::= [^][|/\= \t\n] | \\.
+  * NameWS   ::= [^][|/\=] | \\.
+@@ -1719,11 +1729,14 @@ static char *parse_name(struct state *state) {
+     const char *s = state->pos;
+     char *result;
+ 
+    /* Advance state->pos until it points to the first character that is
+     * not part of a name. */
+     while (*state->pos != '\0' && strchr(name_follow, *state->pos) == NULL) {
+-        /* This is a hack: since we allow spaces in names, we need to avoid
+-         * gobbling up stuff that is in follow(Name), e.g. 'or' so that
+-         * things like [name1 or name2] still work.
+-         */
+        /* Since we allow spaces in names, we need to avoid gobbling up
+         * stuff that is in follow(Name), e.g. 'or' so that things like
+         * [name1 or name2] still work. In other words, we'll parse 'x frob
+         * y' as one name, but for 'x or y', we consider 'x' a name in its
+         * own right. */
+         if (STREQLEN(state->pos, " or ", strlen(" or ")) ||
+             STREQLEN(state->pos, " and ", strlen(" and ")))
+             break;
+@@ -1738,10 +1751,12 @@ static char *parse_name(struct state *state) {
+         state->pos += 1;
+     }
+ 
+-    /* Strip trailing white space */
+    /* Strip trailing white space. Make sure we respect escaped whitespace
+     * and don't strip it as in "x\\ " */
+     if (state->pos > s) {
+         state->pos -= 1;
+-        while (isspace(*state->pos) && state->pos >= s)
+        while (isspace(*state->pos) && state->pos > s
+               && !backslash_escaped(state->pos, s))
+             state->pos -= 1;
+         state->pos += 1;
+     }
+diff --git a/tests/test-xpath.c b/tests/test-xpath.c
+index 3e418e5f..82986474 100644
+--- a/tests/test-xpath.c
+++ b/tests/test-xpath.c
+@@ -355,6 +355,62 @@ static int test_wrong_regexp_flag(struct augeas *aug) {
+     return -1;
+ }
+ 
+static int test_trailing_ws_in_name(struct augeas *aug) {
+    int r;
+
+    printf("%-30s ... ", "trailing_ws_in_name");
+
+    /* We used to incorrectly lop escaped whitespace off the end of a
+     * name. Make sure that we really create a tree node with label 'x '
+     * with the below set, and look for it in a number of ways to ensure we
+     * are not lopping off trailing whitespace. */
+    r = aug_set(aug, "/ws\\ ", "1");
+    if (r < 0) {
+        fprintf(stderr, "failed to set '/ws ': %d\n", r);
+        goto fail;
+    }
+    /* We did not create a node with label 'ws' */
+    r = aug_get(aug, "/ws", NULL);
+    if (r != 0) {
+        fprintf(stderr, "created '/ws' instead: %d\n", r);
+        goto fail;
+    }
+
+    /* We did not create a node with label 'ws\t' (this also checks that we
+     * don't create something like 'ws\\' by dropping the last whitespace
+     * character. */
+    r = aug_get(aug, "/ws\\\t", NULL);
+    if (r != 0) {
+        fprintf(stderr, "found '/ws\\t': %d\n", r);
+        goto fail;
+    }
+
+    /* But we did create 'ws ' */
+    r = aug_get(aug, "/ws\\ ", NULL);
+    if (r != 1) {
+        fprintf(stderr, "could not find '/ws ': %d\n", r);
+        goto fail;
+    }
+
+    /* If the whitespace is preceded by an even number of '\\' chars,
+     * whitespace must be stripped */
+    r = aug_set(aug, "/nows\\\\ ", "1");
+    if (r < 0) {
+        fprintf(stderr, "set of '/nows' failed: %d\n", r);
+        goto fail;
+    }
+    r = aug_get(aug, "/nows\\\\", NULL);
+    if (r != 1) {
+        fprintf(stderr, "could not get '/nows\\'\n");
+        goto fail;
+    }
+    printf("PASS\n");
+    return 0;
+ fail:
+    printf("FAIL\n");
+    return -1;
+}
+
+ static int run_tests(struct test *tests, int argc, char **argv) {
+     char *lensdir;
+     struct augeas *aug = NULL;
+@@ -398,6 +454,9 @@ static int run_tests(struct test *tests, int argc, char **argv) {
+ 
+         if (test_wrong_regexp_flag(aug) < 0)
+             result = EXIT_FAILURE;
+
+        if (test_trailing_ws_in_name(aug) < 0)
+            result = EXIT_FAILURE;
+     }
+     aug_close(aug);
+     free(lensdir);
--- a/app-admin/lastpass-binary-component/Manifest
+++ b/app-admin/lastpass-binary-component/Manifest
@ -1,4 +1,4 @@
-DIST lastpass-binary-component-4.1.4.tar.bz2 1623477 SHA256 adb0e91f8d212d34dbb85db0b11738fe36db1a741ad5674d7070c4019a9fc75e SHA512 6fd518fa19f7206a1007376460c61e5a5c8d868126a767b3978309f0cc7ccd069e743cb12364e6841d8d3cb29452d058122b95f42bcfd2bd4deb4b8c77dc5f75 WHIRLPOOL c50bde0ee3f82abe56803beb2bda09786f7806b5e480eb8401fe0302ee984465f2682af66243095f3ea83744d59d6d3548806c423b69a8603abed9fc3ba3d00c
-EBUILD lastpass-binary-component-4.1.4.ebuild 1987 SHA256 65c0839b18ac887697fdc4953e14f00f4ff9dbb38e55bbf3c1b99794641f059f SHA512 65bf16de59b633847eef329c2e7333002c442332f86bc284577d0fc4fbd210adeaca455b65c70bc8fd62855198b74cbf4fbb32927b6c4ccd561032ea99147f6a WHIRLPOOL e8641d108f6450664ac461346d771572ed83866c0a189797847516697b83e488e74dbfcb302abb1d9f0fa053bb3dc2fbcceb2c08765500ecdd36b629be1f7ad6
+DIST lastpass-binary-component-4.1.44.tar.bz2 1623477 SHA256 adb0e91f8d212d34dbb85db0b11738fe36db1a741ad5674d7070c4019a9fc75e SHA512 6fd518fa19f7206a1007376460c61e5a5c8d868126a767b3978309f0cc7ccd069e743cb12364e6841d8d3cb29452d058122b95f42bcfd2bd4deb4b8c77dc5f75 WHIRLPOOL c50bde0ee3f82abe56803beb2bda09786f7806b5e480eb8401fe0302ee984465f2682af66243095f3ea83744d59d6d3548806c423b69a8603abed9fc3ba3d00c
+EBUILD lastpass-binary-component-4.1.44.ebuild 1987 SHA256 65c0839b18ac887697fdc4953e14f00f4ff9dbb38e55bbf3c1b99794641f059f SHA512 65bf16de59b633847eef329c2e7333002c442332f86bc284577d0fc4fbd210adeaca455b65c70bc8fd62855198b74cbf4fbb32927b6c4ccd561032ea99147f6a WHIRLPOOL e8641d108f6450664ac461346d771572ed83866c0a189797847516697b83e488e74dbfcb302abb1d9f0fa053bb3dc2fbcceb2c08765500ecdd36b629be1f7ad6
 MISC ChangeLog 1109 SHA256 30bcd9c2fbbc86a284418d51db7de4a4f50308011c4292f7e7cc3a039555dde9 SHA512 59d411167317f3459c4cefb10b5e14ba4faea4c87f6acef301cf74c8d3c0a3377cc5e7233f0b72de4d75dd52507072f468227c44446177ade8d4653b323a0237 WHIRLPOOL b7a4cc7d6720577d1a2dd962dccb63ef44e97b4dc5d72843a984f1e1a8633a4e3cfb8b0daa5d8780737adb6840000117e0b2b742bdf32b870e5bbe642c279074
 MISC metadata.xml 816 SHA256 d35f43fbc54e2d23b6cfd6624949f28a85d3149c4405d83f739453111facb5a6 SHA512 71eb5c8aa836f75a5bfed79d7398e30628a274586a019d094a114d582ae2011d148cae325eb79b67e64035822cd18f154b9626142a7b2cc4c57f1e40f2f15b6b WHIRLPOOL 9b69c840104a8a72413892ad0f6bd9eba9534e14f5a7d8df5e3b7be88dbefd2b9f9eb21e513ef4f820c8c4de7f740c6d91e83546b6d2ad2cec146ba40813fe75
--- a/app-admin/lastpass-binary-component/lastpass-binary-component-4.1.44.ebuild
+++ b/app-admin/lastpass-binary-component/lastpass-binary-component-4.1.44.ebuild
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -1,7 +1,7 @@
 DIST sudo-1.8.20p2.tar.gz 2930769 SHA256 bd42ae1059e935f795c69ea97b3de09fe9410a58a74b5d5e6836eb5067a445d9 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda WHIRLPOOL 4e9b6ddaba8cdb4d82358e01252136af56ae50f656f9802285471c7c1e5c831d26aa07cb78205f63ea6098f98846911938681a89256afe5419372039d0e4e792
-DIST sudo-1.8.21b1.tar.gz 2949206 SHA256 b7d5d5d0447566d1203542eb427b9822669c82fc57c0110e4d5de38c1232a659 SHA512 baab9e93ab28fd8410f6d5df6b6904791facd0de8e442407834ba95c7e5008cce9e7bc34e0ceb6044c17ecc05cb78cf90ef3c684c86290a0988b36472a2438e2 WHIRLPOOL 145f2601660f71f2a14274fe9cf7a360e798341f76eb81701bddd44be0bd8e9d483bf43965410e89b011dc13bfb5e6fe6142aefe73a5e7baa236b606f31232e8
+DIST sudo-1.8.21b3.tar.gz 2972665 SHA256 d46a5567410f3d72ef8a92e0dfc1c74bd162616ce4f1645384b98e3da0039241 SHA512 22cfbd08b1123fe61a22be7fce961fcd7e88bbeca10dccda68fef2629b87eb2a629ae007cae804e15af3191b898e9751f016661594b01ac28731da12a3aa0e8b WHIRLPOOL 9a10d12ffc5257cec0d70f93998ecbb0822b5b47038d4b347a82ff4174d44760d114397c956f4f2b392db3102f60dfeba43999a9b8a18ea28b73cf6e01ec595e
 EBUILD sudo-1.8.20_p2.ebuild 5753 SHA256 068f861f7d24aa5a4660a3014e28205f3ecdc903b9f77793e51214ff9ca09e82 SHA512 dac3f07f7c4a6ad493535fa9a753424ff9bd03777cc4330eb5575cf7c0a862b5b2c60e5229a9634e80dd001f8498b4effd5c3ef5b33b4e9723d919657162904e WHIRLPOOL 5075f57c3e9d49b84e9099c6fec4298bf60848219074953b7691b8299a0c2bfa584ba57e51a346f4aff5a8fa2abd57da81551858f2cc15a5a16aabf00c6abd8a
-EBUILD sudo-1.8.21_beta1.ebuild 5762 SHA256 04546e8566c1b0fedcd23400a5296eed0cfeec61b05404bbcd33bfaf53ffe0ec SHA512 eff064d9fb2bf0973b8fbd808940282c2f791cfccfebe895d6d591c7abbe711138f0dc6b52726602b97c38269dca42c269f905881de14800b3df2b937e9bfcdd WHIRLPOOL 45d1d3a4d4d7b3f0e1d9923cf81fba48fa35ef99eac568fd539583ecda22d389d20c552cd9ef142ec76a2643cf4d5225d160e5049cc76a0db9c7440357236adc
+EBUILD sudo-1.8.21_beta3.ebuild 5762 SHA256 04546e8566c1b0fedcd23400a5296eed0cfeec61b05404bbcd33bfaf53ffe0ec SHA512 eff064d9fb2bf0973b8fbd808940282c2f791cfccfebe895d6d591c7abbe711138f0dc6b52726602b97c38269dca42c269f905881de14800b3df2b937e9bfcdd WHIRLPOOL 45d1d3a4d4d7b3f0e1d9923cf81fba48fa35ef99eac568fd539583ecda22d389d20c552cd9ef142ec76a2643cf4d5225d160e5049cc76a0db9c7440357236adc
 EBUILD sudo-9999.ebuild 5902 SHA256 873d78de74b8831c7b20c411764882600d25a51e7ae27dba72191ba339a9d10f SHA512 db412c41d971084dd1279c8e2b1b1fdc8e29332ed8d57b446bfb491b2f74113e8cc65b988966809177b5f4582d64753160f9388cda9fdbdc4ee46b7dc614e9db WHIRLPOOL 8b706114c808141669f9f0019e70780b1819ab90e8be29fe4683ee38967c25e29cc9607dce70b32efed179c2950e9851d9fca474ff446709f04b53746d98281d
 MISC ChangeLog 10568 SHA256 88c3586b178e3222f190930a0c39bbb7755261152ac866a3ab6142f9cd740fef SHA512 b06ee9dc63142e847ec5045a84baadb5e0790b63aa87f05a6c0584261648d4f2b10be30c4cf2040316d5c3ff193ce7fa3df20f3982ec8388b5998cba4798d878 WHIRLPOOL c78f7ec2b5eda9e68aaa6a0eea4d2bbb1498d43970465eaf0d5016bbd8b73a703689632a69a66d2775fa6b41d8f5dc80af8fbff0339603d5952d0edc73cea07a
 MISC ChangeLog-2015 56371 SHA256 4ffe6c477fa8f0d089b6d135501283d409b880528f21162a52f8512555a1bc39 SHA512 af41912ac5e32ced0eea056593bdfd569c16a09760d42f79be1901ae8bed2ad98dc13b75d1c82861a0ccad613434076b63853bcb7c755fa775911e9688d7562e WHIRLPOOL 79db049d5b1286721e07d170b381b4fe8ff2433781e25c55fa7e4f999caa61f68d9282d47139b274e64d2f73a325cd18b26762ea6cd128cec7a70b4cd5c3ed37
--- a/app-admin/sudo/sudo-1.8.21_beta3.ebuild
+++ b/app-admin/sudo/sudo-1.8.21_beta3.ebuild
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@ -1,7 +1,9 @@
 AUX brasero-3.12.1-libdvdcss.patch 720 SHA256 08227bbb1e168b8f923f4aad15dd15f1eb331017a11b846dda292248d2b11c08 SHA512 2d3bec8871280e17c7c18c93748e88d5ec4be96fddea95b47c2108f26a601c8292a7d43703548cad30fa103d37ef924c33cdd6bd1d9781990eefa6c2a074d7cd WHIRLPOOL dfa7bd3b6a23bad0fb84c26d79c7552c5148f42a9224d417cdc4e733c33a9d6fb30fc6c53496c0c77b7ecfab70c138452a683a7b77a6b1d0fa4c6b349f2e4fb7
 DIST brasero-3.12.1.tar.xz 3683836 SHA256 9a5eea53e57b66de3c7c8c2393ac21a58d5afa81c6cfb16b3c7f010a3d147127 SHA512 c9a78b9bc627f4420f5cf70825aa8de6e42497e63e293a0382916c9cd1a2bb3ae0beb2b95b624b7203ab17dfd8c8bb10c18c16848079b82077663abe34674eda WHIRLPOOL d7a5cd528d2c7ab37c5adeaf894646c989a29d806f6384e3a3cbcc6044785905f80907b9dec32e8228ade8558c227fe6ecbccf4bc0871e6d7a1581300a0e0550
+DIST brasero-3.12.2.tar.xz 3742120 SHA256 6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041 SHA512 14886e772123f179f79d3172b59e21ced990fd8834cd27e8717eb635a75163c44c1d5084818b53da559a0c2ef25e7c0da4a3a7d3781e2ea74b59cfe98987384f WHIRLPOOL 1cf33d7ea5c50f4faed0648f37a1a127af08831ca8b899ac1ba12cfa1f21671ede4f83a7cccb8edce79b077373ebe3bbba73f11a163887d6fd6b970eb789e002
 EBUILD brasero-3.12.1-r1.ebuild 2231 SHA256 0634e9b467f6128b79f1cbce7911fb464a0eac96dc954a59b57c34b891e75d61 SHA512 dee3f88bf4707f085365c283937b1523e9150de81d2ec4a7bca02262ceff84ed5caaa69f93a073a899c25cc093dedc787a1970339e35dc6130e3a3dc9e587c91 WHIRLPOOL 2afb7df9563e23e2bf62aeb9176dbec3cec16a4709c3484a784727f87b7334275ca4edc8c16bfd0623e09570a0ef9489243f4887ee7464186605a2ee12684723
 EBUILD brasero-3.12.1.ebuild 2089 SHA256 63253fa32713003a978abf781badf0d6c6846372b4f549e10ed461182696cd1a SHA512 c2779f7ddf21450bdc5a9da3884810569ad72741694ce24d016c0b64d669cd7ff182a17922c542b167175599e1e3f65b64408d4e761c903a8248adcb9d4d26a0 WHIRLPOOL 25372a169f3a1c25d2430214878bd416948e8390b40cde4be64b4f09858023fbaca5d0fcb343acf75ba95caacdf0b199d9ae155c2cbb6511b38d902aed85c738
+EBUILD brasero-3.12.2.ebuild 2010 SHA256 c05b6ce6173c33b515b5d1d6900174d6a31a9df04ce2e3d74af1e12c1e149adb SHA512 03f8ccc4f8767747dae3a61a192d8b8ab916d12e27e48c1711d59966e2773866793ef1ab07830f3f22aabc157cc4494fbea66d2ca950973d67952d53cc833c4f WHIRLPOOL 1cee9452a9d94fd5aa750ceedad0156a4ea6f05f7ce91466473ead0305c7856b8a7d5aa1387a72df49dab083945e5939312355f5b3103437e2e52a7d4d7b656c
 MISC ChangeLog 3176 SHA256 d5721c7141a9a20f2d23da55e4ae3cb19c684942cfe2a7d10a1f04cb7ca98df6 SHA512 4d16d16aec520746ad1b271e6e9133c24a1014df7515faa38c35c59cd222579d34544c9c534b5240d01c71dd14ac63a46c75e16aa269c565848bbc3740eb0f03 WHIRLPOOL 178f7fd05715b9989e8bb4e2bd1ae3f2ea6db28fc874df0d823415a57d04d8b93018d69a77a8b23a413a48bf2da9151cb3cdb908a493f50713713fee44289c75
 MISC ChangeLog-2015 27463 SHA256 2fc0672d6d9cc396a887b75816c21c576b7484c02f0f34b3392cad57618982b0 SHA512 658babf6eadf3b444b113c7e3eedc008ad669eeea650e1ccff0be025c9e3ce0411b5f0d4a4748baa58654254d4d64861217fbcba817751f4534933347fcece83 WHIRLPOOL 4b16f17f6d498632b013b9a14eda7803978d340dba194612b5c73fab827bed25115795ac0d82c69509f6e00fa8ee6a43fefacda9e677a2d2a36b3fc8492c76cb
 MISC metadata.xml 767 SHA256 9c001ebafd3c2c87f41aa474403c0756f182a26d05afab82f974eee8dda9d219 SHA512 d5eff95f93edce1d592b2d8b383e04d0f96c92374d8077709d4e8404060e9eefcba9dc16f741651ebb5323f7692b07462ded60c7e6f638be3334fa04740da381 WHIRLPOOL 6a11bbf776248d112723000536eb358284a9c7ec1865deecfe3f99fd4f4724564eae962783bb40ab3731a84b545e3d07e33652798ac9f8440fb5986b086c1f8f
--- a/app-cdr/brasero/brasero-3.12.2.ebuild
+++ b/app-cdr/brasero/brasero-3.12.2.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="CD/DVD burning application for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
+IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.29.14:2
+	>=x11-libs/gtk+-3:3[introspection?]
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/libnotify-0.6.1:=
+
+	media-libs/libcanberra[gtk3]
+	x11-libs/libICE
+	x11-libs/libSM
+
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	libburn? (
+		>=dev-libs/libburn-0.4:=
+		>=dev-libs/libisofs-0.6.4:= )
+	nautilus? ( >=gnome-base/nautilus-2.91.90 )
+	playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= )
+	tracker? ( >=app-misc/tracker-1:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-meta:1.0
+	x11-themes/hicolor-icon-theme
+	css? ( media-libs/libdvdcss:1.2 )
+	!libburn? (
+		app-cdr/cdrdao
+		app-cdr/dvd+rw-tools
+		virtual/cdrtools )
+	mp3? (
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-mad:1.0 )
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.3 )
+"
+# eautoreconf deps
+#	app-text/yelp-tools
+#	gnome-base/gnome-common
+
+PDEPEND="gnome-base/gvfs"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-caches \
+		$(use_enable !libburn cdrtools) \
+		$(use_enable !libburn cdrkit) \
+		$(use_enable !libburn cdrdao) \
+		$(use_enable !libburn growisofs) \
+		$(use_enable introspection) \
+		$(use_enable libburn libburnia) \
+		$(use_enable nautilus) \
+		$(use_enable playlist) \
+		$(use_enable tracker search)
+}
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@ -1,4 +1,6 @@
 DIST rhash-1.3.4-src.tar.gz 249357 SHA256 406662c4703bd4cb1caae26f32700951a5e12adf39f141d3f40e0b461b1e9e49 SHA512 a78be309011798d5e55023eb93f898c10254a42270288fa5ec68ad446b5f3d001e8c6f893683e5171e3858c86d45ce2ce16eefde1173209e1925420c27a7ff7a WHIRLPOOL 5883dcbf0c2bf51036434d1906b85b615eae65ef2729a68d7ac637e2bea3c494cd3ee7fa9a60d3c4f3241bc4fd5c62c8f7e058c0e53649d50dade241e06dda2e
+DIST rhash-1.3.5-src.tar.gz 316867 SHA256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c WHIRLPOOL 80540e96b554fad8c18da431677a0bdc361f7c406b746050bd25ad0b2eeb9d318f1ef0d87ef002d8b8c6fa7db6d789391115358a1676358afd478564d193b229
 EBUILD rhash-1.3.4.ebuild 2635 SHA256 a261080c62167721016f83dc3eaef84faa532ee0908264c1203493272228744a SHA512 08cd631e3a77d6790a29d8e2197b176d23f904d3151c0786d53b5f22621ad5c4839f91efa7cfdc6c3284eb0fbf68251c9af9d80e41237f07bd82ec6cd122697b WHIRLPOOL 0a30d266e3eb1b868dc04bbf9014411cb2e8fd8cea152496118e3d73d41ff2d9b1caf7d43a910cd4a6afb1b5bd390f840c35bd15cd2a4638e94d35ba2cb2a2ce
+EBUILD rhash-1.3.5.ebuild 2548 SHA256 7bb528df5686e0f69de446141b3be91a4a19e6215c96e68b150c060cf8f6e506 SHA512 2e73e848ad45390c2d56cecff6ab28fc9c1dbfc0af205415b3ed2481116841050c100ce31b80f549f8a7612ad96a9d27d2d76b3a552dad275441d4074b89087d WHIRLPOOL 9decf20c7cb87810678fbffed3f605d5dd85172d441a4cd61dfb65b7b5690c218b60482172ed1802bde87e2adfbc9ac6dae82d1818704557f15e6d9d4715c343
 MISC ChangeLog 1898 SHA256 42a9aa251be9c53c86632be46f1a40bb42fccdc94077e44e67f137f16898c43c SHA512 3c7c8dc6b1497db03e2e09c856cd0cde5947e94bbaa1116d088148d01901459d61b4ec50579dd165fd6a22edb2e28f5ca05b62413a0baeea5b47580b89d2e8f6 WHIRLPOOL fc96a4e7ad467ac1a07d19736becfe148f718979e14ba6fee1d037d6901c0601a60444de8c5f232d4870c91c91e54e9cd8c4fd34c6768209977896a34599f2a9
 MISC metadata.xml 1073 SHA256 f4535f1b4865ee9f0aef109339616437ddf49873e19b9b938ab1bba8279f4329 SHA512 3672e2c9523e60e0f4d2fae8acefe058a00795f9bc4277b7dff3f999ab7eebeddf3e7d15b6cb53cc3fb5392f427f65963fb8bd1ae57bf2c0d8b071dfa728e5ac WHIRLPOOL ab25e82f818db52a7458873344afeb7be2fcfeff13cdf1ee13029dae10704a3b6f651e530de5f53d1873c31477d7ad2e88ca2b655072601235474abf467a444b
--- a/app-crypt/rhash/rhash-1.3.5.ebuild
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild
@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Console utility and library for computing and verifying file hash sums"
+HOMEPAGE="http://rhash.anz.ru/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug nls openssl static-libs"
+
+RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/RHash-${PV}"
+
+src_prepare() {
+	default
+
+	# Install /etc stuff inside the Prefix
+	sed -i -e 's:\$(DESTDIR)/etc:\$(DESTDIR)/$(SYSCONFDIR):g' Makefile || die
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local ver_script='-Wl,--version-script,exports.sym,-soname,$(SONAME)'
+		local install_name='-install_name $(LIBDIR)/$(SONAME)'
+		sed -i -e '/^\(SONAME\|SHAREDLIB\)/s/\.so\.\([0-9]\+\)/.\1.dylib/' \
+			-e '/^SOLINK/s/\.so/.dylib/' \
+			-e "s:${ver_script}:${install_name}:" \
+			librhash/Makefile \
+			Makefile || die
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=12548
+		# skip the export.sym for now
+		sed -i -e 's/,--version-script,exports.sym//' librhash/Makefile || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	local ADDCFLAGS=(
+		$(use debug || echo -DNDEBUG)
+		$(use nls && echo -DUSE_GETTEXT)
+		$(use openssl && echo -DOPENSSL_RUNTIME -rdynamic)
+	)
+
+	local ADDLDFLAGS=(
+		$(use openssl && echo -ldl)
+	)
+
+	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] \
+		&& ADDLDFLAGS+=( $(use nls && echo -lintl) )
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+		  ADDCFLAGS="${ADDCFLAGS[*]}" ADDLDFLAGS="${ADDLDFLAGS[*]}" \
+		  PREFIX="${EPREFIX}"/usr LIBDIR='$(PREFIX)'/$(get_libdir) \
+		  build-shared $(use static-libs && echo lib-static)
+}
+
+myemake() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr \
+		LIBDIR='$(PREFIX)'/$(get_libdir) SYSCONFDIR="${EPREFIX}"/etc "${@}"
+}
+
+multilib_src_install() {
+	myemake -C librhash install-lib-shared install-so-link
+	multilib_is_native_abi && myemake install-shared
+	use static-libs && myemake install-lib-static
+}
+
+multilib_src_install_all() {
+	myemake -C librhash install-headers
+	use nls && myemake install-gmo
+	einstalldocs
+}
+
+multilib_src_test() {
+	cd tests || die
+	LD_LIBRARY_PATH=$(pwd)/../librhash ./test_rhash.sh --full ../rhash_shared || die "tests failed"
+}
--- a/app-doc/jargon/Manifest
+++ b/app-doc/jargon/Manifest
@ -1,4 +1,5 @@
 DIST jargon-4.4.7.tar.gz 9061260 SHA256 d93627a2b581081457d0a48a767080bc47954240ca5908a2439606dd0cd16911 SHA512 afc8c44994f22de3fbae325e315fa101c04a5db2ef6af7c5592b4c072cc0e94a2bc523042ab9c894977c34f8321aea77c8208ae57040a4e3419cd240ce169803 WHIRLPOOL cd4e9360885755f85addbf7b81df5887f8683e8a56cd0db869733e6fa8141526c1e06d2b8d0da7bcbfa9c90d10945350d014a61bc744b3889e0de4a81cc7ca04
+EBUILD jargon-4.4.7-r1.ebuild 605 SHA256 f7d799e776ceb1ca5f4d47725e79a209689d9ab7f3b8608a02dc7a5825f1dfe1 SHA512 08317ce53af4d670618dcbde276ec93a4f337b5c4b8fb87b292d0ece6dca82c31d06574d4dbaf9a87b131ba628b18888e1eed04f922d6b85477bfc8d7f52489f WHIRLPOOL 05390d7e360feffe55b3e9f65be4d13db12b3a9b727feabd699dd6803cde93a63fd9d14f48cb91c31a1cea8370a6b092533f605a8116ba1bf717b45b456772d8
 EBUILD jargon-4.4.7.ebuild 602 SHA256 f09e5df69e214d23d558a8ebd218605d397bc1f22277981b22968a3bd528f97d SHA512 ef9f1e5cee8130882ae2c02bb0af1245c2e2ae1d89c20ac6d726249d254d686e36bf560cf2e99ea5c4e98fbbd25baa45c57c9470c4a9ebdd9200712cf2600204 WHIRLPOOL e348c9c626c5306df6cdacb4a17f0ea8a7ca57e2b5e3e7054a3333446c7545d570bb780990a4d4c8c6453b5192a32e084b402547e6b5b221789d012644a2df8c
 MISC ChangeLog 2452 SHA256 69101b157c9d9ffbec5f2f73c71c2449fb695c8dcb9987221e3df168d939b181 SHA512 cd79d9f964921c120101c9ac0f6b3d221c64fe4353a87954d23cb74d408ec00cb6a2ed5d5a6c57d799a08e20692b23f1049f7038c39cc985c139f6b9b00d38b1 WHIRLPOOL ea22d35ad16c8cf651b1bce50a68a84a8cdaebd02c19eb0e162c03af88cae1c788b3429aaa602036f0836d9eef4d2e6bbc06f45d97d8d3a223158641d287f708
 MISC ChangeLog-2015 1296 SHA256 496dffec05379f055f2540555a69a0b2d16091c231e3bb7454af1f3708331a10 SHA512 f052891997ac34d16d57aee50b0c879d7dfa8a1dfc70b29e0a1f10a414c5acba984a8c01b88f1cf28319be8bcd996400f139db0532a4c3e5255919f864874e38 WHIRLPOOL 6e2cf50a64e85c52e792ba0fe9822a30f0d78fbb3c10b2245e27b178acd0f88b3ce807e7e126774cc0bace81db4f3da3a519814ea4c0570aa94b5c380ff35b2e
--- a/app-doc/jargon/jargon-4.4.7-r1.ebuild
+++ b/app-doc/jargon/jargon-4.4.7-r1.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A compendium of hacker slang illuminating many aspects of hackish tradition"
+HOMEPAGE="http://www.catb.org/~esr/jargon"
+SRC_URI="http://www.catb.org/~esr/jargon/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	find "${S}" -name .xvpics | xargs rm -rf || die
+	cd "${S}/html" || die
+	sed -i -e 's#\.\./\.\.#..#' */* \
+		|| die "sed failed"
+	default
+}
+
+src_install() {
+	dodoc -r html/*
+}
--- a/app-emulation/libcacard/Manifest
+++ b/app-emulation/libcacard/Manifest
@ -1,8 +1,8 @@
 AUX libcacard-0.1.2-underlinking.patch 15058 SHA256 4f825354ba34f5960fa904cb933cef234ec7b5b34a13e49f5d6fabe4a74be2e2 SHA512 dca450e974fd05f0125c447d565d3e4855e5a1d034676a2f2f5871fe137cbcb84414d0760b416c1abae6feb8f4fd0a521e98adeb1db4c797ff7e922afd3bc980 WHIRLPOOL 12ae282de5c00fdbc79fd5654596619cc5411ca8db3ebc7993c66bb14a6af7d9d3ab22b750f216b2f397ec8f843944fd89de61d76836ccecca856d09d47039fa
 DIST libcacard-0.1.2.tar.bz2 276430 SHA256 ca100118865ee24f16cf39367f74434cddbbb003a12a1adc8645f3dc34791daf SHA512 a3622b29fe3a059e069ad6f7da428278a915cec362a6aae3c7cad0d47dfadba67308631435993c0f41cabe92a05874b339518dc503b71b8d86db4976bb6987f6 WHIRLPOOL 9e1a156fbbff34148a1debc1f4a6d23aea687213a45cac7feb57134dcbd59fa95a22558e15e5c237ae6c3a7851282c72b49ee6e94c9fff8940feee13d42f08ad
 DIST libcacard-2.5.1.tar.xz 325692 SHA256 4bc29c98bea1defc168205652f4ad203ea5746519b4bef8f04ff7cbe099c4e4e SHA512 88e66745f649f52c3fcc7745834d628e76abc21cef1b300e8750e6c0641f65d0e11224da30fa13dea20d6ebe5d36d7a8680d029e15149fddaea43558216ccc21 WHIRLPOOL 5affa8ad2f047553b0a241a123b89d0db5b7620860da1fafb6123f26efafb7680bfd4d971b3b67e82674664daddf45fe0d973153e97944955e8417ea591d412a
-EBUILD libcacard-0.1.2.ebuild 727 SHA256 29628ef56368ccecaebaec9053c3ababeb75a4c4fb8c0c2d8ef5b2a9e04c19f2 SHA512 7e8cf88977072b5fd04c36366d78549c58ce289d1260c6be174e8b52a00a08f3659d6f03ec34f957f0d4e6acca1e781f21444e187009dfb95ff69876e9e5845c WHIRLPOOL c1e790089bc0597d2c9e88e5d60ab6ede84b4920e0869a7c9211cb76c9111a37d75d570ae048415ae45fb01bea75b5803b31d27203b541c4342f29ca5ec294e8
-EBUILD libcacard-2.5.1.ebuild 656 SHA256 d6534029e368779fbb112ec07b6dafbf990ee5da22c3305c7258888a47375bce SHA512 fec7329b88fe169cc4b2ee98e3a37645eeca87c692c19eaff3546903d6b249fe32499e4870ae9bcb5b55f242f1d4eb4b8e1b0c33b42b3bb02cc164f82bdad055 WHIRLPOOL 1dd7eaf5f41fde6c95402360a702becddb28e0494a281456994cf4746c05fd43a26bc0362fb2f073e44a7a3ba95520e363538523471d21e8edd1219245216894
+EBUILD libcacard-0.1.2.ebuild 741 SHA256 542d2def9d415924de5ece3c074100179990e92c397727e4f789d3ffa338db48 SHA512 591fae7bd4b09d2176c4369b717ad90c75dc00e7f077228676b096b54dba71253cdd74ff2b1ee3baf9be7a790ca7fc8f85c2d9e210912dac88fc82345ecfc760 WHIRLPOOL a54afc0836eaa43d2a1464720c1a12faebe402db7b55432d3eca95ca90b2ec461da4117ffcf4e4be3fcb352a0e739e1fbaab1e0c2e4eaa1e0be84c2636142eba
+EBUILD libcacard-2.5.1.ebuild 670 SHA256 fd7c60c2f14b6d501c5e7a7c82fc4f9f1f8387061e9af93aa8916a2a05310038 SHA512 47040ae3f979d378bc6977a4e3820603b5f9f43c42ea73fbd087825c43bccc0a5bf971b0ce16eb718d2b1d24fcdf0d5dff5c5f54092e38ec320054ede2d63785 WHIRLPOOL 94bc23761879ac64f69fe89f23d687cc6c3e5a9e948603560f4a1e145e42c54fb45a5078a531b8dc13f688f4535af8f304ad12822c3177a2db31496259a86761
 MISC ChangeLog 3338 SHA256 00818b81e141b84c8ddac771770e7e9b4b2dc89a9c88417ca7d180be0c4ed071 SHA512 a903a8f7f568e2cb77aa359da640ce5d780e86e3c110681b8064ea84cf62ae96078430a9582610db3dc96be1b284d4bdbe186fb7edd3174c30a89b6a3d6abea0 WHIRLPOOL 5dd08f58737386a5edf8573c8e4898fce64b2627b63640537a11ff0b25e2abeb898039d0887280025c66bb588aa28c6cc37cb48e934bb5a65233acc7565734c2
 MISC ChangeLog-2015 2248 SHA256 0eb40080739f1888abd7f6875bd8c0635b10020767c832311e9a17fc83971061 SHA512 b7833b638e0f43a2b6148f4a1f8da2c9e41d5398c86dd7987d98c1af30531d1dde2cdb8c36942fd78ac58cfc8541eb8b32f868643cd4cfa8f43f0e990637bf4a WHIRLPOOL 07505006de9ec842c8fe88cf8b4e8b5d81c25eb2c2ddd196751cf48ade6ccb060283390a0f22f79195cbc4cf5b7056963027e869c988e8d591cae38de4cb9e86
 MISC metadata.xml 392 SHA256 d71716d2383aa9ab43cbdde172b26662566a8c0eb8529efc728de9354ec3a6d9 SHA512 94b90de5debbe7d9e443a927854adaaf76315248af06f781e2e00b6232b0a33605479f9c29c5f78ae6527407382b3dedfc02ebfb579c884f0e82237e339a8b22 WHIRLPOOL 941723ce22812137b4a6788f04fc1d26ba9e33a44b817790143a6aa05e9a602a5e26905bf8c95ef2cf303e341b4ae43ee377905925c83bce1943de34ae0b8188
--- a/app-emulation/libcacard/libcacard-0.1.2.ebuild
+++ b/app-emulation/libcacard/libcacard-0.1.2.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
@ -6,8 +6,8 @@ EAPI=6
 inherit autotools eutils

 DESCRIPTION="Library for emulating CAC cards"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://www.spice-space.org/"
+SRC_URI="https://www.spice-space.org/download/libcacard/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
--- a/app-emulation/libcacard/libcacard-2.5.1.ebuild
+++ b/app-emulation/libcacard/libcacard-2.5.1.ebuild
@ -4,8 +4,8 @@
 EAPI="5"

 DESCRIPTION="virtual Common Access Card (CAC) library emulator"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/${PN}/${P}.tar.xz"
+HOMEPAGE="https://www.spice-space.org/"
+SRC_URI="https://www.spice-space.org/download/libcacard/${P}.tar.xz"

 LICENSE="GPL-3"
 SLOT="0"
--- a/app-emulation/spice-protocol/Manifest
+++ b/app-emulation/spice-protocol/Manifest
@ -1,8 +1,8 @@
 DIST spice-protocol-0.12.12.tar.bz2 80628 SHA256 17abdc2743b5d44b0f4423b61c44aafe9f2078c27218aeea78c2d02a5c409d03 SHA512 66e7a902b3c4a5a778cb91ffd9d324b12d414184146ac834dfb3bd81b4b6b1bb56258d3e1ce240b6f8747e1960fce8f0f6b0ada3617e9f9819be7118195fce6b WHIRLPOOL 15f7989e4508724dd43b435b0047a6f0bd6f1121ede74093012706007fe1d1755d51992e7085bbef37ee1bb0bb484141b8cdeb035b17280c70be23cb83ef66e7
 DIST spice-protocol-0.12.13.tar.bz2 73259 SHA256 89ee11b202d2268e061788e6ace114e1ff18c7620ae64d1ca3aba252ee7c9933 SHA512 55840020a7a538e72bf53d2124a6b1920dd2d567418cf02dc33783ae5c78154d5c832d69f2e6570453c4086194b417d10687884de20365c13657ad7ca7b2ae02 WHIRLPOOL 6ea2ac3361a3e52fd9e62b44a7c5c2fc189a71ca5c0f7f97a8f5775437a1090b67dc26114f28ebc25afe39c8181cddc34490d75cc704be5fbc33a1c4ff291649
-EBUILD spice-protocol-0.12.12.ebuild 384 SHA256 d4a63adec600133f0cbb8a72dd3b8c59363009f582c4715fe8da74e2470372a6 SHA512 8692f881427815c3218f579f77dddf07e0699f9d2decf7244866f5c11b1b5b7852e8a94607e13bf5cd64cd82bc56d684eb210d8171275cea6d6ec6df8dd38421 WHIRLPOOL d504dd86489d77172bfe675aa3a45e0631a6813077102f108d6a9fb0fb0dae68f67d432c30da6afca1939dbbd71afe75c30d34bf5f0cede0676654f5d7a0c2fe
-EBUILD spice-protocol-0.12.13.ebuild 386 SHA256 f96b7f880fd2e7c538895165aec6d95e6813f288b0b94f231c451ef3872808aa SHA512 f7199ce81b2823f7254efc5f0c032bf702215bb00abd54f39c7786b11171a6db8cecdaf001bdb34818ff604c1542655c3146d64c7e407b12714838c17ea7044e WHIRLPOOL c6d1eed2451ca3157dcc91d05dd2113f9fa4db67cb4170cd999515c082bf8ee7a658bd6ac1337af0586dd843238c9d9603039d7ed1d7b88bbe6c916a70435400
-EBUILD spice-protocol-9999.ebuild 613 SHA256 082ee0c6aa3cdc026000358375ea8087a8bfdb08b030f18f0e43125b0a67dfe9 SHA512 2eb80e51d4cc320b0e6633b1bc40c8d8b518d85a6c14bae7fac21e27ba5cf1bb09cfb4b07eabd990e572475bd68e09ea8a7b5a7194b3a4050abcbe0f96f80d9e WHIRLPOOL 1d195a9e0c6b798190657d7901f0662f582ef14884b7d1b1f0be206337203e159e132c584cbf56d82781f4c9e5392697cdb9e322ac81b61403fee866105be1a5
+EBUILD spice-protocol-0.12.12.ebuild 394 SHA256 fc0a251d8c997f68610ca91c03ad669376c3ae2865801c629f522609d6842c89 SHA512 3707ec4d90a0c950649b2b45b908232aefbf08c49de5b6d2a884976b83f7193446f1517959fcf54e9557d62292ef6223f58b8b02ebc80fcbe17cbda5253dc0f9 WHIRLPOOL db81392d5926a6db1996d7066ba6c21bca80a7d182bb3db2e1960b96498389f8b5794bdf3bfb68f069c201c6f7a8e9c7d165ac97db3266b9c86059e89e713eeb
+EBUILD spice-protocol-0.12.13.ebuild 396 SHA256 bcf1208ca165eccb06bc24ec3db77449ce0345159096672d879a7922fb06fdf3 SHA512 d88899ae0e019c301517d372665782a5ed3c2577fbdbb9e63c9f4f28fb114e38aac3d649c83e31a3389edcc9d674d9cedc440e84f34d283b7fb21417e6f35ef7 WHIRLPOOL a1b0749314ec70dc2430d57a4887c012e1cfaf1b91af11f5171552752cf538498ce9f1f8362f9aae2a9c0d2945549ac9c1604e0e9c81ac72def361e13014134c
+EBUILD spice-protocol-9999.ebuild 629 SHA256 a4456eaff50e9fc444f6329ebcc41b2778849c916e11c8f96c1fc25a2eefc077 SHA512 ff78d51efbfb26d41650149e9f5ef0222a1d8a43da0aa3b32561a139beadb9218bd00b6383ffe5c876fed39a8326c8597e0a497aab993a22688e0a6b1b228327 WHIRLPOOL 2174e33a8f7aa7336a69e080b95cbe27dd8b92f6d0f9502109df27fa4023cb0c846c97a7a64790c6811cce47aeafe8ce7717ec5b7780be36accdec76c8207609
 MISC ChangeLog 6998 SHA256 4142bee983542a00dd7d9bb4e0ab31bd3ee727d1f32f251ce48bcd420e3232e6 SHA512 bd1ea6a05aa33f0f31ec46faa37eb03d1e53d72ec87b8b3a4634da2b10916ea1e3bbfc4c35666dbda2892be9b4714f23588a1bdb6ca75608ae273fd0d5dbeda4 WHIRLPOOL 97d4969a44539e335686334927ac758b039ae837963a3b92ef61a5c33d409d3728adae2fe6207e7dc23935dab208fa62e17270053b19ba880c911867c8a4a35a
 MISC ChangeLog-2015 6113 SHA256 7fcca09d4ad157cb4f6722f938025fc41ab255158baa603b8e94f513eacb175f SHA512 78960a6ef6486b2d326a8479f0f431905199d6af0cd9eb023bd25ac1d4f4ba55a58db8b24fd379cab844154f30ad46dfbf197a0636e6662ec88ceba736ecee1c WHIRLPOOL 73f844c53a36fd957f905212801a09b3fb5294f05d8db919e2ffdcdac46801ccdfe07a557ec66495bb8de7c24aa93d8d54d51464329dd926af271e3015c86850
 MISC metadata.xml 271 SHA256 7e2e349648b5f0571eeb491c56ca611300480b3283ffe2a955453058f0e10aa3 SHA512 0cd444be2e9b4a1530671dc4fc88a2177541dceb453dca10a1778938d8f114caaa55a01551b662c29e0e775aa9e9df9389b4a5d5ab4fba643da447ac2e7aca32 WHIRLPOOL b89d14b6f27e74268c16597518acf3debf59c1d32aa749a791269f428dfa009faff1d91c87c6003f756ee94420c07e460e337a620b4d2743cbb6b958166c3ef0
--- a/app-emulation/spice-protocol/spice-protocol-0.12.12.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-0.12.12.ebuild
@ -4,8 +4,8 @@
 EAPI=6

 DESCRIPTION="Headers defining the SPICE protocol"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
+HOMEPAGE="https://www.spice-space.org/"
+SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
--- a/app-emulation/spice-protocol/spice-protocol-0.12.13.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-0.12.13.ebuild
@ -4,8 +4,8 @@
 EAPI=6

 DESCRIPTION="Headers defining the SPICE protocol"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
+HOMEPAGE="https://www.spice-space.org/"
+SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
--- a/app-emulation/spice-protocol/spice-protocol-9999.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-9999.ebuild
@ -1,20 +1,20 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3 autotools
-	EGIT_REPO_URI="git://anongit.freedesktop.org/spice/spice-protocol"
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-protocol.git"
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
+	SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi

 DESCRIPTION="Headers defining the SPICE protocol"
-HOMEPAGE="http://spice-space.org/"
+HOMEPAGE="https://spice-space.org/"

 LICENSE="BSD"
 SLOT="0"
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@ -3,7 +3,7 @@ AUX spice-vdagent.confd-2 314 SHA256 50dc90de28c68dc95000b88c9e00d01dc9d3fc338c9
 AUX spice-vdagent.initd-2 1483 SHA256 4d43a431bcdbadab7c920f59233105bfa8b0f0041617993a5f1241c2619fb49c SHA512 520b341b4b0a960d4577897d6a0875567375a92521e8f3ead44dd51eaf5df1238d316ed157e19fae3e28b34bcb98599deb7d13734e606dd2a5a9bfddb06e690a WHIRLPOOL 387c6eb5f748f5947239f0add3feeceeb43f6a5826b03d0adc3e24313dfbded909a1de130cc5441b7fcb1351640732cbc2d7c9a51c5b900b8f34979b40396741
 AUX spice-vdagent.initd-3 1475 SHA256 4773d918016d0ad862b2c2ed0a58b8d40b397988639bb6be168aa1316eb808d8 SHA512 11e61f5cd8081231318248e332f081e43a36fb2315c70d52e436e83a14f1fca5ee4ddd8016e8c9d639cdafe69c3e5f360fb66dc2405f0d45f817130221ece516 WHIRLPOOL f99f6690b28aebc986451dac86a7164dfdd4b626338f0812686f5edda64e0c4d2fd1bbdcf62f011e9cd4cc0e9e1b519d871fbdfb869d00ca75ca9565f7a85861
 DIST spice-vdagent-0.17.0.tar.bz2 130413 SHA256 f14a8bd8cdee10641aabd9ba32461a5844eab0fddb2a10c1d31386e7a9f7b33d SHA512 b26e44f6463ba70d5815956b301cc2351db22de41ed2ce8b2828d9bfa1cc581c86acd433f8f0d35d552d20f6ca140f88fa39b079ba26e9166dc07ad35bee502e WHIRLPOOL b83d034897c0a9ebc224072214081847ab0276edde82ad0d94d107421971fe64afc03ba3f7464735911fd57cf7a05b0cfcb0ecbb32eb4d55adc8abcf23fe8d09
-EBUILD spice-vdagent-0.17.0.ebuild 1519 SHA256 60c183ccb429912e1d87361eaf810badd93b13ddb4df4315e6a2b4e0e38f8a67 SHA512 101c0ca97ee166e831572cd2abe7e2228865eb14e6229fc5c10e37f44ab2f9bce5bc04381ffb1ec291b0cf582757ed94dacbc1b2513cdf2bc15aaf314b0d65f5 WHIRLPOOL b66023d4e0a425df34792d4c0beec03f2087c81fef2084cbda717ebc1aadc04353f99ba7b5f1242f1529f72fb015c2ad1b65bab6e9e91d1a8dfbd9e7cc5b81b4
+EBUILD spice-vdagent-0.17.0.ebuild 1529 SHA256 82608474e03c411dbe21e729f16f6915fdcb0b65459ee6d958873e2564c7083a SHA512 a9f36bec7245932f69e0c6c24055288667d0ceb8a6e99ad389ed913b746b19c12e288fdd7d5f9e07bab558b51c47c89b1a1b6e48d00019db23cf9b2bfce475a1 WHIRLPOOL 4574a54fcb2635b1427a8b562be55f1705c84b6adeeea96a0ccbc7b273c44811b3acbb8f9866cb3555e6378a799b9341a8c5c41f0ef8b51a8598ec745e4cbcd6
 MISC ChangeLog 4523 SHA256 c1861cf8df88cd525433f0b0c0f799e2aebebbdd9d30bf6b959115701741465b SHA512 b83ba7cffd1fce72caeda88c7fbb24b65151d81b42d31b57f1256644581d3320dc2da9a3ca06ac290b36739ab2424af5c522578a37f842f342f1c5694b7acce6 WHIRLPOOL d685b7311bf6990ab0653da48bd9336ae0eb1f79f1294d4310fdd0fcbdb56e94c1f4a0fc0567d2241f8b5a29475780ee19546b6de3d0f7202901cc6b6918b919
 MISC ChangeLog-2015 2822 SHA256 5e55c7a39724d6b9e54e76f7a47f811ac1fa4770771e00aa8777ea5687fae423 SHA512 cff2bed019c84260699f8365856391b26040f1d210512df974b6c9000966e4da3d32e814f2881d9fba72d6cf9128d9b528eb025d6838c730abcfe9a6f5e85c42 WHIRLPOOL 5ec239ba0f68740641e4bf1f17d4dd2ea29d21bda01aecea1bfac58171ff9d20fe3c7fcb8f110bb1f2cc66bdb20e0f46ca9efd12b2daf5004586a001f79947f5
 MISC metadata.xml 557 SHA256 4424218cc2011d8638e59ebf24632fd8ceae77b8e2a41f1fd93066fa35f61a04 SHA512 1f3892771740224f1275a9eb3507e1ac32be745340b50f983383e6b09e69de75d2e0562fd13465a588d08a4d049d0b33b233ada1a3a9883e1ee24c431fa7e236 WHIRLPOOL 9e7ecd059341ca072b105d6d25a592bdac27b71691d362a9178cc961defe00fd6a5e14668d79519cbe021f5f35c9935442c013dcd8a9ed0889ceafcd04ade71c
--- a/app-emulation/spice-vdagent/spice-vdagent-0.17.0.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.17.0.ebuild
@ -6,8 +6,8 @@ EAPI=6
 inherit linux-info

 DESCRIPTION="SPICE VD Linux Guest Agent"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
+HOMEPAGE="https://www.spice-space.org/"
+SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"

 LICENSE="LGPL-2.1"
 SLOT="0"
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@ -4,9 +4,9 @@ AUX spice-0.13.3-reds-Avoid-integer-overflows-handling-monitor-config.patch 1022
 AUX spice-0.13.3-reds-Disconnect-when-receiving-overly-big-ClientMoni.patch 2988 SHA256 1bd1088f245cb0bf226cae2ed1b43fdb661906d514769b47f85a941231e0305e SHA512 ee15a37c45527869415d301968857f47a4536462bcea6fb5608862fa7019b2eeba36d08563b74feb7a96bc565dd6fe09349c736c4677d43c1f13fc95f1c42c06 WHIRLPOOL 39be2806ad73dc6a8435df19026e0c59423d03a93db4e06ab0857147503dee787d177427eacf9ecf98619d1ccf6ec6386afd516eb6a36d1acf3e580ce840334e
 AUX spice-0.13.3-skip_faulty_lz4_check.patch 566 SHA256 ab6077b3751b5544535a3688f721302e3701f6a52df969f978932aa40d1423bf SHA512 aa16b86446f42a08c5d76927090e6b01817308520b34affcdd28a9e89d70d344f5ce47d1600c5cc564ecdf428cbfe8cf456ce8d3ccf4e686bd0cfb2f9fe5fe33 WHIRLPOOL 7d55cefb97a9c1b486b0011bfed2d582153f12bc3a4040539d90ef43d5973d94b603d9e4ca1fc21a367262a6df3a701aecc2e696d09d9870975511f2d4bd1add
 DIST spice-0.13.3.tar.bz2 1322505 SHA256 30f710c0e7594e05b6b9cc702be748a69f910a95192ab851d748c256157fb89e SHA512 63496fbd3df0fd453052cef8e1fb00a3a28f0105610676fdc4a58043cbc6da571ae4407701af2b817e410d05ce727d60d5ee0c93c8897231e25229897c51d95a WHIRLPOOL 16bb08301d66c1f21f612f5be87ba1ffef7132f3c18ac3ab7feec21e16de61461648311d04f6990254d4c47ee7a6d39f4c33f122e941e5a3fc0c2ed289dd928b
-EBUILD spice-0.13.3-r1.ebuild 2441 SHA256 0a4d9ec75ebadb0c4391aa3280f5693c5e67598d080e2758dc312200fd9b9c54 SHA512 8b8503458d8ffa7d3e3093e8dd68cdfae60679a0ed853099360f1f5a5c614b37589431128c92208392b5d6eaa32d47868e3f2c2d87f61519e6378bc6db5f852e WHIRLPOOL 9a02cd8ac82952e3c2ef3dd66c85d3760465f1fe4796867157f345886ef5c4418be56e98b73db95565be7ca2f0b348e7fc139f320ad73d0a77b41d55dc34d4f7
-EBUILD spice-0.13.3-r2.ebuild 2703 SHA256 f5fb008b987558576b8f5b093bf81d07459a487f4356d60d13174bfae7572233 SHA512 17b412b00bb7a583ae53c564a24d07ca73a3502d0b68a7561bb68e4ae5c624309c2121903f466724b57dea0d78f5806a7231e3d71a4732a68844cc0bd56aebec WHIRLPOOL 61e87f92410340b292fc301425000e4aa8591eb3acedc2c0a4284444f6919d42a673fce8ae3cc9cea605bbfdff7174d93bcab54c37706d54ce418eacde98daa3
-EBUILD spice-9999.ebuild 2371 SHA256 c970b01d1fa3cea54d817a951635bc90b1d57fcc27d769a97bac7511b0bab74a SHA512 ca382d9ac0ae55a7608f4a1d29aa68f693b42946e59d5db8658a6845f8ee8592baee603f44aa78a76e973f18d5de8cb40838f16008d0bb1549457084ca61231a WHIRLPOOL a66d538ea18e6c902de1a03acd7616e8d7952fc01b51db7e1c116a26e4973a21bb541d6d8b997fd45984ecb6aa5b3eb8c5fed856cdf3a2d296de42063b2ad2a8
+EBUILD spice-0.13.3-r1.ebuild 2451 SHA256 eee8fbb088bd132a6ed0652f37fba9d0df7aeb9d1144ec5bb356f9f56aba998e SHA512 b90782d1801de0c40e93d4eac8de6108a42c4191d39746c7cd27854546725d03deccd664ec9a72cf2143bd6b4ab01ae825fa24b8e22d0fe9adbe5608aef53894 WHIRLPOOL 6c1711f74530adff35b74aa6b3ee3fdd9652c5b5ef9bdd63ba5f17952800f7e0df6d8f61f59e050db3d74c99f33d7ca29d366694dcec380e0505f121563e7344
+EBUILD spice-0.13.3-r2.ebuild 2713 SHA256 3402cfb20bb0576ee66540c4fc43eda25dab63850d03f02ca8b4949040547989 SHA512 d4ba159d20e1ab6dc2e8be27eabb539a5f72a0bbe5e8956b95979af595e098640a7f0d7503f25fac6d8dbba6b6d63a810bd7d8ea6ba3d6be37e0bb571910ca6c WHIRLPOOL aef35f94360aa1311613acce74b328d3a9a3bca6031707ce21dbb10b3dc7b2d38907be0adba0f9997416d515921af3207ee4f034e13abf594f07ba5548811a2e
+EBUILD spice-9999.ebuild 2386 SHA256 bdf7268f6b4a3556b5fc5f7aacf0424efb49fb99183473bc3c37920af6ed3198 SHA512 e9c217c888229996b61a6fd38c0769fe5fc579117b0f2f54f07d44d45d720d4a1bd7a1c6b8145f01d7aa99c03aa88ac2a5edd1c44ff6a4bd17fd0950eb29397f WHIRLPOOL b23518c8e6c13fc381a7e805fce932b0aa5d0cfe57f2f0bf9b6574b3f983a5768af6b8dadb24e9abeb86693277b352ce572dd6130777150219cb9c756faacb59
 MISC ChangeLog 11884 SHA256 97e782ea60e4e3c73a5075bcc6265ce048b5465ec8f7fa8fb8cd3210ece98db7 SHA512 ccbfa0a73c0a2e677dc43126b11c820756f9da6b486ed927c8791b826e52f25b0e3af7fff2aca2975d775ee61d9e285f68377875f6c0c709e1381c906eee3c12 WHIRLPOOL 4f5116466eace15922cb78bfef0aa566ac68c4792ca4b1ebb2b1788bef58722bf6f2fbec6c060144bd723b22f80a5e13d53448b88ce6c648b5280e9427c0666f
 MISC ChangeLog-2015 11333 SHA256 06046dca615aad09da9fc3ee0ac48f77b6004ec2af2942209535bad890cd0532 SHA512 b161432fa57d4d6dbeaa281b213c679518e73b0df1074435c9d2e7d56bae7abd8a889b4a61cd9a0e55f57baace6a63a4f6d232c0768481eda351eb5c2784b5a2 WHIRLPOOL 4aa7e48ab7e741d6a73d28855fc252b47742cb095afbfb2a90fdd6856de7132c9487234f254fe8dd873ab84c1af636f51e25261e3ef69689f06e97d9908010a3
 MISC metadata.xml 476 SHA256 68e31c99eddc0bd582c10f7f6c244ff52b51b06cca166661f75eaafbd072a009 SHA512 3ae95b689c812e19679cb9a9db2f0811077a4eb205cadf4baeb78a2ddfeb7fc0086e2514540fad59e447bbca6c9dba81001a8ff156a1d18ba2d58171ba301f9b WHIRLPOOL ed8c55c858f4c0ec3967f12a51dd56bc8179db5fbae20f9092b9b19b538f0d2f9c8d31d289063885449282377925dee6b1d866530bee8aaa193a5fdd42f9c746
--- a/app-emulation/spice/spice-0.13.3-r1.ebuild
+++ b/app-emulation/spice/spice-0.13.3-r1.ebuild
@ -7,8 +7,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit autotools ltprune python-any-r1 readme.gentoo-r1 xdg-utils

 DESCRIPTION="SPICE server"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
+HOMEPAGE="https://www.spice-space.org/"
+SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"

 LICENSE="LGPL-2.1"
 SLOT="0"
--- a/app-emulation/spice/spice-0.13.3-r2.ebuild
+++ b/app-emulation/spice/spice-0.13.3-r2.ebuild
@ -7,8 +7,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit autotools ltprune python-any-r1 readme.gentoo-r1 xdg-utils

 DESCRIPTION="SPICE server"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
+HOMEPAGE="https://www.spice-space.org/"
+SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"

 LICENSE="LGPL-2.1"
 SLOT="0"
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@ -7,9 +7,9 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit autotools eutils git-r3 ltprune python-any-r1 readme.gentoo-r1 xdg-utils

 DESCRIPTION="SPICE server"
-HOMEPAGE="http://spice-space.org/"
+HOMEPAGE="https://www.spice-space.org/"
 SRC_URI=""
-EGIT_REPO_URI="git://git.freedesktop.org/git/spice/spice"
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice.git"

 LICENSE="LGPL-2.1"
 SLOT="0"
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@ -13,7 +13,7 @@ EBUILD sleuthkit-4.0.2.ebuild 894 SHA256 a5c12f58764e243ddb2072beca811f569a635bd
 EBUILD sleuthkit-4.1.0.ebuild 884 SHA256 c5f8ab94f34c41db0651b10c9cc4d57fb078ef2047c1c63430eda177e83753b7 SHA512 2e246a8164b677b854a4f3ee6e60031520a1847804cef0652289235d40cba686183c0f14adff0a8b7a8291738f231b74aeed49a27f24715f3d7374654eda7bb5 WHIRLPOOL 1bf7cf4a27ca2b45093d86511a5af10303aa59d56c7b4ef7444c49b86f8d395c80b01898c1b6bf62a4f0e7f56e16abff9e3e86d6932b878e15124aa23aa1097a
 EBUILD sleuthkit-4.1.2.ebuild 898 SHA256 609665ab6c27ae81472ebac524779691d5f704a1f5332c5ad538b50139b0a51e SHA512 b1e69b3da2b19b389c4dd1017229b9d1ef5301ee0f17dcb40847eff3b480ae0355dfb5423a264ab022fa8c2619915259d992623e334fc0d10e672c5d1911cf41 WHIRLPOOL 68cc8767a458c250ad028107f9f6598c502c6b507fed326e7043b640051c24e338d5361487afd83ad887b58da852ab349be7f19fecd6b250e6a7bd0e760e81c4
 EBUILD sleuthkit-4.1.3.ebuild 898 SHA256 609665ab6c27ae81472ebac524779691d5f704a1f5332c5ad538b50139b0a51e SHA512 b1e69b3da2b19b389c4dd1017229b9d1ef5301ee0f17dcb40847eff3b480ae0355dfb5423a264ab022fa8c2619915259d992623e334fc0d10e672c5d1911cf41 WHIRLPOOL 68cc8767a458c250ad028107f9f6598c502c6b507fed326e7043b640051c24e338d5361487afd83ad887b58da852ab349be7f19fecd6b250e6a7bd0e760e81c4
-EBUILD sleuthkit-4.4.2.ebuild 4222 SHA256 8ea43c6bf9d9a0789c7959601c84ed3bb2aa55b24db94656553c1952adf79b43 SHA512 b9c3ca1e5670f0f2e245af5d12d358308133f887978e8cd9e253b05b6c6ccbf50914b3d29e4ef167847b109303c21517462e9abce1b308666f338a8565665f71 WHIRLPOOL 2630d1c3c62cf3a2b73e5bc1ac7e413b500ae6ccf077cef53a808dece9ab7f9f86f196f05f709c67bbc30fe27bced7f5859f4a1c25b0e8fe7b71b35339505437
+EBUILD sleuthkit-4.4.2.ebuild 4234 SHA256 b9bd0b314a07fa1fcc278129c3eb58b82f4a0df2cf22f5794e68c595cb244d8b SHA512 0a725403757e9ac4a25f7b5ca97af308e48cb109269bbdfaa7d8cc708fd9caa9c4f18044d5a39db48ea19eed8a47885f77b2c94801338dc4bdbd30e28f575787 WHIRLPOOL c0acace9269ec9a6ae79e6fa892359e811412ab7219c9ef902f8c8207df8f92c1c2f8f15ee309e4da36d0446b5c1b6f63f0a6b602324ec2b726c609792ccfc1b
 MISC ChangeLog 3220 SHA256 54fea49263491197dda469369b27e519e0f552582ffa54532db2b61f68aabed4 SHA512 90fae34b69900a2fad2297700946fb4eafac9be1d566bb8c89c73df46499103416952643f92e8c6e1ab18eadf370f0cb7296227930566fb3eb56ea44858cc49e WHIRLPOOL d86e6bee495ff046d906d49c2b0c8c503eddd3b50284670f0f2fb69fe0f9cc412ed7a02d63f4dfef7a47642b9558af639b6feb04a77200cba3fbed59945c96ab
 MISC ChangeLog-2015 13171 SHA256 89e82f116ae1a7de32c8210ae55a2e90ece3134546fc12c5fb54cd5fd8e225c3 SHA512 c256d2b2a004c11454b4c57a5363597c966ba980a5f23852372f13eeccc19f5136dd46ecee14488c67ad03fc3f25c8259613c0782c4a63316d3955a0906e853c WHIRLPOOL d6342eba29d00c6c5bfbbff1b1fb188054d26de122597d1d712715e82adbf5e1b3e005bb8a422279bdd2b9a755b95b00226b0bdb30682383698064bb06eeefd6
 MISC metadata.xml 521 SHA256 a5b383c588bf18c2a1cccf840e8a499b5685eb2595c30eb7ae0e15aaec3aa77e SHA512 9d3385a609d94d85d6e519a007d279c8202e795417c3c768ddf4a612e27320c6219e984f96c2e5bfccaa6de2cd616902b21f8e50ebdb26eec920ca1223c01786 WHIRLPOOL 55ccef6e0bcb1818a3dc490feca66996226c728c9e83eed2b20f942f50a8e07eab48378dd17579ce07f62772cbb1030726f9fef16df7746028103a1d9f402d8f
--- a/app-forensics/sleuthkit/sleuthkit-4.4.2.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.4.2.ebuild
@ -131,7 +131,9 @@ src_compile() {
 	fi

 	# Create the doc output dirs if requested
-	use doc && mkdir -p "${T}"/doc/{api-docs,jni-docs} || die
+	if use doc; then
+		mkdir -p "${T}"/doc/{api-docs,jni-docs} || die
+	fi

 	emake all $(usex doc api-docs "")
 }
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@ -1,4 +1,4 @@
 DIST uchardet-0.0.6.tar.xz 169192 SHA256 8351328cdfbcb2432e63938721dd781eb8c11ebc56e3a89d0f84576b96002c61 SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 WHIRLPOOL 3fa915fa768be9cb4002e0a1b84c120db017f59fd0011df36a4853c53b403d5f3839647ab7aff8d8691a43ef0ecc90714475ef6a46a85d20abbd57fba7d90a13
-EBUILD uchardet-0.0.6.ebuild 642 SHA256 aeba84dd68830125278358795e0e24eb68002f9f9349c06504a5d0cd2c49416e SHA512 a70104aa30b4f3b41dcc09e0db8711efa2b814e97876e913fc49fe3be494e25e8837ec3004c4a656e0dbdce275f9b002435c7a64550948be6d1cb8dfc05971ee WHIRLPOOL 509635163632a13d7067bb4d17e7b4813ed0e92891577022b2fad433b35d5653f6a1f1b63f44bbc53805f4be97ab6915dcdb7f7929496f17d1d8ec2d3ed0b143
-EBUILD uchardet-9999.ebuild 654 SHA256 41c71447ab2b97b812a7e9d1f94d1cd2a863c71002257f861a73b85a7c134973 SHA512 087ff52b67a1eb50e4ba4451f2b044224c289286b54a1dde5dfc45e3e95622d18699d52b34c79d6f8d036cff3863b03db6232b9b2399ac09fd32f9cd8ac8707e WHIRLPOOL a4821eaf74d6ffe7e9c48b38f9a324c62f324226ba7f32edab95e5c696f7109a509a44c246190b2ac8f6325846a74fec3edba5aca20ec70eea81c4a8f7fe769e
+EBUILD uchardet-0.0.6.ebuild 645 SHA256 4e60ff988bdc9dfb22985d3d15e72b500090854dbb9a63a6bb7ce46675f50cfb SHA512 be50b6a31af8f0579161179b58a39d78c3a1954a165322eec1b3c1bb7d2533549239dd0b29a7223ad6471c909eb5b9e3d28e8e999093895cec9b0eeb70eaed8f WHIRLPOOL f6c7e03473a4f09f265997b7ffbf2163980bf2aca9b7d4b2d98545a866b7f3b2423e2da808cb49f92e55bc5a7870160fe9abc62a4d8b83c7d9f0c85c7ba6a8a6
+EBUILD uchardet-9999.ebuild 614 SHA256 f4f7b032ea896d4473153c5ba523bad11976f4db9612d5bf3deb748d25cc4381 SHA512 bd7ad0e7c6f2579f88cf66c49bdc5a40ae8b7d0bc0cd05d435c0ab1f844f7bb2dae2d8fa21a4e9f80921ad19a1a98d777b6751ea332291da8f22ce461b5291b9 WHIRLPOOL 950d9d4c0a4a3e7fc1c73e4f5cf3a951d9d3b43483d80ac396938b63d234f41bf89ccd3227ab17bfc8e8bf77e7c7a9179a02b9a57e45ec8d29e86f066955c41d
 MISC metadata.xml 472 SHA256 a71aa88e9a24e6e01d47776ec56baeb3170d3638ca483f0088869344b161d340 SHA512 3cc702714648db5605638ba28364caa1e0ad0be1b9fb519b434f34fa993f76ba29a9ccdef0e8dea8f4b0fd89514c7196328a1f77efbb9aece30adce5063f7536 WHIRLPOOL dd6598374a41ccdf46867e65a5c02fccab9a505e3129eb95c8ca5f74a69b6cd307c08aadae40fa26d44bf3852d69d95ca78bd3f310f1a772361ce828d7eab63b
--- a/app-i18n/uchardet/uchardet-0.0.6.ebuild
+++ b/app-i18n/uchardet/uchardet-0.0.6.ebuild
@ -7,7 +7,7 @@ inherit cmake-utils

 DESCRIPTION="An encoding detector library"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"

 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
--- a/app-i18n/uchardet/uchardet-9999.ebuild
+++ b/app-i18n/uchardet/uchardet-9999.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
@ -7,10 +7,7 @@ inherit cmake-utils git-r3

 DESCRIPTION="An encoding detector library"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
-EGIT_REPO_URI=(
-	https://anongit.freedesktop.org/git/${PN}/${PN}.git
-	git://anongit.freedesktop.org/${PN}/${PN}
-)
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/uchardet/uchardet.git"

 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@ -1,9 +1,11 @@
 DIST bijiben-3.20.2.tar.xz 779580 SHA256 5774dfdedb79f5ffe5bac3cebe0816dc7e6410381744dcb999815061dee6a981 SHA512 11c00602ba5d10b30c6ce2a32f6ba854e93f2b5eecb9a6eb10ecfa5c700f59b1e96359290771afe72d01bc6275ef6e29d34cbcb5b32e4bed225749e01ad7626d WHIRLPOOL 3905d6e3a52f9a82088b9a8428a86da0d232978ef26fe1652d80a3cf8dec86c2b481b695157e08cea4c8295f53ebb39af4c0783c9912fb5a053c72205addde8f
 DIST bijiben-3.21.2.tar.xz 786676 SHA256 d7f05abd82da837d8d48d9f7acc6035a289d934c722fc89870d17007ba158e0d SHA512 3de700ec9474402062b831460d5178a8bad11580fa8aa9082f325df382b7ed6ae6cede209d6494b09a6292f8babc7f6fd56611e7404f19c8a5335ae697b76b70 WHIRLPOOL 566e230536a2ddcee695e3a84b47bfb9c00612f1af24f3e2ce49eb98b235628ca164fbf04dd537e098c87067d04adde7f8a36bb2944d807025a7792c418b097f
 DIST bijiben-3.24.0.tar.xz 830884 SHA256 2582c083e18b51c1c5743376c2adc1f8c68a1b912d14171a9d655ffe3d31abb6 SHA512 aba794d275b05f2267b7dfdd3f3933c5197d3596e06e72b0ae3d1f9855310761e5ff1b42ec7088fe7c90f55a6ffc64f6c508d72edc389d74256a9bcec90767d1 WHIRLPOOL b52996d7f7f061aa58548d7f199566f624ce6b154d2e4441f7b5d8a84478bc4c459339e9cd18338b171405025cded66c16d38dac736ac74b198b23999319956c
+DIST bijiben-3.24.1.tar.xz 837840 SHA256 2602fc3f8ce5c39813b4273ceed7bdb014b1cf1fa82a6757fc25e5078be4f741 SHA512 c1b14823d291b96b5ce4172d129f696905bc2349ef94ae98473b675358ca7672d5e0b7af66fe1b3288b5bcbc25820531e7229204fdf0b789abfb6d3572e52af1 WHIRLPOOL 8fadf2aaca38fcdd7d4df7d0155ad58929ab9b4d28a21ab18b25ae8073bf4aede30a993634c78c87ca069eeaaeb5e170117a0f25d5f0611b216217fa12c5e0c7
 EBUILD bijiben-3.20.2.ebuild 887 SHA256 74df259e2e566160baf69f4fe0c4658bf6e6635d903b519cc193e7732e4a0465 SHA512 231a2f475588fcc9fcf743983509d9cf6f10430f8d6a764bfe6e7bf0da09c1ffb1a7f9a345baa4ff2944adfa050d03147d92c3838392020a805505e28ab46629 WHIRLPOOL e6ccb399ea11cbef2d8cbc9fc6fb5c3020d672ab363be178b7ae24c5441f7b27276985da17e313637458a9325d294eb478f355779d95f3fd1fb46ea1091e7dd0
 EBUILD bijiben-3.21.2.ebuild 828 SHA256 d764bc9b6d2b9ca802b3ba49b3f521d359f9d2345c0eff8629be11eb558054d6 SHA512 57d6734efb87ce1f17ccf2b1cf94c9db5216896d43378f3c41faad7ff3a453c293dc7d7e3224e1f48442909fffe6bebc120a00d3a9bc134318fd0a867e3d8203 WHIRLPOOL feeb51e83d298c623ed95a667da6cdf2f1f9a6a6deba651af6c858ff6f056c4104b8c47e253ce6137c5983ea4029106a8d3a4f6acae98d4eafcea4ecd320abdd
 EBUILD bijiben-3.24.0.ebuild 858 SHA256 f16f010675b7fe24675f4c77737cb18d91e9acf34446d47b7a4662613aff5d93 SHA512 c3b90558d520ee7f7d70229b004da46dfbe1a2a6df224db57c3b07ffc48326bc8d52affbb997b5cda0549f3750ad4fd0f8e8c338a78b7a33869df58586182711 WHIRLPOOL f75ccddccd89a352eee3ab1d75b69fa21f9ff072f61cdd7f4292345e7b749d033eed1026c4bb894a53206f3d004d7a7fda9db912ef53717cebf3d4ba3ad04d7f
+EBUILD bijiben-3.24.1.ebuild 916 SHA256 b71c113d44547322fe16eb43c7771e9babf7788b8825914891c207051e25e407 SHA512 aa04609147c328e517dd678048500d2f9e6412d60edfa2e6fec3c6184a525faf84e9315a13acde4324643bb3e1b7291e470e4f0eab219e55261f7b857c3f768d WHIRLPOOL 88927d84aa6e7d38255bcec9ab674451d4be82ac8b46295802035da79f400e182ec671cd47fd8f08d332185a7656635b6a436828b69edf12f48d38bb1f6fcc8c
 MISC ChangeLog 4537 SHA256 6904e29c98fdba47211c1d88bb2c028910142ebe51824553fd6ab6650b4b5473 SHA512 48009c1072c5ae8d609c3f2b18d72b54c24f4dd8675bd3b7ded22fd6b60d6bc030f58694a9b702dba1e4f0c37d05a1ede201e2b25bb95db93d57820adab1ad45 WHIRLPOOL c21b7d4a95e85e247e911a558fb1251c003826ed13336ac783b050675678c95c66f9d2a6203fd2b55046b2d90d42aa94853f13d2c08e6c3bd8ba139dc4634970
 MISC ChangeLog-2015 3248 SHA256 b951925fd6fd1fc227ea11a1d364ece88998ada325a2d8a1dca4a7d4c3ac0025 SHA512 e572c555e6470558b089678fb52daa6561ec01c3ada4d8161fbb280e7884d98dd2ee3f77a666d61a9a37483faec7424534bb189e95f23ef64887a7188a9c025f WHIRLPOOL d5d8a113418090f53fa2a3294e647d108affa1b1ff4444a3b520c67411bdc67f7ed8a03e1c8b7b16a7933d4085215093a72b6661c5a372de95979571e57dda02
 MISC metadata.xml 363 SHA256 55e49b9d005195e624311affcb49f58dc2df0e3f7efe0360d3cf1e539a785df4 SHA512 e891b4270a6c2c77ffe9e5efd945c6e6d7fc058e6315fac0793fbf86ca68251fa9a3d2fce796419fce6be1ca0fca215d50b77e9a4da6667475d0e0a155bcc747 WHIRLPOOL 177379d036c1bde78960fb4546abe8fec17a7d99cbe80419fcca377e61219cfbb00be3f5b865058469f46c2739e8f428cdf4d2332be14579f8c5aac0c0ba7767
--- a/app-misc/bijiben/bijiben-3.24.1.ebuild
+++ b/app-misc/bijiben/bijiben-3.24.1.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Note editor designed to remain simple to use"
+HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="zeitgeist"
+
+# XXX: raise glib dependency when Gnome 3.26 enters tree
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3.11.4:3
+	>=gnome-extra/evolution-data-server-3.13.90:=
+	>=net-libs/webkit-gtk-2.10.0:4
+	net-libs/gnome-online-accounts:=
+	dev-libs/libxml2
+	>=app-misc/tracker-1:=
+	sys-apps/util-linux
+	zeitgeist? ( gnome-extra/zeitgeist )
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Needed if eautoreconf:
+# sys-devel/autoconf-archive
+
+src_configure() {
+	gnome2_src_configure $(use_enable zeitgeist)
+}
--- a/app-misc/dailystrips/Manifest
+++ b/app-misc/dailystrips/Manifest
@ -1,5 +1,6 @@
 DIST dailystrips-1.0.28.tar.gz 58713 SHA256 dc54d8559d378fb4115a5605cff5d0e45a69f6ed1539f4aa31d6e13231c362ca SHA512 a5388d5bd45ce1b8b22420c3d53bbbf4d26fec9737c6edca3b579126443e4f88ae5a7ce5c6770264ca96ea1488ab69b73831ab6bbd20e0f68854fb08714565cb WHIRLPOOL 19abde3f088c549f829c9f2f55c58c5ae2c8a045c5c4c37e03b1cae6a20faed98e52650d973e1ac93e4605899427deba4c5628e674cc4ff5130876ad05b2f020
 EBUILD dailystrips-1.0.28-r2.ebuild 810 SHA256 9499ce379c32c1e547791b2c5335f5309b2bc6a482dd54696a732cf3171dfbac SHA512 ef444ddf3c8caee991aae8e23fe013b84be795640243ff10f6c3c5af61ec09e4c21a732661c1576dbc752766ff2b2b2c322a6fbe9083f95b7256740fc405a618 WHIRLPOOL bac9476b442bf28279c69d52eaf27162533819d6a32580c38430c19193fb22f91da9ec69efc231df3c753ffe56ad6d7283ae0d1e700b311e6240fbe80ab03a02
+EBUILD dailystrips-1.0.28-r3.ebuild 752 SHA256 8583c68e73608c101e1bdd59aab0d43683a09342b93c518af06e6dbc3b3b3aed SHA512 52fd790664043171c0627e84a3a285336d29a20673677b398181f39db9786859cfb0626044fba3b4cfbe289db3cf5f4e2d404f832511b47ccd13eea8657edf66 WHIRLPOOL 357d5ff38735ac6c2b81a78ebb84aea462bfee49ed9d7103d86cbe0984d7a931bfff5b1742e595a679184bf165e31e6b293091de56387b041feb9b99961c969d
 MISC ChangeLog 2542 SHA256 5be8cb4b11151596cf079018bf557104e23918eb9994bdd0b1d6ee0361a2cc06 SHA512 7e894531b40ab078ce03662ec7a297d66baf7d2aa210cc2abeab0ac6e9d41c515e4cb128685858db9ba5ae634314ddfb8ae2905fa8f7e7f3b8c0bc4bf6655348 WHIRLPOOL 98ac05546aff526166c55937bc8e47fbd9f694cf75c89499c38657bef7f9e5d6f166b42177fcbcac849905c9cb22d196954ed62ef01a17c88f444f34c5616c0d
 MISC ChangeLog-2015 3161 SHA256 b8cdce4571497cb408701ad6f228195f1cf9b49b221ee7ac4d218f3e4c5c73e7 SHA512 045289d3db2318082ed3c69f1ee1809ee314d09cf17f37e65518da9104f127a5ce20efbd0e9a65a103c7e552ea86c253e48219c1e60af8ede5c3847f580fa4df WHIRLPOOL f37eac05e17a18ce40692cb3fd50ea1c47843637385f10b2b7f25c96e60f087caa2b91ff8999c7d6f931add81feb209771ead03fc96d3f15d9664cc4f3166927
 MISC metadata.xml 248 SHA256 2d248ffc347bc733a37d201dfdf76a146d84634ead379c5986693a1af1e6c7ee SHA512 d08bc57fb26bc08dd2c8eb96219fcf98dd63b1e9ac4725dd0bc246ec90db63ed13cf9653d94ad11789ae3efc933d9ed9781bbb4db6f439c5596bac12011b7552 WHIRLPOOL bdcad488325f8238e4b1a6d5f1de05020dc4e841147880c73815c805d8f98ffce1c187ff68e43358c1db0e8876e47a7becee105f6b2cab8eee6ea1246c22f495
--- a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
+++ b/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="dailystrips automatically downloads your favorite online comics from the web"
+HOMEPAGE="http://dailystrips.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dailystrips/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-perl/libwww-perl-5.50
+	dev-perl/DateTime
+	dev-perl/TimeDate"
+
+src_prepare() {
+	sed -i -e "s:/usr/share/dailystrips/strips.def:/etc/strips.def:" \
+		dailystrips || die "sed dailystrips failed"
+	default
+}
+
+src_install() {
+	dobin dailystrips dailystrips-clean dailystrips-update
+	dodoc BUGS CHANGELOG CONTRIBUTORS README* TODO
+	insinto /etc
+	doins strips.def
+}
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@ -1,4 +1,4 @@
-DIST ddcutil-0.7.1.tar.gz 429744 SHA256 e73e2332d4b8c861026fed3886630b975e85fbda5efeba2866214ef16eaef5c6 SHA512 1bae833298d3d5dbdb235c09905c7325d98e090ee5a2c61abb843680ce1c8e13e700f2b04055d68f72f8e44a930e748e0214adc969909510fc8dcd32431323b6 WHIRLPOOL dcfc663d3e3bcdfa687c069b0c2b7ec8381505cab18e3c4b98b30f6629d2b45ff2a715547087fbaa26b8ba281d1f3c87bd4f670e3b861696041c296fded835e0
-EBUILD ddcutil-0.7.1.ebuild 3082 SHA256 91f82703a4d45a6d67c8a2270c81ce1eba5e4725c866bf76eb9e2c5cffdf1dda SHA512 107b7014d2a384e583882ece136ac8f5e3898ec34fda22e04bb8a9bb7b9f0259e2083a66d9779d7db6e887661eb4851a0a0e1185070fd8b73fd7d2c801fac2b9 WHIRLPOOL 2aecc419ccf7ceb417245391a6be4480c8286cd3cdd7661d52cf3b4cfb271a0fb1fa8a051e1aad605ad5fedda18381f7dbf6e8ddd16fe05a117bc9eb3c5af4f5
+DIST ddcutil-0.8.4.tar.gz 558405 SHA256 7bfa9bd1dad7aac1853cf1070d2becf47156c158b84ae874cd77e8fd7d4e44d5 SHA512 e7bf78295a008607ef520e055873acc0bac6d94b850a6ea1f7d4a4ea9e080d23b4b7d82e5725a220ff120ab1523aa320265ba22671982625c10088521c72a14c WHIRLPOOL 3637a3a03a5a4d402f1ca3dcf0ecee8cd361735cff1ffce4a2e862ad9c87fe12cd09a782c5c2b6bfd53e94547eecf29c344ce918217931593e07a4a207bf241a
+EBUILD ddcutil-0.8.4.ebuild 2891 SHA256 fdaa8d6576bfbbd9b10627e3e41c65469d5412addb5a063263ab96d7885bd7c3 SHA512 bd35c9e20e89e35637cf2565f4a504635fc08e793ac31686238030dd125550a75a20d88d77d76277a618032380a11e575baf39e22cfa9729dea6f713a78b5a5a WHIRLPOOL 2365573e81fbb8b23fd54daf9cf5a18c6d506e024fbddbad6189446de93328d92fda2fd409ecf221888ffee135773a4e4dfbe1ca5defdaf171e3d1efa0496104
 MISC ChangeLog 756 SHA256 3ff29933fd30bc81aadf45bd7a3c9047fe3721cc22c10728fe0254e7055bfeef SHA512 aefb3bc91b67c481b94cb5518b89c6fa56dc7326e5bc7dcf277d1b940f818832dfde0b209a5747c71252dca36a54d736ec392cf53a4a45ee8fc730cf39ec13e3 WHIRLPOOL e914df41a8773052f089504b9b6cec2c66379616f913eef9d54e9c312ed02f7199c2c0465ae10d4def07b94559255eb105b292e3ce5f9b4b10a7a0be1a88c837
-MISC metadata.xml 1384 SHA256 62246606bb332a86f75ac2544cac5ae210b06c889e37db081392c0e2c12e157a SHA512 a3fffa559b10ba38e415e3e6ccec21379026b3b2927a9c5d0790b6857006262a6058f70339c75db5f3649268243e04b626ffa960db0359c9e8dede3fe2c7ef8c WHIRLPOOL 9470c18a8a8bc1575f32c25db690e07badbed2604ce03cff2ab9932e388b5658db02d087e6110cdcafbe05d9b3d7a9bb4941a7ce72890959c92f9f237a8bc3be
+MISC metadata.xml 1277 SHA256 4ef015ffaacdc3e15213d066501a4709e3629a7d3e8ae7b31a50ad4a03ca42f7 SHA512 e71e364fddc851248f3c87be147b2ac046326172a2726b0614c60136a99223ce12d30999140c35534ff86d024023f80f8a7149a8fe59a8d6bfb2771468b514af WHIRLPOOL 8845c3281a2d3cc5122743d1a99363c47c38a28d2ec288d74eda45e4191266ba7aaab44a8fb894f3b9bfd407fc9848d4d4f2d071eb8cb51639c0542d69076130
--- a/app-misc/ddcutil/ddcutil-0.8.4.ebuild
+++ b/app-misc/ddcutil/ddcutil-0.8.4.ebuild
@ -7,7 +7,6 @@ inherit autotools linux-info udev user

 DESCRIPTION="Program for querying and changing monitor settings"
 HOMEPAGE="http://www.ddcutil.com/"
-
 SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 # Binary drivers need special instructions compared to the open source counterparts.
@ -16,7 +15,7 @@ SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.
 # the different drivers.
 # Remove ATI/AMD driver since it's masked for removal.
 # Will most likely need to set this for AMDGPU when in portage.
-IUSE="enable-api-libs usb-monitor user-permissions video_cards_nvidia"
+IUSE="usb-monitor user-permissions video_cards_nvidia"

 LICENSE="GPL-2"
 SLOT="0"
@ -39,7 +38,7 @@ pkg_pretend() {
 	CONFIG_CHECK="~I2C_CHARDEV"
 	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
 	if use usb-monitor; then
-		CONFIG_CHECK+="~HIDRAW ~USB_HIDDEV"
+		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
 		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
 		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
 	fi
@ -56,9 +55,9 @@ src_prepare() {
 src_configure() {
 	# Python API is still very experimental.
 	local myeconfargs=(
-		$(use_enable enable-api-libs lib)
 		$(use_enable usb-monitor usb)
 		--disable-swig
+		--enable-lib
 	)

 	econf "${myeconfargs[@]}"
@ -96,9 +95,7 @@ pkg_postinst() {
 	fi

 	if use video_cards_nvidia; then
-		einfo "=================================================================="
-		einfo "Please read the following webpage on proper usage with the nVidia "
-		einfo "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
-		einfo "=================================================================="
+		ewarn "Please read the following webpage on proper usage with the nVidia "
+		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
 	fi
 }
--- a/app-misc/ddcutil/metadata.xml
+++ b/app-misc/ddcutil/metadata.xml
@ -18,9 +18,6 @@
 		a USB connection.
 	</longdescription>
 	<use>
-		<flag name="enable-api-libs" restrict="&gt;=app-misc/ddcutil-0.7.0">
-			Enables the C/C++ API.
-		</flag>
 		<flag name="user-permissions">
 			Adds a udev rules to allow non-root users in the i2c group to
 			access the /dev/i2c-* devices. If usb-monitor is selected, users
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@ -1,13 +1,6 @@
-AUX fdutils-5.5-destdirfix.patch 5699 SHA256 a2d2961738840aba6ec1b298da177bd4f474faa0b8ce01da6bf884d133ca68ee SHA512 88c4c1c5f12a38af48331edfed0615a8df6f6d6ee6457bd3453af788d9928b6cf7d1f1f9cc285dc6d86fc7eb7307f75a22c075b01cfaf07780b4985165a1b273 WHIRLPOOL 0396b008a18d4b02f3eb5653f074ce746153bc02e09fbe4aa73ef3aae9d1cbce91bb65c64f7aa4472d5be52dfc98e05ce476cb4e8d51266ff40d96980513bbfe
-AUX fdutils-no-fd.4-manpage.diff 434 SHA256 3436f0c8b8b52b3f418696cb19cd95027f016260a85ed8cb95691b33d802c075 SHA512 fde1038d321bc35baefed78ebc031668210b2ee5990012517f9c9cf75489093865d602a3e996aa4e4aacc3e2dd8f11142493623d2e6a90270876ac13d0fc7b9e WHIRLPOOL f2a098b7327cdbde3dfb8e2c86762fd46e6c3a2afeb59b3276cb6c8f47bc516c8ad16c9431f274ca15a1c7f6483b860804ebdd98a1ea516c875bb304052a3767
-DIST fdutils-5.4-20020222.diff.gz 25310 SHA256 259c340a5956272e60385d0b8ae0a04b3d2ae0fc395114672536cba5f50bf903 SHA512 069583e796f86266e486ad65009d6a8163fc56b59f957f34ab144cc25188b868c950a48e2fd25fc876cd5b1fa3faa40bdc4c16e4690fe3a2a47f933f85e31094 WHIRLPOOL 9b679a1a0b7254a1d72de083c3ae3fa9c329234c6da6138ad08649cde8fbff002e31ba8f0d4de504c3a98404a88ab23a3dc76a60b51599ee18af786f157e2d12
-DIST fdutils-5.4.tar.gz 190535 SHA256 20ebb4fa9ec74e669eb0377819fafbf177325e930906032649aa8344bb34b9e9 SHA512 3c2dde9d2e14f771f6916851827df5b2dde62e3522b6ceb411bf0772800a4d8ed4721d99ad170b81de0cc8dba41a60817232993f3d69eb07141e1929ac626570 WHIRLPOOL 20626366bc1ad4334184de97c8ef43d50a00496be80f298a59eeb1144f493750cea61a39cc43ff8d251794854ec0a635141bc39d43cba9fad36c411bd0710da2
-DIST fdutils-5.5.tar.gz 222801 SHA256 87d5bbe8094558463acc5902664c58afd794322b0ea3ab3c2ed7b362c583a48a SHA512 c9eab0b8931bbd11fcacfeff54c87059844b068595725abb00c7c605cba0bdc7c9abcd31d0a0186786306a9136eac2ec3bad43842f0383acdb162ccbb39a73b8 WHIRLPOOL 622ded0b8f56257f42fdb7ab7ce648a3d813882c2b05ab30cc36c1b447b66e8c51757ce972b43ffd65d7929be7b7aed72ff3fe235c8fa47a263739ae1daace14
 DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 SHA256 51fae03acb4f087b09c076dc3ec4e7b31362f1e1a9fa7b2b17d6dade1cd512fb SHA512 db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149 WHIRLPOOL f34a8d5d98a5b89544270dad4c3198881062aef7bec99e2dbfc186bfeab2e24f5ac741b487fac8136d7bddce907527645116d26d21f5f1af9e6d4f6c581196e8
 DIST fdutils_5.5-20060227.orig.tar.gz 222915 SHA256 a867b381adc3596ca9a0c9139773bef18a38ceb5fa0e7401af46813c3a4b8d58 SHA512 a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd WHIRLPOOL 4baa17276258669d950a0b3199db23521ebcd63ebe069f9ad94ec1903dd62e142314ad411c6d40a7323f5cc4869f3fab147ca3eb930f4ae0c7dcaaea3362c442
-EBUILD fdutils-5.4.20020222-r1.ebuild 940 SHA256 dfdabed0fed3ba232349cdf818fffe264bc801ebe3a6eaebb1041313421aaaf7 SHA512 f6811e355ea81a0df8aaeed9484d86b70c0bb50dc9c77de6ac6b1abced4431f4c576c040d53005b652135822a7983bf85917559e144d6ffbce2cec6b37f3b699 WHIRLPOOL 50821ac87184d4b5e207b9b57f7d85a252cc87aeeda7a8633da013ecee66e75ecff75614ef38e124d1899650c641c5950cf1c36243017433d38193ef388dcc6e
-EBUILD fdutils-5.5-r2.ebuild 1070 SHA256 003620fb52601736ef8f6e74dae176dfe13d20d339f54ffcbad26e80ec42915d SHA512 56558f4d09994534b81e3cc3bf2c673ad9552c6299141fbd3026687a8be1b0194d2b3dc2b93e0775a8cf69dc707b2fa98106bccbb667b4f422d69abf8fe82901 WHIRLPOOL 16179dfd706d4cecad1ffa3653425bc09467cd8295e667d3d7bd4a90a41805ca1a9b86bc2d1a35063405844d9398901107c5a87de8d6c6ec6a64525617827c6a
-EBUILD fdutils-5.5.20060227.ebuild 1345 SHA256 181fbf2f84f7f07f5b86b032c0e978eda12d3b708f6efb461b954146d166197f SHA512 e8b64abca1bca23214ff7f59245d549179cba73dbdbf2e2388ae1e585a9d186ad5952596a1b6205e6663c9353b7002269aa0f880b187fc849d2f8088b9aa4048 WHIRLPOOL 566ee2520728472ebec01bb737197fef771eff548c7e0d4326f4c49e65bd3ecc9e3702881989fe07b6a56c516714b2e1cfb5d30a0859ff45997292ee8e0f9982
+EBUILD fdutils-5.5.20060227.ebuild 1344 SHA256 0a6a351328ac8d0f08e8e8b8ad15a56044fbc2420178a2ccdf8b50b9c44b0b63 SHA512 d7c7c3a6467d782d6f185248a3bb24bb795ee927b9e3d9b0faf9629df239f6307477da04282ac70671385c425ca4e95d7bede9d12d1bc77a99261238305ab1c3 WHIRLPOOL 550b4b904301efd6efb87ba0dbe381f5ce9e3c95eb54ac53df4d48663cbf0ee0f1248d1dee998cd11a28c2d4c15167b1eb460556133a678cdea225f57cf4534d
 MISC ChangeLog 2788 SHA256 a341ee34f9199090f434d59ad8844e3b04e540c062c8a37571d13ced2cbeffa9 SHA512 436c5e1589640f61e2e4a7091cf320a074332aefcba831b83bd522a94c86b314b331615319a58730be4502af3e3621c2cae8e1232b6be5f4d42c674121d64324 WHIRLPOOL 5db4d4bb2b4ebf3a6d0f6840299f9ee4ad5d675f4385193fb1e98eef48abdfeaa32e866237b00d16f0de8f2aa01e1fcf0177bf8b34b0fdb43759c26a7c734719
 MISC ChangeLog-2015 3943 SHA256 7af4814c528fef0e0ded1b9b3a83fe587a6c9d259c35304dd37d31aa41ff85db SHA512 32904bd815bde304793d5b223abd425f84d8c95a7d5d3208439780c3d9feb4496fd574a514fea8509f02e7b721e8d86f1655fd050a20b4844d0fee0f05c88539 WHIRLPOOL 0d772cd4cfb449a5158522ef8e64e734f29cca3b1bdf1b3b9792302f48acb6210acde9ec95fc0c804644478ef66258496ede477e1030cc164d73bdf1cc1da2af
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
--- a/app-misc/fdutils/fdutils-5.4.20020222-r1.ebuild
+++ b/app-misc/fdutils/fdutils-5.4.20020222-r1.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-S=${WORKDIR}/${PN}-5.4
-DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
-HOMEPAGE="http://fdutils.linux.lu/"
-SRC_URI="http://fdutils.linux.lu/${PN}-5.4.tar.gz
-	 http://fdutils.linux.lu/${PN}-5.4-20020222.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="doc"
-
-DEPEND=">=sys-fs/mtools-3
-	doc? ( virtual/texi2dvi )"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${WORKDIR}/${PN}-5.4-20020222.diff"
-
-	# the man 4 fd manpage is better in the man-pages package, so stop it
-	# from installing
-	epatch "${FILESDIR}/${PN}-no-fd.4-manpage.diff"
-}
-
-src_compile() {
-	econf --enable-fdmount-floppy-only || die
-
-	if use doc
-	then
-		make || die
-	else
-		make compile || die
-	fi
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-
-	einstall || die
-
-	insinto /etc
-	doins src/mediaprm
-	dodoc Changelog
-}
--- a/app-misc/fdutils/fdutils-5.5-r2.ebuild
+++ b/app-misc/fdutils/fdutils-5.5-r2.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
-HOMEPAGE="http://fdutils.linux.lu/"
-SRC_URI="http://fdutils.linux.lu/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=">=sys-fs/mtools-3"
-
-DEPEND="${RDEPEND}
-	doc? ( virtual/texi2dvi )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# the man 4 fd manpage is better in the man-pages package, so stop it
-	# from installing
-	epatch "${FILESDIR}/${PN}-no-fd.4-manpage.diff"
-	epatch "${FILESDIR}/${P}-destdirfix.patch"
-	sed -i -e '/\$(INSTALL) -c/s/ -s / /' src/Makefile.in || die "Failed to sed upstream src/Makefile.in to prevent premature strip"
-}
-
-src_compile() {
-	econf --enable-fdmount-floppy-only || die
-
-	# parallel make unsafe (bug#315577)
-	emake -j1 $(use doc || echo compile) || die "emake failed"
-}
-
-src_install() {
-	dodoc Changelog
-	use doc && dodir /usr/share/info/
-	dodir /etc
-	emake -j1 DESTDIR="${D}" install || die
-}
--- a/app-misc/fdutils/fdutils-5.5.20060227.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/f/${PN}/${MY_P}.orig.tar.gz

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

 RDEPEND=">=sys-fs/mtools-4"
--- a/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch
+++ b/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch
@ -1,140 +0,0 @@
--- fdutils-5.5/doc/Makefile.in.orig	2005-07-16 19:54:56.000000000 +1000
-+++ fdutils-5.5/doc/Makefile.in	2005-07-16 20:00:42.000000000 +1000
-@@ -79,68 +79,68 @@
- 
- # Don't cd, to avoid breaking install-sh references.
- install-info: info
-	$(top_srcdir)/mkinstalldirs $(infodir)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
- 	if test -f fdutils.info; then \
- 	  for i in fdutils.info*; do \
-	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
-+	    $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
- 	  done; \
- 	else \
- 	  for i in $(srcdir)/fdutils.info*; do \
-	    $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
-+	    $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
- 	  done; \
- 	fi; \
- 	if [ -n "$(INSTALL_INFO)" ] ; then \
- 		if [ -f $(infodir)/dir.info ] ; then \
-			$(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir.info; \
-+			$(INSTALL_INFO) $(DESTDIR)$(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir.info; \
- 		fi; \
- 		if [ -f $(infodir)/dir ] ; then \
-			$(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir; \
-+			$(INSTALL_INFO) $(DESTDIR)$(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir; \
- 		fi; \
- 	fi
- 
- 
- 
- install-man:
-	$(top_srcdir)/mkinstalldirs $(mandir1)
-	$(top_srcdir)/mkinstalldirs $(mandir4)
-	$(top_srcdir)/mkinstalldirs $(mandir8)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir1)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir4)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir8)
- 	for i in $(MANPAGES1); do \
- 		install -c -m $(MANPERM) -o $(UID) -g $(GID) \
-			$(srcdir)/$$i $(mandir1)/$$i; \
-+			$(srcdir)/$$i $(DESTDIR)$(mandir1)/$$i; \
- 	done
- 
- 	for i in $(MANPAGES4); do \
- 		install -c -m $(MANPERM) -o $(UID) -g $(GID) \
-			$(srcdir)/$$i $(mandir4)/$$i; \
-+			$(srcdir)/$$i $(DESTDIR)$(mandir4)/$$i; \
- 	done
- 
- #	for i in $(MANPAGES8); do \
- #		install -c -m $(MANPERM) -o $(UID) -g $(GID) \
-#			$(srcdir)/$$i $(mandir8)/$$i; \
-+#			$(srcdir)/$$i $(DESTDIR)$(mandir8)/$$i; \
- #	done
- 
-	( cd $(mandir1); \
-		ln -sf fdmount.1 $(mandir1)/fdumount.1; \
-		ln -sf fdmount.1 $(mandir1)/fdlist.1; \
-		ln -sf fdmount.1 $(mandir1)/fdmountd.1; \
-		ln -sf xdfcopy.1 $(mandir1)/xdfformat.1 \
-+	( cd $(DESTDIR)$(mandir1); \
-+		ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdumount.1; \
-+		ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdlist.1; \
-+		ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdmountd.1; \
-+		ln -sf xdfcopy.1 $(DESTDIR)$(mandir1)/xdfformat.1 \
- 	)
- 
- install-zman:
- 	for i in $(MANPAGES1); do \
- 		gzip < $(srcdir)/$$i >_; \
- 		install -c -m $(MANPERM) -o $(UID) -g $(GID) \
-			_ $(mandir1)/$$i.gz; \
-+			_ $(DESTDIR)$(mandir1)/$$i.gz; \
- 	done
- 	for i in $(MANPAGES4); do \
- 		gzip < $(srcdir)/$$i >_; \
- 		install -c -m $(MANPERM) -o $(UID) -g $(GID) \
-			_ $(mandir4)/$$i.gz; \
-+			_ $(DESTDIR)$(mandir4)/$$i.gz; \
- 	done
- 	for i in $(MANPAGES8); do \
- 		gzip < $(srcdir)/$$i >_; \
- 		install -c -m $(MANPERM) -o $(UID) -g $(GID) \
-			_ $(mandir8)/$$i.gz; \
-+			_ $(DESTDIR)$(mandir8)/$$i.gz; \
- 	done
- 	rm _
- 
--- fdutils-5.5/src/Makefile.in.orig	2005-07-16 19:51:09.000000000 +1000
-+++ fdutils-5.5/src/Makefile.in	2005-07-16 19:54:39.000000000 +1000
-@@ -116,27 +116,27 @@
- 
- 
- install-conf:
-	$(top_srcdir)/mkinstalldirs $(syconfdir)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(syconfdir)
- 	if [ ! -f $(sysconfdir)/mediaprm ] ; then \
-		cp $(srcdir)/mediaprm  $(sysconfdir) ; \
-+		cp $(srcdir)/mediaprm  $(DESTDIR)$(sysconfdir) ; \
- 	fi
- 
- install-bin: all
-	$(top_srcdir)/mkinstalldirs $(bindir)
-	$(INSTALL) -c -m $(PERM) -o $(UID) -g $(GID) $(srcdir)/MAKEFLOPPIES $(bindir)
-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskd $(bindir)
-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskseekd $(bindir)
-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppycontrol $(bindir)
-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppymeter $(bindir)
-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) getfdprm $(bindir)
-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) setfdprm $(bindir)
-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) fdrawcmd $(bindir)
-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) superformat $(bindir)
-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) xdfcopy $(bindir)
-	$(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir)
-	$(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir)/fdumount
-	( cd $(bindir); \
-	ln -sf xdfcopy $(bindir)/xdfformat; \
-	ln -sf fdmount $(bindir)/fdumount; \
-	ln -sf fdmount $(bindir)/fdlist; \
-	ln -sf fdmount $(bindir)/fdmountd )
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-+	$(INSTALL) -c -m $(PERM) -o $(UID) -g $(GID) $(srcdir)/MAKEFLOPPIES $(DESTDIR)$(bindir)
-+	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskd $(DESTDIR)$(bindir)
-+	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskseekd $(DESTDIR)$(bindir)
-+	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppycontrol $(DESTDIR)$(bindir)
-+	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppymeter $(DESTDIR)$(bindir)
-+	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) getfdprm $(DESTDIR)$(bindir)
-+	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) setfdprm $(DESTDIR)$(bindir)
-+	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) fdrawcmd $(DESTDIR)$(bindir)
-+	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) superformat $(DESTDIR)$(bindir)
-+	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) xdfcopy $(DESTDIR)$(bindir)
-+	$(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(DESTDIR)$(bindir)
-+	$(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(DESTDIR)$(bindir)/fdumount
-+	( cd $(DESTDIR)$(bindir); \
-+	ln -sf xdfcopy xdfformat; \
-+	ln -sf fdmount fdumount; \
-+	ln -sf fdmount fdlist; \
-+	ln -sf fdmount fdmountd )
--- a/app-misc/fdutils/files/fdutils-no-fd.4-manpage.diff
+++ b/app-misc/fdutils/files/fdutils-no-fd.4-manpage.diff
@ -1,12 +0,0 @@
-diff -urN fdutils-5.4.old/doc/Makefile.in fdutils-5.4/doc/Makefile.in
--- fdutils-5.4.old/doc/Makefile.in	1999-07-02 15:03:25.000000000 -0700
-+++ fdutils-5.4/doc/Makefile.in	2003-12-10 00:24:36.000000000 -0800
-@@ -22,7 +22,7 @@
-                floppycontrol.1 makefloppies.1 xdfcopy.1 fdmount.1 \
-                floppymeter.1 setfdprm.1
- 
-MANPAGES4   = fd.4
-+MANPAGES4   =
- MANPERM     = 644
- UID         = root
- GID         = root
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@ -2,8 +2,7 @@ AUX jq-1.5-dynamic-link.patch 292 SHA256 c4000f13ea2e0fe85e4d89470af17b7528cb87b
 AUX jq-1.5-heap_buffer_overflow_in_tokenadd.patch 1241 SHA256 5069a8e81ece30279e8d525b4a590f5757dfb3d05f8c0a9bf212f37e75905fcc SHA512 7c0e7268a8715f9354322b81e82971fd6e6810206024fb59f55fdf319c1053fdd17ab4d2a78c8edc9ed1638339671419f4ea92cbb0f8ffbb34e5b521efb35718 WHIRLPOOL 16d961d05c95d17c3d87543fc60b6166b968356b25568a8b1d2a5b2cb43bfed37435342ff7a3b530527222835da88ba6c4ccfbc60e542c22eb93431db0473ebd
 AUX jq-1.5-remove-automagic-dep-on-oniguruma.patch 1879 SHA256 d5b55b63332899e9eff705fbb32fb1d790e2c637ff3be2659c47ecf8b17bc6c2 SHA512 3c7efccf85beda5f80c66432f6950b2d885c4587e6ed3cdc66447f60440dc0287da834cc5744ddd7af8ad36677254ebae6969bc498d36e457dfac69ca0da3f6d WHIRLPOOL 903ce507584d94ac49eaaa33c414e9fdca1a7f9ebbf185038ccb232b78ac6c04d7782458b97db0e983037ff4ab63e3e1cdd8d164191b7b22c020930d25baf913
 DIST jq-1.5.tar.gz 739309 SHA256 c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c SHA512 4a0bb069ae875f47731d7d84ae6b82240703dc7a694cfb0aee4c7e9639defe7ba9af575d17dc32bda4426b80c186cc8dcd4505f3a6bcbe16b39e9b13097da238 WHIRLPOOL ca45763fb43ba0bc4a97f1a6d34e3c5af0f25f2548d04646f76ac18e95792445eaa42869ce4a7a736b7d6bc09440225e277df79abacf23ef3c8f1b41170e2907
-EBUILD jq-1.5-r2.ebuild 1309 SHA256 2b108de88ec11c1050d14652b1f72aa6b2777fa2e4aef48afb33211f26516889 SHA512 f784bd9a4aa711f2779aded94d70af3692d69da6b626de1c2a4d9274366b264ef47f019caaef61fd0df2efa1511ec100c09f14a0d31f3a5472951b51a67a3a97 WHIRLPOOL 4823bc376c9a9c589898fe15cf4e0c57dcccf4065f935c9f0f37aa1b84668ed2e63022aa90241a12cbe692cc8fe6fade8002804d5f15788c67905ae2d8d64f51
-EBUILD jq-1.5-r3.ebuild 1366 SHA256 a890b42b64c69143556588cb47c0e6a4dec679edfab03f98d10c7380f6ad83c5 SHA512 a8833865c6aabdfa16a485416b0525ac3998c73e4dfcee9bebb75d047e3ff7774834477916e42995e9e43bb3147ebc0a389444357f1a19a0a59068e71ccd80d4 WHIRLPOOL 539805401c22902e2f420e60d34724c8df78681acadf63ae94faa9b5581d0c6c1db076f37ae1f9ee9a9411a75e20b70fceced532092ac5beab7c86cfb9ca8ee3
+EBUILD jq-1.5-r3.ebuild 1364 SHA256 c7fae2370f4b4e8f3fc9d14239c2c08627b11d02d67d8d2493bf6926f8de3853 SHA512 4bd6cd75c1e41e29c5acc47ad86a2d673273f70b57123b678f87846941f74b0ebf527c89a847a51d03ec1302cbb62702746cfb6a62fc817c2798f193ece985d3 WHIRLPOOL 704f33343ee35d1e62d856560fafe914c4810be804d9086dc4069c0b25406461d06d82ee1ce8cb63839031a53648709c5145d20d7ca105730cfe49564dbe6776
 MISC ChangeLog 4611 SHA256 f882e1fdddc525ad029cd8c7787b81e5acaaf956bf93372738f0af2107258ec0 SHA512 fa4a3f42f00c9817fbbd524939f885ce8451dea401f5f1ce0c76f4f56839a24e3da98b3f0354ce75c769a78b8b5614702a511c6d66a96017242fd95cc57c4dec WHIRLPOOL 38eac5aa24f837b5177d390a6951120efcda5aa867bcebeb74bc3f1a23fd549865becb6894a33ceefadc507aff0051a17933e04317076bd33b11c156e1b78808
 MISC ChangeLog-2015 2176 SHA256 2e4f02d2f3bd0d54f9eb8e19deebb0bc43a8a7bd523dd65a0391817de5d9afeb SHA512 b407b35544a94c67504a90635083d816147c27791c8ee745e8252dcb0da67950fdf248eb791a25b3275a259ad70ef7a475a8b24d14711cdfb6e943da34493769 WHIRLPOOL ffef34e807b2ad4af67959abd78088316d73db4f520ceb062b0c2cd5c3149bbc31acbf251ab0dfbef2d74305702ad2d995bb92cb12a13c4e0820162c0e298e08
 MISC metadata.xml 496 SHA256 319ebb2c53892f65fee042340d9863478f1dac535343bdb8b45acca859be3b64 SHA512 977a50ca16817f33a37f8f97be38f981c7aeaef36d22f19435eb16e5451194d487350460e10b474c45c58d5a401bf045784c3b9d821a8eb62dd765ac438c06df WHIRLPOOL b81d8c450f11df5d1d90fa96314defdbbcdaf51ce70c5750112a47a46ca9c917254487ad2e06644ee65a9c2864e80ac06176588a34c7730121c88b1c3f0b9343
--- a/app-misc/jq/jq-1.5-r2.ebuild
+++ b/app-misc/jq/jq-1.5-r2.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="A lightweight and flexible command-line JSON processor"
-HOMEPAGE="https://stedolan.github.com/jq/"
-SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="MIT CC-BY-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x64-macos"
-IUSE="oniguruma static-libs test"
-
-DEPEND="
-	>=sys-devel/bison-3.0
-	sys-devel/flex
-	oniguruma? ( dev-libs/oniguruma:=[static-libs?] )
-	test? ( dev-util/valgrind )
-"
-RDEPEND="
-	!static-libs? (
-		oniguruma? ( dev-libs/oniguruma[static-libs?] )
-	)
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-1.5-dynamic-link.patch
-		"${FILESDIR}"/${PN}-1.5-remove-automagic-dep-on-oniguruma.patch
-		"${FILESDIR}"/${PN}-1.5-heap_buffer_overflow_in_tokenadd.patch
-	)
-
-	sed -i '/^dist_doc_DATA/d' Makefile.am || die
-	sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
-		configure.ac || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		# don't try to rebuild docs
-		--disable-docs
-		$(use_enable static-libs static)
-		$(use_with oniguruma)
-	)
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( AUTHORS README )
-	default
-
-	use static-libs || prune_libtool_files
-}
--- a/app-misc/jq/jq-1.5-r3.ebuild
+++ b/app-misc/jq/jq-1.5-r3.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"

 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~ia64 x86 ~amd64-linux ~x64-macos"
 IUSE="oniguruma static-libs test +valgrind"

 DEPEND="
--- a/app-misc/physlock/Manifest
+++ b/app-misc/physlock/Manifest
@ -1,8 +1,7 @@
-AUX physlock-0.4.4-makefile.patch 340 SHA256 25c5e0ef4cb4d7cdf22026b04967aa58effde70f154a43964eae17e1b1f8ee0c SHA512 384aa4606bbbe20d51e554a190ccfbf475261ac5329a6a078aff2cb92debcf4dcbe2a9695cefd7c856efb6fe01cc976165962feaeebd5e7bd4dc0b01469ff8e6 WHIRLPOOL dd6ecc1ac043120b0379c048f14dcf1eae87b46be11c1b0064a873796e6c9c784d0840bcce8befda0ec5b33bc8249ec64a6ae2eaaebfa2d0b5daef0aecd4aff1
-DIST physlock-0.4.5.tar.gz 12804 SHA256 5ddb42553142c5e2b8744d086bb8f5bf131a29fc58b8886e825b80e6a456961c SHA512 ab2e71bdc0004d97e3742cf8155602c036dafa22156147cc3cd4050c1665e54d4ca04ee8dc1f763e6369a5d6592524cbc8e10c56870905a1b13385640f4ec476 WHIRLPOOL e770cc9e4448c3407c12d51e1bb2d1fec5f74cdc5be4d6503fa89a297b3a40b7f5bb67466fbb641e2af249339aacdf2abb5de9ac145482c1b283604abbb51533
 DIST physlock-0.5.tar.gz 13547 SHA256 395873abe9bfb3879df796bd9d857be024c4ca01c5b6e83cfd3253647b558782 SHA512 0e22d2c1093556e2ca52da4ee36e53a7eebf9c2cf8e10592c95971aa3479c3ee1a31b9d71e52fca715a483f22740f6cf9a3c167fb61e4c6034a2ecf900fd5f9d WHIRLPOOL 4dbfea803043a691e16a515fede273a27360923808aa2d1c6bd281282bc24b24113cc39915ba2f90723dd15322ac930297605f7cc2c6b1fc51cb7794ee46796a
-EBUILD physlock-0.4.5.ebuild 527 SHA256 24f4c2e5b0a23d314576e8f3c54446d2c4da297f5d03e51397bcb63e789f85cf SHA512 0e01a08c0c97cd5c1049c2804e71b4c5f5917a573f5164fc41b64213c6f3b17ce640f8ad9a26f1f566373b6440b4555c621e6f5e4ec7919c1e0e39848b1b12f4 WHIRLPOOL 3258edb390b8e56ae6ac83f7461df6c7499493d281a48836d22480e8b57a4e0b4813e63c8c6efe7abe9877f2a9424280f06c80bc8adc65e6e2dbb32fb66f3b61
+DIST physlock-11.tar.gz 13791 SHA256 f03031a6f4c6a08d62098457834d04b8835082a76609059451397356a83d4442 SHA512 d3badf5c99e4e3e16f4e7ec5c59ee8320c845f1b180463900d816206362ce1aa8652f2489453ad5e190cceee2ed61a90acc52e25bb6b4c4a9dc8c4ebd3054938 WHIRLPOOL e74513bf5c60db1669dfa11496f98cd4100753ce1a9aa93c603235680adb3ff4b7f2bffff134e8f2f27534e1a5fffff15a4cd17627dd2761f6b67d3903a166f4
 EBUILD physlock-0.5.ebuild 471 SHA256 91feab43fc4fc14092d8e9c6aa9097365ac346441de4ab379f5aa0de0aa6c48e SHA512 743491ca82a6f0495b22c2356f8f27846cd27689f4b2e67473de54aa7551a46c7c1865d7a6b2a0c59bbf329f9323700973089403aabdf049aa3d0f1242c07f54 WHIRLPOOL fe7f300e5c32a7313653bd1a8118f54f240c360f40f8e614dd8bc075dec47de642cf38ced9aeaf547076357fafa2c4f6cb8bcfb9bd313b5c8addb353557c6ea4
+EBUILD physlock-11.ebuild 523 SHA256 8d51699178571eefa074831bf2cd064f22f69368120b8d15e223cfdac745f784 SHA512 8412a1a7a74145589962d8a8a81e35352c6dc75c2af078b3e771c3686f209f367175450ed56c2c0ca5bdff6ddf134eef0253b56c66f16a20cc9d609df3f02ed5 WHIRLPOOL cdc69ab631ddba87e6ba3ade1be1757676a724406d33bd6aff84096248373542ae9e507a063901e90e3985c69ff139a6a50994b4ce54f5236341ba5ea772bb0d
 MISC ChangeLog 3003 SHA256 884b796c6597cab7c563bbadf3f5a9e5c19a5fc4461351a620adf79b05275861 SHA512 d6ff1325f245859348f22ea07a60220d928e3dd23275216f7e7b244942179aa8d8e3cd438c475766cc7f53181485a7094f5f5eddb229fd0755e041c66ae7a071 WHIRLPOOL 93e984218b8215f03c6034a20e6597f24fb37227b3302b8dfb716b761d7967fb901147567e4ea689f29c31787245f4381efed7091be867816b3a39aa1b45e4ba
 MISC ChangeLog-2015 863 SHA256 64107fb881cab2b517c1376767e28a6d915d1b016bdb7fecbfe6d52d4648a5fc SHA512 438f410ee8cae55183287245a9724c0fe1d7e5004c3103894bc5804ee244551453ccf0bf7c7024cb4032d29faf9c037f0a6ece71705db2fccedc38ce6067be5a WHIRLPOOL cb4a0948ada4363ee1bff9febb15cc39350fdc620a213575b6aac9fafc1f7f7e5bdc3c3ff70a1357da90bab9ea998537f806c69d92ff973aaa9d9ff29d330ba5
-MISC metadata.xml 756 SHA256 7baab23f761ec91cfccbc6e0f0672cca73e7c384c733cf82e124c79dd56bf600 SHA512 ba42f2155f2842d34d75d5e5ccc33c5ea73b229f3fdaac24eec67e41e3b201099c6c01420e30a25a29e3c2d2788068853204e53eeb74375352ee95b3d8113c4e WHIRLPOOL afb4b019ed82072469c254f78ae8ec2dee7118f0cba3f6e636f53d824ee1c011f16b26cad82a49bc5807ed43ac4a4e8a04e002572950ea05438153dfc00039a4
+MISC metadata.xml 757 SHA256 b7602043c7acf204376271583fdc45d920f55823a16c7689836ac65e3e4da01d SHA512 34f57b70b867095ad5ddffad1a5a943488699e98495e98631dde72a96fca5260947bcece476e4411d146d6a1f72ed602401455d49343a4fa79faae77b5483625 WHIRLPOOL 34404fccbced6e1a6a0720a951d79f748338b0917d486e430d0d90daa3e33b53bb0354e6cd2a79140302364ac3f4e615b3dd7317dd71f6f76063a6d3fcf405ca
--- a/app-misc/physlock/files/physlock-0.4.4-makefile.patch
+++ b/app-misc/physlock/files/physlock-0.4.4-makefile.patch
@ -1,16 +0,0 @@
--- physlock-0.4.4/Makefile
-+++ physlock-0.4.4/Makefile
-@@ -2,10 +2,10 @@
- 
- VERSION = 0.4.4
- 
-CC      = gcc
-+CC      ?= gcc
- PREFIX  = /usr/local
-CFLAGS  = -Wall -pedantic -DVERSION=\"$(VERSION)\"
-LDFLAGS =
-+CFLAGS  += -Wall -pedantic -DVERSION=\"$(VERSION)\"
-+LDFLAGS +=
- LIBS    = -lcrypt
- 
- SRC = auth.c main.c options.c util.c vt.c
--- a/app-misc/physlock/metadata.xml
+++ b/app-misc/physlock/metadata.xml
@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
-	Control physical access to a linux computer by locking all of its virtual
-	terminals / consoles.
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		Control physical access to a linux computer by locking all of its virtual
+		terminals / consoles.

-	physlock is an alternative to vlock, it is equivalent to `vlock -an'. It is
-	written because vlock blocks some linux kernel mechanisms like hibernate and
-	suspend and can therefore only be used with some limitations. physlock is
-	designed to be more lightweight, it does not have a plugin interface and it is
-	not started using a shell script wrapper.
+		physlock is an alternative to vlock, it is equivalent to `vlock -an'. It is
+		written because vlock blocks some linux kernel mechanisms like hibernate and
+		suspend and can therefore only be used with some limitations. physlock is
+		designed to be more lightweight, it does not have a plugin interface and it is
+		not started using a shell script wrapper.
 	</longdescription>
-  <upstream>
-    <remote-id type="github">muennich/physlock</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="github">muennich/physlock</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-misc/physlock/physlock-0.4.5.ebuild
+++ b/app-misc/physlock/physlock-0.4.5.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=6

-inherit toolchain-funcs eutils
+inherit toolchain-funcs

 DESCRIPTION="lightweight Linux console locking tool"
 HOMEPAGE="https://github.com/muennich/physlock"
@ -13,8 +13,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"

+RDEPEND="virtual/pam"
+DEPEND="${RDEPEND}"
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.4.4-makefile.patch
+	default
 	tc-export CC
 }

--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@ -8,7 +8,7 @@ AUX kmymoney-4.8.0-soversion.patch 870 SHA256 74eabed61e7db6696a73bdd7cd974dfa9a
 AUX kmymoney-4.8.0-tests.patch 7303 SHA256 21cd9d7fece1b38b87ade8e4fc7f01397cf44a7fe0bc44cd08dda01d05207215 SHA512 e7f8cd817eee087faa02b7ca4320a2df0a3c52f4db2dfe8ce32314d2abb8572f0f2caa8b0f96e4a43be3fab3dff76e5211e693cfa6105ee85d1252cc6e3bcfbb WHIRLPOOL 254bb128ca8789b70519ad59d54fe2b364336e698da000177343d9a345461d4533c7f20aae6e0c3ce6b50c783b3b507cb5788d0331ef7d71ba79f1f132a35c28
 DIST kmymoney-4.8.0.tar.xz 20785888 SHA256 c2a635710aafa6925a49803c480e043e0bf4bc5b62430689aa5eb95619f48ac2 SHA512 883635a94333341cbe3d6c835fe1dbc1cc5ed5cc834f76c945030ec680aee4fc6ceb367fdde811672a392eb5cd7b735c858e0be5a7f7964a4ccf5f9ba8865381 WHIRLPOOL acbada22e3e9c83e88e571b397c37da79eb36ce05a55786c352af306d3f863dc2db7140c9f1e1757393ea7f6dc9a1728debe077c71ce28b655c65e707f1130cd
 EBUILD kmymoney-4.8.0-r1.ebuild 2029 SHA256 54eaf62b986d0e5a6c537b041d020873ed9f3cb1973bad710eed6ae600298d07 SHA512 06686f02697045a687f25bc90b97882a51936f9b9be8cc44943bc292ac6eccf443f0bda5bf2a30642d1a1d0c004d5b5dfef699b30afc605a25308361fb1c9d3e WHIRLPOOL 8ba1e4bdcb39ae5fa42a1005f91e143958591ad135dd9b8c8ee5b0116a8efaea8fb2897cd49e6176dbef359962184fa041c821ca494b0a751acbf4b68eaae0c0
-EBUILD kmymoney-4.8.0-r2.ebuild 2234 SHA256 336a1b760c21c7e0801e4116653ff41b6c46da5f8ab4d0f914b884dac1766850 SHA512 8c8c1147b0d361a854ce5dadfd41a0ee000c8a2d2cb95403ea3a12255cf112218ee756108dbe9555ec456589429df0985e255dd791108bb5acc4dac137301950 WHIRLPOOL 9d6093113c80e08ca950ee0d5207e833c236e220fe29e39e8990b78e944e31699c8d10c2d3beebe0e4a27050f0ec632d539b679419323e2b6bb76309342da3ac
+EBUILD kmymoney-4.8.0-r2.ebuild 2256 SHA256 6b9a4f7ed8227847ae038293665e060ffa06bdc6d535fee0edb0fec700079f2a SHA512 eae18ebb715cec9706a70db47b3d5ed22cdef71ea8addcdea31a786b36912e2ee089987dddbf56dbe50df0adab7a4aeb9d3ea20c170b5474c937b6845081d179 WHIRLPOOL 3b68d130981f1407cdea55a416f6de21bb45377505738e6e382dfa37470da1fbf39b6e7c0eeca55fdbb217c228c67024de2b9cb6041def6f6a74827438fa135a
 MISC ChangeLog 4485 SHA256 9e175277e4da330ae2d945b5de2fe704a85ad896157a82f16932cc9a84dd6911 SHA512 92fd06b647814339aec3d64ed7af4935aaec6d31235b64ecd72e315bedce826311696869a7df4511dcedbb3c07b1ca235c73bc65db9853ab05abf4224be451ed WHIRLPOOL 93f5ff364291eec18400b39aa75e2af182098fafad9ee4dd9a8ef58392a5972e4ca862253e16f8d9415466b09052f3b0c2f57dc0cf183bf3ec7259ff24dffbd0
 MISC ChangeLog-2015 8457 SHA256 2582e98eb7536147ea28b2a71cb0a1a779523c062372e1e0737fc893f06bd86b SHA512 2461320ccd8bed67dd135627efaafd466eee7b5c95d142b7f90d53affa65cff24dfafa1c3583997f6ea06feb912f3bcf3413f2dc9a1599018892b334b4214ac8 WHIRLPOOL 6ec23d745285fcba6e2e7588da1029c0a86742651b349a4d5dbaf58be761b8ee41e0494abb7afa7c245b469485b79333979ce14252d160af2f57517ed61f4cc1
 MISC metadata.xml 695 SHA256 8456f2794d2deec180431875652a3b5cc1b4b65125717c34443c9f5d5199aadd SHA512 f283f7991d556b2f6a5acb244c2becbfbb22e827a0a9a7d5da78843ef0c08cdcbeb3732c4dc2e6038c309fdfe8c089ebbf7175efebfb1cfd160d517e88422072 WHIRLPOOL c7e47356988c49be6234ed5ffe39c9bf38ee1f5b31da464fcebf2c2faa454340e18a881593f2df877b14f056ecde672215948db249e915ef2923c7e6f5c5275b
--- a/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild
+++ b/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild
@ -6,6 +6,7 @@ EAPI=6
 KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr gl
 hu it kk nds nl pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
 KDE_HANDBOOK="optional"
+SQL_REQUIRED="always"
 VIRTUALX_REQUIRED="test"
 VIRTUALDBUS_TEST="true"
 inherit kde4-base
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@ -1,5 +1,5 @@
 DIST kraft-0.59.tar.xz 560116 SHA256 e05ff0b78a073bafffa5c0e41fe458461216b66fd57fc9432a1064a7be2b2034 SHA512 53576855e3a4ac054818cc3fcb5d123222c0a5839ba621ea7c1f390f1e3180b5c87b00daa09a57fbea64cbd1dc857c4cb7645c5f539635811ef236c76483dc36 WHIRLPOOL d442c33ecbee4f0b3d8f33b358a5f7fab9f9c99d5e70019ca9d5910a3b717530008b6b09c3573132a27681f9e554f83f1798bc6b5a71d71fd10c81884692dd6e
-EBUILD kraft-0.59.ebuild 706 SHA256 10020113afe44a7b084fac7d476b9970efcc995803d88c279075c59321a54aba SHA512 8467c7b26f0704efa76428b3b5864be185892b9dd6d46895b2716ae93d5025db58fe28b4801d64bff5378122cad25a365e4d086189fb90d5ca43a330efa77070 WHIRLPOOL 8e097bbb1c746318acd301b6e8f47a2b49ae022844d6b55d46cab232ac6049d1d9d3eba51c1c9e6b31701ff38ee08e21c65d47b6b2e36abfb6a02b3b0b0aa4ec
+EBUILD kraft-0.59.ebuild 755 SHA256 9850e0843dfbf70b8cda110fb4451474e4cfe1632b9a744c0a37e6c753ebfb0e SHA512 0517e87d4bb3639c1380330fe6ed94dd2e26ba355fa6e584537482dfc5c4a400bfafc5cd545663cf4bacf939a107d597a2806f7767e791c790f6553d6822f3ec WHIRLPOOL 2979d205517c6c8617f3b884ad05713280fc572a41746258a75b8fd55abdf5a112478103438e45f46a2eb85fdd25df355ae11d111c0c35841923e129c52b077f
 MISC ChangeLog 3994 SHA256 04496dcdbf9c68f0311d268cab777a25e7f78ce06201dfb513ca4a96eab75e00 SHA512 98fdbf3036940f252d937e4bfc63ff2ecf0cf8e5228c7e9a79e75de73f124b9be11ab3eaf0c57ac822845cab8aadbb996edac91aaf20d9c84c6acf20ec10db5b WHIRLPOOL e1ac4bdae81aa6cc3679f3aeac5a2e10019ff8ab783b89d510615766cef2f759de8f9a2a03a7d9a55569a5359aa11c90a090774503e15a22875bbae705eb56ce
 MISC ChangeLog-2015 2564 SHA256 dc0f232741405c27b965d900725fc52ff1035e110c83e362f8bf2c6ce61dd3bb SHA512 df98953b22a5fb9850533946cf689a382cfdc62f8db15a1e43b8541b08b47261fdcaadb71c9dc32b7e7b282a1d9ac48d0b223bd3c061605ba0d4b34aa67f6f7c WHIRLPOOL 54119dbe54926341cd1c35b9e53d4b06abdd8faa507b328970d0eccc6a1c62b2b8d3b6db8366b19187a5561259832e2d6e6436df68bdcb4dfce0b19474313f2c
 MISC metadata.xml 324 SHA256 85191ed8715e115fc87a453e1cd407e35e3bcd5c3af4d4993a109081217a3144 SHA512 daa8d6137a400ea0c63cc6562ed5b1e30b84f9decfe0d8c6bd89b6a4e13915435f777cb324bc83e2fd293f1d498ed545c09ea02a3aa8d3cd32b2c1c7456d50dd WHIRLPOOL c060b3ead31d17ead377a4e662fca286eb35fa3350a3c1b537fda3aa719d4ecc607cd529518b18f81c940535e06444b7ef46e9677e868a1840d1b77c71872e15
--- a/app-office/kraft/kraft-0.59.ebuild
+++ b/app-office/kraft/kraft-0.59.ebuild
@ -1,10 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

 KDE_LINGUAS="ast bg bs cs da de en_GB eo es et fi fr ga gl hu it ja lt mai mr nds
 nl pl pt pt_BR ru sk sv tr ug uk zh_CN"
+QT3SUPPORT_REQUIRED="true"
+SQL_REQUIRED="always"
 inherit kde4-base

 DESCRIPTION="Software for operating a small business, creating documents such as invoices"
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -19,11 +19,11 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e06
 DIST libreoffice-help-5.2.7.2.tar.xz 1940516 SHA256 f7d35c460da96ed2d52cf97baef159382b38e5ce4579c34e65480ff2911cac4b SHA512 c86bc17448fcd1da01e13d3e9fee739610fde390abaf0635cc4593755d102da08a5eea0533076e1a0f8d89f0b32ba5086b155b9b388f317a5e4c669bf17769e1 WHIRLPOOL 4da96a14b70be718109eda5ced62cec85b96e9028fcf65d729a99604598de81edc097bc06577f3ce7958de1316b04d2d2f1f2782c6504a487ffc6ebaaf7feca6
 DIST libreoffice-help-5.3.4.2.tar.xz 2108116 SHA256 ab8600dc99e09d90fec83bcc505c42556156730f78973cecd74fa377fe8de91a SHA512 c4785e7e1b99806adc6b354f8ebf5d81a76b1f802628f0453fc365989ed07c5ba039145ea1ebbfbd0340815157c6638040953afad1c1c9f80bc3271257137d7c WHIRLPOOL fe229a3bd9b99067d33ab4d53ae6502578fff4ee3e184b0096e9da3c458534a35751cc6809b77351c011730a91d94c2bf9be94abaa026852ab67b3b6c50cdc7c
 DIST libreoffice-help-5.4.0.3.tar.xz 2343204 SHA256 e1460aee386733725e0d734bb5fed4866c93b0342a49936eb45ec350e45e27d9 SHA512 5683c296a35ab3e037bc3ba2ea6ab55d970041f667ab459451dfe555d6042701e86da3adab9a3833d3e71db7ad6ff40a720bcf22a3f6ee41bf13740fa18076b9 WHIRLPOOL 81745102e7073fad752146dec2ba989397d9f4defc6857c69ce1552705ca3e88447a641d12d1d4d4ff2883e3f3c8a0974617f5252f4794d0ee8772f72e28fe83
-EBUILD libreoffice-5.2.7.2.ebuild 17864 SHA256 348815360772c87eadc14e3058432e979cab55935e4c3c829ece5113aced703c SHA512 4024343c26fbdf62d176ef5ffbd5d8b82d3149f4cac9f2d08dd924f647ab04204515f3ff3019678067985ac1491cda58829a690e3794e681faf2381916a3631e WHIRLPOOL 013f0a001935f914d2e08d7df8874ad0b82e53999283773e122539e7d5dc0ab381da8c12802ed98664cc7423680d9905a8bb38cd44e7e5b02a3906dd278e925f
-EBUILD libreoffice-5.3.4.2.ebuild 17606 SHA256 71f977820421c3d0d3b9155298fee6614f2ad1a1638c5b023edc8f9b41eb821f SHA512 55b93b5e41bcd92ab371a457b91909807604fd20fc588654d115e7cc0182e61ca79ad5f869332435328fd7297a3434ef05c970ad062d8e267b8b9be04f957c8a WHIRLPOOL 0d5eee80a9fe363975fea1c502da96f05b9ee5eee96607be33c7f0e1e66a601a6a891939fbeee94ad129aa982a7eea92cfd47fc97b41c613d3f4209c87103bed
-EBUILD libreoffice-5.4.0.3.ebuild 17548 SHA256 64c90550f2bd5bf04e8405aa6717e7f4577508bc5b980871186e244b5eaf644d SHA512 8cef13e451c5771fcd2c8770a2e2a7256f5dd089d7e40304dc4cfac346ad49db2610e6defe06a79bfba3c44035603c74d6b43dc5f1f504497a6ec6fa6d93f0f2 WHIRLPOOL 0a40c3607ba52957c6828161e2c968b66e52926cd65eb15a1026bae5a9b052c96b3da93f53002dc7527ee2e67d42073e6d3d782adef4b46edf7fe0149bc60846
-EBUILD libreoffice-5.4.9999.ebuild 17548 SHA256 64c90550f2bd5bf04e8405aa6717e7f4577508bc5b980871186e244b5eaf644d SHA512 8cef13e451c5771fcd2c8770a2e2a7256f5dd089d7e40304dc4cfac346ad49db2610e6defe06a79bfba3c44035603c74d6b43dc5f1f504497a6ec6fa6d93f0f2 WHIRLPOOL 0a40c3607ba52957c6828161e2c968b66e52926cd65eb15a1026bae5a9b052c96b3da93f53002dc7527ee2e67d42073e6d3d782adef4b46edf7fe0149bc60846
-EBUILD libreoffice-9999.ebuild 17496 SHA256 a22fffdbe759dd461dd156684a72d4835211212bd71cc7f8356184e0bb7c0529 SHA512 aa38d34ca0a8166c3b75811348c6cae7583d8afbada78b887012ee33202b195bb2f0d61294f6e077964b54a220be60b64514e69f0ebb7b5185f1d9a07e883c0e WHIRLPOOL c221c2baeba8136204a05cb9c76740db568a69e3a81b41237f39cf0beea550cc6d1e659d0d1ca6be62625d3ffa3689df316b0ac48fe421a1f0df66f30a70636f
+EBUILD libreoffice-5.2.7.2.ebuild 17873 SHA256 5f8c7f5d41dafd9a7bc56c250885bd143946d3d84eda8c872baeadc4769b88b7 SHA512 4257b398839fc7aec7017a954df0db13a51adf9914b83835656f0783ffb38b6df540f7deec15e8d6fe7700a240ee6c756129b4fb37c196e7705808e357285f81 WHIRLPOOL 8f569cf8d75dda399fadaf1a04f8093535b984aed3b6d828850517c70f7c240f5fec7e63736ab110f4d86309a8cd4bd5cbf3402c1bbd7afc9b8db09abaf1e260
+EBUILD libreoffice-5.3.4.2.ebuild 17615 SHA256 22be46cddf16ee137507a1b92a884f637fdb4f7cd18ec3d1f2639de426b54ee0 SHA512 263e1638905f8942727988133262e0e5c2ff83d7ee6cef2d3ac2637f484a0efc3b65818d55850ea0d7c43198d8cfd307b121803e99d8fdff776685bf1a57d99e WHIRLPOOL 80fc1fb46a05a01ec3714c438f0b490a4757545aeb075685c3a4897a311585c63a5ec4fe48085db738e3e5a3c7990770c3f18733a142ddfccaf049046e839441
+EBUILD libreoffice-5.4.0.3.ebuild 17557 SHA256 ac2f30a2b19d8fa6f452fd00a7bd2335eac45fd3b9093839fbb787a7e673befb SHA512 bef6566cfcf964fa88ca9096ee940f996b2e03a2f9364360ff112e64c2125c345e9d6da8abadedc56ce84a3194cfdf7e9d77628e736b36d1767f890d8e342b27 WHIRLPOOL 600788b50a25cae2a9811a398fd51314c4bffa17a40c481a16b7ca7de0c623c7e6d71d566dcdea9da46f4eb346456b5286de5df318dc9e040f2f9b0533c5d465
+EBUILD libreoffice-5.4.9999.ebuild 17557 SHA256 ac2f30a2b19d8fa6f452fd00a7bd2335eac45fd3b9093839fbb787a7e673befb SHA512 bef6566cfcf964fa88ca9096ee940f996b2e03a2f9364360ff112e64c2125c345e9d6da8abadedc56ce84a3194cfdf7e9d77628e736b36d1767f890d8e342b27 WHIRLPOOL 600788b50a25cae2a9811a398fd51314c4bffa17a40c481a16b7ca7de0c623c7e6d71d566dcdea9da46f4eb346456b5286de5df318dc9e040f2f9b0533c5d465
+EBUILD libreoffice-9999.ebuild 17505 SHA256 e93bcfa73b8f320aed4f37783fed45547f4a5aedb7108407c9b23a8eb4b19f81 SHA512 e712bdabe2a0689c22e2884e72ddcc7a85874feb9f14f44828264bce3aa7fde411f07ac609143fc60f1557d3556b4c73a4ac23b5ea6db1420f8418a8c00cfff8 WHIRLPOOL 08f2270af284a70cba80007cde0a5adf35c5b53bf616595a5462b4a48c36b7e9eb79e306b0df80bd7499be2d9819f1867fcd500dfee4f80f2f07fbd55edc040b
 MISC ChangeLog 26281 SHA256 bd07909b751104de22082cb359251b4c87df9c9a029e0f0573606e1d09687e29 SHA512 c037427319b94ed201e768b1d6b5ac37ef5e7eff313d197f681bf30469ca66058024418b105adf09e2990a513c215726367df6202fe0bb0f41f9939adb3efeb6 WHIRLPOOL 01ae7f053217c02f6c0a93efd482ff1adf4dfda79a3b4e8dece1e95af2add09d1b38a66e99808f423e180553ddf37d677bcf725954dda2165c0c6f4923eec363
 MISC ChangeLog-2014 109721 SHA256 db62affd74b541212d4043dbc88acf51fb8aa36602d6e5625cab9b0b823a54f7 SHA512 6481d8f26924300ca46f0cd216962167b6ce5d53028558b0128ed4f996a8cf5576182e9e511493e4b57f628189fc127dec9ce62110bc8d3d85c6d4e2a815bf26 WHIRLPOOL 76c87a30a9296f64675baeb5f77a8500b9b1ff25c6edd5a5d0b984dc3cb3b3aecee37938d882194d6be58ef34c8b1925c1d9b8b7a7b786a5d68539fba714e627
 MISC ChangeLog-2015 9339 SHA256 efed9b1e7f6ed3ce24e8351037daeb8b050089969bf6ca5e5c013d42ffb2fb88 SHA512 7b58f85ea022bc91f78c812e09381660c25fb054b8f4e53e17e81161db775c832e441c5c64f50ab3d0093edc627a6bbc54c53f3fc75470d149ccb7ab92beba39 WHIRLPOOL 90c23e45e3afe143983ff60c5ca561f55169014d80d78e7d67b4342c2d7c71a0cf5548ed6316cc98366c3f205f506374a9643d22697e542c83243ca5bad1c78c
--- a/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
 # Usually the tarballs are moved a lot so this should make
 # everyone happy.
 DEV_URI="
-	http://dev-builds.libreoffice.org/pre-releases/src
-	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-	http://download.documentfoundation.org/libreoffice/old/${PV}/
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	https://download.documentfoundation.org/libreoffice/old/${PV}/
 "
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"

 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
 unset SCM_ECLASS

 DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"

 # Split modules following git/tarballs
@ -313,7 +313,7 @@ src_unpack() {
 		done
 	else
 		local base_uri branch checkout mypv
-		base_uri="git://anongit.freedesktop.org"
+		base_uri="https://anongit.freedesktop.org"
 		for mod in ${MODULES}; do
 			branch="master"
 			mypv=${PV/.9999}
@ -373,7 +373,7 @@ src_configure() {
 	local java_opts
 	local ext_opts

-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
 	# Note: these are for Gentoo use ONLY. For your own distribution, please get
 	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
 	local google_default_client_id="329227923882.apps.googleusercontent.com"
--- a/app-office/libreoffice/libreoffice-5.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.4.2.ebuild
@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
 # Usually the tarballs are moved a lot so this should make
 # everyone happy.
 DEV_URI="
-	http://dev-builds.libreoffice.org/pre-releases/src
-	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-	http://download.documentfoundation.org/libreoffice/old/${PV}/
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	https://download.documentfoundation.org/libreoffice/old/${PV}/
 "
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"

 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
 unset SCM_ECLASS

 DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"

 # Split modules following git/tarballs
@ -301,7 +301,7 @@ src_unpack() {
 		done
 	else
 		local base_uri branch checkout mypv
-		base_uri="git://anongit.freedesktop.org"
+		base_uri="https://anongit.freedesktop.org"
 		for mod in ${MODULES}; do
 			branch="master"
 			mypv=${PV/.9999}
@ -361,7 +361,7 @@ src_configure() {
 	local java_opts
 	local ext_opts

-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
 	# Note: these are for Gentoo use ONLY. For your own distribution, please get
 	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
 	local google_default_client_id="329227923882.apps.googleusercontent.com"
--- a/app-office/libreoffice/libreoffice-5.4.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.0.3.ebuild
@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
 # Usually the tarballs are moved a lot so this should make
 # everyone happy.
 DEV_URI="
-	http://dev-builds.libreoffice.org/pre-releases/src
-	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-	http://download.documentfoundation.org/libreoffice/old/${PV}/
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	https://download.documentfoundation.org/libreoffice/old/${PV}/
 "
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"

 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
 unset SCM_ECLASS

 DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"

 # Split modules following git/tarballs
@ -306,7 +306,7 @@ src_unpack() {
 		done
 	else
 		local base_uri branch checkout mypv
-		base_uri="git://anongit.freedesktop.org"
+		base_uri="https://anongit.freedesktop.org"
 		for mod in ${MODULES}; do
 			branch="master"
 			mypv=${PV/.9999}
@ -366,7 +366,7 @@ src_configure() {
 	local java_opts
 	local ext_opts

-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
 	# Note: these are for Gentoo use ONLY. For your own distribution, please get
 	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
 	local google_default_client_id="329227923882.apps.googleusercontent.com"
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
 # Usually the tarballs are moved a lot so this should make
 # everyone happy.
 DEV_URI="
-	http://dev-builds.libreoffice.org/pre-releases/src
-	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-	http://download.documentfoundation.org/libreoffice/old/${PV}/
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	https://download.documentfoundation.org/libreoffice/old/${PV}/
 "
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"

 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
 unset SCM_ECLASS

 DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"

 # Split modules following git/tarballs
@ -306,7 +306,7 @@ src_unpack() {
 		done
 	else
 		local base_uri branch checkout mypv
-		base_uri="git://anongit.freedesktop.org"
+		base_uri="https://anongit.freedesktop.org"
 		for mod in ${MODULES}; do
 			branch="master"
 			mypv=${PV/.9999}
@ -366,7 +366,7 @@ src_configure() {
 	local java_opts
 	local ext_opts

-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
 	# Note: these are for Gentoo use ONLY. For your own distribution, please get
 	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
 	local google_default_client_id="329227923882.apps.googleusercontent.com"
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
 # Usually the tarballs are moved a lot so this should make
 # everyone happy.
 DEV_URI="
-	http://dev-builds.libreoffice.org/pre-releases/src
-	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-	http://download.documentfoundation.org/libreoffice/old/${PV}/
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	https://download.documentfoundation.org/libreoffice/old/${PV}/
 "
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"

 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
 unset SCM_ECLASS

 DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"

 # Split modules following git/tarballs
@ -306,7 +306,7 @@ src_unpack() {
 		done
 	else
 		local base_uri branch checkout mypv
-		base_uri="git://anongit.freedesktop.org"
+		base_uri="https://anongit.freedesktop.org"
 		for mod in ${MODULES}; do
 			branch="master"
 			mypv=${PV/.9999}
@ -366,7 +366,7 @@ src_configure() {
 	local java_opts
 	local ext_opts

-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
 	# Note: these are for Gentoo use ONLY. For your own distribution, please get
 	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
 	local google_default_client_id="329227923882.apps.googleusercontent.com"
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@ -3,5 +3,5 @@ DIST elt-patches-20170422.tar.xz 27864 SHA256 56c5391b8c6958bca081d1eead516917ac
 DIST elt-patches-20170815.tar.xz 27864 SHA256 caf05e2b3bdf1dfc4188a27c703dc68d66d51ea4274edc6a6ebf9918cf1b2340 SHA512 deba10767b6a8cb5e8139e6f47a30e6f8a4a9312adb1d3e0199df24321d89601915fc91003da2d14fda679e7cbd30a4d4cf39d94ba57bce06432eefc168650dd WHIRLPOOL dcf892154407238cbe7874a1d2b976b8bf8260ab47a18cd8d6e543d98fa47442d83cfefca9431a2e4eebae5156f5e31e4d976831558faff8a79da251d45686f2
 EBUILD elt-patches-20170317.ebuild 736 SHA256 c4973abc56d0941ef9a82aae95ae6c50a9ba5c06c8e1ab4e245b9cc8f0fb846b SHA512 a3b0ca1ea555df8d11dd27870c8c7e26650539dbb484f9932fa1bf5b1186d1b0e658acb74a5c26923daf2f861224244756d45ee635dfa357e6038e3d4b7567bc WHIRLPOOL baf679f6e14c48aa0b48d0f0e83efa1848402683d583d7b82a767f6328a41d3c5fc4a130503ada9f06610e66071797724e22b4422b8acd99afd85d4eba5ba07b
 EBUILD elt-patches-20170422.ebuild 859 SHA256 64c770c60b080cda9f5c2f610d87f156a1ea00052aacb5804bc2e3c1026eb772 SHA512 30bc6dadf131698579806e8c06ba6d39c0f4b143828bf7c90c1bf1cd5a0c67fe8d872d5efb1ca905ac236e94eb072deaeb9ee1b80db7552086024c1d3e21e186 WHIRLPOOL 0c17832ffb4616c43e7f2455411b3979440b299f2cff0c57350472464d874e31fcefd1dba2ed7fd0d09160cfa2fc70fc5fcb52705691030e669ab4d419a255ab
-EBUILD elt-patches-20170815.ebuild 876 SHA256 bfd34ec72119339cd457a19585af2defe9be4da86682e716dda70b0ee6877515 SHA512 ac77f0ef49d51df10d1d4afd3942c6a455a3a3a44a2e78eacde674b2e5337c152fc95fe800b56ff095a9fddd8f5aff7e394ee28189aa70ab461c0c9c49a74d35 WHIRLPOOL 4d31dedeec68c824395de10cd341c714a9957962836ac6c18a34104bac43167df4a09d902480fe1e72ad18f817070ea001750c1f6890a5cb7234439687c6a3d2
+EBUILD elt-patches-20170815.ebuild 875 SHA256 ec8fb166fb316f676c8b837f3b91058dd439eb3436f7ea1ca52c53f727b8ac9b SHA512 b9bd8fd72b4ce2139efbcfc85533548da012dcd4b396d33f81e84842e8f38b61d2ab314a4c360f67e1c23e4795adaf23c13823f2f741f8b8d3e96fd406ad808d WHIRLPOOL b32b74ba20204ac5bdf6a410b21934e3bab2896a3401194aafd66493edc9b4215f7b0d5a1224889c34b78fca8248794aff501d07796872f89fa7ebd705e436e8
 MISC metadata.xml 223 SHA256 0834d0e288620f593dd7fdfcd741f70a9148531d7259c483f062e9aac0d690d9 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb WHIRLPOOL a86eedb2ffe72a1deeed960f811fd16ff3bd26f22d9cde76d93280cee537d614b5a9ec3cd310df89de6704b8eacd37c2feec3b67e42eec46d13b108049b45484
--- a/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170815.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""

 RDEPEND="sys-apps/gentoo-functions"
--- a/app-portage/kuroo4/Manifest
+++ b/app-portage/kuroo4/Manifest
@ -1,5 +1,5 @@
 DIST kuroo4-0.90.5.tar.gz 342698 SHA256 698b4fa177b52bc84787e925304f5287eaa4dc4c77e10339232d2703ba3fc536 SHA512 aed2ec984b77768f5325b41b01ea1c63e214e45699f9c29e1bf11cf7d6ff6ecc6660c2cc07948d0fc66f0469154fa00e1df9e78d330ad426db86a70db85f400f WHIRLPOOL 5a2ff9a14aa345117da539ff390357561332b40b2dba7709421b056d83363acc2bf7cd0232f945b942b8e894bf23816208304db6a5ef05a4049ca45f3c039035
-EBUILD kuroo4-0.90.5.ebuild 517 SHA256 26465b70feb736b8b59efa045dfa5b31136dfb13b34ecd53287a0fa28c042844 SHA512 2fb3f0acb75a30a3f323344fa5abe3d0554a5ed525dc55b1427e5f361289c2bcffb31ed7270dd1fa20d50bd3f84886ba2a6731a12696329777c46ca31eef4dce WHIRLPOOL efd3534f2ba52e7ebfac928c165ed3b5fa32a8b5d28cafa6cddedde918e28f111ad2a256ae65dd4d28302a680001faa5739d476ddeada41a4d22ba96762c9fd4
+EBUILD kuroo4-0.90.5.ebuild 512 SHA256 076cb935a2bbec0ff696ffa456dddcff1787c1075f571b591757745a27968144 SHA512 3a38125337f4a33541674b51e92a170c141e087ddcfade2bdbd375f00f01e9832ca253c80024fe959ac9d1020fc59f2fc797ecfede616cfebde3eb45b3eb8454 WHIRLPOOL debb76391d2f383ddda6372a9ab284cd46ef644ac3c4f386ae4141a28ad2b4d8b51e36bb4308220dac7b1ed96745b431f87bbf4368c7cfb5468df9cdeb721f54
 MISC ChangeLog 3294 SHA256 038369fd269b9decfb9387afbf807f24b89e7c166f0e725aba89af4af3c8c725 SHA512 2c0cc4a34dea877beed1a198005e90fe236af3669d0279aeb155ce83ea050ce55afbe55bea47792e6e148124aa87461e1875f588499a3f2c4963158bdf1a3555 WHIRLPOOL c21f3221d89308173e5d5beffaea0a11a136e7cf4b5fc2396fcc184da9b609f2ea3ceb315afb658e5ffabebf77e6f2d73172ef2edc0ecc4ab7c012ed65df56c2
 MISC ChangeLog-2015 2097 SHA256 94fbe78a5d7bfb01482e6452fb610b74725ae86aba6bd506e595b2da1e2168bc SHA512 c413cbe3f56336fd84813caef2f86344155523c5a7a669749ce5040faf65232d175d42fd993cd5ab701fb8dd75fb13c1f0a5a6e3c9fdf3fa29a152f4cd890a81 WHIRLPOOL 8a9250b132dd6da1cc6b9a30bb80130072def4a42791573e8efbb3be01750694406772ad7945a2bda28af25c97f55f9247fb5dac467959f8fef96b4d268e7de7
 MISC metadata.xml 848 SHA256 d4bd24ef0cf59e9f3c5445a80ca1030f321d6b27072b324a2b2a4c9ff167d264 SHA512 b474295993a6b05a885bc9873f18f3c880b953417471059d06cd3a367b0b8d482809091126caf5443f5f761776eb96f128138352dbeaa86219ba4554c924f3db WHIRLPOOL 4e433c59214f27edc5a8e1466fe2cde1e9d339f883b7dfa14f39c22c4c03a76acd64e5aa500c70e8ca87624e61c030fb2f9e1fe555e23cdd0c0fdb57dc5251fe
--- a/app-portage/kuroo4/kuroo4-0.90.5.ebuild
+++ b/app-portage/kuroo4/kuroo4-0.90.5.ebuild
@ -3,6 +3,7 @@

 EAPI=6

+QT3SUPPORT_REQUIRED="true"
 inherit kde4-base

 DESCRIPTION="Graphical Portage frontend based on KDELibs4/Qt4"
@ -18,6 +19,6 @@ DEPEND="dev-db/sqlite:3"

 RDEPEND="${DEPEND}
 	app-portage/gentoolkit
-	|| ( kde-plasma/kde-cli-tools[kdesu] $(add_kdeapps_dep kdesu) )
 	kde-apps/kompare:*
+	kde-plasma/kde-cli-tools[kdesu]
 "
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@ -1,8 +1,8 @@
 AUX libetonyek-0.1.6-drop-test.patch 1105 SHA256 050d1c99de0f5564ef8f05fe7e50bb1fce99b79ad3cb90e8da4777246967e099 SHA512 a4d53634fe5fea85120773b609aa901f164a3a93a0ead44f25fbde433470c22a6956744a3b35683bacdf1d55f99f63da47a0dcc39c78f02d537eb8a4883cec5e WHIRLPOOL c37d20925d1c149520fe3e0ca0b7389b89b775ae1d2fac28050881968ed747f77935d23649bb5c7dc080cf86f26a95f57c21e25d1dbf02834ed418bc73e46187
 AUX libetonyek-0.1.6-mdds-1.2.patch 1170 SHA256 d2956ab771787d88bec86221fa2fddb5219cb9ac1d64d82711bccc5b33abba8b SHA512 4432fda977bbb0d4b1a5e163d4ff18372717aa93a12775117880b04daeb695e64ec69d3e577caef09fdeb133237a868c8afaece9b60fb4511efb55032469137f WHIRLPOOL 5919d6e09a8294b8f5afc2ba8838cf08d32a27291f4f4bf33778839c8e81d46040090da5060940f3384e6652d06306cd5ebabae4529a28440653c29ea3e8d8a0
 DIST libetonyek-0.1.6.tar.xz 1243364 SHA256 df54271492070fbcc6aad9f81ca89658b25dd106cc4ab6b04b067b7a43dcc078 SHA512 10ae0403d98f33b27be4c3c905dec3df48cc01ce438f8760298edeadb76dd74da997edbd7dc03635fbc168b318bfe6e130f2306f495dfbf4135dd6dfcccabb4e WHIRLPOOL 932704f1d8bb1269e6be8e3fd7bd64af01ba0f098272befc747da9a4bd225bb201542bebf31d6e6338e613835fca4d7c6e2c1454df4ed764af30459393b6d73b
-EBUILD libetonyek-0.1.6.ebuild 1486 SHA256 9dd6e18c6a351961b7520fe4b27ec29909809d80b87411d13527cee47f2e5eb5 SHA512 65db8a1d38b313c9f00fec8c3a9a829597ee17e5a050fc15fbc6d11d17745c0670242c738642ca25fa39051893b82135f0aecf04170820af74122814e9a2f76b WHIRLPOOL 35a682e79099d728fb6a4ed31046fec72c1bca6ba66ce5f140590a819962b29656b479f0312f0b8ac531ac5a778c22c3c07af8acc001e36cc612653b28f9a3c7
-EBUILD libetonyek-9999.ebuild 1394 SHA256 d721590c305422156f27928dcf79b77e4e2386af15fda09ef1ea15176a80be4d SHA512 eefb052af33f4f3c018f212074c687d6900c0a98e1b1a9662974cda760becf24d77f3b5b97b362d398bbae263d6ee2429c4e718d6c1e9d947d2fcb33214d09df WHIRLPOOL 1b76e1aefdf811e85f184a82c92ef6a4018d70103c9f924b69c51a5ccf2164634ecdb8d6b8d6adb19663e2a88eb85d9b35f2be08950a46d2d948ccbfeaa231b2
+EBUILD libetonyek-0.1.6.ebuild 1498 SHA256 d754d47d69422d80fe6d3f80192045f25466458affb6e686d5129f6834b86466 SHA512 6626d38accd7701af8eff233f4549a9f844e80b8e650d1023d02e164fe4b4ead30965a5f373ed75f7685823a8aea504d19593fc975b9785fd401aa7f125cd08a WHIRLPOOL 3603e86c5a946bd1e560ff864bed52c04f7bd1194620288d97e655c3f66df1db2056c6c13150075504d41753db8cfa9ed7140b58618bee1e6afa131eb6087a63
+EBUILD libetonyek-9999.ebuild 1406 SHA256 2ea7acbaa598a2b9b0d311c21263bc9ffd01468f82f9a7321eef4c68f6241bd1 SHA512 a7f170d0b41c96cb16689685875b41770be1e0017b4b2016dce4f3b80a2ab82cd019cda84837a9095aac89f9a5f86f558fc274f2c19b0f84fe554fb83d241d07 WHIRLPOOL 9f1f3929abdae8eb93a1c25fac474242f5b427bbd5db461f7e07280cd40b6c5d42500e7d6960608f6998883910ea30ac2cabc115cb3b2cc5e71c69aeed4a65f4
 MISC ChangeLog 6189 SHA256 9a127d40a3e9436851b5482fcdd712b137235123376ec7675a4307d8af8c1733 SHA512 1ddb61e03f4cb16a98380acab3f8523afb441641fea1e1b7987fe3eee8a864a34d06ab973ab37ddd86b4932e2ddcc9eb8cf0acf0c7cee683ec43dcf28efaf8aa WHIRLPOOL 501df2826e1bde3b795285bbca998143ab678f74ca1d924a57067dcb2dca93dd216acad22869e34a79a470bdc25bc859eefc974687aa59d31df98b8684457458
 MISC ChangeLog-2015 2369 SHA256 9a4563d8beab7e18e288e97e32a6cee1beadba719cc7a450f750e447e9f89b8f SHA512 17f6d0d1ab4b174cd24273c924e07440435e717aabd50a35a1e06bbfbef49a50ccea1eb727922e3ea8bbd5969d74ed4b3adccef979a9a6ec57f8e13b1f440d34 WHIRLPOOL 56afc7b2322bd406f85adc3ec4725f647034724a66a997fa2904fd15779c4748c305ce7562296a1c7e1b3fb976196b543f7028f9416319dc40fed79709fa1c69
 MISC metadata.xml 255 SHA256 34d028c790cfe86c47c5c3dcf8655fcefc3e23ff52fed38a400ce42d678c8c5e SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 WHIRLPOOL 87f7199996948fe95e5417f8da0c4c90cd51a68f246ac8ae87a2e2a31c11c709f220d664eb893b34692577415e5f5eb351dd7e310dbc59f508fa40c7edb8ceeb
--- a/app-text/libetonyek/libetonyek-0.1.6.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.6.ebuild
@ -1,15 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
 inherit autotools
 [[ ${PV} == 9999 ]] && inherit git-r3

 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"

 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@ -1,14 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
 [[ ${PV} == 9999 ]] && inherit autotools git-r3

 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"

 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@ -1,5 +1,7 @@
 DIST libgxps-0.2.5.tar.xz 346532 SHA256 3e7594c5c9b077171ec9ccd3ff2b4f4c4b29884d26d4f35e740c8887b40199a0 SHA512 f449c4cb989910797c84614ce9f141d4e9adcda0c18f309f656de397ba5deabfa9b4c558c81be7f52bc44c048c401616775989cd1ff9408eeea44f46ef56635b WHIRLPOOL db7514e785f46a3fbf32db9962c2644837855116acbbf37373388c3cfed3b88645c4a574fe8e2ae41913b68250d9448dd3566d9b15b258c74810262f4411f9b8
+DIST libgxps-0.3.0.tar.xz 93000 SHA256 412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae SHA512 283ce3041f0238ef1dcae30ce2adbc3f843677e00ae22f20ed3459828f3edaab6d05d87c20dddb613925ab248ed0b29855a94198b982606c3dcb2e59f800b013 WHIRLPOOL 00b8544245bc6be3d2a8d183a35f3f4936951fdc3772d1c7ee893ce5fe97712bc472d0ab3ff670c35655bb8f93941e9687d54e3b503075929958bc492c6fa42e
 EBUILD libgxps-0.2.5.ebuild 1161 SHA256 50acbe5dfda1fc2087899529e7c448e295feb9fc73a7b49ea407e1f9537a5cc7 SHA512 644ca138e4c1867fe00d1af8df9a64206ddded7fbec270623537a5f9c86a1eeb4c47fbb33b5914aa337e43d97ead97f3df61172bef751810b61ef7e125f4c527 WHIRLPOOL e6678a46470a03e9cdaf53eaff0222b488e576c7487efb323caa5a733020582297960c8c73343e79ff11212c8fe45f13922d075e1cee9897cfcd2a812d35a92b
+EBUILD libgxps-0.3.0.ebuild 1221 SHA256 283956de8d6bcc80c9c5f8dcf1eedae8c35ef419aa8d3c9ae8785541b7251db5 SHA512 b8af663fe8d8ddc157f2bbac7128733049e2c0ef2d6920c2cebf23249834523247fc4735795ae8b69737ece8f1d8a9d04d78e032dc459766ccaf8d67a6128e68 WHIRLPOOL 5eee42beadea0e40a81cddb569a6ffe0b0070a90527ae26f55a92e2c3143aa62c5497f91cee0547b90d3881424e89338c2dc9e259c1c72b3493b147628bdb9b8
 MISC ChangeLog 4972 SHA256 f8f935360d9ba494c9a151072213f78790f7aa9b49c59795fea6ec9a86504cd5 SHA512 176b65d050ae3351176a6b88bd67ce9799329814af81af675f40af30b16884529659bf0e3961148675dcb0341b91c963e8e4995cd2e826c550985d44bb7e2a9f WHIRLPOOL 179f201323fac5a848aad32213fdb09f196f1b9fdb290a4431f2e8cf3ad24e1976e0ffb6ed5519be9cc38b7873aaf3d8d74c322f52d3b9184aabdb07acdf83ef
 MISC ChangeLog-2015 2913 SHA256 5f53c0b25af1aedc7958a36c0ad538bffe1fab5fe05e6b06c01fe1a063465916 SHA512 c255640c1e49fdd749247e19f12b3eb78319a0ed8e83f55a7d5864480fa9968bf5b673a9b1add88e0ec466cc0f0e0ae13f538acaf9382c7f7a0cfa38b2ead056 WHIRLPOOL 17a4fb510a28d801bb480608cd84cf3b6e15972a94eb9c0a9459faa01b2795740d6ac9aa27f3f6c4b4803a9580f373cc752da691dd22b15c22912693fdc64ef5
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
--- a/app-text/libgxps/libgxps-0.3.0.ebuild
+++ b/app-text/libgxps/libgxps-0.3.0.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org meson xdg-utils
+
+DESCRIPTION="Library for handling and rendering XPS documents"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+introspection jpeg lcms tiff"
+
+RDEPEND="
+	>=app-arch/libarchive-2.8
+	>=dev-libs/glib-2.36:2
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=x11-libs/cairo-1.10[svg]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.1:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	tiff? ( media-libs/tiff:0[zlib] )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+# There is no automatic test suite, only an interactive test application
+RESTRICT="test"
+
+src_configure() {
+	local emesonargs=(
+		-Denable-test=false
+		-Denable-gtk-doc=false
+		-Denable-man=true
+		-Ddisable-introspection=$(usex introspection false true)
+		-Dwith-liblcms2=$(usex lcms true false)
+		-Dwith-libjpeg=$(usex jpeg true false)
+		-Dwith-libtiff=$(usex tiff true false)
+	)
+
+	xdg_environment_reset
+	meson_src_configure
+}
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@ -1,6 +1,6 @@
 DIST libmspub-0.1.2.tar.xz 345556 SHA256 b0baabf82d20c08ad000e80fa02154ce2f2ffde1ee60240d6e3a917c3b35560f SHA512 c19025a2b887c33f5966b0972204ab2a8ae841b82df38eaf53c0cdc8f99d93cccab5e1c78143a79d5aef9c7a7387bd6f2cf34833a00861058e0e4687f48be714 WHIRLPOOL 0ba2e79d0b9d0eecd632cba551251c40bf49331d98e9c6e657a9870bebfb4d68e755c738b0c8f3055b2c1cc8336d9ec00c98b147d3a960d3ccb63dd5fad534af
-EBUILD libmspub-0.1.2.ebuild 1085 SHA256 2cf49e52493e97a834bc9fc6ee15e815c604dbe1bbcf3d57a129c41acc63baa0 SHA512 c04c433df9625354739ef8abff68e2eb3f24c57f519fd965333b12a66bb3c2a236f13f3585724cd20001e3bbb654833e5514f10c38ea97fb05f2eabcb98cbb72 WHIRLPOOL dd5f11c7f7cd61451804341d114488410cdc6cc5d3e0a6a6c9c6b2b9ae1f1036c2cea8176ec4c48f87ad787b9ff33719777e98b98e190b8a6c8d9e2653796199
-EBUILD libmspub-9999.ebuild 1069 SHA256 5f68e7812b2faac1af9d115f394caad5f3facc8fd40c6c78f9f7e49d6b08e1ef SHA512 7b43bbe4fd0e4ee3a0e2a61eaff3651b2631b03034f2434c239b334593418d510db1aaee51b469df52184f78384f9d56afc3007740326f045a0bd58c10ef9e4d WHIRLPOOL dbc43a8f9a40996fb8f0a99dded7cc83bb44c488ae40a8f593e568f6fc979c7f2a200697782b52fab69c5692481fca58d025710709ca4f5f1ec0d6113c2c919d
+EBUILD libmspub-0.1.2.ebuild 1097 SHA256 977a16ec9d1cf26cb8adbf28f9017e95599d8b79b4c25db34d4901174b2497af SHA512 99a6fd382488ed72e6851dcf091dac14e0bc2803acbd83b4ff595416e2cdbd73e4facdd7688170a0bd4a060f2474070f79af6b7d941f8f48570d78029e41cdb5 WHIRLPOOL a9f019f512d83739e24285e74c79f2fe3fa1734d7aeee7c7af0d8427ab19d51ad9d5a68ea312f2762c864b73688c802f2de0651e90b9178d90762b661718ad62
+EBUILD libmspub-9999.ebuild 1081 SHA256 ecb8f0d398058db028c5f0f02fb9c27c5a3dc3471ca33f08ac2643152d581ee5 SHA512 f9628d9dfef0f93360ce7b7fa39894a272627ca3e00c382fa8bda258591fc56759505eed49a1fb77d8b8361b5a935ac12db7cda53d75a0222a66e914d15629e3 WHIRLPOOL 1d4a43e71edd3e9a75401372c2b3bf62e34c53f003a62804bf0ebee2c72f9355e50bdb11c4fcb422932fb628ceeda3f90bd10fc4457aedc14ef8e3d17867602e
 MISC ChangeLog 4039 SHA256 2b086d8a7692f3300fc8cf2aca444fce58c0d132220057b2d7687977696ccaa0 SHA512 ce075f913d32894f19de7ffb707f9f2ab97dbd7bd7b3fa1be89ae06bccf9493bcd2dc3ddc159bb1046cbe552afc3cd4068679350441b43aaf703b0165f2c7bc6 WHIRLPOOL 413e706f40ca1b5e23c419fcec5c1d8693c5ac70eb8df55913222face8f063b56c69c32664d0843a14e691df0ed8e9ca1b0acb275aa6e27449de4e85da3c8c7a
 MISC ChangeLog-2015 2552 SHA256 6616a8b79cede80a8dd453e5aee865bb19b47a82b834dbc4c3577db7f11f43ad SHA512 5166414d4c62b8674c7160f0a9af3b19877c45cda6645e3e1ff46befe784258dfbff784f44e7d37fa4de2037dbfd85b01f6c3f844fe784c788842516e294a9c0 WHIRLPOOL 2e818df65d9ac3564266f29ea74decd73b7791e177aa1d3b1025ed60ab7f187c88f21fef5fa224cd025f93e74a112070f51805b4527454330a561af7ebe03ff9
 MISC metadata.xml 255 SHA256 34d028c790cfe86c47c5c3dcf8655fcefc3e23ff52fed38a400ce42d678c8c5e SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 WHIRLPOOL 87f7199996948fe95e5417f8da0c4c90cd51a68f246ac8ae87a2e2a31c11c709f220d664eb893b34692577415e5f5eb351dd7e310dbc59f508fa40c7edb8ceeb
--- a/app-text/libmspub/libmspub-0.1.2.ebuild
+++ b/app-text/libmspub/libmspub-0.1.2.ebuild
@ -3,12 +3,12 @@

 EAPI=6

-EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/${PN}/"
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
 [[ ${PV} == 9999 ]] && inherit autotools git-r3

 DESCRIPTION="Library parsing Microsoft Publisher documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"

 LICENSE="LGPL-2.1"
 SLOT="0"
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@ -1,14 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/${PN}/"
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
 [[ ${PV} == 9999 ]] && inherit autotools git-r3

 DESCRIPTION="Library parsing Microsoft Publisher documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"

 LICENSE="LGPL-2.1"
 SLOT="0"
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@ -11,10 +11,10 @@ AUX poppler-0.53.0-respect-cflags.patch 2879 SHA256 bd9e3064b77ca827b0cce615922c
 DIST poppler-0.45.0.tar.xz 1674464 SHA256 96dd1a6024bcdaa4530a3b49687db3d5c24ddfd072ccb37c6de0e42599728798 SHA512 b703bed35da3572801834740bf61d59b6a3ee3b88bc1b3181bde3472264be4f6b89ceacb56179d7093329946abd6ba2501acfaf209d4f543352ff9fd38c47f1b WHIRLPOOL 687b1ba816dbff1b0a69cb05914dd7fb161bfd8c0fa4e26b77bb0ad26e27f7d7d94085a1022716a8d7a7563145f0acead9fccbbd332959d0216b81b27f3632e8
 DIST poppler-0.56.0.tar.xz 1701488 SHA256 869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173 SHA512 74d2ca63afcb7e155c153b4ddc71621b7f4f2c60d4fcafd873176d5ac59fafedc35b200a22c7af2013d7f75e670a1cc23d6ba878167a02209917f8d30002d528 WHIRLPOOL 3b7b4330306f46bc6c1f72205a8cff95f23a82011260a629762ad52bdcbc89e5c071da8aeb48c15ff21e7b38893aa01b3421d9d232938ac8a61745f798271b04
 DIST poppler-0.57.0.tar.xz 1703300 SHA256 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8 SHA512 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f WHIRLPOOL fb0c15e4834f23b2956014748f92557de9996b8a2a37cf4a7ba62ca22f01866455a933bcf0412775a8d5a8f6ba1ba463f2fd63e27fa406b5fb5bf1fd25d32000
-EBUILD poppler-0.45.0.ebuild 4094 SHA256 7bac180b099ef65f5a511e2e6bb58f41e5e9cf17a89a984c601754158539f808 SHA512 65d57ac289788b9760aab49f7aea4a49186cbd0ef97f65d513164d5801c910c4e3808d90035dc0321ec88e557adefdd7da97c32758c841b18a78a93d281891d7 WHIRLPOOL cc46770ae424e9122c9133e5f634ecfc2478ccc3ec16f570c8a5433127df465d4cfc03b97893610ebda5d8f8068983cbc510ee32b567916aa1ae45f92eebee2a
-EBUILD poppler-0.56.0.ebuild 3866 SHA256 6e215885e7c6f7eb88997893eae0e5a8a610701384db9d884657689df9f1d5d4 SHA512 4ffda184cc6c4012a497587d5c9031dcc5558d4a47eb457c2686e49bc09b18c4ea810c9b68da32a5b238ad6fbd449ac233a497616d4716c12fb066a57b13d864 WHIRLPOOL 7c13ac8b3ca10f3d2546705890fd351c1a59bd303cb1bc584c2a396ba1d20d531a3ba64b81df427d8f210a8e00892efaf648da4a6984c15238b19f32062fd3d9
+EBUILD poppler-0.45.0.ebuild 4108 SHA256 fb29a6d15775c6029bcd3d2796bb43eac7120e3ac7304ac815714b24c758c903 SHA512 d0baeb8e0db1b7e0faf183b4913457d77a742981814a06cd1f75644b7238cf9f06fceccb9cf1c40f1e56a79a215dc2aab80da099f89fd300106ed383c877253f WHIRLPOOL c82e97dc8ea77ea41d9a224d734abb2a8b1137a6a49f860a8f782c9108bb7c7257338c60734c908009ce1b9b7e64ece124307b3766a67741330e5cdafc96c2eb
+EBUILD poppler-0.56.0.ebuild 3880 SHA256 554540c9102bf09cc11e2435e653bd627d4c9a00f79a682de30b5d71d789b128 SHA512 6fac8d151ebb53471ef9e4de8125b22a007a9326dc16583278763ac8c1bae9bba5cdd871fdf2b59eff6c0baac0770a7f0b454723f365257433fe588d70cfd342 WHIRLPOOL 9d6d89ddb764a8096df0321a696edd5c9b5d939d4fbf271568644c0e55100d296a037a1b1ab602bd24e54b0da4f14f744e21ad331f2c9ca638d3b9dbdd169c98
 EBUILD poppler-0.57.0.ebuild 3866 SHA256 2cade1bb1526307c28127eb4faaa3c7b236ef1f71097ddeb34d2e4c9923b1fa3 SHA512 0918e65ce998c2205ec85c90762a640654cccbcb7b21c87e15bd72e5ecb9099b7cb8d168ae3e909de6b1f5f742c22a016de570f3424ad25dcaad28aaa597c249 WHIRLPOOL 96bcae40cfe07c2b71fe7596b4f3513edc088e732bb23d86c656d27b9374220dbe0fde87e0addbc7e53c95d5bc41d230c20e63dec8500ea0d5c45dd26a522c78
-EBUILD poppler-9999.ebuild 3866 SHA256 2cade1bb1526307c28127eb4faaa3c7b236ef1f71097ddeb34d2e4c9923b1fa3 SHA512 0918e65ce998c2205ec85c90762a640654cccbcb7b21c87e15bd72e5ecb9099b7cb8d168ae3e909de6b1f5f742c22a016de570f3424ad25dcaad28aaa597c249 WHIRLPOOL 96bcae40cfe07c2b71fe7596b4f3513edc088e732bb23d86c656d27b9374220dbe0fde87e0addbc7e53c95d5bc41d230c20e63dec8500ea0d5c45dd26a522c78
+EBUILD poppler-9999.ebuild 3880 SHA256 44532c2095f94e18ef23beff067a2f25ffd25105018c3ba62cc0af76752f3d64 SHA512 8078921e6a0c9fd5014c36685c6cdb4a87667b593129f4a64bd8fcc47ff2996e625cd84ab991c5a03a7f826eeb1ef38e3f96a24e710a9ce6cee15de40527a734 WHIRLPOOL d6b97b04e4f8a3cb58ae16e7250c0f44809f1e56f76f6485df5e488c1595d867ecd8832329a6b700d95f3f3d1d8a5185c2b81f3f6212c591abe41c44f8246aa8
 MISC ChangeLog 12583 SHA256 b10bb0674eaf3fb5709ac71f335e1d0b3010cc6465f52c43d0d9f8d80ba327f4 SHA512 92b92d9ca9d028de27ae96ac2de9f2f38b582742d0f6474315e341dc883488632a106232c4763375b93161885276cb4aa0c833712d96e569d2915881877611cf WHIRLPOOL fd51e52ac26587ade05a2548432a914936db4be111871ca8295930b47ee5e3064ad49cffc932ca6258191281b731f084b80186596e4d95d3fb63fc68587168ae
 MISC ChangeLog-2015 64326 SHA256 2d1c6158c2ddf8e667300324ead9d16a38118479df81bbfd17b754e19027b72f SHA512 beba273afefaaa7163bc58e177d7c52ac3e957037bf1616647021a174ea0cd86fc272c6cb8747b81e597e04ec2378591b37e4ca084f231c5ff20d4c9043fd961 WHIRLPOOL 9a7e71e81554411c48d7b6b60a7702c32c2a180f6dcbefc55777d9fb44f728250d08e08873dbc59653a90dc58da453e9d4789fc9a4fb8949d61971672bcf518c
 MISC metadata.xml 999 SHA256 ffe981c4c31df137ec6f6523138ab48e6d6bb60e84e8940e83211bc9415f05af SHA512 c23399b672d336acafa0e4589e44c66e57fcc71f4a4878f7f18672d9d02bae82e50f543c7462b1bb9ce3b08ee4f835997f1f571bbbb75bfbf820d9b31b60542b WHIRLPOOL a16ec5546bb6dc986e8100f316e91b738b1c97d85a0b0648901260792dd3acdd95b2f3271f46e77c0c6837285d5afdf7d65f80c3406cf9dca2d468e95082b19d
--- a/app-text/poppler/poppler-0.45.0.ebuild
+++ b/app-text/poppler/poppler-0.45.0.ebuild
@ -7,7 +7,7 @@ inherit cmake-utils toolchain-funcs xdg-utils

 if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
--- a/app-text/poppler/poppler-0.56.0.ebuild
+++ b/app-text/poppler/poppler-0.56.0.ebuild
@ -7,7 +7,7 @@ inherit cmake-utils toolchain-funcs xdg-utils

 if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@ -7,7 +7,7 @@ inherit cmake-utils toolchain-funcs xdg-utils

 if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
--- a/app-vim/bufexplorer/Manifest
+++ b/app-vim/bufexplorer/Manifest
@ -1,9 +1,6 @@
-DIST bufexplorer-7.4.12.tar.gz 24777 SHA256 bcd8549fdd64d149356f1995eaf3f7cd6e0996d8c9128b41085772a24e13a00a SHA512 4767b735e041620e7410866a8ab62932803a248aa2cc311dda8d9a56421d26edede56d56a6329eb2a2b95d7962cc7084ac1606f92485dfb87ba6d647ca4f5c20 WHIRLPOOL 70b3fe6cdfb37bc040100aed89c34e48e0cc7996a0c35170cc20cd8f31a6eab61e87889c3500727b29d41a476e07a2e51d8b7dbe22e8d7c8228e2a6327129095
-DIST bufexplorer-7.4.14.tar.gz 25041 SHA256 bfbda1e8ae93da697e5dba39310632bd7138a34d3876ee583d9950873d7edc0a SHA512 a78c12e01727132fdb5baf97aa901ce9619efe9a03e35688de1b5c2357050089e352c78e6e33eef3c861b1f5b12b014eeb70af34b3d8305ad3c79e595fd98436 WHIRLPOOL e06414069524266228ae6cca56167916bf96ebab6f84bacc22266415a5d44f6ecd2ce84c7364a41b125a65340ff1ad2e27f23eb47b35eec977f25030b9880ab7
 DIST bufexplorer-7.4.18.tar.gz 25117 SHA256 6cf21e3d36d8832cca9c53bbd44021aba437d0cebef5cf95576ade79750d8280 SHA512 420e3d352bb31a80311c3ab8ad62f7a6530fdcf78eb0bc45717e075f81a3d1a42fef18d756c129d2c25e8d5f7d8e1161affae905cfa7d8b0d1d3c9245c9f1bea WHIRLPOOL 798e5c61c0eafaeec73729dccfd9be38637174d32b958fa729893785d946b31cc9c593f2bd86d9a24b5d18e06850ffe5b5803cb0328396cf7bb5d46250ddfa74
-EBUILD bufexplorer-7.4.12.ebuild 502 SHA256 da66f4a53cd8d6e765d02eede8536f7b82e21099f248f2c6a65ba1fc038d4a16 SHA512 009e21aa18d8273c074244bdf57925d6544f519eed99b96c836d2248e2d7d886d860b8dc259410cfeead93bc013da19ea255fc30747c2525ef3f1d33fe2db2b7 WHIRLPOOL 1185067409be4301bf62e377116fe33760874d80c6bf488362a5d6f5065a782c84d5269dd31b7eae55fc4232edff9cd4fc4757dae14f006b83ae77ff1c84cec5
-EBUILD bufexplorer-7.4.14.ebuild 504 SHA256 94a76b0d50817372a6de058d980fd7e5c63eb52d4bf2775fab976f2b57c92934 SHA512 b14b335eaf5de13500747fb2ede3f68c875aacf4a26f3ad126b2fa6ec1f2572e84a850eb5450feb9c0bb5cd7176c1aaf2ee15bb28f16f941e9259c23e70f84c3 WHIRLPOOL 5f83ea9445e6400f406bdf4a811c93e8daf7f0a14b9b7b143ab50384ab7cc10a5173c7699c81b0cdfafa2e3e748cdf2fed82ba0db47c865dc983ceb38f127d7e
-EBUILD bufexplorer-7.4.18.ebuild 505 SHA256 34992c71aa1aaaac40468d10ccab16b32683664144a9749f97e0238816bc20fb SHA512 14f292dd10a2e1c5cf17192d71dffe34c33c60c31a33647016c6c064f3fe82e8a86708be4acf739497208ced5eaa2183ac265e6d07cbe808ef27fb393a18a9a2 WHIRLPOOL 1397cb5ed5af1d146587d2e07a555c2e5a1c4d1a51725f9f6c2fe4db7b927f96a3b238d45aad28ff52b6a809510583bb3dfb9dce5e143d457fee3616bafad72d
+EBUILD bufexplorer-7.4.18.ebuild 503 SHA256 4d40e8ff24cd07b740c8cdcf783e165ea1c5cc03e4ca8374fc2f0c710a8925b4 SHA512 268fb5dda23a8a25085da25a4c485ebd4ad51db2cf4a61f6d9970bef28e432e3f53eb40390eac359c698c9938c69baf36ca3def2c5889288cd90f51492bd8cb4 WHIRLPOOL a84b0774d46ca1630ea914f7a8896b56be7ac0699d4b90ee6181945fa6e454612d35e1acb16f155b914b778ebbe7d07606fbc2c35580e3d5a50632e51c5ebca9
+EBUILD bufexplorer-9999.ebuild 628 SHA256 5369fc279bbefffb0addc9f66fb78e21b04dba211073bf85c08b73d5d5f38299 SHA512 8b6d39ed46164135c8816efc5daedcceb072ab5ffa6579a1100d5e1cdf54e579039eb2bd7500138c744045709228f8e41ed3f9e98da6b0eac8cababf3a893ac1 WHIRLPOOL c2adab135cfb8de4e54dd0d194ee52a05fd0de5e0c22a398c9cc61f7e5edac5f06450f492eb904189192aacd2efa2c08bb190e0cb3b23f2fd86bd7a68d89a43d
 MISC ChangeLog 3450 SHA256 58a394b11981ff8a606bb42aae9788f4e8f218fe3548123cf771ef9123d477b4 SHA512 ec2958d453c4f7eae1eca73ac3254e51bb225428762fa7ecf83f9aeecb87954171647a50a875b7a42f0a3156675026b2e9a161d535579a2c9cea327149a291a3 WHIRLPOOL 7f632edd720ccdf296a3b12812dd44082884d1fa15c63b73bd1606510a8529bb82501c40bcbcddd5fab7bca8c50a549b964c5064a9d1b52d92ed808329eae4fa
 MISC ChangeLog-2015 2182 SHA256 d37dd23d42d69bead215dea0c6b0e7eeced50e87783dc6f4d2948fa7eb547d86 SHA512 d3931816a75c49448a898ffe04f0950153eaa90dc3b9d610250173fd833eaae11c8c323741a5db903196c7004aa99887d4f68e82b3bd5664a47bd4345bb1d78d WHIRLPOOL deb2c20f691e2c3ba9ce5a1b72b2edffaccb956c71a7feed206cea3c51fc4d82f7373a9dccaaf3c3a08b12fa08b29a161ea481e736ef5813f2404fe12ceb44e0
 MISC metadata.xml 337 SHA256 9b68b73892ab71c070801ed223c30a8eb24899e3a2bb783fd6d1787f16d44167 SHA512 31c66f4059fd32f6521fa33b6d655d6d006a71b6d14fc008e4dbe2cc1b93bd3fe5a8055105afcef07f38845377ebee7ecb41d0f92cf7da73e020dcf72216590e WHIRLPOOL 9b07db9b5c67c872b883582460751bb0e11c049bdf756e84c9128538346720255511427f1261cf43d8852221a9e174ec0d79d3f614003aeaca20df77d8ec1e0d
--- a/app-vim/bufexplorer/bufexplorer-7.4.12.ebuild
+++ b/app-vim/bufexplorer/bufexplorer-7.4.12.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: easily browse vim buffers"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
-SRC_URI="https://github.com/jlanzarotta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_prepare() {
-	default
-	rm LICENSE README.md || die
-}
--- a/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild
+++ b/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild
@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: easily browse vim buffers"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
 SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 VIM_PLUGIN_HELPFILES="${PN}.txt"

--- a/app-vim/bufexplorer/bufexplorer-7.4.14.ebuild
+++ b/app-vim/bufexplorer/bufexplorer-7.4.14.ebuild
@ -5,11 +5,17 @@ EAPI=6

 inherit vim-plugin

+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jlanzarotta/bufexplorer.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 DESCRIPTION="vim plugin: easily browse vim buffers"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
-SRC_URI="https://github.com/jlanzarotta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"

 VIM_PLUGIN_HELPFILES="${PN}.txt"

--- a/app-vim/dbext/Manifest
+++ b/app-vim/dbext/Manifest
@ -1,7 +1,5 @@
-DIST dbext-24.0.tar.bz2 106023 SHA256 77fba040a3badd9475dac109171f42148d28b32b664c04a8ea60cba4af5c3d9d SHA512 2f11ec45d980714ccbb1dec32b6b231551edf5fe67a7394aa917b83c3b6f197f9c9a53fe12f7e7e43ef963eb31370bf5efd723fe23b2aadf065ec29914112cd8 WHIRLPOOL 22e521c47ef394a7c8b99c57b77ddc192bc81afaec375abed981506312e6ed362a7c6ad0d5111bf717f23ae34d2a68ec05f9cdf6164ed52a036c298866d57b4f
 DIST dbext-25.0.tar.bz2 108580 SHA256 2e9efdd5161c4225aaf6649990cbcf1d8dfa3dab7dbeb468a3329138cc229dff SHA512 715d9d41be46f691ea5e635bf564c4f16d16a74e5b65d9ae12f794406a2a7815df836e34d0c415e8696847e8f36f2ceed1fda4bc688ebe0db8826dc3f0493340 WHIRLPOOL dbb0eef4c9bbcbef6218537b77f989fe4717c9b6b25cbd7509abd8e6708a4755df0fd3555a5131d5efb5550f18f340c55149eb8487987dc3bfc263e370759416
-EBUILD dbext-24.0.ebuild 331 SHA256 dbc36ef066cd131b8a73349eb1ead3cf38e88b1f00b0ba5180d277950226640b SHA512 48224738e3241c65ef58031ba0cd7e3bc8844772ef1449b360214993b10163e1a7115a4341f49232a523e9952ae82c0715180b2b95b8e606e90cee6a96810053 WHIRLPOOL 08dee1f9ba5b4bda452afe8faa043deed459e021508db86870e927ebd6c0ca55dc0be067e8b0c8ab62f8b5614d020d352665c4ba6d3dd1375c62d5968fe39c27
-EBUILD dbext-25.0.ebuild 334 SHA256 3c26c1b6424df898882dab44d76bcbdca7e89a30615b75923e1956df8c71f5c8 SHA512 82d27853fdfa2aa7f27c1b0aace3180437bdf4c56db22d8031d435f69fe43c9766e812eef0c5765fd6ae252d8cb8f18a53a61b6140df8645e34a76a911298883 WHIRLPOOL 7c85761767af6e15f0c5709c729b52ff96854b1a4ba9928d5f82010a7aa64bdeeddf16a0b92e06be5ca979e3af5b84dc84251a1740c144ac5ce82b544fedba09
+EBUILD dbext-25.0.ebuild 331 SHA256 dbc36ef066cd131b8a73349eb1ead3cf38e88b1f00b0ba5180d277950226640b SHA512 48224738e3241c65ef58031ba0cd7e3bc8844772ef1449b360214993b10163e1a7115a4341f49232a523e9952ae82c0715180b2b95b8e606e90cee6a96810053 WHIRLPOOL 08dee1f9ba5b4bda452afe8faa043deed459e021508db86870e927ebd6c0ca55dc0be067e8b0c8ab62f8b5614d020d352665c4ba6d3dd1375c62d5968fe39c27
 MISC ChangeLog 3643 SHA256 2a4de949910029bd23a6a9bc79553a6cbdae1495f5ed8c2e2d3f872a7fa7d794 SHA512 355fca4a6226c9381a3ee9f7f8ecc7dd9ebd9520f2f2c6272157e1e5a44e3d88ada97bcf7d4d4386a9ef7622173b5dc8947fea306a8bd549df0b90a9c45b8111 WHIRLPOOL c800f55f30ddd932162c94500d3904688d2c8fccd1c73723174d3d62660a589bb64ac98bc66bfad48a3f506698d652dde4478b4f7e633b8be4f3b201b7dbf01e
 MISC ChangeLog-2015 4612 SHA256 ad9adb97bae88ae315a4b52875d0c69bfe244b7d5baed9e418edef04fec66f8c SHA512 6ea7a134b1f2e1dd6f828eb85a6cf768adcb529dae2d0d99d5a65c149300c917ff8a3ed9526945ef837350cba5aa16de857186b256c4c8239deaadff1a0827fa WHIRLPOOL bb452ee21849c1a29d2dd5098c863e41061b487afe985711c5cfe0e31c58fb6364af188a8738aa1efbb7a369ffe25c78db670a05156b01ef4e7acada41dae68f
 MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
--- a/app-vim/dbext/dbext-24.0.ebuild
+++ b/app-vim/dbext/dbext-24.0.ebuild
@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: easy access to databases"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=356"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~mips ppc x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/app-vim/dbext/dbext-25.0.ebuild
+++ b/app-vim/dbext/dbext-25.0.ebuild
@ -8,6 +8,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: easy access to databases"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=356"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"

 VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/app-vim/diffchar/Manifest
+++ b/app-vim/diffchar/Manifest
@ -1,4 +1,6 @@
 DIST diffchar-6.4.tar.bz2 16824 SHA256 b6d1b21c88119662959263bf717d6559ba38579ffb79a572cf4a6593cbe9ffcc SHA512 aee6ec2225c80306eabc5e18ad1e29ef0a007fb830608ced27e209c26166990354f156f95c210895dcdd7408ff02415be69528fd2062cbb42751a5c5d87aafd7 WHIRLPOOL f65c1fe819c5aaded4a8ff9c1ec775b44f7a7b3059bcee9f9b4b2d352d0a6f9dfaf618060dde5ed80f2d9ed9e20872d1ff85466b2f03853258a15e07deb0242e
+DIST diffchar-6.8.tar.bz2 18005 SHA256 4fbdae53dbbbe61cb08e7f72661ae9bc11b8d0aadd156a478cce837eb854bccf SHA512 e32430b0295d60a92b963270ce7d14e956dab99e470257876164e9e9f8c4c55366eb6bdf0eb429f7ba0e63034b67cc48f97eecef1708d9091f2fb9f2c2e3d492 WHIRLPOOL 1bfc7edb666adf37ae14dd3ff0ae378e3445934dee7621969bb461330ffc61ceb221892a377d34c31ce3ec8bde1c60901960e4086e354f357911c33e1b8d7142
 EBUILD diffchar-6.4.ebuild 403 SHA256 99dc905c78e8a0d80ea168640718f5f7b9ce979cf6c97882cf023b3269ffbf07 SHA512 cec70af853e0f840c5857f46ab8f8c6828d2c96eb762f7171124b84aef6ea2fc879c6fc6178b80ee78785c0ebf8b5c320f13898682e420857c4d3f1c213811a2 WHIRLPOOL fca1bd1898ecd999125fcdbf85df879b14b217077ae70e4bb792a365c2332e297bd33903ae8cfa1ca52e990704a4ae399f22d5d1279f5e6d831270c43659e424
+EBUILD diffchar-6.8.ebuild 405 SHA256 3ec7e9161a33569ae20f3031afe02a44518fd28f65a364d575c8e595c5a9a5b8 SHA512 95a7bb6babb873b24636b72fb1204098a2038f6f348b83ca1507285bbbbdd89293a542215f0aba48a2b7cf3d607ef34dc62609f0dad9609e99d2edac09d2c505 WHIRLPOOL 11049f69f45a64d384f587a1099ee89e2e482e621b1e2ff3c705bfc7163f83a49fdb83aca619036465412758b529ee4e116f1968e1f1dd672a6d50ddd0298e09
 MISC ChangeLog 790 SHA256 d0a571a2e2fcf398a96ab5752187ce33b3f31e81a95327aad67a8661996dfc90 SHA512 8895189eb31a3d14f610b25566d7d342fcec9b9fb92fc8a26aefa90f6f48ff0d364ff4f3129f1f004a2d35bbd991af09a6c3d35c6179d861950a75efb15067ed WHIRLPOOL 562088f731381df6383d29d99523e0a44fc8ad5481a4451c1fc7aea8e2a510c07a890eb87abe12f82b6dbc4c5b0423ccaead85fc3bcf0c77cfe4f03b4e88c690
 MISC metadata.xml 345 SHA256 606b4637e74a2832f91c264039bdb3b4221b64346d5de50b7df1212e1d130227 SHA512 bbe312936f14ed5cda6ac637f0780480b5e82580ca79320c5503b404e0a2eb9659fb7d0dda9e83097546fa104b7b9503bb1b25b166725b045487c78d80219d7e WHIRLPOOL 41dc5687da5ea29f27c1463a689f06b7aa0dcb088abe09c6a2a2384bb7d8174caee130bb86c56dab038a462e7860da6e1e1a82fe5975314e06e3f35c604bd19e
--- a/app-vim/diffchar/diffchar-6.8.ebuild
+++ b/app-vim/diffchar/diffchar-6.8.ebuild
@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
+HOMEPAGE="https://github.com/rickhowe/diffchar.vim http://www.vim.org/scripts/script.php?script_id=4932"
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/app-vim/gitgutter/Manifest
+++ b/app-vim/gitgutter/Manifest
@ -1,7 +1,5 @@
-DIST gitgutter-20161027.tar.bz2 40930 SHA256 7943ad643d0b015663b7c85e2c247716f9321926f1437e15b8c0ad810ff2f8a9 SHA512 d935dab24530a0562784030e2167e09de374d4f5cb01d77918bc7f97675498bd636a81b42d1e82f1dc34fc70f0d32f824aa6eb9f8baa6582cf22e5d0a0d81098 WHIRLPOOL abcd3449e11d09f81539e579f0bc5a7293701c4d15ccb50a8c2fd7a9d8d9963cf9eeab5776c46c2b84077292e07b131c78088839408441ceca603bf2a238c8c9
 DIST gitgutter-20170222.tar.bz2 41819 SHA256 10ff5c0c4fc7c4fca857b98df92f0e94efb43c79b1077aaf7e7c54ea59e08e29 SHA512 970a956a839c2eaa05b699e8507b239d36ad623c40d3d05d9ce82320ec93ae733de2d40619898c5ff43074e2c8f95611b94879424767fac4f2b1fe2747611f4e WHIRLPOOL f201c0edbdf0978f0b48f2caed305343424bd2d97951902a0df9ce6f6c499ae3f0e506dc917a230db5f42c34022b170bb54baa682a2e75805af724b919d1f35c
-EBUILD gitgutter-20161027.ebuild 568 SHA256 24cab3bd3f986db3cc356624dc4a7e48af27b501fe5b90be24af99a79e57c769 SHA512 fd105833be6db68c1f23b6d39512c287b476fc0a71491e213479a309d37d5e178d7d68231f7381a3920b7afd04031b5afadd6f99dfe8b5f65b4c56edb55d3bc6 WHIRLPOOL 3cd01822981ad2367b645b282131f6ae7429f8695eac7a5429a58dab0324717a2b9e8491c8a2099abaf774c4d61c7444fccdf6fc2f031cb481d12fff7661c47e
-EBUILD gitgutter-20170222.ebuild 578 SHA256 a4d3fadedffbbff122bdd1a0bfc8331a4fb0953083b54542cc9908b359b9cfd7 SHA512 98e7672a0422c0d556ca38c747d7b5f7b4c0c6c284a4d0e4d719d8c0ad8952acdee72a91ff15c3689b09e900d7fab1b65b47cf4742341014a7d45f5c9585037a WHIRLPOOL 0b6743cbffe8a2968fefb097f7f64f72bf734b74b84b7cdfa73498eba50d643b0ec67f8e9560a49f3f1b2b7538e4cb1c3a3e9daa39a178bc9e87f10de951414f
+EBUILD gitgutter-20170222.ebuild 576 SHA256 0918a039d251f714a1230b40c53fd5cc9aa542268f8fc86433ffb72b1aec4e60 SHA512 f6b6f1fc620034b9e573fc826984ec8c520a32d656ffbbbb7657fd363d20245586c28e33066d711a8e46979da0b944df530e24b89a3a5bd5e57f2904c7300691 WHIRLPOOL ef0880ad18ef43f5aeb64cad7ee18e31dfa014743a55e4730c87d0789d37ae24e0b9fcfcd7110393c83f2574698f7506c3f5e1223ba630ecbe6f1ae74da1d1a7
 EBUILD gitgutter-99999999.ebuild 578 SHA256 a4d3fadedffbbff122bdd1a0bfc8331a4fb0953083b54542cc9908b359b9cfd7 SHA512 98e7672a0422c0d556ca38c747d7b5f7b4c0c6c284a4d0e4d719d8c0ad8952acdee72a91ff15c3689b09e900d7fab1b65b47cf4742341014a7d45f5c9585037a WHIRLPOOL 0b6743cbffe8a2968fefb097f7f64f72bf734b74b84b7cdfa73498eba50d643b0ec67f8e9560a49f3f1b2b7538e4cb1c3a3e9daa39a178bc9e87f10de951414f
 MISC ChangeLog 3479 SHA256 076e7977ae19ca15cc0dfacb730f826d908456d0a0653c8885960ecc4d447411 SHA512 bebfe3f3d3a2a509c3257e1cb1e75bae6c1cc32f54444626b8fca82981a0b2995957483bb790974eee7a40a68f165fcd6dcbb79cc57f93f62e7958dbd0bc361f WHIRLPOOL 52fffd40cbe2a348a655dc8bc438c07c46e3af60adadcb846ada97b06aab87765cc34791218e2d8bac63d5720c46f34d60c5d237c8b5dbb477e7a39bf865b904
 MISC ChangeLog-2015 647 SHA256 2e0c1dc118819fddacfe63be4edfd2db03cc2342c7ded1bb48c495cac3eee7fb SHA512 0e441574b6a3bf70bc5579d625b8f76c2978ade6a69a339f873ef7380d43069dbfb2b8e6c3c5fe404cfa7ab47b3c1d25c37af08e363a30da343cbd694a70e9ea WHIRLPOOL 63f462db32896da9a12da37c7794d2c9b20e37c05fbfa2cf5c276bcb23d69ff19af6e903d0a83fab9088a02157d1d08342c2501167c360a836848a960c93a0ce
--- a/app-vim/gitgutter/gitgutter-20161027.ebuild
+++ b/app-vim/gitgutter/gitgutter-20161027.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit vim-plugin
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/airblade/vim-gitgutter.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
-HOMEPAGE="https://github.com/airblade/vim-gitgutter/"
-LICENSE="MIT"
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="dev-vcs/git"
-
-src_prepare() {
-	default
-	rm README* screenshot.png || die
-	rm -rf test || die
-}
--- a/app-vim/gitgutter/gitgutter-20170222.ebuild
+++ b/app-vim/gitgutter/gitgutter-20170222.ebuild
@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/airblade/vim-gitgutter.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi

 DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
--- a/app-vim/gitlog/Manifest
+++ b/app-vim/gitlog/Manifest
@ -1,4 +1,7 @@
 DIST gitlog-5.1.0.tar.gz 29684 SHA256 7305176d205635479a4373349ae4e3115e4f9f8f20d2ce7c8ea74da6d3c058b1 SHA512 1c2bd363ce5341fcdaa80955af350084903da7e7cac1e20583d05f8812ef11e562137e2ef3bd198f787a6cc1e322f7d942135341c27186a7c987cd9d631a0eeb WHIRLPOOL 577d8b598b44216beaa2bf95e43f313f0fb88981cae8701b39fb99dc54d2ce874818cdee8cf725f4bb059317283ffe6ffeca521e5aa5e42fd5eba9d8d4eaaf81
+DIST gitlog-6.0.0.tar.gz 33956 SHA256 ff64dfc23278e45d8d5ae9a92f4785675db8caff1fbe303ec598f54b3d93304a SHA512 17016057df69b22e72548d00bd8c253ace864f0551890f64e6b9a91c1411b1e0a479d6c04028583edf9f9c366418b50b758f60d197fe0a62a75c7799b68a4069 WHIRLPOOL 15598129669f02afb5b1be24490733b0856132392d1fbd84f64774d64c9473a5adf8a202b836a665912ca331b453009d5e3b798b470c9b4363d7e1d50d32bbb5
 EBUILD gitlog-5.1.0.ebuild 499 SHA256 e97ced50657406c9a6da1f45c4ca31cdfc80eccd73e25513853e5a702f5162b4 SHA512 99f5de2279eb2004045af925ce6f6e53b46819f413ceb48f60ab96900a359db9e63f23770f8e9f9e63c82eaffaf3aedbf24b66fec40ed3f8f3793b30c1a77b00 WHIRLPOOL c777840f1842e1867af17cdfde82b022a2f1ee1eedb32adaa78cc01d8e46da140494541e92ed40f281ac2cf7f5952eb5d98e355ef6d27384d3f4f091f1b98a8e
+EBUILD gitlog-6.0.0.ebuild 620 SHA256 6636e9e5139bd66810ad352f252ce016c526ddabedf3394f88ac75516fd52308 SHA512 dcc80bfb97357f367187a7edb0bb5aa849e8c0f4fd6b138a1ec2df0e4bc4fd9c445040b5334ef5e0cb5856b8a0565a13be83c09e0a7d02aea71e022e77007d59 WHIRLPOOL 07b7eb2a406f153a61e2a17487ff7e9b32ba844924802aad3137fcae69a9d6af38050a6802d3891e9335f9e254ecca6dc6a7a457f395718bedc2fad96eb6bc20
+EBUILD gitlog-9999.ebuild 620 SHA256 6636e9e5139bd66810ad352f252ce016c526ddabedf3394f88ac75516fd52308 SHA512 dcc80bfb97357f367187a7edb0bb5aa849e8c0f4fd6b138a1ec2df0e4bc4fd9c445040b5334ef5e0cb5856b8a0565a13be83c09e0a7d02aea71e022e77007d59 WHIRLPOOL 07b7eb2a406f153a61e2a17487ff7e9b32ba844924802aad3137fcae69a9d6af38050a6802d3891e9335f9e254ecca6dc6a7a457f395718bedc2fad96eb6bc20
 MISC ChangeLog 403 SHA256 793efad94de75b8b988691d93f203087fb03dec33bf07f411257dc7ef03ab78e SHA512 825d33b33052a1a69e3080d1564b7d80b8d25cfef608f6dc02cea75edbb3e772e313fdc3600fdeef9100a9096cbd4c29569cc20895915ecbe4f8d63fc480ad4b WHIRLPOOL 9def031c3dafd2be525706861983ef3658eb3d95dd745bff1de9438e59a80a224d88326aa56e6773ccad0a4b7c86d0b0ff5e398495cd2d0026a084197c64feca
 MISC metadata.xml 342 SHA256 683e5b8e238da7f109b6f89cd4075c2419b4fedef2b4be59a8babacc34612c4c SHA512 419f19aff509708c460c7848a5e90c03a19c47c986ae6d5d07be0abb3a387a8045f89b98139d2ac0ac5abb16b9b8cd315fe3001a8808a2c1e4ee497449e23a60 WHIRLPOOL a606b7f8fb3c6d546c1ae0b0c40c8a874abb03a82660dace11b141aa3cfdc95705ac8f995be666646b8edcff8ec3a330c961fdcda0f8a0ea9fcd383bff1c9803
--- a/app-vim/gitlog/gitlog-6.0.0.ebuild
+++ b/app-vim/gitlog/gitlog-6.0.0.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/PAntoine/vimgitlog.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/vim${PN}-version_${PV}
+fi
+
+DESCRIPTION="vim plugin: git log and diff plugin for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
+LICENSE="Artistic"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/app-vim/gitlog/gitlog-9999.ebuild
+++ b/app-vim/gitlog/gitlog-9999.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/PAntoine/vimgitlog.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/vim${PN}-version_${PV}
+fi
+
+DESCRIPTION="vim plugin: git log and diff plugin for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
+LICENSE="Artistic"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/app-vim/gitv/Manifest
+++ b/app-vim/gitv/Manifest
@ -1,6 +1,8 @@
+DIST gitv-1.3.1.tar.gz 553719 SHA256 ad65999e64d1924a6c540efe7a3adebb949cf30be2dcb23a3ce41175ed21170c SHA512 e6a6773dcac18fdc36c891bd592d4dcb2eb20af6253df5886582fd223e040fb8296dc606d4fb25abd7a14f9dc1a712fe0e354821e234c8f54b1b5914af55dcbc WHIRLPOOL a200640371fce5a2af8be014b08a578a8e555a8b1a1ac1db138fe0f08cf8ffe4e36e24080043b61448f4653b0dc5d2df26ae56ec937219bb69b7159bb6e825d6
 DIST gitv-1.3.tar.gz 21319 SHA256 6533196f9f2688846c7f4035ab1af82713f5e0e4aaf5c18335fa5007e0ad6555 SHA512 1a13d98ae9dd3e50a559d98881b6b0a8150186573e8f9fcdd9bd5cfdba1a679ea1c02b57f7d7be712dbfb5ec1bffbc4c0e8e1330cd64acf095c88400c499bfaf WHIRLPOOL 7c99b3e697c1e92ae829ad75a85ff2c777014420ed986a93d9d23a7df96af082d0c8c8a35949b1075fcbf8a754c203dd3055e787df075352f9d0fcafce199257
+EBUILD gitv-1.3.1.ebuild 682 SHA256 cdcaddcfb92e97d46e1a388bf695a1fbd6249d9a47968c95808d6e57c83fc355 SHA512 6dac563def9f199a5dbe20070ea2656fab379fbd5fbdfdc7b3bab667b082950220ae39c8028b74374a24192a3f16002a2fbf3212158fe86c71627d1f9d97d52d WHIRLPOOL 737b2d510286cded74558a5b1918a4f9454b7798a8efdf688c243ac20df520034696b7d68f1614b2fd510fc2c643d6882bce53d192b5f09cf24be405fc3ecdec
 EBUILD gitv-1.3.ebuild 437 SHA256 bd38b7d43bc03448a3caaa6b707392b5e48bc1bb4ecfc9ccb09f18456e7085fa SHA512 74b772f3b36f12e0e610171c63fcc04dcefa10564fb86c496739076387af3f65a0ba2f811720234b39e7905d27959935326619c01c83a5dc47e4f496631567c2 WHIRLPOOL 0739fc886b279a0684d6c056b3381a8594c01e1de16245fca754b374a679f49cc355d510bb9b9f7eea7960e82e26fb4cf8517965afe8a2df8bb1be9a2ba2d73c
-EBUILD gitv-9999.ebuild 586 SHA256 fc2488398652d05428257cb6121e59d6af2739456bd879ed5f69ccac729fffc5 SHA512 6391d8fe10eb77599aa4eed65c1eb542327209ba2ec309f39aaaf0e5033b0c03592eae7ae98c4718c8a44205486e88784bd967f7db2c440f4266a8a24e4e806f WHIRLPOOL 776a3e8c5fce15f3d1daf8af40ead1c97f39e58d19905f014d1e6c67213522efbaa9425de5caf3d17e36c007149d10c597d5ea693b2d7b4bfa9fd3b24d2cbc38
+EBUILD gitv-9999.ebuild 682 SHA256 cdcaddcfb92e97d46e1a388bf695a1fbd6249d9a47968c95808d6e57c83fc355 SHA512 6dac563def9f199a5dbe20070ea2656fab379fbd5fbdfdc7b3bab667b082950220ae39c8028b74374a24192a3f16002a2fbf3212158fe86c71627d1f9d97d52d WHIRLPOOL 737b2d510286cded74558a5b1918a4f9454b7798a8efdf688c243ac20df520034696b7d68f1614b2fd510fc2c643d6882bce53d192b5f09cf24be405fc3ecdec
 MISC ChangeLog 2664 SHA256 139a57823df298c56d3465e5c817991d3d031b706e7f7a390586bf8d19aafd30 SHA512 9e8a27d4648522762c40f6b603fe737aa1961a8dcc04fae5407f046f4f39bc2a8f22f5fd76f5666e4ce1266087903cddaad34e03789fc44cbed53aa58de6e608 WHIRLPOOL 1c0979054f9505de9d2adb31a162d9409547169392971ad6106f4d82a93bcc8f28bed785b5859794b3df87a68f335ca2780c33142b46c0016909c49a465bc5c5
 MISC ChangeLog-2015 1699 SHA256 8e9ad861c92d1dd5d4992b5dc4c10eb8190cde6c75eec889bed5c43ad9509182 SHA512 2720b94b41815a1aef6e56359edc00a81ff1ba6be6b8f04106e015dc940173a15f70899444a52b26b6950c998cdb1c160e385c89aaab7d455c0b3c212c3bf3c8 WHIRLPOOL 406a6a14b6c0e919eb4684034e831a6f38641bf380255d89ccb1a6e26bcfad9b73118a68bc3be7885972a50f075019f4535d4d840c365fec19b5e65fb0c4f5ec
 MISC metadata.xml 339 SHA256 711f1df16191ebe9df28a6bb09104be750b5560ba8c8d2be1af8a268443808f7 SHA512 ca3cb18c58b214701105d230d86f6499c1df741d0631483991465daa0680e3c3a8c2adb9440d828b98cf73fb598bcf33b4eb31ade16fe7faf31210663742344e WHIRLPOOL ac731345757645a18ef173b65e52843fb292d7485145b3d3e5ac928037d2bf0646f735e6bc5637f2d08f17c0dbf97e0dfe63ac6a75a7af83cc0b77aaa4151fbb
--- a/app-vim/gitv/gitv-1.3.1.ebuild
+++ b/app-vim/gitv/gitv-1.3.1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gregsexton/gitv.git"
+else
+	SRC_URI="https://github.com/gregsexton/gitv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="vim plugin: gitk for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/"
+LICENSE="vim"
+
+VIM_PLUGIN_HELPFILES="gitv"
+
+RDEPEND="dev-vcs/git
+	app-vim/fugitive"
+
+src_prepare() {
+	rm -f doc/tags addon-info.json roadmap.md || die
+	rm -r img || die
+	default
+}
--- a/app-vim/gitv/gitv-9999.ebuild
+++ b/app-vim/gitv/gitv-9999.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=6
 inherit vim-plugin

 if [[ ${PV} == 9999 ]]; then
@ -20,3 +20,9 @@ VIM_PLUGIN_HELPFILES="gitv"

 RDEPEND="dev-vcs/git
 	app-vim/fugitive"
+
+src_prepare() {
+	rm -f doc/tags addon-info.json roadmap.md || die
+	rm -r img || die
+	default
+}
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@ -1,4 +1,5 @@
 DIST merginal-2.0.2.tar.gz 15048 SHA256 e1f5030dfc30cf7c2c98f9193529c385c86def213ea2bc36c3feb5feea789a59 SHA512 fd2162491e04afdcf9c81770a3082c035b32ecfd8808be035db64ba6ed4ed4076c692d067f261c093fe12b467e020bb7c6770deabecf72e6631e1248d569b721 WHIRLPOOL 5101f0040f608370296fc57ab5b61be281c5190f9957dfbeb553714fa983434d22e8b866a60457a633e8ff89a4a49f4629bc20d47d310669708464065b966c9e
 EBUILD merginal-2.0.2.ebuild 606 SHA256 1b25c78c97afb4c33d8ac73c27d4547969fea46aff96e522c05a38da272dfe80 SHA512 a6ce247cb63895e38bc8ae65256ebe9e0d40e2e6bfbb2a49aeba81cb5b2b34ebf16441294caccd46cee24dfb9d969dcb7dd03b7471ca956694000aa74c8ad00c WHIRLPOOL a2b102e2e89265884f23ff6d7335c01e0e6ea91fe82beef51dc7c77ec8a42ea8ac4662dfe6dda5c87e0a348c413dee61917ef09af58524d18dd156a4562f6613
+EBUILD merginal-9999.ebuild 725 SHA256 2b9da031324a8c8a787ffba51f75edb4d2c437bf68a8db0236f1b088ba62f14f SHA512 07723127315f34c04686248fcd3f4cc6598f055fb014d0b8aa7954fa45c439f694274a9daf531821fbfa58c2ec641e49d257a0cc6a49de94d8d57643c5de0363 WHIRLPOOL 04a1f22564fec2aa3c72848228688ed4a4301fc40c90d307f4b875d96985d8a944d43e05f6a9001ce4c7a09d41e1a6d188d09fa356d24eb98452fac74575cd4b
 MISC ChangeLog 1013 SHA256 68c6ad3109ac0cac53c4c2d7abf4e018e8d7827344e8bc1910bff252d02510b0 SHA512 71635bac6454ee0f8bf8be28d9d4a2ef513c7883993cc863026c0fabeae60335b9ad4282f47781d5bf1214fe237e234f3c52c14eca4907a77d838ffa5688148c WHIRLPOOL 73103ce5d9e51a6e084fda72ba574196613090731233e97add26616182b5bf75a02f7e22217b70610ec5ef2e2ff211906f53c08d878abaaa7afc2bc54be6592a
 MISC metadata.xml 345 SHA256 64293a95b48d1d9c7468ff16713a596deca735a98e781aa8aaca93a706cb6fbb SHA512 c86f966d8b95d7ae380395af45af1046b3102e4c921f5a4102b4d421c707659b4e5aee25765b8af1e815cb5274963bdcae482cc4700d3196259e62ecaf6919ce WHIRLPOOL a3528486823d2993f156eafd1b3702c6eca615211a88c6f71193f94b9719f9be39811ff4adf87a69507379d3026aee0f01c0f69291ff2bb14769891cf45e2063
--- a/Show more
+++ b/Show more