gentoo resync : 27.03.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-03-27 22:40:05 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-03-27 22:40:05 +0100
commit: 8c364c784966be1700ea39ae45028f3e9be9cae0 (patch)
tree: c1971211069b79e3831b71accd52a67a9fdc77a3 /dev-libs
parent: 6bd95d1f6320b8666a31ec949183aaa3088aa16f (diff)
42 files changed, 1036 insertions, 393 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index bb331f78b3a1..f0fdc8c58356 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index de49ff996b44..0b0017c97ade 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,11 +1,7 @@
 DIST dbus-glib-0.102.tar.gz 783792 BLAKE2B 5dca4d1d4c9d281e46ad9b15307a738698d6588b064fe07ddeae63d7fbbca0b1338d655ebcdb2b4259ce8979c5ec2888c05f8578d73f04c6c7037bd80e6692d7 SHA512 9bf4b33dd264eaed9ade0e35f0ad47986c31bd5e3de4d3e2fcee66a9be87000b6121bc810b9a5a24eca53190d98323b871dc78f341df8e05bd0247b096cf778f
-DIST dbus-glib-0.104.tar.gz 793417 BLAKE2B 87c12f15e7a960acf2071fae9a689780b74ef146e0f776e117fed66248d16d2ae45e52d264fa87eafc336935db5c64f85474a4b16f29389436faabd976beae6f SHA512 eff599f169976055545b51459d77845002d8bc7e8dcd056cec2bf83836d07c66b03baed2023bc87a6d7c021d35c744987830f8ed6f9c3391a49ee199db85134b
-DIST dbus-glib-0.106.tar.gz 793343 BLAKE2B 8444c587bf002a23abe6f0ffedd1dc1c3a60445cbdab923567c74bd80ebb178ae24c9ee685426601782785e5f67ebbcc1524d65379135958bc7d3ede44c48feb SHA512 13a1d4600add29d29dbb8d1271570e6c04f70ddff0862d28fcb7df774bfa76a961f90303f897f3b970070eb959e909d5d02a94941e2edd8ba315b9aaa3a602cb
 DIST dbus-glib-0.108.tar.gz 812488 BLAKE2B e958c4054c09ec98d7bff659917a9c162dc4338aabcc5c6ec6d7ec34304867dd65d373eeb8871cd188424a36dafa337bb713fb2aaa87e47d1ed4f91a4e7ecd7f SHA512 9fa7cd1c22bf6ee1e345dd6fe48aa725abc01b3b180ba430efea9996403ad99636b2c40f682956978ae5049c110c3298fa199470a4cc05907e11773d034ea5b1
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
 EBUILD dbus-glib-0.102.ebuild 2144 BLAKE2B 9c03b870f2711061dc58b4789aa7bc156c3ec347873ed1b6829365a49ee4b812549909ce95af5095b70232299380664d22cc6655c98f6aa7c2946c08d23d906a SHA512 2464a7f101b40806dce95827c693263d6ac533f97fd18473a5262c3a98ca92d8a8b08b2ecf4aeef1110798b36348255ea963a90818a35cf8121d789a2b5cbb3f
-EBUILD dbus-glib-0.104.ebuild 2108 BLAKE2B 30253cc6295eb45f268a5bc9f13d666c9b6c19e97fa2a7fdb5bdb2e3687f70ac4e3eda78cd889509c4d79449cfbe2d22de4c2ced5c012e9a6d3bc5fa7d2845ca SHA512 a047380aac56e192915e21938e65c29d8ee73d9e2feaf36747c9a28af8d7456e7ab9c9a8289240ec271cad508f1cc483122ee2c69fe124fed5f30b092bea2104
-EBUILD dbus-glib-0.106.ebuild 2108 BLAKE2B 30253cc6295eb45f268a5bc9f13d666c9b6c19e97fa2a7fdb5bdb2e3687f70ac4e3eda78cd889509c4d79449cfbe2d22de4c2ced5c012e9a6d3bc5fa7d2845ca SHA512 a047380aac56e192915e21938e65c29d8ee73d9e2feaf36747c9a28af8d7456e7ab9c9a8289240ec271cad508f1cc483122ee2c69fe124fed5f30b092bea2104
 EBUILD dbus-glib-0.108.ebuild 2100 BLAKE2B 39c5706373fcad6b2e5edbdb77394ab13a9a71e9a3e8bb0150e4ccdd507ea612c1d476d8b412d9bbdf11bbc196ba88cca928ab9754c02b362703b8de6ca9bfe2 SHA512 5f259f54a4b8d06e329b2ffd6d0e650a8af0bc1274e34d009f3c5488be75f91b6522a8d758a20eb8ead9e0bc94037ffb9a42abcb6a26580ca7997fa0469152e2
 EBUILD dbus-glib-0.110.ebuild 2047 BLAKE2B fce708b2bfb4014d81a0e56b9805aabc9aa385fe7a20318c6ad79c10fa996a83e60cfc78a747939682f7746fdd5d16c36aa858cac2fc9dbd760763256d3a3a59 SHA512 5f973f6c74d1a295c61ca26d45738ab4aafe5a121f86da43a06b2fcd71be2a57ca2b34de0090e7a8a045e6f5fc0c4d4bbbbb1f8a35c570f0d8bf2df9d2928e60
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.104.ebuild b/dev-libs/dbus-glib/dbus-glib-0.104.ebuild
deleted file mode 100644
index a86cb10fa16f..000000000000
--- a/dev-libs/dbus-glib/dbus-glib-0.104.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit bash-completion-r1 eutils multilib-minimal
-
-DESCRIPTION="D-Bus bindings for glib"
-HOMEPAGE="https://dbus.freedesktop.org/"
-SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-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 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
-IUSE="debug static-libs test"
-
-CDEPEND="
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.8[${MULTILIB_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-baselibs-20131008-r8
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-set_TBD() {
-	# out of sources build dir for make check
-	export TBD="${BUILD_DIR}-tests"
-}
-
-src_prepare() {
-	epatch_user
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}"/var
-		--enable-bash-completion
-		--disable-gtk-doc
-		$(use_enable debug asserts)
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	ln -s "${S}"/doc/reference/html doc/reference/html #460042
-
-	if use test; then
-		set_TBD
-		mkdir "${TBD}"
-		cd "${TBD}"
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf \
-			"${myconf[@]}" \
-			$(use_enable test checks) \
-			$(use_enable test tests) \
-			$(use_enable test asserts) \
-			$(use_with test test-socket-dir "${T}"/dbus-test-socket)
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use test; then
-		set_TBD
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake
-	fi
-}
-
-multilib_src_test() {
-	set_TBD
-	cd "${TBD}"
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send
-	rm -rf "${ED}"/etc/bash_completion.d || die
-
-	prune_libtool_files
-}
diff --git a/dev-libs/dbus-glib/dbus-glib-0.106.ebuild b/dev-libs/dbus-glib/dbus-glib-0.106.ebuild
deleted file mode 100644
index a86cb10fa16f..000000000000
--- a/dev-libs/dbus-glib/dbus-glib-0.106.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit bash-completion-r1 eutils multilib-minimal
-
-DESCRIPTION="D-Bus bindings for glib"
-HOMEPAGE="https://dbus.freedesktop.org/"
-SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-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 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
-IUSE="debug static-libs test"
-
-CDEPEND="
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.8[${MULTILIB_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-baselibs-20131008-r8
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-set_TBD() {
-	# out of sources build dir for make check
-	export TBD="${BUILD_DIR}-tests"
-}
-
-src_prepare() {
-	epatch_user
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}"/var
-		--enable-bash-completion
-		--disable-gtk-doc
-		$(use_enable debug asserts)
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	ln -s "${S}"/doc/reference/html doc/reference/html #460042
-
-	if use test; then
-		set_TBD
-		mkdir "${TBD}"
-		cd "${TBD}"
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf \
-			"${myconf[@]}" \
-			$(use_enable test checks) \
-			$(use_enable test tests) \
-			$(use_enable test asserts) \
-			$(use_with test test-socket-dir "${T}"/dbus-test-socket)
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use test; then
-		set_TBD
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake
-	fi
-}
-
-multilib_src_test() {
-	set_TBD
-	cd "${TBD}"
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send
-	rm -rf "${ED}"/etc/bash_completion.d || die
-
-	prune_libtool_files
-}
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 4f5ecd29b9af..f7aa38f2365e 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,7 +1,9 @@
 AUX efl-1.17.0-gnutls-3.4.patch 1303 BLAKE2B 74368829bd2cc3ebf1878384dfa6fc5a4290fb7b59b52d387141992fa957ef3099b6c5bf2c8a0723bbba034a45448c68e3bee5c42fdf0c4f8bd9196a95d1f178 SHA512 3bff2855849031b35fa68f70b3c59136f404793564a3fe2b15cc9e15ef211b0a41cb628330d84832fc4e9b1b331c161e6731816d2efe68aa7a1a5146bd87196a
 DIST efl-1.17.0.tar.xz 43485360 BLAKE2B 97a79bda40658eac6e50886a01821bb8c98d6f56d18fcd51dc3827154506064bec3bf665c8f471919aedb03ae83ce4045293afa9a0bf8d3eaf947221ef7cba9e SHA512 e4f28f938daf4ec1cb3d761407a443e401b59c6bb0f9fa6cd771dbd256b95f4a32a5f9e6bd8ad8328708a382f732e67abd1a23c7be2ff222f08bc8135a2435da
 DIST efl-1.18.4.tar.xz 64609944 BLAKE2B b36e5ee7c64a57772c5826e990a85110fffc3488e605d72515d4db7a6ec56eee25eb68c7136840f24cb8cdcdc8d7050e2825c17f0e4c5566db7d9ec2c96fd557 SHA512 2cfdcde8b5adb93310e75e4923e3845392bed97563ca1a68f4537e346b51f59acefaa85a425bdbb5619e5bfd6c9ff92b4bd1888b5d4ddd8db94c8a555e3934c9
-EBUILD efl-1.17.0-r1.ebuild 7085 BLAKE2B 4bc38796a2704eb360c583876e35b3dc997d5e40dbdb15c417649b936b8b4dcfec74ff20f2db37befb023e22053c02ac4398a5bec1d11b343cef11fe7e9ae386 SHA512 95292a09cdf04ce02d863d2b4544fe50509fe084e1404a3ed117026832c1516b2b7e1403a534ef97795802d3cb73f968c885f5f96bf016976c59d0237f6844b6
-EBUILD efl-1.18.4.ebuild 7253 BLAKE2B 1c1814cbfe0ec120067803e826b8af26f9f722042d2cbd9e97fbb715daed97767b1c4d6cff7b0275e66d98ed0bb110e64e130e3133d1345a678a33575b56e941 SHA512 a752956004ff68af0310302276a26e8096e68834abe685aed0b6a9e269dd7332fe17527627133bd0cb444ef25a35f78e64d3396f9a758b46d26d06f266a86f8f
-EBUILD efl-9999.ebuild 7253 BLAKE2B 1c1814cbfe0ec120067803e826b8af26f9f722042d2cbd9e97fbb715daed97767b1c4d6cff7b0275e66d98ed0bb110e64e130e3133d1345a678a33575b56e941 SHA512 a752956004ff68af0310302276a26e8096e68834abe685aed0b6a9e269dd7332fe17527627133bd0cb444ef25a35f78e64d3396f9a758b46d26d06f266a86f8f
-MISC metadata.xml 1620 BLAKE2B 3a967bd7dc991947c1520e9e513adae314425476c2e7fe5c03f985ea9c1e41c2a8b3891a81c0a52cb9ad5bc744697b4f4dd2a889e6726393090cf80c2e057acf SHA512 a70e6aac0200b85a927cc0c0bc58a6f41c18b1155f239ba2a97dfe50e24f54632a05f4387204439093e4fa71ae01632b984fe0fc454c5b711470020fa42f928b
+DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
+EBUILD efl-1.17.0-r1.ebuild 7068 BLAKE2B e0ce5cf1e86f41918799a7ceebfa341726ea9a700c7e2e4d89acedaf595171b12bef11261fed2bea14c4099fa63fcf063d0eddb49c1dcf490449f936ec4dd1c8 SHA512 a5293c2f97a4976fe3681ad8da97918f37a0bd47bf37cf38d4f025ad7512782e967deaef1d2f80c624ccf57c8b68b74f8288a9b223f710dcee3bde515d454be2
+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
diff --git a/dev-libs/efl/efl-1.17.0-r1.ebuild b/dev-libs/efl/efl-1.17.0-r1.ebuild
index 73c6b642ffd2..9ab0e9d1a1e7 100644
--- a/dev-libs/efl/efl-1.17.0-r1.ebuild
+++ b/dev-libs/efl/efl-1.17.0-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"
@@ -92,7 +92,6 @@ RDEPEND="
 		x11-libs/libXext
 		x11-libs/libXfixes
 		x11-libs/libXinerama
-		x11-libs/libXp
 		x11-libs/libXrandr
 		x11-libs/libXrender
 		x11-libs/libXtst
diff --git a/dev-libs/efl/efl-1.18.4.ebuild b/dev-libs/efl/efl-1.18.4.ebuild
index 7e7cc7eab220..6047e25ff9fd 100644
--- a/dev-libs/efl/efl-1.18.4.ebuild
+++ b/dev-libs/efl/efl-1.18.4.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"
@@ -92,7 +92,6 @@ RDEPEND="
 		x11-libs/libXext
 		x11-libs/libXfixes
 		x11-libs/libXinerama
-		x11-libs/libXp
 		x11-libs/libXrandr
 		x11-libs/libXrender
 		x11-libs/libXtst
diff --git a/dev-libs/efl/efl-1.20.7.ebuild b/dev-libs/efl/efl-1.20.7.ebuild
new file mode 100644
index 000000000000..9641b4080cd7
--- /dev/null
+++ b/dev-libs/efl/efl-1.20.7.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+elif [[ *"${PV}" == *"_pre"* ]] ; then
+	MY_P=${P%%_*}
+	SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
+else
+	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+inherit enlightenment gnome2-utils pax-utils xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+IUSE="avahi +bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound svg systemd tga tgv tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm"
+
+REQUIRED_USE="
+	?? ( opengl gles )
+	fbcon? ( !tslib )
+	gles? (
+		|| ( X wayland )
+		!sdl
+		egl
+	)
+	gnutls? ( ssl )
+	ibus? ( glib )
+	libressl? ( ssl )
+	opengl? ( || ( X sdl wayland ) )
+	pulseaudio? ( sound )
+	sdl? ( opengl )
+	vnc? ( X fbcon )
+	wayland? ( egl !opengl gles )
+	xim? ( X )
+"
+
+RDEPEND="
+	avahi? ( net-dns/avahi )
+	connman? ( net-misc/connman )
+	drm? (
+		>=dev-libs/libinput-0.8
+		media-libs/mesa[gbm]
+		>=x11-libs/libdrm-2.4
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	fontconfig? ( >=media-libs/fontconfig-2.5.0 )
+	fribidi? ( >=dev-libs/fribidi-0.19.2 )
+	gif? ( media-libs/giflib:= )
+	glib? ( dev-libs/glib:2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.6 )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	harfbuzz? ( >=media-libs/harfbuzz-0.9.0 )
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( >=app-i18n/ibus-1.4 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	libuv? ( dev-libs/libuv )
+	luajit? ( >=dev-lang/luajit-2.0.0 )
+	!luajit? ( dev-lang/lua:* )
+	pdf? ( >=app-text/poppler-0.45.0[cxx] )
+	physics? ( >=sci-physics/bullet-2.80 )
+	pixman? ( x11-libs/pixman )
+	postscript? ( app-text/libspectre )
+	media-libs/libpng:0=
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw )
+	scim? ( app-i18n/scim )
+	sdl? (
+		>=media-libs/libsdl2-2.0.0
+		virtual/opengl
+	)
+	sound? ( media-libs/libsndfile )
+	svg? (
+		>=gnome-base/librsvg-2.36.0
+		>=x11-libs/cairo-1.0.0
+	)
+	systemd? ( >=sys-apps/systemd-209 )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib )
+	unwind? ( sys-libs/libunwind )
+	valgrind? ( dev-util/valgrind )
+	vlc? ( media-video/vlc )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		>=dev-libs/wayland-1.11.0
+		>=x11-libs/libxkbcommon-0.6.0
+		media-libs/mesa[gles2,wayland]
+	)
+	webp? ( media-libs/libwebp )
+	X? (
+		>=media-libs/freetype-2.5.0.1
+		x11-libs/libXcursor
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+
+		opengl? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+
+		gles? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		xpresent? ( x11-libs/libXpresent )
+		)
+	)
+	xine? ( >=media-libs/xine-lib-1.1.1 )
+	xpm? ( x11-libs/libXpm )
+
+	sys-apps/dbus
+	>=sys-apps/util-linux-2.20.0
+	sys-libs/zlib
+	virtual/jpeg:0=
+
+	!dev-libs/ecore
+	!dev-libs/edbus
+	!dev-libs/eet
+	!dev-libs/eeze
+	!dev-libs/efreet
+	!dev-libs/eina
+	!dev-libs/eio
+	!dev-libs/embryo
+	!dev-libs/eobj
+	!dev-libs/ephysics
+	!media-libs/edje
+	!media-libs/elementary
+	!media-libs/emotion
+	!media-libs/ethumb
+	!media-libs/evas
+	!media-plugins/emotion_generic_players
+	!media-plugins/evas_generic_loaders
+"
+#external lz4 support currently broken because of unstable ABI/API
+#	app-arch/lz4
+
+#soft blockers added above for binpkg users
+#hard blocks are needed for building
+CORE_EFL_CONFLICTS="
+	!!dev-libs/ecore
+	!!dev-libs/edbus
+	!!dev-libs/eet
+	!!dev-libs/eeze
+	!!dev-libs/efreet
+	!!dev-libs/eina
+	!!dev-libs/eio
+	!!dev-libs/embryo
+	!!dev-libs/eobj
+	!!dev-libs/ephysics
+	!!media-libs/edje
+	!!media-libs/emotion
+	!!media-libs/ethumb
+	!!media-libs/evas
+"
+
+DEPEND="
+	${CORE_EFL_CONFLICTS}
+
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	# Get clean environment, see bug 557408
+	xdg_environment_reset
+	chown portage:portage -R "${HOME}"
+}
+
+src_prepare() {
+	enlightenment_src_prepare
+
+	# Remove stupid sleep command.
+	# Also back out gnu make hack that causes regen of Makefiles.
+	# Delete var setting that causes the build to abort.
+	sed -i \
+		-e '/sleep 10/d' \
+		-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
+		-e '/BARF_OK=/s:=.*:=:' \
+		configure || die
+
+	# Upstream doesn't offer a configure flag. #611108
+	if ! use unwind ; then
+		sed -i \
+			-e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	if use ssl && use gnutls ; then
+		einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
+		einfo "gnutls has been selected for you."
+	fi
+	if use opengl && use gles ; then
+		einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
+		einfo "opengl has been selected for you."
+	fi
+
+	E_ECONF=(
+		--with-profile=$(usex debug debug release)
+		--with-net-control=$(usex connman connman none)
+		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
+		--with-x11=$(usex X xlib none)
+		$(use_with X x)
+		--with-opengl=$(usex opengl full $(usex gles es none))
+		--with-glib=$(usex glib)
+		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
+
+		$(use_enable avahi)
+		$(use_enable bmp image-loader-bmp)
+		$(use_enable bmp image-loader-wbmp)
+		$(use_enable dds image-loader-dds)
+		$(use_enable drm)
+		$(use_enable drm elput)
+		$(use_enable doc)
+		$(use_enable eet image-loader-eet)
+		$(use_enable egl)
+		$(use_enable examples always-build-examples)
+		$(use_enable fbcon fb)
+		$(use_enable fontconfig)
+		$(use_enable fribidi)
+		$(use_enable gif image-loader-gif)
+		$(use_enable gstreamer gstreamer1)
+		$(use_enable harfbuzz)
+		$(use_enable hyphen)
+		$(use_enable ico image-loader-ico)
+		$(use_enable ibus)
+		$(use_enable ivi wayland-ivi-shell)
+		$(use_enable jpeg2k image-loader-jp2k)
+		$(use_enable libuv)
+		$(use_enable !luajit lua-old)
+		$(use_enable neon)
+		$(use_enable nls)
+		$(use_enable pdf poppler)
+		$(use_enable physics)
+		$(use_enable pixman)
+		$(use_enable pixman pixman-font)
+		$(use_enable pixman pixman-rect)
+		$(use_enable pixman pixman-line)
+		$(use_enable pixman pixman-poly)
+		$(use_enable pixman pixman-image)
+		$(use_enable pixman pixman-image-scale-sample)
+		--enable-image-loader-png
+		$(use_enable postscript spectre)
+		$(use_enable ppm image-loader-pmaps)
+		$(use_enable psd image-loader-psd)
+		$(use_enable pulseaudio)
+		$(use_enable raw libraw)
+		$(use_enable scim)
+		$(use_enable sdl)
+		$(use_enable sound audio)
+		$(use_enable svg librsvg)
+		$(use_enable systemd)
+		$(use_enable tga image-loader-tga)
+		$(use_enable tgv image-loader-tgv)
+		$(use_enable tiff image-loader-tiff)
+		$(use_enable tslib)
+		$(use_enable v4l v4l2)
+		$(use_enable valgrind)
+		$(use_enable vlc libvlc)
+		$(use_with vlc generic_vlc)
+		$(use_enable vnc vnc-server)
+		$(use_enable wayland)
+		$(use_enable webp image-loader-webp)
+		$(use_enable xcf)
+		$(use_enable xim)
+		$(use_enable xine)
+		$(use_enable xpm image-loader-xpm)
+		--enable-cserve
+		--enable-image-loader-generic
+		--enable-image-loader-jpeg
+
+		--disable-tizen
+		--disable-gesture
+		--disable-gstreamer
+		--enable-xinput2
+		--disable-xinput22
+		--enable-libmount
+
+		# currently no JavaScript engine builds. Therefore:
+		--with-js=none
+
+		# external lz4 support currently broken because of unstable ABI/API
+		#--enable-liblz4
+	)
+
+	use fbcon && use egl &&	E_ECONF="${E_ECONF} --enable-eglfs"
+	use X && use xpresent && E_ECONF="${E_ECONF} --enable xpresent"
+
+	enlightenment_src_configure
+}
+
+src_compile() {
+	if host-is-pax && use luajit ; then
+		# We need to build the lua code first so we can pax-mark it. #547076
+		local target='_e_built_sources_target_gogogo_'
+		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
+		emake -C src "${target}"
+		emake -C src bin/elua/elua
+		pax-mark m src/bin/elua/.libs/elua
+	fi
+	enlightenment_src_compile
+}
+
+src_install() {
+	MAKEOPTS+=" -j1"
+
+	enlightenment_src_install
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/efl/efl-9999.ebuild b/dev-libs/efl/efl-9999.ebuild
index 7e7cc7eab220..6047e25ff9fd 100644
--- a/dev-libs/efl/efl-9999.ebuild
+++ b/dev-libs/efl/efl-9999.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"
@@ -92,7 +92,6 @@ RDEPEND="
 		x11-libs/libXext
 		x11-libs/libXfixes
 		x11-libs/libXinerama
-		x11-libs/libXp
 		x11-libs/libXrandr
 		x11-libs/libXrender
 		x11-libs/libXtst
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 24801d968fbe..6474ac10c672 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <use>
 	<flag name="bmp">Enable WBMP image loader</flag>
+	<flag name="dds">Enable DDS image loader</flag>
 	<flag name="drm">Enable DRM engine</flag>
 	<flag name="eet">Enable Eet image loader</flag>
 	<flag name="egl">Enable EGL rendering</flag>
@@ -14,8 +15,12 @@
 	<flag name="gles">Enable the OpenGL ES GL implementation</flag>
 	<flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag>
 	<flag name="harfbuzz">Enable complex text shaping and layout support</flag>
+	<flag name="hyphen">Enable text hyphenation support</flag>
 	<flag name="ibus">Enable Intelligent Input Bus</flag>
 	<flag name="ico">Enable Ico image loader</flag>
+	<flag name="ivi">Enable ivi-shell support</flag>
+	<flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
+	<flag name="luajit">USE <pkg>dev-lang/lua</pkg> instead of <pkg>dev-lang/luajit</pkg></flag>
 	<flag name="oldlua">USE <pkg>dev-lang/lua</pkg> instead of <pkg>dev-lang/luajit</pkg></flag>
 	<flag name="physics">Enable Bullet physics effects and support</flag>
 	<flag name="pixman">Enable PixMan for software rendering</flag>
@@ -23,10 +28,14 @@
 	<flag name="psd">Enable PSD image loader</flag>
 	<flag name="scim">Enable Smart Common Input Method</flag>
 	<flag name="tga">Enable Tga image loader</flag>
+	<flag name="tgv">Enable TGV image loader</flag>
 	<flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
 	<flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag>
 	<flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
+	<flag name="vlc">Enable <pkg>media-video/vlc</pkg> support</flag>
 	<flag name="webp">Enable WebP image loader</flag>
+	<flag name="xcf">Enable XCF image loader</flag>
 	<flag name="xim">Enable X Input Method</flag>
+	<flag name="xpresent">Enable <pkg>x11-libs/libXpresent</pkg> support</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index a564041ab18d..1d7a1387c372 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,8 +1,8 @@
 AUX icu-layoutex-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a615272dcf1ad3a5ae2ddfdb08eeaa9bec4d037493583bf181417df49087fcca6f6aa3d977a8e72b98df68e3389c4e47343c062d036 SHA512 54835db4db5bca704aed015a911a1f5285fbd3f6d09493cdcf98493d87a03851c9ee79cc9cbcb45da409513ad5b3af38b302aa5d164992d94af1f80c6349aeb8
-DIST icu4c-58_1-src.tgz 23366443 BLAKE2B 16f1c778d925893769c6e0f0901fe02e57289535a25edd8ee8c96bdf4551499ead2c75d0f7e733fb89d1670c5065f1e8013ebe14cbdc34881a67452e622cd990 SHA512 59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
-EBUILD icu-layoutex-58.1.ebuild 2512 BLAKE2B a34a084cd8c5fedd0169d1d7a7c9fe3f2f55a91d0fe362d927fb49c90ed5b2674a4a8d76552157629258eea7fd109e56be971ab230bf7afa90720db77fca4105 SHA512 6c7bb82c9fa751b9382832952cbe66b253d339b5034c6144556f8a8d7433a9027ca734c5363cde4a60b0f2facc938bd0d4051d4843f5cbc8d0b23de24fb12310
+DIST icu4c-61_1-src.tgz 23400587 BLAKE2B 6c6c78b4169ad3e900ff8a8a8fc7286f3dfb692dc04cc88103804799d1ce1fc7d1a3a7b1fc1b379e92196dd5976cfea3fe014a09dc65d387f34f141eae5b9465 SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94
 EBUILD icu-layoutex-58.2.ebuild 2518 BLAKE2B 885f5583a750f60830f94e4fab7b80070cd9633fc16aca7d2713b16418685ce3eb8eeea27ac33f52a864edb8c3508e77592b729b63f690e9849c562f79d16c42 SHA512 f2b385bc0bad96157f3d321dc9f1b418438b3d390729b372d6c47b28bb7acf3792ff071288d25ed6a78741feb2831dc3e0733109380d86eda2e0631dd75bd8d7
 EBUILD icu-layoutex-60.2.ebuild 2525 BLAKE2B 71f0e92ffabdfbafb429837c1c9241252fdc898da64ad2128fb4427ce7cfc492a9369c0d38e6545bfa3f39d5434a7a8dd9dd809b242bdab4a5b57c5bb2c2f477 SHA512 bf1d94af09720cdd5cb6461004182bc2debad0e12dcf46bcae21ac485a36011dee14ce54433940ee035f9306a1a986acdb697ecb8023aa6f0be25b15b285cee2
+EBUILD icu-layoutex-61.1.ebuild 2532 BLAKE2B 1816a69d005b941c307cc07b2b39a3e7ea6de68b34a5f974f83ec094fbc9ac5309a8343abeae46d345b6b30475392e87ef819b05c275f4861070317b5f9fa581 SHA512 93e0e30b393881b7e649fff1962f6764751303972f1f081f33f40f6b99615765d4cce70cfa08c15be42653c5fdd60a89e3d8886758fbb3b65ea59640074fd171
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-58.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-61.1.ebuild
index df417bcaecef..7d87f4217b72 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-58.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-61.1.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
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="amd64 hppa ia64 ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug static-libs"
 
 RDEPEND="
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 4f4efb0e60bf..2289b542d0a2 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -3,10 +3,10 @@ AUX icu-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a615272dcf1
 AUX icu-58.2-CVE-2017-7867.patch 8934 BLAKE2B 7f934d75a99953d69ac54f8544c698d3bd774a37a463237b6b043713a35f2991a444a482191107070b1d1c0055f813d3692102cb08091cc7cda575e37fb076db SHA512 6e29326f378461ae07b253c59550447096352be1247e575d974839cea37ec326f7fa8dca58caab63544582ef9f4b3c71c9e3fa0eceb2e85fb7380ee71b138c5a
 AUX icu-58.2-darwin.patch 2076 BLAKE2B d85d07ae3ade827a81bf2ce4eb2813a6535d7cd70e68241b29ee72c0a41115e3cab0490727771309c32f1eb0853c1a8ce3cf6aae64186037d8ee75d035cb0478 SHA512 fe884a72d354324ad0b1e5502d834fbecafae22a290fb152058d6507b218c4f07efc34cc7d978bae0adb54f74dadf00df7a2679c480dc7681ee287da7f678cb7
 AUX icu-58.2-glibc226.patch 463 BLAKE2B 840440c4a3eb0882ac6733d3c5f44568bc081fce6f3f641e01d76f01fe1f35f74cc2465e89b3353ab86569c7478090df459a659d69143810ba121e15c27923dd SHA512 20d8e76c43ef5549ca7f104b052661269c99d4af45b2a65bd9d72e28b01d0c3b70c066b51799e09d7117a4a39e44fd463fae2522a238a41972c0679c290c5da3
-DIST icu4c-58_1-src.tgz 23366443 BLAKE2B 16f1c778d925893769c6e0f0901fe02e57289535a25edd8ee8c96bdf4551499ead2c75d0f7e733fb89d1670c5065f1e8013ebe14cbdc34881a67452e622cd990 SHA512 59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
-EBUILD icu-58.1-r1.ebuild 3332 BLAKE2B 951e0963b151c25950a2373a5d68575a14b6f9d0672c7954ee8c03796a34abf21787c81047e6e3df481d85de0afe7948920a533e146105c368917b6d7dcae18a SHA512 03883866e050b61cbeb8268247f8a59b6516df75a33be729b7a8c513a887d951d748af42950bdcb5484dff9d9734daad570943845aa75996297312ac0181a258
+DIST icu4c-61_1-src.tgz 23400587 BLAKE2B 6c6c78b4169ad3e900ff8a8a8fc7286f3dfb692dc04cc88103804799d1ce1fc7d1a3a7b1fc1b379e92196dd5976cfea3fe014a09dc65d387f34f141eae5b9465 SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
-EBUILD icu-60.2.ebuild 3713 BLAKE2B da44806a042486173ced618ffb24dbbf6bb50f6bae308bc7f9b2cc501a7152a51adc6cadccc566a3415764bf51ecc4dc228e2b41387fdd6ace5405a8613181b6 SHA512 fe84fed0e81524f4a76b6e774c3679798454251819b9c43ab5d7b6fd271bf79296657e271e236a87394ed4fe91d8b764c567319dfdcc251b053c6a95ef9dd982
+EBUILD icu-60.2.ebuild 3712 BLAKE2B 4084475053ce2f0d25cdd9496bbe44541ab6a19eff5b5799b86c3a34eeae434cc2446b56e4243494416b1dc35cdc5fcb6abbf741d97a62046f7fec766fba6ccc SHA512 bb6097da552b4c4f468982427aed51a8d58ee4ece37ee99861816946fe27a54ad546668ae3971ae0e315dbf56f3d2dae5e3e7716a7a593c1062d19687a742590
+EBUILD icu-61.1.ebuild 3721 BLAKE2B 72fd1527eb1bd7425397de5eccf60ed03c22a58dc113f6fe4c9a1853f0553c3cde723583d24c875e2f928393ff8b494a889a98800bfb9948a314fa804c15f6eb SHA512 d766de018dfe7a908dd23914ac0994dbd98c9d515ba0cee76a4b7d6c1a9f44809cefe414c9a8ca556aef08e3e7f3a4d249b6af12449651cd2ea303818f12effd
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-60.2.ebuild b/dev-libs/icu/icu-60.2.ebuild
index a02ebe4de781..5664307cff2a 100644
--- a/dev-libs/icu/icu-60.2.ebuild
+++ b/dev-libs/icu/icu-60.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
diff --git a/dev-libs/icu/icu-58.1-r1.ebuild b/dev-libs/icu/icu-61.1.ebuild
index 288af0e8b047..bebf5f978415 100644
--- a/dev-libs/icu/icu-58.1-r1.ebuild
+++ b/dev-libs/icu/icu-61.1.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
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
@@ -31,7 +31,7 @@ MULTILIB_CHOST_TOOLS=(
 
 PATCHES=(
 	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-58.1-iterator.patch"
+	"${FILESDIR}/${PN}-58.2-darwin.patch"
 )
 
 pkg_pretend() {
@@ -114,6 +114,12 @@ multilib_src_configure() {
 	# icu tries to use clang by default
 	tc-export CC CXX
 
+	# make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL=${EPREFIX}/bin/sh
+	# probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL=${BASH}
+
 	ECONF_SOURCE=${S} \
 	econf "${myeconfargs[@]}"
 }
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index b7d6549e7378..efd1f0131a1c 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,11 +1,7 @@
 AUX jsoncpp-0.10.2-arm.patch 825 BLAKE2B 1d79b8633215825c84214379013d4f5cde03936ca9c933010422fbcb6d75932111094647aa61844dfe4d7cd2042f0445726c3fd560efdea9608ef9559fa17658 SHA512 2f30d2802c9018c93d30c84011fba2b2fadbb78c84e1b0a3a995c482f50caefb7a8fad12adc355fc4af0fce730a9557c1714f250fde130907b746288c664870c
 AUX jsoncpp-1.6.2-fix-pkgconfig.patch 2271 BLAKE2B 24fee66b70f4b21a249fb962af6bf7a7dc0bcf4bf65e767abd04e24892b63c8b44c29854d0842f2735688268b665afaaa2a75d98d1e6bd0404409dc2ba529840 SHA512 5efa120a5da7695cd9b8d4420b6247479f639bdca35c0627aaca45167c4fb46a7c04243ebdec6468217aa171a8f2333912fe062eae355668d64d6a4cdffca1a5
-DIST jsoncpp-0.10.2.tar.gz 197188 BLAKE2B eeca1bbccab98f9da0d1158d19cab0079b9a025ea53494795531de53206256d083703e2d1f0ab68e68f5f6f7427a28b3ffe04078a9fb26a775fd086783e2997f SHA512 8e451e3ba37094445ab098d5b9f7236ac84e2f15d98e2039c565e609b757c2383e91850bd86aca507ca5cd2f733fedc484bb7760eeeee7fe9bace71d97ae0d2e
-DIST jsoncpp-0.10.6.tar.gz 200213 BLAKE2B 3b643a4c672c150ab235473010894674d1577b33b23dbe3cb1e951ddfb5ed59574ddca750f38278afbcf74de44c62d09888ee61e0e756b2a406fe663292a3d7d SHA512 9fcf584d14c31fc135c9789b36c02c5985daecc7396eb21912d5ea3e757d1fd0d516d7a060e14b4955c73f6b4aa256529281da908726919236fa65310de9f1aa
 DIST jsoncpp-1.8.1.tar.gz 210629 BLAKE2B 5f9a7f51b463784c5a74a78b7189800a37797f233b1d5a66d34edc0689c77a2b96b230c0ed4dfc749401087c551dd5659a6d152e09342ca92250ce9ea91a293e SHA512 4203826fca4c366b51d28ffc928399c914ffaba8be1cada64ff118b5742e6b469d3fc3e59344587d851447857b479794c5697d4fd11a9a55b32a3a7a801b745b
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
-EBUILD jsoncpp-0.10.2-r1.ebuild 1461 BLAKE2B a09c52f309f131f670ceecf2967f2979a05f9abc28ab6833e0342ec69b3b29fcaeaafaaac5fe5195a18d3d46da985bf72412a64825c71c57046f0b4b61d4082e SHA512 88b4652e85f8134d4633e143e07da5f0ff8b2515bc50ba937a985310b7651ae3695858d5b236fca73dd1fd95d0c7b8f2a50fb2545a81751f1b09e05befc986a4
-EBUILD jsoncpp-0.10.6.ebuild 1385 BLAKE2B 02ce4136b20a08a4a3d04f4a1f4a4a57da48447b7084343a743703eb0cd1bac3d85580ba6f3b2af8a58c0ec3f03c013d922ec1d1d8ec45d8c16e0b2a17b00813 SHA512 2d00e37b0ae59303b3a0f12f099daf78a98f209b406aa8362e4bf8aaf9542a74968a76c8ef0ab625ec3a9065d492c791948517a7a4a6927e7d2ce0c33b81fbb3
 EBUILD jsoncpp-1.8.1.ebuild 1353 BLAKE2B a561f153e32b1b81043fc02b64020a51235fb6557626aeceb49ddb58be7a424f8da93c2c8db7bb16a24a4d6cd86e01f8c7290f22926d983794fa2969ce4cbd1f SHA512 1479c2d2c5069ff392f158dc7f0e8320b1414d15ebb941a62a3e1359baf482e3e07093b828e38796180f5b08866e081fe3cd9f62efdca5104e9c583a1ec24a82
-EBUILD jsoncpp-1.8.4.ebuild 1375 BLAKE2B 2eefeba63db0f76dab05991e2005c3d11dcb5e691c61340ded3c5dc566d98ecc9e624d1d6b82840eebbd7de9a56389f73fd1b9ceafd82af5a429341b3db8526b SHA512 b6bfebee50d924bdac2b113007e26d55fdbc4f4eeaebf7b0d1696d10cfdf9c3d6e81d7219528ada5fa5a541a5abfb725a367ac70b9d9d3461ae1258e08f213f4
+EBUILD jsoncpp-1.8.4.ebuild 1374 BLAKE2B c02dd38cde27ea051fc45af85db5b4e93ee5e1c8d73cbdcd9c398ff14c307937505ce1e226e9f933d54e6321e9ad671d8c2c1604e8a010cde98c3511284fc32f SHA512 3c977547061601cee991ea8ec3a8a394b2fc7ad79d4becbd8bc49c2b49e26387ec500c37cb802920faed69ad7e42acb504834a5c67ce7ae5e749b490d4494233
 MISC metadata.xml 522 BLAKE2B 6f34ae666bd7ccce5ccb075abfed8c32b8b5b3b32ac9fde277871ab735626fef6af12bf6b9da75f081726af7846bbe55cb8fe0663f107d6adb4f3bdf2db2dd26 SHA512 95270a54162bd5940602765fc238d7f30fdd0f42b8523774464a3f2e124b586dc0b03913a7b2db4bbb90f83b6384b97d8b8af8bcfabe7ce50dc93e2c87058530
diff --git a/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild
deleted file mode 100644
index 282e25c214ac..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
-SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc test"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		${PYTHON_DEPS}
-	)
-	test? (
-		${PYTHON_DEPS}
-	)"
-RDEPEND=""
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# fix broken path subst in .pc file
-	"${FILESDIR}"/jsoncpp-1.6.2-fix-pkgconfig.patch
-	"${FILESDIR}/${P}-arm.patch"
-)
-
-pkg_setup() {
-	if use doc || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSONCPP_WITH_TESTS=$(usex test)
-		-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-		-DJSONCPP_WITH_CMAKE_PACKAGE=ON
-
-		-DBUILD_SHARED_LIBS=ON
-		# Follow Debian, Ubuntu, Arch convention for headers location
-		# bug #452234
-		-DINCLUDE_INSTALL_DIR="${EPREFIX}"/usr/include/jsoncpp
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		"${EPYTHON}" doxybuild.py --doxygen=/usr/bin/doxygen || die
-	fi
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" jsoncpp_check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		dohtml dist/doxygen/jsoncpp*/*
-	fi
-}
diff --git a/dev-libs/jsoncpp/jsoncpp-0.10.6.ebuild b/dev-libs/jsoncpp/jsoncpp-0.10.6.ebuild
deleted file mode 100644
index 52631dc51550..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-0.10.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
-SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		${PYTHON_DEPS}
-	)
-	test? (
-		${PYTHON_DEPS}
-	)"
-RDEPEND=""
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use doc || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSONCPP_WITH_TESTS=$(usex test)
-		-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-		-DJSONCPP_WITH_CMAKE_PACKAGE=ON
-
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=OFF
-		# Follow Debian, Ubuntu, Arch convention for headers location
-		# bug #452234
-		-DINCLUDE_INSTALL_DIR="${EPREFIX}"/usr/include/jsoncpp
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		"${EPYTHON}" doxybuild.py --doxygen=/usr/bin/doxygen || die
-	fi
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" jsoncpp_check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		docinto html
-		dodoc -r dist/doxygen/jsoncpp*/.
-	fi
-}
diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
index 7f4ed846b3fe..618e11c41dda 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/19"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/jthread/Manifest b/dev-libs/jthread/Manifest
index 3737d4b1e1b4..e333f915df34 100644
--- a/dev-libs/jthread/Manifest
+++ b/dev-libs/jthread/Manifest
@@ -1,5 +1,5 @@
 DIST jthread-1.3.1.tar.bz2 8130 BLAKE2B 38929704e2d8308e3c9094d7627ef0f807af26f647aa0269bc726dfa42f541b6cf4cd21596687071e975e6e13b447b39a2c78a4c9b42131a991fc36183fa3bd5 SHA512 ea369ed8028266d67d2a7aeadbc6dd4859191f563dc2f328ad3622af3cc010e366c446a9d325fd689dd35473e6547e552dd0715a4ab308207f46260382f1603f
 DIST jthread-1.3.3.tar.bz2 8514 BLAKE2B ba24fb73f5b02e64af81f889401cc81acaf8c6d60fcfa0316b92e9356b36f8ec65a9cbf0fb999867ef2b590fe15a46136f165739279b14805d26dce8d55b1b0e SHA512 87c57db51014cd1af87cb4a7f6ac1ccfdff699cf72ff91ecbdb30702c844aad360768261d7bf6391b96639cc17f2fae29f3f3506a333b4ce6ed8a9ba64239e6f
 EBUILD jthread-1.3.1.ebuild 689 BLAKE2B 8e091bea5a215015413209fee5ea6ccd6a8a56b91afb6da7f6f79c90d61a0e1ddf779c69902daadec7e82b59c8b68c922815075d893999ac265379ca961e2f2b SHA512 44ac1c3e064896782da3fae3a522985adbfe6d6290608dbafe99cad4f0b9ec3180602ab5d5f79863201e83114b4e5970cd835329a785b732add6bf026d1acce2
-EBUILD jthread-1.3.3.ebuild 712 BLAKE2B 58e974427d3f59196ba0f84a4939701088558d4101c1de65712b174c3a418481f64f6fcb4479303a34012b3cf0a63d119484921171ecd6b617846e8533e9d6c5 SHA512 802db41568a829fdd44fb43fa06def60736fdcfc520554c14febdd38fb505dad9ae0aab6888c21c48c6324b5f7276733015a76bd8c8ad56f369bb19899f54cfd
+EBUILD jthread-1.3.3.ebuild 711 BLAKE2B 609da7743940fe7861c2c7b9bb9256a7eb232ac5092e7d1917f9458bf2d0cbb6b0077587c1f5bd216b317f174cc89aae6c18b29fd73313a768a8c24e1e5a3495 SHA512 898b286dcb1460e29af042375ce723820c20b7ec7c57b547a8a10fff066ba50c03287883bc29594fe893e90113d2357e9de5d42170d6efff0d6014f900073c48
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/dev-libs/jthread/jthread-1.3.3.ebuild b/dev-libs/jthread/jthread-1.3.3.ebuild
index e854d07537d5..458230f1cc27 100644
--- a/dev-libs/jthread/jthread-1.3.3.ebuild
+++ b/dev-libs/jthread/jthread-1.3.3.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="http://research.edm.uhasselt.be/jori/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="static-libs"
 
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index 1b487e1d3525..f79a5470d07b 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 9412 BLAKE2B e9d8c38215ebbc1e8dd9d93191591660aa8edc4e1ef8b3f11547387433c790d2f4b5d958962a264e006a6186c5632ee645d4c2efd8362682ae993a2fe4aca75e SHA512 a98c89af7b3e736bbd38c4f055ddd81e180c59ae0d894780121a94dbd8cc3863eead045c0a06581cbc58d0178c99f17ba8fb9fff2b91ee0d0694170813e20d2e
+EBUILD klibc-2.0.4-r3.ebuild 9502 BLAKE2B 6115e7add73a94b742c03e53fd7ac2d0f5c5b3a045e20efa483d3dc2487c765842d0951374fcf6b06f7cac9eb770d693d027ec6a32378e2fe660ec6dfcf154ad SHA512 676c2c9ebf2e8448503b8eca4058b867cfd5feff78c3ad4abd59cc21fac9c05c5fbaeae08064b32f6b84e6887aa86430bc54c17d800f960ef94c71e74bc7bee0
 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 8e334dc61ba3..d882a5476cb6 100644
--- a/dev-libs/klibc/klibc-2.0.4-r3.ebuild
+++ b/dev-libs/klibc/klibc-2.0.4-r3.ebuild
@@ -178,7 +178,8 @@ src_compile() {
 	append-ldflags -z noexecstack
 	append-flags -nostdlib
 
-	emake \
+	# Parallel build intermittantly fails when doing `LIST usr/klibc/syscalls/klib.list'
+	emake -j1 \
 		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
 		EXTRA_KLIBCLDFLAGS="-z noexecstack" \
 		HOSTLDFLAGS="-z noexecstack" \
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index c17b976b8182..4d69ce6328f7 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -10,8 +10,8 @@ EBUILD libbson-0.98.0.ebuild 975 BLAKE2B f5d79791d080bd8fce54c8cf351cf6910c916be
 EBUILD libbson-1.1.10.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560abbf6a9d85a055c5ede7967d42a430c0be809a98ead267bc1a34fb4a0453a90cd6a19f61e0a3d43d52334049b3b SHA512 e6abbe7790ebe385d047629eedd6574edd9685000424e8350dd3d1e8e861b2459ed7dd3d3f02a1f5fc33e34e0b8bf7cfd5088c8aeef0713c590399eb91cf423a
 EBUILD libbson-1.1.2.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560abbf6a9d85a055c5ede7967d42a430c0be809a98ead267bc1a34fb4a0453a90cd6a19f61e0a3d43d52334049b3b SHA512 e6abbe7790ebe385d047629eedd6574edd9685000424e8350dd3d1e8e861b2459ed7dd3d3f02a1f5fc33e34e0b8bf7cfd5088c8aeef0713c590399eb91cf423a
 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
-EBUILD libbson-1.3.6.ebuild 1118 BLAKE2B 362ca8d609da74abf57f541c4bd8c91a0634dea5b734f6068f9954bec665865f8a597b4e2587740720bcd955a73151eb653059e4c4641bdb2f7a47eaabeb65e1 SHA512 ac2607347570113f109d85d20d24c918a133265b3ca2497c108b30b80e457d33275a30d6a1587a5af87134f3987996048ef9e0ba2e555829cb9e7bad3d540feb
-EBUILD libbson-1.6.2.ebuild 1024 BLAKE2B cf1c41f81d03ba6cb2ffea9728d713540c2aee97b8fb3f4ad1d0371233896a23857c8d166aa683fa22e5e81433a37da006b2716dc316700df34aad5755e26cfe SHA512 aaf96d91eddb70e532fde927aaa7e412b46d5858a46949597e3729fdef23869c5e2e4ac49c90fe601319689fe7437072e54f5db6f936cb875b2a7560f7e18331
-EBUILD libbson-1.8.2.ebuild 770 BLAKE2B 7028f877ba5d62593f3a8d971520d4f2e416b4d688658dbc84dfcf7098202edb029145986d7afcf50ca7f667606a976c5cbd6bc1d2c94b814c3c5e39352d7c34 SHA512 2d2312d207ac617cb718c290652c22a118e208d9c0b72a2b19f99ffbde8744239293b6af4826effe5a1583f253373e8eea1bd8967220aa77d208c0bed58c15b5
-EBUILD libbson-1.9.3.ebuild 772 BLAKE2B 0cd86c5694a4c333767b7afd0a17e5016c48c2dd7bdf56ef46f87e270a2a1faacbb7ade21cd5c584b517876befe34e0c199b7099a708a2c08a10121af338703e SHA512 2ea727be1526976425b981862bdf1c70f789abf2cad5b9a5e02a04bbe1c96a4bbcfce18fed204ba61bfa40f3f31fbe93f0ec558649baa75ffeab59514aeea445
+EBUILD libbson-1.3.6.ebuild 1123 BLAKE2B b568b6ba2dad1c940d0a77e04b9b3aacc119377f378a496edf2a4757c37110bb89a8325c3f1b6682dfe87209f582e37165290387b0ab4cc98bad51529550a3f8 SHA512 1abff3af97b0a699689d92f5f80affa42228b5abeac36a0eba830c4ae6eacd87e67c192045aa1921d43f4a2fad5e407bea728cee6f2100bb4d0a4df7765b6c57
+EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843
+EBUILD libbson-1.8.2.ebuild 775 BLAKE2B 757fcbfa99d6faf368f1e8f75470ab94a7fc055d1bd13cd57e4005e8e27852a39ec5cf7adf6d426b0b15e18c4ddd2194ddf7d77768d2c01a855e20f32ed330bf SHA512 0823615caf208dd73db77cff1b45c819b04e597e3a046352c905fe52bb46095baba016362b31684b1d269d1907367e90642a97d6cc684f67fadecf0f5188615f
+EBUILD libbson-1.9.3.ebuild 777 BLAKE2B cd5fe3826c1fdf263b86a1e7d4f4247cc5839497c04c88cfe70036a0a33a2c468f8118b1fbd5ea4248b84db948176564db724bdd3eb7951b1464a61def9c9607 SHA512 d847c9bf88596c69f281041dd6bff7b4bf9ee88e5e92f8b2fe4b16105d56ca826bb5fcd9d7f7b33ade37edb74e3c161b6b85c6060b91a7d73332d404214fb463
 MISC metadata.xml 404 BLAKE2B 09f99f8595c089c30e13406a3dfe969c444b325dd1fbbd8ced6c9f3e257556dfe5ef762bd97cc16067c9691dba04fe38e855280c2058d90e7970a01474324a98 SHA512 081d2001bcf61d7cb00a36ddaa1869cdce615fa706693efa907676e4224c297871cb65a3dbc64397f87b29c751125735b35ba595e4344a654f2682092411e8c9
diff --git a/dev-libs/libbson/libbson-1.3.6.ebuild b/dev-libs/libbson/libbson-1.3.6.ebuild
index e326a2d1a2bd..89963ad26142 100644
--- a/dev-libs/libbson/libbson-1.3.6.ebuild
+++ b/dev-libs/libbson/libbson-1.3.6.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/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="debug examples static-libs"
 
 DOCS=( AUTHORS NEWS README )
diff --git a/dev-libs/libbson/libbson-1.6.2.ebuild b/dev-libs/libbson/libbson-1.6.2.ebuild
index 5fa8902b1649..53d3018c63c9 100644
--- a/dev-libs/libbson/libbson-1.6.2.ebuild
+++ b/dev-libs/libbson/libbson-1.6.2.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/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="debug examples static-libs"
 
 DOCS=( AUTHORS NEWS README )
diff --git a/dev-libs/libbson/libbson-1.8.2.ebuild b/dev-libs/libbson/libbson-1.8.2.ebuild
index 674823edaf70..afa64c6c9047 100644
--- a/dev-libs/libbson/libbson-1.8.2.ebuild
+++ b/dev-libs/libbson/libbson-1.8.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="debug examples static-libs"
 
 src_configure() {
diff --git a/dev-libs/libbson/libbson-1.9.3.ebuild b/dev-libs/libbson/libbson-1.9.3.ebuild
index 8d74b74a4e4f..5fa502a4ac5d 100644
--- a/dev-libs/libbson/libbson-1.9.3.ebuild
+++ b/dev-libs/libbson/libbson-1.9.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="debug examples static-libs"
 
 src_configure() {
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 4f8f4cdca43f..62f8778a97c6 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,6 +1,8 @@
 DIST libgit2-0.26.2.tar.gz 4706513 BLAKE2B e11a7043d3f1b0a13d04129b7052d60beb401bc87f583f63dc514251dda001b622d8a7b5c7b65b8d6364244e4b15e09bd4ef789b120ef13214cd0430af8c76c1 SHA512 4601b4a09f2c70b41361eab5549d3f758ab5a62742e4ae0b07df0cf4f8d7b66a2eae09a1db410afcce0f6436162dbc4f8cbe97b08de1807960ddfce02e5d695b
 DIST libgit2-0.26.3.tar.gz 4728289 BLAKE2B b437732cb30d85487a7a1a16efd41d19fe7677635ae07393094cd2931a0fb6673f41b14122793a31dd317e27936df9844fcb2444ba916469e4673f42e9db04f6 SHA512 abcd3a904bed05c1f200be2ffbc2c44cebd1b548459ee834d5635c5eaf7bcd551a4993bcc1cb9fbeae9ea990c5ebc07655007ff4e623fa7c697f326c0ce12c3e
+DIST libgit2-0.27.0.tar.gz 4761312 BLAKE2B 4b39ab7609b8031751cff826523a6989872d2a8508b3928461680f03e5e5e2db0782f396e03c69d6d484568958d4eb018a41ebdd4502555c41bf5b7b9756cd82 SHA512 1304f0b6182e1e6e7fccbec1a568aefb662e144a1aea4fff5901f3c012ff0f3d28720f17d19b9a1bc6c892c32fe602766fe98a15538a94a468d65d3e4a1680ca
 EBUILD libgit2-0.26.2.ebuild 1748 BLAKE2B 2451d8d46de8edd0081fcfe74d2ec964eb0f85e7a490e1405cb1cfdc4ecba3485213de36d2efa0c44338baff7aec184c99e9d06e0e81976ff704421e4ed96a67 SHA512 9c971dda49e296e61330b81f3046043769d30513ffb5662f727b8c81f3a202c17203e914f571e82d887427858f13a6fa89a9567e029af75f39d7fe839b7f8fe1
 EBUILD libgit2-0.26.3.ebuild 1876 BLAKE2B 310c4ccb8a71663e9758bd80a7a903436e4add8d9df35942e88f2f833262670b4d091d3ec16009df70ba3b62a24368a775b9d495a78bfd9d9c4b58670b325b87 SHA512 f64f4911811a2a0d5b7a79585dda7156ed407d807ea650dd4709fc72b73daaa32b0f5d8fab53fb6dac0f94b863f586698a834f28030a7eef4a3fa2c6e8d5d860
-EBUILD libgit2-9999.ebuild 1882 BLAKE2B 43d84f718bd6cc1a3f6ae4492b1889ae371e4bae4daed87c6fcf90b4a56985017b4397bb0f1c7ae7d5e53670fb1947e5bd13cbd96966afdad01dc67d083d469e SHA512 e183504e2c6f883fc11f64266b95d4d673eb9f296311bb7ef316cc198067990af2c93a47e0920842502efe5fb95f83e282377804871dadfbbfe2a50b75a9dcdc
+EBUILD libgit2-0.27.0.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
+EBUILD libgit2-9999.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.27.0.ebuild b/dev-libs/libgit2/libgit2-0.27.0.ebuild
new file mode 100644
index 000000000000..456ded8f18df
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.27.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/27"
+IUSE="+curl examples gssapi libressl +ssh test +threads trace"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	curl? (
+		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
+		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
+	)
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
+
+src_prepare() {
+	# skip online tests
+	sed -i '/libgit2_clar/s/-ionline/-xonline/' tests/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DCURL=$(usex curl)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake-utils_src_test
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
index 677c3a9a8184..456ded8f18df 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="A linkable library for Git"
 HOMEPAGE="https://libgit2.github.com/"
 
 LICENSE="GPL-2-with-linking-exception"
-SLOT="0/26"
+SLOT="0/27"
 IUSE="+curl examples gssapi libressl +ssh test +threads trace"
 
 RDEPEND="
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index d54dccc8d7f8..c6592da9cfdf 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,4 @@
 AUX libpeas-1.14.0-lua.pc.patch 553 BLAKE2B a86596d6c76e22e3e947709db226a47110f0964ae493d4fd16e506f4666de5fd5214d431a5109ffb0b68a6743bf2aa89aba84b63fabe4e402ac491be01479743 SHA512 ead06352498ff82a4520d4a7ed7b5d03e2d0adcdf2025413851b8385bfdd691c938b456b555d2214ec2dc7b95708f306149d6f1cfa7c5b03ad28a1c90c873349
 DIST libpeas-1.20.0.tar.xz 557872 BLAKE2B c10cd85ff6f15f2124541aba3b437e3216322647e36f93a2202df14aebda7c35896a5f77a40ddcd5a5f0300df11c274334cc3a8dfba3fe2745e0b364cb7eac4c SHA512 b3ddebf65e1a76493b5cd5150f60c13597c90398eea16c002e51d25449a595f7591bd0ccd1214ca3a8cbce724eb10f38a316e8c95092442034c048bc95cfdbf4
-EBUILD libpeas-1.20.0-r1.ebuild 2175 BLAKE2B 728bb4eb437c03cbd0d430972fa7059571843de4e0b8b1ff3dc135333a9632aff3d0bca971f87135c6374700380151a8b3eebc6137fdc15c692f9908260b9c84 SHA512 3b5567dec6ae096a84000ed8cd1646aa6a1b90bf0776a5d6de4e1c95b093a06a8006706a7f72ff34ec7c371bfb7c1aaa0a7016bb5cfc21b38b5482c1280ca537
+EBUILD libpeas-1.20.0-r1.ebuild 2190 BLAKE2B d714b8b30bb27d3587ab8879e94265a72acc6279adc5642d969bc42f87ba5746636ded6b322f55e1b4eae04a82b038b79f7fca0874293161b6b897d12521544c SHA512 647363247a0a2baaf94ccf252f3cda514d147171123aaf123fa83104cde3e41159a9ecc6c3019548efc4249fb1e21d4185a2f00fddf003bee43edf00d7925e22
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
index 71803c6cb7fe..ead15aa6969b 100644
--- a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
-IUSE="+gtk glade jit lua +python"
+IUSE="+gtk glade lua luajit +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
@@ -24,8 +24,8 @@ RDEPEND="
 	gtk? ( >=x11-libs/gtk+-3:3[introspection] )
 	lua? (
 		>=dev-lua/lgi-0.9.0
-		jit? ( >=dev-lang/luajit-2:2 )
-		!jit? ( =dev-lang/lua-5.1*:0 ) )
+		luajit? ( >=dev-lang/luajit-2:2 )
+		!luajit? ( =dev-lang/lua-5.1*:0 ) )
 	python? (
 		${PYTHON_DEPS}
 		>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
@@ -65,7 +65,7 @@ src_configure() {
 
 		# lua
 		$(use_enable lua lua5.1)
-		$(use_enable $(usex jit lua jit) luajit)
+		$(use_enable $(usex luajit lua luajit) luajit)
 	)
 
 	gnome2_src_configure "${myconf[@]}"
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index d4952f4bf39f..91fe87edf604 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -5,5 +5,5 @@ DIST librelp-1.2.15.tar.gz 440273 BLAKE2B dba423e206bdbcbfb351ab691f777d4c78f25d
 EBUILD librelp-1.2.12.ebuild 978 BLAKE2B 625572f11231d83db1c5e8766ad87777f8c4edfc710599f45b572e0d6b87fb841097f50eef78ad81aeab83f5e38cd51d39514c1b08dca9ab4b57723c8c11a4f6 SHA512 935b4372194efd5f60d696b778c956ce42d5468919c050533fa98f9b9fc75f452fd16e77e569bec1639dd8d12a9edcd0f9a02c57df638af4c4594d7973111f7f
 EBUILD librelp-1.2.13.ebuild 981 BLAKE2B d27aed2f1378dbcc9f6f72a58dccd72255cdf28d16620773e8ef07d07dfc5296d2e765fc71560c92869712b7b03c3931fe2cd6cd56c36cb242b3971c6c7341ec SHA512 574b227a1408d93cdacfc4e6aa04450df1607d21e5e89c4bb85382a986fd6df350d376ceda9783bf469c357035138826d14d9bd8ac56a6740a36eb8bdae76f55
 EBUILD librelp-1.2.14.ebuild 981 BLAKE2B 6ae7bc1292af4a7b171bbfd7c7d2574c004859c36ad84ae9e73417f447f0bcf554ac9e8a8b020fc9a44cdfca8f9aad01c02c27f380c5f5ce37f7064570f81b9c SHA512 a87c0896b3d99983a0cac6e077c2753c636636ef3f966fe51b14122596b58f6f15fbe5ed943dc27a6d353ae82b1c4897c98f0fcdd1309bb2a0f9a9d39ff9327a
-EBUILD librelp-1.2.15.ebuild 983 BLAKE2B 5d5ebf37e2a914837f71836a33ccc33da137f85a1730936f71b947945105a6e9ba588abd509e68601ec781dd1aefe5a569bd3c1844afd528df8ef1a1457ee32d SHA512 94cc3a42bdc2129b43789de8234c8d1ce9054c0511e3327f48447137921be16d5e093f342819c9689eaf6ae1d79601e3b6765372859620b53bcf0df22c6e00f6
+EBUILD librelp-1.2.15.ebuild 982 BLAKE2B 77c09c25b30d6e4078ff692ba236a6289edbea597de8cc175a71c64f5acf3913f50f82a10325719c14f631f04f660bb68fb7a3fa5ac31720a81c521d663f7db3 SHA512 fafc6d5d93669c3c5e72e87041d48256b54baf590b50ab10e08624e7a30f20717a33988285f3d64a2c5cf407c847365746c196561d897fb5a7d42d56162bb45f
 MISC metadata.xml 358 BLAKE2B 2b9924cec5f5b08dfaa8df564577e388c620b48db4206c2c37774e7e110c1b3ca695f82eb39913c0f552a59ce30c6a03a2e348aef78ee01a7c37165fd3c097d8 SHA512 8b0638c9c4d4c385dc14d8b3e0300791d181bd08c9476dfe5d881281b8b6d4e7bbd8501c06159602d38db4b037b24ad45615b29377cf5a8989ae850fff8f362d
diff --git a/dev-libs/librelp/librelp-1.2.15.ebuild b/dev-libs/librelp/librelp-1.2.15.ebuild
index 3f467877fa5c..6995890a34e4 100644
--- a/dev-libs/librelp/librelp-1.2.15.ebuild
+++ b/dev-libs/librelp/librelp-1.2.15.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.3.0"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa sparc x86"
 IUSE="debug doc +ssl static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 14c49a6bfdad..8f5505bdd1e2 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -2,5 +2,5 @@ AUX libtasn1-4.12-CVE-2017-10790.patch 2268 BLAKE2B d3261e687f14596ae091951de1b7
 DIST libtasn1-4.12.tar.gz 1888450 BLAKE2B ccd3d5c7bbc9d00fd5be125a60b1705833bee4dff8bd0147cc6a7ed67ed679210984dedcf5d76f701ab53b8d7c127580ddb3162876aea9e1142f518271d12252 SHA512 6c551670949881193e39122f72948e4999ff1ba377f9ee5963d0a4ad1b84256e4fe42e9f6d6a2aa9f7d4ef7acc0e5174fb5cc3df5298524cdeda92f4b8c104f7
 DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
 EBUILD libtasn1-4.12-r1.ebuild 1361 BLAKE2B 242d6f13825143cd912cc33e684c4026c56fbb534631463e6f9f125920e21cc1f1769d392bb3e9b33158c0111c66bcbf2851cdf8e08543ac486bb53d5314fa40 SHA512 be735c1c8b9b4113adfbe133ebe90d191bd11f32e3b108e55876b48252c5b83a2b0503bfe08b818edc5fa47bc63ffafd60dd40453ce03fa52fc23229155361bd
-EBUILD libtasn1-4.13.ebuild 1317 BLAKE2B f83aa0a4960c57fe1ac2adf802eca21912bcd24f192ed0e91de26e6eb2bfcc1c5043ebe5fbcfb8a1e3f86d0c96982f025b03da4cf3ed5de2cdcee8bf131956b2 SHA512 8d075909eb223252fe0065864eb458b8cf1e0820ff1db964cb4d7eb445ca4c0229e31cd49c651c0eec2bfb50ed29fe93af1618bdd96ad03613e0491eff12f383
+EBUILD libtasn1-4.13.ebuild 1315 BLAKE2B a1a8e2a73e94bfd7c6658e101d349fc2a4496e21fb83b8b023ad381be737c4c0f49aad5768f67ec73ebba6345652964830efe52ce438c4daeae4724d1d2c06a1 SHA512 cfe0c4e9656dcbf2c18db72a2286024c250d539246156e34e445c515bcb9e4f674e86f80bc2e289ee3a8beae413ae873996bf66aa6740650683a957e00422e0f
 MISC metadata.xml 347 BLAKE2B d1cb59aca28df43f3b322b98daf2cefd4c91d45120bd47c5cb883dde59ae0ac9b8fcb092e0bd4b51e1f09aff48b97a6e1880568ae6796025a989b67902b01a7c SHA512 2f70d06c9e91e2d9305cce180c302b6b04b4831fd93c1897fd2027a1bf5855700c5531ba3f9c3fe93748df1db923d6ad4ea78bbe3cfd2458c0006457ed43a450
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
index fe8a2e521c01..78d4c86457d9 100644
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs valgrind"
 
 DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 4c83da2cac82..2df4a64cf44f 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 1052 BLAKE2B 391d889a02b1ec71011478d63d2adc5f4d0b1751f499b1c2373af024ae765a4dda8394a88bc3704b8023247bca1efe945ed7808a2fb1be3d6e53ed6f0d7bee28 SHA512 6b91e8adb2db7909b8396925af2ad95d143e1e47add4971d9a61e0b9917300f191731c75cdca003b80e1168c90b7e6fa4fd9cca02cab0a37408aa19f781faa1c
+EBUILD lzo-2.10.ebuild 1051 BLAKE2B 7ab1db74153ae3a22053ecd2c7ca15b1a15d674242e0e221e17a468142bad1b95a6fda85cedd440e1426cb733428a431e4369fc06beea877647b12de8f2163bb SHA512 c056ac62ba719bfa22748c87a51deda3a2e802d5102ec46bf333349297869700b5fe26e3b32fb7afeebd10b47bc1b259895d8286a04db8e3a065fffa59ef4dd8
 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 46bddf38642c..bf11463647c8 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/openssl/Manifest b/dev-libs/openssl/Manifest
index 8cd1d794c945..b75ca4027aae 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -8,15 +8,23 @@ AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2
 AUX openssl-1.1.0g-CVE-2017-3738.patch 2317 BLAKE2B 93ec481b15075ecb94c175659314d6e5a90c1a513d8e82948823bce8c51214e7e27f72a56f9043f0771d5458159f1844e4ac8f6d12d0ed78cbc75a1b9630094b SHA512 4b033443d49d385d6ef9e89975af0e1d8108b97d28492239a427ac15ecc4e9c995b6a0df324361baefbe3ae04ecb97508ad7c80eb22b5b4a157a1a1b5c875b61
 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.1.tar.xz 11656 BLAKE2B 8e60bddd97eb6475e3f0026f5e6f11e40a2195a6ecac508cbf7efc5e6077fedae6e1a829261540a69616544368561e003c47ce755cf4ef67d4f857b2f594e6c8 SHA512 7f7f509a4a5f15b53fc5fce03ce9988f9a420d8741b82404c89a26379a72b7e4f5ff5b2a4f7d0d4d5c3fd5cb7eb24c42fb4fb1321fbb4b520b3c21dbe7efbca2
 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
+DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
 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 8042 BLAKE2B 25b5c35417b7305fbad6d7d179c2000f98d94ec30b42f192ff9d6bc18ca0a1862c3fdb4e2b187d332ee2658566197164462584c98abf1ffe5690a7cfe1d69b3b SHA512 06722c4dda89979c4121eef85512ca80e05c473894a8c44c1e869acc483201deb1a3ad368655d1199b0490939983eebcd4e5d2cae6534a91d5495d7f7156fb54
 EBUILD openssl-1.1.0g-r3.ebuild 9123 BLAKE2B ed3a8a8bbbfeadecba97d3a3724b7013967ace24b8a2de53ec8824638ed342e688c411f5edad812f21340a6a42632768c0537edd3d2ae88e9b8f2947fb2ac917 SHA512 422f242d0ad025bf204baa377395f7e57c514c42eb137bf6d75266b9bc97c64f85225f7a1b77881a67e8b2185ad963443bde55c5465aa50eef91d00037c7b92b
+EBUILD openssl-1.1.0h.ebuild 9060 BLAKE2B a826a13c07eb8781e8de306aaaa211688017cd5d9b0ef76a51e4d347bda1c4c7b7e9bd544c10a3724288f2737093527da1585e6c0379f42ae18f78f17722f208 SHA512 8180398aed74bb25baa456d1e993c96af0b0ea4b3f5fc23daaf6d5c6a961c4e4f28f23c67584b871a03a7d98b8d322fec657e7109da619194a23a8df18f46b10
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.0.2o.ebuild b/dev-libs/openssl/openssl-1.0.2o.ebuild
new file mode 100644
index 000000000000..10f2fe518b77
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2o.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+PATCH_SET="openssl-1.0.2-patches-1.1"
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+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"
+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 )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	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 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		eapply "${WORKDIR}"/patch/*.patch
+	fi
+
+	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
+	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:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	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
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	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"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	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"
+
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		$(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 \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	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' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# 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() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake INSTALL_PREFIX="${D}" 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
+
+	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
+	# 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
+
+	# create the certs directory
+	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
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -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
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.1.0h.ebuild b/dev-libs/openssl/openssl-1.1.0h.ebuild
new file mode 100644
index 000000000000..e3426c78ba39
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.0h.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+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"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+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
+)
+
+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"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		epatch "${PATCHES[@]}"
+	fi
+
+	eapply_user #332661
+
+	# 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 '/^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 \
+		|| die
+
+	# show the actual commands in the log
+	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config
+
+	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
+	# 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"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#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} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| 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=::' \
+		-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}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" 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
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# 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
+	# 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
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -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
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-03-27 22:40:05 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-03-27 22:40:05 +0100
commit	8c364c784966be1700ea39ae45028f3e9be9cae0 (patch)
tree	c1971211069b79e3831b71accd52a67a9fdc77a3 /dev-libs
parent	6bd95d1f6320b8666a31ec949183aaa3088aa16f (diff)