gentoo resync : 19.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-19 14:14:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-19 14:14:48 +0100
commit: 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (patch)
tree: 8f255dfacbacb657e3ac3654d01c1e11e651c066 /dev-libs
parent: 8aebb228036d5e2863b7eaa6e319ab41c1669269 (diff)
65 files changed, 296 insertions, 717 deletions
diff --git a/dev-libs/Ice/Ice-3.6.3-r1.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
index b4bee2e8a66f..538503b9d2a6 100644
--- a/dev-libs/Ice/Ice-3.6.3-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc examples libressl +ncurses mono php python ruby test debug"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 25b4af5c63d2..10d871bb4cd5 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -6,6 +6,6 @@ DIST Ice-3.5.1.tar.gz 4799296 BLAKE2B 815f6fc40635b85eef85b7b3f1fcf0f7622bb1d3bc
 DIST Ice-3.6.3.pdf 8844957 BLAKE2B 137e3ce85885305931cbbb2c838ccc52175dffb7ad51264837b2db77eea05987ebecc5e3678e2f589bef1cc94c133f0f298ecce23031fcf2654621921c2bd541 SHA512 44638a315b0da9c26519c053c48ab8ee216c43410f53844465535a972ae01031f1603769e9b3169fdf9358de67e0d0c7e238b2918b5d5b1c4cb95cb922fa922a
 DIST Ice-3.6.3.tar.gz 5512741 BLAKE2B 7219cd263ccf6207c0d1e788358004744bd53717bba79a53be468b5e38ddbc81895ef078ba31c98d90ac9ccdd9e17123f4a7ab590fa354c28f6d82f09bf0301d SHA512 6e17d21f55a8504af87a64c498a0c4d2084ed96a85c7a66d00319324774f671ace6afa03108d8d4e9bedf5fcfc2f3dba247949a27deecacdd0d298bd0bfe0a45
 EBUILD Ice-3.5.1.ebuild 7233 BLAKE2B 8b9a4d1e5a26e5b6a1ec776d5d686f09de23a4c7c3689bb605b5b6deb09b8ae9b04f3c8ba9ae3241b9f03f0290cad7033a739ad60005f77969e18fdabd6dd225 SHA512 b74b9fc0ceb0646bcd37c93e3aff54c2f63276cdd30ab885def721224021ebe5f80ed75debe562d35e64bc68553d75fbd963a565eab9a6e776e7c2a5007a23b8
-EBUILD Ice-3.6.3-r1.ebuild 9198 BLAKE2B 73f1bcef503c339e62590ff88d927311a0b4885fcc7b2b51aa256db7e35785eb674a00b61db9273a928920ea3c82ee1e7b2d739c001dfac5824d49a9f6b7ae40 SHA512 dbd4a0bfae20dbce9054c7987ee70e40d83d89597b0f579f8219f44ab40e12400b0174c8b507925838f303de1975fc17b2248a83348a8346c989edffb1618a58
+EBUILD Ice-3.6.3-r1.ebuild 9197 BLAKE2B 0dbf1ed5fd26bbfa921383d8f22f3be0ad8a9bb553c10d52fa41f99ef009def204cdedd12bac909dd2054d0ed5f3db34c71f30d671fa6878d74e95f872cdb12c SHA512 40d2a3a2cbb95ccb34aa4c6f6f0c92d49d13c383453de8d190aa399226423d25f8b3010a33f6e51db213b25333ad7f6dc9d668b7a8856b67afe6147ed4d9bbd1
 EBUILD Ice-3.6.3.ebuild 9158 BLAKE2B f2dd4a71838000b24cfbfda0218cfb72b44e1df6ae9e461cf7c794f483b5510132a7ffc96f0c15d53f797cc7f4427b8fdbf22106388ed7b954864b67624d1589 SHA512 dbc028c9cab56cb05359870321a55ae573fa125d84e1b439fb487a9d376366aeeb3e1e2dc1926d29b82627ac295fab51b65d9ce44b9633d040660ebbdd777a7c
 MISC metadata.xml 520 BLAKE2B f2658367fc9c7720a8b6338c8c79cc88ce7687bbcd58d61e50efa3e452c6bbfe2eaf71563895a1de22bfd8513adeb0439fd4c2674c370199fb37cb7a86c25ace SHA512 8958293c1fbc414bd911848999b0414dc64befc865b012c4c5c40350dce69f366e329c6aac793877eca8cf5e4b8bd477df3055a0ce7481d3c6d9ae1a4b76dfe5
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3715d304bb75..3a33075c6cd0 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 6d4c0ec80b20..6729b8007e2c 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -5,5 +5,5 @@ DIST Botan-2.5.0.tgz 6596225 BLAKE2B ffb5647e5734a8bef14b6c52ad12a211844e9c73f84
 DIST Botan-2.6.0.tgz 6599127 BLAKE2B c45a974f89571c1050e28108267ca6ec094171be3d7dbcb033b86b7dac3f8074703c40c42d5737074a86c19266b4b47c266d0864ce08ee26fad05116a50c48a8 SHA512 2082b4aaac0802f117a5f75c67a69e6d364b436a0ebe543032e370c3f085752bbe1ca48051462066e13bd42e47573ebc532d1d45074fe406df032f33346ee645
 EBUILD botan-1.10.17.ebuild 4217 BLAKE2B 4af0e21d562a01017e28bf55d78788fedd731d390edcb6786b1cecbd9dd637a79c525b74920b9516925795e88eade82ecd3db88ac26df888300cbfe8e525564f SHA512 5cc5ff02202de8b9cc131f0c7346206f40a26fa6ca222dafecd90dba4946980bdc85c9411008c2975a234d077d7acf5f979af5c9be5d6651305a5fa148c9ee97
 EBUILD botan-2.5.0.ebuild 2298 BLAKE2B 9f08544892b00175f01336e4057673f549a69b33b5c6537a444b508f58c05a731f2b18c5c4836148c4c4700f212c9828e2d25c4c1d509538e93a8280a5908b23 SHA512 6530a683b3ecbffce4ff08588ebe4d0860152e17d9004190df44211d45abffbd9371f74a497819c70eadddf7d1caa4d73a423f890df6c3324757eeeddc31ebd9
-EBUILD botan-2.6.0.ebuild 2300 BLAKE2B 4f1843d6a40e8e7ffec332c798aabbeb964091765b76b6f558aca69baaa78f60056e38827e7913793cdb02c226d7c300f4bd31b8260b0758931aa0d475534d77 SHA512 e4368e147581c02226b887b8a346d04fd4a709a2e135fe0fd36c9ef862789a9847cefc2bd79f80a1bd186fd6029f8c3a9ac141e1ca6a5769f4563fbfba5b3ad8
+EBUILD botan-2.6.0.ebuild 2342 BLAKE2B f108b4152e9f8e8cec101b9129345bbdad605567e55cd21743b17f22061a8ff2c6fdde2ec9c33758e0ed235032261697374ecd53d2d0870c045617561c170ec6 SHA512 deb82cc5e8ca3e7627da427a047c03aca73f89e6cce27ec8ac36e803f7f0ebe71650558c36d827f3a5704cb022f2f2a1d099ad84a62a009fbdf74d8c3b0a0745
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-2.6.0.ebuild b/dev-libs/botan/botan-2.6.0.ebuild
index b74f0eb4f854..4fb14ea2ea62 100644
--- a/dev-libs/botan/botan-2.6.0.ebuild
+++ b/dev-libs/botan/botan-2.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit multilib python-r1 toolchain-funcs
+inherit multilib python-r1 toolchain-funcs versionator
 
 MY_PN="Botan"
 MY_P="${MY_PN}-${PV}"
@@ -12,8 +12,8 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="https://botan.randombit.net/"
 SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-SLOT="2/5" # soname version
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+SLOT="2/$(get_version_component_range 2)" # soname version
 LICENSE="BSD"
 IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
 
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index f7aa38f2365e..b18546047980 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -6,4 +6,4 @@ EBUILD efl-1.17.0-r1.ebuild 7068 BLAKE2B e0ce5cf1e86f41918799a7ceebfa341726ea9a7
 EBUILD efl-1.18.4.ebuild 7236 BLAKE2B 2da08d09505f7b2181b942f8c36b7ebb4b228b1634da871e3bd091ace2beb68e824361c163b474cf47ad21ff4166b3195d7b0ae592250deb6a95b04a739590f4 SHA512 966bf8069f1c7e2a87e21973a877c3ccaa530a18b2f9f6f772245e988fd18c34bae7dd37648299a3b87344b1bf6da4b7e6270d44b4d90a00bbe334e0d83a21cc
 EBUILD efl-1.20.7.ebuild 8726 BLAKE2B 340202316bf86613902028e84626e9c9973624c5986649e2a2e2f705278f75b2c418d6560d09ff22997aad29a05fedd1e82d044dfbd4af13975f19abb918a2cf SHA512 8096f235e961c0fab334499795b04634757adcf289060cff1ac49dde4464788b5a73646d922f2cb37799aa0a5b1fb3b9bebf59f1fa108371d3cb20bd8ee9252b
 EBUILD efl-9999.ebuild 7236 BLAKE2B 2da08d09505f7b2181b942f8c36b7ebb4b228b1634da871e3bd091ace2beb68e824361c163b474cf47ad21ff4166b3195d7b0ae592250deb6a95b04a739590f4 SHA512 966bf8069f1c7e2a87e21973a877c3ccaa530a18b2f9f6f772245e988fd18c34bae7dd37648299a3b87344b1bf6da4b7e6270d44b4d90a00bbe334e0d83a21cc
-MISC metadata.xml 2183 BLAKE2B cdcddff05b5f78cc7694443f46c0cd99bbd30bc3f9e8f2bb14ecd6341d9b053ab0f4a0846a696dba1e0c96a691f9df1e7b4b9c669d16d4140f5e5b54f80d4ef4 SHA512 fe9297b36bd3d9e105100aaa7117fc583de9242ffd777cda2f90a2b81eb52a3462b98006e581cd482376d40632cf95ac360881d59cd38fd2256f732fcc6ee511
+MISC metadata.xml 2091 BLAKE2B 3c97d0f22ba6ae0a6aa2a75b60590414da3a25f955990be2cec07991f779a3e63034f19e8b826fa7632fb546162d8d4619413882e379dea46ee6d45bb42e6ceb SHA512 1ebe31d782aa8fd4eb8e21f2bdc030d1d88d2ceab85f3b3713a5da51d55f6342473fbbd41ee7b99d82b1d67ddabe52a1003e02d850c71645eb370d26c08b7556
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 6474ac10c672..925b59046ee0 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>enlightenment@gentoo.org</email>
-	<name>Project Enlightenment</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="bmp">Enable WBMP image loader</flag>
 	<flag name="dds">Enable DDS image loader</flag>
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index 880adc93ca37..c321526bd6bd 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,3 +1,5 @@
 DIST kdiagram-2.6.0.tar.xz 683792 BLAKE2B bc6074e4732a2eda4d8b2a321cfc8a2bad0f614c8d6dd48347f3e2f9ec013b2915a9793807b8640ee00cb1e20229741aae1e77abfd9f826016899a4178581f44 SHA512 243839e23171f5deafb167e5a05f1a2841f0294c9f7944cd2580c9e72830a7082a84e4dddd70da620751bcad4086325747e2308872dc272404540b13d91e4ca3
+DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128
 EBUILD kdiagram-2.6.0.ebuild 636 BLAKE2B ee07b1a8f9181b13fc76fc6bed6731bdc17fc603ce4b9cec75483fcd2524565fc9590bed66e9a468571b7cc6d2ab3bc77432539b93f975b400204eeef8ed1396 SHA512 4a02370e857131d138f60614756811da8cd64e0059ac0c3adc8a7e2cf95854bb94e54e5aeedbd5edb81c858af95bad41690eecbe1ca947a6426aa342dd735265
+EBUILD kdiagram-2.6.1.ebuild 652 BLAKE2B 8fbf71fe669531b9df5011f6c7eb87243ba2d41d0c170c59b5515f1682568718e8bea7c0474ceeca262c8e5f216d07b5d81532a253d4b02f371847c3d38718e3 SHA512 803e14d99ec0380425cb4fe11e4f0b0317b983f29fae78bd6703d7bb0e1c2f44adb7a03b1a04e423d752e776fe4df2310c1f443c3da423817cff8cea544147af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.6.1.ebuild b/dev-libs/kdiagram/kdiagram-2.6.1.ebuild
new file mode 100644
index 000000000000..9a92400c6611
--- /dev/null
+++ b/dev-libs/kdiagram/kdiagram-2.6.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_EXAMPLES="true"
+KDE_QTHELP="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams"
+HOMEPAGE="https://www.kde.org/"
+IUSE=""
+
+REQUIRED_USE="test? ( examples )"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+fi
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep linguist-tools)
+"
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index 163f30463101..72518269b992 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -2,7 +2,7 @@ DIST keybinder-0.3.1.tar.gz 391730 BLAKE2B ea286ab5bbd864709a1290ffd8d7d45468b1d
 DIST keybinder-3.0-0.3.1.tar.gz 358650 BLAKE2B 541ce7cf5bdb9fc8c0cb6d7f1f6326d47c0cb32f71b517a8bfe8aeecc74658cf17bbaff93854bd57aa898e1f22bff1269c20422bab347df6c1e2ca1d8eac13de SHA512 af65ce02707ed2712c70470c9151bffee87e6d5b3b97218b653d3061b74001a7f3ac59e15b71362e4466e7ac16573bdb6331dc00ebccd906ce08ca8176b6770f
 DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
 EBUILD keybinder-0.3.1-r200.ebuild 1173 BLAKE2B 45e340e209d26411e5268ea16c4c929b921cf5447f03b18475227637b49a0f65dc781a231ad6d19296b744cc6f4f640b418040d9e81d76e154a6c90b1adc8f7d SHA512 631ab2a39cb8fe98b95c961dcecd252741fd1799353ecba32637e47afb8338ac29f112ff506b732cef9cd31e75bdf48ecb2a6464c414bc4e3ea7b945152a8ce1
-EBUILD keybinder-0.3.1-r201.ebuild 1195 BLAKE2B 011e2522edea663e82cda46eb5ff4e1b4418259a3f3778645565ce2664df4ea40662ba34508605f51ff0987bdb30ce4494bffae657f2ed15846a45ac8e94043f SHA512 5ee158464f7b10d05e74f1dc33df21a9825bc73df9c6835d67fa46025b0bba17d19d3c6a73896a2b8b914f8aa0fd2d29b447b6e48eafb1b9f15cb2be1d6eb4f8
+EBUILD keybinder-0.3.1-r201.ebuild 1194 BLAKE2B 349ef6c7c551de8583313cd88499b9ea15c51f694ddf223af7691b198d1877745f2c8fd07cc3a8668257e9f2209593fa699c0dd85fc03fc1eff70e5e74cc298d SHA512 fd282e927e6ff35be8890095788694e107134173daaa64670fb58cf28ee3b5f29ac0dcc78003d2b2a2112cb19389c20951b6eec94e16501d026abc06f69f7ab8
 EBUILD keybinder-0.3.1-r300.ebuild 939 BLAKE2B ad5c4af3b728edbef0c2c61882ae35a2e8c630392f7446efe13701ff6fd83bbfa1bc51768244437b4cdafa00620a5e8e5e69ce9fcbcb9880aed1f6a7fedeb6a5 SHA512 c84f03c94a0a27549ffe215a0648882f324f80d38e30c49a97a2b8529c133737c673f74545d2742efdc845d2be5717c66624fdf6ec34e7dbb442c3c71c70efa7
-EBUILD keybinder-0.3.2-r300.ebuild 1054 BLAKE2B 4791bf80fae73518f921a6904d215850099ceaa76b863b7868296d7c497e929f7b63c218eb70efa3892048f9e131fecfd10cea21f27221c621c27f7981548b3f SHA512 64b66555f799cc580d74878f91f9ebb1d105ed65d9ba37d6f502e51fdce9aaa217bffab7ac26e0d9f977c82f24df45c496ab24e59e83a4d510d030a8688004c7
+EBUILD keybinder-0.3.2-r300.ebuild 1053 BLAKE2B 488150055c73ddca34c29af98adea9901d1b6dd1fd17b0c195295d0331d191dea9d708bf9bd59c45aa52e15b0c06bf20eca979d43960742291b0a0d8fc984dec SHA512 6c8dcdb09d62c767e3068ceb8ac4a6ed39f8003e18c45ce3ac5e49dd4ab19d42fa3317966899ca4ddcc34a59962e0772566ffec15aeab473e0c12ff8b5c2f7c1
 MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
index 167e162e8b49..203f9b3ba7bc 100644
--- a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/engla/keybinder/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86"
 IUSE="+introspection lua python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
index 9bc024d422f8..8cc6bce5ac4f 100644
--- a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/engla/keybinder/releases/download/${PN}-3.0-v${PV}/$
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 x86"
 IUSE="+introspection"
 
 RDEPEND="x11-libs/gtk+:3[X]
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index f79a5470d07b..80b91ad7f1a3 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -8,5 +8,5 @@ DIST klibc_2.0.4-9.debian.tar.xz 28628 BLAKE2B aaad6fafb7372152987eebda5951b9f3d
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 EBUILD klibc-2.0.4-r2.ebuild 9408 BLAKE2B edebd4801c55ddf27208c663f6c53ec331cbfb6ffe482362590631704c5e4cc7645baa1672035ba6d61c2e6dc075ac77bd00a548dd030ca4cac8f615ae0605cd SHA512 9c840e5353ef7ed7dc24caa16f8123b1ec57c12f82a4c8853ab8481444ee5836e26715a13a9a820a2dd1b864bd85eb1685e3f63be205d26b9bb5d35cff051372
-EBUILD klibc-2.0.4-r3.ebuild 9502 BLAKE2B 6115e7add73a94b742c03e53fd7ac2d0f5c5b3a045e20efa483d3dc2487c765842d0951374fcf6b06f7cac9eb770d693d027ec6a32378e2fe660ec6dfcf154ad SHA512 676c2c9ebf2e8448503b8eca4058b867cfd5feff78c3ad4abd59cc21fac9c05c5fbaeae08064b32f6b84e6887aa86430bc54c17d800f960ef94c71e74bc7bee0
+EBUILD klibc-2.0.4-r3.ebuild 9501 BLAKE2B d4b331541f4444c5fd6f14be22b2fe4be7639feb9f99cee38e63bd5e59eaf9d8f089a6e46699add1a5a6a55bfa5a90d91358c7cdf7c6eec968373b69725723fe SHA512 7595e4149452344ed6752f2b1815ce3cf564b1661b8e93843b996fe50d4a10032ef2e4c83d5cc8fbe766b40d53bfed53d944a9e031af38b2eb888bafcf9b1bef
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/klibc/klibc-2.0.4-r3.ebuild b/dev-libs/klibc/klibc-2.0.4-r3.ebuild
index d882a5476cb6..fa47aae61a04 100644
--- a/dev-libs/klibc/klibc-2.0.4-r3.ebuild
+++ b/dev-libs/klibc/klibc-2.0.4-r3.ebuild
@@ -50,7 +50,7 @@ SRC_URI="
 	${KERNEL_URI}"
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 -mips ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="debug test custom-cflags"
 
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index afbd0b2c6bbb..817338e47671 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -3,8 +3,10 @@ DIST leatherman-0.10.1.tar.gz 423218 BLAKE2B 1c0af89efda8d899a703d92b7cb7c56cf37
 DIST leatherman-1.2.1.tar.gz 431781 BLAKE2B 0fecfd8f1cdee49548e7408664b78c3edbc76f39dca6abfff3f052dcdae0aaca32ad6197d5cbdce8630116b801c1a8e55d9915531769a3327bde1ea3b242a354 SHA512 f12414093d09b86878558cbe68f03b7f36fc89131412edad0573dbc891b1c422b98b9923babbed9ac4acef2cad869ef452d602199ae4d3e90fca5a3e2eb688d2
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
 DIST leatherman-1.4.0.tar.gz 805151 BLAKE2B 38d5b895370997c91d2d1637ca23e3019bba97e27bc0aa0fb86cd931573c19a669c40ce8c9473c60b365b8474d75ec90b3e8dc2b0f1d488452cef4736668423d SHA512 dcc59928c4623ce0746e2583d4591ae5a9b0426f186ab4105a5a8156daf12d83901e496f2d7edf2a1b77c8087ad200fe90ec703081d65ecae0f999b12e53b0ca
+DIST leatherman-1.4.1.tar.gz 814131 BLAKE2B 53851ce0e875a5953a445b594659d494b127956694b2488c343694b9d4adff9890dc0e462671950c9d920dd5828951ad7629cae20de57625aef02522789024f5 SHA512 71fa4723d231ffd6c582a332d6e57da8d1631d787ac7eeef55a505217b9d216ada11efc2636f2238c0272c30d943c61e1f391941f1c4531f911cce597062ffa6
 EBUILD leatherman-0.10.1.ebuild 981 BLAKE2B c4ba598588bb3b388e627a36f6401c596752a8683814283460e8ae1d5e575ede72d603859ac6c514c451f3f0f655fb3ed01f300f41bb8ce7cb3599c599cbd02f SHA512 1d6b8e7fe40dcd0188b246fd29ce34dcd70afdcb9260899f5bf662a7de9d517a05e40a7187091bba03f97b304c0cdcb8f493e478c3f0e5687edaf05c1467fe9f
 EBUILD leatherman-1.2.1.ebuild 1069 BLAKE2B 2415743c31d327115a44cd551902fa5f8a768a103074cec467b84e2e1f930d392b2e31d77f40f6037462e306b92079375d5c209508ea6744cc1b87be6497e38f SHA512 a16f251b7baa9bcd65dc45e31f744d0a00aba3bed5419825a9e538f7b611bb86820cdb24be67fa6fb996c31686f97bbc9f4ec7116e8cab5653c9773edda93636
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
 EBUILD leatherman-1.4.0.ebuild 1222 BLAKE2B 7aedb4f5a32614583bc4754e25cf8fe875948c79f85dd816766208061d3d778e15aaa69e639b0d6ec578a74c5f84b1f742c486600fe064ebd97425898feb1a82 SHA512 8b3d6ae0c8d7057e0ab55d9a1dc37b763c0898b1ad0dc1c79a682987f323fdb60b1bf967a516ce8e93ffe3f4d70c62851cdb5ddfeb1efe771d166cc07fed8cb6
+EBUILD leatherman-1.4.1.ebuild 1224 BLAKE2B 1b70a91f1dcac7daf0985723f0dd12ffcca0474acac18812318a07fc9487b3f174ae697f9cdc83b477e3e38f936f3ba7b211ca52ef3c48f662dddd102a91d727 SHA512 d0916476dff03385e5b0d3d073e762a32bdef4f7f3dc34c34e4a824c5d913cb82decb77c16c41b44e6f083e6c5488c5827965e6fdc0912f1cf707790efa3cd83
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.4.1.ebuild b/dev-libs/leatherman/leatherman-1.4.1.ebuild
new file mode 100644
index 000000000000..1bbc1551d010
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.4.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+IUSE="debug static-libs test"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/1.4"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.54:=[nls]
+	net-misc/curl
+	>=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+	)
+	if ! use static-libs; then
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=ON
+		)
+	else
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=OFF
+		)
+	fi
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index aead496a70ce..c3b41f077735 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -31,5 +31,5 @@ EBUILD libatomic_ops-7.4.4.ebuild 796 BLAKE2B 9e4dc567935a1036a4d08f10efa416ab1c
 EBUILD libatomic_ops-7.4.6.ebuild 659 BLAKE2B e5417d2158a4f43f4f471a4ede787ecbe82c164af9cf0a9cc2a1792d0414a81f6ffa5f72e834f3d75714477edb247a2702bff0f15a6cda7afa647556970cb68c SHA512 24f438b90aad521994e6cdf4ae195b7bd5bbdc65c66d3f49daade0131c69952ffa2538d10acd01b55517dc94057a0704919c172e3adc10ca49fbb598e2976d99
 EBUILD libatomic_ops-7.6.0.ebuild 650 BLAKE2B 097e7ff302e2dea88181cb379246a2eea38bc8e638500b608359f52e00be14acf8fcd532277d41406a877e6988255ca36e3b50adc204fc657da67af7d22792b8 SHA512 1d4d27e888b82f36770c301e7da6d0cde3f22a034139d5ac5d1b2ae85268fe78eb9338992d8144bc90f2f56cf0716e8fd1498af617e0c3d9c780b42585a67e9c
 EBUILD libatomic_ops-7.6.2.ebuild 661 BLAKE2B 1f61944836bc735e327f9086ecc10621ed8e60d2426c086d774db56abcef07cdbf98a4d88aac485bd0ec7aaad585081422a7810a84cb4fb9078159aab82ce26d SHA512 ac75f27f0324f245873d7395fb119242a0d677ce32b5aa9d0b7824305cffd6b5f986a8b5addb7ee6098ae9f795aeb4765157a3a815b810b7d9817a9f348205ad
-EBUILD libatomic_ops-7.6.4.ebuild 779 BLAKE2B 5bdeacbd3b1688a466d1ecfa4f4188a688319d5b0a6b4ac2c66b0ac80a3d4cc7c42fdff08081ede6e7ae1191bd5912003484cabdb0dc4e8eaccee730ca55da49 SHA512 6897598cd4ac259dd075d2811867f5b41ccae00e064c93a3b28bb6f7428b299dfc5fc8a5dda44fc0c74c9f3d96277658c040e5e51d75612fb99798c7ff13fe90
+EBUILD libatomic_ops-7.6.4.ebuild 777 BLAKE2B e5f0ccc72620a94b3a5a81722a8c26ba065ec95a8888fb6293fb23a81672a3570bf22b55c00895cf27ed6b98eddc5ac1f7405ea3b322a871eb452088ee493726 SHA512 d932417c23a28c5dc1c627bc8d58fcf8cd1aafc0a8bd3b69a02939636d3d96dc21026a8ec7d117835ef098e8964f15367487620248b2c874b38e6368352e8484
 MISC metadata.xml 347 BLAKE2B c8fa80a777d85e172d52bd7eae6523981b9fcc79fa8d6cb7378960adda45dd6489def86930704bb845e64437ff33b39f5401cda0d11ed021342235c7020759e5 SHA512 7a4acee1ccb58c4694e9100d556046c55f508050f6e09dc3d4dd509db9eb747b94eca152e1e98c2ebacd8b8c9c75c362426ad9545cac490f959ec16464f809e5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
index f55074baf0a0..459215b4cf59 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 7cc15933df4f..84b84fc595e5 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1,5 +1,5 @@
 AUX 0.6.12-CVE-2017-7960.patch 1285 BLAKE2B 10118fd008c5c009052f8802db3d65693806c4e90a29d06ae8cc9124b3ce4d2868d7cc689285b685841d989f66100ce50ccab0ea145152bfc818beeb1efff4fb SHA512 736240327aeddbb9a2d7272a7dd3dff2b459e5b99bd81ab9d881644c995e51879d9b3e9c8080571bd387d8dd46ab5cf656f8e2b4e3715fd5548ca32b1d77d58d
 AUX 0.6.12-CVE-2017-7961.patch 1437 BLAKE2B 8678147cc24ff674b067691a3eeae42a5731faec2740c23a4679f689b51b160e51f0ec451b38954fb644b2545fab120aa2e97bd22bce253f5f4e5c1b7c21e22a SHA512 88cbcaf64e4c8ceb7002ffd05ce5f42880bd37a25f8c89e927760f0fa982122cde3819ace2e730cc0dd0e093812ad8470e8783477bc2bd10fe05aacf0b3e0e4f
 DIST libcroco-0.6.12.tar.xz 482028 BLAKE2B d43b73ba21f600ec6d549b867a58db956e081ca8b0787db577062e36487d23cd99b384ca3269421d26aff9825725b262fd6a3e48be73448fe984548ab3eb080b SHA512 af9a171d5ccded255b57f170576e67155f12fa0f61ab3e379e907975f77afc37e82e22772c6019b2897cffc15b2425faf3ccfda92b1a45b23eda2519debabeb6
-EBUILD libcroco-0.6.12-r1.ebuild 1455 BLAKE2B 56bb96545667e3042376100065507ea68a5198fd0466459e557163cbf990ff972800d068a7c789d6a63074b24f46b19f028558f630bfe2e697cea33d782bcb5c SHA512 92fe3b34b066f3289a36dda1e3ecdf1f76ea5c351f60dec5c7485f91e0dc7846f1940a1a61448d5c8980ee19f37cd7fbe5dcf5293c8d14e7328b0e899f71f8db
+EBUILD libcroco-0.6.12-r1.ebuild 1454 BLAKE2B 84850e5df4810ab53635a451be8958b388bd3a2a4fd7534d2f5f460efd3454fd8089e2937897c96c777ba445a28d3e565e1916a4d1cf61104874715741bc70de SHA512 6d62ee1abb2edb46a10c2b8746bd69bafac2f1abd9372299b79a182bdbd43f241ce194622b1f006203fd0c55974fc8863333e04bf462209a934973c8b8182a95
 MISC metadata.xml 597 BLAKE2B 93f85899d5ecfde37206061e57a03b1eaa181d9e2c105999621da011bbed2b11efaae603c2dbba0b405917653adc75cf849e92682e798e9514984e5577fee90f SHA512 9161b1cf0d796d0aeb681374b278be7938bc551316d6d7fc4fc1e19bfff4477f6b12bf606df0eb17c57e08ecb257f358f579a232ce6dbd6cc2f838aee4e2b9bf
diff --git a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild b/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
index 18f7c7c21f6a..19b49bd64c69 100644
--- a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index 3034d41ae438..1f8c21678f76 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -2,5 +2,5 @@ AUX 0.14-man-page-typo-fix.patch 1562 BLAKE2B 3e0bc53ca9cbe959ba6360c6226ee99a82
 DIST libdaemon-0.14.tar.gz 340474 BLAKE2B 1dd6ac48e7b9a31f58688c7a59814435059287a30db80dd7c9cf69f9eaba27245424ecdbfd8719a4cf30d9686f4b61bb5e394821f66c05e770c244a0208e8f3f SHA512 a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2
 EBUILD libdaemon-0.14-r1.ebuild 1199 BLAKE2B 5dfa0749f2f582edc5003f4c1d9bf4f00d4100ad62d5ff058ea4a996d5e6f23d5f4bd74e18be8b9afebf23bdd45a825c2de0b488652b047c38bbf0c81763e806 SHA512 a4f0679b5702353f0dc05cc959dbe1cacba004093a69430fa71a85e2d0be0a80c07603d3e62152ebc203e8dc0fca412b764614cf9ccabb291e0fbcbd3d0d2070
 EBUILD libdaemon-0.14-r2.ebuild 1446 BLAKE2B 4e43ad8358555b319685431f1f7f3b2598116060cfe0d3dac1f923f06bcfcd84438036dd17fb2e174df5ff8397332ce557d81541b8fe7455cfa2ab1abe3027e1 SHA512 dffc3b0c3bedd18a109b5831009aaa309023645d4b419cf9f3d718cfc6629b2e0de5c738b681a093a3f7207b8076d88abbca880a002c2e7c5e8f1256446ff892
-EBUILD libdaemon-0.14-r3.ebuild 1401 BLAKE2B 57603ac8bea3e1ab88607e00cfc40b1e05b453d6c3a6f6daaa80fbcf82c49ec2b8cd87a5af9e36b119f4f02f914bf9b529eb3d790edef7dc98390c30e9bf96d0 SHA512 c2113f7bb113a3a12b73e1973ba85b499da6c6803b67956895cbe6aec7c54ab77c5abdf5b9ad9541b7d84418a18df256ebab538547db97917af50c1ebb871957
+EBUILD libdaemon-0.14-r3.ebuild 1400 BLAKE2B 7c6fb11b435fb9901a549c657141d02300cba809a8236db1deaab9397e7873757bb77fa1da28cad95ca6b9923fc0d22d40a33eb3b0cacf2046431b12deb96b8c SHA512 cab44349f9a73a3f5b2b5f3440912772226e153ceb3a5863ec13f307bf24cddbbb02568b85c5dd334c7e5d61367d0c575afe4fbeee03b0406122c77518fc72bd
 MISC metadata.xml 214 BLAKE2B 33eeb62dd1e0788ebdae4c98136c1c6a3b94a197683d1056a2e0c08566d14cde6469852038c1c8a574141f422d7ed3559332415f8ae79ab0fc223bc5fb55a1b8 SHA512 9b8ba52023f39252d9fc270607a4b928d4c961c893ef4f722d7e2ac567c66a3de509849ef754e3c8fef73923144251e5ebcc19b0d2ec93b94ab79ffb5c17cb83
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
index 8d64d71e16d4..623d97089a18 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 077e941ad7cb..70c9f973bff7 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,3 +1,5 @@
 DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3cd7c11def7155ef1e7be1d496e0d3a7abf977afa1f618b33ca8bcd0427c0c3b46fce2d0a2b9613378f06780f1aa47c SHA512 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f
+DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
 EBUILD libgpg-error-1.27-r1.ebuild 1429 BLAKE2B e8b64e4cf269abe2879393db06cd569719b9dc8f1dc84f2137811111e550b1a2ac8747f87cf33e5daed2a789bac7ef011e5c6f901a497ee0ee0d974498cdc825 SHA512 56cdcf73c28d15a79a55b7016c88e0112b6be319baa67f3e4920af23e5527127e2043bb5323954334d37986b9ef2d329e87108141c9c96e97b6385fa545f8c33
+EBUILD libgpg-error-1.29.ebuild 1442 BLAKE2B f69b65077a12796c1b86e6101f6347055ce91cf8691410be67dbb53e623c908161cd7daaa7ddebf7803a433ba3b5649dd50ab1d16f73225ae19d6328a7143c57 SHA512 c6ff041733e91c5f3139b6945fba2f4d096b85dae732b60a98368b2bad9396c2a440c1297851f57563ebe83fc55c4ea8b0f39a450e957ee8f96d6a85b73c0986
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
new file mode 100644
index 000000000000..ce896dc99821
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit libtool ltprune multilib-minimal toolchain-funcs
+
+DESCRIPTION="Contains error handling functions used by GnuPG software"
+HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp nls static-libs"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r12
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gpg-error-config
+)
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/gpg-error.h
+	/usr/include/gpgrt.h
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		--enable-threads \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_enable common-lisp languages) \
+		$(multilib_is_native_abi || echo --disable-languages)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+}
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 0c1b6906e891..a344e41d1dac 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -4,5 +4,5 @@ DIST libmspack-0.5alpha.tar.gz 654193 BLAKE2B 10f586058d4bc8b46b7149ffdd131f937f
 DIST libmspack-0.6alpha.tar.gz 476992 BLAKE2B 3ff510e108e12741b661a4960f204ce268572f79917d4ec18e105d09cee3f515d76e02a2432717ad6c2118c7eb191b51902ce86e3c5b441ee269740816b2a392 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d
 EBUILD libmspack-0.5_alpha-r1.ebuild 1056 BLAKE2B 4a1db2480e38cc374a1175bb7a2fdb130cbb1070fc72c2842f8d3344f4b2dec50d20fe05d88c653261027146801eaecbfe1b5319da586845957a4ca7c62865b8 SHA512 df255a8f2895b667e46acb21586f7101cbb59d9dff1575a537ce31bbaac7c1d5316ca37ea58c953c1c7854929cea6e5314d5287b915b19cbd8bc943d3f1c2182
 EBUILD libmspack-0.5_alpha.ebuild 1001 BLAKE2B ee8ad03ee802e7970f541a932b8c64b3db85277d2f080bc8371e1a3a20726429679329bcb126d92d341ade78d6f14674f6d922e29fa2c0c1cef0cd89b39d8333 SHA512 04e51296ad4a50665ad8df5d020337c75667f7525412b08356aede88c5b79bfd102613ba5f7a7fd26adbb918a4d78e280f4977949dfcc59a492613ceba1114ed
-EBUILD libmspack-0.6_alpha.ebuild 1146 BLAKE2B 998b93a0adac6106b467ae82f9df1affab43a674e3155e1d9ff60c43dec09b4a360f9331ecc016bb85bad8af28e3c584e5fbb3cb636a968cd196e3ea5b0da346 SHA512 29a7d579ea338dde999bbfc486db4f6017914abc2217c392e0b2aaaa8ba9b425296b5eda7644b7554f234978ff3492175d0119ad2b21e57d59073e27cd907e6a
+EBUILD libmspack-0.6_alpha.ebuild 1152 BLAKE2B 152a52b4441ae7d8b807c2aac18f5c2ea76faac37f0c8486a9ed7a728e67425faaca55a4ec84a1669386ca92406e6f971249c5c369113eafddcee07e375fe9e8 SHA512 8c6c002b89d49ebd13510790e4ac553dc09c9f3fc382fda44130220b8d70a9e8cdfd1dca6a12f237d97b2baa5f73063c4e0d788dbe8efadbf25f1533c29d59f3
 MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
index 3f6b29d86658..4efd4b68f576 100644
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE="debug doc static-libs utils"
 
 DEPEND=""
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 1100eb3a8eb4..c111d12851ac 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -14,10 +14,10 @@ EBUILD libressl-2.4.5.ebuild 1288 BLAKE2B b0b15886c79d4711057dce71dd0bd087740a07
 EBUILD libressl-2.5.0.ebuild 1295 BLAKE2B 5a596e4f2129eed334a02e4bee41c703a7199d6c8398414d0660dc388ac69c3b566a0a4a7c36f3d8f57e30a48d69fe6f73a98fe6d06cb90a199c481841a4762d SHA512 2855b421ead68be0c5337fec2d4e4dbe957c6040e0dd731db73b20a5133b855b10e39891cc4eb7f78a29b92a4084c7e5c7fbf0cd86c0c2e39456f6786d0b53ba
 EBUILD libressl-2.5.4.ebuild 1315 BLAKE2B c72430f36cfbad6a855e22c97a191966aa9abf2bcf814ab72d9a72c60bfdc1b7dca3c8e4dd5fcbd92a00a3fcb9f72def28696b1668bd6855a50793cb1bb5d141 SHA512 44c432cd921f06c052625559817e2bd7e1322dbb23f6a83d85dc5acce31d5f0a11fa67d3a992dd469aab9eb3e948bf782a1b4ab39849162a4226e43c36282137
 EBUILD libressl-2.5.5.ebuild 1308 BLAKE2B 2c500d115a57666f18d47b1174cdf171b1a094cbb12255f19e863618694e7ead16e2ab911610b449ad5e8948f4144adfc7ea44854063d60a3cc676130acfa8f5 SHA512 cefb43c76305e0400efc8b0c33f142b47c8358186fad3329dcc2b22ce387d9b774d2bdea825fe1c8602ca5ab4f3594ea0dbdd551431b1f549454832bcaceaf33
-EBUILD libressl-2.6.0.ebuild 1339 BLAKE2B 972fca7ee193125ac70354489457eae41f8d63707b226dc7ba5adf1061069460e87f6c22be2917d8c5a3320295ae5cc4942ce73db641210b433309a907890e7f SHA512 347cee6db53b099328c4fee6d9a8f889398baa1fbb54889c12b04e83a685fe971b39310ee00dad494923afc7ce932bc7c2943f5645475a1711291b4efc766d8d
+EBUILD libressl-2.6.0.ebuild 1351 BLAKE2B c50aef1bf338ac7cde282311f4ee82fcf0b7174c419fc64b632222b1efe0b59d0845d072623e7e27bde8152a0b353d9ae727322db98db9be3cba609ff4df56f7 SHA512 6f02a29826b0ff0c97c24ad11a93420e2a3638531b67ed09d8a22ab1e7869994e266da9ddf4a05fb1ec3ea4147a3648ffc270934775925bdc3f782768b5edbd9
 EBUILD libressl-2.6.1.ebuild 1308 BLAKE2B 005fc03aa6f53f0b66029e24e322360c126d87e63c011d70e6628341397b266d7fb1fd3ff029e2bbe6a5a3e38f3f2e344c9b255389de51ec9f8391bead806253 SHA512 c4463fe8f0829a9714fe072971d744b991ae6578324ad4c313076d8294814dee6ee3c7827d5bc530fc3ce7e2f91aaa8c307c98d98161477495ad526f7d6daefb
 EBUILD libressl-2.6.2.ebuild 1308 BLAKE2B 005fc03aa6f53f0b66029e24e322360c126d87e63c011d70e6628341397b266d7fb1fd3ff029e2bbe6a5a3e38f3f2e344c9b255389de51ec9f8391bead806253 SHA512 c4463fe8f0829a9714fe072971d744b991ae6578324ad4c313076d8294814dee6ee3c7827d5bc530fc3ce7e2f91aaa8c307c98d98161477495ad526f7d6daefb
 EBUILD libressl-2.6.3-r2.ebuild 1315 BLAKE2B 27557c431220c36ead74810a6bec36f8c50e45efff1f76a57c26b0546d6a2a309a91e68e4156415f3bed7f2c1080a8c90764d00a3e5d1f91cbbd7a7f5574cad9 SHA512 817ac8f8a17a757cbada0e6978a880fd8ea1d84fae02c43b7ef0c48ea5a57c88fbb71e540bf4ac93d7fdf0698b0b8464fd482a6c9add2621215bafce8ecc46e2
-EBUILD libressl-2.6.4.ebuild 1312 BLAKE2B 02f50726d11d7fcef059dd50502d904d3e52c8811c7fc7ae32c26eaf721c39eb8a05be1a86f8f91b18da6b8caf940e3ae655820185367941a8642e8c174de490 SHA512 b7abaee2162673b5a746d5ccccaacbaddb05bd9dca87ca74bba584c3ac7d97599692f16036a2d3b92c89c19d546ec99de0fc81453e811826f4648c28b7943755
-EBUILD libressl-2.7.2.ebuild 1328 BLAKE2B 5336c18471c6bf59da562fcac0b531d6e698dd51ebe0278c3289c4f4cdbb55842d1f8a5df6d9c7b1d4156fa85f3629904e33b551803d2e909bfe90508e79523a SHA512 52e36b6f5ca5a65e4ec331f141c77c1effa072db202d9668735301f2f704e9aa4e347f4f0a4d2f1b53f90c6aa5b6abbbe6bdfef4ed5a55b4c4b9f0bd19f2f730
+EBUILD libressl-2.6.4.ebuild 1355 BLAKE2B 4ab22f89ae1cd6122d172e01c6a65f0e74cda30b9783671dd684525bcfec6b90c2f64c5c8dad7b41db469cbd3ac700eb3400883b82f63799b5bb81708d410461 SHA512 b9f774988a573d5638b3468dc3bd700bf5de2544bc3f89b8819c9f08d07a9484ab106cb08345161503952e46b2c7c82ac227651fb86affb053b6b7c4a7ba55b2
+EBUILD libressl-2.7.2.ebuild 1371 BLAKE2B 76d727e0cce777dcaec922367344125447ea62fa0135a56e2ead996f6cc8bdcc1200533dd96d3d64b1ef946b55c7c7a1de2235337baaa8e96297d49879041b5c SHA512 ba032fe0411d89b37192399ff6b182a621cb0a8cae63cea0dcf3892b3fce7a9c7886667593210099a61015379432f695bbe75458807a6415c2f968d71ed78c3c
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.6.0.ebuild b/dev-libs/libressl/libressl-2.6.0.ebuild
index 44ecf27ddcb0..2613eb39b531 100644
--- a/dev-libs/libressl/libressl-2.6.0.ebuild
+++ b/dev-libs/libressl/libressl-2.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils multilib-minimal
+inherit ltprune multilib-minimal
 
 DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
 HOMEPAGE="https://www.libressl.org/"
@@ -15,14 +15,13 @@ LICENSE="ISC openssl"
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/43"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="+asm static-libs"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
 
 RDEPEND="!dev-libs/openssl:0"
 DEPEND="${RDEPEND}"
 PDEPEND="app-misc/ca-certificates"
 
-RESTRICT="test" # bug #625266
-
 src_prepare() {
 	touch crypto/Makefile.in
 
diff --git a/dev-libs/libressl/libressl-2.6.4.ebuild b/dev-libs/libressl/libressl-2.6.4.ebuild
index b4987334136f..d8f2130d4b1a 100644
--- a/dev-libs/libressl/libressl-2.6.4.ebuild
+++ b/dev-libs/libressl/libressl-2.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils multilib-minimal
+inherit ltprune multilib-minimal
 
 DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
 HOMEPAGE="https://www.libressl.org/"
@@ -15,7 +15,8 @@ LICENSE="ISC openssl"
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/44"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="+asm static-libs"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
 
 RDEPEND="!dev-libs/openssl:0"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libressl/libressl-2.7.2.ebuild b/dev-libs/libressl/libressl-2.7.2.ebuild
index af207c40014f..d988e0c8f015 100644
--- a/dev-libs/libressl/libressl-2.7.2.ebuild
+++ b/dev-libs/libressl/libressl-2.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils multilib-minimal
+inherit ltprune multilib-minimal
 
 DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
 HOMEPAGE="https://www.libressl.org/"
@@ -16,7 +16,8 @@ LICENSE="ISC openssl"
 SLOT="0/45"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 KEYWORDS=""
-IUSE="+asm static-libs"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
 
 RDEPEND="!dev-libs/openssl:0"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 8b5bfce1ebec..6ccd08617724 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -1,5 +1,5 @@
 DIST libsigsegv-2.11.tar.gz 448744 BLAKE2B 3fdf79efd9ce392887e1b133d5ea54637587411c3654b9cc4ae55b8cdfd05d41e56e76596edea7ee3dd09feb865dae56a67d2312033b07b491fbaca291fd1fe4 SHA512 6d60bbaa704b86c12a32a6b0eadd30fa7736d0e0ff8a1c45af1b15b7b7d4524f39902fe3f7f47a100bc2586e32aa25bb575e3d859d9ccb5fd7e99ba4e62f7b02
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
 EBUILD libsigsegv-2.11.ebuild 873 BLAKE2B b002a1adfc3c2d26211758114ec9ddfef9288e10083b7fe1f4663bfb357078df8b4d5b6a416b86981cf8bca5da3cc3e6c37c4fcc2876f207d8dd6b1d25d9a78e SHA512 70dc26ea9d120835ce750b60405ca296342203da4078319c02700734f226786f5a01defb5fab42718fa1e3b2791fd5d6ab120d9c66cae4ec61a2874632235024
-EBUILD libsigsegv-2.12.ebuild 794 BLAKE2B 69a356745c392627c0a1e489b6215686ca9b0e1bd05bd771455d0d427875375ca3e4ef6ee4e56aa05367ce537b0af29f7e359b40a9fc3db2488625f3fbf1e4d4 SHA512 3de11e59ef88837e28cc579a7fb26ddb70f8cd4112a2a5512d7f722298b6aafce9b5e750aef785e67dac23c4b85258f04bb7da43fcc2fb02d8c5d46dfe6ff8b6
+EBUILD libsigsegv-2.12.ebuild 793 BLAKE2B b1293a07478ffc068d0f33fdab04257846a368635e0e6cc1c09a6ad5ab297065ed77e40fb25aac55fb3ad7d3242482c9db2d4eadce7cf7ba39b33eb181b54de9 SHA512 07e611d7644d2fdc42685d94754d62b0e115a37750160622afd91447a59a42f41276295dafe6f64a8f5da54610ee81d63d9b579ff96b17996ee71a91b34b522c
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
index 233cf284c260..8d9de96eb2bf 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_configure () {
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 6333989067fb..a7af78b1c9e6 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,5 +1,5 @@
 DIST libuv-1.10.2.tar.gz 1074184 BLAKE2B 81b5327684ae75ad1347730264f07f1106d9136b84956ac170ab99db9fa5fb574f52af9a786f7e2ce6c5bd8caaa0a28b1efc2ee7a23c015499b420feb9c329c5 SHA512 5d9a7c483c3504e10e17c29297d72dee1572dc657d261229cc68efe63cb3abb59f7e7768885ce3eb06f22691e73323158c06dcce29000c81e35ff9888853f080
 DIST libuv-1.20.0.tar.gz 1180231 BLAKE2B 8ba258477c685acc1ed5486211b65719419757f6dec5dda863d622d4190552a2f5968f3b05519ec5574a5963cce99a9b92c224b511e0f9e70aa099d47f4fb4ca SHA512 382309cb6e54765b956b03357cb754f49d93505ba0e0122a77f33efca07d7b87966c993a5fd9f9503edd1bcd0f49ca42bd9cd9264cce94c847aebca77d237ba0
 EBUILD libuv-1.10.2.ebuild 1140 BLAKE2B a8dd07a2cb5bb9959099d681d9d711bb78afed0decff1f997735749c185540592212137735165989050ea59d6bc1795cf2e1fa82898bdd81fb7d55011ca63d4f SHA512 65f5e4e77ef871f8e40657981432a3bd51d54671b056cac25a2a268509f6f005df3ea73894ea29da3a4f1e1076c9e9c7f177e0e2a968df1d6df498ca14381be7
-EBUILD libuv-1.20.0.ebuild 1170 BLAKE2B 0754f29e8e2810f5a010b9970f7c23b9fa3d95c31e073c248962dfe9cbe04ffe3adf41970bfa89af946f2a083ebed17b847e0d7cb39df63bfd873b65b292345d SHA512 448c026470fb5a3cc5372fe282b421056700c07ddec4404aee864bd3241da2217d5d6c402ec4b77be3eff15492a5857bef9bc0d8d9a78e25d74c08e60238e584
+EBUILD libuv-1.20.0.ebuild 1169 BLAKE2B 477842aa704db8b147b71bb19ab2a8178df6bbac603356f424d3ca5470acc298ef3e40217e52f171375d87b27791304570f4c60c9aee0e708904e6da8cf68b61 SHA512 471e1777462c8b13dc87bc91b2c1f0e772008dcc4b9abe959627084ddfb95d32691f6de70e87b76f6590e419c6629863a62518f41a246a22d52e9e711206f1b5
 MISC metadata.xml 1262 BLAKE2B 0bcb30d58c10147ecb831f1805c89a9cf8d4c8545c7fd8a834a5be6cdfe80e5d7d4b2e7c41df9c2e0b545e199dfcf5de26651f04131442ca8bddf86792fa3e48 SHA512 f95931c1bd8f6bdf6b06fa48e4c66e5bcc567f23fbce82ab46593a3e8b540a582b1e3ea023287ce02d42d3e013e85e3260a300b1d0609d95a98fcd5d7dbea668
diff --git a/dev-libs/libuv/libuv-1.20.0.ebuild b/dev-libs/libuv/libuv-1.20.0.ebuild
index ecbdb9830dd1..eee52115b556 100644
--- a/dev-libs/libuv/libuv-1.20.0.ebuild
+++ b/dev-libs/libuv/libuv-1.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 93bac43951c4..05edfee5e367 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,5 +1,5 @@
 DIST lzo-2.09.tar.gz 594855 BLAKE2B e2a3f3582ce8290f4c66e80e5703af7074a4f097f8b8dd953d8ebcfeea42bad13bbc724c268ef09f5344ff9857ed60cb5092085b225a1b33f0d1252369516cd4 SHA512 7c64e5e7d2050d75ac8c59d613f6f7230b74746b1d207666755b07450053c8b73980f12f8a1ec59d2af0bada02beec126aaacb675b8088b5fe65e97ff7e6bfc7
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
 EBUILD lzo-2.09.ebuild 1264 BLAKE2B 7c75a964bdebeea828ece72bfe7c57f45eb12f53f8df7334dfcd977c96b6b56cc10849667fcc1483e9955e4e7fd61cc0c44a29e5ef3a2ac60b3eb501a7414660 SHA512 09ef14f13313574994a9c2386eb3cbead83f9ac807394a0138dac0c507b7f1dafa00a97f0997351b52d4d84507b7022d697de03c96b0e5ff3ae98950e03ff29d
-EBUILD lzo-2.10.ebuild 1044 BLAKE2B 02531619cbb883c2b3d4a552e52a064aaefc67ebb79f74bcf0e47e82f255e0a05cc9eef4d6904a559db88287ef2a7fb9f19cf1289ab383d464db8c1acded0ea8 SHA512 ee83f8a6261a49d071b280470ed5a91e75914b71ff48824b20b2a0bdd48aadf93c2bd551783497832939be7543fda17e277a56d94edaf9a5afa3c24cc6cbba99
+EBUILD lzo-2.10.ebuild 1043 BLAKE2B cd67c466b8712283adb3d671acb9c0b7520fc858eac8b85a1d482f76f8e6c8d8851dd22f0b831d30735762647903f4b0beda9ad00463c8893dd229ff679993de SHA512 440151794990e5526cb1097c0534e381b1432c4ac14349f02465b322ca5edef90af663d3c004a4cb9fbfbabd2255f4874cd53b1ca6ff6341d47923ae82c89595
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index e7f8186b70bc..3ff5d8c17b3d 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 multilib_src_configure() {
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index dec4aed683c8..a67ff6e9ceb2 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -3,10 +3,6 @@ AUX m17n-lib-configure.patch 3290 BLAKE2B 8b82158404739bd9f976f01d600e4f820c981f
 AUX m17n-lib-gui.patch 365 BLAKE2B 0efcef5e8be1f794f2fadb193aed03371c334226225cf2c53df81c54ad0d26e1d367c7d7e9f04365f415b61a428662fcbcae2cfe70e75e71df076f4ff8145400 SHA512 792900e167d8ed47a006dd48f8cb0b0b58e239f1ab56751131de15179b917c5ec8251d00932dc5d0d2fec8c51b2532606e958e90c943f6360a3442a02b76f445
 AUX m17n-lib-ispell.patch 458 BLAKE2B 745b7567421b475fad70e63c4a6c5e12606de89bd7add18cc269d0a18e294dd3c1fed542cf65aa776120989f63009bf95bfabaad1b795fd5316e1599dd66dbf7 SHA512 cbfbd70a1b6d7525627ad8d87c3b2d79f8bfbd74915da5b6f8646a5ab7cbb351abb7a1ea103320faaa4cf80fa0a58d0adf7d9b3a7cc0ee40e8bb4220dd92574c
 AUX m17n-lib-parallel-make.patch 2379 BLAKE2B 2867ed88387bf6014841b1f00ceebacda768948e92f4fb0bdaa7d5316657bc48342232edc64c24ec4e7f7b1329fff8ba2b453e8211856168d6830218d6ebd48c SHA512 a1726270680ab0124764a092aca36369e89a21b0164b039d5663cb0af8352b316ed59bec049dc849201f046bcb7bbcf3dd8522bbc7ab20ef64c59d898274eef1
-DIST m17n-lib-1.6.3.tar.gz 1033048 BLAKE2B 869fac61545ecb94d063282cd257732b0d46cab01dd3a7b49901315f1f81f65fa5e7b782429766e8f8248c83c355d57f0d40251bbdfb35ee065f4c6d165aacaf SHA512 66177e5be17e330230d31bfff8a3cc7415ad79f9bfaf8f4c4baea02f1f19bf2d3628210c697a9b14d07dcb9bac8ca256e6c5102cbaae65876bf49aa2150cfd80
-DIST m17n-lib-1.6.4.tar.gz 1034422 BLAKE2B ccb991dddd55e8f149b37f2e9ee6e84c5f8a9600494c16cba7ee55ab0a96c56b338383bfd88de5c81f2dc3609a40b4e3c645b8eaa6905bfe08aba56dbedc91ae SHA512 751f22efdaf4fb3e23d17ca07e20c65c59d60ff4f90a384bd9a8e9e8b01503d87c76cfc4c3c9717d8549a08c705b1c444939816a7eb07ca77b029b4f457f58c3
 DIST m17n-lib-1.7.0.tar.gz 1063169 BLAKE2B 61192d26dec8a8bdb55b6a819c5b1aa5503e4320d57864889065c9490ee6720f5b258fbef10d5944f69f5a9ccbe49ea5494c8b0a10d536592c301f46df6826c5 SHA512 26fc1be02a5e487a2fa5f2f63d991f3c745aa1b78e20d931fe4b265125266501cc8d402aa3cb5c1b71a7d4c0f7a0bf5b2c3b17ec5f4f8e0f5ee3052ad4e205b7
-EBUILD m17n-lib-1.6.3.ebuild 1243 BLAKE2B a0deea4634dea41cb57e8670bbd801e647bc09ff10c69b720aa5ec2654a31c5d2f2f3f65bbf8f1f86893bc83561605f24a3262bd72d6984403d065ecc20b8e6f SHA512 fd406846f8b9fbb807d52284b5a0b2414aa77291fd3ce164cc8ed7b1ad1134c1fb701116db1052d209358bd308139ce0f348f291e97aeead3e18bbb4ccb5c907
-EBUILD m17n-lib-1.6.4.ebuild 1856 BLAKE2B 218168f81159feb10f99c1cfab9742ed495ac5e461fe809012d20b5f4fff80132026c507545c3461eb2fce709791f614f2c87305021aed2324457fe0576d1f18 SHA512 73a904207a8be9e7e5385c116cf5d4fed150defa974dd81b76c1882b526cb0599234a90c29232efb66ade5ded0f2ee4a8cf7b67ebce8417f0c3386f733176040
 EBUILD m17n-lib-1.7.0.ebuild 1797 BLAKE2B 6ba7262da1e21d675d2b458cd791b9cfd7273436c5bc04110f4fb8d3e81fee2c38a960ec2f9a32708e0fb580dbd95f306a5406747fdee1df0ba85c01cf14462d SHA512 9b0bf74495f2ccb2c3c50f1ff44f2716149fd961a9c7536cb1d46229576b26abe3ed7c21e2ee6ca26b8c139336ca852c39a52ffeb1fceb5ffd07317f3e51679d
 MISC metadata.xml 873 BLAKE2B b273eacca314fca66e3b779dbc02401d36030747c3068c9e70799500dfdd6a5ea8e5e04f259bf4e284278ec633ad625abae6b1559e757857ba585caeffe6128d SHA512 e0318084f83ee510dee477bb9b6396a81dfe4afbdc407daecc49d51c037217002686af4db286e4bcd6a158061ca0a77822f3853f25f12db5a384a3fafdd38291
diff --git a/dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild b/dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild
deleted file mode 100644
index 3ef131f92f82..000000000000
--- a/dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Multilingual Library for Unix/Linux"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-#IUSE="anthy gd ispell"
-IUSE="gd X"
-
-RDEPEND="
-	X? (
-		x11-libs/libXaw
-		x11-libs/libXft
-		x11-libs/libX11
-		gd? ( media-libs/gd[png] )
-		dev-libs/fribidi
-		>=media-libs/freetype-2.1
-		media-libs/fontconfig
-		>=dev-libs/libotf-0.9.4
-	)
-	dev-libs/libxml2
-	~dev-db/m17n-db-${PV}"
-# linguas_th? ( || ( app-i18n/libthai app-i18n/wordcut ) )
-# anthy? ( app-i18n/anthy )
-# ispell? ( app-text/ispell )
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-gui.patch \
-		"${FILESDIR}"/${PN}-parallel-make.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	if use X; then
-		myconf+=" --with-gui $(use_with gd)"
-	else
-		myconf+=" --without-gui --without-gd"
-	fi
-
-	econf ${myconf} || die
-}
-
-src_install() {
-	# bug #363239
-	emake -j1 DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/dev-libs/m17n-lib/m17n-lib-1.6.4.ebuild b/dev-libs/m17n-lib/m17n-lib-1.6.4.ebuild
deleted file mode 100644
index 5bbae7728402..000000000000
--- a/dev-libs/m17n-lib/m17n-lib-1.6.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Multilingual Library for Unix/Linux"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://download.savannah.gnu.org/releases/m17n/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="anthy athena anthy bidi fontconfig gd spell libotf libxml2 X xft"
-
-RDEPEND="
-	anthy? ( app-i18n/anthy )
-	spell? ( app-text/aspell )
-	libxml2? ( dev-libs/libxml2 )
-	X? (
-		athena? ( x11-libs/libXaw )
-		bidi? ( dev-libs/fribidi )
-		fontconfig? ( media-libs/fontconfig )
-		gd? ( media-libs/gd[png] )
-		libotf? ( >=dev-libs/libotf-0.9.4 )
-		xft? (
-			>=media-libs/freetype-2.1
-			x11-libs/libXft )
-		x11-libs/libX11
-	)
-	~dev-db/m17n-db-${PV}"
-# athena? ( x11-libs/libXaw )
-# athena shoud be enabled to build m17n-edit properly when X is enabled.
-
-# linguas_th? ( || ( app-i18n/libthai app-i18n/wordcut ) )
-#
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-gui.patch \
-		"${FILESDIR}"/${PN}-parallel-make.patch \
-		"${FILESDIR}"/${PN}-configure.patch \
-		"${FILESDIR}"/${PN}-ispell.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="$(use_with anthy) $(use_with spell ispell) $(use_with libxml2)"
-
-	if use X; then
-		myconf+=" --with-x --with-gui $(use_with athena) $(use_with bidi fribidi)
-$(use_with fontconfig) $(use_with xft freetype) $(use_with gd) $(use_with libotf)
-$(use_with xft)"
-	else
-		myconf+=" --without-x --without-gui --without-athena --without-fribidi
---without-fontconfig --without-freetype --without-gd --without-libotf
---without-xft"
-	fi
-
-	econf ${myconf} || die
-}
-
-src_install() {
-	# bug #363239
-	emake -j1 DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/dev-libs/mathjax/Manifest b/dev-libs/mathjax/Manifest
index 8afa2e45f3c1..489b8052ab60 100644
--- a/dev-libs/mathjax/Manifest
+++ b/dev-libs/mathjax/Manifest
@@ -5,5 +5,5 @@ DIST mathjax-2.7.0.tar.gz 24594403 BLAKE2B 7cadfe7565a7ebba3569fb298a097f0708192
 EBUILD mathjax-2.2.ebuild 1175 BLAKE2B d935186d274ce75dc8f5ecb4c3c70afa7d0ed7454ccd3753ecd3f147584064e511918a24b7f94177b57f357d39a64752b770fc60e0adacebeda1ca0530ffe7de SHA512 6966f52b9bbab31cb2a0bf532828de111a2328ebddf8e485e99e03391761618f837cd7d2dcb7949d2263f220a19c85e294dad67b2b866c13e07b087624e3959f
 EBUILD mathjax-2.4.0.ebuild 1183 BLAKE2B 917678402b7f6193416fad3219cbb86af91ebd54dc4b64af942daf39df9dbea5cf57677ae5bff94a6a6da6f48500628dd4c0fd51bf4d13cfe03cd640c1a35ca4 SHA512 30f74edb2300d82ed46f206cd25100bc407c3e9d65c719163105945b3494f0fb66075c92393b327e50278af9862a35548860a64f2202da3a49f0cc1b3b925d88
 EBUILD mathjax-2.5.3.ebuild 1178 BLAKE2B c7efe9d683c49c0d5d406af3373f3037f2073388d701faddc67904adaf6e589d63c987240cb3474d034a879d004837f6c8d5027235e72ce9689b37b089d73943 SHA512 62fd25330641476a19e9d1d9309665ae1b3d2e70edf90bc289f9eb93c3811377bada19d13a92521c77f5a19f0e803a98860f71bef637b1b0c813b6437dca8c16
-EBUILD mathjax-2.7.0.ebuild 1222 BLAKE2B f8ffb199127ee06316adcb372e1bd29bcb71bd906bdaa8bedee1116ec75aea8e84eb26c6b7522403ab5c869a552ad7186e320b03a63513b92e81df6349367deb SHA512 b3ae6720278189001b3e17a75aea76a10801ac36901e4d133c68b842c2c5a733f8ab02f1f1192d6e6b003b35aadd54865d9129c611d4f0635467bfceaca4a82b
+EBUILD mathjax-2.7.0.ebuild 1221 BLAKE2B 095ea895cfb5d52251ac0e5bec3b28e18f5255e4ebd81d87c11c5ccee760ba15d28e1411f4ae18ad791f23e959802be596bf6af22b9ee9d92772a310ad98cfc1 SHA512 3721ec0ae180e12a1e6d1ef8e0920a12d7b1400ab0655a1c7115a2f1c4083090e0ad43c5026137e31a795d5ea07d70fa5d93853c992d7e4434e518a643680fdb
 MISC metadata.xml 1030 BLAKE2B 8f3b54b726e2f135394cd6a0957d309070d3aba8fa7c40ef4b51ef8daaa0123b7f30f6cc793e2d93cef3c9f801267640444d7c604a3d6dcb277d9621ec6dd1a7 SHA512 aa7911df581513457da3e6f146e9d7d986c9b028698309ed42d1980f7bdd7a738dd6eb2a252ffbdd49fded3877e196c32b0a75f90fd1fd928b078429ed84565e
diff --git a/dev-libs/mathjax/mathjax-2.7.0.ebuild b/dev-libs/mathjax/mathjax-2.7.0.ebuild
index 39306114c926..934c0e39a110 100644
--- a/dev-libs/mathjax/mathjax-2.7.0.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RESTRICT="binchecks strip"
diff --git a/dev-libs/mm/Manifest b/dev-libs/mm/Manifest
index 7f5d847bef74..e5b2d1d786a1 100644
--- a/dev-libs/mm/Manifest
+++ b/dev-libs/mm/Manifest
@@ -1,4 +1,3 @@
 DIST mm-1.4.2.tar.gz 344903 BLAKE2B 5fec1eeea52e9ff77f94081f4e77dfd627c356cc94591169fa89f5564882e2e3a4712c90c3f1e133024ef0adf095da8063916145159e5023c4191748bd622c6c SHA512 dcc12676453cfaf19560f99fa97e905428051d72b46aeaf574300f51e64f689caa70c81b619b8794ad604e8a2efe6bde1e486a2e315263b5694d6eab1cacc182
-EBUILD mm-1.4.2-r1.ebuild 829 BLAKE2B 31dfd5f23e9f9516d531428fe89482bbe56db4a222e38941d69420f66705135d1dd98ad4c45dd680e0a72c828fd09803b217b2c1524272e3220a66367a8fc7d0 SHA512 2d8134d6cbcbf8c7fbef54dfdf6c9651c56243f325c073b9310692e5eeac3ef4f9a88612d5f2f73de8e5b6939103528ccb7cd9c7cb216b600917483f4e2271dd
-EBUILD mm-1.4.2-r2.ebuild 705 BLAKE2B 2bf4ee4a0dec9d1b2eddfe733961af74a47772afece6c0f27e68b29c239f0710f23618e08d3fb605ebb9aa14e8b3145c86578ee939d462fd264b3599ca02aeb9 SHA512 82fe8b58b135f88af38363bcb3163adfdba585c98a67b8cfbfdb77de7a1915b588e10d42236519c7e43c327f17731cbf7b7a8003aeec0f5d5f94e3f86038e828
+EBUILD mm-1.4.2-r2.ebuild 702 BLAKE2B 17eb838eb0e56f535a854d151deb697004184be5f3db2e2b30c40ecbda7a338b257ec9888d893bb5c8f6a13b08776a867eda44401561944f1483d14398c1bb90 SHA512 464cac6439d28dcf16c8f5a279a8b1f356516cf356ab974c401d94fbe20fdb96d91c8c939c954cbcc7c83eceee47c9e72bb56aa66ff2da70a5e67f17022472d4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/mm/mm-1.4.2-r1.ebuild b/dev-libs/mm/mm-1.4.2-r1.ebuild
deleted file mode 100644
index d347ba400709..000000000000
--- a/dev-libs/mm/mm-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit multilib
-
-DESCRIPTION="Shared Memory Abstraction Library"
-HOMEPAGE="http://www.ossp.org/pkg/lib/mm/"
-SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz"
-
-LICENSE="mm"
-SLOT="1.2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
-	sed -i Makefile.in \
-		-e '/--mode=link/s| -o | $(LDFLAGS)&|g' \
-		|| die "sed Makefile.in"
-}
-
-src_test() {
-	emake test || die "testing problem"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc README ChangeLog INSTALL PORTING THANKS
-}
-
-pkg_postinst() {
-	ewarn 'if you upgraded from mm-1.3 or earlier please run:'
-	ewarn "revdep-rebuild --library \"/usr/$(get_libdir)/libmm.so.13\""
-}
diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild
index 654f8f6e9d46..84e891c31927 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz"
 
 LICENSE="mm"
 SLOT="1.2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 2763af21a13b..2dabc21a2b9a 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -9,7 +9,7 @@ DIST mongo-c-driver-1.6.2.tar.gz 6907818 BLAKE2B 7922a50ba58d92d2954eb5c2ccb02fd
 DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de062804f0f8637a36ec197efe434ae23a387ec0e6b2e4aa3e9c8bb2434a3cef48fecd17fc4b159a92ad86b8b940b17598a SHA512 af23601ba33694d80acdb890c1b85a354fda966491c4bbfb341a884bcd6314886e405efa3a09e47398adf8dbfdeb1b05ae8b022a72f04a66265bfaeddb661f76
 DIST mongo-c-driver-1.9.3.tar.gz 7716783 BLAKE2B 9f5fc8cddbc1c4cf1f85016027e49d4c3bf2ebe50b1df45eda8569d48b88e174fe2c73e76f7afd4f3a36b74c5d02b826f55c610b8c4df273d8ebd4047e823edc SHA512 2c3f915c4f367f5614a904741b4b480896dd521b7039158b2f421d0d7579a45862d5099cd26b6d14cb088f9db49019538aca553c5cf72d9706ec9ab6516ff40a
 EBUILD mongo-c-driver-0.7.1-r1.ebuild 1265 BLAKE2B 8dd36363056eccf480098c353f77eb89c66e2be3e38568e97a6a92b0adef6c3887324df07fcbf10a81784e2508e2249a7131c6eb288ece61b6691c341a43a476 SHA512 eb9f7c198354e5daf80cccfc3cae0640dbeb5b748bd5e4bd9f9c94400ff56df7616c389234063c362a2dbe89d0bf8908593df06b68d4fb6bce4d350f795ccc94
-EBUILD mongo-c-driver-0.8.1-r1.ebuild 1206 BLAKE2B 84720e113ee9577f8d7990adb03665fb4c33dfed609b4a275f0bd87bf34d75eb439161c705827907b3f8084b06b0da8b482c10e8e53d5dded9885bd9adf9e20a SHA512 a8fad804c2fa12ee63bba7167e299db787b9293d2850b7a234d09b3ddb6890ab97987bdf475d937f23de874447b1da80dd0ebff140aeb315c13d598cdfd7a4b3
+EBUILD mongo-c-driver-0.8.1-r1.ebuild 1204 BLAKE2B 1dcdd5945923fde34f50fba03998f88096e598e1f1cde394eab22a74ba1d537531e5365317383609dac5baa5932fde85ca5d426e03cc649b6ec6e2e5370474e2 SHA512 c66b8e7d836d5ca9845bbbb73ca643a74d2568c70ec9b08912b4b55bbfb08ed581579373f2c2443713ced62b72620b7462bfdc1cf7a9fda009f288d82305fcda
 EBUILD mongo-c-driver-0.98.2.ebuild 1692 BLAKE2B 247c26866b8eb10aef7b0894300157a7522d2e579d7c5f19022f086e0352afaca4d5f6a45f9eea94f99049b102fcca84bcbfa56a138ef8d6afc4cd44008ebe71 SHA512 b74806852fbc46322c52966c987d882866fcf551c865eac0bba641b4ccf0f7f4a2129feb3f610e4fa57d3a0be99f50cd1e4796aafec2a1d6ed851c16125c370e
 EBUILD mongo-c-driver-1.1.10.ebuild 1803 BLAKE2B ed8a0f4296418db9836fe3cc4052a9d2c72562542d5588c9219803ee408ba8106829945ab22d1cb64b49428f7a78991d086652f68bebc592ba5872f7aeba2a86 SHA512 3f5a4deeb9115b9a31b1229cf560f62d28611281fa76e1c2d043602f49264a0b75b67540a872621a72bb20bf3aafdfdc4b528aaccaf206ad538127bb69e8587e
 EBUILD mongo-c-driver-1.1.2-r1.ebuild 1800 BLAKE2B 61782ec9c74e2d67bd884c1e1aa1b51eda2aa7148b3df90de3b45187c2823efb3afff7edff1eb5047bb205004a3b9cb8977c0945e6609df7a7c037ca97ab2bf1 SHA512 0183addeff7e2bac1add74db48b727edaf09f1b24b774bafe717c43c0e9a4a083081f12ab1d2afb743b61fd3591d6d3fa04f1b6c2be9339a2ab55a27ef4791ea
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild
index 764dce23aa5c..495c4072b100 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/${PN}/tarball/v${PV/_/} -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="doc static-libs"
 
 # tests fails to build
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index a997aabbe2ef..6cb4d99f427a 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,22 +1,8 @@
-AUX oniguruma-5.9.3-makefile.patch 1621 BLAKE2B 7b67a65dcd618c2e18bea8460d9d2fc96c915263bcb2f4e3052600b57e8e67024322d4b909a569dfa203f630504091cfc5d41a1986c7358a85d916faff339fbc SHA512 0478865cc6ccb3ec5154eb16ed2682b999fd45e7892c10e96662e4a0cda20c5bb0ada8dad2cca5cd88a10d4e11ba43e47a81cbf7b806364274bc8a27733cae07
-AUX oniguruma-5.9.6-CVE-2017-9224.patch 467 BLAKE2B 0989d3e3cda581768a8cad5c426587ef9ea56b78dd4c8b8cb63a70470277adca913c4bc008edbbabc413ff6d8b8f02cb330c903ec38b18e3440d19180fd300b4 SHA512 163e681c7d4578979209016e644b313037035d82f129d6e1cc2e93ed840358a00382c2daed127973f5af2bd11adbb0978bd006428061e29222ef89a2c1142a0d
-AUX oniguruma-5.9.6-CVE-2017-9226.patch 1278 BLAKE2B afec87f0a5eb7aa35511f9edc8e5ca2046f92d295eb62ee7d56e47b296056c7864613cd8241700e8b35c2e1844b538961d9d97d92eec31d5a9ab6e7d7dec5b91 SHA512 65e725959abc68ae3934e61cabd89a94825bc6b3e3a2fc76586973cacdbf73c9904c8f6a058dcdb2f1b91a38bfacabbc48c65a6094e42758078f30a775316d1c
-AUX oniguruma-5.9.6-CVE-2017-9227.patch 376 BLAKE2B 324a05b4eecf1dd09d6bd7a7be273ca08d32093a3547bce182c6816d1728731814a5ba5edc990a921a09912338fc7c98fcf89745a4b18db9759ebca8a41bf96c SHA512 70c4f985b547063338a39cc6ab7812cb53dd3998b9cce60f71c40cf3911dc2f31b66c8cf9ae543763ceed071737288ff811a474e1562a086cc32d98e0cf9b0b2
-AUX oniguruma-5.9.6-CVE-2017-9228.patch 354 BLAKE2B a73da41f58160d59e44afc373991cf8ffb3f2c174dd17ee1c3734b6e09fd12b2e081d465a783341c03a3134f14cc89e8617711a122a03e39c5e5df45d32ae3d4 SHA512 f87dd5b1afaad7069116afc17ca73ca77c165b31fe4d7c2d5c54609bf5a30c2d81ba2fb1c461bd6e3a9c7e518363adb10ca900ecc42f397c69337f7989cbd5e9
-AUX oniguruma-5.9.6-CVE-2017-9229.patch 1311 BLAKE2B 92aad3dd5d175e8ade8ff419302bc1d7413ebfa662984985c043c6d6cff6afc051590cd1b5d2233444cf13c80b9aaf9024149891e095b07491de63c254d6f2e9 SHA512 eaae2b40b15f261ddb380ea188eba341094a8ec174143a054cddb902352579df1a057c5060f6873710bc9445bcdc6c0d9ca9e692d82ff66b1cfc9ceba9ae5d8a
 AUX oniguruma-6.6.1-build.patch 656 BLAKE2B 0fff5eababc1a4fa732ea797c0790418c8d152623724e4f7d23f2e21a280a8ccce65f91026c686f7063091e298ed0f2c3691384d45933ceb9efe17749f061f86 SHA512 44190842324010cf9389b6269e041bac5e128324f5ba7cfdf5cbe6770020325d7e802c71f1c138b4e181d81fb6f53f7cdfe58f9b1c25cc4ca90e23d4d63c3397
-AUX oniguruma-combination-explosion-check.patch 417 BLAKE2B c210914710af87c0811f1224ae6174c3ae2bf1ecfd7c645deef81cc9d7e52ea3eaeb39479e32c53e7af06f9147b4fa9ab5156891de1a2d4c7b6c0aadc37fa67d SHA512 2a163eac5f214bf82fed0c2229f5415947886602c8d929421cac762ccc7158c0120d316ca08449a88785ef196812c3426525d4eedd0b4d8c9bf53de77c49eb4c
-AUX oniguruma-gentoo.patch 1502 BLAKE2B 445a48c225384b316a0573c28910ce44bcffff8b08602a45f53b32076c73f1145e7c41f449f48f93bd8a1c555c4ee1588042c4ce3803e4cf49faadd4d02b2b2c SHA512 fc7c017a60778ff665df3a178604136754e72ab51b016ceb6f164c72ed66f442e77981cd14563dc0c84948e66ad37416d9e6b431387bb664d660c7343e0cc367
-DIST onig-5.9.5.tar.gz 587874 BLAKE2B c3d691757d920c3690f6f8b4f0b3c7fac1fea0127d72a0c953ae212df711cb5d4e3ac6b36a40b7087d228381b405fcefc26fdb8203672eb01f12fa5c9562c337 SHA512 3ba3c94c5e52c80c680ebf1d19be53fa5a94a11d622e0282184c7a9c8cc6676f1926b97d12aafc66514071e65cd7de2bd4632afb053c69b01ddb8b581e878252
-DIST onig-5.9.6_p1.tar.gz 605920 BLAKE2B 9f5ecd29d0dc583d424866e5a37fe92ae4c987408d764f840f1f765e11e469f9f9db0169e670221d91ffeecd8ad4337f10d7f9c8559d3dd61f5edf82c244ce24 SHA512 5c874a92acab19e7b228e855cee2d8c55648d3c0c25213127e67bba7f510ec68cb5d64999cf629ffa509745e1b0bd13dd80afbdcef3ba1d4bb8f3d0ee3616f48
-DIST onig-6.4.0.tar.gz 900425 BLAKE2B c2c76ea0bd1e47354169e386a495b8754da604be0dbcbbe43e7889e1c37f84ddf032b0874bdf3711221b60e717c1f1bd36edb35903102f0be55c323f81d42ec9 SHA512 476f2110f09eae9b27e0da4b995fa9db46fe6f98f5ef8700b9f1966f9b4bf6db680c6e9e67e1d8d81e759fd8d1787af39c4b38d6681ee4b6405a970c18d583fa
 DIST onig-6.6.1.tar.gz 943490 BLAKE2B 75771b5da78ac31e382ba964b9e881cb153b0ded89a5bc58b60783ca7fb7925e4bcbd8c8a1c02cf654accdfb4a079af6427d8731a6ca241d8aa86217835e892c SHA512 ce9ac1336e2782fcfdac8cb4a257162f57dd8c2be20f74771a1ab9671b5926ea9c9fc07e2f4b04d80a2138a6e4c0e3295ac3f257e4424acf888e343870a377cc
 DIST onig-6.7.0.tar.gz 952950 BLAKE2B 7ff45b04abe28caabf8c54e3dea4fb801c50fec9795bb39089a5be282d703c794c1eaa14433fe96b09ecd653275e8450e16ce410f0f53de63acd79cef36d3844 SHA512 21b10ff7cca8bdf057110927755cecf444415e308a8580427a4f661d58e678ef808a9e238066c54e664878739449fcf3de9e8348568e9dad2bfdda8d39b46a30
 DIST onig-6.7.1.tar.gz 951650 BLAKE2B 475f6de4dca5579071777de9805a7676f8bf0ba0fff360a8231895882ce5535c80ee8f12bede3d1db17497efcc904c4653f4d15d559cf5ac180039563f0c14cd SHA512 36ce29b639e8a15bacc3fcce835eea3ae5516fbefc250d0152493b86166f8f3b74ae4c807c609f6374cd8c401b434dd1682747be14b70da64386150d4e82badc
 DIST onig-6.8.1.tar.gz 973837 BLAKE2B 5ccbd8b428dcb0775e745857cb1ee678cb2e42c1b9044ac807444403ea0ca602aeaa7ab86f70b9835c2042a2b48a65531c355d1f32ba22294403dc5a3f3ce895 SHA512 50005d7bccdfd5090181781c942e7814eb82ef1652453ce4bdf7f4e763344c87af84fb06c5240494d3774568913cbfc3b158e0a69edfbc1283eaeb7842dc0631
-EBUILD oniguruma-5.9.5.ebuild 1075 BLAKE2B a4512730195cf7e2d48379ba4c4d43d02c9121eb142ff74541ab3233f5cefaba8bc03026a044680f6a54f45336c2b47721e2b4e360ea96cbbd1af4f9bb352293 SHA512 83ec9d45664414ba08759534b04f346641e680ee4daa94dfd668e5408bdb19d982f22bca41ec606a955777732043d6bc681d557270d1619447406a3435196c64
-EBUILD oniguruma-5.9.6_p1-r1.ebuild 1367 BLAKE2B 70deefd41dcea8158140baec264749af5279cae2456b5a55ffbfa2def6aa1c49037a5015d48982090e575083894316870ad89eaeee876925f8f2b830a9c455f9 SHA512 4ce079503ac7278f07bf34fb8bde3c7cd6afabbe5ec9bc5512756461502e02e23857e05f37cbfa2bb27273a8e204b1ab1ed2478ed2d6a15215d206b690327cb2
-EBUILD oniguruma-6.4.0.ebuild 1155 BLAKE2B 07dfe6707e0ce33eefcfd13693f38c47d40cbfe1ad6d6da73c76f1a271b0af677a5ed611599d8b1a8b1189fe0e2ee6701565dbddc62cbdc3a15261b944ad27bb SHA512 56f20dd2bd854d209674839e80505ef80b14a7dc8b61bc3cdcbba194f63d6a7dfe556ea83a9d78f1fec80fbfcf40fe94fee97bb89877de1e3221600055402f22
 EBUILD oniguruma-6.6.1.ebuild 1112 BLAKE2B 4bf1ae4b3f3b0b4f1202ab94498ccfd27bf5fb761547c84cfb132502ace2b47d709b3fb023d0bdb86dc9c7de15e55587402ec51a0f7235ba6019429c8c56cb3b SHA512 93e21e61a4d46e321088809332b560748adebf2db65f8b690b8945928c09e6199495b2a8b9ecafcb383938debb8ee279e724b5e5c08227e9cebdb43a971dbfd5
 EBUILD oniguruma-6.7.0.ebuild 1025 BLAKE2B 0dda1e53ecdea21e89f9d4045eab988da0217a24d0b55076644eecf913365a75a1345501a7ff9d88d097e44856d9779760fe19658f4fbab6175f6dc24b80b8dc SHA512 4597d01dfb2a8cba6dd36846be059bed3ab8c0867263e693806fe2ec11dbf416a5a3e838da7474375457bcc895db22ee6102dd94bd9ed26ef4cad51a236df5d9
 EBUILD oniguruma-6.7.1.ebuild 1018 BLAKE2B dd84e5bcf595ebb2953ff5a9fa3d14b4dcb9dee3de98ab42de84f4d1abf91ac266123c8ad1ff3c0037ff8f81d2dfb9a1fb7bdd1dea46a34a0d1478e51294b5ee SHA512 f67876f86021a107dc43fc1b979d0278d4c2c1e7bac83c27a726d9b86a93a2a835041d27cac4b2f5bb4ec849eab7ecfab6ea4d1545387ea42bf4d7faa8a6f80f
diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.3-makefile.patch b/dev-libs/oniguruma/files/oniguruma-5.9.3-makefile.patch
deleted file mode 100644
index 7003907f7850..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-5.9.3-makefile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 2865fb7..75cbd45 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,7 +6,7 @@ libname = libonig.la
- ACLOCAL_AMFLAGS = -I m4
- #AM_CFLAGS = -DNOT_RUBY
- AM_CFLAGS =
--INCLUDES  = -I$(top_srcdir) -I$(includedir)
-+INCLUDES  = -I$(top_srcdir)
- 
- SUBDIRS = . sample
- 
-diff --git a/configure.in b/configure.in
-index 1e21f96..51b56d8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -25,7 +25,7 @@ dnl check for COMBINATION_EXPLOSION
- AC_ARG_ENABLE(combination-explosion-check,
- 	[  --enable-combination-explosion-check   enable combination explosion check],
- 	[comb_expl_check=$enableval])
--if test "${comb_expl_check}" = yes; then
-+if test "x${comb_expl_check}" = xyes; then
-   AC_DEFINE(USE_COMBINATION_EXPLOSION_CHECK,1,[Define if combination explosion check])
- fi
- 
-@@ -33,7 +33,7 @@ dnl check for CRNL_AS_LINE_TERMINATOR
- AC_ARG_ENABLE(crnl-as-line-terminator,
- 	[  --enable-crnl-as-line-terminator   enable CR+NL as line terminator],
- 	[crnl_as_line_terminator=$enableval])
--if test "${crnl_as_line_terminator}" = yes; then
-+if test "x${crnl_as_line_terminator}" = xyes; then
-   AC_DEFINE(USE_CRNL_AS_LINE_TERMINATOR,1,[Define if enable CR+NL as line terminator])
- fi
- 
-diff --git a/sample/Makefile.am b/sample/Makefile.am
-index af33057..347af94 100644
---- a/sample/Makefile.am
-+++ b/sample/Makefile.am
-@@ -2,7 +2,7 @@ noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl
- 
- libname = $(top_builddir)/libonig.la
- LDADD   = $(libname)
--INCLUDES  = -I$(top_srcdir) -I$(includedir)
-+INCLUDES  = -I$(top_srcdir)
- 
- encode_SOURCES  = encode.c
- listcap_SOURCES = listcap.c
diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9224.patch b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9224.patch
deleted file mode 100644
index b256e0df581c..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9224.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/kkos/oniguruma/issues/57
-https://github.com/kkos/oniguruma/commit/690313a061f7a4fa614ec5cc8368b4f2284e059b
-
-Author: K.Kosako <kosako@sofnec.co.jp>
-
---- a/regexec.c
-+++ b/regexec.c
-@@ -1473,14 +1473,9 @@
-       break;
- 
-     case OP_EXACT1:  MOP_IN(OP_EXACT1);
--#if 0
-       DATA_ENSURE(1);
-       if (*p != *s) goto fail;
-       p++; s++;
--#endif
--      if (*p != *s++) goto fail;
--      DATA_ENSURE(0);
--      p++;
-       MOP_OUT;
-       break;
- 
diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9226.patch b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9226.patch
deleted file mode 100644
index f5e0490ecfb8..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9226.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/kkos/oniguruma/issues/55
-https://github.com/kkos/oniguruma/commit/f015fbdd95f76438cd86366467bb2b39870dd7c6
-https://github.com/kkos/oniguruma/commit/b4bf968ad52afe14e60a2dc8a95d3555c543353a
-
-Author: K.Kosako <kosako@sofnec.co.jp>
-
---- a/regparse.c
-+++ b/regparse.c
-@@ -3064,7 +3064,7 @@
- 	PUNFETCH;
- 	prev = p;
- 	num = scan_unsigned_octal_number(&p, end, 3, enc);
--	if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
-+	if (num < 0 || num >= 256) return ONIGERR_TOO_BIG_NUMBER;
- 	if (p == prev) {  /* can't read nothing. */
- 	  num = 0; /* but, it's not error */
- 	}
-@@ -3436,7 +3436,7 @@
-       if (IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_OCTAL3)) {
- 	prev = p;
- 	num = scan_unsigned_octal_number(&p, end, (c == '0' ? 2:3), enc);
--	if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
-+	if (num < 0 || num >= 256) return ONIGERR_TOO_BIG_NUMBER;
- 	if (p == prev) {  /* can't read nothing. */
- 	  num = 0; /* but, it's not error */
- 	}
-@@ -4084,7 +4084,12 @@
-   switch (*state) {
-   case CCS_VALUE:
-     if (*type == CCV_SB)
-+    {
-+      if (*vs > 0xff)
-+          return ONIGERR_INVALID_CODE_POINT_VALUE;
-+
-       BITSET_SET_BIT(cc->bs, (int )(*vs));
-+    }
-     else if (*type == CCV_CODE_POINT) {
-       r = add_code_range(&(cc->mbuf), env, *vs, *vs);
-       if (r < 0) return r;
diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9227.patch b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9227.patch
deleted file mode 100644
index 580cc1446791..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9227.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://github.com/kkos/oniguruma/issues/58
-https://github.com/kkos/oniguruma/commit/9690d3ab1f9bcd2db8cbe1fe3ee4a5da606b8814
-
-Author: K.Kosako <kosako@sofnec.co.jp>
-
---- a/regexec.c
-+++ b/regexec.c
-@@ -3154,6 +3154,8 @@
-     }
-     else {
-       UChar *q = p + reg->dmin;
-+
-+      if (q >= end) return 0; /* fail */
-       while (p < q) p += enclen(reg->enc, p);
-     }
-   }
diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9228.patch b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9228.patch
deleted file mode 100644
index 523455c97f38..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9228.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/kkos/oniguruma/issues/60
-https://github.com/kkos/oniguruma/commit/3b63d12038c8d8fc278e81c942fa9bec7c704c8b
-
-Author: K.Kosako <kosako@sofnec.co.jp>
-
---- a/regparse.c
-+++ b/regparse.c
-@@ -4081,7 +4081,9 @@
-     }
-   }
- 
--  *state = CCS_VALUE;
-+  if (*state != CCS_START)
-+    *state = CCS_VALUE;
-+
-   *type  = CCV_CLASS;
-   return 0;
- }
diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9229.patch b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9229.patch
deleted file mode 100644
index f2dbc55d59ac..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9229.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/kkos/oniguruma/issues/59
-https://github.com/kkos/oniguruma/commit/b690371bbf97794b4a1d3f295d4fb9a8b05d402d
-
-Author: K.Kosako <kosako@sofnec.co.jp>
-
---- a/regexec.c
-+++ b/regexec.c
-@@ -3207,18 +3207,25 @@
-     }
-     else {
-       if (reg->dmax != ONIG_INFINITE_DISTANCE) {
--	*low = p - reg->dmax;
--	if (*low > s) {
--	  *low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, s,
--							      *low, (const UChar** )low_prev);
--	  if (low_prev && IS_NULL(*low_prev))
--	    *low_prev = onigenc_get_prev_char_head(reg->enc,
--						   (pprev ? pprev : s), *low);
-+	if (p - str < reg->dmax) {
-+	  *low = (UChar* )str;
-+	  if (low_prev)
-+	    *low_prev = onigenc_get_prev_char_head(reg->enc, str, *low);
- 	}
- 	else {
--	  if (low_prev)
--	    *low_prev = onigenc_get_prev_char_head(reg->enc,
--					       (pprev ? pprev : str), *low);
-+	  *low = p - reg->dmax;
-+	  if (*low > s) {
-+	    *low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, s,
-+								*low, (const UChar** )low_prev);
-+	    if (low_prev && IS_NULL(*low_prev))
-+	      *low_prev = onigenc_get_prev_char_head(reg->enc,
-+						     (pprev ? pprev : s), *low);
-+	  }
-+	  else {
-+	    if (low_prev)
-+	      *low_prev = onigenc_get_prev_char_head(reg->enc,
-+						     (pprev ? pprev : str), *low);
-+	  }
- 	}
-       }
-     }
diff --git a/dev-libs/oniguruma/files/oniguruma-combination-explosion-check.patch b/dev-libs/oniguruma/files/oniguruma-combination-explosion-check.patch
deleted file mode 100644
index cfc758d2a083..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-combination-explosion-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/regcomp.c
-+++ b/src/regcomp.c
-@@ -3619,8 +3619,8 @@
-       switch (en->type) {
-       case ENCLOSURE_MEMORY:
-         {
--          if (env->curr_max_regnum < en->regnum)
--            env->curr_max_regnum = en->regnum;
-+          if (env->curr_max_regnum < en->m.regnum)
-+            env->curr_max_regnum = en->m.regnum;
- 
-           r = setup_comb_exp_check(NODE_ENCLOSURE_BODY(en), state, env);
-         }
diff --git a/dev-libs/oniguruma/files/oniguruma-gentoo.patch b/dev-libs/oniguruma/files/oniguruma-gentoo.patch
deleted file mode 100644
index 5661cea03b54..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-gentoo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,7 +18,7 @@
- AC_ARG_ENABLE(combination-explosion-check,
- 	[  --enable-combination-explosion-check   enable combination explosion check],
- 	[comb_expl_check=$enableval])
--if test "${comb_expl_check}" = yes; then
-+if test "x${comb_expl_check}" = xyes; then
-   AC_DEFINE(USE_COMBINATION_EXPLOSION_CHECK,1,[Define if combination explosion check])
- fi
- 
-@@ -26,7 +26,7 @@
- AC_ARG_ENABLE(crnl-as-line-terminator,
- 	[  --enable-crnl-as-line-terminator   enable CR+NL as line terminator],
- 	[crnl_as_line_terminator=$enableval])
--if test "${crnl_as_line_terminator}" = yes; then
-+if test "x${crnl_as_line_terminator}" = xyes; then
-   AC_DEFINE(USE_CRNL_AS_LINE_TERMINATOR,1,[Define if enable CR+NL as line terminator])
- fi
- 
---- a/sample/Makefile.am
-+++ b/sample/Makefile.am
-@@ -1,10 +1,10 @@
- #noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl
- 
--lib_onig = ../src/libonig.la
-+lib_onig = $(top_builddir)/src/libonig.la
- LDADD  = $(lib_onig)
- 
- AM_LDFLAGS  = -L$(prefix)/lib
--AM_CPPFLAGS = -I../src -I$(includedir)
-+AM_CPPFLAGS = -I$(top_srcdir)/src
- 
- TESTS = encode listcap names posix simple sql syntax user_property bug_fix
- 
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -1,9 +1,9 @@
- ## Makefile.am for Oniguruma
--lib_onig = ../src/libonig.la
-+lib_onig = $(top_builddir)/src/libonig.la
- 
- AM_LDFLAGS  = -L$(prefix)/lib
- AM_CFLAGS =
--AM_CPPFLAGS = -I../src -I$(includedir)
-+AM_CPPFLAGS = -I$(top_srcdir)/src
- 
- TESTS = testc testp testcu
- 
diff --git a/dev-libs/oniguruma/oniguruma-5.9.5.ebuild b/dev-libs/oniguruma/oniguruma-5.9.5.ebuild
deleted file mode 100644
index 8b0019e6e59b..000000000000
--- a/dev-libs/oniguruma/oniguruma-5.9.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-# Needed for a sane .so versionning on fbsd, please dont drop
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils autotools-multilib
-
-MY_P=onig-${PV}
-
-DESCRIPTION="a regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-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"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.9.3-makefile.patch )
-DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} )
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable combination-explosion-check)
-		$(use_enable crnl-as-line-terminator)
-	)
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install
-	use static-libs || prune_libtool_files
-}
diff --git a/dev-libs/oniguruma/oniguruma-5.9.6_p1-r1.ebuild b/dev-libs/oniguruma/oniguruma-5.9.6_p1-r1.ebuild
deleted file mode 100644
index 07a88e15b522..000000000000
--- a/dev-libs/oniguruma/oniguruma-5.9.6_p1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools ltprune multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="a regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/2" # sub-slot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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/_p1/}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.3-makefile.patch
-	"${FILESDIR}"/${P/_p1/}-CVE-2017-9224.patch
-	"${FILESDIR}"/${P/_p1/}-CVE-2017-9226.patch
-	"${FILESDIR}"/${P/_p1/}-CVE-2017-9227.patch
-	"${FILESDIR}"/${P/_p1/}-CVE-2017-9228.patch
-	"${FILESDIR}"/${P/_p1/}-CVE-2017-9229.patch
-)
-DOCS=( AUTHORS HISTORY README{,.ja} doc/. )
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable combination-explosion-check) \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/oniguruma/oniguruma-6.4.0.ebuild b/dev-libs/oniguruma/oniguruma-6.4.0.ebuild
deleted file mode 100644
index dec199e97dda..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools ltprune multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="a regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4" # sub-slot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-combination-explosion-check.patch
-)
-DOCS=( AUTHORS HISTORY README{,.ja} doc/. )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable combination-explosion-check) \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index d56af767ccab..1491ccadfeb3 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -6,17 +6,15 @@ AUX openssl-0.9.8m-binutils.patch 684 BLAKE2B 35650e98595910d2e6b6fc846b49fecbb2
 AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162a8b931e455f35f9e045372102d1461e3e3fd4cf4e4f544ec06a0b46a573d2009c8decf22678df03707c2487bade64f27b5 SHA512 b8e745ff90e447b000ace9cfd5f746c1bc8f3bb8249064d1d2f1072a1a628f5a89c405c7f384c73f0310f2a2f7af672950a9b7adbc583b1ee94b41d911b8a708
 AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
 AUX openssl-1.1.0g-CVE-2017-3738.patch 2317 BLAKE2B 93ec481b15075ecb94c175659314d6e5a90c1a513d8e82948823bce8c51214e7e27f72a56f9043f0771d5458159f1844e4ac8f6d12d0ed78cbc75a1b9630094b SHA512 4b033443d49d385d6ef9e89975af0e1d8108b97d28492239a427ac15ecc4e9c995b6a0df324361baefbe3ae04ecb97508ad7c80eb22b5b4a157a1a1b5c875b61
+AUX openssl-1.1.0h-CVE-2018-0737.patch 996 BLAKE2B 4b4d6e619a508f36f4fdc00c0066d1160ff7f6cd301cd799405d37b3236ebb69b11a4ccf9baa9ea3a69f21c6fe8550b440c1a3503ec27a5a9c5d1e4d472e2b57 SHA512 833712f0ae355aed6547ccf49447d50bdb7be1ea3c3b3b51f182f6e0eb17692c78ca90341a151985b35b86800cf6229926f3e3af936741d437ab9ac5444987c0
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
 DIST openssl-1.0.2-patches-1.0.tar.xz 11572 BLAKE2B bdb9d2b8388f1aadf3a9274133aa8f86b0029fae1ce86d005baa39a7347657f8d4d84395b54e8ccd67944356ee197dfb527f843b4f146e305533e2ad5450721d SHA512 15234ade359a0acf001cf10c7a7fc05f54603a44c67831529c2a6eda03342f9ba1cf40664ac782b5b73c50b23ec5649fb48ccff2aea8f0df2ef634959c47e3e9
 DIST openssl-1.0.2-patches-1.2.tar.xz 12208 BLAKE2B 99b7a3538aeeecf8e1939fb08d26e2ce6aa4140488f0f6fc382a4f0dbdd67a0204c4689809e9d170148ad6686d4dbf0c8fc95802712270b0ea5720bc06c8fbbf SHA512 5e5739ab7132e986abe9704739dab2ccd16df9696318ed29762d4ee0245fd2645f9435f7340ba36edd5531a83e48489fc659ad78c09ded0e0d021dd5a3906ea6
+DIST openssl-1.0.2-patches-1.3.tar.xz 12592 BLAKE2B bce0c289ae689091fe62e9c0d7d631cd915fd17beb81b0879931e0414f25c8a08425a08514e28ea7e81c1be23cf162f3bcad7cc3933f2378f53decabd3a7903d SHA512 3ad3efa45eddb733e3db9c406f9f651dbf939bbb13debbcab12b49ecf72490a4868b1563de60ee106483c1b23bd2092fc58c8fc911fe62a019cb97d738163723
 DIST openssl-1.0.2n.tar.gz 5375802 BLAKE2B 2e04f8c3d5e2296859b8474d7e100e270f53f18a26c6d37a4cf5e01cd14f44d24d334b4e705da05d77c33b5dc91cffea0feea9f7c83c77ba16c9b6d5f5085894 SHA512 144bf0d6aa27b4af01df0b7b734c39962649e1711554247d42e05e14d8945742b18745aefdba162e2dfc762b941fd7d3b2d5dc6a781ae4ba10a6f5a3cadb0687
 DIST openssl-1.0.2o.tar.gz 5329472 BLAKE2B 30226db49be04317da3a76cce68d5aa401decd198f92505bddb0c72a7ef6a79f3c9c06d4a816db734e2a0991ebcab8b207feced26d83639e50c821d9e76ddc45 SHA512 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd
 DIST openssl-1.1.0-build.patch 3028 BLAKE2B f8cf981ed3717af234ce02fa50f27cdbcbf2b766968a5957fc6f0a4ea997549505fa77398444d7f3b9a75f66048447fe62542b9cb1d5f0268add87c44915a6fd SHA512 b19a912900970052f80c67f28975e793ae9e70ebfc62efae0544e09931079e98c4cd29ce1cc8d937ceca97aff9a12fdc1ff9ce6c2b47fea68c79e7065464a0f0
 DIST openssl-1.1.0-ec-curves.patch 2967 BLAKE2B 1c639514445ea85cf731732aa7901b5a03ddb5f637b0483ab2ec6825433ad978723c5a07316db684bdaca4a12fc673b4e049a49c0cd4dbe5f25a5e2bd3b75cf5 SHA512 8fb9c6759ae2077ad3697ba77e85ab3970fd8b3f64b21eb260b4f6333b7ebf2f5a53c7eee311229edfbd96a2b904ec5e5e00dfa5b62cf1105fece13069077bd2
-DIST openssl-1.1.0g.tar.gz 5404748 BLAKE2B 23daf80e4143aad4654ae86f8e96042dd7328a9d1186b4922e284fcfe0f68259ea12d21c4472d92d65a7fcef21e049cf9371cc9bdad11b66a3df11286418ed42 SHA512 6c76f698fc2a4540f3977d97c889e139acf7d3f9eb85f349974175e8a7707b19743ef91c5ce32839310b6ea06ca88a03d9709ee011687b4634c5c50b5814f42a
-DIST openssl-1.1.0g_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879
-DIST openssl-1.1.0g_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae
-DIST openssl-1.1.0g_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
 DIST openssl-1.1.0h.tar.gz 5422717 BLAKE2B 11de1468855c0bb1836fb346c8efdfedd06139a774fc4dbae1b0e95fea7a33aa39b541e3d2d27f83f2b5f4dd3846cca2356020aa6ec81793085842ab78b3a127 SHA512 fb7750fcd98e6126eb5b92e7ed63d811a5cfa3391d98572003d925f6c7b477690df86a9aa1fa6bf6bf33d02c6c7aee6cff50a38faa8911409f310645898fda39
 DIST openssl-1.1.0h_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879
 DIST openssl-1.1.0h_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae
@@ -24,7 +22,7 @@ DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131e
 EBUILD openssl-0.9.8z_p8-r1.ebuild 5067 BLAKE2B bbe98db5565577ca9bffa9224a8e1ac2903ec8fdadf23b2f59a8b82a7e71c2c4fb049abdd64ba00966ffbe037f7f9d396667ee61f548c6b4415ed9d055c49602 SHA512 c747f5f2dabd1705cb3dea9f22c5999dca4afab0623eae581137efbb537402cace75a76f3b7751809108fe00959e7b4d30475a6b9002291804149a78bb4e332b
 EBUILD openssl-0.9.8z_p8.ebuild 4990 BLAKE2B 58f2db31a50db3b2053a0d375eb40efbb78cd0f593f0ae2ea8a86c7d477385291e3b40407cefde9dd80e087ca9ef35bbd220e74762fb3d2a36834b3dec019ab0 SHA512 3d2236951d4fabdf29493d5dfe5a104aa32bbc938a003f3b46d793873da6cfb513408b321a96adc3f2b23630e7ef1aa84f61171024d6effdf72c9f57eff28282
 EBUILD openssl-1.0.2n.ebuild 8029 BLAKE2B 03b66a7d81e954f811b87314dd56bce86ba3e2dd4b15678d3a72ee40f03cf8d27fe70493c0727c640c96cf21dcab8b8a6a0f022af8505d68f49e6e024d2166c5 SHA512 0da731451be5903656e4035f7eb30b1565b0b5a9fe277e300e9272bc2bebcd97a1043a5e8ebcf62808f50e7a2f8c9433e15f4a6fa44aa86d5efee94fffce8a54
-EBUILD openssl-1.0.2o.ebuild 8035 BLAKE2B 9f9e9859e7b1996b804e475b60079416e00fdaa9a6e63a07aacd3262202c4924e8798c4ccbea26912ba1e4da688e632780a873e8468fde0e4a106d4ce04f939d SHA512 aa5ce464c717c3014983c045990f59ee831d39c0086ca0ebdcc8e17b997b3bf68408b8e29a2482c1cea81297d97b2e45b2333e0978a786ed8ee5e03c0ee7fa3a
-EBUILD openssl-1.1.0g-r3.ebuild 9123 BLAKE2B ed3a8a8bbbfeadecba97d3a3724b7013967ace24b8a2de53ec8824638ed342e688c411f5edad812f21340a6a42632768c0537edd3d2ae88e9b8f2947fb2ac917 SHA512 422f242d0ad025bf204baa377395f7e57c514c42eb137bf6d75266b9bc97c64f85225f7a1b77881a67e8b2185ad963443bde55c5465aa50eef91d00037c7b92b
-EBUILD openssl-1.1.0h.ebuild 9060 BLAKE2B a826a13c07eb8781e8de306aaaa211688017cd5d9b0ef76a51e4d347bda1c4c7b7e9bd544c10a3724288f2737093527da1585e6c0379f42ae18f78f17722f208 SHA512 8180398aed74bb25baa456d1e993c96af0b0ea4b3f5fc23daaf6d5c6a961c4e4f28f23c67584b871a03a7d98b8d322fec657e7109da619194a23a8df18f46b10
+EBUILD openssl-1.0.2o-r1.ebuild 8042 BLAKE2B 8e8f266dad8dac9192f3484d3334a2253c23858e9fadc7cb20e3c1d9742c65e9b1f072cc65ba82f329c94b45d8bdaf33576cfba90ff13bdaf65535910f867a03 SHA512 af301ed141db94a1a3095458219ac1daf1b9d0fb9d9bb0dddfb01249fe436d64f9e0adba83f3ef818952397d39755dd413bd2d8e8c4f9dd31024107d5c1e40b4
+EBUILD openssl-1.0.2o.ebuild 8034 BLAKE2B 8cbec51376dd42bca5f1d766228c1f0b2f6bb07aabd86b7c528fa6ee101b3051b916878c529028a666cb1e53fd941d70b7def83d6494c52ecd97c9b68273c132 SHA512 3d53563596f4c3e8a39affeae274a919d036fd25a328c1671046c3858bc096df98f2ca843633554a609f7def5ba6df05c10088d4191f593a645f3b2b3a79ad46
+EBUILD openssl-1.1.0h-r1.ebuild 9158 BLAKE2B c0c4257218e9ef0a2460d5b19a9d43741d3c67a4cbed2714f352951c6d051973a6851bb9a33733e539ad98f0f5be6051b4da157adb421fb79704f995b119f894 SHA512 b1e6dec42afd6c9ca00697cc7942c6b192aebf6ef914c45949c8e3592a11162ce3954b07b484166331035ce421a4dd0a6d463652ab21c25fb3bcfc14239a4cac
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0737.patch b/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0737.patch
new file mode 100644
index 000000000000..34c9cc02fa71
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0737.patch
@@ -0,0 +1,31 @@
+From 349a41da1ad88ad87825414752a8ff5fdd6a6c3f Mon Sep 17 00:00:00 2001
+From: Billy Brumley <bbrumley@gmail.com>
+Date: Wed, 11 Apr 2018 10:10:58 +0300
+Subject: [PATCH] RSA key generation: ensure BN_mod_inverse and BN_mod_exp_mont
+ both get called with BN_FLG_CONSTTIME flag set.
+
+CVE-2018-0737
+
+Reviewed-by: Rich Salz <rsalz@openssl.org>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+(cherry picked from commit 6939eab03a6e23d2bd2c3f5e34fe1d48e542e787)
+---
+ crypto/rsa/rsa_gen.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
+index 9ca5dfe..42b89a8 100644
+--- a/crypto/rsa/rsa_gen.c
++++ b/crypto/rsa/rsa_gen.c
+@@ -156,6 +156,8 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
+     if (BN_copy(rsa->e, e_value) == NULL)
+         goto err;
+ 
++    BN_set_flags(rsa->p, BN_FLG_CONSTTIME);
++    BN_set_flags(rsa->q, BN_FLG_CONSTTIME);
+     BN_set_flags(r2, BN_FLG_CONSTTIME);
+     /* generate p and q */
+     for (;;) {
+-- 
+2.7.4
+
diff --git a/dev-libs/openssl/openssl-1.1.0g-r3.ebuild b/dev-libs/openssl/openssl-1.0.2o-r1.ebuild
index 61e2b4b945c6..256e230d7cfb 100644
--- a/dev-libs/openssl/openssl-1.1.0g-r3.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2o-r1.ebuild
@@ -5,19 +5,24 @@ EAPI="6"
 
 inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
 
+PATCH_SET="openssl-1.0.2-patches-1.3"
 MY_P=${P/_/-}
 DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="http://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	mirror://gentoo/${PATCH_SET}.tar.xz
+	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz"
 
 LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
+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"
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
 RDEPEND=">=app-misc/c_rehash-1.7-r1
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
 	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
@@ -27,56 +32,13 @@ DEPEND="${RDEPEND}
 	)"
 PDEPEND="app-misc/ca-certificates"
 
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
-PATCH37=openssl-1.1.0-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f27'
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
-FEDORA_PATCH=( $PATCH1 $PATCH37 )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
 S="${WORKDIR}/${MY_P}"
 
 MULTILIB_WRAPPED_HEADERS=(
 	usr/include/openssl/opensslconf.h
 )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-	"${FILESDIR}"/${PN}-1.1.0g-CVE-2017-3738.patch
-)
-
 src_prepare() {
-	if use bindist; then
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die
-		for i in "${FEDORA_PATCH[@]}" ; do
-			epatch "${DISTDIR}"/"${i}"
-		done
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-
-	fi
 	# keep this in sync with app-misc/c_rehash
 	SSL_CNF_DIR="/etc/ssl"
 
@@ -85,26 +47,30 @@ src_prepare() {
 	rm -f Makefile
 
 	if ! use vanilla ; then
-		epatch "${PATCHES[@]}"
+		eapply "${WORKDIR}"/patch/*.patch
 	fi
 
-	eapply_user #332661
+	eapply_user
 
+	# disable fips in the build
 	# make sure the man pages are suffixed #302165
 	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
 	sed -i \
+		-e '/DIRS/s: fips : :g' \
 		-e '/^MANSUFFIX/s:=.*:=ssl:' \
 		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
 		-e $(has noman FEATURES \
 			&& echo '/^install:/s:install_docs::' \
 			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \
-		Configurations/unix-Makefile.tmpl \
+		Makefile.org \
 		|| die
-
 	# show the actual commands in the log
-	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
 
 	# quiet out unknown driver argument warnings since openssl
 	# doesn't have well-split CFLAGS and we're making it even worse
@@ -113,22 +79,13 @@ src_prepare() {
 
 	# allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config
+	chmod a+rx gentoo.config || die
 
 	append-flags -fno-strict-aliasing
 	append-flags $(test-flags-CC -Wa,--noexecstack)
 	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
 
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
 	# The config script does stupid stuff to prompt the user.  Kill it.
 	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
 	./config --test-sanity || die "I AM NOT SANE"
@@ -166,32 +123,35 @@ multilib_src_configure() {
 	#	fi
 	#fi
 
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
 	local sslout=$(./gentoo.config)
 	einfo "Use configuration ${sslout:-(openssl knows best)}"
 	local config="Configure"
 	[[ -z ${sslout} ]] && config="config"
 
-	# Fedora hobbled-EC needs 'no-ec2m'
-	# 'srp' was restricted until early 2017 as well.
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
 	echoit \
 	./${config} \
 		${sslout} \
-		--api=1.0.0 \
 		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
 		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		enable-srp \
-		$(use elibc_musl && echo "no-async") \
+		$(use_ssl !bindist ec) \
 		${ec_nistp_64_gcc_128} \
 		enable-idea \
 		enable-mdc2 \
 		enable-rc5 \
+		enable-tlsext \
 		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
 		$(use_ssl rfc3779) \
 		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
 		$(use_ssl tls-heartbeat heartbeats) \
 		$(use_ssl zlib) \
 		--prefix="${EPREFIX}"/usr \
@@ -201,19 +161,17 @@ multilib_src_configure() {
 		|| die
 
 	# Clean out hardcoded flags that openssl uses
-	# Fix quoting for sed
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
 		-e 's:-fomit-frame-pointer ::g' \
 		-e 's:-O[0-9] ::g' \
 		-e 's:-march=[-a-z0-9]* ::g' \
 		-e 's:-mcpu=[-a-z0-9]* ::g' \
 		-e 's:-m[a-z0-9]* ::g' \
-		-e 's:\\:\\\\:g' \
 	)
 	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
 		Makefile || die
 }
 
@@ -222,6 +180,9 @@ multilib_src_compile() {
 	# that it's -j1 as the code itself serializes subdirs
 	emake -j1 depend
 	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
 }
 
 multilib_src_test() {
@@ -229,7 +190,7 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" install
+	emake INSTALL_PREFIX="${D}" install
 }
 
 multilib_src_install_all() {
@@ -237,7 +198,10 @@ multilib_src_install_all() {
 	# we provide a shell version via app-misc/c_rehash
 	rm "${ED}"/usr/bin/c_rehash || die
 
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
+	einstalldocs
+
+	use rfc3779 && dodoc engines/ccgost/README.gost
 
 	# This is crappy in that the static archives are still built even
 	# when USE=static-libs.  But this is due to a failing in the openssl
@@ -247,7 +211,9 @@ multilib_src_install_all() {
 	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
 
 	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
 
 	# Namespace openssl programs to prevent conflicts with other man pages
 	cd "${ED}"/usr/share/man
diff --git a/dev-libs/openssl/openssl-1.0.2o.ebuild b/dev-libs/openssl/openssl-1.0.2o.ebuild
index b19312505a65..0c7d4a84c0d9 100644
--- a/dev-libs/openssl/openssl-1.0.2o.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2o.ebuild
@@ -15,7 +15,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 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-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/openssl/openssl-1.1.0h.ebuild b/dev-libs/openssl/openssl-1.1.0h-r1.ebuild
index e3426c78ba39..6e38d19eaf54 100644
--- a/dev-libs/openssl/openssl-1.1.0h.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0h-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
 
 MY_P=${P/_/-}
 DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
@@ -56,6 +56,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
+	"${FILESDIR}"/${P}-CVE-2018-0737.patch
 )
 
 src_prepare() {
@@ -69,7 +70,7 @@ src_prepare() {
 		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
 		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die
 		for i in "${FEDORA_PATCH[@]}" ; do
-			epatch "${DISTDIR}"/"${i}"
+			eapply "${DISTDIR}"/"${i}"
 		done
 		# Also see the configure parts below:
 		# enable-ec \
@@ -84,7 +85,7 @@ src_prepare() {
 	rm -f Makefile
 
 	if ! use vanilla ; then
-		epatch "${PATCHES[@]}"
+		eapply "${PATCHES[@]}"
 	fi
 
 	eapply_user #332661
@@ -103,7 +104,7 @@ src_prepare() {
 		|| die
 
 	# show the actual commands in the log
-	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared
+	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared || die
 
 	# quiet out unknown driver argument warnings since openssl
 	# doesn't have well-split CFLAGS and we're making it even worse
@@ -112,7 +113,7 @@ src_prepare() {
 
 	# allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config
+	chmod a+rx gentoo.config || die
 
 	append-flags -fno-strict-aliasing
 	append-flags $(test-flags-CC -Wa,--noexecstack)
@@ -233,7 +234,7 @@ multilib_src_install() {
 multilib_src_install_all() {
 	# openssl installs perl version of c_rehash by default, but
 	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
+	rm "${ED%/}"/usr/bin/c_rehash || die
 
 	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
 
@@ -242,13 +243,13 @@ multilib_src_install_all() {
 	# build system: the static archives are built as PIC all the time.
 	# Only way around this would be to manually configure+compile openssl
 	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+	use static-libs || rm -f "${ED%/}"/usr/lib*/lib*.a
 
 	# create the certs directory
 	keepdir ${SSL_CNF_DIR}/certs
 
 	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
+	cd "${ED%/}"/usr/share/man || die
 	local m d s
 	for m in $(find . -type f | xargs grep -L '#include') ; do
 		d=${m%/*} ; d=${d#./} ; m=${m##*/}
@@ -263,6 +264,7 @@ multilib_src_install_all() {
 		for s in $(find -L ${d} -type l) ; do
 			s=${s##*/}
 			rm -f ${d}/${s}
+			# We don't want to "|| die" here
 			ln -s ssl-${m} ${d}/ssl-${s}
 			ln -s ssl-${s} ${d}/openssl-${s}
 		done
@@ -270,7 +272,7 @@ multilib_src_install_all() {
 	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
 
 	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED%/}"/etc/sandbox.d/10openssl
 
 	diropts -m0700
 	keepdir ${SSL_CNF_DIR}/private
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 7bedfcc17a04..91174be9bfcf 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -5,5 +5,5 @@ DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee265801
 EBUILD vala-common-0.34.16.ebuild 2542 BLAKE2B 4cdc068195601507e5d82dd5aae28c76f8793af489ddee1df1c9a48193ecdd006ae125775126eafcf9caee83537041369b2b3303cf2f97f214dd27224c057fda SHA512 edf400f4a70b300b13bc1086b1ee9923979d9bc21a81a3e4efce05944842a035d1c8701bd35b026b84f062a9465e037eca70690723f8e6fe05e1608f0030eb22
 EBUILD vala-common-0.34.9.ebuild 2533 BLAKE2B 6cd8150927a49de7daa2d3a6394b72ad7e06b33a1459eea21b52e1fb751b7095d5b731930af9d22647e5767bebd5d028b3aadbdb9d6c6e097999c1c17e566907 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de
 EBUILD vala-common-0.36.11.ebuild 2542 BLAKE2B 4cdc068195601507e5d82dd5aae28c76f8793af489ddee1df1c9a48193ecdd006ae125775126eafcf9caee83537041369b2b3303cf2f97f214dd27224c057fda SHA512 edf400f4a70b300b13bc1086b1ee9923979d9bc21a81a3e4efce05944842a035d1c8701bd35b026b84f062a9465e037eca70690723f8e6fe05e1608f0030eb22
-EBUILD vala-common-0.36.7.ebuild 2534 BLAKE2B 42236d61b827e14cb4ef16e622ab1658023d83bc5a9614a24958fb8c156cf767aab57384dddb18de6fb9741252ce2a7ea9c8c256cd97fc4603387d99e8ca0b1f SHA512 c9e6657884911c1618207828445550e770c6568ac4404afe60702008910e5ab36ce4b3cb3719e5e77ce3e323c7685e011a3f66783cda3cc09b8c3fc163b755c3
+EBUILD vala-common-0.36.7.ebuild 2533 BLAKE2B 1e834f43de5670f211052c5ba6be783806cfe25fd6aa4a2890efad0eba1db06953dd656dfbd58b880f4be2e87f9855f9300adeeb2c517b9d68028c73af1f0b28 SHA512 5a5b8eb3e3f25aa08d28eb2016e9514e7f3789aa8c32e81711190218900a4a90df3acf711269a03fbd395e78d88516e894ae7eed87fc32767ae9e731c1ac6e9e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.36.7.ebuild b/dev-libs/vala-common/vala-common-0.36.7.ebuild
index 706dbbf907fd..21649ff52ab6 100644
--- a/dev-libs/vala-common/vala-common-0.36.7.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-19 14:14:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-19 14:14:48 +0100
commit	5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (patch)
tree	8f255dfacbacb657e3ac3654d01c1e11e651c066 /dev-libs
parent	8aebb228036d5e2863b7eaa6e319ab41c1669269 (diff)