16 files changed, 28 insertions, 283 deletions
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 2a30922ba03f..0547859458d9 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,14 +1,8 @@
 AUX check-0.9.10-AM_PATH_CHECK.patch 1287 SHA256 7da055a54dfdb5cb7f3d413d05e1561163422f72191ad52b6a5f84c1833a9177 SHA512 c8c4d667032b62ddc49dee04034a9f6007a13795540b55088df49037d0aa238e0685eaf2b57cd16e6df3ef1e3fc3714a90cf3e40a6972f8c6b164b775aa53c73 WHIRLPOOL 1b6f02cb93139f3c43bf7e61542834e71c3ef7eacb8b52945d4203591a0c43e597686c90feacc4250f734817a3f87cd50fde96b0041d321a02a90b940acb6052
-DIST check-0.10.0-github.tar.gz 257887 SHA256 38daf46cc8bf9081d63970b6ea371e8462beb5e77c03443f275cf4b10ac3a0c2 SHA512 d4a5881e07c9285a5ca4eff6f63172b19c968bab3cd5cfc06c2be54fd25ef71d63b0bd6b425c7af5cfe89d7bc3fae17e56b8648cad1db58a9972e6de1b6fd96f WHIRLPOOL f254b3cd77db9735388f482aaf0d93be24a6bbea08558632d28eeb9d0573ea73ef4d9c36b2e0571fa7c938e288d8261a51dede5bb0ccd8a2671f5788512a230a
 DIST check-0.10.0.tar.gz 769119 SHA256 f5f50766aa6f8fe5a2df752666ca01a950add45079aa06416b83765b1cf71052 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5 WHIRLPOOL d3399a2500a4a1f6fa8865fe75af67e98a22587edd2525d144f4f403dd313cc59b7622cd77cfd885b9e3dfd737e2bef5366d28062b2975c882ffac6253b02b29
-DIST check-0.11.0-github.tar.gz 275579 SHA256 df18bb72ba31eed2e06c21dd97402174500a211645e4b3748e9e277551acc97d SHA512 829adee2a5793dda6ac88162e355268019dd82e7a8ad95f1287bd262c3a7764425fba6a8347f1aeebdad642a972043b70aa59d54c87b3c46e1b5b569290dc359 WHIRLPOOL a37225f70a27bf78e6d6d1eb27596f9778ef809aaee834d0a75de407daa160d8c98ab6aaebc98fa18dddf332a0d110faff073c62dc37f037ed7923ea6507b563
 DIST check-0.12.0-github.tar.gz 281127 SHA256 7816b4c38f6e23ff873786f18d966e552837677bfae144041e0587e7c39e04e8 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90 WHIRLPOOL b3ef728b1f442a2eafd5cc431de204a6f32d28463543693d25d49e57c53b5c062786b5eae11752515f6d5b4eff35892d483d7b54705354bcea985a58c90b2266
-DIST check-0.9.11.tar.gz 691146 SHA256 ea4e8c7ffb00bb4ffb3f59f11744a71f1cc4212c79f3083c7d9a4b0953976936 SHA512 10883709463b76f6650197db989c348d9d07ccaa2cacc0bd6bd177bbcc1e9e0d88746c2e110e620ab18c23cb5f41b95797d60d77de279af1a810a42b355b742e WHIRLPOOL 9559104a68b2f1215e9b00affb4711a69bf3e4e94e0ec894de66f0f77b5637187bb183560e29d0a889ff04d0e07f2785fc407128dee1ba74d584ce9a0ff9a3b1
 EBUILD check-0.10.0-r1.ebuild 1797 SHA256 8efdca278e0c901a6accd73f04622487ec50866f04ddc58bc8535b9e633c54fb SHA512 b178160a81d6df74c7ef10f8d4658c6e12759a2b7b416d7c7e724d83a83212b67dfebcf41b15942dc7dc6f1e5b6270463b2088825a84c6c945b8c535151f1881 WHIRLPOOL 519035816d0379722b26b25e15c2a1e50ef18d57ae718fa63482c15fa86e1f30e68411258f6b017a8c34d4d335706cc17843c64dfe1548c635953cc63969c32d
-EBUILD check-0.10.0-r2.ebuild 1683 SHA256 c850cb06502e7475295bd63e11912b46ec5c753dc3b745900d8aaa1c7bf1e584 SHA512 6e4671a3ad2a6ea6367b61ed0b935771007d12c09d1d47f95f2aaebfcf984f4823c252f8751a64df05093f87df4bbba29e0654a44e5dbd64f80a447acaa8e59b WHIRLPOOL 9ebb12d84a1500c6473fe71b2ba973d87be94dc866b8214b071c910e88a48fa47c524862670b44e7e2423062d2cc6e1692d01f6a2832c33a0dae8624c437c089
-EBUILD check-0.11.0.ebuild 1693 SHA256 0c84723c0be1ef56f334f6e7e5b10bd96b67d09a3fa3bd4e7ab983f3e6715fd1 SHA512 cbb7df0b56cb70d2f50333419fec040d49aebf08c2ed60e247d26305e66b6bae15f969faa848da0cd5c428bcb7cd68d0ee84182ddbb3424e445d71cb7ef74414 WHIRLPOOL 418b8dc03cc128d0923a3ffea1796e9b9450478c98d1c91992d6bcf63405bb59b721e3eaf3ef12a2b0b299459c8dc1ddbf51d98908cc6c7fe5c79f089b5f6ee4
 EBUILD check-0.12.0.ebuild 1690 SHA256 0d336490b3ee076b62b841c04e7f281b66a0930a0765295fe6decd21b4680f1b SHA512 781f2f097f11f462e6070c095d8366e02ecb11f5f73e8f274826192171ad715d4b7e903b71630d0b8ab1b2613c9304345703052dc72c4f83dbe2a033dab453bb WHIRLPOOL f03c189c0fa7d4b19cfe7f2ca626d6762a5b7656ea1c3dfb6a4e1c8d0f9a1c695562083e9d0def509aa7755e1b916d0386bad3d0d4f1f1065b2943a5ccfc031b
-EBUILD check-0.9.11.ebuild 1392 SHA256 f8298ab896666739b2ddd2139ffd2ee05e7d04007f94ecb8b6d389052fdb8d38 SHA512 22f33ad3999c3ce2d9279f214e15c711ec0ce01f50005d6beb5bb6662d04f114a2faa8d295ba31c173755262e10251e6b064fc3815abf299f5153fa0e84304d8 WHIRLPOOL 1bdd6565f3dc0bb7e3e9cffee025c90d155a84e466011e8205ccdc548e25c204e3bb76376397648d1fd9832b62e7440d921ca7affb7123ec8c52593556d748d3
 MISC ChangeLog 3979 SHA256 1202da3ac2cb2736da6f82a36d0b9fee00a8ee7f96879056d446d901c841465b SHA512 514910be30832ddfb3f43f0cd562093a560a2a7d883d6e7c4ae20f51ba875728eb3f75d5cbd3ebfdbd525037b7a3769574f80b4bee046218e2fe63656f036864 WHIRLPOOL 7a362d4bf332c192aa1aa7198c9b8530f65db727a77cc8c872b9ebbb0bf3de8a41b7601e9aceaea2ff358c391cd5047a3e1af8476100949a228a7d7b8a918199
 MISC ChangeLog-2015 11960 SHA256 b3e62fc21ea12728d11cad15cbba7ee0365015c94fbdbdc161929f0dfbe31069 SHA512 42263c3cd16cdee1bf65d09691d1c9b300f5c921cf184ee58d7b2313df5dd03d9070b0d84951e8d66d52b789b1d0b1755cd188694918f2ae99a4e165912fd190 WHIRLPOOL 2a8386fd20378b4acc2a5ac79bbcc479dfcbbf1286983617c1a17a0ad07824eb404058bd5c307a0447b9a100757eb73278f4843bd637b531a3db48978854241f
 MISC metadata.xml 363 SHA256 1077af075555b764c1bc2116d1256aafae1fa80ceb948e720f381aa41bddd75f SHA512 b025f88785c7d2f4eb01ccc5f9730c2ef81171fc94a01802f7832088eb20aae42aff7cf4ecd89c3de6e87cf583f873fe5ed9dc4c7fab9f124ce3ebc8441ccfaa WHIRLPOOL ec41a0b44c37ed506bb68751a370efaf4f5df0272b2cb59cf8d6f4e4eca02a7b0e6722be55e5a56b0cc5cabfdb8cee7351e18f75294c06b575d4c0552d91a68c
diff --git a/dev-libs/check/check-0.10.0-r2.ebuild b/dev-libs/check/check-0.10.0-r2.ebuild
deleted file mode 100644
index 7bd022c8e059..000000000000
--- a/dev-libs/check/check-0.10.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
-
-inherit autotools autotools-multilib
-
-DESCRIPTION="A unit test framework for C"
-HOMEPAGE="https://libcheck.github.io/check/"
-SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs subunit"
-
-RDEPEND="subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# See multilib_src_test(), disable sleep()-based tests because they
-	# just take a long time doing pretty much nothing.
-	export CPPFLAGS="-DTIMEOUT_TESTS_ENABLED=0 ${CPPFLAGS}"
-}
-
-src_prepare() {
-	sed -i -e '/^docdir =/d' {.,doc}/Makefile.am \
-		|| die 'failed to unset docdir in Makefile.am'
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		$(use_enable subunit)
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	autotools-multilib_src_configure
-}
-
-multilib_src_test() {
-	elog "-DTIMEOUT_TESTS_ENABLED=0 has been prepended to CPPFLAGS. To run the"
-	elog "entire testsuite for dev-libs/check, ensure that"
-	elog "-DTIMEOUT_TESTS_ENABLED=1 is in your CPPFLAGS."
-	default_src_test
-}
-
-src_install() {
-	autotools-multilib_src_install
-	dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO
-
-	rm -f "${ED}/usr/share/doc/${PF}"/COPYING* || \
-		die 'failed to remove COPYING files'
-}
diff --git a/dev-libs/check/check-0.11.0.ebuild b/dev-libs/check/check-0.11.0.ebuild
deleted file mode 100644
index 4a1f73cca3a6..000000000000
--- a/dev-libs/check/check-0.11.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A unit test framework for C"
-HOMEPAGE="https://libcheck.github.io/check/"
-SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs subunit"
-
-RDEPEND="subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS TODO )
-
-pkg_setup() {
-	# See multilib_src_test(), disable sleep()-based tests because they
-	# just take a long time doing pretty much nothing.
-	export CPPFLAGS="-DTIMEOUT_TESTS_ENABLED=0 ${CPPFLAGS}"
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/^docdir =/d' {.,doc}/Makefile.am \
-		|| die 'failed to unset docdir in Makefile.am'
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		$(use_enable subunit)
-	)
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-
-	rm -f "${ED}/usr/share/doc/${PF}"/COPYING* || \
-		die 'failed to remove COPYING files'
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-multilib_src_test() {
-	elog "-DTIMEOUT_TESTS_ENABLED=0 has been prepended to CPPFLAGS. To run the"
-	elog "entire testsuite for dev-libs/check, ensure that"
-	elog "-DTIMEOUT_TESTS_ENABLED=1 is in your CPPFLAGS."
-	default_src_test
-}
diff --git a/dev-libs/check/check-0.9.11.ebuild b/dev-libs/check/check-0.9.11.ebuild
deleted file mode 100644
index b1e035273875..000000000000
--- a/dev-libs/check/check-0.9.11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
-
-inherit autotools autotools-multilib eutils
-
-DESCRIPTION="A unit test framework for C"
-HOMEPAGE="https://sourceforge.net/projects/check/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs subunit"
-
-DEPEND="subunit? ( dev-python/subunit )
-		sys-apps/texinfo
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.9.10-AM_PATH_CHECK.patch
-
-	sed -i -e '/^docdir =/d' {.,doc}/Makefile.am || die
-
-	# fix out-of-sourcedir build having inconsistent check.h files, for
-	# example breaks USE=subunit.
-	rm src/check.h || die
-
-	# Fix automake warnings being treated as errors, bug #420373
-	sed -i -e s/-Werror// configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		$(use_enable subunit)
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-	)
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install
-	dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO
-
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING* || die
-}
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 2dc4450cbca3..d01b88565582 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,8 +1,8 @@
 AUX libmspack-0.5_alpha-CVE-2017-6419.patch 1483 SHA256 4b3ba5b72796af2a442bb0a01a09d6f19a4cc1544c84f505b9c50d974262e9b4 SHA512 b6aafe82630d3bb1254fcce9a8bc528b0f375a2e7eec5f729e04c2d9816feb23ba12a0275efcf5ced6578789c4ef83b4364104b4cc35c2c146f4fb527c8dbf4a WHIRLPOOL f34e90557d6c01827c032ad9067b7d1d0072f9cd4b49d99c3d6968e30e0d2d64c5a4e405fa5ff93d483268a1ee2dd912ef4e8091ef4265ef90eed0447416646d
-AUX libmspack-0.6_alpha-fix-tests.patch 3848 SHA256 b2a1f3851d7127e446972a24e94c068026f391dbf048a942c278af1a4813bc9e SHA512 7a2374a4099744939d0422e5194f019d34bd1cadc6155112e7202ed7ebaa722e9ce90b2b3095985dd89238ea77bb26bde80f8f05e5c0097096127ce7693ec007 WHIRLPOOL e7f475bd486db5efeb5022beae267906537b54b6864c8e662180b400bac08fe632d6b7127593993e53ab35ea5cd1abbe2adf3fd521d9ca6f0b21b315dee16501
+AUX libmspack-0.6_alpha-fix-tests.patch 575 SHA256 ab1bbe6b469316c320507f1b13aee36fe06b3732949c52b8e5e0f8dd4c3cf8a1 SHA512 8c715e174d3eca76fb33c2a5eccccd4f7c4c7702320d0db9db5dec6038129f508afade126ae791191ffaaf60740a722db7a87fc76f8c00c86912a1e2e2323eda WHIRLPOOL 6ce1114568edf9b9d6dc1c40bccbff070ef7e0737059dd1b88451547dfa891b21a6c96473512c132546744947bb4ba24318c8eabbdb23e3f2660b39c375140dd
 DIST libmspack-0.5alpha.tar.gz 654193 SHA256 8967f275525f5067b364cee43b73e44d0433668c39f9376dfff19f653d1c8110 SHA512 6d4efa0f43c43185ef91c97c1518aa70f09109d7332cda7e12019e146ec9cb0f2065fb1b57683b48bae9a7eaf8e82eb94096644c6d25c56d45878f630b719231 WHIRLPOOL fcbbbdee1ce4c75222767ad7ce3e16d18c3fbf1c7cb60170a9cad51647e3500e11c458f7a65e8c2e0dccfb8a8e3981f13252ac26fd9edce6f633381b77410faf
 DIST libmspack-0.6alpha.tar.gz 476992 SHA256 1edbee82accb28e679ab538f803aab7a5a569e4102ccf1715b462b1bd915f921 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d WHIRLPOOL 5c8fb600af798cb7902c8a7233515004ffc2cc440a152d4296f6827910530259648f73f6e29fd75b5190057b9cf66ad1d180c58255450dbb6b23fce548ad5c73
 EBUILD libmspack-0.5_alpha-r1.ebuild 1056 SHA256 8a72b6596b49c1983142923a489d396737bf24f8fd8ec103311aa681889d7ded SHA512 df255a8f2895b667e46acb21586f7101cbb59d9dff1575a537ce31bbaac7c1d5316ca37ea58c953c1c7854929cea6e5314d5287b915b19cbd8bc943d3f1c2182 WHIRLPOOL c0ce9ca8a6e62e50574c14ae4b2cf4d56fe405d448ae9e6fcdb82bbb3df008aea0aa0763f23b2bdc9d0ae236b8995e26e3c964508956694c84b727134137765f
 EBUILD libmspack-0.5_alpha.ebuild 1001 SHA256 e3ba99982cb2b9704552a2805b912d6c6be5bb1a74c33770609bcd0bdaf30a73 SHA512 04e51296ad4a50665ad8df5d020337c75667f7525412b08356aede88c5b79bfd102613ba5f7a7fd26adbb918a4d78e280f4977949dfcc59a492613ceba1114ed WHIRLPOOL 55f3edd5aea6e803a8c3c70c310d905a8a76e314ad2ecbfce453d8438435512e2b5cdb04d9dcbdff54b9d59915b77e0018d46cc1a9e3fdd4a49f3ef902a8c9f0
-EBUILD libmspack-0.6_alpha.ebuild 1052 SHA256 d1a122b76a5c9990c7049f341dfb89d8ffa4c789f53afdc003406fad8f2284a0 SHA512 ca61e5186f0c5a181a72a58a0e6144a32e01bc320704cadc8fa1a0cd86877fee4dce45e43fd8840cbaba941fcd3039b4806890fc1e212c1ed50dc67a55610f0c WHIRLPOOL c2425336ba490a16c79028f94148ec3fd5ffeed8db8b23d3201c3c0d545fc39945ad484d85589872d5f5e9dbf8acd5e9eb482b181d5041cdfa12619c41a6b1dd
-MISC metadata.xml 269 SHA256 b0e50e7006e04a696bc946ae45550e2bb2d59f449f22ca6a2eade72adb0a927f SHA512 753992cc0fe22a630515becd9f12d80c9929c104521232d87da5fb369c1e3d2a86080d1d54ed1483b54f368882a7a3854a151c7779c5a3ce2aabb06b6a840c2a WHIRLPOOL e9ced1f41b584ec2f6653cbc62c86391fd9306e5f79347bc9d6e82956a7d069177ff5c2e5fc471a4097984889b22fdad936210b3bcd0682327c6aaafb11877b3
+EBUILD libmspack-0.6_alpha.ebuild 1148 SHA256 5dfe0b59bba854aad077a549153ae04968e775a2686d0153f049362e9e891acc SHA512 e5883f3560891d8e243e165e241b13b7fe78717c3ac72afdc71db4391451dfa301e1c96365e0c5a570a77b9a210b5c4e999a65e4c1611b16570fb66d8dfead1f WHIRLPOOL ab96863331cdb7fd454bae82f1c7aa6c94209234f0b3f6bc18fa14237d41c95708e8faf7b4eca5b2d6b9ee584165b938157c25a85e1497774bf71c64727b335f
+MISC metadata.xml 355 SHA256 6e600062e09e00628cc91144a45b3f44757838f3f8ce751a43ff0805b1f1ad9f SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1 WHIRLPOOL f394a499be502f540310c9bbcfd7f6666d8f0e730b2e4c57e0ee15fc99f793e94fa6eeb4140b47b6903db93d8538f3e0cf4e66336fe0a10d0a1883e295f62e1c
diff --git a/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch b/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
index 2f010d87a376..22b0461ae7e4 100644
--- a/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
+++ b/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
@@ -1,36 +1,7 @@
-From deb65056f436a4ce06946c4dde270f533e3cab4d Mon Sep 17 00:00:00 2001
-From: Stuart Caie <kyzer@cabextract.org.uk>
-Date: Mon, 16 Oct 2017 13:59:05 +0100
-Subject: [PATCH] Fix cabd_test.c test and msdecompile_md5 script
-
----
- libmspack/ChangeLog            | 10 +++++++++
- libmspack/test/cabd_test.c     |  3 ++-
- libmspack/test/msdecompile_md5 | 47 +++++++++++++++++++++---------------------
- 3 files changed, 36 insertions(+), 24 deletions(-)
-
-diff --git a/libmspack/ChangeLog b/libmspack/ChangeLog
-index 6861b19..4aef85f 100644
---- a/libmspack/ChangeLog
-+++ b/libmspack/ChangeLog
-@@ -1,3 +1,13 @@
-+2017-10-16  Stuart Caie <kyzer@cabextract.org.uk>
-+
-+	* test/cabd_test.c: update the short string tests to expect not only
-+	MSPACK_ERR_DATAFORMAT but also MSPACK_ERR_READ, because of the recent
-+	change to cabd_read_string(). Thanks to maitreyee43 for spotting this.
-+
-+	* test/msdecompile_md5: update the setup instructions for this script,
-+	and also change the script so it works with current Wine. Again, thanks
-+	to maitreyee43 for trying to use it and finding it not working.
-+
- 2017-08-13  Stuart Caie <kyzer@cabextract.org.uk>
- 
- 	* src/chmextract.c: support MinGW one-arg mkdir(). Thanks to AntumDeluge
 diff --git a/libmspack/test/cabd_test.c b/libmspack/test/cabd_test.c
 index 5e8851c..abed65c 100644
---- a/libmspack/test/cabd_test.c
-+++ b/libmspack/test/cabd_test.c
+--- a/test/cabd_test.c
++++ b/test/cabd_test.c
 @@ -186,7 +186,8 @@ void cabd_open_test_05() {
    for (i = 0; i < (sizeof(str_files)/sizeof(char *)); i++) {
      cab = cabd->open(cabd, str_files[i]);
@@ -41,56 +12,3 @@ index 5e8851c..abed65c 100644
    }
  
    /* lack of data blocks should NOT be a problem for merely reading */
-diff --git a/libmspack/test/msdecompile_md5 b/libmspack/test/msdecompile_md5
-index a1d3b4b..9efbfac 100755
---- a/libmspack/test/msdecompile_md5
-+++ b/libmspack/test/msdecompile_md5
-@@ -1,24 +1,25 @@
--#!/usr/bin/perl -w
--# put hh.exe, hhctrl.ocx and itss.dll into this directory
--# for this script to work. You can get them by downloading
--# the HTML Help Workshop from Microsoft and then doing:
--#   $ cabextract -F 'hh*' htmlhelp.exe
--#   $ cabextract -F itircl.dll hhupd.exe
--#   $ cabextract -F itss.dll hhupd.exe
--#   $ cp -a itircl.dll ~/.wine/drive_c/windows/system32/
--#   $ cp -a itss.dll ~/.wine/drive_c/windows/system32/
--#   $ wine regsvr32 /s 'C:\WINDOWS\SYSTEM32\itircl.dll'
--#   $ wine regsvr32 /s 'C:\WINDOWS\SYSTEM32\itss.dll'
-+#!/bin/sh
-+# This script needs the following setup to work:
-+# - hh.exe and hhctrl.ocx copied to Wine's system32
-+# - itss.dll and itircl.dll installed as Wine DLLs
-+#
-+# Download the HTML Help Workshop (htmlhelp.exe) from Microsoft:
-+#
-+#   https://msdn.microsoft.com/en-us/library/windows/desktop/ms669985(v=vs.85).aspx
-+#
-+# and then run these commands:
-+#
-+#   cabextract htmlhelp.exe -F hhupd.exe
-+#   cabextract hhupd.exe -F hh.exe
-+#   cabextract hhupd.exe -F hhctrl.ocx
-+#   cabextract hhupd.exe -F itircl.dll
-+#   cabextract hhupd.exe -F itss.dll
-+#   mv hh.exe hhctrl.ocx itircl.dll itss.dll ~/.wine/drive_c/windows/system32/
-+#   wine regsvr32 /s 'c:\windows\system32\itircl.dll'
-+#   wine regsvr32 /s 'c:\windows\system32\itss.dll'
- 
--use strict;
--use File::Temp qw(tempdir);
--
--die "Usage: $0 <file.chm>\n" unless @ARGV == 1;
--my $hh = $0; $hh =~ s{[^/]+$}{hh.exe};
--my $dir = tempdir("./.tempXXXX", CLEANUP => 1);
--
--$ENV{LANG} = 'C';
--$ENV{WINEDLLOVERRIDES}='hhctrl.ocx,itss=n';
--print "*** $ARGV[0]\n";
--system("wine $hh -decompile $dir $ARGV[0] 1>&2 && " .
--       "cd $dir && find * -type f -print0 | xargs -0 md5sum");
-+dir=`mktemp -d`
-+echo "*** $1"
-+LANG=C WINEDLLOVERRIDES='hhctrl.ocx=n' wine hh -decompile $dir "$1"
-+cd $dir && find * -type f -exec md5sum {} +
-+rm -rf $dir
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
index 6a40351178f2..63c273dced26 100644
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@@ -15,10 +15,12 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc static-libs"
+IUSE="debug doc static-libs utils"
 
 DEPEND=""
-RDEPEND=""
+RDEPEND="
+	utils? ( !app-arch/mscompress )
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-tests.patch"
@@ -47,4 +49,7 @@ multilib_src_install_all() {
 	if use doc; then
 		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
 	fi
+	if ! use utils; then
+		rm "${ED}"/usr/bin/* || die
+	fi
 }
diff --git a/dev-libs/libmspack/metadata.xml b/dev-libs/libmspack/metadata.xml
index ea4e7c21a844..1e5806295c83 100644
--- a/dev-libs/libmspack/metadata.xml
+++ b/dev-libs/libmspack/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>reavertm@gentoo.org</email>
-        <name>Maciej Mrozowski</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<use>
+		<flag name="utils">Enables building cabrip, chmextract, msexpand and oabextract</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index f6ebacdabb4a..9da7720ab3a9 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -10,7 +10,7 @@ DIST m17n-lib-1.7.0.tar.gz 1063169 SHA256 8eb853e1e0c86a70a09871f3264f950e5d62bb
 EBUILD m17n-lib-1.5.2.ebuild 1353 SHA256 1cb703d5b5fd0915bd1242a66ea0cb8132ea160159ed4265486d469d6cef7517 SHA512 0d78a72cad467a2c392f1a61b21c37feb7f5f2c13e7530c395dcf8975764c5286eadf20bc2b070af54df0a3c072e439a9ddba3a032c86fbaafa9d8d6f6dab815 WHIRLPOOL 2378e0eb2cb2a7e43f6d30d298d174350cabb66721cde24e682d07e277c31ef9c2b9854b01c4a92b7e06f759e90ce0ca50496cc99b75a993d49d6486b4bda3c0
 EBUILD m17n-lib-1.6.3.ebuild 1243 SHA256 ddf7c9ebea5447fdc8807e3bdf7d6c6527a17ec10798617b3af35ccfed7f71b1 SHA512 fd406846f8b9fbb807d52284b5a0b2414aa77291fd3ce164cc8ed7b1ad1134c1fb701116db1052d209358bd308139ce0f348f291e97aeead3e18bbb4ccb5c907 WHIRLPOOL c478db1366b5e2f342bebe76f6a32ad2ca78672b024a0e9c35232a51e0a61ccb542b4d003e3f9c5035e37fd7f83e168496cf34ee3c82d2c9a6ad95b4ddd0a771
 EBUILD m17n-lib-1.6.4.ebuild 1857 SHA256 dc655f8722d8c3205e3002415411214dc114723503e70916f9b178aa86993a2f SHA512 dc39e2a31c78633892e99721fdd99c14ac5c04413a39f9982c38b300f7baa393e9054712ba0c03e43231f772f6648a4814f2491c17c5c505daa54110385e43d1 WHIRLPOOL 87523707fd9858e72e8b5dda1d1ca6dc346baabd5668add99dd49bf77b4c04c7dfa671fa573f9b39a52ae8a06ad7f274a0528ff8a30e925b51e5c4516ce574ee
-EBUILD m17n-lib-1.7.0.ebuild 1759 SHA256 bd178bbcac07c934290d0d516b268fb659e833cc76278396097f9da98ba7f4be SHA512 165572d8389f8b70e99514596035236f1c23312cca0ff98cb6b5f62c348f1aa4b48c26006d2f531fecca26bc3f7d433c2cbf9d5eb6e4b1e6bdb42c77d876b8b2 WHIRLPOOL 556edd6b081bd2b8bcd6a5b8a057d451bc200917d6c40496253f707dde8263d337a3d12550d2437f4a0f1ef711d71a2685e287b4facd114621a27a802c7d0f68
+EBUILD m17n-lib-1.7.0.ebuild 1758 SHA256 b57a71a3a290d837527a89a35d9f7441bb63b839d741575efc49de8327e34c1c SHA512 3a3c361a3f41ddc63d90f03ba380556f9d8d2c84487700605f661206e89aa24fbc5382e24052ba5d1feaa29ebe2dc0824a2ab52213dac59a41c91d77127c2f2f WHIRLPOOL befc349272f4da5bb7fab0fc8840a73582a0e816b777e2cdf159e3896d93e306c3c1b2c9a9428a4aae378dc65934e782555bf5fe74e4f5d48641eb75c3d63ff1
 MISC ChangeLog 3387 SHA256 ae7965ed07a33dd431f919d1f0521de3c31a736329b37ac5613b82825087f54e SHA512 017b06441caac2e2003038dfd5a67ce8f9f31e32731dea330cd9eb31cc2a0cbee95c34ab952e0dbb9de4a88acfa6e8dd052bb88bc0e26c2caf531e13fb294d7f WHIRLPOOL 977f04914e4600cacc398ceb8caa3c05c217fb20ccb1db99eeeb3e836a478f2ce2a6d1d06a817d83ca286c091769b6c8b685ad273f8bb1a7b750422b443e01f5
 MISC ChangeLog-2015 8232 SHA256 7613efc07cec4fc6949d29eb4d037c14e5f816bbe44144a5cb32c2616f3190bc SHA512 902a015a49fbe6b61be5a2f7b845d37d7d3eb45d6b5fb66a7926495fe83981503adfdba34a57853c69ffe5486a6b90c1c7d66a4df2870ca75332a614595ebbba WHIRLPOOL 7d79e0d97d826e2c19692176aec1d9e42d127b61c21317e36986d37a832156e0aba231e632a8bfe1c730df3d4f7f9a9c08a0a011d2f4147cbb5848d771b331b9
 MISC metadata.xml 873 SHA256 3bc9fbc3db6b479c3b8ad0fc1730be58b8a9d68aba1a5e95691f386c34af92e5 SHA512 e0318084f83ee510dee477bb9b6396a81dfe4afbdc407daecc49d51c037217002686af4db286e4bcd6a158061ca0a77822f3853f25f12db5a384a3fafdd38291 WHIRLPOOL 3a41db62f5e9070d4b23893ebf1c38984f932b42010aa4a8745450cd1ca9929dd0dd37da607d3c9a93a8dec2570c739a823efb8da38b3a3c48c71f10fc0e568e
diff --git a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
index b43b6b4fd1a4..bcf0b1620c5f 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
 
 RDEPEND="~dev-db/m17n-db-${PV}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 2f4b83ed9f7b..d163bdfc9e2d 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -14,7 +14,7 @@ DIST onig-6.6.1.tar.gz 943490 SHA256 8f9731f9e48666236a1678e2b4ead69be682eefba39
 EBUILD oniguruma-5.9.5.ebuild 1129 SHA256 fe48f2becf821d0d60f91ce82a8f72260b44fd38cce6dd526e40999a89adaab7 SHA512 0889defa5f3a79337e4bd353f49d19a88870fc4657acddb88b47cc49bd2d54e64e7a10afb393a8e2b93cf196d7ff140d9117c61c7ba0551d0903bcd13703bb6b WHIRLPOOL ad4cfd96d4a9babae36ab975cf2facad5b9f240fbd67ec16ac75897b76647b5c8833a7f87e0c934115b01b6afc568985fe471d37d2f15cc7236dc6175ed7ac0f
 EBUILD oniguruma-5.9.6_p1-r1.ebuild 1379 SHA256 a484fd0dab3622ff12e0d68dc6913ac81292ba1f386970937f7da7f4856518f2 SHA512 6817357097456c702b5488cee375135e54bed44360a2edf0dbad9b2712c8c824b4f5433b73cfc8dcf460075fd95a6a396916a79032de4a69d633c856bd52fbea WHIRLPOOL fa4c0019b4692de04933e002586220cb7c3b1244d4f817fd41f503b3f09b0bb7224d3b88076802bdc4abf06e9390d24b8f9abb24e35206eeaa55da6b21c418e7
 EBUILD oniguruma-6.4.0.ebuild 1167 SHA256 1e05d4de551c9657f3a51ae130602408c256921dede9f5f6f52a69d14c70f1ed SHA512 684194ee689ad9fb79fb2c933f8eb64e8dfa20c79da0c76907cc6b913391f2e4bbd42793a4d11204c66d87651c349f71c75c4169f2ad87808b9f43b6a14b63c1 WHIRLPOOL cbb7c9eae2d7cd5d621e84d95d957b7c978554105ae15d225fb2ce2bfdcb7ed56e6adf2ec255c1730286379152f57d8ea20244cbfa8276af5925ba00e2f24811
-EBUILD oniguruma-6.6.1.ebuild 1131 SHA256 b88fa7a58444a7c3b010d876ef3ed0a5ae6a626d70b3619865720b9074318517 SHA512 3470a7a34c892e0246f3c3b07b409a7a894235cfb31cc4b92dd101540e550e1ccf656e8dd1950a533a45219fcfafd29ac274137ad333b565f531829f4e67f06d WHIRLPOOL 4e4e8d006e60d9665caa7e43bd4547a141981034eda734f157292a9d79f80cc382229c1913a68efe723baa98bb08d4bc81093f2151e55b475842dd8b0894cc54
+EBUILD oniguruma-6.6.1.ebuild 1129 SHA256 826f31635aa1f38bd285efb8d691b76ad3d828f8b0aa34a0300118e71ff8d172 SHA512 55dcc88d877358307d8d678ba430e3a24f175d5542c3787bc6e75ff3a6ee390dda221473d173b13bf3c04ffb49dc69d8cbba877c786ffedad0dc7fc3d0017f55 WHIRLPOOL 2f390b811d144a4ea580c3ef1cf4162f9e24a83c4955f7ffd0941e580aa944e4df50c28519640151ff62f2c529e0cd7032678caa36876d491646ad59617f7785
 MISC ChangeLog 3480 SHA256 017a5b8fa1c2c3efbff36f8fc86700c40dd5f6c4a5cd3111279c460f762140db SHA512 5340377126666c789a2e2445bced19c8348aca7a862da341bd950b737545824e836a567a70f0e99aa7765964eada43980ec761fc16d8868067f2ddd2beb24529 WHIRLPOOL 1f3f3aa4fd8af3724f25c24ec7a371c63b49f85b4965185d6a11a075369a50cdd5970dff0fca833ab618b178dd7bc57f9ad85e4514fbc7336a1f313d34cf4971
 MISC ChangeLog-2015 9089 SHA256 ff4e22531be2af0b4732475ca1e23fef670ee4982fa0d519d1272b98c05fffd3 SHA512 6ab9ec86d19b1644073fa2cc50414f2984c6e51f0658be44f5b2b0172a6f8cdb98aefbfa650621c03d992df3cca4c430489fc8058aa58a40332399ccadb4eb63 WHIRLPOOL 54e80067dd972b53205940d26676d010743507b7269b7470a48878b64a0975e8522551984a0eb56fe7f6bd9f344b4c597a6ae1921374b39527d53e83872f1b71
 MISC metadata.xml 898 SHA256 1dea20487ad239dacee930e91229ad7e1b49bf75597c52567cd1f670cff966f5 SHA512 d9736125e403f64018466a0fd53e19e86552254bfba410d38b7d9d485c50b74a55757de54fee90cdbaf21f6a535b5d765e38019e5fc3adbe5cb1fcf88ab71a2a WHIRLPOOL 130834b5e6ea1a6cfdc30b8e3c0cd81c9cd4bec586ee6ee1a84574e8ddff32bfb490fca959f2dfd44fd90acb5367c1d01cfd3c41f567452b8efeb0c23a197304
diff --git a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild b/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
index 02df1a2e2b46..a19a0cf234f2 100644
--- a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 723fc3343939..3035c07a3071 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -29,7 +29,7 @@ EBUILD openssl-0.9.8z_p8.ebuild 4997 SHA256 68825bbb48e4862340690badf5f4fdffb671
 EBUILD openssl-1.0.2k.ebuild 8334 SHA256 81be072ce297e7426353f5fc5e1021b464aab6c08317ab0798b3f2f3511e25b9 SHA512 69041d575f7542984cdbc9ef32aa04af49610e1e5752ce77e2566b63d0c60d0cfde6aab808d9c32390ca986911de3b67de057d09c1e036204bf119136e386efb WHIRLPOOL 8b5445b07d05613e3003348c5518d1fdd5fdce4415739b0cfbd3589f5a2801747dcbd5bad2c034cc28b6f8bb73916aeeec4d3d3c591462d024147f494180f2b5
 EBUILD openssl-1.0.2l-r1.ebuild 9930 SHA256 78d0509140e5187d636f21320a6bf125d4a1a03d797bf545c7741d31d7ea7864 SHA512 86ffa8e9d2ad2e69fdfdf7888cdc3f885ee3b5fb7bae6af3a9dbcf977d4fe00d1f4fce1642b7c1bc5eab0f7d8a3c2247beb2d80a731d0b14e6aa0b545e323c23 WHIRLPOOL 5765b2ac767c04ccfd1ceb7e5998513aab7e18a80e77124eec63f729f054fc479318612a567b6a8141afabc9e4bdc65101b0811bc25f266960580465e0de0513
 EBUILD openssl-1.0.2l.ebuild 8338 SHA256 072d91bb6cdf1e356a450d995e1a43026f6a86800a601b853f17ab7da1f17c44 SHA512 2435e1f4b4b8f766d1ea5ed0a21fece5109559e16c9d4260d2ef052ab82795bb7005d3f2777bed3978f0f4940521eeb5bd10c85ab2e2037ac2d053f501646f3d WHIRLPOOL bfaedc69471ef1ef1496c2f87de036b29496d903967a66f6a13154aca7b4ecb85eb7abd668dd4652bccee7a8bb6a1a0ab9d5492b19db8ed0e9360f7fbf67b775
-EBUILD openssl-1.0.2m.ebuild 8348 SHA256 fa413bd745a65c33e60394aae1b48ce3ebf26e63e5096debdd9c13d9f1be5077 SHA512 78ba7ffd4565ec9ff8962c4f58bbfab3417da0216b4f766d0c0e7fb5222c28346693d4fef8ad2b4f251f1d31c7c99a7c6baf0429b64b12579fe436f208e8070c WHIRLPOOL a3c3c5b1b583523031ec023934de20eaf6df4b7da2491e822bd85e22c676e8f93045c772cb6c22ff8d50aab1ae2d4a09de5985c0bfa30af8fd46bff622381937
+EBUILD openssl-1.0.2m.ebuild 8346 SHA256 b5196e00b3fa4323fc5eb5d764c712764f322ec165401a9452c26f6409357a31 SHA512 8d97084d044eb5bbc347003d46fcd7658bafa9538eae67c9fffb2e4a0ceabba1fc386c797f32509234b8fe0740424b0554eda5b27ffaa4c6ea4f42199393fa3c WHIRLPOOL 509d637955a160124c6cdeacbdeae1bfcbe2ed198fff6b3fb3c5eca86af3828c22919814f1e9e0cc647bec3541ae21d22a92ae450b4896b649dda4c3d73338e8
 EBUILD openssl-1.1.0f-r1.ebuild 8960 SHA256 59b50a19926a7cef6c0d366e40c4e2ee36cf9f8349c3a5be511f974ad1d7036c SHA512 5d7c628faa89d56a58f5d732f30d495743e6cfa94962e036042f396902aeb71d6e997a2ee2db904f7e04e21a6c2d75e879fdb172f74f28d51b0e2569d532d33e WHIRLPOOL ca550601ac03f73ac41e1c10b882b93c3b351a65fddfc6febcee3e5a3a3b545e04cb38bfb3fca8a8b3d32cc36149933772cba764b731141f1a8f4c5a832aa934
 EBUILD openssl-1.1.0f.ebuild 7419 SHA256 553325ec8be13740869ef1416fb62654c7ec6ea1755a55f2eec81db6797d0950 SHA512 30d243d3d3e13571c8b55f9b13abc8b39ad0e719bd482b54d22ee7cb01217e8288cf2594dca1511bd5bd3945acf4e2963a16d3a172c59c11af93008a7a8874b2 WHIRLPOOL 1248a75677f564b74c2f0e575994fe00a8421c12b6a420a5782c3c3646eeb249dc391cc5b3838ee5d5040a9b0d0a4ec281a3af79a1392aefb9455607a21656c5
 EBUILD openssl-1.1.0g.ebuild 7419 SHA256 553325ec8be13740869ef1416fb62654c7ec6ea1755a55f2eec81db6797d0950 SHA512 30d243d3d3e13571c8b55f9b13abc8b39ad0e719bd482b54d22ee7cb01217e8288cf2594dca1511bd5bd3945acf4e2963a16d3a172c59c11af93008a7a8874b2 WHIRLPOOL 1248a75677f564b74c2f0e575994fe00a8421c12b6a420a5782c3c3646eeb249dc391cc5b3838ee5d5040a9b0d0a4ec281a3af79a1392aefb9455607a21656c5
diff --git a/dev-libs/openssl/openssl-1.0.2m.ebuild b/dev-libs/openssl/openssl-1.0.2m.ebuild
index e47810140be8..9514ee98812f 100644
--- a/dev-libs/openssl/openssl-1.0.2m.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2m.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
index b1d6c76a8835..055c3710ea69 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -7,7 +7,7 @@ AUX zthread-2.3.2-no-fpermissive-r1.diff 2008 SHA256 d7fa1ef2d7c5c75860d4f38745f
 AUX zthread-2.3.2-no-fpermissive.diff 2010 SHA256 f1f37cffbff4c3dd825ff482b80686672902b817529519851f1b554d50ce29d3 SHA512 95f89cad5f531bb5374ae1e300080977defb69bf304221188204f3cbfbf4e23a1445cbe4174e279453a005ab410925b0111ce56ffac4aaf8656b50483a9f1a8d WHIRLPOOL 2ff99434d56f9c7a31ff98657f13f23245a3a5fdd11a5c65c045e82eed94b80029ef1b41b30bc3c88d4a28c1de2b4ea8c2c3c660e79b6af738274bef93eab364
 DIST ZThread-2.3.2.tar.gz 412527 SHA256 950908b7473ac10abb046bd1d75acb5934344e302db38c2225b7a90bd1eda854 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b WHIRLPOOL c5ceca4639b26a86936ff49e781737b9b7e59abcd0ececa5a0799b01460a23c88c18c84027dcdbf16cd5c98549dfceba3a4d30a71c0052f8ffdbe0a824e2c254
 EBUILD zthread-2.3.2-r3.ebuild 1461 SHA256 ec1db4baee921f16b6d5b6982fc51b5cacac8dc7ff7493d19d48c2d3daee9ce8 SHA512 0001e221cf7368c9f6ec9174a6792f53e4bd7174244e4eaaaa6d81cd95a260afaef647a58fccaa60e0be20aa3ccdc2a9d30cfe8483f0e40e6ffd5f7de06378b0 WHIRLPOOL 00f62338f7e52ead46e454c5e9b489028224ebfef853e0baadc0147fc8b18a172de54268e19533233ef8f5bb7a1b40591bf0145376d1f18d949cc8286dcbae26
-EBUILD zthread-2.3.2-r4.ebuild 1404 SHA256 10ee775d3522ed0e2ebab989cb5480f00352c7e7591f601ae72d49357518756c SHA512 eb69852c9ee5d14f525b3201fb99c7cacd28538c17c88c042757e20967440d4db3e484b9f80e286c0a6032328d8096f4b12d1cc44761c1775441224c28012913 WHIRLPOOL 22edad5065b63668d175af824dcc04d3c118e9bbb7dd097defbd6e619843eab8d9672339f534f13ac21603efdcab9b43b2bde32936177563a61c9afa988ac448
+EBUILD zthread-2.3.2-r4.ebuild 1402 SHA256 e477cc5eaff7cdc87a627ad4cc7417a04709b1198e10100878ee925edf89289c SHA512 2451e61155ca7b57f6e058677326a0829b5d63bd24949238de4f3824e1c33240b4ad55a20f4f08256fbb7c13c157c22ecccee78bdcb8862b9faae37c76bd16f8 WHIRLPOOL 52f2ba0cd2c2024e2f11af2758e505bb370ca711357d52cd80470475fb6e7aa0b8674d949d6dc4e567b7cf99c5ba71d180cdbb3635bba22f2e57e5e56d73008d
 MISC ChangeLog 3226 SHA256 d5915a5bedcf9b990e1379c8222124a75f1aa9e2f3db4156e57bc8a87c14e65c SHA512 cde125ab210c5745ea5ba4c706e5574196cdccb7261253c8caab2056572d12cf15b4cb61f6108a3a9acbe3b64fdcf6c13807e672182f417760ab3eb578fa596b WHIRLPOOL ff9aa4de83c97865a8ccaa89b6c8fa7789f23c7f91af4ebb774cdec1ddb15281120d1ec90a18314e41d472b6d0da60ab6148b39e1ad2fdb0a5b5f640100f5344
 MISC ChangeLog-2015 5897 SHA256 e4da5a1ecc0aed3a55bd26f150a22db8a6e9fc2c559e2b6e01c4835c5b53d979 SHA512 339a109d1d89ad83de913c9bfa27f7198c67fa6434a295bd01c65e54ed3d816fa26008247eb5dff843e1cc38c3b49e4170a2896c6a100f99e76d0f7b27494a0e WHIRLPOOL 05f109e36e70e16af6b1961c32f2c3533de9bd84b80b0c3c0740113f6f85881ea9fdec74fe8ec49f17cec311658b05c80644a2d09730c4b740758def833cf41d
 MISC metadata.xml 326 SHA256 210c8d16f72efbe69a7bc2954b22d48d4156610695762609f56a00a6d6269096 SHA512 b01487803f5222c80e0bec2b0acf7bc85a30c7314642ae8e178274b4872a17986ca88ef324700a732b1afb573b74eee64c2e1bf95c08e8fddeee5910969f2230 WHIRLPOOL 868f905de7f37b162a44695e01f15ce8f23f2a512f6431597bbf7b77fe9c839d64398550fe3ca3223ad4d16a40fa4a6dc9dddb9bcc0ad61c2efce3d3cbdec7f6
diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
index aeb476d946f0..6f31d0242103 100644
--- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
 IUSE="debug doc kernel_linux static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"