Sync with portage [Sun Feb 5 00:14:23 MSK 2017].

7 years ago · c96eb419e9
parent 9558b4bef4
commit c96eb419e9
1124 changed files with 6270 additions and 10516 deletions
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@ -9,10 +9,13 @@ DIST puppet-agent_1.8.2-1xenial_amd64.deb 15179348 SHA256 5195af288ca014bcf65705
 DIST puppet-agent_1.8.2-1xenial_i386.deb 16609778 SHA256 48d4588ae8c87a3a3e41c5c4e6159cba7bf6484578ce0761b4abd76854f7bdad SHA512 b96e239906e75773a22c37a28c3c794b7293cab1a970ba5067064b120e12e0a6f0b620f06dfb3cc5b83e9140467fa552aa05ea46a33f3fb8b489ac7790cb7734 WHIRLPOOL 6daf05a7ae5e50ecb922ffa260101cc62e64267fd40ca6dd8d684ab1b3760eb45a4f797f9644b7fb351f70a86e88d5c88cd1cc5dd4d68341912846466ba72257
 DIST puppet-agent_1.8.3-1xenial_amd64.deb 15531434 SHA256 2a468846e4b31f07dce9bbbf96c3fe06a528512cbc37bedc7ab44715a6833e94 SHA512 11958f51b75e012484f332b49d66bba225fdc19634f3972dfe5117ce7971d187bd7bca36dff079cd898e48c3545d560f34ee57a3acb710427154875d9d99100a WHIRLPOOL 895050da0f52a1e977d58802dcc5e5db11c331d5ad30732b1ac80e799d8b3312034efa800e3489b789cc40e9c156a5fe66050264d01a33c4a85e489a647b6324
 DIST puppet-agent_1.8.3-1xenial_i386.deb 16564720 SHA256 c2d5a1fd91941031b375b59f85f323a38977cc526b33e73f93eae50ee036fd65 SHA512 bb617c351ba26d431a6f0d6aa150c8888ee822feb63ebb56557586547e8afc9d387c5af6a6c59e6a885bc6ab195c89b3ea9317de74440abe6df76870c3dca345 WHIRLPOOL cdfd414d9113add49f9b60d5efcd5f16ce0f71a1bb094a4e98c31486b8ff86b1f9dbe1b5da0724358aa78d8f75c3aed9c8247a62595cdde92eab74519b9d06ef
+DIST puppet-agent_1.9.0-1xenial_amd64.deb 15324700 SHA256 acdcdc314b39e404102b8e6d0a7d1fdeb5710efeb34f60c447afd95a17a230c4 SHA512 068e27aa59b7e60eb296a7d41435ae821559822f4e4136dae0af20445490a209baabfd0bbe5f91c8981091c999170c251310c5a6fdc0ffd9825f1d0ee7128e06 WHIRLPOOL b949befa1ad7f61877188828a90687f2a5957831af8a71723ab7424172d5df04b923f5241681a816f28382e3ac832fab2c7982c34f1f12db6f31ca9440f0ec2d
+DIST puppet-agent_1.9.0-1xenial_i386.deb 16775966 SHA256 c7c5303e411278d19eee798ab7ae68b51edc7256935e6637a58fbb8c035df6ed SHA512 00a29cf00840e8d75e5d858fe03a15338f21e9eead123a1bae5e2a8cca66e06a6bbdc4671a06a986ee8807851997459fc134c6ebb196674e6993fd12af5bbd47 WHIRLPOOL ebac057af1efeb692b6b56fe2a697a79ab45872639add7db903b24f176651e86dfc18651c25acef3b33682dda255562e357e0942b9121b232474dcf1f6617176
 EBUILD puppet-agent-1.7.2.ebuild 3138 SHA256 b6a701fc13da1e96cc4a00ca111fef086c0c117ee6200f961681f86015adbadb SHA512 a3be50f9abe60ce56280bad5a3c235088fd082ebcecf88f1acf1f86b3c8817f805a36b4a73cfa5652e3cb29458fc30cfb8ebad93d88026f09a8b84b0d6bb72a2 WHIRLPOOL ee492f211cf92073f4a32ca764c18eb1c9f06d476626e9b8e0684e8f2901dac944cdb131a20c207afd4a89b3f13bca667fa8e83216229d17aab704315e963136
 EBUILD puppet-agent-1.8.2-r1.ebuild 3281 SHA256 4d3b35d4df2fd44c6e842158ea26f7a4c3d59b5cd275a07d846d1028356a0a7c SHA512 79d2f0a3c13ab2d085a95a0ad611f8175ff4eb0bf3bb21a2c0f87a3fb5aa40b03e938c9e4b3803949fe68194dfd29de3f6e8ca53a0d2b19940689593aac71f94 WHIRLPOOL 457e64fac8cdc981654f0a520575c4f0154af5dc0630c6ff304c03338491b0a6e31dc4744ca146f059ef76318415f1fda9edf31e8efee79e6bd9c26fa85f88f7
 EBUILD puppet-agent-1.8.2.ebuild 3263 SHA256 aadc74c548d0db56586b10164348670e6a7e3dcf6aae95950cd13b86f4532f36 SHA512 d3f1f8e94e36c818fb82072adf4802dd9f0ff17a08fe734d5f5ebf0d29108cd741ca3a9a0dae687bc3db6bc9d24154cf8dbe2d95805cf5def6a34294177cc141 WHIRLPOOL cd968675388fda6e1995ea846bba641592ea30e62d3a4870e7a9aa02d0f2036ffdb9ae93c7f7ae2a6e46b0732095209ac1feab045fe3ab6a2f9128dc6b479020
 EBUILD puppet-agent-1.8.3-r2.ebuild 3330 SHA256 0d7c7ae56980e9de4da2cbe688012ca311d27d1800bb178385fbe98f5ae46298 SHA512 db89027eb3e1570b49d78e13f96554a5249851461eef571fb752b1668a49c812149663b651c2bc9bdc5e04be7ebddf8a4abf98c1856836d15eac29146920db4f WHIRLPOOL a64312010830b484ff1517fa51ef1d0118afdfd18285007425a940b3da9c6ced2159eddc6239a3cd64264fb0cafff732a9e7d3d9f6a87002e9641d73a021f1af
+EBUILD puppet-agent-1.9.0.ebuild 3330 SHA256 0d7c7ae56980e9de4da2cbe688012ca311d27d1800bb178385fbe98f5ae46298 SHA512 db89027eb3e1570b49d78e13f96554a5249851461eef571fb752b1668a49c812149663b651c2bc9bdc5e04be7ebddf8a4abf98c1856836d15eac29146920db4f WHIRLPOOL a64312010830b484ff1517fa51ef1d0118afdfd18285007425a940b3da9c6ced2159eddc6239a3cd64264fb0cafff732a9e7d3d9f6a87002e9641d73a021f1af
 MISC ChangeLog 12414 SHA256 43b79bfdeb14a8a8c06df8809dac296ae71e59e85e5243bcdd578dd99c3c3f7b SHA512 4ad26d58ea469acd9c510f6582175ecb0a58954cc7eb2c8c90c2736e227fce04f9d196cce20b64a52153323058d6f5a2831de364251803d8eb0656b15ea4cafc WHIRLPOOL 16dab8e7506da0d6bb98f91d08c1890c12e9152baa7f15c4e1ad01f210845acfb55cbe3c8bde1a1b71559cb60d84ea436c24798290802891e3047d024b66edfb
 MISC ChangeLog-2015 1925 SHA256 14cec0025e9af42a203c9a087daf7d2bce1dd92aec66445814fe3ba58fb55611 SHA512 f5c921d2ee0079c50c6618d8efa13438d07fe0626133269c8be9b5dd7f7a3aa6d2d1643d445d5e1d527094b2d814c0d5858974e5b38dd475dcb9d0271162ec72 WHIRLPOOL 92882e38ab2de443b8c4edb81327915b6ac76d1df5bd4306827ad92704bfe844ceda17c4abc81210de36718ad6d51eade549d720035e46ef6e719262f0441354
 MISC metadata.xml 433 SHA256 34ac6187d7fcd5df99dad8daa85048885cc5503ca5e6cdd58df2fb40c9fe8b60 SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402 WHIRLPOOL 08b6fff0f6e4c12d48d686c21fcecb2b1d011c6aef7fd24d11bf78d2a8ad408ff0f8cb00b3c2329d24de30f144413802c84773919339eeccc572fd01af15af94
--- a/app-admin/puppet-agent/puppet-agent-1.9.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.9.0.ebuild
@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/glibc
+	>=sys-libs/readline-6.0
+	<sys-libs/readline-7.0
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+	/opt/puppetlabs/puppet
+	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/engines/*
+	/opt/puppetlabs/puppet/lib/virt-what/*
+	/opt/puppetlabs/puppet/lib/*
+	/opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/mcollective
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/mcollective.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@ -13,11 +13,13 @@ DIST puppet-3.8.7.tar.gz 2650247 SHA256 50460a3dd8d25118e25eb01178d09743dabc01cd
 DIST puppet-4.4.2.tar.gz 2680253 SHA256 90ea74703b415965def15566a6d709fbd781a1e21589688c22d2f1bab4688860 SHA512 38c4e4e94693e8f3131aba44ad8b03437cd6896f8266e6f9d6434e355f044c87173034bbd336c33e5848692de60c5b4612141128a95a3d088947e72f90d13bc1 WHIRLPOOL c7d06954d1a9b46cc7f56e73da88dd3297179f1f7ede646601b6305940e200f29bf7047e494df3be12e76b0640673d616058055bc4887d3e296a5372daeab0fd
 DIST puppet-4.7.0.tar.gz 2822807 SHA256 9b5c00da165ba8570607097d5d494ecc8988829d9e066b0bd6103cf1fa903e4d SHA512 667b96c66f63befccc19cdd0e88d5c7b29feb2f3ba29f0faa74ac77b4e4f16e06a34b19114b27b36329a5964b37031e8c1430849c1673760a782d4e80b8df296 WHIRLPOOL 949cecc001179bfc81b589756718deb6a3b298ea314a9fb9eeb7d660ea9baa22f9f2c183b8992f70f95158db80a3a996075e36d365da845aef795b0ab897b9f8
 DIST puppet-4.8.1.tar.gz 2873371 SHA256 8b3ee6b60639e2a2839ad7403fab8f8ecc390a93e6e47b03f1b053aa262bcf17 SHA512 9ecde04c68874652b501e779764bb3227d226564e80f06c2c15bd982620529ec55f8e11911bcf68db994ee98287746761752538aa5aeee474ddf37f21976e2d1 WHIRLPOOL d3a4b0b4b15dceb75cb3f161b73843af53f5d21121ba1fb06fdae422ec458f62f5fa47d0f5c7bfb96e3e9b04eb62c4c1e1a97f7131101e4f6f4ff952127c0685
+DIST puppet-4.9.1.tar.gz 2912770 SHA256 db02cffb8339b349bd1ab2b15899511d3f5d449f0f591038256f0fb862f4c7db SHA512 db2bd324e4f58c583debe417ca233c613c296aa8824520c5373c8da45056ae9d09e54ceecba5c6b7d0250ea7228d6e1b83e5b690b1203de43dca8942c8f24ce2 WHIRLPOOL fd5554d5de319f8534fbada7ae6f4100d6de5a98f6646985e21c250a52a3d415ac31fc46c15c987bd7bcbc688bc8bb4d7dc9d37ebd93ecd183b3bd01d3426687
 EBUILD puppet-3.8.7-r1.ebuild 5268 SHA256 8e168e2400f7482c182b30727205fa35f9931397605a5580ba7bb147058e0254 SHA512 9f28f90ed1fcfe1dfb46ed87eb8b2a5ffe6a2a8cd6af714332e5f10bf61cbba6e155d855e351ecb7ca345324e3fcd426b748042deaeda9bd37fe09298330872a WHIRLPOOL ad0dde6c67612401d75dddfb11b1116987c8433f27366d95f2413db6fb231949ce1fbac5715e83cdbae14c457b08ec7379617c32ef2b7e046a6505d48f357eac
 EBUILD puppet-3.8.7.ebuild 5005 SHA256 b36d4b26548aedd400d726ecc97d722295b530846259a8dcddfb7514af55b243 SHA512 adb85c1dd988b3954b848da5a384750db93e2e81ccf17e700216d9faf3b6462ab035d0a0f0a0f294c59be6c49fb17ffd6cb522d69225359fb9a0d9d7d1336a20 WHIRLPOOL 5eec15785f1be6e7ccce27b91fd95f55b34ade26e54c98d14c05c315de5c194a248157aa4e53bbbb7cc4b4eda7f06a97c065ae52367aea6cacff858d8ecbad18
 EBUILD puppet-4.4.2.ebuild 4695 SHA256 ca5ac90314d706c92e62cdf58915ea20eefd925db6e7e0f6eb1bc8e1b4a40266 SHA512 24d18927d8bfb8d859bc6059a6477af57beb7c3618dec94f3042d1ec253ac43797668ef24f4daf97eb2d1086c4bfcbec1e438cc9d74c7c728d1677e678942ed7 WHIRLPOOL bc3f58b3e9d551c4396ac96426a5205b7f9aedbcb3717185f5b8299338ad2c5988903b599371c92dcac5b86a1b9fb2b03e28dded21419e6a0b2df1a1c84bc87b
 EBUILD puppet-4.7.0.ebuild 4688 SHA256 7e237a94b9e665f86fa0f085f684f92d79a2753d2b3fb774e304c04d17e9502a SHA512 0eaa117615b552833caa808281983410f2b90ec04a97ce4361636d56253520806eb10ab3a003aba5ca86f78cb6fdff57f664c24e234cac9e37d3a8f583589fe4 WHIRLPOOL eaaaa1f8c16e44cd9f0b8fea8a17eef16c989153aeceff7d6e7591007c3c67c67b8c4728ccf7a16b00bff3fdf25ae9db8187f45a6898e4c8ba88876ac18f1f09
 EBUILD puppet-4.8.1.ebuild 4690 SHA256 f03d31d1ca7770c5fc80f1d815c56b1422b3f2ce0a232f139d836a6f232358b5 SHA512 9852b56a6ec4c5f19573741a2499dd47fa2b3df5fe6f297c1654aaca027dc506e5fac39cec2f847351384b54bba095a695d66dc04c2fa7809429ef0150186c82 WHIRLPOOL 31a8c79cd2bc41853833258dec2aa9e251cedaf1cfff9066420d5fcf15ad96b4a2714a2cfbdf082664758d1f357fc108a4c24daeaa453f5d217a625cb1eb958a
+EBUILD puppet-4.9.1.ebuild 4690 SHA256 c55437a221ee5960126ce36d6c04e5c03cd91722b7626da0f6552549f7526971 SHA512 e67e6cbd26af8a1439d496d19928a31e1b057056140b1a7893b62f56eb2f5a113ccb599db7a538439d7aaaa16df950b01211daa2f4e07199074cdeda8a066134 WHIRLPOOL ea128baef44ad7cf59f0a9fa21828f6fc17de8c850560dad5f1ff9501ab45bf6a72757ac02a5727f99fdab0f7c8d0f5c6845fca80b01a11e1e27201e531b1539
 MISC ChangeLog 7719 SHA256 ebfd68981bbfd64b0ff92511b97749e56ab20d4663b4190a4ce89fc458a3a40b SHA512 98f3a66da3959b16036bf32851f8881d1928092c5ce64c02819dd9bf8578a2eb142e8f2ced5a85aa6d5b5cf1f15842e8ac9d6b9a851b2efdcab59eca9f2df1bd WHIRLPOOL 6fb9b83691125722682f433be9c49a75d7ee4e9eccc26ab6d273a379508f830b3ba7bf67a87924b4c0722590003f20530e2d9ddb1d29f2d5a0458d070672cef3
 MISC ChangeLog-2015 37770 SHA256 3183b2d4bab4f43c30b81d32da261e55a0311a0e0f32127fe36e7678a7964670 SHA512 5495eb8a18269cf58f6d8f5e20049da35692ce6e30fe126f65c0c15b77c477206b3dca3e2b61ac165d82ed2fc665775b474cf4bc667d3746aa5d12a58f55c51a WHIRLPOOL c5401b362aa38e38685603c8d0365a06c08f3f4b46533d2242b614133ddbca4c5ebe8897d60109c7c383cd4f5a61f118313e7c949f501e3f80473981ef26498d
 MISC metadata.xml 1445 SHA256 e3931b10dd70f3c92b3f2974c70aae3cfceb2c1b3e5c8062e60b2b8384fd4b24 SHA512 69bb92d99f03b56ee1285b06959bb8e232036b432cbd674561be10ff9575ce57edd4a00e11deee916f90b6ffe12bc4ddda5641850f440a4f16e272a9b34e879b WHIRLPOOL e14a74811fbf9a7b8e291bf4f32c0bce658efba10411e93286b7487b764a5fdfca437e7614ec4e8138bf1567bedd2db93ddccb9c1bec4ccc05e875b5d7d8d01b
--- a/app-admin/puppet/puppet-4.9.1.ebuild
+++ b/app-admin/puppet/puppet-4.9.1.ebuild
@ -0,0 +1,175 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+USE_RUBY="ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	>=dev-ruby/rgen-0.6.5
+	dev-ruby/json:=
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#		dev-ruby/rspec-collection_matchers
+
+DEPEND+=" ${DEPEND}
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+all_ruby_compile() {
+	if use emacs ; then
+		elisp-compile ext/emacs/puppet-mode.el
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
+		elog
+		elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+		elog "/etc/puppetlabs/puppet"
+		elog "Also, puppet now uses config directories for modules and manifests."
+		elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+		elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+		elog "for more information."
+		elog
+	fi
+
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
--- a/app-admin/ranpwd/Manifest
+++ b/app-admin/ranpwd/Manifest
@ -1,5 +1,5 @@
 DIST ranpwd-1.2.tar.gz 41018 SHA256 b63cc1a621966a3bfabc83803c32617ef8caf5b7687042ac1b0eee04b8b79507 SHA512 7ae8ff593623a2102e50fbb3356889291408263100a358de14bd44b13c1d2931bf0e1e8ec972a620b8328a179a38a0d614099ffea2473079f9ed2425809a922f WHIRLPOOL d2cba9af972ee81d2758ca90c1860e61b05fd4a6c9dd8284eb7ebacfd3f2ed94e072e57092aaf35797b4ce3b9c88ca45012b9bb2606adad84d5099c71827e7e6
-EBUILD ranpwd-1.2.ebuild 632 SHA256 ef56bb022ada67f7906d3a7c795905e4733e862c4cd77dfc1822254e3e7549e2 SHA512 44caede2cd18ba5b464eba1de9ece711305e43581723f5ea877019e26a4bc7983c582a0bcc0b313894958d32f26be495bcb779739ba27e610729e29aec6b98f1 WHIRLPOOL c7eeecfa87270b1849038968cbb69eb36d277453e428398430fd3edc4fb0bd3588e0ba223b2d388d02b80978514590c2ca8661099058b95867d2e86f5cedb182
+EBUILD ranpwd-1.2.ebuild 594 SHA256 3c90e3ef96cd2118238329d8a13eac17d205e2958a687d7ec6097b4579d94345 SHA512 f17060c870b3c5d1d95649b8a5164547d479dc8add92743dbd24032d833a3caa796bd1b7596cd21f0a4a4214c254557c7de375f13f17e999e0cff2fa3a426d5d WHIRLPOOL 9150df52a851ca2c7404f292c98b8bb53e428f9130ea299d3d7909309abc5419dd65f297e50723f094f61244c859140af5624f03ac10d952c2058efcc20fa052
 MISC ChangeLog 2973 SHA256 7c3eec549641626760548ffde1a18f2d7f8b11251c91c5cac438f42228778b2a SHA512 b55217bcfc1b2b015ab546b795343f4bcac56c2da69f65beb2d0079715a1b7056c99eb9be49459806c4294a9b254d75dbd4709cc05c28194fe7cec1a0c477828 WHIRLPOOL 706492f6774972d1cc853e7facd4ddf48d2f72c52f6c4dd017dd5dfbbf7f0ca747a2ea0c48dc64cd625f0626e081908cdc941e82846d95a14d95393d20e71008
 MISC ChangeLog-2015 2008 SHA256 d9110225b79fb7e01327cbea0dc2937e2e5e63cb40df9cfc0c6a2110f1ec0ad1 SHA512 a9d0f6ed01f966c3f683507c4cf9b7dcf8f3a66b86c002ea5348da9e30328e99eacb42fdf7ca6ec166b2d8ba12aedc7ca31527e747b365e1e300087a42ebb197 WHIRLPOOL 52a9b36c45bf6e593a9946a6eef42f66e1137002417f4829bfd95867d9141b7cff7b55b2e23d44f186d181e9c03c43b2a7a69c1bb26a9328b318760975cd7a79
 MISC metadata.xml 255 SHA256 12d3921d7afbb74ed371a0bf5e78a83511175ec58b540e98dabb8c98f7ca9fbb SHA512 c7d9f06ac1bea18bbcc835796f4e9739a4c8bb39af3439dbf36c231551cab15f882f777445035946f2bce0bb3bfbeee29ee2712091a455e0cbb3aebe93eb0d26 WHIRLPOOL b64b6cf04ccb582812611a7e359c8bd25ed9538d415fe1753abea8fbce38c70bd5cea2fc2bf2ae5c6b8327cbce0d8bce1bdc62fe4a705a14d1292ccaacad3b65
--- a/app-admin/ranpwd/ranpwd-1.2.ebuild
+++ b/app-admin/ranpwd/ranpwd-1.2.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=3
+EAPI=6

-DESCRIPTION="Generate random passwords using the in-kernel cryptographically secure random number generator"
+DESCRIPTION="Generate random passwords using the in-kernel cryptographically"
 HOMEPAGE="https://www.kernel.org/pub/software/utils/admin/ranpwd/"
 SRC_URI="mirror://kernel/software/utils/admin/${PN}/${P}.tar.gz"

@ -25,5 +25,5 @@ src_test() {
 }

 src_install() {
-	emake INSTALLROOT="${D}" install || die
+	emake INSTALLROOT="${D}" install
 }
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@ -1,14 +1,15 @@
 AUX setools-3.3.8-no-check-file.patch 558 SHA256 ce1b798f8e1129d2b893dc7de2d9c3fed5a4785f03c55b14a1c7e2d9fec0b037 SHA512 25051dcbb94ddeed623aba598235cb1caaedbb7071dd997c58575ed3cc8266c4421cf070d8f10d5ec6804167bef969fab7227a0241daf7f92e30e1bff0d89080 WHIRLPOOL 85ac00cfac831f22a112fb8420eeaabf1c4d3653ecfb958e68079adb061f773827711ddcce89dfc77d702d8c9460c626ec7c9852cd37e1e01e4eeaa4bcddca28
 AUX setools-3.3.8-policy-max.patch 1051 SHA256 64f06c91af9be789f4e6b6db9f585d76a09670bcb9a5f56e2dd848a89b647bfb SHA512 9eacd76d450b6e68d85f14c4d38cb9370a7cd435610c209d83063b3ddc7bb45f8bd75b1aa8573991e021d4af4205646465b3c2b19ac89296bb7e43147eb0775b WHIRLPOOL 9892fdf63f5a6e27d35edda4ccd984a131c9d96efe458170b8269e2e20e72e2adad412f315fc388774004e1c6ae4af3946d5c8237bcee5c90a65b3cd4b58f854
 AUX setools-4.0.1-remove-gui.patch 1031 SHA256 7aa70f25d6c6b3e45cd5773b1d5f9d26f69535b909249a92c596642807fa3171 SHA512 982c0cd43bdf9473df5dd9584d199bbf1bc71bfee284a2f4e7e800c877bb62bbb6aca03ae3099e481c0538bf3f12d425ca23e19763b1b58c647e9749925283ef WHIRLPOOL 4263180a8ae0c8876ad6fb532e6520b614857c6731bca38169e7a06339e9c32d24d2c4fb2f6111d5573dc23d8480a7e3c3984f22e347940d37549fdeb9390a24
+AUX setools-4.1.0-remove-gui.patch 881 SHA256 383d543b29cb26cbf584f713431a0aea6c3c40ec0a5678cec6eef4754f8b4447 SHA512 b931b0cb7d33e22465c1be849990f2bef07eebdd48ad72d22e5fb2cfa853f6ad2f19a722423db72a4578676376c7d23be557c9932cfe457087a68960f04d15d0 WHIRLPOOL 0561ff8d29bc2b5439083694b5fcf889cb5e0e4de76a2d2ed626958b1b26b4fa38ca7804c397530df5a444ba31d50fa6ae006d26a4fbc28e4724f55bd276b542
 DIST setools-3.3.8-04-gentoo-patches.tar.bz2 94986 SHA256 9a8a43ac97606fde9b2610ceed65f640638929853f871ce530982bedfd919b64 SHA512 39bf00b6aaf31821c6e2e2fb4c460dd1914fba4bf8385acebedf88f1533da990f1fb925dd49d75827aebef3f394a50a1edea46a07204193b58c65a066a064e6a WHIRLPOOL 4a92e4cf6930584de931c5d0805815aacd1c1af4434ca8e73414eda33588a55ef8d7bdfe4195be642889eee480128cbe12d1c5612e07ea304021b230e0b74816
 DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371
 DIST setools-4.0.1.tar.gz 399888 SHA256 4c2049877f2f68e4485b72bc280fe20127b49a019169a2cf1d8295c908bdcdfe SHA512 d0a36cfddc6a6f47ecaa8402141271558e97467b6c449d18b98bf6fe894189f29a32fb672e3ff573efdb44964bd361283c68c2906d02f8a9c1269b6b71903bc2 WHIRLPOOL 017e709c113b28175787249af8aa1dcc99a5034eadcc76e97a394f9f89afcc1e7fe3eeb8ec105c541a6260d8a2eb4b1aa8155ba2297ecdf6d640ba112857a442
 DIST setools-4.1.0.tar.gz 447189 SHA256 cc251572c50298e2705617c8a0ddb5ae7cfe0bde2480bc0c6a4e44341d3df831 SHA512 047f969a347c5d015885aef0c7a341ae4393c8e0d61a7112b7bd0380d7c6161765f1ac5d875777ac84430bbe4d21bcb8a748f1b8484ae3a4d3f0137e90a07f2b WHIRLPOOL 9b05768d55d4edcafe7f7f90e49fe3170659084a497f1bc74266270e8d242ae4173820058b598fb4452483e57303d11bf6bb4f2482144e9d2803369cf58b857c
 EBUILD setools-3.3.8-r7.ebuild 3643 SHA256 9a448b5d10e6ecab25ca0a98e35fab7b763607b44b264a61daa7c8c8a23f71b3 SHA512 db80005757b5ca83bd5273e0883dc9c51a01243f5d6d7c1005d1a994e9942b43656d1e54e397ad1ef302c85d04fe4a0966ec6c4abcf34a9daf1584119fc51016 WHIRLPOOL 26aea1cc0328890c95e7a893d8cda85c3283516b243a85238136eb514fc98dd048877a59f0f6103a05446e28c7c0920433564b168b810281a8bfa15c56c1cd16
 EBUILD setools-4.0.1.ebuild 1252 SHA256 9afc49db6904082162dd131846084c0263784b2e2648a5ccd2c25da675b1a2ff SHA512 2abad8fc9c188180070a54a5dd6e89ba3cd1c6172153b71c366b39e2e94452dd07393a0f1601b2c35ccbafa0ba80a2e05252cf8d8fde1b03b25d6fdc18b1d3e4 WHIRLPOOL 568872d823b259636f2844649c7bd295c46d56b24659db51d4a148d7cfc75728ddb1aa09a15d71c570b444c9c720dc05ac456164a8d16d11e71fc585a8a69deb
-EBUILD setools-4.1.0.ebuild 1251 SHA256 616a4bcd86039d73d42a94c8456b3197d566a0355c0aa91094688ef33b4c8034 SHA512 fdd3efd6bf06feb63f99d6bc57be332215dbcec27e14a5ef581c0745b9aff88a219cc66ee02c4ed495c84a1da2deea6bd685427e44f55987a7355ca84172d3c9 WHIRLPOOL 45c4e4fd23cec939749612d8ecb1b18c20e648daeea563fb7e3bbfab5f1f758fc016df5c0f98250f137b9f2abd6e6fe4ed9521bc2bc0694aa3afefe5c2fdab9e
-EBUILD setools-9999.ebuild 1251 SHA256 616a4bcd86039d73d42a94c8456b3197d566a0355c0aa91094688ef33b4c8034 SHA512 fdd3efd6bf06feb63f99d6bc57be332215dbcec27e14a5ef581c0745b9aff88a219cc66ee02c4ed495c84a1da2deea6bd685427e44f55987a7355ca84172d3c9 WHIRLPOOL 45c4e4fd23cec939749612d8ecb1b18c20e648daeea563fb7e3bbfab5f1f758fc016df5c0f98250f137b9f2abd6e6fe4ed9521bc2bc0694aa3afefe5c2fdab9e
+EBUILD setools-4.1.0.ebuild 1233 SHA256 a789d3c56aeba0ba6383f332aa1bdef244db9a44ed884896c6f42615a1d62f00 SHA512 98ee4a6d222d69752ac0bc50c2e86d76347ff90fe40ba6d09a5e06aa430ca3be4b542e4543176e35804ac8d9f4c223c487eb8e43b31411624d79da4bbdc6c822 WHIRLPOOL c3ffc1a48c2319cbe2e9ac47c621988d5c3322584af9933a72b86a461be1c8152bdb0e7f2b136b7f38826590827716095aa950922a91281f33a018f70df996e6
+EBUILD setools-9999.ebuild 1233 SHA256 a789d3c56aeba0ba6383f332aa1bdef244db9a44ed884896c6f42615a1d62f00 SHA512 98ee4a6d222d69752ac0bc50c2e86d76347ff90fe40ba6d09a5e06aa430ca3be4b542e4543176e35804ac8d9f4c223c487eb8e43b31411624d79da4bbdc6c822 WHIRLPOOL c3ffc1a48c2319cbe2e9ac47c621988d5c3322584af9933a72b86a461be1c8152bdb0e7f2b136b7f38826590827716095aa950922a91281f33a018f70df996e6
 MISC ChangeLog 5140 SHA256 8e79850635caf36462120694daa381d14b742f63a8a3cbd0ff2cc2ee132ce204 SHA512 05e8c3a148150d3f849955ecbf6ba2afe26250c0589ace0cf9747a33ff27f191af0ad5dbd83a5e1bc5aa230c9c639e8c2319ae797dd939ba5b7ac1d42cb68854 WHIRLPOOL f9ff886df693422539a6cd39265d506e3577bcaa55e9d8ef306f79d3943a9e8ec422c19ef0021dacde802a8ee8740ac9793487cd139bc1f3242f3ece8bffd7a0
 MISC ChangeLog-2015 14070 SHA256 bec7f864d78e8ce6fe5154849b5812b59997d667d135bbea4303712caba86ec1 SHA512 427cb0ec019f621f26153c1ba61da38b40d8c3de05f7a70a6361b5eab6f66a96fd9f17f01a7a2662040b7914ffb0dcf4e57272a472f81de01dda76785800202f WHIRLPOOL 9408d6ebc29caa71b2795377d710007628657cf48f895f9787d7d544eb32b8badddfd1c3014f4250729c314cd4525aada13a262689a18ed77edeadfaffb0ef99
 MISC metadata.xml 403 SHA256 dd38714f015f8ddee0a34b8d9711e68f388d63f6057e8a9b13b9152b1185297c SHA512 be645abfaf1149e2f2a9b7f0613b61f015df81a16bc6dde593513aa2ba7b4a9a8fba65520b53a2511ba65c022258f48bcd2aed3f85c273a35c94359e358a8fa6 WHIRLPOOL ed51a619b4afb53017e26d3b273463e641beb0aed9f6fcce5c6c7137e4b1b2016262cce0f0ecfa9f4072f7037f25ad50ad036dc040cb359c4fad8a50f05c75ec
--- a/app-admin/setools/files/setools-4.1.0-remove-gui.patch
+++ b/app-admin/setools/files/setools-4.1.0-remove-gui.patch
@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 4e7645c..aa3895a 100644
+--- a/setup.py
+++ b/setup.py
+@@ -180,10 +180,10 @@ setup(name='setools',
+                 'build_lex': LexCommand,
+                 'build_ext': BuildExtCommand,
+                 'build_qhc': QtHelpCommand},
+-      packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'],
+-      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+      packages=['setools', 'setools.diff', 'setools.policyrep'],
+      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+       data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
+-      package_data={'': ['*.ui', '*.qhc'], 'setools': ['perm_map']},
+      package_data={'setools': ['perm_map']},
+       ext_modules=ext_py_mods,
+       test_suite='tests',
+       license='GPLv2+, LGPLv2.1+',
--- a/app-admin/setools/setools-4.1.0.ebuild
+++ b/app-admin/setools/setools-4.1.0.ebuild
@ -25,7 +25,6 @@ IUSE="X debug test"
 RDEPEND="${PYTHON_DEPS}
 	>=sys-libs/libselinux-2.4:=[${PYTHON_USEDEP}]
 	>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
-	app-arch/bzip2:=
 	dev-libs/libpcre:=
 	X? (
 		dev-python/PyQt5[gui,widgets]
@ -44,7 +43,7 @@ DEPEND="${RDEPEND}
 python_prepare_all() {
 	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"

-	use X || local PATCHES=( "${FILESDIR}"/setools-4.0.1-remove-gui.patch )
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.1.0-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }

--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@ -25,7 +25,6 @@ IUSE="X debug test"
 RDEPEND="${PYTHON_DEPS}
 	>=sys-libs/libselinux-2.4:=[${PYTHON_USEDEP}]
 	>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
-	app-arch/bzip2:=
 	dev-libs/libpcre:=
 	X? (
 		dev-python/PyQt5[gui,widgets]
@ -44,7 +43,7 @@ DEPEND="${RDEPEND}
 python_prepare_all() {
 	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"

-	use X || local PATCHES=( "${FILESDIR}"/setools-4.0.1-remove-gui.patch )
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.1.0-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }

--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@ -11,7 +11,7 @@ DIST dpkg_1.18.18.tar.xz 4501988 SHA256 c88b61e3d4660500753142689e8ddbeff1c731f2
 EBUILD dpkg-1.17.26.ebuild 2373 SHA256 5a28220c9e52d31e9c93505797e480a7718ed16ab16b72c81cdc8310dfaf4ef3 SHA512 723b97230e7e2e2a700dac388101b9ebd096c462b3ee0622cb5c0274fc4bf3de826ca345490d3293297b9c2f83be0503f0e8e50f0c3f50f731cab78ca43a0d8e WHIRLPOOL aa63b2a795d9862066d9c6652b8f72ac80620326b1b6e1c332640ae78a3045e001dd5b45179f4887bada47fe6891810889f1770832c6ecb096ec8e4a6c9e6aa8
 EBUILD dpkg-1.17.27.ebuild 2382 SHA256 36fc4e8194bde9cc9c6af44d8d01225978e14af188f78ea1208673b88dc133e5 SHA512 4852ee94b4b43e95281be9fc8c3955e18e9944494fad6483fb0b1c071cd3f0dc49189cc3075ad379b93bdd192f74d2132eab7f0f320a1ddf945732625d2133cf WHIRLPOOL 3eb7d40ff558f982f984056b74b53bd059bdc5c85e8ca7c37ce5d317bf09f944e4274e07d5e20818c2a7cb8ecea74feda285a39b1a214ed987a0efd9091afd26
 EBUILD dpkg-1.18.15.ebuild 1860 SHA256 8a3b91fd07c89d46ef86625d74587f4aa43f8497a282b9062c9714cfbf0f0224 SHA512 81af76ad5c9b389a4c7fd149adb381b91d4d8f6b975f4d3364c1d402c663fa5292fdb0165297a97d97ead4c9d601056ecad3198fd712b552e81d7f47785e07da WHIRLPOOL 02815b789896c455bce54ac2fc6de235aea7fa58db221b2a11ca657a7786e755d2f64023ba069834ea538cb29a8a29a72c06c048d95be961c046a6b65d1e0dc5
-EBUILD dpkg-1.18.18.ebuild 1860 SHA256 8a3b91fd07c89d46ef86625d74587f4aa43f8497a282b9062c9714cfbf0f0224 SHA512 81af76ad5c9b389a4c7fd149adb381b91d4d8f6b975f4d3364c1d402c663fa5292fdb0165297a97d97ead4c9d601056ecad3198fd712b552e81d7f47785e07da WHIRLPOOL 02815b789896c455bce54ac2fc6de235aea7fa58db221b2a11ca657a7786e755d2f64023ba069834ea538cb29a8a29a72c06c048d95be961c046a6b65d1e0dc5
+EBUILD dpkg-1.18.18.ebuild 1859 SHA256 b3a6c7a1113dd22b0aa606fd8b3e3378a725a1003d6a6e762b320a3ab15bcc50 SHA512 5ee4b540e9a2f3cbf9b44ae067cb1ddeefaf567f4896c2676f6a5cb9eff5d62f76b79d7e61db283a424cd2b52ce997d6119d1a120680bcc3ecfd036282377bc8 WHIRLPOOL 7e547375b82f8616d76d2be68adb55c99cf147ee1af526f4970c415356a03000760340832d82db1ad39f16665fca02ea1f1e9cecff6fed95ec98ad213b3158d3
 MISC ChangeLog 7721 SHA256 1e1c36cfd01473e82c9cc67664f45558e45b8c319f517890e9436b63d9c39d92 SHA512 2683ce4a540924cef2c096b3793bc0f453494aff39d52ab4a080d43a994e1215e546bc761be915af1fe9331c468f192e65a75d728fea298ac8fa7db83b28119e WHIRLPOOL dd7cf86b9ef389d004008c114af04e7095da91a6e4ab666f031f3b030b599ec606570b32891b6a4600ba4fd3718aa2d9e45e46fc03390a6bc297a91d9184eb59
 MISC ChangeLog-2015 41705 SHA256 f7f0188c3df33ab1fc331c9ca695b1eecd4ec0cf3b9e5b3ed08df7b754ff80ce SHA512 8e1c6d6fec58f5fda0a2b052ab7854b6251032d68e2f594c638d6d7978b248ae387ac1d178bb9e4d9dd2587386c2ecdadac03d0df81b9847dab03f23ec29d1ca WHIRLPOOL ad4693ad3c953fcb20ace7db867b1bd293a51a12ee37a0beab170b93be9503b780b023fd17568e9579cc4ca72bc030f19e044fb8ea09989880cb087e7f0937b3
 MISC metadata.xml 339 SHA256 7e03a6012cee00c3a0b649654cec8a24311ed416b5061f351a2a0af841b43292 SHA512 c3fbabc925c3e99f26c6441cdea9626dc93520f2a8d3c5e45bfa7e51d42095295624f0f82377240f0c11580a9eccc5b5b15bf149ce6cfa36960e52f8c77aa61b WHIRLPOOL aab452f864ee87d0b3477c03b4299b89d61fb0c1d23ba061993f729d9f44b0742611fae0c3d9b0cfe88ed4f4dd0d4d7a8e74b5cf84e71acdfab1c0b696204358
--- a/app-arch/dpkg/dpkg-1.18.18.ebuild
+++ b/app-arch/dpkg/dpkg-1.18.18.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"

 RDEPEND="
--- a/app-crypt/acr38u/Manifest
+++ b/app-crypt/acr38u/Manifest
@ -1,7 +1,7 @@
 AUX 1.7.11-bis.rules 590 SHA256 afb057dd48cbb46a24e358edfe5a8e100fb25642194ef2e8df688c72d15f7add SHA512 9e2d806a13a978f1a27a9b3bb6bf4f63809bc3cd03057b513f48bee0d2f2589f75484ff4e0e18dcf8b1b37b9af2465014fc3bcf87b48dd330a375fee3baef52f WHIRLPOOL 7fb9d3406fde2a37941ad8d32ec9dbc45e2e5b2c1d2cfc08543d1542ecb4c6d0c0ae781d14da370e7fa3cd052fe23f135190558ad7b1239990849012acc041c9
 AUX acr38u-1.7.11-build.patch 6299 SHA256 a9758edfbe70fd4e55a004032d487a1ba5377f8f967bb35818eee9f34dd0de06 SHA512 9979ca060a4dc4da526e0a0fbbe45a09e5e261cfde4f928f0dbc514af7d799796a2edf2f81d4015f512d9a374aeab57e971ce34f62cd7b0ac024ec2662c4a029 WHIRLPOOL 50b57c87e75642b5f8b457b6cd844f10cb21dfc4bc49a9d0d88a9c53ec5ef7bf8016827236c2b0e7c3d06dc00ad99792d7ce980dcd7e3c1841d250fd24c03a79
 DIST ACR38_LINUX_100711_P.tar.bz2 274137 SHA256 7d7e4fa97def2415f4b5c9e90cfedc2f7acbe94ca8b1653a5d8a85e24fc0ab53 SHA512 c5d0e71ae383de515718d24110b825efa84cf1a150ec7249f80070446331fb4df4d157f5f4e96d45588346e51ab8e2012530edae92575b66891c7ee596d8d3f7 WHIRLPOOL d63f7d1a8ff51ff131e0e0bcf943bbb5c38773b707019e695377fc42b5a91029ac22736dae95f10342a8d44370f90f766c9bdbf23f5c445c8f41c051303f87c3
-EBUILD acr38u-1.7.11-r3.ebuild 1418 SHA256 878a8aa13636b33de6c4addec5055e885cb7c883ee5a0837bbd119a3e793a956 SHA512 79233a13c3d7b42e8a4521c5b6d571a958529224698bdeb7da2d35e3e86db9cd976a7bbcb3901f42566b9a76c30fb8ee349dbae2562e06f39020ef503b6d7bbc WHIRLPOOL f4f67ccc54d26d7d0dde0eb859c1b204b4b65130ac96932594d58ff24157169c667e4b491f8ba73fc2410626072f190eca50a48aa24d7ef1c0961f214258c219
+EBUILD acr38u-1.7.11-r3.ebuild 1424 SHA256 c49cef9724eb4b084d8bb71b502522e60bc99508a775c5f024d2845ef9bf006f SHA512 d15616159c228f180874c0536ae56015ad24388f0208b83e502da654b730e69b2672b4edfe8ccca35da2837de604b5bb8bad57fa7014ce94ebc88e2f20c4a2f1 WHIRLPOOL 3ee39954097f0db3cc8fdefb3634eded0925f5bb203911e29f68b1dd8b826040a4ce2200d403a74b39e38d7fb97deb2463a7df2b882a097c4af1493d09ff126d
 MISC ChangeLog 3022 SHA256 1cdc67eac5074d718626feb926d7a4e8ff483b202564419378c6610d11ea370d SHA512 8f89cccf4e31c2a0686541afabb14ca011b228af0a43a75fc18f14fe0260db89efde5f84a5c07c34660dafb07679907e0d0d6ad087b574b0a05c9f8620a120d5 WHIRLPOOL e0a612f85a8b80026d1a5684178c5b6f32f8e84337efb81c043e1de2ac7f113750fbd90e95315db94b62b70c4a3f8e2717e856d47300ef3b19401c735374e671
 MISC ChangeLog-2015 2215 SHA256 50bc9a24a0c2c3dc75a5f008eaebcba3fae184416a36f2f18d670bd21fa3fd4b SHA512 12a19bdf09960d54b05e724438ea4ce1dc255ba0f672b986456237ec605fc733f9286ad1c2652aaddba1a4caf3a490f636edab7e142bdb4fa67c051d626996d8 WHIRLPOOL 5cea56b2762e9521c0d1460fd1641ac2deaa4331bdfe7c4228a60b85f29ab1b2ad1667046a9cc63762809d8e6a0f88a1f9c85afa0de51e12d374cbf8854cb1a0
 MISC metadata.xml 526 SHA256 e95fb95c60fd1d728d03f4d81b4d58a9915282296407c09672227276ac0d4182 SHA512 8228c380a3dd574785b66d451cd008318f37f73c56da35c1c516c1fee96c68221a36aee6e0079df0b1babe24c4e41bdaef3cebb8e635a50b72a754685098b614 WHIRLPOOL 9e5690c9130fe775f25cf3761ca93c8d677320f17003932cb486b032c14ede205f699778ca5cb63f77d4ed589e5b1a492a0e2e9763e88fabd6a9d1d58089f3dd
--- a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
+++ b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

-inherit multilib eutils versionator toolchain-funcs udev autotools-utils
+inherit autotools versionator toolchain-funcs udev

 MY_P=ACR38_LINUX_$(get_version_component_range 1)00$(get_version_component_range 2)$(get_version_component_range 3)_P

@ -33,11 +33,18 @@ S=${WORKDIR}/${MY_P}

 IUSE=""

-AUTOTOOLS_AUTORECONF=yes
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}

 src_install() {
-	autotools-utils_src_install
+	default
+	prune_libtool_files --modules

 	# note: for eudev support this pkg may always need to install rules to /usr
 	udev_newrules "${FILESDIR}"/${PV}-bis.rules 92-pcscd-acr38u.rules
--- a/app-crypt/asedriveiiie-usb/Manifest
+++ b/app-crypt/asedriveiiie-usb/Manifest
@ -1,5 +1,5 @@
 DIST asedriveiiie-usb-3.5.tar.bz2 32595 SHA256 3cbdb3491422678fba970a2364c9aba71fa463e6f2fc2321c0618cdd311cc3a2 SHA512 aa718a1f4b28c9186e120bb8e2216389a8a9f54ac3f299a9cd72c398594fcf23229ac4a14e5358cc02e6fcd2ce3abe0e1e4125e4dac8d302bdc325a3f410744f WHIRLPOOL adc59ccffecd9c82caa02496164c1d93b0354e0beb950a6111de482ad5a63ca801173f83d60045e79ffa200353863af748fe39b4507a0e7f701173ba5d3ab2a5
-EBUILD asedriveiiie-usb-3.5.ebuild 578 SHA256 90e22ce78452ed9fc1533fb0d3bcf0705d39db4bdfaf80aac24bd00215f5ebdd SHA512 1be48085e87fc4b61ef6056da1dd325d9af3c5f6dcb9554d40ad4666c0ed5dd0bf3b67bbcb5914f744213bc612f2b196dd16489b9a4d26d13028ff81c1be929e WHIRLPOOL 38f58e44e3dd3b6a54eae6dec858aad50078ddc9212b20b251331d0255c0e2ca06328d746871d5317b0ab31e6570d26045e01e9a49df1d282cc8b892a27077b8
+EBUILD asedriveiiie-usb-3.5.ebuild 480 SHA256 62dcd4c4d4859c1c83ebadf8edd2c58d0e6ba03a63db2329e4ad3827d9b2d245 SHA512 eecd6b33e51713c624a7a61ef0ffdea799dcf3520b5697c4617ff422e60643da9ff1180db4d1863e6953e594de97c76541bf90b6630e5f6565976a9dd9f8333f WHIRLPOOL aa71c5dd478cb4378899c2772811fae96d8db87227b0287764504f1f6696b8b2968eab1c2aa7634abbcaa18a9265794170529314ab3a842a52bc3757ce56f0fc
 MISC ChangeLog 2451 SHA256 cf37bf100d8e925b969f943a19c794faf50678e7a950d937f4d85c0d4711f2c0 SHA512 4275300fb9782ef1a1b6a40984eb1d10625186fcfc1718840cf3c052d8a74ac30e8a08380b4df44f0c3e2026a5121720f8cabe0028d68c92a9b2f44b5752211e WHIRLPOOL 9987432565823be49bea8c26fced1b000e02f79041e55fc569e3e2b0c19032ea1c9943fd6472f44ec64f62eeec449e3bbe8473d14155b29d8278d0aef0bd368e
 MISC ChangeLog-2015 1541 SHA256 b15eeabe4718e738a127134db2e3d95c2932965b399ae6ef65fbea95cfa78964 SHA512 3f668b56431705d2913302ce25858b98993904adb3948f7a85191980f1134c8f424227af5661647743a47bc4f6b61609d6519b30e7a845b656757ab62c5628fa WHIRLPOOL 8f180983f8bb510861b424fc91ff1be1a87a91dd5ae40a09ed0b684e96be54ae0fa8834737100b0f860d093c0d923d9478c0d3643c21bad4b70fa45d018b1dbd
 MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
--- a/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild
+++ b/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild
@ -1,7 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

+EAPI=6
+
 DESCRIPTION="ASEDriveIIIe USB Card Reader"
 HOMEPAGE="http://www.athena-scs.com"
 SRC_URI="http://www.athena-scs.com/downloads/${P}.tar.bz2"
@ -10,16 +12,10 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~x86"
 RDEPEND=">=sys-apps/pcsc-lite-1.3.0
-	=virtual/libusb-0*"
+	virtual/libusb:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog README
-}
-
 pkg_postinst() {
 	elog "NOTICE:"
 	elog "You should restart pcscd."
--- a/app-crypt/asekey/Manifest
+++ b/app-crypt/asekey/Manifest
@ -1,6 +1,6 @@
 AUX asekey-3.7-bundle.patch 727 SHA256 de817123161ee36634462d1a394d5a5ea7d96fdb7c544c34717f186e9a3ff686 SHA512 4cc556687f59371d0f1919f8649b705801da4427cdc011a40b9627601e90cd27f3a06684a721cb25f1c51b10ec28f6ae728e33fbc30217716250d42c6c15efe2 WHIRLPOOL 5b1af5c948b4972df06193b6972eb42103dc265ef3b3157fd451ae8923b7f5b5264f9ff2dc0e3821aabad8e0baf88471ec41eaeb85bb40c448c5bb5c2691d137
 DIST asekey-3.7.tar.bz2 33304 SHA256 5561c54d0629489fcf689ebacc4f8bc3b6305b02ef5675a5d9669dc6669fd6e7 SHA512 29a01f8250d5fb26a4ba2aca562211cadf403c9e986f9fa6930faf477c374e13095c025b2917e6e837cbe8d83f3a3e023a527598b151ef1c704247c7e7c40647 WHIRLPOOL 3e38ef00b20abca33a980b0ffe05db9469945a574b3e71f9c4dbbea87a41857b9a0a69db748698ed368dcb5e34989c6b917b3c39c2e55f4a26e9923cafbc5149
-EBUILD asekey-3.7.ebuild 746 SHA256 88991285f143aa290c59c62c49336bf0e2c0520ca7e98ff7f2a39bca536628f2 SHA512 9b235a32987e26d1bead2b48d95830fa1daec6e99be4cd2a031d6d4d16c0a4f28662676160a2957123bdaace9c3a55c996294fc94eb39033dc87f21f543d0aad WHIRLPOOL b61648f414970ca0fd0bff07211cb79a3a4385fd76521ff45715dda1cd0b40415d1792a22f5b3574d44235d2e354a118a77c126e5b0decb9c8d78a2d50fe82af
+EBUILD asekey-3.7.ebuild 702 SHA256 0d7f79fbe5f849e249d63c2ca61885c8cc0248be48681060cba7995fd7132c8a SHA512 b26246883099a3e53c99584947b26633e245fe4dbbd46a17aa65ed56254e15c5a329620ecc095e83af02ee508e86eed797a6254e0d5ca900b836a610faa6bc80 WHIRLPOOL e3916894c620ed7fc5e619676e478c7129b5f81662e6625d614a15d1cfe29c77df5ee746bfd97d178ee19c7854544dce9ba11d223bd97ac33106512a5544abe3
 MISC ChangeLog 2453 SHA256 49655cb98a069309a022e1adb19812c31719b07f2ce1cfb688811829138c7f78 SHA512 06a629e801a5967d859de97575d119fc4085487a2080af326e7c994dc2f9a0fee76848bd860ddff497300351838194753b9e8fbaac55f1dd2fbf8b60123dea42 WHIRLPOOL 8de90b89aa6e9df90e83ffac04b16a1970cee7b60e37b505a0b3a84ce5c6b58c5ac867516bf7e6c8a1b8c65da264147f147933188843acb2b3d9981f146bec72
 MISC ChangeLog-2015 2036 SHA256 79838d046dccfdff815ed16669719caca747409c007e7429bedcbd9626f3a89f SHA512 70a706ce3aa13f9523e9d0efdc8ddc21a471ea0c1e9b816cd09b417e6471fdbe258ecd23894f2e7e98ef3481e6e9ff39922e2a834775f510088f0f3c38f76d06 WHIRLPOOL 1b69e999cf03670ad8dbd0c447f4eaddbd7a19e917cdd15e387fca2794f35ca9594ee26481ac0a3cfec7cebe124138c5cf7106966085c1783d54bd0e746ea9ec
 MISC metadata.xml 240 SHA256 d1d2aa7abc46b180b2494a0cbb393768f12073097a3ddf9d118cb9e2cead8317 SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d WHIRLPOOL aad153df696809789d129412e71fd5eca91f7b230c22a10c70baa6f79e3ab57cf8890540fead3d9587f76b4396a7089921b207165fe0505917ad76b5cf86af90
--- a/app-crypt/asekey/asekey-3.7.ebuild
+++ b/app-crypt/asekey/asekey-3.7.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="4"
+EAPI="6"

-inherit eutils udev
+inherit udev

 DESCRIPTION="ASEKey USB SIM Card Reader"
 HOMEPAGE="http://www.athena-scs.com/"
@ -21,16 +21,15 @@ RDEPEND="${RDEPEND}
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

+PATCHES=(
+	"${FILESDIR}/${P}-bundle.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-bundle.patch"
+	default
 	sed -i -e 's/GROUP="pcscd"/ENV{PCSCD}="1"/' "92_pcscd_${PN}.rules" || die
 }

 src_configure() {
 	econf --with-udev-rules-dir="$(get_udevdir)/rules.d"
 }
-
-src_install() {
-	default
-	dodoc ChangeLog README
-}
--- a/app-crypt/bcwipe/Manifest
+++ b/app-crypt/bcwipe/Manifest
@ -1,9 +1,9 @@
-AUX bcwipe-1.9.7-fix_warnings.patch 407 SHA256 3a44e812c600dd452133e7b82f72e94560ecb3d09f831c567f315601f02184ac SHA512 b7143ae5f2d8745301c66f9c2b1a7ca67fa72bbfa295d79b42b81a234f97518dc1ab7e2106350a5803d3ffb9ce804eb257809156f07747845cc6c2118dffe574 WHIRLPOOL 80065feabc5431b6e0123611153c922dd7f0c27e708e989ba6b6873e06278cd11f814ab25c2e10776e7d909341a30950ff6ef90629b49597511be5495ac2c9a5
-AUX bcwipe-1.9.8-fix-flags.patch 599 SHA256 a674175e9908b04c9a9e317da89ad3bb74aaf86bd83c7972052feccaea529587 SHA512 8efd7ee529ab81f5b81bd6c2e64012ad7e412af4a2a63646b5a7cf72f352fac5306da18bfaa16cfe723063f8a08d10a653110a513b86829a975c46fffb1f75da WHIRLPOOL 82159d2b7b21a724d152b6579fb5277aa07b2984572f2e64c99013efd68b7a3a50648fccc33533ab420f682d19fc0729d98c2db7785c8125df5add8590a214ae
+AUX bcwipe-1.9.7-fix_warnings.patch 415 SHA256 0f42b0c1e01d4a37a7b4078cfab78b33ef28fad9f619238d7cbe78df459f6e00 SHA512 504487c91ba3ed47f5d32ff5c4084bfcc10999d5ab42018d233ca160f55631daf466015e8aa81f644b834c00529a984ec026a05f28d7401162bc786a8bdcd5ad WHIRLPOOL 3346580d255a1e74b569045d043a17544d6b865d845798ea9d04b37a81e043dfc96f36d8045b84a873f7f77720de4065d59c6e37f3ddbbc9aca0900c8261e049
+AUX bcwipe-1.9.8-fix-flags.patch 603 SHA256 3caec904719fc43db10450c72c213cff920a82eb716aba15a1db2bf04752d8eb SHA512 9141f81dd722bfe59466bab3d547869aca9178d27912edc61f9ab95044d0e57151870400a1550fe59e0f3c252878b6971486d0b38e2fb24da3241b0dca00ca87 WHIRLPOOL 6fd609f8ec20764c00b8182dc18d32b67660bd2f18c66a508cff1a1cd9ec46903a84181a4526924c8015ba1af602baf1b3bb078bbb21b2123a4623b9f1631168
 DIST BCWipe-1.9-13.tar.gz 141092 SHA256 c5e95d003f291d7c9c7c0a6ac76d03ae8fc48225292507581f949f81074126c4 SHA512 801b6d3c55d82915da14b3136c9ddba7fc947b40c07ba135c410e1e2703f74735d32ebb043d44325f615005631930ce48b4075885f1a928cf8f4a2d4c67ca5cc WHIRLPOOL 631f7af570898c61ad7559c427b8d4677ab62a85189d72539b1f9cf89cdee0fc8fe61a7524299f691c3358b38b0502d1ee1ccd5c035e0479adfb7dde1d6c5047
 DIST BCWipe-1.9-8.tar.gz 131414 SHA256 6f5261716da15e3df07569ca2516334f7d132f0069420082fc71faf2aaf04fc0 SHA512 fe0b72b5279f8dc85c7ac2bee9c3b4ba13df542750faa25556b4a9a03eff323a5822e9e736440e4677c6aa6011a9ecf02acb51b7e934b30f4354826e798d7aa2 WHIRLPOOL 28fbf43435433a4858813329d474dd67e61af615616f9a3283e4b98b7bf9bdebd7ce84c1c787d4ba08a9f7f8ae53293c331cd2bcef3321c0de4ea932a570d618
 DIST BCWipe.doc.tgz 21218 SHA256 afa50bf8653bb6bee108f0ae8b3dc35d289dde3d5c513b7e9ae7fe373635df4f SHA512 5aa402669ded46b6dc680293f18aea4ab20a7d6b7d9d7bf8e63003e557b953e8f8019431ea69d96d2236121e754bc456b3700a0895f4fff0573d2e9bac2e2ee3 WHIRLPOOL 2f6475d9395d2424cbabb046085ce0a016ecad4e76f195e51fb385e57f68f13313587b52c2776ad29798b682eaa8503bae4186029b698a2405f08187180a904f
-EBUILD bcwipe-1.9.13.ebuild 1089 SHA256 f9a58233cce98bff26d182a2649c4d7a4742ee1fadc1d04c3e3401c818bea87e SHA512 a5c5a60088b5b7f3c3b24fb22023466887f7774c032f3651a01f6800fddaf4822e9f16cedce5ca7fd4614860cf6f1edc889a0a107aa2080f95268e979b557110 WHIRLPOOL d6cf9acfb3c632a7e5d46e5f308bf6ec39cd3d42f8cb7030ab5dc025bc6f1c6534f59e7a9dfe2bfba0c414ae0c6455948d87253c21e8fb86566a4af9bfd4b76f
+EBUILD bcwipe-1.9.13.ebuild 1053 SHA256 aad2a45adadd5881d3e085c0d4fa3eca358cd8b62b7c82d4d5cb80bd36a152ec SHA512 52dbd3ff393bb36cb314570b19e04584ac45b4ded0ad43d39f886d42aa5edcb0fd125381086b16cb0141310429b13e6a9267fd4cd1b04e34781ac5a5daf88162 WHIRLPOOL 6c1aed526b2b97f8cef7bfed00c0d3b203b7460b0c1f4bb26b0f52c0f4602b04ce223e4a237072c255708e5ac767b7f9b6d0233c32c65866483786582a133fbc
 EBUILD bcwipe-1.9.8.ebuild 1152 SHA256 e08b9b57f4658b7de886dd9df5c5519b22f8a908d2afd0afac424c18310d6524 SHA512 501a9061cc100dfb8501a3174dfc55d482a12987ff5c8236ab8fd4ac3457e7ec6c10615e1830ba82bb7c2d0f7c1d226c7bf6aa473537e05bd844f082cde9de24 WHIRLPOOL bcb413fcadeac76c0de912f9f3d39d6b3f041af0c5180025e633fba37f0005da59bfa1c800164cff1411f02872599b6a8fb247c9f288cee7dc6e41215b3b06b5
 MISC ChangeLog 2827 SHA256 a91b623974e29a104d970da1c4312679f4d0b198c967f51594f07da1364cfe4d SHA512 0197216e31e0c3d1fcda9198abb2ef5b4772f08c80e65368b03343e3f6a5b494321079f41b7aa70458098422b0c9981433fd3b655aed1f0dbda06e04160ead82 WHIRLPOOL d38ebbbc4c78115f822faa48d4dc0538c63f3116e3caa3161c20689aaed996739d1481b879fc896fbb1e1fbca392140fbebf767df2462037b945ada1ee6ef318
 MISC ChangeLog-2015 6804 SHA256 05e088f1ed46041990e42e8b871aed9d91e3487664698f19bae7a358b2b29bea SHA512 8e18c697ec7ed3f14c7777335846325c2fa8db4b31dad3d148347a2ce1c9061415c3f26560929b55952f1dd0ae029df5b9094d3992c1e09ac337ee54b3a33c02 WHIRLPOOL 4c411e63b4df34394ebddda93069e81988e83baf1e73c0efec655ec4644b2d8c20c1873296f30abf20e885f77cd9f5a99ea6785d4b954b40834f33ae67c805e1
--- a/app-crypt/bcwipe/bcwipe-1.9.13.ebuild
+++ b/app-crypt/bcwipe/bcwipe-1.9.13.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="5"
+EAPI="6"

 inherit eutils versionator

@ -21,12 +21,12 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86"
 DEPEND=""
 RDEPEND=""

-S="${WORKDIR}/${PN}-${MY_PV}"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.7-fix_warnings.patch"
+	"${FILESDIR}/${PN}-1.9.8-fix-flags.patch"
+)

-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9.7-fix_warnings.patch \
-			"${FILESDIR}"/${PN}-1.9.8-fix-flags.patch
-}
+S="${WORKDIR}/${PN}-${MY_PV}"

 src_test() {
 	echo "abc123" >> testfile
@ -37,13 +37,11 @@ src_test() {
 src_install() {
 	default

-	if use doc ; then
-		dohtml -r ../bcwipe-help
-	fi
+	use doc && dodoc -r ../bcwipe-help
 }

 pkg_postinst() {
 	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
 	ewarn "http://www.jetico.com/"
-	ewarn "full details /usr/share/doc/${PF}/html/bcwipe-help/wu_licen.htm"
+	ewarn "full details /usr/share/doc/${PF}/bcwipe-help/wu_licen.htm"
 }
--- a/app-crypt/bcwipe/files/bcwipe-1.9.7-fix_warnings.patch
+++ b/app-crypt/bcwipe/files/bcwipe-1.9.7-fix_warnings.patch
@ -1,5 +1,5 @@
--- schemes.c
-+++ schemes.c
+--- a/schemes.c
+++ b/schemes.c
@@ -15,6 +15,7 @@
  *
  *******************************************************************/
@ -8,8 +8,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
--- wipe.c
-+++ wipe.c
+--- a/wipe.c
+++ b/wipe.c
@@ -42,6 +42,7 @@
 #include <sys/ioctl.h>
 #include <signal.h>
--- a/app-crypt/bcwipe/files/bcwipe-1.9.8-fix-flags.patch
+++ b/app-crypt/bcwipe/files/bcwipe-1.9.8-fix-flags.patch
@ -1,5 +1,5 @@
--- Makefile.in	2011-02-23 01:07:29.841894634 +0100
-+++ Makefile.in	2011-02-23 01:07:46.626793943 +0100
+--- a/Makefile.in	2011-02-23 01:07:29.841894634 +0100
+++ b/Makefile.in	2011-02-23 01:07:46.626793943 +0100
@@ -174,7 +174,7 @@
 bcwipe_SOURCES = wipe.c wipe.h options.c options.h schemes.c schemes.h sha1.c sha1.h sha1random.c sha1random.h log.c log.h standard.h rand.h rand.c prng.c
 man_MANS = bcwipe.1
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@ -1,7 +1,7 @@
 AUX bcrypt3 3197 SHA256 0e376838176e367d9932c630b5e2e3c46e79831080de89c95b1e8e44ecd26929 SHA512 370c28c7289d86a0fbf639c85cb755fef10780f86daa4c5ce6071f32d7e36dea8e21f496e09e145c8c091042a70f3666df068611258a16a05d217d5ed355290b WHIRLPOOL 63a87ea4b7014f71c9820dbcd753820c18647aeeee4506f87340e927472857cf78d5c413771ef42ba4b3f64c02b4a53f7fc08035ac9e2d97a8708faa06657510
 AUX bestcrypt-2.0.6-build.patch 10878 SHA256 8d9bced77a0be44d627900a23d72043bd99365f2e5f2488c9d5e7259f66653b9 SHA512 34e150087fadfcdba5c05c0a4e1d2bfadbc448fe3214663c86ef3a692ec924da011ba11da3fb8f26692c2a52a6ce8c5edd8f20549de42c8dedf965cf3b74d530 WHIRLPOOL dd4968ec04f10bb0c5ce45d1ccd4f77a8c1b6841e0e4682250c2569c956b8b587bd8977b00902945f67fa8ce1a35594fe0b31b8bb35e6d90f555f56bbaf1f586
 DIST BestCrypt-2.0.11.tar.gz 2191182 SHA256 f6aef665eb8ff5eb1ef0f15ce496d7ac62d13e7dbc3031d5d4555a0a5de22ad0 SHA512 f6848153fc68690c116796bd5feb80dc1776f344327de5ac485dddc5b60280b491e2e5c9f266d6f30b7095396cd06b5bdad5d322b4ac24ab612ec642dbc08fe2 WHIRLPOOL 036e7e967a3ef963b481310aa7732cbb764e0647f05796038892fcdc7ab772c48e5d57476ea7ba293d44a877fb42a55858f92fe018d54729f9845ccfd4f41988
-EBUILD bestcrypt-2.0.11.ebuild 1814 SHA256 a4e56b925ac8a7118264b70df8f66b50502626778fc0bc9a736c698d4acaeba9 SHA512 e2ec47c7a1013e10be5b6763dcbea352b93169904b2a5684a89f576aab51327565704391e4fbe8188ca519dee4277dfab9f1c6e380c6dbd5d3881d0690672db5 WHIRLPOOL b6d319597c8098ca3a25bab20c45068ad8d7abdf14bca7746708e1299cc850f5498dc1abb4143f3238bb07caf89884b5ba2d96d2c90c5d80dbaedf21ee922e02
+EBUILD bestcrypt-2.0.11.ebuild 1805 SHA256 b8e992b899eedfd85573fed8c4600252636c21a76e3c027c65fe096800ed5a34 SHA512 4453718394a2d527e3eedf075a4015f3a5630f08216083c3e6a4299a2ff8ab517ae2b012a831b14236bb43fe9f727837a6413e10cef73ab1ca64508128f42125 WHIRLPOOL 632c0939f3e193ecc173d649be73647430f320f9224f725bd550bce82ef39e6237c7381fe06b1781c113b1c2e9f221962e6224b66fabf45eda5907ec9713a4d3
 MISC ChangeLog 3668 SHA256 7f25d3745df2b596707b3f1ffe43934821e716623590eca9c6d3384a1dde9920 SHA512 14a6e7ec871ccc53deb1f32982cabd050c41b2834e7a3ec14ebc7195ade228e527b5472dbf08cdc8202d54079b38d495e27fa684603963ad3f730b80023e8239 WHIRLPOOL 8056744b26c58723cfaf64dda90d96b23c525f71a025ad31e114726f547c740e2e8d937d8a961e520e62a4118f6ef7be54e29ea36c53945ba24fb3c16b8357b2
 MISC ChangeLog-2015 13847 SHA256 bbfb6c9c42995a16414f5f73449109358ba146eb0b5cb1a01672964b932dfa4e SHA512 79263905cbe32e97a299cfef7b76690a172c8db8ab3d13f201675d86089470d22b4a2f19ac9f5ef12d3ca66a21997b5178699d29f5f762f58164064adb4ae2fa WHIRLPOOL fa01dc3b0d56d1994dd41a9ffaec5f0da89984d360119382d741eea787b48bd947ab54b2a4b44d1915a2f5687077af053e379eb53d63a61c3813446fa00321c9
 MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
--- a/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="5"
+EAPI="6"

 inherit eutils linux-mod toolchain-funcs versionator

@ -22,6 +22,14 @@ RDEPEND=""

 S="${WORKDIR}/${MY_PN}-${PV}"

+DOCS=(
+	HIDDEN_PART README
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.6-build.patch"
+)
+
 pkg_setup() {
 	CONFIG_CHECK="MODULES"
 	linux-mod_pkg_setup
@ -41,10 +49,6 @@ pkg_setup() {
 		BC_KERNEL_DIR=\"${KERNEL_DIR}\""
 }

-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.6-build.patch"
-}
-
 src_compile() {
 	MAKEOPTS="-j1" linux-mod_src_compile \
 		CXX="$(tc-getCXX)"
@ -63,7 +67,6 @@ src_install() {

 	newinitd "${FILESDIR}/bcrypt3" bcrypt
 	sed -e '/\(bc_rc6\|bc_serpent\|bc_twofish\)/d' -i "${D}etc/init.d/bcrypt"
-	dodoc HIDDEN_PART README
 }

 pkg_postinst() {
--- a/app-crypt/bsign/Manifest
+++ b/app-crypt/bsign/Manifest
@ -1,8 +1,8 @@
 AUX bsign-0.4.5-build.patch 993 SHA256 62910baf3387a9db873195578414ab37b64217f91925d25b5ae432749d53e00b SHA512 367596ffc688f679bfe160731a57e191894794f7de522f3390dd494fa0757b8bcf1da2d7618e4652b355b18dedc69d402abb0879b440d41227ce4b2b3b384d8e WHIRLPOOL 65d8f1625d0237e3a5227d514e3f5a9f09a6a02d434344fcf7d50d5526a2fb4858ca7ee9f3a25994dbb7c6fec727e00c31da5b1616500d4d3d40e004d9e51927
-AUX bsign-0.4.5-non-gnu.patch 1403 SHA256 ae72b2fd6cf083c0ff28bee6e41d455d6e21582ce17fe325b1c5c4df8acddd0a SHA512 6b5b3bcda1142cf834b12b70a0172e6faa6fa8cbab82064e463ff3f017c1ac3c0625de7eb321d4023db28195b721739a909c2a49cb394ee4d95e879e07942fea WHIRLPOOL 2b7091cec70f7ff69d7321554c393770be56d548340dee368668a970c26098a6722a7acf8ab12a3ba15993cb03d2fae271226e294a01ef2dad9979afac371d12
+AUX bsign-0.4.5-non-gnu.patch 1409 SHA256 56d129e815eb41ef108f7c3380f07820a8b11c69f341740469868cb988eda5f3 SHA512 800e04dfe4c6242c250167076eaa360e626cdff9beb63ab2043611a10331a20f9354380bda2b387f0bb63a06fac9372502166bf49ec025945be1c2dc84ce0c88 WHIRLPOOL ae22744d96e711a0e12bbd46a731836ed8051dc123b0ca18a9e7958c38cafda84cb83e8bb29265015ec708fb1c81d52a1533927ba521e90c8c86c8c49a4ccf93
 AUX bsign-0.4.5-scripts.patch 2172 SHA256 b27003cb1b2370520c283435b407807286a48b7607ab5dceafda29ee31311fc0 SHA512 fbf7e3fadbbcc82b6647f77232715d7baaef5d0ead5065e27e10f038e9cf5734808d29e8814762014d3d26ec4473a86ab9da139dc7f2d1b16770db3e7ddfb494 WHIRLPOOL f9a0efdbd4d3e7507a84c088475fae7b9a47244ebd9a2b3d4df94e4bd68c2e27a197f638df31ad72a27d4cd7addcfc9838962422cd56957006a2b185eec74344
 DIST bsign_0.4.5.tar.gz 77471 SHA256 a80b27286a3b1b1be6df7b93d27457a4a6941a1eaf797070b1044412f47d3106 SHA512 a4dba37d648f683bb5b14bc9aafeb72fb0bd06e21cedb1a4bbd73dfc0a5f7bb22b5b33ef8727b5070d727afb2d97489ed4b9be28bf1025c9e618ccf47f1ef634 WHIRLPOOL 067ff40119578e6208beeba7ebe9ea21fcb0667abe1ca9780f858a250048035705faad5009d5dfa6814cd4778338722c596caab469d3f8b6d7da05794f1fcbd9
-EBUILD bsign-0.4.5-r1.ebuild 872 SHA256 d0f5f04e8b9ca752af9596e68915fa44bd4b39c64655c3b8f572f232fe05a345 SHA512 69d0a560838cdc1386223b6108d9ebd23e31959dffa3b37ab0de7b252ce93e942ecde39ac201f646061ba6923258de5028bfbeb372e296d71937c41fdccabe5f WHIRLPOOL de89d2048e483db89b6c499d2af9bc244985d9b7ff674df4b36ab7aafc4e14d18c1bca74514c554b19ed59c305e3094c09c245f8f0ed19757deb281c36f07147
+EBUILD bsign-0.4.5-r1.ebuild 880 SHA256 4aa594a9a883d317f1c4f9c91602f89bd7ac117f4cc3cead077e1ce40264984e SHA512 3db20d8b3e0f8bda482316f821ee7b193da6d8053c6db81216f5d25656284d02305dc68f35db152fbf4bef6fea01abc2b1dcf94092311e7bf149eaccef48b3f8 WHIRLPOOL 0a3281088faca4c32281b59ef870698b1387678e7082b0cb2a06235ea3672728e0f357d37f851eb1f110f7f5a8f4bae07ca73c4373ab8d51569988aad446c6e6
 EBUILD bsign-0.4.5.ebuild 922 SHA256 efdf49e077df2f531cbc7da4d54fcf311fe6ce816f78356127f56c256aa24b95 SHA512 e3b969aacab0f8c35a9ee9c383e4a852af63a21fea6ca15f9bc2cf7de01ce4fd8c692dcb77876c44ec999a9caffe226a8c171356c1229bb421f5c450bf5a4a28 WHIRLPOOL 9d82224d3b4f6ea4427de5915888ef0ce8a03b56ad78ff6019f39613d351ed9cabbe5732dd5fe7619e6160e96d6199fbd970cd51a503dcfadd48f4974a4f9398
 MISC ChangeLog 2580 SHA256 f3fb01dfc6e3f26df76efa5a4f33bffa5f4ae6a39b72e317ef07ea9196198378 SHA512 29909accff265aba3e0d2f1174e36db7a4809db9af0d49470fcbf6e9dbfae64bed75c8cd10c4ca5a4834b25c4abf3fd2096a0ef6741eb9f7a7152cdead465c73 WHIRLPOOL 8bd1e57994ec758d5d703385495ce1078e98a11ecec8efb98a003fa023cf115a2e327662bfb3880132eb122eac0a59920c0ec4a0671307e16c44a6001b9c0c13
 MISC ChangeLog-2015 2202 SHA256 7bb11a0be309ec4e14cbc20efbaf1ce53fa7f949d58704aa0ca164cc4a4690a4 SHA512 3c44538737afee1635d2315babe714e8343b2534e17322bbe28c5370624327dbb5d3a966a6fcd5f0be0e7fd613877702ce025a8f464e0290c5b12e8e932cbcb3 WHIRLPOOL 6430ea107866f76c46c7e964687d272a282fb0a820eb44e7faeceb09c4087ff30333eb2e881133f28b90eafdb9d465ee7fe46c4a5ca51c59ccccfd62fad81af2
--- a/app-crypt/bsign/bsign-0.4.5-r1.ebuild
+++ b/app-crypt/bsign/bsign-0.4.5-r1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
-inherit autotools flag-o-matic eutils toolchain-funcs
+EAPI=6
+inherit autotools flag-o-matic

 DESCRIPTION="embed secure hashes (SHA1) and digital signatures (GNU Privacy Guard) into files"
 HOMEPAGE="http://packages.debian.org/sid/bsign"
@ -14,10 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86 ~x86-linux"
 IUSE="static-libs"

+PATCHES=(
+	"${FILESDIR}"/${P}-non-gnu.patch # for Darwin, BSD, Solaris, etc.
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-scripts.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-non-gnu.patch # for Darwin, BSD, Solaris, etc.
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-scripts.patch
+	default
+	mv configure.in configure.ac
 	eautoreconf
 }

@ -27,8 +32,8 @@ src_configure() {
 }

 src_install() {
+	einstalldocs
 	dobin bsign_sign bsign_verify bsign_hash bsign_check
 	newbin o/bsign-unstripped bsign
 	doman bsign.1
-	dodoc README
 }
--- a/app-crypt/bsign/files/bsign-0.4.5-non-gnu.patch
+++ b/app-crypt/bsign/files/bsign-0.4.5-non-gnu.patch
@ -1,5 +1,5 @@
--- Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
+++ b/Makefile.in
@@ -62,7 +62,7 @@
 #LFLAGS=-g @LDFLAGS@ @LIBS@
 #LFLAGS=-pg ${LFLAGS}
@ -14,12 +14,12 @@
 
 .version: .version_major .version_minor .version_patch
 -	@/bin/echo -n `cat .version_major`.`cat .version_minor`.`cat \
-+	@echo -n `cat .version_major`.`cat .version_minor`.`cat \
+	@printf "%s" `cat .version_major`.`cat .version_minor`.`cat \
 		.version_patch`  > .version
 
 _version.h: .version
 -	@/bin/echo -e \#define SZ_VERSION \"`cat .version`\"  > _version.h
-+	@echo -e \#define SZ_VERSION \"`cat .version`\"  > _version.h
+	@echo "#define SZ_VERSION \"`cat .version`\""  > _version.h
 
 .PHONY: transmit
 transmit: # distribution-archive
--- a/app-crypt/cardpeek/Manifest
+++ b/app-crypt/cardpeek/Manifest
@ -1,7 +1,7 @@
 DIST cardpeek-0.7.2.tar.gz 1130295 SHA256 9908b38a91b4df80ec5a6d6a89780dd41684dc1f203587c1bcc8e4a13cb24ed2 SHA512 9fd1790794b8d092859670bb36a0cdd235e7d098d563032ccdb8143eac00bb77532f1ab918897c4b753afd184079975de34a6f645e31eadb28b6c5a81d344ecd WHIRLPOOL 777397ca535d820453e4d315be495fc5cf845feea457c666cf935d19b8e2c7556b51e4e23f8d009c6165626c450fe5b92413841d0ee56fd6f1d549716ee05e56
 DIST cardpeek-0.8.4.tar.gz 1520613 SHA256 9c78dfdf84493c551b49447e4bb46c8d7b33f0785b93893222b70b6115013a85 SHA512 f6eebc7a17f270dd56529ee36815fee72b2f9d62b24d6cc90060f20c7604b9b99ab76858d9c04c60aaec838b02b8db76476a91ee22a4e10f01f852cd1f536efb WHIRLPOOL 5ba058911956b2d9fbe1f0f191c81a7def01c75d618e1f6f4810c9159147fe5937dbed00840f7468aa14601170c16558ff949d2c28c2747035b7ae020f8e5d37
-EBUILD cardpeek-0.7.2.ebuild 555 SHA256 dbfa970d0dadacbe01db5214afb442508b60ba86299989b7f93f50c6180b3480 SHA512 c2f9c3e3e08b21a89eb2c4206848b2ef15edfe9ea881e54ed39344cc6becac4d3e870770eb196140f0646ec0756fa6d33b333639192967300a1c997ff4824c7a WHIRLPOOL 2521e1432333c1cecd9e69aa68ffb1c12d96af0e768931898764810c8362b2f07e4af29a48584f683b56ccb7a73df5f72745da20b10eb4ca7b7629e3480d883a
-EBUILD cardpeek-0.8.4.ebuild 541 SHA256 5549aeea40b38940da1f4795bcd497d0234a54b3506a6dc6d40629c129e638c5 SHA512 1acea9f65867d940f7785f7d12f020eb4789ab31ba10f49a5f941d0e307b981d1bc3d4c992b8a4f7e5ab83eaaa276eca506ff3909eb14565a949975de7db04c1 WHIRLPOOL 5034af2c672c57fafa0fa8a11a8030867bf981bd0a63aff970160620bcc36969fbdeebb626da54fc8898b7557cfbb28cb0f7dba1bebbcac3f577e09b527aaf02
+EBUILD cardpeek-0.7.2.ebuild 533 SHA256 8dad370e93cb5574ab8b2dd339703089da5090f77aca88dc395a7d41669a562a SHA512 041ed51cec16736c1f243e3058fb3f660cda1defc1a5934b1f9749f5643aaa386a07b187f9e13de539ee77443c74aa4828c8a59ce892deedf6796dde017ff8a8 WHIRLPOOL 60426241d10cdf08b8d9ec4653d3eee7892775fb3fdf0a45cbafb09a8666a591385475995d8e0d06faaa8d77d1dc7a359e0c774962f6015ab0b1c9a21df53acb
+EBUILD cardpeek-0.8.4.ebuild 525 SHA256 837164a8721c6df167286b2ec2fd06abaf4e14a46ce21c1cfd185066994e2223 SHA512 58f3ed7c4d0197e3cd97ab394de58db3ea3528d3aa580bcf87e87f37e73440dec83f2c5b3b1848a8fa5ab4f86472c0ed659009b75d1db9d7e5b26685677e6836 WHIRLPOOL 53fabcb162727d761ba8ffe6b7c4fec94b55bff0154697f2bad4321b729f78222fcfcdd779c14372d8dcf71e85384fce680f4e59ce91fde40ed5f68dc7ee4b29
 MISC ChangeLog 3176 SHA256 4d23b50abd4ba7ad076c784bcaf455312e483e0bab6abca4398f6bacf825a609 SHA512 747f3206e14bac25825aeaac62153587c769b0eda2932bda9dd96c1cd040113e5880fa3ad941ecaad0c4f10a0bb5c2b4fc1886990037328be37808b2f732d7e7 WHIRLPOOL 515cbf07c2b1ffd13faf408494e0c78ff776cedf3ed065f2fe12cbf3d4ad18be47b2735f3b1fc928bf69fb85f46ddc02e84c83d17c3c263ba6163d3d417781fa
 MISC ChangeLog-2015 701 SHA256 97b7fe3b27a8b4cfd1aacab8e237ed22449f41a74d8eb12a99eece46db79ef8a SHA512 afef08898a02b687db244d993e88a910a9177a0f57f211cdd873f46920eb7c2abebe4dfe805b634e78e6ad8e544c9bcc0f64c18ec765d1fd355f78d67c2bc9e7 WHIRLPOOL ced4e7d435be369380969a6ab08b66855c3f1d6c13a8f89234834fa0a3222e35b263409635b774b4d293c9c04dfc22b4280dc47ef4e9ffdf95f847aaa61fc106
 MISC metadata.xml 246 SHA256 97a4242ddb39ec753b766e7bd7b94f9486e997be8bdcf8b86b24e2ed72417f19 SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015 WHIRLPOOL 1c881073f2000444080ab705b5ea51ddb4e3f62c4e952a69415e259d9fd367192e9687023e96233b3d3686528a4f8b63dd99000d11486e7a80922c93f0b1d7be
--- a/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
+++ b/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 inherit eutils

@ -17,8 +17,7 @@ IUSE="libressl"

 RDEPEND=">=x11-libs/gtk+-2.12:2
 	sys-apps/pcsc-lite
-	=dev-lang/lua-5.1*
-	dev-libs/openssl
+	dev-lang/lua:0
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"

--- a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
+++ b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
@ -1,10 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
-
-inherit eutils
+EAPI=6

 DESCRIPTION="Tool to read the contents of smartcards"
 HOMEPAGE="http://pannetrat.com/Cardpeek"
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@ -5,7 +5,7 @@ DIST ccid-1.4.25.tar.bz2 627456 SHA256 6b062b4ce0f04d6838d58e6faa255ba05222bd8ec
 DIST ccid-1.4.26.tar.bz2 628038 SHA256 3267bf708ab780c02f01f6241b7c7277cb892d30fd1179a9926a8cc0ca40be2f SHA512 4a2e5e9412f2aa4870e14114e54da96fd8b3418ea6d3a236b83e19d6349adb20a94ef7f48628c108f8459f008c10b0606bbf4d797ae4be9183e1acde032c618c WHIRLPOOL 7118e57ca9a394de3b37166bb2c4f4d398fdf744caa0803ef9f1470db7020d999f795ca816a5a70db2b59b64db7225df2dd9366fd329ca34d52b5e4611fd5d21
 EBUILD ccid-1.4.24.ebuild 1713 SHA256 da73c92875aba7c12315e15a4d313444050af76f7e40b04071f42e99871f8546 SHA512 a752b9637aa5a60c77b73aaae1331e3a262ca22ad74971b7ff4647ff0be482d47348d6a0692c3587de291acec05dcbc37e7108b8df4922b2a61bdbece1202202 WHIRLPOOL d2028384265fe742c2be9441993fedd225d10f9a24bc1bfa295a4175c103c2603200bc8a329f80985455f6acf2dc92ce691f501acefe9a13bd51ac1d34aae767
 EBUILD ccid-1.4.25.ebuild 1719 SHA256 f68202e65bcea87106cc389c7f01d56b44f12f8aa2db71ce83c155b84e1ceb8d SHA512 198df1757489178d2c3dfb7ce529d7e12fb139c55cfeb9c33ee2860d9acb4067d1577264caf8429facc589c72919cafeffcd787cb25e5714f19dbf0cbbfa45fc WHIRLPOOL b160afb4b64e06babd7d46f59549289489047c6df337043073ca5ae71ae9b09049f7c8b9ecf6d73629079e71595960d8ee040ff54c418997ca7c05fe690c775d
-EBUILD ccid-1.4.26.ebuild 1719 SHA256 d9ff153672d7ef3d67f617fe3f1af8ede757331c65d67e069a69b114131624cf SHA512 b517048e59e2f196becbac536473a9045d28d59e9fe87a8df8f2727196b4d11e09ca95f2a2a36c477745d7351aa95491482a2204960055617698026d982baabc WHIRLPOOL f7b80434d66e8720cd0149cd662775c476aa25a504eb5aa27736bc613b1ec3d3e181603035b59502fa7f258ad463a66308a196cf7e404b18ac4d535cac59becb
+EBUILD ccid-1.4.26.ebuild 1586 SHA256 e1ea9f739147b1ac91eea90ff5689ef8ac03a0456ece9526442916da7613316b SHA512 8a06d3e0fa0cf8c1bba148b41a6cef786c693dce93658b18a6dc2b905d51d44f034bb06468547487ff7564b7c67d6fc50be53bc1435456a65a95eb7509252ba9 WHIRLPOOL f3eb565d5d5dc9ccedfe04225089dc6c499cf4b8ec91fd625813362668bfc15a56057405fc9db428123c772900cf1a318009a64ad4f9603c3719c17548e33ef4
 MISC ChangeLog 4315 SHA256 a92ea2d504ae2add8c4ed87e6001a7369ce0a861167432db7622af60c3148f49 SHA512 f0a12fb122def254e804b41e9903701126718a925f13a25ffc6389afb4eaf8dc86a705ab80426fb479228053e616ed82835a2d417c1be5b2b83b1e61ea7d7591 WHIRLPOOL 8d65aeabecd12378f3e5e685b0baf2566dfa282392e0d5b7f5fc54f0522f7aafcbedddb56fca17edad57c66b637c3f4f6b463654c8f917d264363493ec09fab8
 MISC ChangeLog-2015 16072 SHA256 88b02e9d853c989f0f4427c2e8946016c52f9f730da3423d62906a8c49a4b54b SHA512 4c230e925bc65a261d26f7edbfefd68c5369b567440c187917710605a164fbf11ee1b8b36205ea609b24de6ce58254a46072623f2950cda3d08b3937c09f0aad WHIRLPOOL 4a39ed6deaabf0063ceeddc835bfcdb5b57d973a0fd20ae278155627a9fb7c62fb78d3f558cedf481259e9c8db327634d3c1c708bf2853d8cc18c1fb0d5ac978
 MISC metadata.xml 397 SHA256 4bb378c2dd7fb9873b3950e3f05e659c713ee2cf20c37bce87806ecbe12ae0a2 SHA512 8e8643f46728232ffffe25fe9906948c6a8bb94733dbdeaf2700afd0cf4a7567a27698c1832edf858c2a433187cac9d847dc7ad709d6398133b40b639e37cb4b WHIRLPOOL 83ef5bad15119742db6b8d8715c8dbf03936c21c967c8abc18827139a39c16d433683bff9dd90480c652607ae18e7221344a4ba46e292e8c88fde1428e4d6d36
--- a/app-crypt/ccid/ccid-1.4.26.ebuild
+++ b/app-crypt/ccid/ccid-1.4.26.ebuild
@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 STUPID_NUM="4205"

-inherit eutils toolchain-funcs udev autotools-utils
+inherit eutils toolchain-funcs udev

 DESCRIPTION="CCID free software driver"
 HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
@ -25,25 +25,22 @@ DEPEND="${RDEPEND}
 DOCS=( README AUTHORS )

 src_configure() {
-	local myeconfargs=(
-		LEX=:
-		$(use_enable twinserial)
+	econf \
+		LEX=: \
+		$(use_enable twinserial) \
 		$(use_enable usb libusb)
-	)
-
-	autotools-utils_src_configure
 }

 src_compile() {
-	autotools-utils_src_compile
-	use kobil-midentity && autotools-utils_src_compile contrib/Kobil_mIDentity_switch
+	default
+	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
 }

 src_install() {
-	autotools-utils_src_install
+	default

 	if use kobil-midentity; then
-		dosbin "${BUILD_DIR}"/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
 		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
 	fi

--- a/app-crypt/ccrypt/Manifest
+++ b/app-crypt/ccrypt/Manifest
@ -1,6 +1,6 @@
 DIST ccrypt-1.10.tar.gz 669491 SHA256 87d66da2170facabf6f2fc073586ae2c7320d4689980cfca415c74688e499ba0 SHA512 b0130998f9830f63e8181340b3138260ab3c2014174e74fbcca77299dc9e0f807471fbfb7cc403dec7d0809f136e8afcb4c9bfd4ee5e43a1b3cc7185e14c3188 WHIRLPOOL aa65659fecadfaf1a9323b5a80c00eeda41ff7e3db40151abb678ad1c14de1310ba7954d2042baf6bb230ac2fdc52368a367cf91cb7a9ab5d0fec51d5937872b
 DIST ccrypt-1.9.tar.gz 667059 SHA256 6538cb75f7f45faf20f912c7b0d284831b0afced9fc61984b8d45a990276ebaf SHA512 fb4cbf6787f26303735e0eb3d038952b518c2466ac232a625ea9bd5e99400bb9d88a0cc41a690caa9de942f86365c567a802a1faf735306155aab14ea67464b9 WHIRLPOOL 122dd2687bbbb4496fc330e52ba1570d735541e4e08e8614a33a417a4d7abf1c29604dd11a836a2a3c696643a7b46acb8c126248b9eb6fc61c6d9d0baedb20dd
-EBUILD ccrypt-1.10.ebuild 544 SHA256 d30d986bc2d03d828e62e0183c96276477553aa90c6739919f87c40071e5cc26 SHA512 dd6c1c219990e4c94f21ab8430d9ac7592a3dffce1de6f2f9edfe998373067910850da4b1437c2f26a7f335d4b8fb7bad842d345ad7414c6014109fda82b4b89 WHIRLPOOL 8bda27de1ad8aeb5a39e7fa0b4f00c1df8234c6181154d3731bf1b57d96ffb7840e92c42caad46a89d04062ecd6aa08fd63626540c2ddfb9fa52bc4d3d4d8ac6
+EBUILD ccrypt-1.10.ebuild 415 SHA256 85e8f34fac3cf8a43678c38180ffe28de48f1a470b62aa898551c5a7b30f5904 SHA512 f8a90122b28a836a87ae40cd7207f8831aa32a80b6feca3d93f9d54050028ef6e081ce191155b9b47ceb3f352c351aac8399d24a406874f105e2204d3cf7150d WHIRLPOOL 8c72cccfaa78b373b1375034ad6904f3c964e8f5821cfc15fd6091492d01d1aa699016026a34229d335ad6ede402496cc2fee8534cfefe4de5a4be73bc24abb1
 EBUILD ccrypt-1.9.ebuild 541 SHA256 d7666d469afb436a6e2e96a0d63f8f9e6eb1188868a7ea9ec67d5feac50ba9fd SHA512 198f74e77e045ba6ece3fd13769dfb6c7ce8cffd575ef5a1453f56b9a446aae336f9b75f242f595b9872acb6900f05b8958aef9054677c7a84dfd8ee148b2661 WHIRLPOOL a4326524e9235c88f6429517ea2b983625a6282726847de280905c2616984bfb9e178a2209f48820850a3670dee5bdf699da19ca02a022a22d0d031b1e666146
 MISC ChangeLog 3015 SHA256 399a143f2726f9f14ce5b17784b520bac727a82eaf210f7225abf64bb074b202 SHA512 64b981a3f95a956c9a9aedaa1d229d28eaf0e348d7426cc5329c5d0a9e104edcaf978ec58aea70e3b5cb0c70e8e686eb5765fa5ba99db3e69fe1b9d98fb51983 WHIRLPOOL 0ad028f32e2919101a68f54eb51d9dae1aa29aabe1bad8867295627453998b41678bf463ccd645c8d42d2738af4898e742803775688fd49f1143bc87adbc31bf
 MISC ChangeLog-2015 3048 SHA256 6e25b85159818d0fbe1ed17fb21983e220f180da1334094a86b1ef40e39246e1 SHA512 9b8ccf9fb5c7255b33277e5e5ea4a5a834d96652c56d55cf822117ee469af56ca212160a90cca28aa1a47ab05a8e196b6707c91b0f1bcf4ce4b9688cae0c8fb0 WHIRLPOOL 2058834565dbd3a974cb8d041d08608f4d44658c63af9c5f054aaaa8bf4f72f2cb40e640d69f596b1f5e9878a1009b2bc51c3e35fae7833def3adb45e1f058e6
--- a/app-crypt/ccrypt/ccrypt-1.10.ebuild
+++ b/app-crypt/ccrypt/ccrypt-1.10.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="3"
+EAPI="6"

 DESCRIPTION="Encryption and decryption"
 HOMEPAGE="http://ccrypt.sourceforge.net"
@ -12,10 +12,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""

-src_install () {
-	emake \
-		DESTDIR="${D}" \
-		htmldir="${EPREFIX}/usr/share/doc/${PF}" \
-		install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
+DOCS=(
+	AUTHORS ChangeLog NEWS README
+)
--- a/app-crypt/chntpw/Manifest
+++ b/app-crypt/chntpw/Manifest
@ -1,5 +1,5 @@
 DIST chntpw-source-140201.zip 1404098 SHA256 96e20905443e24cba2f21e51162df71dd993a1c02bfa12b1be2d0801a4ee2ccc SHA512 a26d747f6e077d1bb3e9b8077781f8c37dd978e07b7426495862f15c9004572b706c34736fc4d1ed8856b1a43335d726b4d87c688f7f9a11fd6cc3a74d71a7fa WHIRLPOOL 87284c123d2ae1965d069d4d97cda23ce757305b3521f84089e43a9f1fa8aaa48f8fbad5bba19b3a439cfb16d270e0f77f528664fdba895c65c100492eb9e42a
-EBUILD chntpw-140201.ebuild 1014 SHA256 4ac539d2ab1bcadac7c6a884b7eff429be57d5856ab277cf62a5bdc4a4b15ee4 SHA512 e9f15bf21c7e08185df6aadf7765ae5f0e245fbbde08cd2f37992e64137271b1a881b4b40a206b389fed9c8e5786e76b4a423a7760855086ebb3bb54f6296630 WHIRLPOOL 9480fdf7788ead9fc2d26f0f48dc4a6d32873bb2fecb865b5b7dad6d3d27552acfa76ce200b3b7c8d25cc6b073cd85026502e7047bcf5301e0bd5db690744dea
+EBUILD chntpw-140201.ebuild 1050 SHA256 25ad6e169c04eaff62abe8d93738ddefa9cf80447512bdea16b91f85d0dff7d8 SHA512 d1b36a763f15882ccdcc7828633a397863ac84c7af6e03c33a7f3020283fc6ae94a4560df385af5400b98fe03775d06467ce1650659ada855125af47b4dde6e5 WHIRLPOOL 041b89c7d57f8095d05720eade2e876ff9440086a139aeb16b7d743098d44dbb866283c95a52195253772e531f227a3a64fd38eaf5ff1fa9762b416207aa4936
 MISC ChangeLog 2732 SHA256 99f2f65bc545603743a39b7b9be747cce9eb866499f1596ae580deecf7d99367 SHA512 4b631faba991eb9cf84fc40ee5a8bfd292d1af63b45e3a7c4707772fb2a47dcb9f7c83d8ae535044a75c659ffebdb05edd7849b5bc1ed3a5760bd65132fcb06e WHIRLPOOL 80e7a0c144309e0627f3748df41aade0eccaaa49eaf14d258b3773527b98751eb8e0dcfcea97aad8e0f9ce867e1cd2653ea8377b3e0e0d010d2045d849fcec22
 MISC ChangeLog-2015 3321 SHA256 827aea09b5309de050099a1a9d578ab76b960c32666a2b78833a3aed8f5cfaf8 SHA512 c7657da1b5fa9da7ccbe1e72e9ce7bd54256d8a064307e882b5033d065492066a86b4cd24cd082029bfe3912c6335cf8ed287c81f7ed6870600e55cc617f1f05 WHIRLPOOL 2b8e5881a283c74d53e8f2c946d84e11541baaa88387793b470887f1893392eeb5f082675d7f20f2d1d309d1782256cadaf1b8fc17088b51a0294ab1748f6b3f
 MISC metadata.xml 240 SHA256 d1d2aa7abc46b180b2494a0cbb393768f12073097a3ddf9d118cb9e2cead8317 SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d WHIRLPOOL aad153df696809789d129412e71fd5eca91f7b230c22a10c70baa6f79e3ab57cf8890540fead3d9587f76b4396a7089921b207165fe0505917ad76b5cf86af90
--- a/app-crypt/chntpw/chntpw-140201.ebuild
+++ b/app-crypt/chntpw/chntpw-140201.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 inherit toolchain-funcs

@ -21,7 +21,12 @@ DEPEND="${RDEPEND}
 	app-arch/unzip
 	static? ( dev-libs/openssl:0[static-libs] )"

+DOCS=(
+	HISTORY.txt README.txt regedit.txt WinReg.txt
+)
+
 src_prepare() {
+	default
 	sed -i -e '/-o/s:$(CC):$(CC) $(LDFLAGS):' Makefile || die

 	if ! use static ; then
@ -39,11 +44,10 @@ src_compile() {
 }

 src_install() {
+	einstalldocs
 	dobin chntpw cpnt reged

 	if use static; then
 		dobin {chntpw,reged}.static
 	fi
-
-	dodoc {HISTORY,README,regedit,WinReg}.txt
 }
--- a/app-crypt/dieharder/Manifest
+++ b/app-crypt/dieharder/Manifest
@ -1,6 +1,6 @@
 AUX dieharder-3.31.1-build.patch 623 SHA256 fe93e67a6ee62f9653949552f7fa44292e8c888656df97896296ff97b9198064 SHA512 8d98efdcbfd4cea06d1cae1a1fbea1305e366c030c99b3abb944d1a47543e9b592304f60cd8dbfe9b3fa77ec9ee61c2537bf2390f072ced7d36ad7eb9550e4ea WHIRLPOOL 6f6d6bfaa5402df95bd4334d0de7871ff292ef93abcc3f75a0efe1b041e4ef34886385274c3936b2b8142cd46f6af6831117b75e2eb435942a9cb95f191eacac
 DIST dieharder-3.31.1.tgz 1149780 SHA256 6cff0ff8394c553549ac7433359ccfc955fb26794260314620dfa5e4cd4b727f SHA512 e01ed4266b4fe5d5fadde3c92c30e430d0ca5f7fedd26b26ed2ab98b7602aa9c35bb5c8fd9314ef2f5235b5087645ab13e5e6550156e26643baa5aeb77088dc5 WHIRLPOOL eb10fffbe839b2448b1955841dd4c3dee45f21ab89eb5107e82c3fef8706f7386ee6b6c21aa947c2cbe1f16075c7882975c9eff5fb17876799c15ccce9b5eca1
-EBUILD dieharder-3.31.1-r1.ebuild 906 SHA256 e52c630791ac36a444466f92877731d0dc31bbc69bf7c371cc5ad6055aac1254 SHA512 6c3410346ac304677f1cd41be299bfd79a88d44b537ffc4611049f492dbea0577e29bf878fb184f89110e2224fc95f5569f5fe18525e939c33238443326ff605 WHIRLPOOL b15b873bf96cd450b1222df5fca8b5bbdf9f93b8363dbe9b600b17d1217817224c6c8aa231ee254086ceb1df1b046073489065bd80f62a16c82a9e7c4b045969
+EBUILD dieharder-3.31.1-r1.ebuild 954 SHA256 0f78e773946bf30d12a86a45ec9754787b725d464a8c4fb16dd4ac223d3519a1 SHA512 4b62a5e34b77425c13071f614ada8f337b60046446cf62c95e94009c5de8790d4faac03869dde72a1aa093ba6d69d7f13196e6952d2ed56ea0733e7d8d1a9f4f WHIRLPOOL a14d4f1be64e04477e3ed6881edc5a181fc364def43f050a1cfe2d8a4b52cdaf4e9067159e06fa038c6fdf933f8b366a0b178009ebac0d0222d9510e2832c8cb
 MISC ChangeLog 2825 SHA256 13aabd85b1f932a36f114280ec7ae7fece0f4d320323b53a105cc50744d755e8 SHA512 5da51e8f7c0c13e5edd881e5a30c3a8acf9536c2b89ab635a440dc215d26d54259bb3a5f3076103d2246ed98c309378325622fc35dff21db00788bc0f0cf465b WHIRLPOOL 2e2be3fc84cbbf111e9101f70f75385001382f2c9de8f27da25b023ffd9506b75752869bd5dd30d4115936c977f8e77715e8cca1777cd4f67ddc706a6d0e3dfe
 MISC ChangeLog-2015 982 SHA256 bbd04fe9d44bfde253b677bf1417315a6c7315f0635769e0576ee84785378c1c SHA512 d44a7fd0b8406e69f8c958a9dce056de565e2a63cf9b6b854b65d924deb0abb68631c277faa3e96e2060a3aed69d3eba68ba0b07c5283de0d8aaae8d8dc4900c WHIRLPOOL 92be7392081bc2b09e568133dbab1c83a434d50c088cde84e6081089632aff8640bdf22644bae2cfde98676724828cfd144c32d85e1563cad61ec43206187056
 MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
--- a/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 inherit autotools eutils

@ -19,8 +19,27 @@ RDEPEND="sci-libs/gsl"
 DEPEND="${RDEPEND}
 	doc? ( dev-tex/latex2html )"

+DOCS=(
+	NOTES
+)
+HTML_DOCS=()
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+pkg_setup() {
+	use doc && DOCS+=(
+		ChangeLog
+		manual/dieharder.pdf manual/dieharder.ps
+	)
+	use doc && HTML_DOCS+=(
+		dieharder.html
+	)
+}
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-build.patch"
+	default
 	eautoreconf
 }

@ -31,15 +50,9 @@ src_compile() {

 src_install() {
 	default
-	dodoc NOTES
+
 	docinto "dieharder"
 	dodoc dieharder/README dieharder/NOTES
 	docinto "libdieharder"
 	dodoc libdieharder/README libdieharder/NOTES
-
-	if use doc ; then
-		dodoc ChangeLog dieharder.html
-		docinto "manual"
-		dodoc manual/dieharder.pdf manual/dieharder.ps
-	fi
 }
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@ -1,14 +1,6 @@
-AUX gtk_not_required_4.1.4.patch 3148 SHA256 21d4353103c38641085b77ab72d5772a4b9a3185e4c8a48ab3b8963449abef17 SHA512 bf773066ad6d0fc56a0f36060f7413aea3e70b6acbb9eb44eb727d1760d11f57341eff994ce99c985e9e8ea26ec1ded344153b50b4f6b8673977b4077a680f24 WHIRLPOOL cb09fc1e64c62e342cfb360a7b02a4ff676c434ebab68e4cb98f7715e5ac34b49a9021bd4cdbd1c6bc81758714cd51f934ff8cdca902c08ddf8f7335902a0e74
 AUX gtk_not_required_4_2.patch 3247 SHA256 ea891a12c8b20c7a99d96ac99cae071ccb391e8bd73a23f03f96f1527a957ba0 SHA512 32e2da278c1fc8fdaf479a575daf65a1a3ed49475568556fba91cdca081b39fe6e7533f98aba4774f7eb00a04911fec3cf55fb2a75c57465d992801d3a4ee11f WHIRLPOOL f6ad905735777614d8df4ab2d05a3b6a88b8606582fec1057333d8ef80a32f2f6e61a971970927fdfefd85afb2bd053b6357505651ad11e31d8d15929eef6f2d
 AUX gtk_not_required_9999.patch 3247 SHA256 ea891a12c8b20c7a99d96ac99cae071ccb391e8bd73a23f03f96f1527a957ba0 SHA512 32e2da278c1fc8fdaf479a575daf65a1a3ed49475568556fba91cdca081b39fe6e7533f98aba4774f7eb00a04911fec3cf55fb2a75c57465d992801d3a4ee11f WHIRLPOOL f6ad905735777614d8df4ab2d05a3b6a88b8606582fec1057333d8ef80a32f2f6e61a971970927fdfefd85afb2bd053b6357505651ad11e31d8d15929eef6f2d
-AUX not_zip_xpi_plugin.patch 1276 SHA256 5f976856a738482d452d665731dd9be500f5a5286348ff4ed13a08063b0010e7 SHA512 71f92fd041d286a35668e905063d05510a02d6efcad0afb029015ffdd8a96e01c5f729617e3c212e46f73a09e5599558ac2877228f15765c87c1044847439888 WHIRLPOOL 679879b58edb044be16474bb069327d3212d53e0a3fa3ba10f8befb6c47663b01b93ee24f60b9ef99bac674d276f63bc8cd808e26345f2940cef389865497634
-DIST eid-mw-4.1.18-v4.1.18.tar.gz 3480541 SHA256 abc9d3194008f05b2589ddd9a29c45d22d89716bdc8689fcec42b2aa8450ddbf SHA512 18825a06007f7c07609cee034896ebf64b589200e04b72fece2bd65004a738c01cf64475d59f2c94b7242aa1adfc433bf4af6cf8b5d809746f3e9357ac27b98c WHIRLPOOL 584817aff81a1e0b1af24e5b259fa7e40b5a43b27be701242430cdc480d8ba57205faeba6fb787f1321e02916e6f3efa722e01609151fa3798b8e37b13cb159e
-DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
-DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c WHIRLPOOL 06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9
 DIST eid-mw-4.2.0.tar.gz 8508064 SHA256 4d86f4750f973a8dcf700544b92ffc3069a85ff93086538b9f334d76dd5c9747 SHA512 c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f WHIRLPOOL b1dee0c0a1800b81a7f392bc0e13d070a1cbc7fa6eb2f26e9c50903e058f322ff0b2da69469f90bd38240f49520be29bb548ca6954bc052ef5b23bdb4cad2643
-EBUILD eid-mw-4.1.18.ebuild 2149 SHA256 c21cfc81ce8beddec06331d416a39d1559aa41356b161d7293e002fb9955b55a SHA512 56c0eed6bb5eeb838a9f70731da24c68e7d76d86b0fb99d9b9f143fa113969527615feb0e5224ee48c4db83a4d9b6b8f8f35a93e0fe7d28129b856a12549d0e5 WHIRLPOOL 8ae000ec393b0bd4e324adcec623bdd59bd3acb4fe2dfcb777c86c5c280a35857ecb94ea8333d292fc163132f941296b9bbe7a73363cd8f43bd84a411c8b7120
-EBUILD eid-mw-4.1.4.ebuild 2126 SHA256 45cc813a7fea1ad672894ab327e1944c9f089beb5804eb438c41336e2c2b3111 SHA512 1f9cb239f0c838cc6ac1975bc8fe39d1efea9e592fd10dfe9330fafba618c821f6a4801a44797dc407282f9720f6bd85baa86fcb6abd83ad474e60891bc0b360 WHIRLPOOL bb132dadd605a43b07f05d646d3d869caba47d031d948a3a0e38ef49b49ad9a53fddc0d7aa6305b7fdf69f9b0a11d1d3525c0e3e7873a82e64feb18324c4a34d
-EBUILD eid-mw-4.1.9.ebuild 2102 SHA256 75634543ee7d426486d933d961f6fd00d90ee2acd5cbffe25d23d2af075e3a68 SHA512 831df79f63e0812e15fc0976c023fba9243118bad2f8afc01048adaaeb0c59ba419d4b5121faa5ed5147a19c51cf0ff37b2dd48481b53416b4ed42f93675043d WHIRLPOOL 28494d2c6e53b7d4d772a305526caf3f3e903ef67675d7a1551f278ed50e0024c876a50e89f54fae10614ea5ef2ba29ceacede28aaf11541a7a462d8de2628a8
 EBUILD eid-mw-4.2.0.ebuild 2504 SHA256 18de4eee2d84422a9c32033718c8c78bc4c98ca7cff145561d1279f9718f3bef SHA512 664a0f3610a3652b0e030c59a8d1e33a72b52de80fa725f9cbacf45b482e5a265f1e08be78c645c0241c4bd0614d72f999abededa63babd34052a65041a86b4e WHIRLPOOL 0d6e2db22df497d8c59c0bf419edb8c0f9a4d10d08e31c958a6d3c1dfc958d4c63dc4faba11f2c46db8d5f4d8045af699a6edbb6de021277764dbdaabc907cdc
 EBUILD eid-mw-9999.ebuild 2513 SHA256 2c59f89e258b0bbab3b6a324ecc26b619d07310e45ee285057af26b3d9ccc93b SHA512 759161d63af49582eb3a28e0f33a0b194a0adfbc40159ae5a23fab1787643772606a55a1290fd9fcf956adfcc5fe34333a4113691cef7f584af61b3d3c16899a WHIRLPOOL 702634c3b3e1b80c1f7944651646317f3a4b92921e824518d94fc54fe98bf4da226630a0ae407771ce0a6dca6b2a975e8c870123e2d8db38ec2795efc12651ab
 MISC ChangeLog 6022 SHA256 40003eb13dfecea94d0e9c8db15dfad65a86ac1140124202d08f208c68ed7437 SHA512 3131bbe51c42f51e689b99d99a75726ffa4bc7579f663a41a28f1f81835fe6dbda984650342a9621dcd776aa88d062ff39b687a6437fb8d022087fdacfb8e22b WHIRLPOOL 18a35068ec6bc520373b104a53a4433a2e47f34c84d2ce520929c3e5742a9886d351acdee997a78fa7915aecaec3e3706a1b8f73f257ffb21468080e12309d43
--- a/app-crypt/eid-mw/eid-mw-4.1.18.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.1.18.ebuild
@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools mozextension multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
-		https://github.com/Fedict/${PN}.git"
-	inherit git-2
-	SRC_URI=""
-else
-	MY_P="${P}-v${PV}"
-	SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
-	KEYWORDS="~x86 ~amd64 ~arm"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-
-HOMEPAGE="http://eid.belgium.be"
-
-IUSE="+gtk +xpi +dialogs"
-
-REQUIRED_USE="
-	dialogs? ( gtk )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:= )
-	>=sys-apps/pcsc-lite-1.2.9
-	xpi? ( || ( >=www-client/firefox-bin-3.6.24
-		>=www-client/firefox-3.6.20 ) )
-	!app-misc/beid-runtime"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
-
-	if [[ ${PV} == "9999" ]] ; then
-		# Only in current git. Hopefully, in next release.
-		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-	fi
-
-	if [[ ${PV} == "9999" ]] || ! use gtk ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable dialogs) \
-		--with-gnu-ld \
-		--disable-static \
-		--disable-signed
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if [[ ${PV} != "9999" ]] ; then
-		# Automatically done in current git. Hopefully, in next release.
-		rm doc/sdk/include/rsaref220/win32.h || die
-		doheader -r doc/sdk/include/*
-	fi
-	if use xpi; then
-		declare MOZILLA_FIVE_HOME
-		if has_version '>=www-client/firefox-3.6.20'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-		if has_version '>=www-client/firefox-bin-3.6.24'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-	fi
-	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
-}
--- a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools mozextension multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
-		https://github.com/Fedict/${PN}.git"
-	inherit git-2
-	SRC_URI=""
-else
-	MY_P="${P}-v${PV}"
-	SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~x86 ~amd64 ~arm"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-
-HOMEPAGE="http://eid.belgium.be"
-
-IUSE="+gtk +xpi +dialogs"
-
-REQUIRED_USE="
-	dialogs? ( gtk )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:= )
-	>=sys-apps/pcsc-lite-1.2.9
-	xpi? ( || ( >=www-client/firefox-bin-3.6.24
-		>=www-client/firefox-3.6.20 ) )
-	!app-misc/beid-runtime"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
-
-	if [[ ${PV} == "9999" ]] ; then
-		# Only in current git. Hopefully, in next release.
-		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-	fi
-
-	if [[ ${PV} == "9999" ]] || ! use gtk ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf $(use_enable dialogs) --disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if [[ ${PV} != "9999" ]] ; then
-		# Automatically done in current git. Hopefully, in next release.
-		rm doc/sdk/include/rsaref220/win32.h || die
-		doheader -r doc/sdk/include/*
-	fi
-	if use xpi; then
-		declare MOZILLA_FIVE_HOME
-		if has_version '>=www-client/firefox-3.6.20'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-		if has_version '>=www-client/firefox-bin-3.6.24'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-	fi
-	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
-}
--- a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools mozextension multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
-		https://github.com/Fedict/${PN}.git"
-	inherit git-2
-	SRC_URI=""
-else
-	MY_P="${P}-v${PV}"
-	SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
-	KEYWORDS="~x86 ~amd64 ~arm"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-
-HOMEPAGE="http://eid.belgium.be"
-
-IUSE="+gtk +xpi +dialogs"
-
-REQUIRED_USE="
-	dialogs? ( gtk )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:= )
-	>=sys-apps/pcsc-lite-1.2.9
-	xpi? ( || ( >=www-client/firefox-bin-3.6.24
-		>=www-client/firefox-3.6.20 ) )
-	!app-misc/beid-runtime"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
-
-	if [[ ${PV} == "9999" ]] ; then
-		# Only in current git. Hopefully, in next release.
-		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-	fi
-
-	if [[ ${PV} == "9999" ]] || ! use gtk ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf $(use_enable dialogs) --disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if [[ ${PV} != "9999" ]] ; then
-		# Automatically done in current git. Hopefully, in next release.
-		rm doc/sdk/include/rsaref220/win32.h || die
-		doheader -r doc/sdk/include/*
-	fi
-	if use xpi; then
-		declare MOZILLA_FIVE_HOME
-		if has_version '>=www-client/firefox-3.6.20'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-		if has_version '>=www-client/firefox-bin-3.6.24'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-	fi
-	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
-}
--- a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
@ -1,60 +0,0 @@
-diff -ur eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am
--- eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am	2015-07-27 10:30:34.638418958 +0200
-+++ eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am	2015-08-13 14:12:43.827586821 +0200
-@@ -164,29 +164,3 @@
- 	dialogs/dialogsgtk/dlgs_gtk.cpp \
- 	dialogs/dialogsgtk/single_dialog.c
- endif
-
-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
-
-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
-beid_askpin_LDADD = @GTK_LIBS@
-
-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_changepin_LDADD = @GTK_LIBS@
-
-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_badpin_LDADD = @GTK_LIBS@
-
-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_askaccess_LDADD = @GTK_LIBS@
-
-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_spr_askpin_LDADD = @GTK_LIBS@
-
-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_spr_changepin_LDADD = @GTK_LIBS@
-diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac
--- eid-mw-4.1.4-v4.1.4-a/configure.ac	2015-07-27 10:30:34.641752294 +0200
-+++ eid-mw-4.1.4-v4.1.4-b/configure.ac	2015-08-13 14:13:51.456736608 +0200
-@@ -55,11 +55,6 @@
- 	fi
- fi
- 
-if test x"$have_gtk" = "xno"
-then
-	AC_MSG_ERROR([At least one version of GTK is required.])
-fi
-
- ###########################################################################
- ####### read user-specific requests from --enable directives         ######
- ###########################################################################
-diff -ur eid-mw-4.1.4-v4.1.4-a/Makefile.am eid-mw-4.1.4-v4.1.4-b/Makefile.am
--- eid-mw-4.1.4-v4.1.4-a/Makefile.am	2015-07-27 10:30:34.638418958 +0200
-+++ eid-mw-4.1.4-v4.1.4-b/Makefile.am	2015-08-13 14:11:43.878340486 +0200
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath  debian build-debian.sh rpm doc
- 
-SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
-+SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi
- 
- xpipackage:
- 	$(MAKE) -C plugins_tools/xpi xpipackage
--- a/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch
+++ b/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch
@ -1,27 +0,0 @@
--- eid-mw-4.1.18-v4.1.18-a/plugins_tools/xpi/src/Makefile.in	2016-05-20 12:58:46.184002742 +0200
-+++ eid-mw-4.1.18-v4.1.18-b/plugins_tools/xpi/src/Makefile.in	2016-06-18 16:18:57.467199895 +0200
-@@ -724,24 +724,6 @@
- @SIGNED_TRUE@	cp $(srcdir)/belgiumeid-1.0.18.1-signed.1-signed.xpi $(XPI_ID).xpi
- 
- @SIGNED_FALSE@xpipackage: $(xpi_files)
-#	 Create a temporary directory $tmp in $TMPDIR (default /tmp).
-#	 Use mktemp if possible; otherwise fall back on mkdir,
-#	 with $RANDOM to make collisions less likely.
-@SIGNED_FALSE@	{ \
-@SIGNED_FALSE@		tmp=` \
-@SIGNED_FALSE@			(umask 077 && mktemp -t -d "xpiXXXXXX") 2>/dev/null \
-@SIGNED_FALSE@		` && \
-@SIGNED_FALSE@		test -n "$$tmp" && test -d "$$tmp"; \
-@SIGNED_FALSE@	} || { \
-@SIGNED_FALSE@		tmp=$$TMPDIR/xpi$$RANDOM; \
-@SIGNED_FALSE@		umask 077 && $(mkinstalldirs) "$$tmp"; \
-@SIGNED_FALSE@	} || exit $$?; \
-@SIGNED_FALSE@	$(MAKE) DESTDIR=$$tmp extensionrootdir=/ install; \
-@SIGNED_FALSE@	cd $$tmp; \
-@SIGNED_FALSE@        rm -f $(abs_builddir)/$(XPI_NAME); \
-@SIGNED_FALSE@	@ZIP@ -rq $(abs_builddir)/$(XPI_NAME) .; \
-@SIGNED_FALSE@	cd -; \
-@SIGNED_FALSE@	rm -rf $$tmp;
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/app-crypt/fcrackzip/Manifest
+++ b/app-crypt/fcrackzip/Manifest
@ -1,5 +1,5 @@
 DIST fcrackzip-1.0.tar.gz 114786 SHA256 4a58c8cb98177514ba17ee30d28d4927918bf0bdc3c94d260adfee44d2d43850 SHA512 c18d45b5a4ec46411d455a0c10cb9faa7a1060a48936a820fff9b1f8af7f7158ac09da44d39673e4bdfaf0f370ee425e8df0a0dbe98a2a930049ecc2a1419048 WHIRLPOOL fa86ec55174bd04aebca3bb5cfc6b70482ed4b9fef4fd9f4fb80ecaf7a16b8bbd99bb39501e587dc9477999b5db695620dc0b365566eade8bf7756a943a2a623
-EBUILD fcrackzip-1.0.ebuild 508 SHA256 f95f7d799e210f06198c470b5dac7ac9767858c523b69baf441d4433ad651a56 SHA512 a2b64620d53e3cdf7bf8a1dc888819c2e50b0eae2887817885092da1f4e2b58ceaf729e4cca22fc5e5052d60789c3d4668dc30e18c781bf9efbabc628401ec2e WHIRLPOOL d6b6543def14e22fc151e240e4dce4c8b2c6dff76a9011d65a75f4312bf11d382ec777a3425fcadf0c2cd2009d88f7745537895a9c8b3aa665656156669daae0
+EBUILD fcrackzip-1.0.ebuild 517 SHA256 450638dba97d7fe8467ad1f56ebbb07e7d9cc03cc61ca0d454de84125b5a1754 SHA512 ec59eb3d37fe30dba4090b92f0722bccd5c3ea5ed44e00f7ded3dd1eac9228040e8f1c8aa943cf6a38f8dd767823f82eb8a1f105e6f13631fb8f15f65433091c WHIRLPOOL e167e8c4a30ec5d7203a7551da5e606fd8835c0e7fdc6ea24d59119f31c10c2ceb172770c762bbfa88eb90d4aee694b76505cafd2a5ab2b6b3d5ed6d6c529164
 MISC ChangeLog 2727 SHA256 c00b5cf0a76042d92ffb4f6174ace56933da2f1068d0284b14f58a80c500375c SHA512 a8b7c1a9abd568603a4b1f8be07e967fe9eb233ab4215a8f6679de41c79c587f24729613ac71937f322a8e3041b71f937e559d8896708c18b963cc4cac0a6958 WHIRLPOOL 3fc082584a2fd14042a0b68c00098ab913ac1862978ea3e12f05d9543a455781e58d75062202ab189507c4cfeb314028645c2e1e26a37b52bbc2709aa86ded5a
 MISC ChangeLog-2015 369 SHA256 8dd926a87f1f774b4dca12923215b0d20af4f2fe4ee2d60f6a1117fca6c0f9e5 SHA512 f93a593214f9dd1a97541019324347ae34acc4951fdd766a35f2dd7ff81e160a51700fbdcf602f9b42d43b329861148ea8779458079f61ab242c3bc7dada5c6e WHIRLPOOL 2508e6e1fbe1b2bada519da4b9a2801885f8fdca6f725532ed4c286446e35a01545e06bc24d568cd514ee72c4b43a0255f68188a9d9b61b14dfc2a5e89469a1c
 MISC metadata.xml 244 SHA256 314cf9dff9677c9f4a13126b78ca5ac0400872718a20f20946ddfd29c743ca1c SHA512 369af9aeb291abf5f4ad1e75411ea1988671f116f7e44e8d5fc58fc2e2a8bde047783c23a71f2b2b5445b20873e5c38265714332dce289dec4e21d0b2cd76e44 WHIRLPOOL 62a911e5e49c39ba11352178b4d84d448cdfde0c7f51eaf4bf701458b7925267a4ab1a22b1ddd7616a9dd70974a859d5848ab6774c6994d7e9a8f6c52ad1cfec
--- a/app-crypt/fcrackzip/fcrackzip-1.0.ebuild
+++ b/app-crypt/fcrackzip/fcrackzip-1.0.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 DESCRIPTION="a zip password cracker"
 HOMEPAGE="http://oldhome.schmorp.de/marc/fcrackzip.html"
@ -17,6 +17,7 @@ RDEPEND="app-arch/unzip"
 DEPEND=""

 src_prepare() {
+	default
 	sed -i -e '/funroll/d' configure || die
 }

--- a/app-crypt/gpgstats/Manifest
+++ b/app-crypt/gpgstats/Manifest
@ -1,6 +1,6 @@
-AUX gpgstats-0.5-flags.patch 664 SHA256 ccc417e297efe7d0a6537e7793eb13ae0283c4884f452a0c44adde7be795daaa SHA512 cafa76619ca83b15512c62183df7d1d1e744fc53cb958ee3c8b9f7bd2d5df240e96025143dcb94c38e3187191e2be35e65b2d7d8c8dac3bc727f3119836ef1a5 WHIRLPOOL b1747f26ddd4e50a0704229ccf0fc73571d00556b17dfefc473af7309543268a87e05efb02ac6dc2e0b4a72d2bc5307610fc3a37fde126245dac4bd5c6380863
+AUX gpgstats-0.5-flags.patch 668 SHA256 d840597717c14959ea6a30e53ce08758838c36673b1e519fdcf4efa472973cbc SHA512 8f54993f957d8d93da495530dea25734f9e5fedc1d5dc17aa4b517daabc88f8162ab2565159a51daa203ef2b039e80122e009bd23dab862be87ad5a75e072546 WHIRLPOOL 16173559238a05bf0f2ba42a3ee940d571847a370987e785bcf123683689dec54c4e7288073f096a7b798c2a3dcc7145ab24f30f0b4b512754dc747e61a04cb4
 DIST gpgstats-0.5.tgz 6691 SHA256 beb3c5037b27e1edf10c47ceefaebb39c7f75b42b376a03ba3d43d2e219676d8 SHA512 273f08af37089eb43cee65fa06ff8023e1951fa4649bf208e01d6bc453e4131c11128b511c6cbd8396a7bd93722904e8930168656994e3d4d055024c3d5fb649 WHIRLPOOL be8d7a3d905ecf18a52e528d9c450c95900d1175b62ea2c6c708829f6fe230b1f67e75160049a3419c6c8933e14dfd3b33372d8913b9fa71a3f9150e7db4a63b
-EBUILD gpgstats-0.5-r1.ebuild 648 SHA256 687a097b9a68faaf5709c5df2b8a53694cd1dc752ce85125981ff9bc129a57fb SHA512 e5d6dab96d5f0dbb4b30537cfed2fae29c4b1df2a93e3d60f501774f3212de15db80f792f3d09839dbe4c2b1509a1eb2263c796dc1b5cf1e3ef041e06db96cc0 WHIRLPOOL f84b5f3ad9ff1ef696aedd26534a8ebc788f48eb6018b4670fc6537451e603134764e974b17ad8c30d91dd72fca290bd0fa1c94d399e9ae6fa0ea0e4727c5e6c
+EBUILD gpgstats-0.5-r1.ebuild 597 SHA256 0ab3dfc4036057cea37a5a05fefa80bba20ea8462c70d12ac652f573f898cc90 SHA512 014f80d2eddc3891addbc26a3e0f5163778c9892a18ac2e035e6e0af2adaddc93af6c2a9989d3c88d0da0736e18f71d6fe16a0d6c0f407bb379823be3d18a280 WHIRLPOOL ab515e7ded6424e2f000ddf5113571ac07ec15a6a07f88dfee733f7bc20480faabd6f67b9e8bc9d253ae93308510bfedf6f7f07d29016d3c20c368241687f23b
 MISC ChangeLog 2466 SHA256 544d63d822af1b4d6a0f89cea5dd7ade51e18d019f149c236b7ec8a9fb02d588 SHA512 2b51ec67e6aae0ffdaa8ec7a503f9dfce0bada4bdbbd65d4c68d0b4da2af9370708324230e2d62b8552e660496570bdbbbaeba5ba824925a7b268630296a7ffa WHIRLPOOL 21afaa74e06b67c23941c0dc1a4e6b7c026819c1ee561e103b32fb4ff9620da93b209b34c2fb15adf4bbff918c49c6204ac9421b890f458ef8854acc6fb1b734
 MISC ChangeLog-2015 1215 SHA256 495c48c95b5417e1ef7596a43927d39a887126792eacd44c77b4867409c2e48f SHA512 eb7fc81729f3fa22d79952e864abb72d4784acf6b4eb05c275a726b0160062d88da5b219efa4dbdf481d66a79a21af24cebc4cc86b4dd6e31a7f5ceda3484241 WHIRLPOOL d420a89202610e74988ba5c7f58713d22ed7009105cab36938bd7bdc14d21d228359f523c90f846d5d2ed20cee7fcd1ad13bbb0d7420065b288decb140b3d1d7
 MISC metadata.xml 315 SHA256 3a46cb25a0895c22304f0c5cda9fe8ec0e64107180db41da6864dd7403a509f2 SHA512 2b356b01e98ef77d3f356dbc758f08c0ea5438a0df80b2b2dc16c90cec34c437ec51b6f3b7f81ea321d9e42ac4016e7c9e83417e476c0ecb1b3741f709a469be WHIRLPOOL 24914ee9f38d640d05cec00a7208b835af06e13698c61b9e2f35e20cda2f686663f87c7cc1629e5bec0053a61a13bb2e4406a3a7c9a473999f888beb557f1a83
--- a/app-crypt/gpgstats/files/gpgstats-0.5-flags.patch
+++ b/app-crypt/gpgstats/files/gpgstats-0.5-flags.patch
@ -1,5 +1,5 @@
--- Makefile
-+++ Makefile
+--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,18 @@
 VERSION=0.5
 
--- a/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild
+++ b/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="2"
+EAPI="6"

 inherit eutils toolchain-funcs

@ -16,14 +16,15 @@ IUSE=""
 RDEPEND="app-crypt/gpgme"
 DEPEND="${RDEPEND}"

-src_prepare() {
-	epatch "${FILESDIR}/${P}-flags.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${P}-flags.patch"
+)

 src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" DEBUG= || die "emake failed"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" DEBUG=
 }

 src_install() {
-	dobin gpgstats || die "dobin gpgstas failed"
+	einstalldocs
+	dobin gpgstats
 }
--- a/app-crypt/hmaccalc/Manifest
+++ b/app-crypt/hmaccalc/Manifest
@ -1,5 +1,5 @@
 DIST hmaccalc-0.9.14.tar.gz 111893 SHA256 5fb659153a5748653ae45ce94700932a08796f972eedb3220750f93037b558a3 SHA512 688a72b4e534ca4a1d45a116c0361ffd389de93dfdeec68e35cbffe0be13832789abaf33300003e12c7317ba473d3a0415f4b22cb3b7b36946c04bd40aa49184 WHIRLPOOL 00a7b2be3776aeb6ecc2baca59694312d1cd4e491671b505464008bd4525c8fba0175baf241936caa7d5a43d16645022b4d1e6475bc4a60d8903d955c969dc64
-EBUILD hmaccalc-0.9.14.ebuild 692 SHA256 4454fe9c5959088df920e42cd6cfd4266eeea6a6b72a14437056b876f7963b9b SHA512 63ee66a49972b1adeb94e2ed565fa05dccbfd265b939acf33ef4d5aadc0c526aabc26c044532b7757b7c6dd51055338e7488361d25e03fcc59a8cc01a7fb7aba WHIRLPOOL f91171fdf52de0b16064dc429ac1927ee0d42d3e4da88fd811f6c697ff827ed874528afc96a588ef0fcd7284e0f358e551ad49d0642af60ede84fccc66ac8c1f
+EBUILD hmaccalc-0.9.14.ebuild 604 SHA256 15d2eb0ded6cb54486a51042e7bfc94ccb228bb847130b8cd5c2591e0265ef94 SHA512 15215c7aa70565d464ae819e36ffcb336a27aaa9a173218604725c6827b9b6918e66063fccd2e20420a0070bce66d257524001e520e6ec7d98047225ff21786f WHIRLPOOL 59351ba466f86ae3bdf854b7b1c5bbc8fbc73b6faf0660f6a6f2dfa71fc0189e703b759e655c1fd42b67113f1172186ba59b330d5835045cd1a623edc09abfb3
 MISC ChangeLog 2708 SHA256 ddb694385f6c93bbfa9b2fb5cae1cf5b57189b52dd035050d1cc87e63f0b6aec SHA512 46b5b775bde34e8e42c9214a94a7e5f141ca2f620fa822f5e6bf3f356ae4273eada1fdfc9f9833539ffd21c7b72e982b1211d04397dc006b0be2822e4c6c704e WHIRLPOOL b1578960447a17a73461e68c0831846fb8aacd6d408fcb94718e74f3902f96d78aea1c1fe35fbc35d7816129eda04c121033ca8e9437cf981ab979394bf1c6bc
 MISC ChangeLog-2015 729 SHA256 55665bf5e430f8d8a689ad50fc4c14f37c522941b81c308202b3fcaf008c207f SHA512 1ed8c6c544e9a6040fef23aae7e8ddf92b66f9bfbb795c35d3d9706eb4710303f1179243561a3c03c2a62d7c3253707c828396f9b85eabe2b857222454d6a580 WHIRLPOOL 5deaa5b7e8d7ebc1c207fd7545db5c7228e253de0e74e4b64e231621cc92a58c5275c52c139b9ad514612d6526a7a5cc15088c6f4d1c7a87fc0852901e9e2668
 MISC metadata.xml 671 SHA256 24efb894a5f17b1be6c58e48459e6f305f3983754b6cb582968e62daa62a9786 SHA512 d4bb7d03ed78f667255e38138262ccdfe33c42707e967817c52d8f445552b9502d6ed1a10a96df7e20cc62f7fa06c2285057a2f81cff1004b28c6e0c20fb17b7 WHIRLPOOL 662369e14132e1d4084e2c8820210d90930366eeccdc2b458e8a6583a7e06372c932cf836459acf36a969255dcb558875f0d89a366f8732278c987f64035a4e6
--- a/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild
+++ b/app-crypt/hmaccalc/hmaccalc-0.9.14.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
 # $Id$

-EAPI=5
-inherit eutils multilib
+EAPI=6
+inherit multilib-minimal

 DESCRIPTION="Tools for computing and checking HMAC values for files"
 HOMEPAGE="https://fedorahosted.org/hmaccalc/"
@ -18,14 +18,8 @@ DEPEND="dev-libs/nss
 		sys-devel/prelink"
 RDEPEND="${DEPEND}"

-src_configure() {
-	econf \
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
 		--enable-sum-directory=/usr/$(get_libdir)/${PN}/ \
-		$(use_enable !fips non-fips) \
-	|| die "econf failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc README
+		$(use_enable !fips non-fips)
 }
--- a/app-crypt/libu2f-host/Manifest
+++ b/app-crypt/libu2f-host/Manifest
@ -1,7 +1,7 @@
 DIST libu2f-host-1.1.1.tar.xz 455652 SHA256 e14d06196aba1fcf80498929e6460370e58b96e8298c57e4660030c045000e3c SHA512 1f6d26d47cabd44391a780f03d88b6ab9ed996bab26e2605f1942bfff2203aa9a8e90fa80c010ccf2e575dbfca3bd03d3322381343cdf6def3829bbe45db8693 WHIRLPOOL 46fc4e087e2679bf8c07922fbd31200d702c5c88838812618c763615f24f7c0ecdc71ed4bd436fde1a9526eea23820bd6f2448040ce711f7fd87ca5c96281efd
 DIST libu2f-host-1.1.3.tar.xz 469480 SHA256 3e00c1910de64e2c90f20c05bb468b183ffed05e13cb340442d206014752039d SHA512 6729dd35beaae1c96283f81794ac6c058ed6446f935a5cee7dc1a3db594201c9f049de6a58ac2e544e1c6ac0c1e9815cce5e2e46a6e45372e419078307a57f55 WHIRLPOOL d14d288d160a83e32484910aa66f027bf8f268e915b9651054089c91ad59818b556a011e818beb527f99b95b972ff3755b081e378b00cea530b7cb4c8bd318fa
 EBUILD libu2f-host-1.1.1.ebuild 1303 SHA256 9c340fef337e4c69c5def72c38446a860933b65084624a312604cb6a6755f3aa SHA512 298d663ca47d309693277838fb654b783b024515adc52e95e4081f6eae5d16293b8b0d9423c4d9970444bb6da6ca36a7807c06e852700c04eb53fb8eafe0da43 WHIRLPOOL 54d2c4b7c2baab153b60d756c467d595cafcc4fef72b6474720b435a31a58417dd094ddd091f2b3febb7e55e09fc67f6313f9f6c8a4fc35c91547c37ad7e9bf8
-EBUILD libu2f-host-1.1.3.ebuild 1303 SHA256 9c340fef337e4c69c5def72c38446a860933b65084624a312604cb6a6755f3aa SHA512 298d663ca47d309693277838fb654b783b024515adc52e95e4081f6eae5d16293b8b0d9423c4d9970444bb6da6ca36a7807c06e852700c04eb53fb8eafe0da43 WHIRLPOOL 54d2c4b7c2baab153b60d756c467d595cafcc4fef72b6474720b435a31a58417dd094ddd091f2b3febb7e55e09fc67f6313f9f6c8a4fc35c91547c37ad7e9bf8
+EBUILD libu2f-host-1.1.3.ebuild 1193 SHA256 32a20debf5524ffe98b824edb0ae4b92099fb8717b08c1554e244790d009feb4 SHA512 1e98d9b39df6715ad0f6954802996c96d4151f225cfae1574452cd0b6cad69705bf6e264aaf7bbd250c145a27fdcbe445d0815aff1135da4ee3441ff38308d2c WHIRLPOOL db7a8e1fe8c71fbb248bc82b95a64516e045a848a3131fa3a926eb173a59b15e1d9bffea93c621f800c7ca266c8571da59c4d6d366f8ee23efb7352523bc173e
 MISC ChangeLog 4413 SHA256 db38bdf129aa2b6d33fdebdb09519f66f8acd5e3613181312320bfb107280bc9 SHA512 ca8361d00bd6fb0095014528d87a0dc1e9e7572c3362a8998d51f997f1b6e62ea6b1d1a291d72dd9f3389289927bef198afb1fe7520d666c65d0993616a3e095 WHIRLPOOL 5d3cbaaa853748b1703171084cc71732598190085457590756114ddf329a9c04d66851a8ef868a7447c2e34f519b37305a189dfa497745e655832f95d3f69c82
 MISC ChangeLog-2015 2133 SHA256 3d7ffd9b6837711427ad55900ae8d1b86604a402bcbf68eef1cf0b2505b7a0bb SHA512 1b3d77426205539397fe682d3aa87610959b60753317051bc61d1f4453dee35423787f42eb826bc3109f21f11a45443886dfa3efe43db96d8a10bae70788e63f WHIRLPOOL e5efbd77cd337779edbff94d99c6a293eb7465e449d44d3d46f2b5dcaa35bb82116565b46eb6e7fe850f9ab5916a6ef7501a95a9bf1998835d4a1cefccf9bedc
 MISC metadata.xml 550 SHA256 e41a2704d99e076ca470f13f43fb46913b1f3d28c53b8718d8a4af17a1b8fd35 SHA512 9970724fffe49705d8dedc85522cbe3040c4e542fa5a56c2cbc428df2540975e76a84fe8c4819bfaacc085cccdf6e5a996a058c14f561b9ef10c7d705f98bfa0 WHIRLPOOL 5e51b7e276fbb5b6278e1b831b90cc14baca8ad5e3a2c99a2b65b86c6e3a4d136f35cca805b3352f702dd4ebdfc1762048e22f2fb831791bba006dbf55c488cf
--- a/app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

-inherit autotools-utils linux-info udev user
+inherit linux-info udev user

 DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
 HOMEPAGE="https://developers.yubico.com/libu2f-host/"
@ -34,19 +34,13 @@ pkg_setup() {
 }

 src_prepare() {
-	autotools-utils_src_prepare
-
+	default
 	sed -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \
 		70-u2f.rules > 70-u2f-udev.rules || die
 }

-src_configure() {
-	autotools-utils_src_configure
-}
-
 src_install() {
-	autotools-utils_src_install
-
+	default
 	if use kernel_linux; then
 		if use systemd; then
 			udev_dorules 70-u2f.rules
--- a/app-crypt/loop-aes-losetup/Manifest
+++ b/app-crypt/loop-aes-losetup/Manifest
@ -1,9 +1,6 @@
-DIST util-linux-2.21-20120228.diff.bz2 43809 SHA256 fc28d4f0e2737b53a4db59072ab0fcf4180a8ece28c79219a21780124798572a SHA512 94135ed18699efd949f5937576da2721957177bbef9be8234ae48ee34f30f4cb65361a541f79c636ed6d6bb5c2786e1096d096407834e1421d82ee78ae0790e9 WHIRLPOOL ba23dccc56fc49d7ad9075537317ad4580ace2a4cd8f6b0250f42035c03ba910f3cafa8e8b1da4c7e5a0960d74c42f2706fda579a3b4a6cadc61dccd2fff3ff0
-DIST util-linux-2.21.tar.xz 2954504 SHA256 5192e8ba7dcf3cf0dc447f07b3d177f6cb3fb49dfae54ac45d6c8c7d86eeab0f SHA512 aab384db2d1a3e08fd560a3e4d7ed7d6b2ceac61386db94eecae65bd540200a8549e141b99d8dad5c6f96587940b574d0544984acef6a35d1f24870e0072c552 WHIRLPOOL 1968ddd63fd21ef9542bb8afc77292ed2bad6f83e1cd67aa4159db8b320abd80ee0d20a062df35ae2ad91e0bc9068168b9f9e44aa39eaf4861d436dd855bea5d
 DIST util-linux-2.26-20150310.diff.bz2 41017 SHA256 18d88810d5d6e95313c23162566bcf7e1a7b785bed5dd395127c144127c9e9ef SHA512 c8e7d7a4795d2ed75af5e0513c19510ca649682df86655ecabe1563586bdb46f32bb9abd6cfb09df230f935cfa396e0d63b1545a40a5f4ce47524a82e7dd7ca6 WHIRLPOOL 2ca00b9ec52b64ce1e083b9a706003d1f0445fb5d7f391e28b698c684dba5cb8bc2a590565dcc23ac6527b8099838435b86e7a78097ab8a19491fe14b6c50ca6
 DIST util-linux-2.26.tar.xz 3847960 SHA256 a23c6f39dea0ed215ccd589509ffc7bb6f706f6e1a04760f493fb0fd7e93c489 SHA512 af07d49a433fce683da7bdf9aea5693ad108aa16166e0147716175bd779fe5090029617dd7db153bc0f5efcf7bdd377761a616efd4cca90a87bf317132ede88c WHIRLPOOL 4f7c9463bfe1523819671824de26e051c496c86884ca34b25208762179345c799fe61e566228ebfcbca2f2b63163539e37b06e438a58f562cf7b53f954564150
-EBUILD loop-aes-losetup-2.21.ebuild 2603 SHA256 76a313d3e275af0e5bf95ff2fdd568ec1a5c1b984a7d9b0c1219ddb59be94d7b SHA512 366afb6d299df865e53e2cd6e14dd4e492812d1efa0e6714fa9308106a6e0cb1cbeb486c5dd8b393a730667eca0a8217b44dd0c16d8b350ca739892427487b6c WHIRLPOOL 299653b32033fd6a57824c75407ea3ac259181754fbec9f7b4893cf782da2a275e2d2623b253080afab635b6448851bf6326afd405305187042dbf780765de9a
-EBUILD loop-aes-losetup-2.26.ebuild 2282 SHA256 b0a9f7a1b527327d65cc4d9ca0ceed7af573f6b0f542dbc640d5783c4b675fbb SHA512 6022b82bd24417ddbf082b3bde734d4241dd0cfed0126ad0d652fd21b0102181ec81f4297911bb1922795998a6616fe68c467a1db6094334e82ad691644054cc WHIRLPOOL ed10973715d1f7bb5c42c8823fa3b0fdcb1f52292c1c38d7e663cbd69fa6c94495a629f2abf590d17839dee847b271adbceedb6b75ff999298649bc226064eb4
+EBUILD loop-aes-losetup-2.26.ebuild 2291 SHA256 4109f702cc8de9460082375472917e12fa022a2e22c7ecfcf9749fe7dd19f50f SHA512 87463970e7b832a2169179868169f4cde46c2601c6624595229710292dec139fe549c4c49841d75e1db8b1017137f4a67740a65df671ef92ce63f315b9db0e09 WHIRLPOOL 4c489d40d716898c7052bddd3b374356327ff6b0ece0685aa4beb40002afe0f5475042a359bd2e572430008b1bbb861324b760bfa99b1bae0056c0a951e15adb
 MISC ChangeLog 3464 SHA256 2eace3ab41d744146f316c61ebee3496bfc7a89ec32d7940d0b59786a6cb8e59 SHA512 c0d0f4ce45927b76b515e9517e8cac18b69661a63650229bde42b38f7bff3733c2fc94f54929b4a997fc1bc8897b6bbaa43404c277451a39bc43aa7e47ec97bf WHIRLPOOL feca1a95fb9eccf93cb728273fc4c477b39709cf17ce509310c02bc728a024f6b3b7549d75265da7e02a8cc6c9d6fb84dff32641bc093ee0eb2b422eaed4d67b
 MISC ChangeLog-2015 712 SHA256 6f90106007eadd547894ff998ef2b1c3799cb3f90efccae8306d6c229aa160c3 SHA512 39277f20bc45bc85aa1756b5dd1e78d6a307b896989fa1ccb6f5958c0237fc4190acb3549e2fd9842486f74f056af518b42cf9e210eb163421c1eb20063ee116 WHIRLPOOL 5ed8049747d2055b75b0586a4c98427389d091c3a521f272897ee63e7f869d462928982d721c0f7ebb88e65100e192e2cd9f8925e2a7080d4363990dc29d967f
 MISC metadata.xml 318 SHA256 a980037629c41bfe0eae2f18978291a66d249c8b3072ebee3fa786c23cc4453c SHA512 93c67a250f19a2a17bde884a0f493b5b675ae2e0b4dd89164dc8a052e7adb9b2b5ebd07a43fb5432a8198216134ed3a0eca4b14bc98b9be71e9d947f51b77439 WHIRLPOOL c5253ad1c639309c61950071f2e0bf460b381e1288cf97c6b232375033eb627cf979faf562765452b51efc00b4b9e9fb43ce40067220ec571ab15da2fdca212b
--- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.21.ebuild
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.21.ebuild
@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-inherit eutils toolchain-funcs flag-o-matic autotools
-
-MY_PV="${PV/_/-}"
-MY_P="util-linux-${MY_PV}"
-LOOPAES_PV="${PV}-20120228"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Loop-AES losetup utility"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
-	http://loop-aes.sourceforge.net/updates/util-linux-${LOOPAES_PV}.diff.bz2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="nls selinux uclibc static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/os-headers"
-
-src_prepare() {
-	epatch "${WORKDIR}"/util-linux-*.diff
-	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
-	eautoreconf
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.c
-	#define _GNU_SOURCE
-	#include <fcntl.h>
-	main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.c
-}
-
-src_configure() {
-	lfs_fallocate_test
-	econf \
-		--disable-agetty \
-		--disable-chsh-only-listed \
-		--disable-cramfs \
-		--disable-fallocate \
-		--disable-fsck \
-		--disable-kill \
-		--disable-last \
-		--disable-libmount \
-		--disable-libmount-mount \
-		--disable-libuuid \
-		--disable-login-utils \
-		--disable-makeinstall-chown \
-		--disable-makeinstall-setuid \
-		--disable-mesg \
-		--disable-mountpoint \
-		--disable-partx \
-		--disable-pg-bell \
-		--disable-pivot_root \
-		--disable-raw \
-		--disable-rename \
-		--disable-require-password \
-		--disable-reset \
-		--disable-schedutils \
-		--disable-switch_root \
-		--disable-unshare \
-		--disable-use-tty-group \
-		--disable-uuidd \
-		--disable-wall \
-		--disable-write \
-		--enable-libblkid \
-		--enable-mount \
-		--without-ncurses \
-		--without-udev \
-		$(use_enable nls) \
-		$(use_with selinux) \
-		$(tc-has-tls || echo --disable-tls) \
-		$(use static && echo --enable-static-programs=losetup)
-}
-
-src_install() {
-	emake install DESTDIR="${T}/root"
-	newsbin "${T}/root/sbin/losetup" loop-aes-losetup
-	use static && newsbin "${T}/root/bin/losetup.static" loop-aes-losetup.static
-}
--- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.26.ebuild
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.26.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="5"
+EAPI="6"

 inherit eutils toolchain-funcs libtool flag-o-matic

@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 	virtual/os-headers"

 src_prepare() {
+	default
 	epatch "${WORKDIR}"/util-linux-*.diff
 	elibtoolize
 }
--- a/app-crypt/md6sum/Manifest
+++ b/app-crypt/md6sum/Manifest
@ -1,8 +1,8 @@
-AUX md6sum-1.0-cflags.patch 791 SHA256 dfda1d4ef71d3552f269737a9f05c5ed5215083dc615f54fde1143fe2ab6cbe0 SHA512 04a306e9cf5faf9cae8518c8861be2963a67d1fd3af991d4a7f04819c8b793a75a7a7debb96e5f2442736106825c3818a3232827fec0701736fc9d0c9dff8d7b WHIRLPOOL a634445ab23f3232f5f33913b9fe9354e4a3ac2533e97603a23e351228e40b7fc42f5479feb74a9569838ba730414885cc0a7960ff62e420a7a03ef624cea6e0
+AUX md6sum-1.0-cflags.patch 791 SHA256 1ce1b6680745083f0ec273be081cdafc9c96da849a674654fa926451cd452346 SHA512 dbd6cadb05b4bcf6dae2efc970de71678eb4f78ef7ee743c08b17782ed052ada29c083da94185a7a37c461823e4c6c10a978bee79791e2e8dd22e604817813b2 WHIRLPOOL 6fc17b7ef3f06ed4482d09feb9c871867d872c5e2ef54ac07935987ca85ad656fafeea945e4a0d931a3146174ae9a3bbcf35d6f3588b3a8b6b17abba8703a3d0
 AUX md6sum-1.0-format-security.patch 620 SHA256 13dec5c113e66d50eefccefbe3caaf67cc2d36923dcfbb61172e6ff6b5594e8f SHA512 b1ec3b1479ce58e9e2aa4a43982b61932d7ed099d1246dd00e7d6f183b1087dda7c446a63ceea06006ee905a167bd3cb7485d208d95a7860768b680670f0fd88 WHIRLPOOL 84074d09048142644ee6f425731b365cc0fe1d692413fa4d9dd202f7b1b2d8721394f4d8ce1cd7ce61585b0b36a679731ebf3603c18b474ad5980e540fb449ca
 AUX md6sum-1.0-ldflags.patch 427 SHA256 699b86db61f451a07a5e1c3f69e51d4e159ec486b26cc547f52996ff7a75c07d SHA512 2ed3dc38eef78f365bd8e03e22264488c6a0d089c30f827e90ca5dd5ada9ad061e0c1a736c3ccc81c05fd172ffc8140034d703993233e5e3f8877cfb298fa1a1 WHIRLPOOL dc24ad00f6e2c9d44a58bad7ad94e6863b71386bbf913f58b3cbf058936ebb57778fb042c34fdef1f8a62184ca0875cf6d99e32327e3e7018431dc9a4c9aaff0
 DIST md6sum-1.0.tar.gz 125626 SHA256 5812286dabf26d576cf9b30d3088da1e7924362442144ecdfa38738530e297e0 SHA512 8253a68dd036dd98b22c39a35a75f9bbdc4018ea63dc8f7823c831090d19f2f92a727458b4dc35388e494dbf496b9f5de693a1cfb3e5a8ca8441f31f0e817d46 WHIRLPOOL 05d3e1c8c5065b8003e620b3824310393ad64c22e94d4e3acc18f508e5a6461ba222c1b53e782616a0bd5372c3cadc7e774b24e9782e8137b1336af5740b0a04
-EBUILD md6sum-1.0-r2.ebuild 543 SHA256 43780631d459e21cab6e900d5790612e173e644e23306c93d8e9e1b85d071c69 SHA512 88f502e27b880fe39055f48d6c07a1498874ea7f4e3474710a764eb3776331043012c803ab189937911cd6436f67e167d1fe85089d0e5897b68a7c61654f692a WHIRLPOOL d72cb76db943836e0557f6bc781901b7b7c4b3625216083011c87a897493bdb10868d138ab5e4d210009cebc24cc793ae9c26b9584de7f556f14654167320f7d
+EBUILD md6sum-1.0-r2.ebuild 452 SHA256 e1190dff3d0bcac7597338de5428e5084fc5d39acfcaadf77f59398f1f73a60a SHA512 a4ceddbd3085cca410a10aaed2d1046413b9c24753a1f409156885ef0e521333d0161f7d2bc0ba8a91e42c0a40e51e490c89ff5b7632d101b6af724ddf58ea03 WHIRLPOOL 54bd4425545d0153b2d73d2faca23e659645f2f36787ce895d76b27417fd40673570d6e3f479c5ad8ff229d0b2102f6f0de71633187c63916f51a8a0a5836067
 MISC ChangeLog 2535 SHA256 b354f4e3a2ca83e311b789737fa901c86ba29a03357b0c5bf74696112c812718 SHA512 f06a64e0a0fcc404b3b9af6566ff8260a7dd829fc64b60ec9a545c35d93e3fd47aa73018be0cb02523a8f6aba2102949813c75b81c7ab9f75094994ccaeeb362 WHIRLPOOL 2fd37fca5d65bdcc24eb6f4c0af8ab6c2416881e2f332a545d1f9ae0511f2c95d8c92e3634fc0b6e10b7d78a951924c21517ca8b51a1d6c1720ee65a986fba26
 MISC ChangeLog-2015 1653 SHA256 5e699e799c618e2c0e48a57394bc2fab6b59a61e790002a65072ee9c2288bc9b SHA512 c94c795c7a03aa6795c71734a20705a85ecd1ab0c39892f019b737f5d6d482f125fe2c07c1dd1bcbcaadf1a80bbf59a2e9d82b17723792c23f15db12be32f94c WHIRLPOOL 0b9bbd94719897be06ba7d7c1d7a79264fd6cedffaf22d0b1313a134fb20fffadf3a9a10cbd4ab6eb2626cc7a8a2a8c7b4c31d65406ca10ddeff8ed76fbaa25d
 MISC metadata.xml 364 SHA256 fce02a08e0cb87ca05fd303d14f83ef9550daa8bf0fd664398e50195e116c524 SHA512 c8bd77c057b300967d680333ce3dd62b1f142d6ef0afdd718fd85f5c296e272edab301bd557460e7a3f0e104ab2f6d810e83262a52f5e820361c72a43e373aae WHIRLPOOL 1329d35ae3ce7dfa22a7cc3315b061d7e5eca51394fd3822914242e8317dd8972812159852926aa15ce583e8362ef225eb8ad4754a773a381034fa470eca76a3
--- a/app-crypt/md6sum/files/md6sum-1.0-cflags.patch
+++ b/app-crypt/md6sum/files/md6sum-1.0-cflags.patch
@ -1,5 +1,5 @@
--- Makefile.in	2012-11-07 22:04:51.207982344 -0500
-+++ Makefile.in.new	2012-11-07 22:06:00.905977580 -0500
+--- a/Makefile.in	2012-11-07 22:04:51.207982344 -0500
+++ b/Makefile.in	2012-11-07 22:06:00.905977580 -0500
@@ -18,19 +18,19 @@
 all: md6sum
 
--- a/app-crypt/md6sum/md6sum-1.0-r2.ebuild
+++ b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="5"
+EAPI="6"

 inherit eutils

@ -15,13 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""

-src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	epatch "${FILESDIR}/${P}-cflags.patch"
-	epatch "${FILESDIR}/${P}-format-security.patch"
-}
-
-src_install() {
-	default
-	newdoc README_Reference.txt README
-}
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-cflags.patch"
+	"${FILESDIR}/${P}-format-security.patch"
+)
--- a/app-crypt/mdcrack/Manifest
+++ b/app-crypt/mdcrack/Manifest
@ -1,8 +1,8 @@
-AUX mdcrack-1.2-asneeded.patch 1372 SHA256 0644ac0be6b990ab378655aece4f7e31f41260688d72783b86fa4016ca20373c SHA512 3d23ea8d96b5846d88b930bd63f4cd6a582b10b37bf6f6c2daf7b685f498ed58916374e62660230a2490186fa59029b89a663a7396fba921df4a6fdb1d5f1208 WHIRLPOOL 8adc2d1548872db6b0f2be22bb54fb6ac63b8340edaa61678d69e201b61cd8f0e5c5f63d6ed2f699dba9b5d2640e31ec16f9b54875dd8fa7496d766afe4b8ce2
+AUX mdcrack-1.2-asneeded.patch 1371 SHA256 763f35ff7d4630e4904568107500965138c64e79bb3ea94c75860337c6fe4ab3 SHA512 5e5aabd01fce2fb8fabcef4ef19873f4ebdc5cd2349dc49a327ab2560be7de2cf8bd85cb9282c2e458e55bc854ac84e301d4a418d0b070cb50e63ac608fb8fdb WHIRLPOOL 4112c6a0b27560c3346c000f1f90a281d235831bd2478eb9b83041c63a00f1ea16491ed4ce56429c533e4e1759a064c86ec68eb294b547ba42e580ee6aa4dbff
 AUX mdcrack-1.2-gcc4.diff 798 SHA256 b803e56979a23c501794dd1ab02c10bc1cecc4ab7531cb5bd2f75a4691260877 SHA512 9c808c882f7558b3e08bac37de01a6e15eb453cb14b03d7e9022f001f498f4394c872b94cb78b02b20b12a34fd359d43604ebfb818cef51a67d3aa191fd363f0 WHIRLPOOL a0db5ccc0f30dd2ffda1b30af9fb3e703018e70c5f417bf8701f098dfec750f9d6231926678e8b21d2f1db348c52c728516a2a3b39bffa6d0c355e80e53008b4
-AUX mdcrack-1.2-remove-interactive-test.diff 6871 SHA256 afdc52e2d5174f81e21cca483702ae41102877f72313374c593f0d9642fbbcf9 SHA512 fda981d6c916d923deff3e100280c5e1e7515304a085d57affb40dea9eb9ea146d88ef0c3912ed86eb999ba324b9c289162ded0c66fda329eba4314fcfb730a0 WHIRLPOOL 2386b3b549925ce9d95feda495396749f177ce4e2ef1032ce13f2eaf25a946f5b40bc06b9df1ee887c8bf758f67a4045716e766c246d637355bdd2af37477260
+AUX mdcrack-1.2-remove-interactive-test.diff 6873 SHA256 a432c7c58407d1804e122773ab6181e9c58f9e6152a65d9d244cd3b16a378ba2 SHA512 899e35bf8f392926f01f43fa4d45671f34bf586206ed40aac0262023d60435bad1c1d655bd34be94e2c9b263e69a607a0d25f7d17931b4540a7663f581e22462 WHIRLPOOL 52702fd7e60aa75b951803f4fa782226a8e7709b92efca690d2f84cfebea135dac154ce6f33a91a151ace0b3d2a92fe5e8b7317d4b41cb3425ca6d7235f2d198
 DIST mdcrack-1.2.tar.gz 60261 SHA256 b68dec25170f177c70264c5a2863a70c28011f669db56a8825ae4ca28b1f5825 SHA512 1a0ec91e19c65ea5c94b988a3a40226e2996adde26970e847ee3756263e65201751c449e6a29595b67314480be10460fdb2ebb31b5e734039d777e58b42c2965 WHIRLPOOL 12ae6e72a2145a09dfaed7e5d95f383c15d8f2187ed8bf1004e17adb783bfc535ff28c15fd94935e3ce2c58b8e8a874e35368ad482b9ecfcfbcf68df5717b662
-EBUILD mdcrack-1.2.ebuild 1199 SHA256 f2652c715799d642c6132282acc83e6f9c971c434144a5b031c5239ebc06151b SHA512 61baf5082efbb5fa165466e8686be3e660d3dc1cf871ef2cbc23e1e62185b00a78037a9449572ef6ce424e497c1f9395607027962a1ec51e5d5c937a1e1fdace WHIRLPOOL dc8160fc1e2133b1a80126264ca960e0c49c2d83a7459fd89a8d053a9ec60f365f975ed378f760844351f11c218959ad0426ad244cbd6091f43f61afd20a6e08
+EBUILD mdcrack-1.2.ebuild 1149 SHA256 c05cc87b7b96ddb03eb85502bc97a103a3f415d7c12651c373e3ef762bc8ce56 SHA512 3c62969bd68758d41e97356114f327fa070f78598d295655679a200439c334aeb6dee53f36f082f01b8e2ff3cb3ae3385200cb55c8f726a0f5ced26ab4096389 WHIRLPOOL c43fde7b861f3f2a8068b1875c38323217613c8e2b8cb3779218bd9b8af705fa522e503abd775273af59814f6ed200142e9c36daf2830601044d7b765caa455b
 MISC ChangeLog 2542 SHA256 69ae79c4e83375a447a087f26c74d4005b86be274500905a9d8c33e297bba9f5 SHA512 db0ceb69cee9672e60ae518f37cdf0fbf7f7fcc20a5cc5b2a200f307be7c3835aab3ca5bd184ead33ea8df08053955f35e19e7f49c08728617b84d6ccb5bfc48 WHIRLPOOL 993861aa9c61ccb799cea984cba70744262feeec57bf8c107a9a234c7fc03de6881d0135227b0acec427f5040bd79dd371687da91f639efe0ee006875159ba5a
 MISC ChangeLog-2015 1305 SHA256 648490f64c21aa9afe12cc001eec2d8e0a4c65c6f27aa8b0ee81026d1ffa5142 SHA512 d37cb17d1383ab7a64a7121eb0372d80b0426eb3d6cec3d90ef52634082b057ed31d970df8924266bdb11f012fb9294a56e90f575f102328e9adce74d14a0bdb WHIRLPOOL 2285ebc1f13fc8d04b2f19709dc3373b79719982a3b85b56304049000f47ee9ab5ed9efd05f973cd223f3b32665e82e23b809f0093a716b7b864385dccd8e09e
 MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
--- a/app-crypt/mdcrack/files/mdcrack-1.2-asneeded.patch
+++ b/app-crypt/mdcrack/files/mdcrack-1.2-asneeded.patch
@ -1,5 +1,5 @@
--- Makefile.orig	2009-02-10 17:06:52.786706429 +0100
-+++ Makefile	2009-02-10 17:07:15.947791244 +0100
+--- a/Makefile	2009-02-10 17:06:52.786706429 +0100
+++ b/Makefile	2009-02-10 17:07:15.947791244 +0100
@@ -56,7 +56,7 @@
 NCURSES=-DNCURSES 
 
--- a/app-crypt/mdcrack/files/mdcrack-1.2-remove-interactive-test.diff
+++ b/app-crypt/mdcrack/files/mdcrack-1.2-remove-interactive-test.diff
@ -1,5 +1,5 @@
--- Makefile	2010-06-28 22:19:55.000000000 -0400
-+++ myMakefile	2010-06-28 22:20:03.000000000 -0400
+--- a/Makefile	2010-06-28 22:19:55.000000000 -0400
+++ b/Makefile	2010-06-28 22:20:03.000000000 -0400
@@ -47,7 +47,6 @@
 BLOCK=-DBLOCKSIZE=50
 
--- a/app-crypt/mdcrack/mdcrack-1.2.ebuild
+++ b/app-crypt/mdcrack/mdcrack-1.2.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="2"
+EAPI="6"

 inherit eutils toolchain-funcs

@ -15,11 +15,18 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="ncurses"

-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc4.diff \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-remove-interactive-test.diff
+DOCS=(
+	BENCHMARKS CREDITS FAQ README TODO VERSIONS WWW
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc4.diff"
+	"${FILESDIR}/${P}-asneeded.patch"
+	"${FILESDIR}/${P}-remove-interactive-test.diff"
+)

+src_prepare() {
+	default
 	use ncurses || \
 		sed -i -e 's/^NCURSES/#NCURSES/g' \
 			-e 's/^LIBS/#LIBS/g' Makefile
@ -29,13 +36,13 @@ src_prepare() {
 }

 src_compile() {
-	emake CC="$(tc-getCC)" little || die "emake failed"
+	emake CC="$(tc-getCC)" little
 }

 src_test() {
 	local failure=false

-	make CC="$(tc-getCC)" fulltest || die "self test failed"
+	emake CC="$(tc-getCC)" fulltest

 	for i in {1..20}; do
 		if grep "Collision found" out$i ; then
@ -52,6 +59,6 @@ src_test() {
 }

 src_install() {
-	dobin bin/mdcrack || die "dobin failed"
-	dodoc BENCHMARKS CREDITS FAQ README TODO VERSIONS WWW || die
+	einstalldocs
+	dobin bin/mdcrack
 }
--- a/app-crypt/nasty/Manifest
+++ b/app-crypt/nasty/Manifest
@ -1,6 +1,6 @@
 AUX nasty-0.6-flags.patch 468 SHA256 eb36ebe8d6203642e2b7330efde9afc1088bb718a1098a8a98d8df23e8f40cf3 SHA512 56d808209a9ba1fd1fa3b77ed90398cded9adb08c271ed74c80c5dff793413f1e7270ab057bd253c8c1e951dec7e7b8ad6c92976abb7c267109f517ccb81d4a1 WHIRLPOOL 68046281c5be87a01a110d866bf01c1e6f3be688a0db039185334d8042afb566c236597aab4308061965b328a2a46b9d7f3b8f65aa404d2e55619675eabb67fc
 DIST nasty-0.6.tgz 3811 SHA256 7607256d4672f1c52f2603d7b9691e7250bfe3a9b4f219fcbb61227172a7f6b7 SHA512 6803c1ccb843934ab6d2bd173c4cf154124926ee493a79072b351167f7fbbc08f90226ba63d2c591f2ae122d33d7cf1dc6b60e8684dc7ec650c8bcf3f04b3e07 WHIRLPOOL 77f03804ae4f3f8ea91f86cd70da2f63adc105cc50a985a667ec063066205fc388acb33a1464fc748901983ed6fd523b235c572906ff1fd7b7b43b7046e22bb9
-EBUILD nasty-0.6-r1.ebuild 552 SHA256 822b3ef5a9c63fe8c53859b970b33222608e170335db9620cc2cb857ef3015c6 SHA512 24bf3ffd3cb09cca8f079ed8203a8cc06e1d1403334a5a29af7f83f0dd503f97b5ec7088f9c6dde126b4b81b0a8e3c3d5c1831ac6336cccc6745142a8df7e30c WHIRLPOOL f05e0d19e6b4b98938a9a040bafd60e35c1976b550a89afcaad4f15bc7fa8163fb869d9258564fb842b075233b1eb78abfff2516dcc40194600ab34e13b037d6
+EBUILD nasty-0.6-r1.ebuild 570 SHA256 05260cfe0a71162b0980eeff0340c4ed4b957887cbc02042367765f2f6716573 SHA512 c82cbf4ef35aae012ee158dd514f5ee558bba480e9c5b2943e6c1c3774e7c0d6e33ea99473798dd3fb5c4247fabfa1ceb506df3ef5fb03727eaf47c567309f8c WHIRLPOOL f0084ea63aa094f0a30b4efb6289f6a42cabcf8ae82b590137f6f1f8c98b7b0559488c04d572735306cdb6b3f261e8c43ecefbc5fe2a54ef76c069ac7e00a2fd
 MISC ChangeLog 2454 SHA256 6b8095c9c9a7f9000f073fcbf7cee6bbf6c7516a90f9eb395329dba0ec3fb6c5 SHA512 f4b3e1282fcb94ab732732c82d866531fd8df20de241dd252af8e6a660c50ff1368813e8453c923fb54a68b43f67dcc3bbcc340c44e31da0f6e809c323b4ecf8 WHIRLPOOL 7e05fbb8af1598ddc7b8e1d06c221779f1b682b57efed5dc217ce59f09ab79b79f28909d7e35727064b242e42eac5a39b5e1d8b3d2202d10856ffcce31c84171
 MISC ChangeLog-2015 1248 SHA256 e410854a02a2349ede889514824c306abbcc2fb8d782b219b246d9fd3dda2a33 SHA512 1eb878aa2dc23ec8686f141ee39fe5b9ac83e872349356bba7746f8be55d238b4c47be358a1aeb33c34a44deb5004c55bb399e178c229bc89bfe48c78b69beea WHIRLPOOL fef38da97189ba35bf64c67851f361faf517b067ab2a5f4eecf41a8497750e05810edf6e97d257379f9e7e9eb9042705460752cd87cffcd6e78b2ad75cd5cb8e
 MISC metadata.xml 246 SHA256 97a4242ddb39ec753b766e7bd7b94f9486e997be8bdcf8b86b24e2ed72417f19 SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015 WHIRLPOOL 1c881073f2000444080ab705b5ea51ddb4e3f62c4e952a69415e259d9fd367192e9687023e96233b3d3686528a4f8b63dd99000d11486e7a80922c93f0b1d7be
--- a/app-crypt/nasty/nasty-0.6-r1.ebuild
+++ b/app-crypt/nasty/nasty-0.6-r1.ebuild
@ -16,6 +16,10 @@ IUSE=""
 RDEPEND="app-crypt/gpgme"
 DEPEND="${RDEPEND}"

+DOCS=(
+	readme.txt
+)
+
 PATCHES=(
 	"${FILESDIR}/${P}-flags.patch"
 )
@ -25,6 +29,6 @@ src_compile() {
 }

 src_install() {
+	einstalldocs
 	dobin nasty
-	dodoc readme.txt
 }
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@ -1,5 +1,5 @@
 DIST nwipe-0.14.tar.gz 150685 SHA256 2fa879256bad5e2369e325e6cb047651b85eb1e8bc88ce9fc89c1db3f4067a2a SHA512 f218f4c9d1add4f9decff5657767cfc0c38bfc57e834dca1759fa44d3a20d108bb9e9addf810fabc576aeaff5a6cb61ace0eb5199d29f69c18251046ab3a2a52 WHIRLPOOL b5d304b8bbf0e32438d128de30a5506179adac5f37b35be997f5e7deface65c00d1a05ef991c9621c924632575b9c3b6c4a1968125abefc11894ead2120a6de2
-EBUILD nwipe-0.14.ebuild 468 SHA256 1ce6e187275778f7840b16ae8b3e64faf321d5d1686f398d9d37059b357761bd SHA512 bb2790bbf184bbc5fcc13b7da2a92f1ca7d964acb581db5addef4df913f79e6cc7f15d4f5c5c27fddd1427387d5db6c37cc3e5d5d6c70b27dec9f34f30e20f01 WHIRLPOOL a671d598d7bf6fc79f8eb56a450607329db861aeb9ef3e764a787867025562566ae8ce63d6a91b9f814347d03da2612e58659f270886d279ab6a33e3c8cc6fba
+EBUILD nwipe-0.14.ebuild 455 SHA256 10670e29d54f0ec160107ea569c1004eeb13ec6a3243c84bda004fc67f987383 SHA512 915231335f4b61da92869859820c0fb3be28b0cca7a621d66c7ef00632d524830622d908c459004ed8a33c0a44fd1ca56621b1213f27ef1ef87a1509c8ca7680 WHIRLPOOL 9d7744ae1743bd9e6ff97e4daa34d6c8f9f3597eceae9d16c5c1e3b4af3cb9468ddb206b7ce0c91f92f18268f276f8de109b308b9d698bf9cdb1694a8a8180ba
 MISC ChangeLog 3023 SHA256 d44d26d3a0d568b2fa59b3b2fbcdba16535f2fe39a3d451b157b97707e97ad32 SHA512 29521c422f341991cf0a9f949021ee2c9af4e9b86ed800f2d20e4c4c88885e03cfa306f56869d54603bb9b7a9b8d260eabdc3f3dfe096ad917882e331a145d1d WHIRLPOOL e266bcdee94cb4ae61fa1d73764db2361451f1c28f0210d5684a5b8eb64e33d75e3ec2c33004307180501e75093008a15e8b85ced95a5a1e7bd95d5416f84863
 MISC ChangeLog-2015 1367 SHA256 111e3ec33f91e7f0d188fc72f8891af24424595800fe2b29f395b2883a130296 SHA512 9f86fc55279a0b264dfe01bf8a992a1b743ebb17287a8db04a0017129247d2cf387132566131e8f1d6e870fddce939292524074de084a1f6a30002564733728c WHIRLPOOL c70ab24a70a708af0c26303a9d017536df09333e1d317db7f2380f1a7eec41292229b584dcb85fa43796daca988878b5523e05e9ca5fe344e63866c87e10e2cf
 MISC metadata.xml 325 SHA256 583bf61dc712a7afe8051f7a644281d556fec909abfba22175b5e9c2593f8cad SHA512 7e34fed2902e5b4c88a73b8976a9d7e903e5149233d1bd8625485dd54a21f012fabf7585c5713bcba837ba15ae03656ad3fb1b51a110bc5c42e4a9ccb0728822 WHIRLPOOL 570378a900da180657d74512f9cffb159916710a5214d248ed5befc5c7278b515785599644e3f44353844d8c5dc8544deffe9bf35f29733672f4a7aa37f67bd6
--- a/app-crypt/nwipe/nwipe-0.14.ebuild
+++ b/app-crypt/nwipe/nwipe-0.14.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 DESCRIPTION="Securely erase disks using a variety of recognized methods"
 HOMEPAGE="https://sourceforge.net/projects/nwipe/"
@ -14,8 +14,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""

 RDEPEND=">=sys-block/parted-2.3
-	>=sys-libs/ncurses-5.7-r7"
+	>=sys-libs/ncurses-5.7-r7:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-
-DOCS="README"
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@ -1,4 +1,5 @@
 DIST p11-kit-0.23.2.tar.gz 1022733 SHA256 ba726ea8303c97467a33fca50ee79b7b35212964be808ecf9b145e9042fdfaf0 SHA512 b665d89f0d752a41b01ec53e29c801c4fdcaf3f21fce524984b10acef0477ad5dbac085edd35ffb747423d0e1e09660b8d29501c979cf54937d3b9d2561cf18f WHIRLPOOL 03ffdce4b96682a7283e9d473f90f2c50be7de5930e1b3cda420bfd09002f3b0bd23351d5edf97f63f6df02545994628d97cf424fc92f66f3ccb04342ddab21c
+EBUILD p11-kit-0.23.2-r1.ebuild 1340 SHA256 f1a4b83545aec5bc1c6d461bbd4a25e9067920873216c828e9944d61c6c89d0d SHA512 8fea30100a6cd54655b63a6abe707b78c8fb7e0b6191fee8d1bc78696789cc8f8fd412b4a9cc1ade5e663ff1f86c1392a33aa1299d52ab581d4d7b882df9728d WHIRLPOOL bb6d801f1dfe198ee3eed968d3e235f849883201512af0ddaa424e5190802a1f903b6e7ae1093e3bb35690dbb75617dcfefb0d2c4317428ae59ff91053937475
 EBUILD p11-kit-0.23.2.ebuild 1317 SHA256 68f084d3f1a8ff55e7000d6e71a56fd45bb092393e9e9df3e2867ef68410297e SHA512 dec4413d34df7485ed4fc24141828345a84f6a2d0cb1b774c293176ea6145ec9105bd8cfbe65a25a57684c60fa48b546836014c2e35ac6e382bdd823498ecde8 WHIRLPOOL 6b856ba7f6fbbd5a807e61db15162b8b4caabeef5958f1c36b785bd40dbc2aa9f871d608347f4412fb81c9ee7bb8fc3ea7de67b2ded83bc4455b81e4e9f7cb7b
 MISC ChangeLog 4556 SHA256 cde307bc48b70eb00b3f509219511362f24f0d9663287267fc0b902412028613 SHA512 b1edfc6aaea71a3e32cbf0a49737fb8ee2d167acb2468a9e2d8633c5335a3f428c1afe58c64537e84f1e61f148ac92044db2c71b601ab68fa0fb109e39ad94da WHIRLPOOL 6be14155e597edb221898f270965b194e694e0a7097576e75dc9ff7415cb0e124d4f21e22a0f7db79875d08a4fa2ee3e4fff02f9dcde2f5606751bf90bb347b3
 MISC ChangeLog-2015 10716 SHA256 45958a4c48b0f05be46e6c77968f1b7b77c967556dacc6d9d92304747a6beb46 SHA512 d4dd46224a28f9c076c7d29d961f650e7279798ba6d93bac920f9bb03f4da439395deb8cd92414f0aae66676826f9e9505344502e268c15e9c57d1df80682a0a WHIRLPOOL 960b1bacd3c2354ae85a90beaf83a70945362c81b62f75eb5530274ab4a77baf6e3945621642cdd7b14d3f5a3e8314da6ddd98bb169d91b4adf37803f5d38f09
--- a/app-crypt/p11-kit/p11-kit-0.23.2-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.2-r1.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.freedesktop.org/p11-kit.html"
+SRC_URI="https://p11-glue.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="+asn1 debug +libffi +trust"
+REQUIRED_USE="trust? ( asn1 )"
+
+RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.0[${MULTILIB_USEDEP}] )
+	trust? ( app-misc/ca-certificates )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# disable unsafe tests, bug#502088
+	export FAKED_MODE=1
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable trust trust-module) \
+		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+		$(use_enable debug) \
+		$(use_with libffi) \
+		$(use_with asn1 libtasn1)
+
+	if multilib_is_native_abi; then
+		# re-use provided documentation
+		ln -s "${S}"/doc/manual/html doc/manual/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@ -1,5 +1,5 @@
 DIST pius-2.2.1.tar.bz2 39466 SHA256 82b842b13237a40a8c4e767e06aae419e93c0024f1dd9f30e287015cd5e56d00 SHA512 6380ca3edb045ab25669e1dbf29a9e209f8de2b41b930b81c94a45dc5921bedeebbdc8fb17b494845228353598f882aeefee5ee7dc16b7cc86297e8a333de6ae WHIRLPOOL 839490a6e3f37d78435c76557f588032a829f529300c8d800d4082a4f467fba3a4d36f5764a0b7a16b05e99c19fa2057dd2f7366c9cda3b8bb6c8c37d919e610
-EBUILD pius-2.2.1.ebuild 497 SHA256 6eb719b2ff0c2336d7fb7ac9cb293541e6594bcc3d9903b306b41d860adbe72b SHA512 b808493c1f41fe07d42050110301f890fbc45fbeb4fa724d93f2012233a90302fe8023385e484e068dc0ec458dffdc5f30765887ad6b660bd7842c5bf82c6ab2 WHIRLPOOL 745f7ea87f84d64642d6190edcbfac9756b5a31ea77cf44fd100ec21f6616fc17687bedee07a101c2dae9270311a411e86f81df0474a399e5130d5cb519017ec
+EBUILD pius-2.2.1.ebuild 497 SHA256 d5d7526aee8e6d448726b4e0730b6b51216ebed7b60ce52b9913702779de0db2 SHA512 cfab37023c3827a8a73374d4a90ea2dcd93cba0ef5ecbb87b0aa15d0e87a418826be14eff9c72d9450c1db658eb2b89572b4439b91b26043084bd434d3ae74b3 WHIRLPOOL 0059fc7dc5d7c5ce053e0c38396bfcd6083f815dd257d67c4b4b663b26249cfc2aa825f0b3270e863f001b763acba9f0f727d81d0993b9a41d66756e988e7ccb
 MISC ChangeLog 3584 SHA256 81e2185218df226fa727383f2010f85b7833c672fdcc357cb50a559bfabfde8d SHA512 49a078966c61395d5a519eda08ac9ed69f241a081b8504c3bff398c33e6c02d67659a32eddf34981631332ea607a00e9a7b18194375e6e129ed38f51e3e4ae2a WHIRLPOOL c3fa7ae1a3782e684d152e9df22d7710bd9c8804375b736a690d9b3e721ce407457cae657249d2ecebdeb6839f6b70d255e49b062dbf3de359757f23bec8803d
 MISC ChangeLog-2015 1223 SHA256 1b62b7fa9aa19c347ce1f46302e115fccf4388ae81f4c3929e797979f7e63c04 SHA512 b891c3f1885c787b68dcb77ea016d6e2d100c2c0bec7cc110d54af0f66e0588f25ee0579079888d1b3200b49164bf2df666cbb33e1c628269645c0ed99cc05d6 WHIRLPOOL a76e7b6d818ccab36982224e744b7111cae240a5231568df224e013fa80ed843aa29020916bab91d31c5f250e83ea140a997f9c23c0229fb42d095fd1cbb6640
 MISC metadata.xml 689 SHA256 0ade26c346b860439495124bf460a5e52f296947dad07ad29b8edf165623c432 SHA512 77e117dc545213fdc376935a62d22a0b1db1aaa05fc5fc6ae83e0ffba49693411a451485c519c1bf1a17a829833a90d78472754600ed4dd5f779a772cc480218 WHIRLPOOL 91eab6db8510f8e1318c7495b62298dc7f36413111bfa09a6141ede990a377acbd873ea58f80d0778643112b9677e6a05751824ad2f1244e93c36ba43c85547a
--- a/app-crypt/pius/pius-2.2.1.ebuild
+++ b/app-crypt/pius/pius-2.2.1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )

 inherit distutils-r1
--- a/app-crypt/pkcrack/Manifest
+++ b/app-crypt/pkcrack/Manifest
@ -1,5 +1,5 @@
 DIST pkcrack-1.2.2.tar.gz 174208 SHA256 4d2dc193ffa4342ac2ed3a6311fdf770ae6a0771226b3ef453dca8d03e43895a SHA512 5c64fb9ae09dedc70fb20cd689f432059fcd64f689072b529b4045c3241760fee273ee921da081bc08be2e0594d27101c5d89d99cb2b84e16f80c011419b7200 WHIRLPOOL 40ba854bdb81e3c04b91fa2b9c05a7b6a500a7a697c4384852b1fd5c153a4834ffabe942a249db52cdd32bd39989c97ecb206a866a3b577b7eb9f540cbfd59aa
-EBUILD pkcrack-1.2.2-r1.ebuild 1246 SHA256 636119cc3d97bc4d1487427aba15b1e6741fd60de4faec0350b9835d8dc16ba0 SHA512 5a9daaf60103d7608199a094c625c05e3bbf1c4281505ec17f3480973638ed4da83aea40565db860da6f1bcd605ab3194888cc35c96464c1574d447dd38f521a WHIRLPOOL e72912a66a6e2a5d39c2a57b0077a8831199aa6eaac17550255902ab1fcc20b369c63ce7804d74b66ee735c342d04459c1e1c3f44167b5789616d42a24599c03
+EBUILD pkcrack-1.2.2-r1.ebuild 1113 SHA256 baba108597874250d3716018e9064c0eb8eae27f8d5dd28e1d06c26d705bff93 SHA512 3d8fe4ccd35c0956adc228173133b9824201f3e525c6a2ec471860f62973d595f762e822bc85412b3319dcf145a2de7b1a39649054b356c24cdd30b84a491eb2 WHIRLPOOL d9671b051978f78cc4ba0a95d60dd200fe668dd8b1b741901e7fbf0ae527589cea2b0726be45e9a71fafb006c6e2f31509e96cb8c947ec3e32ddb07cb98645b6
 MISC ChangeLog 2603 SHA256 b104df5adcb58f6f8538fbbcf0b9ca74b51f9982281ba933974721f851a75cae SHA512 25f58c662d61038db0b5fc399eaffba101b43f0dae88efaf61e057b999d0e733bba1a9b7b627b698cf6456f8793a4562f72a200dce0af4efdc150b60c83ac900 WHIRLPOOL b530579e47189ad4e7c11d2e04455fcda19f3b0edbe7494f9b698ac9e2305eca8de6d59e554c877b8d398fca611bfda756f207e21e16c220012e829ecda40439
 MISC ChangeLog-2015 1307 SHA256 e88047d1ad155c8a8520830badca6ca455f60b922de6e04ac28d8b301b088596 SHA512 48bb361ff49b6e32ff111b509d26e2764a82522514da8dabb2e795198db16adf0cacd9e7a4cd62cb13bafc15cda4b6c663783bff139eb66f24064b54a57d5cdf WHIRLPOOL bd0d4cfea2dc1459e2957803a7d5d4faad77c1647d0c116c6b3c30cea603f2ba66851cab7c02e7b2a5c9e5c974fc3246898b205c94b182e759d5356e5758e109
 MISC metadata.xml 370 SHA256 facef2a7547ea497dce4bdc373309a5b4bb46270226d320e9f2d3566ae2a079d SHA512 39a268538a1a2d5932b5295c4727c8769e4648cb94905ccead6b3941a7e8752b3992403f7623497267334f697478dc0db355e42bf2857b415f8ae06baa99d492 WHIRLPOOL 081bdd23a0565811794f8966b1dc22db3eb18bef9d885a3a9a161dd4ff5adaa51eb01528f994a225c8c52fbe606f08859c0e03938a6ce2146a2cd494ebadedf9
--- a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
+++ b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="4"
+EAPI="6"
 inherit toolchain-funcs

 DESCRIPTION="PkZip cipher breaker"
@ -17,8 +17,21 @@ IUSE="test"
 DEPEND="test? ( app-arch/zip[crypt] )"
 RDEPEND="!<app-text/html-xml-utils-5.3"

+DOCS=(
+	../doc/KNOWN_BUGS
+	../doc/appnote.iz.txt
+	../doc/README.W32
+	../doc/pkzip.ps.gz
+	../doc/CHANGES
+	../doc/LIESMICH
+	../doc/README.html
+	../doc/README
+)
+
+S="${WORKDIR}/${P}/src"
+
 src_prepare() {
-	cd "${S}/src"
+	default
 	sed -i -e "s/^CC=.*/CC=$(tc-getCC)/" \
 		-e "/^CFLAGS=.*/d" \
 		-e "s/CFLAGS/LDFLAGS/" \
@ -26,34 +39,18 @@ src_prepare() {
 	sed -i -e "s:void main:int main:" *.c
 }

-src_compile() {
-	cd "${S}/src"
-	emake
-}
-
 src_test() {
-	cd "${S}/test"
+	cd "${S}/../test"
 	make CC="$(tc-getCC)" all
 }

 src_install() {
-	cd "${S}/src"
+	einstalldocs
 	dobin pkcrack zipdecrypt findkey makekey
 	newbin extract "$PN-extract"
-	dodoc "${S}/doc/"*
 }

 pkg_postinst() {
-	elog "Author DEMANDS :-) a postcard be sent to:"
-	elog
-	elog "    Peter Conrad"
-	elog "    Am Heckenberg 1"
-	elog "    56727 Mayen"
-	elog "    Germany"
-	elog
-	elog "See: http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/pkcrack-readme.html"
-
-	ewarn
 	ewarn "Due to file collision, extract utility was renamed to $PN-extract,"
 	ewarn "see bug#247394"
 }
--- a/app-crypt/quickcrypt/Manifest
+++ b/app-crypt/quickcrypt/Manifest
@ -1,5 +1,5 @@
 DIST quickcrypt_0.9.2b.tar.gz 2927 SHA256 c1078bab6f6f3e6258eb01858e2623b244a3b8a87adb3d159e17c908f3d1bca0 SHA512 7b0efbe5aaf9f878233885470ed053124dd3c14fe2630902517388f3ecefda1bc89f3ec9a7edd6d7582f4108bfebf421d593f4b37ed66a7692e955c65003523e WHIRLPOOL 13f6b899b84a74c3a1c83014fdff5026bd5066da0fdeaf4604438f3eb9ef1a39c1c3870c1c5b7bcea7183c08ead2ec52f2b1d2affa6a64894c8b8d47c1f33de2
-EBUILD quickcrypt-0.9.2b-r1.ebuild 566 SHA256 c0ce7532117ffa8c948f3bce3a7dca43ab046a90947e433d4ca66881b4ecdad6 SHA512 b373eaa79e448e7a81a1b3d58a0ad6929aff53ef15bf52e798519224ab1f0f378bc0e712366c265c8009106b1c6abd1f621a6fbb95639909d48f4af67fe98d0d WHIRLPOOL 2260003272e8f61d8446f66379522c0b0668356fb4ac61c0bdb7acdb32b009de8d6d221c091eec5e8849bce856dd3f1b9a99ad5649d73ec8d457b811a1860495
+EBUILD quickcrypt-0.9.2b-r1.ebuild 584 SHA256 066aa9b1e4a5d70f6454414c7eac5c3749583b39b196e9f57b503509263bcbea SHA512 f7b4dc4bff27bfdf2d1ac9398ed00e5c87c3d2665da07e04eaea3c4859bd646e373dad73b81239de7bed5180f9594a4233e01b29904cffe7931b1a716a096e1b WHIRLPOOL aa7a1250bde086b90f1f747ea0268e9cc47b53edfa1176b8cf8a65bdb94537ba07843a48f489186acb55db31f0eb8d7392ca36badfd2e9b705b03add5956118d
 EBUILD quickcrypt-0.9.2b.ebuild 556 SHA256 f637fe48b6a1bf6a62c181784d12c78e2ea7398763899a10934f88121677fc2c SHA512 457c281b9115de1b1d214a24aeb376f6d6522d9f68b8793226ba255b15f12da12bcc9e69177f006feefe27a34abbcbc2493cca1ba646f2d7dfa0b56391c79c78 WHIRLPOOL 5a575dcf3841ba94e62d12f8af1fc957988543ea5b9fa2fd07cf11bde54880ea344e88872830a0c70ebdf7b1c9f79e1b461ab8e2be0d614ca464b9828d2cde52
 MISC ChangeLog 2439 SHA256 e09050321fb90ae630939b53fa73ae2872ae6e11a41a67435a8ab5d76ba00d08 SHA512 d67dccd9219a5c9497d3ce4d2a393dd94939404d761b7f27337a4962dffa6eebfb8776abbd566a33d6e286ffe7bb2013402e8490c8a90dd0ef7182f5a9f1d563 WHIRLPOOL a385f8b90f1ba7da1aa48f9d68eb6dd8164edf2e1d474c05cfa61479b5d9a1a58b31bcd56772586346f24d9212009cbd81acec41d54793f8df72dc46ecee7b20
 MISC ChangeLog-2015 1654 SHA256 b58486b5041161affb2448e8986c4525862fe9a0c9cd236915622545737c8a5d SHA512 33761da33ecf0985cd53c830b382d29602114b9657b71a70293823815f0dd546499b9fc48489879915f9151847ed5d7c2bf1398869ef9019ed45b52acd8edc30 WHIRLPOOL fce1a55347ee15d751165f2d5ccfb96416e9ceb307fc8259ea9e72c2cc917af95dd5b396be237cc780fde47cd2a5a3af382ead331f8785405d4dca522e2b92b0
--- a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
+++ b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
@ -19,7 +19,11 @@ DEPEND=">=dev-lang/perl-5.6
 	virtual/perl-Digest-MD5"
 RDEPEND="${DEPEND}"

+DOCS=(
+	README BUGS
+)
+
 src_install() {
+	einstalldocs
 	dobin quickcrypt
-	dodoc README BUGS
 }
--- a/app-crypt/scrypt/Manifest
+++ b/app-crypt/scrypt/Manifest
@ -1,5 +1,5 @@
 DIST scrypt-1.2.0.tgz 107796 SHA256 1754bc89405277c8ac14220377a4c240ddc34b1ce70882aa92cd01bfdc8569d4 SHA512 81ac8d82c38dc73981fa5bd4c011142c7ccef962a650ed849317a49e8aa66c26f4557dde326202792500a996178784d5eb0d28f909ab630cb05c86fdebfaae0d WHIRLPOOL ae07467b47f7a39dd2a28ae41de4dfc86d7c767a71e29c1ec0db5af60e1bd5897126abd97b8de38f7376c75338564273f98718f167aa0458508ac496b29f2776
-EBUILD scrypt-1.2.0.ebuild 381 SHA256 3ce2247044736846cbd5dc236e167df6270253fd1661a8923f43ea0230d26603 SHA512 48951e31491f5a85232db079468d42d5aabd3d4b4190458f7f58c899af279eb6223a8ab22de062bc580d6408bc1935b6f07b99d8ce0e6d70e7679912a681aa4f WHIRLPOOL ff2af06262c92f2de5a66aa1ea54d7e57d8efb3c53281008d8eb0b2181da3da86ee2c5e4910f87b1d38488b257db5ad7c5ab4aaf29bfb8cb2c70eeb83854a5bd
+EBUILD scrypt-1.2.0.ebuild 381 SHA256 fbc14a671e0823b1e1d663e80263ad3770d8b0c52a5939b91be06024481fdfe4 SHA512 43dd7f6138179fc32aba64ad29b61a247c7d597fb5b27740f82536a1c7df1c93439366b9c9d285ad2dbc5141bfd1539642cd3b8761219cedfb424f563bac7952 WHIRLPOOL 7e1739495b6c1ec5fc2f291b7d8129c3f793227e4ab7fb2316cca68193fbb351a20128e74c40326fcfe7b1a333d054e0969aa013c2de3aa9e8e983048ebb1716
 MISC ChangeLog 2657 SHA256 ff6c6c7436d47eeb52991ba38c1693a36ed17b811e6b15c1c48337155eabe933 SHA512 78895d23ac192adad82f4cfc7673ae98267b8d5d29d1f4f7c7fb5770e97cd1720bad09fa62a9f97ec93f451a4cf0ab15b844de39fbcfee52aed4163cb417b8e3 WHIRLPOOL 27a9bab500154f518127e3824e376bdeb6a41d5d9786bc1fd7768a034c2578a29a66e05dfba37dbbaba77f28f1af58911714f7c8045005f056ef5fc761911650
 MISC ChangeLog-2015 650 SHA256 eaf8906fd9448147f9da7397ff3b61ae362fbcfba01399f4b27db1a72dcf23c2 SHA512 f11880a552afccf29e17c1bff43b91707e800c89542697f8c866c004551307dfb7afc38594b0ce548ec7fb2d57090dd4f35ad7ff6a24b6a430daf66c3c03bbfb WHIRLPOOL 5a4bb1eafc5490f0d75ab71d1cbc77c60fb9090ce8cb9a44e29e0993df33d85caeef80c6ee85775f682cd3ebb834cfab20e953b40764af7967e21f492414579e
 MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
--- a/app-crypt/scrypt/scrypt-1.2.0.ebuild
+++ b/app-crypt/scrypt/scrypt-1.2.0.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 DESCRIPTION="A simple password-based encryption utility using the scrypt key derivation function"
 HOMEPAGE="http://www.tarsnap.com/scrypt.html"
--- a/app-crypt/scute/Manifest
+++ b/app-crypt/scute/Manifest
@ -1,7 +1,7 @@
 AUX scute-1.2.0-noversion.patch 597 SHA256 3a0047c7b5fab182bb1eca460671e4209c89dd84418f1252a9ece7db9b245f3c SHA512 22c167ffe951c58bf53a7d7badc71bbb1daa6995fda60efd35f1d6f85d0be79970f062c2d467a5997a97c957df5fc57f6d5beb827b8e4c5c30edaaddd9299ebe WHIRLPOOL c51ab0a355bda1c37cf100767559120bb7de56cb61e6505a9578f7f060b5a827c5f67b6fe110dc1cb35a6c649f60bf24716d58ad9e56fc986f76173f1ce0445e
 AUX scute-1.4.0-tests.patch 472 SHA256 82e01d265fae09d8693b78bca7dc66540e6c0b6e67b6f45b4789d2a342bd29ad SHA512 8b2a161a3067bd6da284df3372aa0a0d0f92689bfc1ad136985e0b5150f6441e2458e5f5579495e64cc1e54ca1c34459358195add7fd66aaabb0a3787aeb7818 WHIRLPOOL dae6bb4a8650c19007d41216239da910b81cd6cd580736dc0b88c244712ea3549ed9abca8d6728363e7fc013d759bc88657da35890afb576f6c327ccbaea735a
 DIST scute-1.4.0.tar.bz2 772986 SHA256 bd698a853375324c4ff590899c1994be83d8d0a1400fcaf489529646965fb745 SHA512 7961679ce3195aeb3ed1508557c767b59970cd221b569c0fa00cd419e4017b84a851f1fbe46323a4ffb6256c6b91bb037f93edb4f4f7f9f6e0add672b9cc2015 WHIRLPOOL 6e4bc0852d389ac2103edb5bb0c0c260642dcc596862fec55db3ffd51a5fc6cd0752a81d864b36db4544c5b1efbf944f76672806bcaa8305ccf07bb9f817459e
-EBUILD scute-1.4.0.ebuild 1341 SHA256 804e14e3644281bb0f5e828e1c2754020365aec0e01995678012c73533b47cd2 SHA512 9ebc1f0b056bdde9fcaa634316201a99b64890e2a941dbefe4e3e640c0cb54f3f3bd92f877acbd262a9c9928390a5352454e14ca604a9320d99dde531328cd44 WHIRLPOOL 8161dc72ce2c76366c24e5b537f4610e7bda7a1c66447ad6811c1ec3e117c97c57091e1cf153dc34252d674fd1d78f59e69f805a538ba3a61de6618069d6580e
+EBUILD scute-1.4.0.ebuild 1231 SHA256 b7e72bd3a14e63765dca5cf1d4ef061a2196d92f3be46e061301e7ed67cd38e2 SHA512 4a56dfb2d206cddc92c2870befee297e44c4f7ffe06aad65037d9651fb9fed5561249a592e5907b581d06ef68e63ec3bd262720bc96dd222087ace183b3d161d WHIRLPOOL 9fbed24065cfb077882a7c67cf6513c8b68eb8411c79dea6cd7446c7cad6e85c6bbca8980d687716dcd9d50b0fec5ca776a23875c8c6cf8cd5303d63a2e99305
 MISC ChangeLog 2612 SHA256 9b1d236052a97b7acee6bb680e1bb696427ea9ff1b6a6a5e9118b52136408b4c SHA512 0b22bacbeff0ba34586edbe2dc2f05e47a669976ac6fb8127cedb47ecfbc589bf0f8b98fe4384b55ecec629fd9306c2944579067efbfb1adfd1027863ae3be36 WHIRLPOOL 33138d71aa2b5e8ce1b0701755b3d4a575b109c17dd47a88523cbd6e66c8d9d007fcb4e052396a24d2d7e021b6544b401b29cc376dd87ac438bedbcc1cc9c394
 MISC ChangeLog-2015 807 SHA256 019f4161d0fbdb6c11b24db5c0e07a1f4e07d823b7a5e1f6b4e767cca41e7105 SHA512 1a1c95077b8dbb9adbf66037cb5fd1392f9a8b9daa62ea602680ad239d8f34eb671a1e5320808e3ca4dbdc1ea2e39e6c3196ee3a3dea45379d0cdbe41d8bedc3 WHIRLPOOL 6393a2151aebd652c448ae0f4d6609f5632d6ab8938cb400fc8fb1a908e57e5b8064bdbbae6a77612e08ebc228869bebdf81799b564507ddcea045ab37a6d092
 MISC metadata.xml 1080 SHA256 015619dd5b105724cdec28cf247603b961080fab35a094319064248c622e7d13 SHA512 067f8352727d945e9b6b748f297aa91e07e3f52573f5315346f7369829cd45fef9819288fae86f60a475cd470bf423c89d52869b503b1dc434bd2decccf1dd35 WHIRLPOOL a963b3b3add27b79014d0bdfd4b4c652f4477f0ffb5bf9dfff61a5c441913b105ebc564da498640fa98c633ccfa9810d591378b3a6fe9df5c2a95f9cba777895
--- a/app-crypt/scute/scute-1.4.0.ebuild
+++ b/app-crypt/scute/scute-1.4.0.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=4
+EAPI=6

-inherit autotools eutils libtool multilib
+inherit autotools eutils libtool

 DESCRIPTION="A PKCS #11 module for OpenPGP smartcards"
 HOMEPAGE="http://www.scute.org/"
@ -26,14 +26,17 @@ DEPEND="
 	>=app-crypt/gnupg-2.0.17-r1[smartcard]"
 RDEPEND="${DEPEND}"

-src_prepare() {
+PATCHES=(
 	# We need no ABI versioning, reduce the number of symlinks installed
-	epatch "${FILESDIR}"/scute-1.2.0-noversion.patch
+	"${FILESDIR}/scute-1.2.0-noversion.patch"
+
 	# Don't build tests during src_compile.
-	epatch "${FILESDIR}"/scute-1.4.0-tests.patch
+	"${FILESDIR}/scute-1.4.0-tests.patch"
+)

+src_prepare() {
+	default
 	eautoreconf
-	elibtoolize
 }

 src_configure() {
@ -44,7 +47,6 @@ src_configure() {
 }

 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	find "${D}" -name '*.la' -delete
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
+	prune_libtool_files --modules
 }
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@ -2,7 +2,7 @@ AUX signing-party-makefile.diff 469 SHA256 c9930db5439f522af8f492f1fd5eabfbcb490
 DIST signing-party_2.4.orig.tar.gz 197731 SHA256 02b3487ab80cb3030d33317ce1290c2700241fd2138f6768a49c63a55a6a62fe SHA512 0ab18af70314839193d25053c6b3de31afba173ae70a39b84e19aad8ec4864bbd95f9b685b3bc807674310c35af2dc75145eb6eb9d03d6a0ce84ce45ac7f29c0 WHIRLPOOL fb6892338c110751f7332905afd0336dae667104650a1bc10422111d169a398cfebbe2753202d8a64643eb0bd1a16bb0424b7e71be8651077985cbdb1bc51b99
 DIST signing-party_2.5.orig.tar.gz 198105 SHA256 62db91ccbde650ffbb332beab9cba0676b0d42fc46034fa3c28a471cc0ec4bf8 SHA512 a04875bfaef791a6505134dd2530148d5e6baaa8aa5610e75d42fbf59e884fafffb5de2486425bb53e6464ff3fd35b974684d8bc85291750e4a7bd8bb82b0da3 WHIRLPOOL 7c070f194a67de7fe4ac2f479c6e15a96bf3f182a9065f293b60f5fb979f035c160860ec25ffe0fcc64b30561af94db40b3d8cb113dc8e8cf17cfe2f9bec5248
 EBUILD signing-party-2.4.ebuild 2963 SHA256 78753d60495f3cea570b1660e8482205502eb8c703a47621e2f9490b38dc7fd7 SHA512 c30cca257031a29e4dfc9fb6ce37b240b0b4e9b5d441a414d52013ff42ad1035eef3e9a528e877d4e4e67d87fbad17f827677a081a016f47e0c00f8e6cf2c40d WHIRLPOOL 0dbc55179fb405ad833ce679046f512d25b5f0538bec2eca1b281d2a0bb47423a508eb44c44ab64cf24485b38f5b373e2798c660f1d5b4a886f563bb68f6f013
-EBUILD signing-party-2.5.ebuild 2961 SHA256 a992dfa0b58e86b27f269f3b07864c9b4d93d37a4f2003a35901bec86eb66bf5 SHA512 ade8b1ff089c06774b052536090ed4cf70afed202e6f7ec0a0808fa59f91fb657663f954c5f9e7b26820c33dd664661c1f08e77f7c58d2a850f70927bdf13d30 WHIRLPOOL 5aba8b81b7e78d2c772ecf5e6cb2eb3b51ed78d20464befd04521f6c7d746405a1307e6ee180690ea73950357d9133cffb36e4c0e5b31770df859aa885b454d6
+EBUILD signing-party-2.5.ebuild 2993 SHA256 7f6859e82e5e6cee02b829655f361b3a3ea94253ee7f4784903c6c951c7b3da3 SHA512 71bcf1052ed4b64cb6940a04aa04b39513001ae879caece725565c2272b4e3351e34885e96befd203e31a1e2f4cc53fe7e60ee5f518390065c7bd5c8e51fae24 WHIRLPOOL 899b5a4a4f1afe914082387553144e3d8eff927ef82f326bd0009b38ba051243ecc94b2a5a88457da92e2e952e036afae973efb39b55f86c50d83dea109453e6
 MISC ChangeLog 4150 SHA256 4cdc9c32e23e9eac4f4b1a24302731e20080df446ba31d4aa543200d1aff76ca SHA512 9f5217f623dbdf33c0dccabc4f3369418699ad8fdcd6be21f28944519035fcf91392d7c17e716249183a417ff379eefac80b2b8929cb76fc21b02ee02d862a45 WHIRLPOOL cb418cc3b5673f66bc678e97b00e3b4a7fc7195e4110d3d6be44763f7befcd7c9bae05e3b7b5cb5719d00566eaccb6cf85007af1f3c9c406fcad67be03de4b13
 MISC ChangeLog-2015 7223 SHA256 b16c9754f3004f13b2c22593ca483e969c57387faa2d104031d55336749cbfcc SHA512 894db23caf599c99be320c8485056aa6dc11f7830ce92e97d8b51bf5f9f122c042fa7227cedcc0bcbe8ff9806fc05099b1ff69a3351bbe588bb20b3557f6f9df WHIRLPOOL 58929b500277fb055701f900bdf07e3eb912f4d6663d9691faa4baf07d9c4e36705f0ced0be0ab7319c6869914eea90aed07b88c13098d44df37d8120a307e94
 MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
--- a/app-crypt/signing-party/signing-party-2.5.ebuild
+++ b/app-crypt/signing-party/signing-party-2.5.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="5"
+EAPI="6"

 inherit eutils toolchain-funcs autotools

@ -15,10 +15,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND="dev-lang/perl"
+DEPEND="
+	dev-lang/perl
+	app-crypt/libmd
+"
 RDEPEND="${DEPEND}
 	>=app-crypt/gnupg-1.3.92
-	app-crypt/libmd
 	dev-perl/GnuPG-Interface
 	dev-perl/Text-Template
 	dev-perl/MIME-tools
@ -32,9 +34,11 @@ RDEPEND="${DEPEND}
 		dev-perl/Text-Iconv
 		app-text/recode
 	)"
-S=$WORKDIR
+S="${WORKDIR}"

 src_prepare() {
+	default
+
 	# app-crypt/keylookup
 	rm -r keylookup || die
 	# media-gfx/springgraph
@ -63,6 +67,8 @@ src_compile() {
 }

 src_install() {
+	einstalldocs
+
 	# Check Makefile when a new tool is introduced to this package.
 	# caff
 	dobin caff/caff caff/pgp-clean caff/pgp-fixkey
--- a/app-crypt/ssdeep/Manifest
+++ b/app-crypt/ssdeep/Manifest
@ -1,6 +1,6 @@
 AUX ssdeep-2.10-shared.patch 174 SHA256 fdb1b67f0e9058d5427ae6fd66c84c86743bee84cbed6ed8a53c39448ad172d8 SHA512 9429c38e22cf100809062818c286419d141089e0dd081c11034d7f62143ef9fe2d2bac0ad67104d448c387b7bd4b84ff364933f363faae3dda527e5e8390ad1f WHIRLPOOL 2bdde0eb5a2335cad4cacaf51fc21e0737a74eac3a7f1dbe3a7f2f14e397dcba81420791679fd0f4ebcf4492d014d4ab9b730ef14c06a110379462af9c1b0cd6
 DIST ssdeep-2.13.tar.gz 380712 SHA256 6e4ca94457cb50ff3343d4dd585473817a461a55a666da1c5a74667924f0f8c5 SHA512 26473f1b8801398534c674d7fdd6e87cf4d7862ed91454bb22865f8b6cf885c777250d0d1cdf2c20a28fdf4961c3b21e505e82f37fb75486a9442902d96f5186 WHIRLPOOL 14d5665835f614aa01cfb4607bab5586b5d3469482aff47f88957b4308cff65de7beb01fb423caf071b98593ee72e19cb41f73222ba0ce43d6360865de055a02
-EBUILD ssdeep-2.13.ebuild 513 SHA256 2516503e640ddd75a272b8369846387365c47c49eb92c5d109703636be23c82e SHA512 de3eb2abeadd039e33aadf9d2e4c41d4789abc9cb59f2e1c3b6476db23bcfbc4577c5e7ecbaffc98286ee8e7d8a3ebacdfdc6902aa9f054ee019ba0d8e18f5a9 WHIRLPOOL da06c2d55e91d69180989aed6fb56e6cd69964d7405b0230e30e394eb4083866fd5df8a0c571e9c98b5c4157b7e0243a388ff5ce623234a40cac28876898626f
+EBUILD ssdeep-2.13.ebuild 600 SHA256 5220eafc8fc4dc0113fc91600116f23afb1b1201b8c5a9cb0f668471a5dc27a2 SHA512 3a2f67188d195026a1d0678492d096b08f00f2813a619366c3c7bc8899c61d30824a493e13e42685262700bb9f61b816f5fc5ba952af4ca79b7c512928971a85 WHIRLPOOL 166e4ad0e0e4fe26965c1c151ec536f9b6d7340b9a110a961a21296e23a7e2684edd5e7d27d96ec10faf6f8f3f638768daed37aeec856e1a3b68ee3518ccc771
 MISC ChangeLog 2767 SHA256 0099ca1cf0bec968b44e282e2b46930f389e7ffca01115caf4ecad46ede40f9a SHA512 6062f5122f9a759226901ab112451ccc9dcdaf166877c310efa64d08d0141e623ed964d6af9662224afbeb1deb523e885286d6e09da65c7b19f05400d4ecbd39 WHIRLPOOL 9afa2b54a8aebcb985fc16bd59897e64f68dd261e889a87a1880aeef57a19e141567fa7c62199b136ca440530bc66a7859ed89bc3c111fdd0dfa55aee95f81dc
 MISC ChangeLog-2015 953 SHA256 3d086d731ea504553de1985eb8c3886abd84a80350b967cc037134a0b6b25e38 SHA512 975d27bad23c96cce3aaebe394917108288574b9f09ace3328bd5a6f487275a5925e9940b3d63e132d593a0ae8b113a56d61ce441e7ff45f414d46323e889b80 WHIRLPOOL da12108453042d2185cac51cfb9c8b093f054646bfbc6dd0b61a8dda235a3e74a2c0ebf44d89d9ea4b830c7ab029ad1abed1d2110a21e475303ae89e2a73a676
 MISC metadata.xml 316 SHA256 9a8b50099357d1f8b78f920aa213d2fbe6f220fb82f52b909434f732a0c20e75 SHA512 3fd64f3472e5d036fb4617b2f44d074eff34eeb940cc90c55334712f745b5f4abe02939f423fbf5e28ab6b4eddea2655016711efeffd4707932fe136b0562707 WHIRLPOOL ae0fc0f44b727ff8a99db65501533aa5cedee461e8a4f92205479aa72b5e1d19b4edb97a5b2f64bdd6a99015516fb53c1b9d5be19361922b467b64fd5455c976
--- a/app-crypt/ssdeep/ssdeep-2.13.ebuild
+++ b/app-crypt/ssdeep/ssdeep-2.13.ebuild
@ -1,11 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
-AUTOTOOLS_AUTORECONF=1
+EAPI=6

-inherit autotools-multilib
+inherit autotools multilib-minimal

 DESCRIPTION="Computes context triggered piecewise hashes (fuzzy hashes)"
 HOMEPAGE="http://ssdeep.sourceforge.net/"
@ -16,6 +15,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"

-DOCS=( AUTHORS ChangeLog FILEFORMAT NEWS README TODO )
+DOCS=(
+	AUTHORS ChangeLog FILEFORMAT NEWS README TODO
+)

-PATCHES=( "${FILESDIR}"/${PN}-2.10-shared.patch )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10-shared.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+		econf
+}
--- a/app-crypt/stan/Manifest
+++ b/app-crypt/stan/Manifest
@ -1,6 +1,6 @@
-AUX stan-0.4.1-errno.patch 645 SHA256 22c28b8242e9142fc1be124a063415eae1a273e98f300b1a35b76d331439aa30 SHA512 26de1b2eecb74451fa27113a7b014cf43f97ab48758f4d3127a578934df93a342aca9d7d095521d760f1d11e3e8dd14652490bba004f293c51ea4aeaddf540d3 WHIRLPOOL 6772f0418327688d0eb2a622e5d33e0e0290b5ee48093a1e1b10b953a9ae0de61fa37cf1ea477c1f3866ff1f42d331062ef85d23c65b5ba592fc454bf9bc28e7
+AUX stan-0.4.1-errno.patch 643 SHA256 951baf82c7fbe60e72d766fb76641441ae659f2a81b39b6cb5dbd50e714d7afc SHA512 3b1aaa533559252136d99aad482e26b41dc1a8516dbaf56ca3e7c152378f622b44634d0e54cc5803f3fb1f7aa30a2305ab16535cf1c1d1d3de60c6ec5b75491c WHIRLPOOL 2ac287941467a737361e807ac7fb98741a0fbd1288452901786af0093d98cf618fee7fd7e313d2b3766c73d28b36f5897b1f3d71a13fc70f58fb524ee8d39ccb
 DIST stan-0.4.1.tar.gz 37471 SHA256 b010ffa03d9ad8e8d7cf2cfc2692faec67f6e177ac54b432b2e2bff50b258f5b SHA512 f7c123c9887a6cf994d66d950fc50c42340b35ae6353b69918be95cc7886b59ed2042a85c40596dcf25724043810c50f81c977c54af26af0e7131c12bda0e00b WHIRLPOOL ab529e5bf9f761f99095d9442d03ff558002db6be85398f6c4925c8b8ea8314f70f461275307e6e7782f3134854bcade2a85cea69efe406c838aaec52065e900
-EBUILD stan-0.4.1-r1.ebuild 658 SHA256 63edfe981791271a88d65a12072f59b06d47e161432909984c1fd041a32cb37f SHA512 9e75234c1035b12c112bd4b18e07fe7ee420ab1167dd8f011922bd63c53dc2b61131dc8b989a5e32f55a3af0b4c253e88206c67e7fabf8e0868e991210c771e1 WHIRLPOOL d1c1e31e1589766d3580a60121d72d448ea4ab2c90fabb7e165f2ac59b55e5cb1bad1b04fb21bbe699f3ba544c0bcdd222d83dc92d5e42811901a577f93d60af
+EBUILD stan-0.4.1-r1.ebuild 588 SHA256 844945ce9b1ba2f0f4261f2aaf9d83756f91df1d0e1c4953b23a22160410a6c1 SHA512 a611ccfb1e8c47e3ef607e4f7485a4202767aa8b3e4e44b1832b22e074b0015a18441aa80afbe6ff2ee04e379f7b1c785b5fb1cd0e006f97c85f462fbf621884 WHIRLPOOL 08680f572eff4f44aa96d3f8e319f7b0788879c13a338a0500d9ec9a797100287722fd1d12d6978a67c8f218942ea4b24dc1ff077e46cbafb4dec46745397dbf
 EBUILD stan-0.4.1.ebuild 672 SHA256 74ba74a93302583a9ac4d7070388738b151aae2f1f053c863d493dd79a046c82 SHA512 3efeca0a6df36029b33273adbbcf4b62790c57fa04b7d666e227addb2355cbca812509bbfdbf3c24432a2edc6e7767aef97cc2acdb9294e1f79f34356ad7aab3 WHIRLPOOL 88dc4a69f1889a82e524d6dfa0b49e61fad6c8f2bf8f927bd36b8bbfa502737f2db6feb3e6c199afbf78aee81c5b2fe4766d535a42a0a696635db584565277a3
 MISC ChangeLog 3374 SHA256 90e9ba90acc1322e52c9e7b50318bbc0cca2b1f99996ae732ededff29bb80908 SHA512 dc95eae92f807289bfe9cafacc998acd1a7f9d7279f02939ce6114d89759747f09c869566908fa53d950dedbbb867c469a516598663d261a4040a6ccbb157058 WHIRLPOOL c45a26292c8cd719367bb09d2fd424d933ade1fe2b7fac93a006a31b45528624071ebb976ec6d837587820e16aac805315dd8f9bf3057a5b9d527992b37651b2
 MISC ChangeLog-2015 1379 SHA256 0b9ed3ab6881a4f28199b3afc8f8ebd49def8e464fca89d121e2c2a29946d75e SHA512 2628018201b8405e249b511a83ff50e1354ff59107fa3eb78ca97bf3f214d194895db78ff1b0d2c77101b3327c0107217eda3bc4fc461d7a64820fc6c8fa0473 WHIRLPOOL 9c06d1df4dac39251449ac484b4d355f5d169013fccdb3e861050be09880448c2683986d91dea50c21b03341dfd2bd42fd71aeee9feb24b31d8a4246636af9eb
--- a/app-crypt/stan/files/stan-0.4.1-errno.patch
+++ b/app-crypt/stan/files/stan-0.4.1-errno.patch
@ -1,5 +1,5 @@
--- src/data.c.orig	2005-12-05 13:23:44.000000000 +0200
-+++ src/data.c	2005-12-05 13:24:31.000000000 +0200
+--- a/src/data.c	2005-12-05 13:23:44.000000000 +0200
+++ b/src/data.c	2005-12-05 13:24:31.000000000 +0200
@@ -55,7 +55,9 @@
 #include <stats.h>
 #include <config.h>
@ -11,8 +11,8 @@
 extern tnode_t **treap;
 extern bnode_t *bintree;
 size_t size = 0;
--- src/stan.c.orig	2005-12-05 13:23:49.000000000 +0200
-+++ src/stan.c	2005-12-05 13:24:57.000000000 +0200
+--- a/src/stan.c	2005-12-05 13:23:49.000000000 +0200
+++ b/src/stan.c	2005-12-05 13:24:57.000000000 +0200
@@ -46,7 +46,9 @@
 #include <bits.h>
 #include <config.h>
--- a/app-crypt/stan/stan-0.4.1-r1.ebuild
+++ b/app-crypt/stan/stan-0.4.1-r1.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
 # $Id$

 EAPI=6
-inherit autotools eutils
+inherit autotools

 DESCRIPTION="Stan analyzes binary streams and calculates statistical information"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@ -14,13 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

+PATCHES=(
+	"${FILESDIR}/${P}-errno.patch"
+)
+
 src_prepare() {
-	eapply -p0 "${FILESDIR}/${P}-errno.patch"
-	# Update autotools deprecated file name and macro for bug 468750
+	default
+
 	mv configure.{in,ac} || die
 	sed -i \
 			-e "s/-O3/${CFLAGS}/" \
 			-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" configure.ac || die
 	eautoreconf
-	default
 }
--- a/app-crypt/tc-play/Manifest
+++ b/app-crypt/tc-play/Manifest
@ -1,5 +1,5 @@
 DIST tc-play-2.0.tar.gz 1015525 SHA256 0e17890f37e862746364b10bad62bbd9f3e2b2811a24b07df12eff266534e42d SHA512 17408b2a664eb6822c77ede4f38ca67cdf643512014619d830a2c024bb8971811eded4edd65f6398d6112a3b57cd11a5b414357878c817c9cc2aac9d851946d7 WHIRLPOOL 0fc8273debd60f421eecced41ba43bd5fc36c6fd09f48f365755bfe844bf3a425be79ca36ffe3011a01d70b9911da0cfcb0e21571b3af97ec9f8d84af3440806
-EBUILD tc-play-2.0-r1.ebuild 1103 SHA256 69ec85ab025cc09aa5d503a634f9cc5846348ef858f2322dada6942e06909db3 SHA512 0befa5c705dd0f5b5b7e652c8d1b2ff3ce9a36440d3f19aa407a0451457f30d52347e571958636695ce94010713ff0f496796de8cf10582365fda45d0bd14283 WHIRLPOOL bb7cc2531d2b1327fc74478cf45202a66c594ccddea25f1bf1eec601451729334fedf0d894aec6e239ca3508cb2ca6c790a19ce23245e9b9b39b5832727e63ff
+EBUILD tc-play-2.0-r1.ebuild 1115 SHA256 a3635f427c0feebe2dc39069ca03846e491d04f915ee78c71856222d933c2fa2 SHA512 e64a9382fc8804b157a0ac70d67eaf6a46d9d651f59c78c7342853a882c7cc5cb9c259cb71cb697ca5133b079495ae6bb909a32c792d0ba26a291878511fb753 WHIRLPOOL 786ac4f115f35bd0ddef6e68903529017134810f4eec747bc8ea80178c98cfe001d12b2ca31b061cba98c99ef80833b8fbb969b0f34f77c2a3d66ab585093537
 MISC ChangeLog 2750 SHA256 bffed40b3f5d7e1d829609ab206553581eff01cd9f413b978a5987539541a125 SHA512 3e1c89fd6506cb2320c6ca9b61c6e88dcefe79e4f4a8703131ece19e0ec20e14330f7d9b29bd4277a2bef935c31ffba7d0026a5b18a6f756c56c9ccd719b4fdc WHIRLPOOL 4534905aa974ecd4025bf3b5a827ca9f07cfab93b3411a7ddcbd312527d2304e5d5f66b5c4c0f1f28ca4ad7c9ffb24f5a69c8c0e8bcbff1013b45088fd2f3fc0
 MISC ChangeLog-2015 809 SHA256 689ea475f1c76dca6361257d7e60b9552213f192ece11947f1f4850c24af25c9 SHA512 35d666d5d71af0ee33004a50176060eb68f542aa22d07c1ac219a710b318e2b13c8f7617186ec49ec18161b18b4c6b53926ca3d5e691ab91ce517ef8672d2a6c WHIRLPOOL 2d94939439235ec369075fa713d7dcb5cbd57c85ab5ad85f87ab2b75bc776a0034b87f68ef1e4fc9cdda9c994241d34807d308051975abb1c8ef2c2899151dbd
 MISC metadata.xml 329 SHA256 59747aa229b7deaefd100f012bea9448667660f036754f50526a44a0768aa0c4 SHA512 82f9a92ca705a89f30dd5ae33f45c7b233cd39894083572f8a17c60207d9de15d2188ebe6330da1765b5cd37ce656d904689c8862d3301fb1bd0bb001c1cef73 WHIRLPOOL 54a6a9ca3ae229c70d69fa961532ab9cec25e519052ab9b87e0b72539f228373b7b715b0ec986ae30842f36f94bcd989c95d950298aec736e7fe8a2d45c2eb8c
--- a/app-crypt/tc-play/tc-play-2.0-r1.ebuild
+++ b/app-crypt/tc-play/tc-play-2.0-r1.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

-inherit toolchain-funcs multilib
+inherit toolchain-funcs multilib-minimal

 DESCRIPTION="a free, pretty much fully featured and stable TrueCrypt implementation"
 HOMEPAGE="https://github.com/bwalex/tc-play"
@ -27,6 +27,10 @@ DEPEND="
 	)"
 RDEPEND="${DEPEND}"

+DOCS=(
+	README.md
+)
+
 pkg_setup() {
 	local backend="openssl"
 	use gnutls && local backend="gcrypt"
@ -52,5 +56,4 @@ src_install() {
 		"${EXTRA_MAKE_FLAGS[@]}" \
 		install_program \
 		DESTDIR="${ED}"
-	dodoc README.md
 }
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@ -1,7 +1,7 @@
 AUX tpm-emulator.confd-0.7.4 34 SHA256 3af4a1b3f83919225c4a66f3de3159bed4e8eec4d55e9da848018c5ea66541ee SHA512 61b5145d3fa5b778ba09e66a25ea183165fafbdafe54aa77d171aed2a87f6b5febc918d33603a9bf58320e9ff3f79e3ec58d03d4674562d31c1c90b942faf504 WHIRLPOOL e95e8e0326f2c64695b63ba8242bf0ff9cdf256411b05b9aff9553b5bb69266d5a8bc1aef0cca701502ad94852cec254dfa0e74fdf546952f13afdabd9cc3598
 AUX tpm-emulator.initd-0.7.4 1107 SHA256 d93cebd3755b97ab968db82e61fc5ad5784326987ae0a2f967afd5ba4c24add6 SHA512 bb0164130e7d6a655e67b080711526c65edcc1965314f0464192b1d2341fc2d737ea26c2c6f895d3c8e0a65a2e0183ab78bc599e81e7abbb550ef2e508b37573 WHIRLPOOL ff9513ff0159958ecb3e86befc8643f008907cc0eeb29bfeea6e0e9561bfee4211e6b7ce755bdc68648268df0141b3bc284f5ce943c5d4ea18bdb2aafd4420e4
 DIST tpm_emulator-0.7.4.tar.gz 214145 SHA256 4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459 SHA512 4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35 WHIRLPOOL c75d49e834f8df6c810d7cb7ca3553e742fde0fd6050af7f7aeda8bbdf652084dda6600719eb0b816e1d51bbc5d9f0e119ea40ce3e59af05fd8d55971056fd6f
-EBUILD tpm-emulator-0.7.4-r1.ebuild 1629 SHA256 ea024e2de0cf92555e5957ff9242131c611fcbf14c90b9bab6d8d98f3f653d0b SHA512 aa93c9e5dc6bd513bd8873fee44d6efd0be671f1dbf331bfafe09df46b8c8792ec4ccecc135221376e9af3f3d00c19cdb104ea268a259d7b3399430fadbd8503 WHIRLPOOL 3ed646822549b8e67b0c16814e8933df8b3b3436a7b697695c4618ae18c7b7c0618b35a76835a6d914dc120bbfe67b3de020c5aba169d0568c69e3f94fc204ce
+EBUILD tpm-emulator-0.7.4-r1.ebuild 1629 SHA256 7fd75d7e834e85c26b1d8eaefdb77d269ea62892dc73cf9c088a5a4ff90ec666 SHA512 d7ed17879dedd0492c877b842d3169780b985048dadc6634a5462bbd50f9928010c75c69b14c2032dba2d92b3c8b8e67a857d3398e8d5dce49e39052db61a8d5 WHIRLPOOL 636c66afcdd578995432ac2a791a5112e072d1544d9b43ef8df844d2bed280ad41bbebbf8d45924649135a0284c9a2de997440ab61b4f625e7cb64a2a1aadbb0
 MISC ChangeLog 3387 SHA256 f55e1133580bf004cfe86cdd6497dd73f9e4da8376f4f153f800836595d19e39 SHA512 f5282dd2eae01c78af9221eb8c04e4b66a9b5ca8e2a9f675354a8bfb0aeff852c6c589eb3710bee63ae7ade9601c6273ef1658408e69ff75d0808160e47d318a WHIRLPOOL 5a2ab0aeb39d795129ab9244babe18c93f3c013871110406bc60f1e4f9a078c0c31b53ba46d0c2f0c3ff45a85a7a6625cb7014db484da39bdbb8da74e8863839
 MISC ChangeLog-2015 4068 SHA256 cf829802bcc9ccc92c8962e33f031b5a73ea11e79d4bd4df8088db6bbc1b3101 SHA512 bbf9dd6c4bdbbb0a0dec33a11bbfebd995e8d50b78126d0c9281e856d41316b7593c5b4080319d50e1e923e3c7a01488f4b29cfff81187290870a9bd6ff77e3b WHIRLPOOL b53340261f9e958ff00ebfcdf0f6bd854b8dada9d4d4ff5ce62616fe0b5e15211fc771d7b569154da4d8f4659229cffc5bf6a7f72bb2b3551777ce4375050c63
 MISC metadata.xml 322 SHA256 cf1287a6ed50b56fe582bdf43aa900fc5c4d4cf6c14d5ff97d04c7012ed9370a SHA512 59ca2140630f6c408c51176a30ad8357ecaf8c1a3b37b495176b25cf2b1cb259882dded5072440cfbfe2d16741520a0b30b41384db89c794ec183b318419b578 WHIRLPOOL 7feeeddeadeaa17e666f1a304709b12ea88edbfc603f706eba71776e935b788e3d8462297166ff4bdab7079359be9448f8a4200cb01722845cfea1031d7e0156
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6
 inherit user linux-mod cmake-utils udev

 MY_P=${P/-/_}
@ -35,6 +35,7 @@ pkg_setup() {
 }

 src_prepare() {
+	default
 	# do not build and install the kernel module
 	sed -i 's/COMMAND ${tpmd_dev_BUILD_CMD}//' tpmd_dev/CMakeLists.txt || die
 	sed -i 's/install(CODE.*//' tpmd_dev/CMakeLists.txt || die
@ -42,7 +43,7 @@ src_prepare() {

 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_use ssl OPENSSL)
+		-DUSE_OPENSSL=$(usex ssl)
 	)
 	cmake-utils_src_configure

--- a/app-crypt/yubikey-neo-manager/Manifest
+++ b/app-crypt/yubikey-neo-manager/Manifest
@ -9,7 +9,7 @@ EBUILD yubikey-neo-manager-1.2.1-r1.ebuild 1008 SHA256 f44a20368a1ed286bca64374a
 EBUILD yubikey-neo-manager-1.2.1.ebuild 1008 SHA256 219a66b811e48dfe0638ba60a28e1517408c57c20c9212558a4ffd2aeb7acb86 SHA512 bfccf692b3a8dce3a2c2728dfde826ad7f9a1b77f652e7987f3e84e86256ebe8372705797d5b91ecd301b59f692f9282cce5359b9f594174cd02a64fa1ddfcc2 WHIRLPOOL f1700470699fc96da54c164e31100047e5e18bfce06eaaf67d8b9a2db27b61b30b4095718e9c5554be6dff4c13323ab78ac57203d4c69f7733f4ea0598fd81b1
 EBUILD yubikey-neo-manager-1.3.0-r1.ebuild 1053 SHA256 e131b581d591226a0f7e13c9b6845a5060da80b82bc993c86713b7c1d0950c86 SHA512 8d3fcefe68a3adcb9d313b12448d33cb26204a3004d94989f0042414e1afa468f804a7879d3d4050f83bc16132ad42be0031552c91a0e7e74813e3ada7ae2cba WHIRLPOOL 552ede168e93e954bbfc3ad77ca4bf56b62299c21c1d263763366e6cb73494505d1e5adbd09e4e460607984cd4e01ec4006876f94de0861bee37ed29352b6657
 EBUILD yubikey-neo-manager-1.3.0.ebuild 1053 SHA256 f6cae3fc03c041d9593488a220391923bbec0f5db6e67e1779c18c050e94c9e8 SHA512 cfd41437b9a7ecd9ca311e0962728a8ac0aae816d9c53413a455dec9ef3c0b9e1925929cbecb6e2980002248eca0799677cf76ff5a34c49d98f0b4fab4362546 WHIRLPOOL 7d361c822e30109db5ad264d65e8e737f6252b28948cfcfe57dd17c5659171b568473e663d8661f1877a816b47a6d5c230069189bd6dd3bff9aec4c8ad903397
-EBUILD yubikey-neo-manager-1.4.0.ebuild 1065 SHA256 6b8506e10c4f2071d61735533accda99a91c9ee123275032028481e2423f2a4e SHA512 26c5d252bcb6572372ed01d041ef0b60b7e4d86d46c13611e9f77a3b21e8b3abac8be114c3f034e7c1ebf35aa2cb0cb9fac5f745283295e7210dc53a8f219c53 WHIRLPOOL e54befff6153defcdf80390cb6094842a856124aaa8a41a488b911f06cb109e978425bb1e47b623888c8940be4bdf2a8f4aa576c11b906a4d07ec8a8cd6e554e
+EBUILD yubikey-neo-manager-1.4.0.ebuild 1072 SHA256 59fdbb2e15d585c972831f7b3e28545f9c3ad2b66fce13c21f508529b586828e SHA512 a9bea099ca3d6e9348947f5663719be253961b5615cd6daecb0d691b0e79fa1d9c08308ff8a4608ccc5e9c71407e61e2cfed49282eb66ec7fd1f3cadf94f68a5 WHIRLPOOL bc53560b8bf6e89d092ed1d26e1d3fe6c03611a7027d63c9ab9120915e110c08187813450c74848f166c9d082ad8f16507cbe8fe80431517f1a7585c2ca1aa66
 MISC ChangeLog 4632 SHA256 5aeef4fa4348f832218532019eaab7761c51ed6f1349c034a577646481389c77 SHA512 56ef2e41accce117bdf6bce676b9bb043802d83dfb7721cab3017e9f67385ab552aeede9726f9da3861e3129d975cbfef3edee773f74c97a22e37aceee763c6d WHIRLPOOL 32d62e46d830dbb111630087360cfa6902f0c422458ee9f42b88f28a8df95953205eeae42e096207a971c59871d1ac7a3aac9ce161476486dbbbfeb49ca0ee26
 MISC ChangeLog-2015 1972 SHA256 f8fd9d9b8927f1870ffe5acc17022896d8d3337c66c2944069a420e3ec41d408 SHA512 32e70ccb0bddb4dbd6a7cb94eecdc253a4158b7952e805d9826c76af9c91648c888e9e21c16d08bdf72a915d50f37ad8c7543784bcb992ab88ec47cf9ad574d0 WHIRLPOOL 85781531885e85dbdfb2160e202c4694f3d4216ceeb7923a5d3a902f06090141d0e8057fcf5fbef8a9505d0f5d17618a945a4e1ef1d236fc44e28d52eeff3c82
 MISC metadata.xml 476 SHA256 b4afdde60805a4bbf4f9b8ce93b10f87de075c9b0866bc3a714d9fbcd5a16ede SHA512 2124263ede6b346af7fcf1d5ff1f0ac4d670bb50ea73c612889d5d389c97fb1b15291ede2358a167da4251aa83fe01927cb763343b3357ac79916a54a014a434 WHIRLPOOL 42f2e3bd0caceabc799d7656b3124d827e32961c5bb162ffc96d0a541b2c5f7ef35ba63ea1314b89785c4ba461bfd97c3825f9e9fd2da4b30f5b45bedf865186
--- a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.4.0.ebuild
+++ b/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.4.0.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 PYTHON_COMPAT=( python2_7 )

-inherit distutils-r1
+inherit distutils-r1 eutils

 DESCRIPTION="Cross platform personalization tool for the YubiKey NEO"
 HOMEPAGE="https://developers.yubico.com/yubikey-neo-manager/"
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@ -2,6 +2,7 @@ AUX doxygen-1.8.10-fix_flex_check.patch 4833 SHA256 d912f166f9c47015a9ba36d108ea
 AUX doxygen-1.8.10-link_with_pthread.patch 1009 SHA256 13d1dcf8517a152e0da6dcfa4bf2b13b1ada7d4f384a0cbcad4f334d633c45e2 SHA512 d706b229acf5b914d2281573f2ca69b05154ac8dec0dd0e5744db6d88a742309dcbe213f693b2037234237b4aed634b5b18c366a769c9ca29e561ff2cb2281d7 WHIRLPOOL 2fed7e299ef3c430b4a7f4db8428d7cd394c18c8afbe3427c4f41bc3d0a5de7e81bb626eea8acf00be9d7981bf2b29169a888ce51cb856f87f2e843dff9118d4
 AUX doxygen-1.8.11-link_with_pthread.patch 1078 SHA256 32572502132272a9cbabbf6767e3958a251daaad4a5eb647af906aae49e11b45 SHA512 01173974a66a4b6214f6506f9f9009da2ae3ee1b6f424763dfc2b1ce96293e71b463b1afb4c6ccdeac299c66132bbf6d3ee7fe543f1251ff429107f8b4017831 WHIRLPOOL afdf19a528dd97d4ee5421376b3c3599d77bf86c10c4d0d5a03e26ffb66cd11c994736f013d9bd139c62bfd44869585656ee4c3efc9bb144ebeb23188690ee58
 AUX doxygen-1.8.12-link_with_pthread.patch 1078 SHA256 32572502132272a9cbabbf6767e3958a251daaad4a5eb647af906aae49e11b45 SHA512 01173974a66a4b6214f6506f9f9009da2ae3ee1b6f424763dfc2b1ce96293e71b463b1afb4c6ccdeac299c66132bbf6d3ee7fe543f1251ff429107f8b4017831 WHIRLPOOL afdf19a528dd97d4ee5421376b3c3599d77bf86c10c4d0d5a03e26ffb66cd11c994736f013d9bd139c62bfd44869585656ee4c3efc9bb144ebeb23188690ee58
+AUX doxygen-1.8.13-NULL-dereference.patch 867 SHA256 2c3d700c3a7c191ef432099db30abc3360c021d3a3dd1836440385dde8a1c264 SHA512 e0dc00095d3955fd171e554d0984a3d41b02643da0fa64c0f2815cc16b8cdbf0645e848507e7f100ac6ffb0e3712ca2bbec7e1a81091177e39555bde0b5e3f12 WHIRLPOOL 9bfa84e2840f3a194b419ca2494573dfa0a97c213fe74fc0941c3c963aa0e1eb532f6c1f2044dc91e76590b725a9537bfc1d4f3a09985bef0e5549e30688e8ce
 AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 SHA256 5195bc11afe48641de38f8e5a3574ce93654cb854be97f38bc6322fcaaaddfc3 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef WHIRLPOOL f048801c198d65dff3d2a16eed895c2d9f266034c082b60cdf50f9476e3d79103d3a29d005480a0b7c4b3f6a341e7c5fadca6893d7b817cfd0db09e394c7468f
 DIST doxygen-1.8.10.src.tar.gz 4818276 SHA256 cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93 SHA512 a7f29b5f7b9f55b7e5382b7b7dc7212247a27869bc265433c0ee51480645b3f5f0732d1f5aefd54952204c8a1c98b96ec1ecc22c1ff7a072db5b2356b5981074 WHIRLPOOL 5607e1da5cf8e653ec895a7601a3a6585790a555207928bde6d154ab06173c68e088a61c1963da8d8cdc1a571b66eeaa102acc2a2e4291e0be87634d8e554962
 DIST doxygen-1.8.11.src.tar.gz 4834291 SHA256 65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049 SHA512 44f3f9d2715c4cfe628b988809a6264681c43634dfa830f604b6cc853fa6679eca112cc9c01cee5b019f7f01f0a0acdf4f7d3aaec0848783399d17904caf1a3e WHIRLPOOL 240c84bd02ea3ab747e59bb8db434e40e743ed24cbb8ca78b8846d3bb4f7672497106fd620c14851c06d80e474301811978def5d85db5b01df97b40a4ec74813
@ -11,7 +12,7 @@ DIST doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af
 EBUILD doxygen-1.8.10-r1.ebuild 4814 SHA256 5deb66a7fe56c2992806a590c37ce6fd6544895f37a90fbd99a61ebc1f853545 SHA512 3767f865714c4a22bfb1259bf21771c81e51ee174faaf817564cb1a6a433ac65a6f93ff34d1ea89045498231e47eaeead1c11f241402e18d28fcc7ee4a6952d5 WHIRLPOOL 2f2b1d0d7d26002b4a158a1b3bfd8851e3aaccf1a926dae79436245215fc4755048f0ddf7411e74e78c8f970bfb4e13b47a2a8d78ba15700be4c401425317998
 EBUILD doxygen-1.8.11-r2.ebuild 3901 SHA256 b408104a566338e1fb77a4d88ea3356251b34dfb223fd3dc9af0eebf64619a91 SHA512 00336b589259f1c76f2aada5876100aa0a8d9ff3f68e9795cd0d36705e3f05b857633291d4abf640a91759f9673003e153daf641588e05d7179334c24d161f97 WHIRLPOOL 459145c7b9fabf07833a6a880c6e813a4ea07265d277b690584c27970d3c38bae6082a6a8e52a1278b37fba414637aefabedf9a73f2a8f96e623c1e3a9d04548
 EBUILD doxygen-1.8.12.ebuild 3673 SHA256 46f5ed457d7bcf30afd127201ed694fbfa23a01d774c7d68452cfe321e20b507 SHA512 71bc1a04954a84d0b5dfce6f88e0bac6b6d666d4f46d200159146165dcdebc97855696db39253f644ecc1d8c449fb5103b027f6491b98c61862f3e52ddf6a84b WHIRLPOOL 1c380b8087cc6849f4aeabdaffe86564acc0a29d1fb00523e287dfe06d6ab03d7fec15a035c39c2dff5fc657a6bbb5f9cc631657e9f150facb27c234aa573ce2
-EBUILD doxygen-1.8.13.ebuild 3668 SHA256 838c4494f31ac8d737c4567fbae372acfdeb58e44d5e2f8c05b0e9cdae1610e9 SHA512 8ccbfae13a5d72c59b0680c1dc4e80e71bb07a4d8275b32651c52f066a6a1133ad0d6cd7f8aa6fcbed1edff67e311102edf287f2bcaf3387b3536f63fae4d5ad WHIRLPOOL 260a8244fdbbe5d489e682faf0032c201175ac112890136247d33c38f56adbfe2367100b361b7a4e512583003b0d95eed896f43c26389767002060ee8d028fe7
+EBUILD doxygen-1.8.13-r1.ebuild 3744 SHA256 6c6aa0768e63ff9ba195b3d02b52a7a5fadb0aa1b6bd675d323417847a6ba6eb SHA512 97114297d6b48bfcb1d2044ec4d3db9b9a41914a7b013f5d1123acfc7e455999c336995c2d69930483b936383fd113cfa057697c3070808a84dcd6ae944b85d8 WHIRLPOOL a79ee71a76a28660c2de30288a354faefba706c1287c0d802ea0fea5a5da7c1a22b41ac172ff40db8f5808e97f040756b33e06cab5566610593d6d3cdbbf5aff
 EBUILD doxygen-9999.ebuild 3677 SHA256 170dd9df120b1905d2d9aaf9018c637b3f227b681a71a810ccc66054904adb53 SHA512 70fcb0596b5f88d7c907da1dde18d1690e927a5945228fc10cdf7786ed19175d01679b35f65abc6ef362e35d3fb81c4317200514653c63aa1cd55b7281f622f1 WHIRLPOOL 1965308cb07a196e1e0680259b73b2d6dc902455470143a29e7c389d927cc77adb91176d4c2db137c67d835bd558ad3b36440d34d08fa23977cfd1f8c42528f3
 MISC ChangeLog 11403 SHA256 67de1628f3cfa4d73dad618235c1014497a4f36f8f874ab598e01e2d0ce74642 SHA512 e457094ef741845e414e6c086583615497db3be413c61555aded3a3cd1fe1bfa8213011250b31f2904f813cf6e3107d53d4d44ab2f606b9822966f2113c6c161 WHIRLPOOL 5b4fb15b5491cb1e2cb759f7eb0f55fda0d6284201e42d4dc4269bd9785f21f82418ccd47ade99dfc5a71ba75b435464fd8dead91fda6bcc312c0412c4fc769b
 MISC ChangeLog-2015 47718 SHA256 04cbdd251352dbafb6bbff8482f07cd334528830404e4e8fd6fc4f6096eada79 SHA512 3bdf8ad25a5d953f2deb592f14a9ad4b992b2d612bc8a3368483cb985e9e61ce86b38c0d257f1059bff38721dfe7d95e756f3d525ba626bd1c0a51b58b942682 WHIRLPOOL bf5de29d23c92589d58bafe60813fef9babb95f14f53ad01388598294038e702d6bee94fdc63dfe12c0ec98e72cfe2b809f794978e12b5b7924cc0882bfdc776
--- a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
@ -55,6 +55,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
 	"${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch"
+	"${FILESDIR}/${PN}-1.8.13-NULL-dereference.patch"
 )

 DOCS=( LANGUAGE.HOWTO README.md )
@ -64,7 +65,7 @@ pkg_setup() {
 }

 src_prepare() {
-	default
+	cmake-utils_src_prepare

 	# Ensure we link to -liconv
 	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
@ -82,12 +83,13 @@ src_prepare() {
 		doc/maintainers.txt || die

 	if is-flagq "-O3" ; then
-		echo
+		ewarn
 		ewarn "Compiling with -O3 is known to produce incorrectly"
 		ewarn "optimized code which breaks doxygen."
-		echo
+		ewarn
+		elog
 		elog "Continuing with -O2 instead ..."
-		echo
+		elog
 		replace-flags "-O3" "-O2"
 	fi
 }
--- a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch
+++ b/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch
@ -0,0 +1,24 @@
+From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001
+From: albert-github <albert.tests@gmail.com>
+Date: Wed, 4 Jan 2017 12:24:55 +0100
+Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the
+ breathe docs
+
+Protected against NULL pointer of variable al
+---
+ src/xmlgen.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
+index fe95c7a..70e198a 100644
+--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
+@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
+     if (md->isInline()) t << "yes"; else t << "no";
+     t << "\"";
+ 
+-    if (al->refQualifier!=RefQualifierNone)
+    if (al!=0 && al->refQualifier!=RefQualifierNone)
+     {
+       t << " refqual=\"";
+       if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@ -1,7 +1,7 @@
 DIST emacs-25.1.91.tar.xz 42845096 SHA256 841918b765f9622951348c2209858340262504ff57bb0be293f4f722c3c69533 SHA512 09ecd852e6bf523c8ae7835b496fbd53c0dafeccaa5c3319e9a7f664be0816fdd5acbe9c5267f2dab2912aff9656448ac53f6b22329aea15d3e3af41c04806ff WHIRLPOOL 42af98428ca3f968d9dec0e0d775b61027b7c04bffeaed3b5fe9162cbd63d429173c71f3959508d5a24e7d718ba79a24a5314dc543a1f1fe00319672a3ed89df
-EBUILD emacs-vcs-25.1.91.ebuild 12178 SHA256 1f9447a0fc1dd7e18780ea2140f2c1705971b01cf6414a35da7ee89a5b07e879 SHA512 5f031c4f58646f3ba4075ec0ec5e3ac9d0b2e5d4d2275a15b9d2863d2b81f6480adfba58af65b1568d2c94beae64b513a52269e7a45cd0cc57b4b2a626aee9c6 WHIRLPOOL 587010ab929466ac0e0aafcc85a280b2f125cbcce90dc2b9eefdd6b0632edb58c329aa9cdae6c52a72c2699e6b8aec9d99800fff950c86004e3bad633764eb5a
-EBUILD emacs-vcs-25.1.9999-r2.ebuild 12178 SHA256 bee10fa6a04995de11eae952d100fa115bd0f679955584b4ff2a8f8ea9f18b81 SHA512 dc7c094a0ce83b3a0408bb3cfa45d8e7ff344e948463ea9a607d39be9dff5320afb5487235ee05e1b4111a9ecae07494bfa4b409c41ccd32ecb05c320ff58e91 WHIRLPOOL be9bb40ce9a5dd09da2ba40181be84c30c9b8974265b17c9533926eb850468c1eb673ffbbaf88c0bcd14cadd153472fe5666b4506ed3e2ad1bd7b77fa6886172
-EBUILD emacs-vcs-26.0.9999.ebuild 12249 SHA256 32fe2006e2c338f34c2c49f29fc4db6206bd2f80963b93b482e4e12238e5b39c SHA512 90c881709120281e0a80b86b5266492981f3314be8d53d4d32e471516811ff128c747495592dc7559254b4f1b00e0717f27adda5a0d50d294c7dce81ec3df90f WHIRLPOOL 38d36d15fdcd145604adb9c39415229c8a52e85bc03279f3d4677ede94b29ad658a7ee34aac6cd942641fe1f4420722c98ee265a2c38b6836032d04042fe0316
+EBUILD emacs-vcs-25.1.91.ebuild 12179 SHA256 d3a4cbd3c743d91223d37b07fc79b4afb6367330de69eba0350e1cb16948bf91 SHA512 46dfc35bed99f7c0dc3bc5dbf6fc63590177c22bb348aa7a9ea8f2031a7ae794704a3d795e75d788bb2bdf07f79d01bc8c981b203fd097a7cfbe1287c8220b00 WHIRLPOOL 6116f6e414c6f3a34e29dbac7181086513b456505f1adcc185759ad2805daa1bd8257fe8def802dbc67c860d2a8a87487b8b864dee65a414795ebf1725256dab
+EBUILD emacs-vcs-25.2.9999.ebuild 12233 SHA256 6bdb66391b188906973c2beaba4cbbee00003e4eec3d9534c18b7577d0c60ec5 SHA512 f5d586f49b16f1fd5c5d4e128153ac1bc0d36c148b67bd7dd4a0497c05ab86fb1598c7025997c2aa1562bab8975c43197cec7a64289e9c7a708dc9a7943c7729 WHIRLPOOL 75e650b008821bda07e82ce20953e4bf392af6d886ee3af82a13c7596ec4d87dad27c2f40f3d9c274ae7a311ca6b56aab5fc205f311c08ae9e01abc7c059e766
+EBUILD emacs-vcs-26.0.9999.ebuild 12284 SHA256 f52b8b428b133609b1418969bd78cbd4ff597fbd2e7c8acfe49e228536f14659 SHA512 a705e190efedc3fe1f45e2a85dd0ddcbe784743fac91162262e0552554b252b6103469b57071c39ebeb75969f2ad94cc8e07590c8e82ecb167c1309732e0c284 WHIRLPOOL 635fc7370b26f43698f40734ca5753ce8e9c60cf5861ca758fbb7d58166a446d0af75d5b9e09a33c10b502624d33862d0107fab99ecc03716e95a4d65ec7505f
 MISC ChangeLog 10414 SHA256 32cd8f329ea3c934af07ac926bee0c3aa9ecf8ae243feab908a313d5f97dc350 SHA512 0ee17116099eb0c506ec730f1e8564364065fbbac5970f551b7f6339b9f153aa4e293bd99fe952ac8d25a5045b245b11723b206f9594cfccdf46658589df71e3 WHIRLPOOL 5c52e92cf6e1e4cab924922ade9ec2809b4907d541078055d9dd53c2a188c7482d4198ca14f21dccbe022304757228b3cc563dd06171d6d93dffe1490612a637
 MISC ChangeLog-2015 86237 SHA256 ce19205e1c53f0b9c690a754434783f4e5a8c3265f3ed3580e670dc14109c107 SHA512 fecc40cad7372dc11f3a6cbccfd369e4c75d92a3dd57c7bf671df624a2d120d8496e088a748580937ec7a68d3087cb2e7a3393799124a7ad991447badbf22e58 WHIRLPOOL e0d14721260bc439a87cc70e386a4a04607aa3b20d29fe1cd195a4c613427a1111daa7c808d0ffaf7dc3061b9299986709cad3a531d8793f134129c94482246f
 MISC metadata.xml 2670 SHA256 129bd3ca2fbed47b5d81bd2a50d530f05b1b229d3b5a349f1e21be70dde67f7b SHA512 9bd16b563f4209e245a53ceb818e8218f73d5702708e5caaf6b3359a4adbcbf124545c15b7c411f112520e744af35c6a3e62a6e051e896e8340320a66c9be153 WHIRLPOOL 78f70608e03d44a03eb108a57d9f13b589b99e393e53d6602ff3a97f5f7864d0936f31242328ef63ab2dbcfcf49292cf7b5e4abab155f016ae6a05133b8a9391
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.91.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.91.ebuild
@ -32,7 +32,7 @@ SLOT="25"
 IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"

-RDEPEND="sys-libs/ncurses:0
+RDEPEND="sys-libs/ncurses:0=
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r2.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
 # $Id$

@ -32,7 +32,7 @@ SLOT="25"
 IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"

-RDEPEND="sys-libs/ncurses:0
+RDEPEND="sys-libs/ncurses:0=
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
@ -100,6 +100,9 @@ DEPEND="${RDEPEND}
 if [[ ${PV##*.} = 9999 ]]; then
 	DEPEND="${DEPEND}
 	sys-apps/texinfo"
+
+	RDEPEND="${RDEPEND}
+	!=app-editors/emacs-${PV%.*}*"
 fi

 EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.9999.ebuild
@ -32,7 +32,7 @@ SLOT="26"
 IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"

-RDEPEND="sys-libs/ncurses:0
+RDEPEND="sys-libs/ncurses:0=
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
@ -73,7 +73,7 @@ RDEPEND="sys-libs/ncurses:0
 		gtk? (
 			xwidgets? (
 				x11-libs/gtk+:3
-				net-libs/webkit-gtk:3=
+				net-libs/webkit-gtk:4=
 			)
 			!xwidgets? (
 				gtk3? ( x11-libs/gtk+:3 )
@ -271,6 +271,7 @@ src_install () {
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}/usr/$(get_libdir)"
 	rm -rf "${ED}"/var

 	# remove unused <version>/site-lisp dir
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@ -8,11 +8,13 @@ DIST emacs-24.4.tar.xz 39733124 SHA256 47e391170db4ca0a3c724530c7050655f6d573a71
 DIST emacs-24.5-patches-2.tar.xz 11876 SHA256 16c313ed0fe718cc8505d4276d0b8b18564db5a96745b215c42e21f062a91f9e SHA512 58efc75749842738c6585f7d39d79dee6ef030f589341b4cce6d02623173384f84e1005a7de27be6f759a564ce762dd472c6061579a16a63916b3dfa711697de WHIRLPOOL 41eaaae10df709b28c1f9dae442d59b62281b92e622efb7dbfd62625814338e64dbf116a2373d136637e12461c15133c02bd3dd76c7a7236f53a715a973eb292
 DIST emacs-24.5.tar.xz 39759804 SHA256 dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 WHIRLPOOL 3d9f8fb840f4c846246e642369f967ba0ec357c7cf718ed865523a3cd39605ba14b8c15fc9ae3f076c27e5b6e41fcb681d15f1c6ffc5934430c0a2bf47c233a3
 DIST emacs-25.1.tar.xz 42498944 SHA256 19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33 SHA512 67442b9027869c44430e1d4c3e92e74601e667c9aef7e3da16f20a562b5e3fa8c64efdd4b4055919550523093d32eac73c094b644f6573fed41b4e0938668922 WHIRLPOOL 77cf4e126580634ec5aa2d2252a5d3334b6880a2abc32c54543b8df1a7dc9687bf41c54994044be7517b397bcfc2fc1094286ff4c05a7d6f64a8ef8376a4abfb
-EBUILD emacs-18.59-r11.ebuild 4151 SHA256 0a0e8eb5e069eb5899666d00a49bb665e302579686643f7a21041ac21af0d005 SHA512 b22437982669705b2ff512d79d01fc7b8122c5aa4dde744a281095144bf401b04e7ccfa6e5b0502d94706ddd995d38c5047e162811b759c0e4df2453041e25a8 WHIRLPOOL 353997c377a11d5714dd4c4a632cc5de419686953e193d5a555feb82feeb3a4ee8740e9bf8cc46b48ef45dd45eb066019fb5791f383115dae9c4976306173690
-EBUILD emacs-23.4-r14.ebuild 11215 SHA256 4f3012d4a1cccdf0ba792fc007cb7e88f19fde1cae60fd32256443f89b9d045a SHA512 39ffc62aa4254688306a3e668c55980df193a77f86d81fb9f5147fcc81ab7bbcd66bd6b18dcdcafef352bf0f0459c6ae29bd23c60b95ebc54a72df49045781b7 WHIRLPOOL c827ba754acac369e9b726496aa771f307e3ca0676048235f6c4af3731376c5595c27cf43d1b81b7bf18eae8b4ca680b69667c9b65fb43b7e09940e16cff76ec
-EBUILD emacs-24.4-r4.ebuild 10556 SHA256 e12e3f7c3307360358e8599608198c0b39d12fdba01e0b3f4c4b150859497441 SHA512 5810d1fc3134231c507f79b519c80f993c83e3bc4713cc5831c38eba87ce12c52a0fbbb1149452808610611d29096abfeed2d133eb13da7d625ff8b88a49d482 WHIRLPOOL a0edaa29a636d014c7da9ac07e5a90b2bca6237e7ae4facd1eed2ccafc8de04ae254aebf47ee895326a928f886f5100062628895cd146bebe56e9638f7898e57
-EBUILD emacs-24.5-r3.ebuild 11038 SHA256 6947782d44b4dc756c707da1faa334c604d28e0e31f88a35f4b5f4e28de7faeb SHA512 b8d7177f7a39b994da3da774ea957c07fb6cbb6db45670c51a98b5848c6462c20b2b646f97cdfc9e4098da0e36ac1a109a127d49334b2da66979791234dfa87a WHIRLPOOL 713049414d81c58d4612b36948a2fbfa36ac89f3dcae3d2a5f5c0fd7f86d5a21d5beab94df1ad5949d9b25e3b14925218372a5f995803bb42aaef0dcaf77356c
-EBUILD emacs-25.1.ebuild 11388 SHA256 fc6aea31b295edcd4fe29eaafab3b492e35b4b5e8d5d4163689eb93e28c42391 SHA512 9253dde681b7c053c5a6347817d04e40c8102f650d23f5f65cfb4359b2536cd5ebbf1fcc7a81e154c605ed53fff290d5bd26618405c9cc431853b3fefca50b87 WHIRLPOOL 9f17f9b548519a388d338dc90ac9d6b22a6c0dab693d5a74c0d65da23710d0e5fcf7933f1d477ec98416b03aa364dc24ed5d3e12e56acf93509f58ba7409d3c6
+DIST emacs-25.2-rc1.tar.xz 43010432 SHA256 a94e8e190992627c9b7ef5683d267663bb4c9c2880ef5093988ba42cf8aeae2b SHA512 717cd9b058e4e9d6d8abe7d78a7538745c9a2e29f7f61fa58f3502584a755bb6d4b2d74ce912878e3730f5a72eabf63be1ce1cbb8fa99e1372763ec77df09384 WHIRLPOOL 747c743e4662a37361a5b040bb82a4b835f9ace76068c7e95eb97b1614725ad58acbff6d8607532c4158925c8443a42449b71f47d82e067c0cdf2492f5f5fdce
+EBUILD emacs-18.59-r11.ebuild 4154 SHA256 e91626326da9408571ed6068f49550fdeb2dfd44eeaffc2f315997c0ced8b5ee SHA512 1e88010672f1bdfbf0b67beebd7c24e92bce23666151448481da047209f915ce95716f4a3fd2e4bbc633fe89382cf727477c88a5a3038d33359da576a99c3b27 WHIRLPOOL faaa6e2ec3793630f698b87d6c9788c80e20130382e3ac473d96845306343ff096650cd765d5fec8a17056125c72a33e092bbb4f936ff23f690b71bdf339938b
+EBUILD emacs-23.4-r14.ebuild 11216 SHA256 000ece2e526125d05b5d8e586eb5ca2612d9692a867676be740ba496c5f47380 SHA512 a2a5aba290ec33e922e66b3dec14a23321cf50b9f149498db0543831dba2f0d2599a5e35ab8a86feca6c45652b152f25425e317b7e048d4309892ab13521f243 WHIRLPOOL 9ac50d55cb7efbc9f85cb8649f36c0f039163c3002b7033eff9df7b2e1038280bedf472fba2941c5c5113818cbb12d397c1b99f54edd4e7f456f02aba9425ced
+EBUILD emacs-24.4-r4.ebuild 10557 SHA256 095cce2d5a68851a7bba4d9cc14a8ed4291659ee04f96e344e2d6c8c1e3dfa28 SHA512 d7e1792131f4efcac052238c95b13f18ffa579b653db0767c409f5b5a75598f0e480f0554adbc72d396b6133ac9fc3e0ebacd99096d0ee25e763ca1329c975e1 WHIRLPOOL 0fbd417ab97bc8a1440cfe8fe3376c2e061f59cd739ec0c27aec1d9570151a95d2a66e8942dfc5fa348d1fb8171d7cfd82bb76346c1bf5869d5ce1a1a4db45de
+EBUILD emacs-24.5-r3.ebuild 11039 SHA256 bdb34c41c1ec2ea674f62591a53c9471c6d0b0e5d3cf9694fcad4e0b7dbfa306 SHA512 7fa160832a1909bb3ae82fe556b5180867612897c935b3e62a92b5f89e89d888f8ad514118c4e0eaace14abeb460a0558b05b9b663fdcb8ec5dc27b001f53f74 WHIRLPOOL 6b2a10c9ffede4115e335288f95e638d00d5e116701e239fd6eaa0ee407fa75af38825ae07f258a896481cf8e424b0390260eda817086b1c1adae6ff0d53d505
+EBUILD emacs-25.1.ebuild 11389 SHA256 edb55bb55a2e3a0c1b1a39d781a23c95212947b66724d18addb2d78a4ad2d59f SHA512 b00236bc6da0d76df20a9bf1dbbcec86de3f49868ac966aa7c659d204684c7d8de13b04c3efac2d975bdbd334ba7675cdfdceeb56b077a764ddff46067ef5c12 WHIRLPOOL e1d20b58c6ae0ac710ae4df6da7428b3177529e089a15eda9ce35b656769f9f48ef464031cc26c937538214085327610f2ebce1232f4a4ab4822f194d91a928b
+EBUILD emacs-25.2_rc1.ebuild 11414 SHA256 01ea243038639f3e075fb6311d903a07a28535740f1365c247f5aa8df84361c4 SHA512 bd8549f9eaaae43c910e84f5c06fa1495edbcaabdb1122c6b30ca6d883d191c6ce88a087dc49ce96d4c68960b2cf304019ddd70571bf02fcd4dd18f837c66d80 WHIRLPOOL 01d2c5538da9d8592d33403f62e737ccd5f23fbad48d3bf0af3ee5145c1a1a3a20960a4e4351a8722d6a5c9a2ac6f6927ffa29b67c41f1d1bf41cc076ce55435
 MISC ChangeLog 12072 SHA256 cbbb16232ce5f7e640a63614a882cf80f25c86e6c47e693a5f6de8de093385ee SHA512 fb8e13e19fd88c032c01f2c248ffbab47947bb3c3b5e7e7c16ed6972515b850c30774c56493472ba9275e85e30c0b45d0b4aa77f5313b5a4a3a78633fdffa328 WHIRLPOOL 9c1c0ae2cdd9685a7476499b4a51cdb8236e923a50105745979e339e4c9264a8ee7bcf7376ac03d94b2a857421ee77e7b6db342c30ee0b546eaa40e5419dae71
 MISC ChangeLog-2015 93870 SHA256 0de5747f6d5fff7e3dfca0a37269e4c804d6ab3c9fdb34d39e51b650ce46117a SHA512 d41a91ed0454ab885df588edc8a7ee1b97faed64cd479dc12fadbb8056c36b81aabd43ea521171db511e7061ccbfbaec4c443924528dd1779147a4cf5537bf57 WHIRLPOOL c51fbaa8eae82fb02fc76683b2cdf0de65321b07fc1f5b9c2d929a605ac48ce7354f1d4fdc9a7bf1833e9e7280f4cd62e9130b94107b5860890d255ba1b14ea7
 MISC metadata.xml 2670 SHA256 129bd3ca2fbed47b5d81bd2a50d530f05b1b229d3b5a349f1e21be70dde67f7b SHA512 9bd16b563f4209e245a53ceb818e8218f73d5702708e5caaf6b3359a4adbcbf124545c15b7c411f112520e744af35c6a3e62a6e051e896e8340320a66c9be153 WHIRLPOOL 78f70608e03d44a03eb108a57d9f13b589b99e393e53d6602ff3a97f5f7864d0936f31242328ef63ab2dbcfcf49292cf7b5e4abab155f016ae6a05133b8a9391
--- a/Show More
+++ b/Show More