gentoo resync : 17.05.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-05-17 22:49:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-05-17 22:49:47 +0100
commit: 30c53e395853f5bfe805a1e429fcf26666eed8f8 (patch)
tree: a0670eaf9babda7b83503f7d36806a944bb49752 /dev-libs
parent: d302a5d7fc9caafba5c8a404f2891bb6ccdec311 (diff)
43 files changed, 968 insertions, 539 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5c0ad39843d7..8f055a40c94e 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 217aae1885fb..995f6c5d333b 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,3 +1,3 @@
 DIST folks-0.11.4.tar.xz 1972272 BLAKE2B 69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f SHA512 bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
-EBUILD folks-0.11.4.ebuild 2372 BLAKE2B 5e1c32eb979ad801e3f56c4a081e066a79a0bfeeeecb2ddd06466e2f2500cc7b0739bfd2dffda1de97c49e0f6da345f119c48e187c7bb93b37f1ee0ffce91bf0 SHA512 b6221f21f16cc03eb5d2af32f25e6b47c0d7c99ca9c18038730bb769f62305bac00d2de33d9ca884bdb8c7acf5ac9c6a1fee48ea4201ca070e9ca83c616c4b8b
-MISC metadata.xml 556 BLAKE2B c0fa3124cf91826d1ea75e81881653e8570fe8e407500cd9c5add37b90195f3dfcfa099c757c078a99420406b21841f40a0633b452858be1c8b2f6bc1bb12ac9 SHA512 d984c087dabcd82d2ea2ac288594c7a3fa46dde36b863eaaa2c5a49fa6e02b087d819b5b3bcc7d896fe850de593bc185c164ab0124d89cea0340c569d1ecec7b
+EBUILD folks-0.11.4.ebuild 2287 BLAKE2B 88ff4471bda2f64b67215049dedba5241370b992b0d59abdbc7411d9bda0ccfaa22072c7ec5d4fa1f09685f8be2908a9ae4742eadb77c520833389089817848b SHA512 8cd137238de0aa09e5467b76afddf18885cfc66561dc3b6c78f3783ad876a52687f71b45ba9845a1c5ab21b8fdffac58001dd0d8bc2cebad81a392c119f71d9f
+MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/folks-0.11.4.ebuild b/dev-libs/folks/folks-0.11.4.ebuild
index 77622692ce8f..be35991b3224 100644
--- a/dev-libs/folks/folks-0.11.4.ebuild
+++ b/dev-libs/folks/folks-0.11.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=6
@@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 
 # TODO: --enable-profiling
 # Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
-IUSE="bluetooth debug eds +telepathy test tracker utils zeitgeist"
+IUSE="bluetooth debug eds +telepathy test tracker utils"
 REQUIRED_USE="bluetooth? ( eds )"
 
 COMMON_DEPEND="
@@ -33,7 +33,6 @@ COMMON_DEPEND="
 	eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] )
 	telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
 	tracker? ( >=app-misc/tracker-1:0= )
-	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 )
 "
 # telepathy-mission-control needed at runtime; it is used by the telepathy
 # backend via telepathy-glib's AccountManager binding.
@@ -73,7 +72,6 @@ src_configure() {
 		$(use_enable tracker tracker-backend) \
 		$(use_enable utils inspect-tool) \
 		$(use_enable test modular-tests) \
-		$(use_enable zeitgeist) \
 		--enable-vala \
 		--enable-import-tool \
 		--disable-docs \
diff --git a/dev-libs/folks/metadata.xml b/dev-libs/folks/metadata.xml
index b7d687336697..a89e8dcef9f3 100644
--- a/dev-libs/folks/metadata.xml
+++ b/dev-libs/folks/metadata.xml
@@ -9,6 +9,5 @@
 	<flag name="tracker">Load contacts from <pkg>app-misc/tracker</pkg> index</flag>
 	<flag name="telepathy">Load contacts from the Telepathy framework</flag>
 	<flag name="utils">Build the folks-inspect utility</flag>
-	<flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index e687d41a2dcc..bed897a110aa 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -6,5 +6,5 @@ DIST fribidi-0.19.6.tar.bz2 639022 BLAKE2B cf17ec580d93807e7720f7833bcac2e5ffaa1
 DIST fribidi-0.19.7.tar.bz2 648299 BLAKE2B 496d010f29dd8fc3d349ad3f89d60a596dfceaa5350663442d5965cb09bc7a23e2ab8a876d7ca5b05ec3f4c5e178060cae2b493ccc46a6cdfc022d139e778259 SHA512 4bfdda43d961030a8a2ae2c98d2ca5d43c1b59633fa0987920c5537ec69f3f624204ceacc4c474d878cbb417ee2d9e708dfe169cfce6ad584d2f2d5122678b63
 EBUILD fribidi-0.19.5-r1.ebuild 1258 BLAKE2B 073108631a3d3db4e98a79e60dee5dabc34ed2701a819e814135fc223dc920d19e920b7447b995983fcdf2aa9d47b967142c0682124fbe72d93497b8e1357e48 SHA512 e428b8a0098b8a9b372c950cf12b539fa387a9e7708fc7331228f7e052c63fa6cb31152d35efba88c5cf89e96078322714c38f44577612a4b627cde8b9b64f36
 EBUILD fribidi-0.19.6.ebuild 1321 BLAKE2B 6ce0078d166db2c9dd60e8877211f097e50c4af20a118f70fae1a7418bca5e1079dcac3938340c9c415dee8b3b4d3f50269f5db509b706e0695364379177e793 SHA512 7b6e91b05f9a665330047817182d6b8e99b0c83c0fa76cc24b940cfffab49bf8d90504541076611d0f5331dd19ac07ac65c2fec656156f646be54f45137828ac
-EBUILD fribidi-0.19.7.ebuild 1194 BLAKE2B 2047b936929f79b1b41a463abc07678e2e4be301f845f5c67bafe7dd08b5614a9f501f57a7be6a3748f24b7c387ac45e05e3ec95b83f415b5172156eb75a8f90 SHA512 82a4ceea35c7fbf7a264c5c42f31d6941a91eec59edf9e71f856a1a69bc424dbafc10fab2229fd39f69ba878bcdaaf62f55fd02b8b33caa334ba385fbacbd07d
+EBUILD fribidi-0.19.7.ebuild 1193 BLAKE2B ddcdc67dfdb3f8a4efeaa922de677b5533d65c2b1373fa6d6f6c578cf5c2a962367ed012f12dc2c6c2eac57ae4d27b897465c08a9525f9902744c30bd59408a8 SHA512 8907f4edf2d7b658d53e797eb9488309904126028f55f371133f944e751ed54b87a4ea9a233d3ea915bd1d1ff085ddae4354e791f2ee65ca884b3e6faccd67b9
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-libs/fribidi/fribidi-0.19.7.ebuild b/dev-libs/fribidi/fribidi-0.19.7.ebuild
index f9a2d65a1192..0beede7a5743 100644
--- a/dev-libs/fribidi/fribidi-0.19.7.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 817338e47671..1b3ca3d9f94f 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,12 +1,6 @@
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
-DIST leatherman-0.10.1.tar.gz 423218 BLAKE2B 1c0af89efda8d899a703d92b7cb7c56cf37b06e4f35b026f511edfd444072b8fbd4870fa144b565e3d171be5ea09b1af2a871f18b9dc5d884e546c96fa48a396 SHA512 bbbb772c855f5ce1e38abe7186400d9a2c9663dcdc72bd0a822bbe171eed3d01e33a6ec2196d4f6f8f0895f309d031b1eb77ec188bd16b37e52b306fafb66d17
-DIST leatherman-1.2.1.tar.gz 431781 BLAKE2B 0fecfd8f1cdee49548e7408664b78c3edbc76f39dca6abfff3f052dcdae0aaca32ad6197d5cbdce8630116b801c1a8e55d9915531769a3327bde1ea3b242a354 SHA512 f12414093d09b86878558cbe68f03b7f36fc89131412edad0573dbc891b1c422b98b9923babbed9ac4acef2cad869ef452d602199ae4d3e90fca5a3e2eb688d2
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
-DIST leatherman-1.4.0.tar.gz 805151 BLAKE2B 38d5b895370997c91d2d1637ca23e3019bba97e27bc0aa0fb86cd931573c19a669c40ce8c9473c60b365b8474d75ec90b3e8dc2b0f1d488452cef4736668423d SHA512 dcc59928c4623ce0746e2583d4591ae5a9b0426f186ab4105a5a8156daf12d83901e496f2d7edf2a1b77c8087ad200fe90ec703081d65ecae0f999b12e53b0ca
 DIST leatherman-1.4.1.tar.gz 814131 BLAKE2B 53851ce0e875a5953a445b594659d494b127956694b2488c343694b9d4adff9890dc0e462671950c9d920dd5828951ad7629cae20de57625aef02522789024f5 SHA512 71fa4723d231ffd6c582a332d6e57da8d1631d787ac7eeef55a505217b9d216ada11efc2636f2238c0272c30d943c61e1f391941f1c4531f911cce597062ffa6
-EBUILD leatherman-0.10.1.ebuild 981 BLAKE2B c4ba598588bb3b388e627a36f6401c596752a8683814283460e8ae1d5e575ede72d603859ac6c514c451f3f0f655fb3ed01f300f41bb8ce7cb3599c599cbd02f SHA512 1d6b8e7fe40dcd0188b246fd29ce34dcd70afdcb9260899f5bf662a7de9d517a05e40a7187091bba03f97b304c0cdcb8f493e478c3f0e5687edaf05c1467fe9f
-EBUILD leatherman-1.2.1.ebuild 1069 BLAKE2B 2415743c31d327115a44cd551902fa5f8a768a103074cec467b84e2e1f930d392b2e31d77f40f6037462e306b92079375d5c209508ea6744cc1b87be6497e38f SHA512 a16f251b7baa9bcd65dc45e31f744d0a00aba3bed5419825a9e538f7b611bb86820cdb24be67fa6fb996c31686f97bbc9f4ec7116e8cab5653c9773edda93636
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
-EBUILD leatherman-1.4.0.ebuild 1222 BLAKE2B 7aedb4f5a32614583bc4754e25cf8fe875948c79f85dd816766208061d3d778e15aaa69e639b0d6ec578a74c5f84b1f742c486600fe064ebd97425898feb1a82 SHA512 8b3d6ae0c8d7057e0ab55d9a1dc37b763c0898b1ad0dc1c79a682987f323fdb60b1bf967a516ce8e93ffe3f4d70c62851cdb5ddfeb1efe771d166cc07fed8cb6
-EBUILD leatherman-1.4.1.ebuild 1224 BLAKE2B 1b70a91f1dcac7daf0985723f0dd12ffcca0474acac18812318a07fc9487b3f174ae697f9cdc83b477e3e38f936f3ba7b211ca52ef3c48f662dddd102a91d727 SHA512 d0916476dff03385e5b0d3d073e762a32bdef4f7f3dc34c34e4a824c5d913cb82decb77c16c41b44e6f083e6c5488c5827965e6fdc0912f1cf707790efa3cd83
+EBUILD leatherman-1.4.1.ebuild 1222 BLAKE2B 7aedb4f5a32614583bc4754e25cf8fe875948c79f85dd816766208061d3d778e15aaa69e639b0d6ec578a74c5f84b1f742c486600fe064ebd97425898feb1a82 SHA512 8b3d6ae0c8d7057e0ab55d9a1dc37b763c0898b1ad0dc1c79a682987f323fdb60b1bf967a516ce8e93ffe3f4d70c62851cdb5ddfeb1efe771d166cc07fed8cb6
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-0.10.1.ebuild b/dev-libs/leatherman/leatherman-0.10.1.ebuild
deleted file mode 100644
index de62973685fa..000000000000
--- a/dev-libs/leatherman/leatherman-0.10.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.54[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.2.1.ebuild b/dev-libs/leatherman/leatherman-1.2.1.ebuild
deleted file mode 100644
index 2b3ec0032cfd..000000000000
--- a/dev-libs/leatherman/leatherman-1.2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.54[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.4.0.ebuild b/dev-libs/leatherman/leatherman-1.4.0.ebuild
deleted file mode 100644
index 41db96ea9c04..000000000000
--- a/dev-libs/leatherman/leatherman-1.4.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-IUSE="debug static-libs test"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-SLOT="0/1.4"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.54:=[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.4.1.ebuild b/dev-libs/leatherman/leatherman-1.4.1.ebuild
index 1bbc1551d010..41db96ea9c04 100644
--- a/dev-libs/leatherman/leatherman-1.4.1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/1.4"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index 0fe648eb6e59..091b81ccf58b 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -3,5 +3,6 @@ DIST libcec-3.1.0.tar.gz 1097121 BLAKE2B f216c03c26fd51366282d649d18ca969f362438
 DIST libcec-4.0.2.tar.gz 334995 BLAKE2B bdbebeb339ce39f2f740805c4c627cc5190cc0dd57d0d87e3d3aa4ba8feeba103336d035fb8b282358f2e08fa470111be43df4df48870be0e9aa93f35434d0ef SHA512 7bb80965cd1bef713f59bff136dc4a7f1172c4a9bdb8e2f59c6bcc5b74110848c0b2912263280ea68177908a688127e8d7208fc43ce6e65d589343b85395a0bb
 EBUILD libcec-3.1.0-r1.ebuild 2048 BLAKE2B 131b91fcd3720d8fc36dfa9e782f0ce7ee858d18a028393a7bbf9e3dcc375cd96a3752b52ae8c60ef0da8c607416cd7e8552fdd012545135c88febb7896b61b7 SHA512 e6d11e0d455c0e277b864ab2def6209ded30718d8939032576d1ee5d5370e743adfe44545bde1869342775b0d13f2b64152cc0f134564bd920a54ce7d69ade3c
 EBUILD libcec-4.0.2-r1.ebuild 2161 BLAKE2B 69d64d87ad45b660b9407cf7ada57d1746ad02a18025615c4eb9085abfd8d21ca282a1efddc751919b7c4ee704bf943968c85a23f83d5a382e55b4dcd8329509 SHA512 fd2a22614487c9196b5c0de7245c45d4a2c26b96145e2a84ad04b6f387a2836e8b2ba23ef2292d9886267f8443b184ebd3ef57a9a6a0d68b237a638f6cef25f4
+EBUILD libcec-4.0.2-r2.ebuild 2165 BLAKE2B 681c2fab832ff107b4f913b32795c6d32862848bf736c275dd32515917e80825274f73a569cb5ac3cbb4cbebf40e3166a852d57c8f315b51713cffbda8578100 SHA512 b953524f26680045dd7191af3cfb41c8a534205acf0a28b75b6df360babdfd0276255a795fcc79865f2869a0444f3d248a64b29bcae5ce14d4ced0be12f66047
 EBUILD libcec-4.0.2.ebuild 2112 BLAKE2B a489f01bb2d2f4e4429a45cdf55d53afba13222b4e371380e47f90613831f600f3b92a269589eaf932abdf5503822a936e20f7255d909b8a37f77f504166366d SHA512 5bb45988de38b50974c2d52053733c0861cb2416957a83208178b620cd9938ac0af4e5fc8467d0c0c9e9049214e61fae3321effd89ea203c84303b604b5b6a7d
 MISC metadata.xml 662 BLAKE2B d87a9b256eb1cec65184415c8172819e8ffd47f38da6ef0aab46c0b8c40ff09b6b365d4051d44d2fee46a4bb0a7c0fbc0a87d92a171e92961b6f6b7a50d5868d SHA512 5abf50f31e2a18c7a5fce12414dd74efab13be9ea00a70b84384de8f95722f327d7446f51369b7feb33616bc0ff182cbbb7dd0be2855f5b54aee4e3c69dbc59e
diff --git a/dev-libs/libcec/libcec-4.0.2-r2.ebuild b/dev-libs/libcec/libcec-4.0.2-r2.ebuild
new file mode 100644
index 000000000000..876ded98edd8
--- /dev/null
+++ b/dev-libs/libcec/libcec-4.0.2-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+MY_PV=${PV/_p/-}
+MY_P=${PN}-${MY_PV}
+
+inherit cmake-utils linux-info python-single-r1 toolchain-funcs
+
+DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
+HOMEPAGE="http://libcec.pulse-eight.com"
+SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cubox exynos python raspberry-pi +xrandr"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="virtual/udev
+	>=dev-libs/libplatform-2.0.0
+	sys-libs/ncurses:=
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	xrandr? ( x11-libs/libXrandr )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~USB_ACM"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}-no-tinfo.patch" )
+
+pkg_pretend() {
+	linux-info_pkg_setup
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Do not hardcode the python libpath #577612
+	sed -i \
+		-e '/DESTINATION/s:lib/python${PYTHON_VERSION}/dist-packages:${PYTHON_SITEDIR}:' \
+		src/libcec/cmake/CheckPlatformSupport.cmake || die
+
+	use python || cmake_comment_add_subdirectory "src/pyCecClient"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKIP_PYTHON_WRAPPER=$(usex !python)
+		-DHAVE_EXYNOS_API=$(usex exynos)
+		-DHAVE_TDA995X_API=$(usex cubox)
+		-DHAVE_RPI_API=$(usex raspberry-pi)
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_SITEDIR="$(python_get_sitedir)"
+	)
+
+	# raspberrypi-userland itself does not provide .pc file so using
+	# bcm_host.pc instead
+	use raspberry-pi && mycmakeargs+=(
+		-DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \
+		-DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "You will need to ensure the user running your CEC client has"
+	elog "read/write access to the device. You can ensure this by adding"
+	elog "them to the uucp group"
+}
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 62f69c7bb1ca..cf75c7560451 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,9 +1,3 @@
-DIST libpqxx-4.0.1.tar.gz 1582532 BLAKE2B e84f455de3cdce1bbcdb29ae0ff5fea6e5c624f910a3612976eea1f50e054b785b9b7f2b816fa5d0e11ec4f53498404eb2ec1d9c80fc60a8be27d0e0cef0de14 SHA512 00204985097ef8bb0a3376d6ba541dbb471d7c52d7135f6244a9f4acbf6c8e5254d6f813e4411421e49bb56f4a520fc6ac67e300141d724396ce0ac11bd3a95e
-DIST libpqxx-5.1.0.tar.gz 677998 BLAKE2B 5d486beff9d45249d191b380b2a552dcab621c0509c318e8745abfcb5d6d30b0c31dbe3431fea0c1c212b7a3d6d48abf15d537c6f5a6b3869963dd7615f3e4d3 SHA512 4e881bb509b36b6b48d18dddd0895ab6864ba0430630d3e1417036ff8ff0008b446467868f2672e0b49b46cc3a86c6a61a8a3e5c6b63e0bf422be3268d7f9702
-DIST libpqxx-5.1.1.tar.gz 678031 BLAKE2B c615094b7d872355ad45eb49c3f2e9776f314bca0fbf393ab9ec96daeae5732082c9907eef4793f575cf2cbb95ffa30e1d83cbfb9c4a2938019d9d207ebcc9cf SHA512 fbbefe37d01ef58dd7f73629b5174c7285c0fe7d2f2ae10d3118d55d944f7e92b88d0e9c8ac72425c3bc55bdcc12f3e110e1974b303b7fb227be805e935982dd
 DIST libpqxx-6.0.0.tar.gz 676528 BLAKE2B a40095ba9851acde1296d93af7e4c4414f334a734b5062874b63a146836105fdde24672707caf623f2073dc1caf87b1053f25c80b10c3fa779fc91a52f9ec7ae SHA512 f237cc03c01a8262eee44a9428206c1cc11b6034dddf540afef145f58eee5c32b880d84832563480d73d834c24311170e2ef6789e100793afbe0b6e393bd4169
-EBUILD libpqxx-4.0.1.ebuild 2332 BLAKE2B a6d7affcddc3930d4a789ee7f7ae2cb2b1c1e823465a02dc8385930ac3951fb39bac8e1e85fe4dc577f02303143a26629aeadc98b05ad9f98a1b8687cda5412a SHA512 6d01421a6f56b160e51297cb02d73f5c0ad5c197a5bda8491efee96c8c46fc1cc0d792a3b3f21d9898e3296eadd5511e3be7b9e8482598db8b28ddf443c33b0a
-EBUILD libpqxx-5.1.0.ebuild 2182 BLAKE2B d92910a7f05c82109dc98d40a66ec1837b57e820250f784a16a85073979c1708588a3e5c02b9cf2c98a559ae0231029069365860fc520a9eab083f98ff049179 SHA512 9cd97b0fc56f25b52409886a37e3faa477c93e0723274fdbaf2ae7659c57f8df93e52309c95d3426d0734a6574d5bd1d75c12233b2ab8841b5bd68d33e95f49b
-EBUILD libpqxx-5.1.1.ebuild 2187 BLAKE2B 6bb232930a9db7762a0cc34301c31b691c9cd744dff027a32906891e253b0efb9a37b5edd337fc40548d370058339e2738b015212b4d742bcb98968c3df2d4ba SHA512 399b8ed2100dbef667be36a03df5f80793408ccdc33aeacbd44dcd41e413937676fc5e84535d4b5a0ddb426982f92d188095a953b92104e0c9b6df89d36e7c86
 EBUILD libpqxx-6.0.0.ebuild 2180 BLAKE2B 7d701220cf445748f4e67104c36bc3d9c8ffbee6633ed578c676416586b440477da4bf48fc31c2291dff2f52e33f5760891177a01098254bdff5f2523da1708b SHA512 9b85c12d7be7acca245f52557cc11063b3064ce8ee09292c31a35402648de7f555134731d675835353ab1ca0639553b4c84adaddb2e92389c7e715eeb51282f0
 MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f
diff --git a/dev-libs/libpqxx/libpqxx-4.0.1.ebuild b/dev-libs/libpqxx/libpqxx-4.0.1.ebuild
deleted file mode 100644
index 1be9171fb27a..000000000000
--- a/dev-libs/libpqxx/libpqxx-4.0.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-DESCRIPTION="Standard front end for writing C++ programs that use PostgreSQL"
-SRC_URI="http://pqxx.org/download/software/${PN}/${P}.tar.gz"
-HOMEPAGE="http://pqxx.org/development/libpqxx/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND="dev-db/postgresql"
-DEPEND="${PYTHON_DEPS}
-		${RDEPEND}
-"
-
-src_prepare() {
-	sed -e 's/python/python2/' \
-		-i tools/{splitconfig,template2mak.py} \
-		|| die "Couldn't fix Python shebangs"
-}
-
-src_configure() {
-	if use static-libs ; then
-		econf --enable-static
-	else
-		econf --enable-shared
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog NEWS README*
-	use doc && dohtml -r doc/html/*
-}
-
-src_test() {
-	einfo "The tests need a running PostgreSQL server and an existing database."
-	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
-	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
-	einfo "    ${EROOT%/}/etc/libpqxx_test_env"
-
-	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
-		if [[ -f ${EROOT%/}/etc/libpqxx_test_env ]] ; then
-			source "${EROOT%/}/etc/libpqxx_test_env"
-			[[ -n $PGDATABASE ]] && export PGDATABASE
-			[[ -n $PGHOST ]] && export PGHOST
-			[[ -n $PGPORT ]] && export PGPORT
-			[[ -n $PGUSER ]] && export PGUSER
-		fi
-	fi
-
-	if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
-		local server_version
-		server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
-		if [[ $? = 0 ]] ; then
-			# Currently works with highest server version in tree
-			#server_version=$(echo ${server_version} | cut -d " " -f 2 | cut -d "." -f -2 | tr -d .)
-			#if [[ $server_version < 92 ]] ; then
-				cd "${S}/test"
-				emake check
-			#else
-			#	eerror "Server version must be 8.4.x or below."
-			#	die "Server version isn't 8.4.x or below"
-			#fi
-		else
-			eerror "Is the server running?"
-			eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
-			eerror "    Role: ${PGUSER}"
-			eerror "    Database: ${PGDATABASE}"
-			die "Couldn't connect to server."
-		fi
-	else
-		eerror "PGDATABASE and PGUSER must be set to perform tests."
-		eerror "Skipping tests."
-	fi
-}
diff --git a/dev-libs/libpqxx/libpqxx-5.1.0.ebuild b/dev-libs/libpqxx/libpqxx-5.1.0.ebuild
deleted file mode 100644
index 65bd4b7a2800..000000000000
--- a/dev-libs/libpqxx/libpqxx-5.1.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1
-
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-
-DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
-SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://pqxx.org/development/libpqxx/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND="dev-db/postgresql:="
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? (
-		app-doc/doxygen
-		app-text/xmlto
-	)
-"
-
-DOCS=( AUTHORS NEWS README{.md,-UPGRADE} )
-
-src_prepare() {
-	default
-
-	sed -e 's/python/python2/' \
-		-i tools/{splitconfig,template2mak.py} \
-		|| die "Couldn't fix Python shebangs"
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable doc documentation) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	einfo "The tests need a running PostgreSQL server and an existing database."
-	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
-	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
-	einfo "    ${EROOT%/}/etc/libpqxx_test_env"
-
-	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
-		if [[ -f ${EROOT%/}/etc/libpqxx_test_env ]] ; then
-			source "${EROOT%/}/etc/libpqxx_test_env"
-			[[ -n $PGDATABASE ]] && export PGDATABASE
-			[[ -n $PGHOST ]] && export PGHOST
-			[[ -n $PGPORT ]] && export PGPORT
-			[[ -n $PGUSER ]] && export PGUSER
-		fi
-	fi
-
-	if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
-		local server_version
-		server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
-		if [[ $? = 0 ]] ; then
-			cd "${S}/test" || die
-			emake check
-		else
-			eerror "Is the server running?"
-			eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
-			eerror "    Role: ${PGUSER}"
-			eerror "    Database: ${PGDATABASE}"
-			die "Couldn't connect to server."
-		fi
-	else
-		eerror "PGDATABASE and PGUSER must be set to perform tests."
-		eerror "Skipping tests."
-	fi
-}
-
-src_install () {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/libpqxx/libpqxx-5.1.1.ebuild b/dev-libs/libpqxx/libpqxx-5.1.1.ebuild
deleted file mode 100644
index 83c831e8738d..000000000000
--- a/dev-libs/libpqxx/libpqxx-5.1.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
-SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://pqxx.org/development/libpqxx/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND="dev-db/postgresql:="
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? (
-		app-doc/doxygen
-		app-text/xmlto
-	)
-"
-
-DOCS=( AUTHORS NEWS README{.md,-UPGRADE} )
-
-src_prepare() {
-	default
-
-	sed -e 's/python/python2/' \
-		-i tools/{splitconfig,template2mak.py} \
-		|| die "Couldn't fix Python shebangs"
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable doc documentation) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	einfo "The tests need a running PostgreSQL server and an existing database."
-	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
-	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
-	einfo "    ${EROOT%/}/etc/libpqxx_test_env"
-
-	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
-		if [[ -f ${EROOT%/}/etc/libpqxx_test_env ]] ; then
-			source "${EROOT%/}/etc/libpqxx_test_env"
-			[[ -n $PGDATABASE ]] && export PGDATABASE
-			[[ -n $PGHOST ]] && export PGHOST
-			[[ -n $PGPORT ]] && export PGPORT
-			[[ -n $PGUSER ]] && export PGUSER
-		fi
-	fi
-
-	if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
-		local server_version
-		server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
-		if [[ $? = 0 ]] ; then
-			cd "${S}/test" || die
-			emake check
-		else
-			eerror "Is the server running?"
-			eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
-			eerror "    Role: ${PGUSER}"
-			eerror "    Database: ${PGDATABASE}"
-			die "Couldn't connect to server."
-		fi
-	else
-		eerror "PGDATABASE and PGUSER must be set to perform tests."
-		eerror "Skipping tests."
-	fi
-}
-
-src_install () {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index fe5aa92b0bba..be0fd4002413 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,3 +1,6 @@
+AUX librelp-1.2.16-fix-valgrind-usage.patch 988 BLAKE2B 410abca2c3b323a8f896768c3c721e03063506dcee4529553d279aee1f37badfe881b536799ececb82b8390f49d6ba93f3cc3fa25ed8d7ed9c0478080ff050cb SHA512 bb43c8b0b046209bcb649f205537b55cef8393f5a59ecd91520eebc343aac5aa0606194a5fd8f43f1ad007e77c298fc3b02cba3c27ea474f2174dac6a723df2c
 DIST librelp-1.2.15.tar.gz 440273 BLAKE2B dba423e206bdbcbfb351ab691f777d4c78f25d9042ffe2cdac01bc4e7e07eb7c02301ab0d8942a73d688eaf28b43d9f77aa94cc88a258dee1b28dac94a13954e SHA512 9cf52c82c8e61f6970a83ead60da4bc64ab56a2bda42fedf184a1ae60c28f66d565a0c3a8720b55b9a2e5e3ffb7ec35601158f634c8f2965f8c0d3b4f1c15568
+DIST librelp-1.2.16.tar.gz 474456 BLAKE2B b528aaa66e9d52d5304510f86400067e1baea44be487f8cb176aeb146924bc35af24a403e849376e74614fb060093b48a3afe9d6c5da56bbf4dc37a6740478cc SHA512 54c101281c94046e4f8d6f77e73ab52874408e62c77f3dfa29ec0b294f39c216637674cc0bf1b7e04173557b3f21bfa74b7be1aafa3ff2771acd41d1d067d3a3
 EBUILD librelp-1.2.15.ebuild 979 BLAKE2B 8383923df704355300689ee33a1f20d1e82db40b01d75d3ebc2f6c912510738f27bf5434a4c0f7ede684f1cb18c87a8f9bcf38a7754c79daecbba411d1a0d1f2 SHA512 00d1baaf48bb2e1643bfdeceb2af3c735c4e2d1e94e7ce763643d9a9ab730495a865ba02ca7a3e90d9e10bd521090f04affb11512e15db4381cc74ecbc2fc5f0
+EBUILD librelp-1.2.16.ebuild 1075 BLAKE2B 8975b47509ce1f0b373cde7230c486876ec0a36e123b6cd298ed302fd7d23b018e7758ac24079fb4fec641a1e5c9e19e7b86e3531bb409dd29338640e0b5fa0e SHA512 97987e2b5e8464687bdb1a6897dd7ca3e631ca497182c831be6b19f137f0d89b3234f1f117090de6d3e91a1e03ff708954802c9d41e75e76b90bb2fedd5978e4
 MISC metadata.xml 358 BLAKE2B 2b9924cec5f5b08dfaa8df564577e388c620b48db4206c2c37774e7e110c1b3ca695f82eb39913c0f552a59ce30c6a03a2e348aef78ee01a7c37165fd3c097d8 SHA512 8b0638c9c4d4c385dc14d8b3e0300791d181bd08c9476dfe5d881281b8b6d4e7bbd8501c06159602d38db4b037b24ad45615b29377cf5a8989ae850fff8f362d
diff --git a/dev-libs/librelp/files/librelp-1.2.16-fix-valgrind-usage.patch b/dev-libs/librelp/files/librelp-1.2.16-fix-valgrind-usage.patch
new file mode 100644
index 000000000000..15f605dd4825
--- /dev/null
+++ b/dev-libs/librelp/files/librelp-1.2.16-fix-valgrind-usage.patch
@@ -0,0 +1,27 @@
+Upstream bug: https://github.com/rsyslog/librelp/issues/100
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -176,16 +176,20 @@ fi
+ 
+ # valgrind
+ AC_ARG_ENABLE(valgrind,
+-        [AS_HELP_STRING([--enable-valgrind],[Enable valgrind tests@<:@default=yes@:>@])],
++        [AS_HELP_STRING([--enable-valgrind],[Enable valgrind tests@<:@default=no@:>@])],
+         [case "${enableval}" in
+          yes) enable_valgrind="yes" ;;
+           no) enable_valgrind="no" ;;
+            *) AC_MSG_ERROR(bad value ${enableval} for --enable-valgrind) ;;
+          esac],
+-        [enable_valgrind="yes"]
++        [enable_valgrind="no"]
+ )
+ if test "$enable_valgrind" = "yes"; then
+         AC_CHECK_PROG(VALGRIND, [valgrind], [valgrind], [no])
++
++        if test "x$VALGRIND" = "xno"; then
++                AC_MSG_ERROR([valgrind is missing but forced with --enable-valgrind. Either install valgrind or remove the option!])
++        fi
+ fi
+ AM_CONDITIONAL([HAVE_VALGRIND], test "$enable_valgrind" == "yes")
+ 
diff --git a/dev-libs/librelp/librelp-1.2.16.ebuild b/dev-libs/librelp/librelp-1.2.16.ebuild
new file mode 100644
index 000000000000..62f7452fb6a6
--- /dev/null
+++ b/dev-libs/librelp/librelp-1.2.16.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="An easy to use library for the RELP protocol"
+HOMEPAGE="http://www.librelp.com/"
+SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ doc? ( FDL-1.3 )"
+
+# subslot = soname version
+SLOT="0/0.4.0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE="debug doc +ssl static-libs"
+
+RDEPEND="
+	ssl? ( >=net-libs/gnutls-3.3.17.1:0= )
+"
+
+DEPEND="
+	ssl? ( >=net-libs/gnutls-3.3.17.1:0= )
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-valgrind-usage.patch )
+
+src_prepare() {
+	sed -i \
+		-e 's/ -g"/"/g' \
+		configure.ac || die "sed failed"
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable ssl tls)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	local DOCS=( ChangeLog )
+	use doc && local HTML_DOCS=( doc/relp.html )
+	default
+
+	find "${ED}"usr/lib* -name '*.la' -delete || die
+}
diff --git a/dev-libs/libuev/Manifest b/dev-libs/libuev/Manifest
index 013e978dc4e2..7a46f44e44cf 100644
--- a/dev-libs/libuev/Manifest
+++ b/dev-libs/libuev/Manifest
@@ -1,3 +1,5 @@
 DIST libuev-2.1.0.tar.xz 247388 BLAKE2B e2934fb79e32bf61e22a7c8fcdd6371f089c5e8a4f5b3039c10c90abd852d08c5612f7b871ef705afdca68857a270dfd133a1436cd9f49876e0bf47b903e6328 SHA512 82bd68c75f015284d3757886720d1a0e5689cf71b40b896410e5e4e952761fe05b090a33e0787f632afa7726567667e4dbbbc6270129828656953ded6d28d02b
+DIST libuev-2.1.2.tar.xz 248092 BLAKE2B 7229acc6ae0e55a5ceba00e970a9e7b4b11049dc4f4435643e0541a7b3c75ac300ffc2839da0eaa7b3819a5910d20b608247812d32c028ff19c0cf3735d2941c SHA512 65a35f1e2cda5383267ba47bc90e2cdd769e5fb1318c11969c8f44262d8a5b2edad522688619aa6e9219c278286ba9ff997967f9281aa4f667fbe9b0842bf0ee
 EBUILD libuev-2.1.0.ebuild 534 BLAKE2B 4150427bd0e11f554676c94e81e83133558c64295861e0d0ad126f4800f7546e86aa24709754aee3d766d6228f9aac25990a9d5c572c6d507ae57d820b198a5e SHA512 da87d2ddac8efd98e103319718bc62e4737b2c8609df22b8f7064ccc66ddd10d003f7aee299c8a898658f4ce22a0e8feaaae1d1e220c0a0d59b710a2ae32e286
+EBUILD libuev-2.1.2.ebuild 534 BLAKE2B a87a2d9f2abc15dfbc0aa0f9e118fbf4b7c43f622d410aace856d9b9983b3a7574656add4335904526974cc0f96423fd95eae42f5d00e3d3e084e8a93bccc3f4 SHA512 b1e88c77b5c4a352f78c9b8e9f7835570df86e63e7e5dd5ae3550da7122395a97bdf0004bba8c7e0938a541f6c8d8b7a55d642d137d7f92889007560a3ced797
 MISC metadata.xml 697 BLAKE2B dcba433b09e4af6c7a3e849ec4b084545f84d08faa409b7408ae95d3f2922632f08237b6c51e1274a09299b0b09cb2031d809a8f5957f75206573695e7a9b11e SHA512 5250db4faa8c97ffb7b2a7df81b1afd4300358e2f223e1dcb15e461521c816abb09aac8c333315e506c325464ea404a4651009ce2f82b7a1270cbb35020cd4ff
diff --git a/dev-libs/libuev/libuev-2.1.2.ebuild b/dev-libs/libuev/libuev-2.1.2.ebuild
new file mode 100644
index 000000000000..e82786a75198
--- /dev/null
+++ b/dev-libs/libuev/libuev-2.1.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A collection of useful BSD APIs"
+HOMEPAGE="https://github.com/troglobit/libuev"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+src_configure(){
+	econf --enable-static=$(usex static-libs)
+}
+
+src_install(){
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
+}
diff --git a/dev-libs/libx86/Manifest b/dev-libs/libx86/Manifest
index 41f30ebab71e..b63a5623283a 100644
--- a/dev-libs/libx86/Manifest
+++ b/dev-libs/libx86/Manifest
@@ -2,7 +2,5 @@ AUX libx86-0.99-ifmask.patch 584 BLAKE2B 33c0ebeb0ca32b892cebf4bdd91bb2f82fefa3c
 AUX libx86-1.1-makefile.patch 853 BLAKE2B 48a25cd96bacd2e39bc8ecb4fd7988ab3775441f259bfe56fedf0f39f8cb894f3f4bcd64a03a6a5357ed064f9dc0e0b578cccbd760cd2056c564f2502f065d6c SHA512 a61e21ab31b1f22d898799ecc3db57e6816146488d436d3d33817f0ac19d420562830411111bacd8ca4c80a446c088fb931ee293522828076d0a1cae6e7ee0a6
 AUX libx86-1.1-x86emu.patch 1194 BLAKE2B e4f721ca09e081fb9f528ec95ea491a8267a9be8a169a12ebfd05d18425d473b89fe3e6d121ece254b6764a66a4adaeee9d811e619c6db1ce0c62178185d1ac5 SHA512 476d0bc7d3e903c1b1dff75577ea0caa80a5dd06618a08b24300367031ccb578322fcc267746285bcb671583407f22bfb7165374eeb2301ed67177ee18ec549e
 DIST libx86-1.1.tar.gz 87428 BLAKE2B cee90a446994816ce925a5b9edb3de5256f404bcadd9853ad197f13bdf4c86bf4c2def6d38e342ed9af5eba9e87400bfb76cad56852d44583b183853b65dcfff SHA512 b946555a45405a06fdf00b3e2522fc99dd7c61349c32726221aa60117a8d3da6da4b44188b1ebb208368e12b396f26055437cebcc8a0e6df10c7a006182c9280
-EBUILD libx86-1.1-r2.ebuild 816 BLAKE2B 79df8572f9ecfb7c0ee66f2d119221c52efca692fb83a63ae64ddb592498e23d92c5f2820de922695cf6b4410feb6e62316ba2838d5e17070d869c4304c69709 SHA512 ec280eba45ccd55b8d7246ab8c1ae16207a6d45112c3205ce06bbe638af6bc1e72205ee43d40af38e4d0a187e89b58f6b690f1e600040d6b82f0478f210d2cd3
-EBUILD libx86-1.1-r3.ebuild 1129 BLAKE2B 0a15cd2fd28dbfb47f1c780bc0f0d7f03e6b1a49388589b7bb4e645da11233e4cd67e047e633ab63fee3ca25b1147a9d0ad9a68db5151c22eb2e1367b50ddfdc SHA512 fd5a51b0385cbcf4709c627fea93936b13fa1826435e78a758d08783f2b13f93a987bf1d44189bf14073c7d2bee92f44b8919f37dcb7332354b5e8b9a7859c5e
-EBUILD libx86-1.1-r4.ebuild 1232 BLAKE2B dd4d8864a30276fc10d7e381e584af40bbb54d60e9d0355d9abad2fb79200814e98d4da2d4a451ce6aa2a3ecc9ad5c7ed25ace06b0ef1d32299745599ae70b64 SHA512 7306a96a739463d3066bd765b9dd2a8644db90faf19126b4b58ac19f1062725dc035da3778446c58545fb7e4d461c2791975b148f40d71aa66b846bfc81a5c4d
+EBUILD libx86-1.1-r4.ebuild 1233 BLAKE2B 7165f84264a5c936d29ad7030070f356074a0c47b87916b1a0ace57c4b58d2e1aedc7fe33ad08792fd054a1b7a753b2befddf0629b888551ad8693be9943b2ad SHA512 0efb4a9c19918395ca2831223c35b201c4dc7e4fbf628ff34f90f6b8e444a86894c6386e1a8edf075f67f0e19a652b4bf2f471586f8668e4a1357c92d90cfc0d
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/dev-libs/libx86/libx86-1.1-r2.ebuild b/dev-libs/libx86/libx86-1.1-r2.ebuild
deleted file mode 100644
index 72c2285dadff..000000000000
--- a/dev-libs/libx86/libx86-1.1-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A hardware-independent library for executing real-mode x86 code"
-HOMEPAGE="http://www.codon.org.uk/~mjg59/libx86"
-SRC_URI="http://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
-	# fix compile failure with linux-headers-2.6.26, bug 235599
-	epatch "${FILESDIR}"/${PN}-0.99-ifmask.patch
-	sed -i 's:\($(CC) $(CFLAGS)\)\( -o libx86.so.1\):\1 $(LDFLAGS)\2:' \
-		Makefile || die #236888
-	tc-export CC AR
-}
-
-src_compile() {
-	local ARGS
-	use amd64 && ARGS="BACKEND=x86emu"
-	emake ${ARGS}
-}
-
-src_install() {
-	emake \
-		LIBDIR="/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install
-}
diff --git a/dev-libs/libx86/libx86-1.1-r3.ebuild b/dev-libs/libx86/libx86-1.1-r3.ebuild
deleted file mode 100644
index 7bc72dd56ee3..000000000000
--- a/dev-libs/libx86/libx86-1.1-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs flag-o-matic
-
-DESCRIPTION="A hardware-independent library for executing real-mode x86 code"
-HOMEPAGE="http://www.codon.org.uk/~mjg59/libx86"
-SRC_URI="http://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-src_prepare() {
-	# fix compile failure with linux-headers-2.6.26, bug 235599
-	epatch "${FILESDIR}"/${PN}-0.99-ifmask.patch
-	# Patch for bugs #236888 and #456648
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_configure() {
-	tc-export CC AR
-	append-flags -fno-delete-null-pointer-checks #523276
-}
-
-src_compile() {
-	local ARGS
-	use amd64 && ARGS="BACKEND=x86emu"
-	emake ${ARGS} LIBRARY=shared shared
-	if use static-libs; then
-		emake ${ARGS} objclean
-		emake ${ARGS} LIBRARY=static static
-	fi
-}
-
-src_install() {
-	local install_static;
-	use static-libs && install_static='install-static'
-	emake \
-		LIBDIR="/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install-header install-shared ${install_static}
-}
diff --git a/dev-libs/libx86/libx86-1.1-r4.ebuild b/dev-libs/libx86/libx86-1.1-r4.ebuild
index 962e86942828..24efb4976012 100644
--- a/dev-libs/libx86/libx86-1.1-r4.ebuild
+++ b/dev-libs/libx86/libx86-1.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,12 +6,12 @@ EAPI=6
 inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="A hardware-independent library for executing real-mode x86 code"
-HOMEPAGE="http://www.codon.org.uk/~mjg59/libx86"
-SRC_URI="http://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
+HOMEPAGE="https://www.codon.org.uk/~mjg59/libx86/"
+SRC_URI="https://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 3fcce82f52b5..2906fc801ee5 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,6 +1,9 @@
 AUX opensc-0.17.0-build.patch 3577 BLAKE2B 0ad69e4305a21d613f93e76818d442983b1b1b642ba8e5c7030e44c96d4e86ed03f72c7623ba6b08ef9b620f6a5c5f43ea00a670880f070c165cb1f60235c529 SHA512 0412a0d0ee3caca534098357e7778f2aa6800ef6d8d559614cd892de13c6dd05d3a6f78dc12cdf834ab6a4c0160234342b46efda0ac844e2411f54aa08a94016
+AUX opensc-0.18.0-build.patch 788 BLAKE2B 809f109bfde3f40929d5e487c5f766210d1520bff0d857219d226b7d67a3301c9ba5f10b9e54409e75174a170501654a276bce97556bab8a2819980971ca03f8 SHA512 f1f74ef670826901d0302119fc914b7cd82295573d2f2e7b4e2121c81bd58a148021287bb544053dc1eeaf7f056db25b51603ec9bab3b4c27f692eb49214f36e
 DIST opensc-0.16.0.tar.gz 1760418 BLAKE2B 7f5799445e285010392f315fa57919c7f0b038170a19e83dbda664d5d73898f075cccad4304275402c900b9fc50564ed5515a10d31156a6c76a68f170ca3e439 SHA512 15f7d62388dde6dad226acab3cd54f8e2f2f53684dc0cb976c6fc6fbdb4487be931ca69bf965ab07c51efd16be64d5411f10bacea11a07fc823c92dd7bb25139
 DIST opensc-0.17.0.tar.gz 1950547 BLAKE2B 861dbb60e211d503332228c9d75d667f70cb9e15883c571821bb2f7703ca62dd4ce56c5ea7965e2d5e8c6a81b5063fc689013670294426baf1bfaec88282e20e SHA512 8991c1724d187d3c34a2ed591b21f0085f767c0d866edc2decfda85a2b3dedf717838f4937d1dda3e1bbc17f02e6eca6740299660128bc448a29e8bfc2962922
+DIST opensc-0.18.0.tar.gz 2037073 BLAKE2B f2b339d1f9c616f6f706acb3c55289deb5b1749a8b5561142c69db4ed1c7dee554ce1f8d820e6e69bb9e462ca460379badf3017ed35fa6cd395702c995326c3e SHA512 dc90cff3e0e639c14bfb11d1d0455964d24d08aa27728592ab0d8b487a1ffee1ca71cb9bbf5d0f101b2ebd85cf9478988f686d45effa72315e6ffc843d398768
 EBUILD opensc-0.16.0.ebuild 1390 BLAKE2B 14cd6dacb0ebc6d688ac0c0c6628cf11cb10337e13cf390a72d83bd755a589f8b8a61e4961a66b4de0b479e39f43ae30725dddd91aea27e33242cab1955de7ca SHA512 ab05e282f226d4c194b292330cdd132c23e92abff34aa8acdb75b3e2e97d5c1dad29089fe79f8e48d0ba93ed4150c7a287a497da20322ec9f44e8c6850230b4e
 EBUILD opensc-0.17.0.ebuild 1467 BLAKE2B 87f9b57bfeedd29319951e7e88e96f67dbdb6517ecef4a185f6f61c396a1943b7967b2e6ac9080dfc4f54b6bcf017c81169702a0e6b035eec6f4bd40a3f34f42 SHA512 50b49c15558621c22addc53dd2ed3b5379e1c185b098c1b4caee9a3af8557f87dc1de3c0d4f6d8c6ae8c73399caf7780aa2a984ff1f64d30814eb2082c8792d4
+EBUILD opensc-0.18.0.ebuild 1467 BLAKE2B 9a2629aff7e09b0135cc47d54adcf6402f79b185646e96d7ddf670be74be154438de59e982c4f63f26d527fec975f421d43cb209dd6fb93af9071be506cb257c SHA512 16762cb1a2c1d44afa3a4e75b41d9682484c380a2262c384de46e896e98739ae929e5d23ecbd1a47d248e9c32ffd5e3b51f67bc3f38023e55bc42bbd5329bf6d
 MISC metadata.xml 1164 BLAKE2B d512f5bb01592e7f864a09e7d537a94e89ac2226be34fa999d746701e3b0b9fc8495700f5dc6ec1c866ec9f2fa59ed23d737de53204e4cbc401eca176d1a8ac6 SHA512 eae0e3d7c795c452f65730138d867bff881778d9615b1cea1aba362d374e4d8ae8949d01204ce14bb8ea80021ca3328cb2657f3e25b95b93a7848e76f577c761
diff --git a/dev-libs/opensc/files/opensc-0.18.0-build.patch b/dev-libs/opensc/files/opensc-0.18.0-build.patch
new file mode 100644
index 000000000000..2bea2e53d595
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.18.0-build.patch
@@ -0,0 +1,32 @@
+From 1f1de5ae9a43e845431dc43af96ec61e910ad789 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 16 May 2018 21:30:15 +0300
+Subject: [PATCH] build: fix --disable-sm
+
+---
+ src/libopensc/card-sc-hsm.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libopensc/card-sc-hsm.c b/src/libopensc/card-sc-hsm.c
+index e2af52b9..a609f612 100644
+--- a/src/libopensc/card-sc-hsm.c
++++ b/src/libopensc/card-sc-hsm.c
+@@ -451,6 +451,7 @@ static int sc_hsm_soc_biomatch(sc_card_t *card, struct sc_pin_cmd_data *data,
+ 
+ 
+ 
++#ifdef ENABLE_SM
+ #ifdef ENABLE_OPENPACE
+ #include "sm/sm-eac.h"
+ #include <eac/cv_cert.h>
+@@ -573,6 +574,7 @@ static int sc_hsm_perform_chip_authentication(sc_card_t *card)
+ 	return SC_ERROR_NOT_SUPPORTED;
+ }
+ #endif
++#endif
+ 
+ 
+ 
+-- 
+2.16.1
+
diff --git a/dev-libs/opensc/opensc-0.18.0.ebuild b/dev-libs/opensc/opensc-0.18.0.ebuild
new file mode 100644
index 000000000000..9693228d0a48
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.18.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune
+
+DESCRIPTION="Libraries and applications to access smartcards"
+HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
+SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc +pcsc-lite secure-messaging openct ctapi readline libressl ssl zlib"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+	readline? ( sys-libs/readline:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	openct? ( >=dev-libs/openct-0.5.0 )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
+
+REQUIRED_USE="
+	pcsc-lite? ( !openct !ctapi )
+	openct? ( !pcsc-lite !ctapi )
+	ctapi? ( !pcsc-lite !openct )
+	|| ( pcsc-lite openct ctapi )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+src_configure() {
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		--htmldir='$(docdir)/html' \
+		--disable-static \
+		--disable-openpace \
+		$(use_enable doc) \
+		$(use_enable openct) \
+		$(use_enable readline) \
+		$(use_enable zlib) \
+		$(use_enable secure-messaging sm) \
+		$(use_enable ssl openssl) \
+		$(use_enable pcsc-lite pcsc) \
+		$(use_enable openct) \
+		$(use_enable ctapi)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/dev-libs/openspecfun/Manifest b/dev-libs/openspecfun/Manifest
index 5f9571b3170f..322fa3ac3ad3 100644
--- a/dev-libs/openspecfun/Manifest
+++ b/dev-libs/openspecfun/Manifest
@@ -1,3 +1,3 @@
 DIST openspecfun-0.5.1.tar.gz 121110 BLAKE2B 157bf05d63048d88674d4dc2657d91b0ff5b69f93659eb86a235e805893571ce9eb3dd84be63ff5ea691b8047a25417a8d7f755d547ccbc8b3956b2d2b70a529 SHA512 7f7b0dd04d5c325a99bf5a44521edaed87ba75acc8d85be64e3be55ff697a1544430d1fe4b5330d5ceb907bada26b42750cf6654fc8ed12b1738ec29fcbeb0b3
-EBUILD openspecfun-0.5.1.ebuild 847 BLAKE2B 0724f056b806aa40882c322498abb11a5bd22f81a844587e3ba12db33373d39019be6fef78cb2f29f5c0be76c8b15f543bc573c15b0d6dc41d963aab4437ac20 SHA512 4c4add1a019da0fbeba7d7a117050d83973a41e1efd30d9a2bdee5898b7b24a36694e898d75f59b4cae8b551d6ed8b481cf20f3397ffb3317536390bc4d4c982
+EBUILD openspecfun-0.5.1.ebuild 847 BLAKE2B 4a8b66e01f5bb06425a5572a80f1d0e897e399c43ffe927d2fe25f3cc13d519bea71f33e37ea5aca5526d49b7caafd05105a399d80054764d6bb386fbc8bd352 SHA512 dc1de34e5d70653450dd534f3e4ea6f8ebbe8142fda62ff72aeccc9f5752261470179ab7d2883b85fbab4e31290f0dc7eff53bf21e15eb2dc90587fbd466b08d
 MISC metadata.xml 463 BLAKE2B 2b6c6898e8ca4d4c4483de5364421049b3d631b1a4c09480cdb473cc2a1eb050b5de006919c2888ce97a295bcf88734072676be03fb21af3fdd23b5296f67798 SHA512 04269bd766d4549c8f5182f075d709b61ca75e170e3c2cee36ad7b172c9f0b20967ce921cba055c75c390bdf2a0b0ff36b550c76ece580d8411fcdb10ab20406
diff --git a/dev-libs/openspecfun/openspecfun-0.5.1.ebuild b/dev-libs/openspecfun/openspecfun-0.5.1.ebuild
index 5cad71a2cd9c..40545b5459de 100644
--- a/dev-libs/openspecfun/openspecfun-0.5.1.ebuild
+++ b/dev-libs/openspecfun/openspecfun-0.5.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit fortran-2 multilib
 
 DESCRIPTION="A collection of special mathematical functions"
-HOMEPAGE="http://julialang.org/"
+HOMEPAGE="https://julialang.org"
 SRC_URI="https://github.com/JuliaLang/openspecfun/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT public-domain"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index d661a7ee7d11..b91229b0b559 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -12,6 +12,9 @@ DIST openssl-1.0.2-patches-1.2.tar.xz 12208 BLAKE2B 99b7a3538aeeecf8e1939fb08d26
 DIST openssl-1.0.2-patches-1.3.tar.xz 12592 BLAKE2B bce0c289ae689091fe62e9c0d7d631cd915fd17beb81b0879931e0414f25c8a08425a08514e28ea7e81c1be23cf162f3bcad7cc3933f2378f53decabd3a7903d SHA512 3ad3efa45eddb733e3db9c406f9f651dbf939bbb13debbcab12b49ecf72490a4868b1563de60ee106483c1b23bd2092fc58c8fc911fe62a019cb97d738163723
 DIST openssl-1.0.2n.tar.gz 5375802 BLAKE2B 2e04f8c3d5e2296859b8474d7e100e270f53f18a26c6d37a4cf5e01cd14f44d24d334b4e705da05d77c33b5dc91cffea0feea9f7c83c77ba16c9b6d5f5085894 SHA512 144bf0d6aa27b4af01df0b7b734c39962649e1711554247d42e05e14d8945742b18745aefdba162e2dfc762b941fd7d3b2d5dc6a781ae4ba10a6f5a3cadb0687
 DIST openssl-1.0.2o.tar.gz 5329472 BLAKE2B 30226db49be04317da3a76cce68d5aa401decd198f92505bddb0c72a7ef6a79f3c9c06d4a816db734e2a0991ebcab8b207feced26d83639e50c821d9e76ddc45 SHA512 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd
+DIST openssl-1.0.2o_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
+DIST openssl-1.0.2o_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
+DIST openssl-1.0.2o_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
 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.0h.tar.gz 5422717 BLAKE2B 11de1468855c0bb1836fb346c8efdfedd06139a774fc4dbae1b0e95fea7a33aa39b541e3d2d27f83f2b5f4dd3846cca2356020aa6ec81793085842ab78b3a127 SHA512 fb7750fcd98e6126eb5b92e7ed63d811a5cfa3391d98572003d925f6c7b477690df86a9aa1fa6bf6bf33d02c6c7aee6cff50a38faa8911409f310645898fda39
@@ -23,6 +26,7 @@ EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d
 EBUILD openssl-0.9.8z_p8.ebuild 4860 BLAKE2B 8c78442920df3443d9601c3e9246caa838e0acbe9541b5c250a6a96253b2d28fca65878cf9cddaae62f6fab6fd6d264997b168888cfcd1e53ea90b34a804e3e2 SHA512 60bcce7807ee7d0a68df11cdb2ab76560ef23b6e3df43a506263fcbdf54d0571dcfe0d16188159d13a268425b16798eb28c3c1ed985123ae095c8ea146c1e4d6
 EBUILD openssl-1.0.2n.ebuild 8029 BLAKE2B 03b66a7d81e954f811b87314dd56bce86ba3e2dd4b15678d3a72ee40f03cf8d27fe70493c0727c640c96cf21dcab8b8a6a0f022af8505d68f49e6e024d2166c5 SHA512 0da731451be5903656e4035f7eb30b1565b0b5a9fe277e300e9272bc2bebcd97a1043a5e8ebcf62808f50e7a2f8c9433e15f4a6fa44aa86d5efee94fffce8a54
 EBUILD openssl-1.0.2o-r1.ebuild 8042 BLAKE2B 8e8f266dad8dac9192f3484d3334a2253c23858e9fadc7cb20e3c1d9742c65e9b1f072cc65ba82f329c94b45d8bdaf33576cfba90ff13bdaf65535910f867a03 SHA512 af301ed141db94a1a3095458219ac1daf1b9d0fb9d9bb0dddfb01249fe436d64f9e0adba83f3ef818952397d39755dd413bd2d8e8c4f9dd31024107d5c1e40b4
+EBUILD openssl-1.0.2o-r2.ebuild 9629 BLAKE2B f452cd495b29e0c3cad5e0fdae87fd5b19efd1ef95673cdd43c28edce46599b254ac522fcf80c841e205fa17164b2264154d5706e8947c6acf47315eda4f427e SHA512 088ab213ed79ed97997a6e33e2137f8a0703a07cc3d2a53bfa0d9e18fd41f35f86783b2500f75ccdcba240deb7d588b373792a1e59739e33d2bd637ace690e05
 EBUILD openssl-1.0.2o.ebuild 8033 BLAKE2B 63a4108de7e3468d1671c8f2f71da0d96a1f34b82e995036aaa4d184a3c3448af3fbf0aea93d336e5859bd3eb26aaec6ab0dc4eb64d404fc1d7f2e1408b751bf SHA512 bd462f8fd05e348098dab2ab4e00ceab831b399df60c9502caeb30ca3ef2fb21490b05eda829cd9bec0b93dc70e64e7d5ca3781c0a6042dda049ec4a590d95b1
 EBUILD openssl-1.1.0h-r1.ebuild 9158 BLAKE2B c0c4257218e9ef0a2460d5b19a9d43741d3c67a4cbed2714f352951c6d051973a6851bb9a33733e539ad98f0f5be6051b4da157adb421fb79704f995b119f894 SHA512 b1e6dec42afd6c9ca00697cc7942c6b192aebf6ef914c45949c8e3592a11162ce3954b07b484166331035ce421a4dd0a6d463652ab21c25fb3bcfc14239a4cac
 EBUILD openssl-1.1.1_pre6.ebuild 7587 BLAKE2B 34eb743824c977e7b5f793a1837251dd29621ea5949497023a2254f5fad1e49fcf8b91b0962f0405f298e10e6a1b86326c0d0409cb9b4d75a795efa4f1978e52 SHA512 ab71eff89c32dea33dfe95bc52dbee60be75c837730b0324a20d13922aff380c9615576c6712971cbeba86bf2c70366e25fafaaaac20188f471eca9e7684a288
diff --git a/dev-libs/openssl/openssl-1.0.2o-r2.ebuild b/dev-libs/openssl/openssl-1.0.2o-r2.ebuild
new file mode 100644
index 000000000000..ce7b536e3ab0
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2o-r2.ebuild
@@ -0,0 +1,293 @@
+# 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.3"
+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"
+
+# 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='f25'
+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
+)
+
+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}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
+		for i in "${FEDORA_PATCH[@]}" ; do
+			eapply "${DISTDIR}"/"${i}"
+		done
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	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
+		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"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${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/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 322d467ddff7..4181b7b99640 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -9,5 +9,5 @@ DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dcc
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 EBUILD protobuf-3.4.1.ebuild 2523 BLAKE2B a774fdcde73cd91848e3d9ce0a04af49d2716598d3437db4dad303653173aea1d0348a35e8676323d8e80c55c56423ad8e1d521ef335eb055ce83082cf03a1ea SHA512 61f7adaeb0b4c88aa3955ebeb4e703f007d1c98e04d6856becac21be0378af85dc18b60b3f8d36a5e7fb639f4a61f5c8f518c724544ce7bd2e5faed93c2e6980
 EBUILD protobuf-3.5.1.1.ebuild 2617 BLAKE2B 59fd5152cae402cae46bd4b3e03cdae43a5ebd74c2035ee21bebe4bdfe9449388eec1d54adef01ff0912e4872aa1aae390f862b644724d4b6403ef2c654fba43 SHA512 3189220abf34c044eab311e9d86d30aa57873b172ac57b86fb33bbd98a367b6d4a4c101884bfce152e78d949bb7c2bd66bea6c35b6e7371c4d1fbf306ef2e23a
-EBUILD protobuf-3.5.2.ebuild 2490 BLAKE2B 369e5086222a1b5f1c793590efde1edeedb70fc9edc6cebd0e818cf527caed62a842af718368092f8f32dfd4bc510a031286a662c5dbe9afacdb80f151e21cb3 SHA512 ecf460b5520c0f2369b025e0c878446dc8a5a44bacfa652ff7b17f9f00c6593c5f75a98ed860f6a6a6539a8350abd19d01f8694be0614378bad69db8756dd1d6
+EBUILD protobuf-3.5.2.ebuild 2489 BLAKE2B 7e74ea98c093bd2e197d706c1ff8a0a4d2a9907dc1a097640823b8d50bb0ab5638ef1a1e28e9646bd43149f757a9f50e29e693f79b7235994d33afcc22e84d89 SHA512 dc15ee0a2144b421e07ccf1229a6d85e819225e800b0733a893f53d643756c2e5d2f033da080ece23d145d017c71c3e558c4368a5afe8422d6bcd85ac04d31ef
 MISC metadata.xml 534 BLAKE2B b5ffe91fcd25e8285f33e178fdf39f6c5e2e477e5db4bf80ffb144dc8e2c982a586329eb27239ea2867efdbc771ecde26197aa12c67441ede2bf08e1d8e78f0c SHA512 f9b4a37461edbf530940c86f2b0a3838fad80395f1c5e4738b40519fec2df24867e005cf55884f126d2a3a1dfc894cfd1a26fa085268da2dc4b0e562390ebb3e
diff --git a/dev-libs/protobuf/protobuf-3.5.2.ebuild b/dev-libs/protobuf/protobuf-3.5.2.ebuild
index 67ded9fd02a0..7b956ca08a61 100644
--- a/dev-libs/protobuf/protobuf-3.5.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/serdisplib/Manifest b/dev-libs/serdisplib/Manifest
index 20fa4b987452..3b1f8e930ffb 100644
--- a/dev-libs/serdisplib/Manifest
+++ b/dev-libs/serdisplib/Manifest
@@ -1,3 +1,7 @@
+AUX disable-static-build.patch 3327 BLAKE2B 677d3dcc121cbc42345e987055aa202ea8118c74bbb5edd0f5d50dc7408ec77e6f439e38d1277fcba87e31932be4794021c45fe55115d7e1325cafe506abc750 SHA512 ca19a3f05fbc70693892d201efb938c9fd1c298d9e4551a51e802d99999b91568607fa73696c4be991a833432969ae0981fe3daa1e2cd5d18bbc0406bd925faa
+AUX use-destdir.patch 3400 BLAKE2B 77d9adc8c9a44586cbe352c6273677704d7335fc75c82d50a681c361a10a45484ae0dfb3241bf9d99ba242f6548df9cb036992b46e157f9c4ec3ca098397be7e SHA512 370ace46b39ba5e67d7f728a3cb3980b75a2c7e6e5fb25273f9c3bfbe10f33479bfcff92e3074a2cb80985c114d161b78115410dd88330810f654875e57d7575
 DIST serdisplib-1.97.9.tar.gz 293190 BLAKE2B f11406acaedb724d51266510d10f5cbae7e3bf1a69e3378ed8a0f8c4551336e3d662eb104ccc938f72821aec3406e1eed27754c990e17940d8dbe7dd8c5d6805 SHA512 ab45202fd1fd85b12f1ebf7a7e1a4575ad363f6faffd45949300840456e26dd521c70b67ff57c32e1ff6c0a9f2668b3be6a653afb57ba6da701fbae6e8db3118
+DIST serdisplib-2.01.tar.gz 472998 BLAKE2B 7ee78703d1d2cb4172e44db443825dd0fb3080284e832c60a102b853a1df6e0812a30a40504b8eb3e5ecda83f57138d78b43c3c40b8e4efabb7071eff7ad1b3e SHA512 0474cce4353edb3640d8432272905859e90efe6140e6791c84e1cb51df7f533734a9c78447d8d8448a70e62dda6d65061bbcc515ee346354825029874ae5e9a9
 EBUILD serdisplib-1.97.9.ebuild 689 BLAKE2B 046e5cbc15c905f6e9ce98cd91798a7b08e93f0ab5409d3ca46a0f52f2cf5c600d53521720e584146c001dcf1a414ae65c98f469cfd203a89b427193cdbad07d SHA512 f1d713fc3c1005ad81b074a4b75638015f06b57141d2f83e02c4cf11a2b2cdaac56b89f1c3fbfc1b3e38d33f2c48e0e22a7ac6af31c47e50b1d4431231c613a9
-MISC metadata.xml 417 BLAKE2B 2cd2bee187549d2fe1c77b23add02c47a793bbd2d8843916ca4a102b88af3236890c8662d66c35e475875ef909cf8e25c0b72164e51dc8b4c640c971afaa191e SHA512 412fa7141dda04d9ee042f73851a1978700f95f1d9e383d38dbf1fb99f54518c6a9df3774fdb94d9bdb5735c38d51a465f990920279b228275f5b88eade47a30
+EBUILD serdisplib-2.01.ebuild 2506 BLAKE2B 8052e43fbc97bffe04494a8fda82a7b8d892242a1bff51d9728cf9b2a5237446643f80d65368d8937ad037e5e0ef844e8cd2ac52e6c8ccc01952bbbe7cdce066 SHA512 575c1540c0625cad14a4b5fe0a3a3e29e0ed870790491c96fa72ce50b3f3e74da943a93395a0ee6ae75c79c56b7632e01faaa0286b7a4a6ee3fecb3e61421155
+MISC metadata.xml 781 BLAKE2B 39a77b8c97974cdd41d31afa7bc47def2f23f1137b00f79f6574c4f4236702f2ac12219520c7afb7346c4b51dafce61ae901f64da618972fdc44d80b918ab5bd SHA512 fd9814780e1fde17eacd0424f757b9d2b905cbf2116d44cc0966d703cbfe7878580a1afe7b2da4e02d641617922b3e057e9daf8213091a69b0820bd7d92186fd
diff --git a/dev-libs/serdisplib/files/disable-static-build.patch b/dev-libs/serdisplib/files/disable-static-build.patch
new file mode 100644
index 000000000000..6364650a8207
--- /dev/null
+++ b/dev-libs/serdisplib/files/disable-static-build.patch
@@ -0,0 +1,84 @@
+--- a/server/Makefile.in	2018-05-15 21:52:38.966823295 +0200
++++ b/server/Makefile.in	2018-05-15 21:58:27.137821967 +0200
+@@ -83,13 +83,13 @@
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES)  -c $(INCLUDES) $<
+ 
+-serdispd: $(LIB_DIR)/$(LIB_STATIC) $(SDISPDOBJECTS)
++serdispd: $(LIB_DIR)/$(LIB_SHARED) $(SDISPDOBJECTS)
+ 	$(CC) -o $@ $(SDISPDOBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+-serdisplearn: $(LIB_DIR)/$(LIB_STATIC) $(SLEARNOBJECTS)
++serdisplearn: $(LIB_DIR)/$(LIB_SHARED) $(SLEARNOBJECTS)
+ 	$(CC) -o $@ $(SLEARNOBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+-serdispproxy: $(LIB_DIR)/$(LIB_STATIC) $(SPROXYOBJECTS)
++serdispproxy: $(LIB_DIR)/$(LIB_SHARED) $(SPROXYOBJECTS)
+ 	$(CC) -o $@ $(SPROXYOBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+ 
+--- a/src/Makefile.in	2018-05-15 22:09:10.087118208 +0200
++++ b/src/Makefile.in	2018-05-15 22:11:22.224117704 +0200
+@@ -167,7 +167,7 @@
+ 
+ all: libraries programs
+ 
+-libraries: library.static library.shared
++libraries: library.shared
+ 
+ library.static: $(LIB_DIR)/$(LIB_STATIC)
+ 
+@@ -188,7 +188,7 @@
+ 	cd $(LIB_DIR) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
+ 	cd $(LIB_DIR) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
+ 
+-testserdisp: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
++testserdisp: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
+ 	$(CC) -o testserdisp $(OBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+ clean:
+@@ -198,7 +198,7 @@
+ distclean: clean
+ 	/bin/rm -f Makefile
+ 
+-install: $(LIB_DIR)/$(LIB_SHARED) $(LIB_DIR)/$(LIB_STATIC)
++install: $(LIB_DIR)/$(LIB_SHARED)
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)
+@@ -206,7 +206,6 @@
+ 	
+ 	$(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)/
+ 	$(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(DESTDIR)$(libdir)/
+-	$(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(DESTDIR)$(libdir)/
+ 	list='$(LIB_HEADERFILES)'; \
+ 	for headerfile in $$list; do \
+ 	  $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(DESTDIR)$(includedir)/serdisplib/ ; \
+--- a/tools/Makefile.in	2018-05-15 21:53:01.042823211 +0200
++++ b/tools/Makefile.in	2018-05-15 21:59:45.142821669 +0200
+@@ -130,19 +130,19 @@
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES)  -c $(INCLUDES) $<
+ 
+-multidisplay: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
++multidisplay: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
+ 	$(CC) -o multidisplay $(OBJ_MULTIDISPLAY) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) $(EXTRA_LIBS)
+ 
+-l4m132c_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
++l4m132c_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
+ 	$(CC) -o l4m132c_tool $(OBJ_L4M132C_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+-sdcmegtron_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
++sdcmegtron_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
+ 	$(CC) -o sdcmegtron_tool $(OBJ_SDCMEGTRON_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+-l4m320t_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
+-	$(CC) -o l4m320t_tool $(OBJ_L4M320T_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
++l4m320t_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
++	$(CC) -o l4m320t_tool $(OBJ_L4M320T_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) $(EXTRA_LIBS)
+ 
+-touchscreen_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
++touchscreen_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
+ 	$(CC) -o touchscreen_tool $(OBJ_TOUCHSCREEN_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+ clean:
diff --git a/dev-libs/serdisplib/files/use-destdir.patch b/dev-libs/serdisplib/files/use-destdir.patch
new file mode 100644
index 000000000000..786d475cdd0f
--- /dev/null
+++ b/dev-libs/serdisplib/files/use-destdir.patch
@@ -0,0 +1,84 @@
+--- a/Makefile.in	2017-02-02 13:37:48.000000000 +0100
++++ b/Makefile.in	2018-05-15 21:52:25.900823345 +0200
+@@ -44,8 +44,8 @@
+ 	done && test -z "$$fail"
+ 
+ install:
+-	$(top_srcdir)/mkinstalldirs $(libdir)/pkgconfig
+-	$(INSTALL_DATA) serdisplib.pc $(libdir)/pkgconfig/
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
++	$(INSTALL_DATA) serdisplib.pc $(DESTDIR)$(libdir)/pkgconfig/
+ 	@for dir in ${subdirs}; do \
+ 	  (cd $(srcdir) && cd $$dir && $(MAKE) install) \
+ 	  || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
+--- a/server/Makefile.in	2013-05-25 12:58:14.000000000 +0200
++++ b/server/Makefile.in	2018-05-15 21:52:38.966823295 +0200
+@@ -104,18 +104,18 @@
+ 
+ 
+ install: $(PROGRAMS)
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(top_srcdir)/mkinstalldirs $(sbindir)
+-	$(top_srcdir)/mkinstalldirs $(sysconfdir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+ 	list='$(PROGRAMS_SBIN)'; \
+ 	for prog in $$list; do \
+-	  $(INSTALL_PROGRAM) $$prog $(sbindir)/ ; \
++	  $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(sbindir)/ ; \
+ 	done
+ 	list='$(PROGRAMS_BIN)'; \
+ 	for prog in $$list; do \
+-	  $(INSTALL_PROGRAM) $$prog $(bindir)/ ; \
++	  $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir)/ ; \
+ 	done
+-	$(INSTALL_DATA) examples/serdispd.cfg $(sysconfdir)/
++	$(INSTALL_DATA) examples/serdispd.cfg $(DESTDIR)$(sysconfdir)/
+ 
+ 
+ uninstall:
+--- a/src/Makefile.in	2017-02-02 13:37:48.000000000 +0100
++++ b/src/Makefile.in	2018-05-15 21:52:56.268823229 +0200
+@@ -199,20 +199,20 @@
+ 	/bin/rm -f Makefile
+ 
+ install: $(LIB_DIR)/$(LIB_SHARED) $(LIB_DIR)/$(LIB_STATIC)
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(top_srcdir)/mkinstalldirs $(libdir)
+-	$(top_srcdir)/mkinstalldirs $(includedir)
+-	$(top_srcdir)/mkinstalldirs $(includedir)/serdisplib
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)/serdisplib
+ 	
+-	$(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)/
+-	$(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(libdir)/
+-	$(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(libdir)/
++	$(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)/
++	$(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(DESTDIR)$(libdir)/
++	$(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(DESTDIR)$(libdir)/
+ 	list='$(LIB_HEADERFILES)'; \
+ 	for headerfile in $$list; do \
+-	  $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(includedir)/serdisplib/ ; \
++	  $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(DESTDIR)$(includedir)/serdisplib/ ; \
+ 	done
+-	cd $(libdir) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
+-	cd $(libdir) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
++	cd $(DESTDIR)$(libdir) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
++	cd $(DESTDIR)$(libdir) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
+ 
+ uninstall:
+ 	-/bin/rm -f $(libdir)/libserdisp*
+--- a/tools/Makefile.in	2014-03-30 09:13:59.000000000 +0200
++++ b/tools/Makefile.in	2018-05-15 21:53:01.042823211 +0200
+@@ -155,7 +155,7 @@
+ install: $(PROGRAMS)
+ 	list='$(PROGRAMS)'; \
+ 	for prog in $$list; do \
+-	  $(INSTALL_PROGRAM) $$prog $(bindir)/ ; \
++	  $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir)/ ; \
+ 	done
+ 
+ uninstall: $(PROGRAMS)
diff --git a/dev-libs/serdisplib/metadata.xml b/dev-libs/serdisplib/metadata.xml
index a117a1166efe..74d9cf8a6041 100644
--- a/dev-libs/serdisplib/metadata.xml
+++ b/dev-libs/serdisplib/metadata.xml
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Library to drive displays with built-in controllers connected to
-		a parallel port (and serial port for i2c-displays).
-	</longdescription>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
+		<bugs-to>https://sourceforge.net/p/serdisplib/bugs/</bugs-to>
 		<remote-id type="sourceforge">serdisplib</remote-id>
 	</upstream>
+	<longdescription>
+		Serdisplib is a library to drive serial displays with built-in controllers,
+		parallel driven displays and USB driven displays. OLED displays are also supported.
+	</longdescription>
+	<use>
+		<flag name="tools">Build optional tools.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/serdisplib/serdisplib-2.01.ebuild b/dev-libs/serdisplib/serdisplib-2.01.ebuild
new file mode 100644
index 000000000000..85de825917ea
--- /dev/null
+++ b/dev-libs/serdisplib/serdisplib-2.01.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit udev
+
+DESCRIPTION="Library to drive several displays with built-in controllers or display modules"
+HOMEPAGE="http://serdisplib.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="threads tools"
+
+# Define the list of valid lcd devices.
+IUSE_LCD_DEVICES=( acoolsdcm ddusbt directgfx displaylink framebuffer glcd2usb
+	goldelox i2c ks0108 l4m lc7981 lh155 nokcol pcd8544
+	remote rs232 sed133x sed153x sed156x ssdoled stv8105 t6963 )
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+IUSE+=" $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) "
+REQUIRED_USE+="|| ( $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) ) "
+
+# Specific drivers will need some features to be enabled
+RDEPEND="media-libs/gd[jpeg,png,tiff]
+	lcd_devices_acoolsdcm? ( virtual/libusb:1= )
+	lcd_devices_directgfx? ( media-libs/libsdl )
+	lcd_devices_displaylink? ( x11-libs/libdlo )
+	lcd_devices_glcd2usb? ( virtual/libusb:1= )"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( "AUTHORS" "BUGS" "DOCS" "HISTORY" "PINOUTS" "README" "TODO" )
+
+PATCHES=( "${FILESDIR}/use-destdir.patch" "${FILESDIR}/disable-static-build.patch" )
+
+src_prepare() {
+	default
+
+	# Fix Makefile, as it will fail, when USE="tools" is not set
+	if ! use tools; then
+		sed -i -e '/$(INSTALL_PROGRAM) $(PROGRAMS)/d' src/Makefile.in || die
+	fi
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e '/@LDFLAGS@/d' serdisplib.pc.in || die
+}
+
+src_configure() {
+	# Enable all users enabled lcd devices
+	local myeconfargs_lcd_devices
+	for lcd_device in ${IUSE_LCD_DEVICES[@]}; do
+		if use lcd_devices_${lcd_device}; then
+			myeconfargs_lcd_devices+=",${lcd_device}"
+		fi
+	done
+
+	local use_usb="--disable-libusb"
+	if use lcd_devices_acoolsdcm || use lcd_devices_glcd2usb; then
+		use_usb="--enable-libusb"
+	fi
+
+	local myeconfargs=(
+		$(use_enable lcd_devices_directgfx libSDL)
+		$(use_enable lcd_devices_displaylink deprecated)
+		$(use_enable lcd_devices_displaylink libdlo)
+		$(use_enable lcd_devices_remote experimental)
+		$(use_enable threads pthread)
+		$(use_enable tools)
+		${use_usb}
+		--disable-dynloading
+		--disable-statictools
+		--with-drivers="${myeconfargs_lcd_devices#,}"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	udev_dorules 90-libserdisp.rules
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index 10b18329d3f1..1a5c02c9ef3d 100644
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -1,6 +1,8 @@
 AUX Makefile-3 1054 BLAKE2B 30f94d5ec66a4ab11703c53caccec0ac34a034686dddab9595d9ca2892fbf68b603035f6b80c1d47219c7ca6aeff43830a4096ec1d36fc8d00c19468cf59c1a6 SHA512 81b05e25341095444d0112fe58840d334a14f754cdc0e907b468484655008de026a4b96947de98d009a4a54d84af121ee0a663075fe0ad727894d3aa432426e2
 AUX tinyxml-2.6.1-entity.patch 1776 BLAKE2B e8430b2fea965f351c12a0413c3bba43ce19da7e8a0973fae3c7db4b4a8978cbc8b74beb495dd9141e79e90f9ad012b6b5e738207f8075ad7001cb85b424f5be SHA512 e03f4bdfb80354c6d262abb40e6c105cb2d37530e2f1f1d865ff4fd8434320a26957fbc2379db8af1bd18cd3c8662e064e79525831a5fb9fcb4aff46f3eb0809
 AUX tinyxml-2.6.2-defineSTL.patch 353 BLAKE2B e9a3d63283f7946e04dafa58a7eeda782b02d6d6093bae18fdec727b9e6c6722a4c610230cc43ea8142695f3a0aaa1e9bf11a8f0072ad580acb5428655a3d6e8 SHA512 52cd82ef9e8f1783b3d6042551342a8c592c447e1da352d5d017db4211144bc0a908ddbfe2a4641b3108fb8e02dc47f385a851f920532d94178314255904a6ef
+AUX tinyxml.pc.patch 383 BLAKE2B 7f13d388d80605a9576ca6c6dca263d9d1afe87026801f4a5d1db9b341b8bc763c66dfdfef924ce388b30fc453b143f01019ba676f66805fb11270c54d19ecfb SHA512 e423baf55f488fe4788234b8b19819520db3f9a43e677c34dd0bb9250c187c349b796a5c2749b5bee35d468b8676ccc8db7eab8a1094c36f65f63e128572b860
 DIST tinyxml_2_6_2.tar.gz 210124 BLAKE2B 84d4ad0174eb38583a4488523410105928b9797f09a2ef84b41156580a40cc11d1d09e28e67512494bd02d7a7e0b208aa6c1ce3383bec12de606491214c16a77 SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
 EBUILD tinyxml-2.6.2-r2.ebuild 1267 BLAKE2B 7e59ba9d1424815a07c4c8827c0a6c06143c574957c667d9f8f8d29fbb19a595086876f0ce246fc3dac8fdf36172de52ff2a12ad8ab6576e437ad19a0c0ab6b6 SHA512 515396ca0b136a79786eca7620cfaa912a9cfb60a582837c695bdee8868bdd85825000fca0a6d087b9f3f7f8cbbd4d7b84e69779ac6baf36f85723749deb98c6
+EBUILD tinyxml-2.6.2-r3.ebuild 1505 BLAKE2B b2359f773ed5bbb2e0dac14404f36af326db8b74a5042ede4ad0e68c2738f7b3a5ba3db54c5505955218f3a75c67807279fac4887c34d77ef6b3df33ea5a99bd SHA512 c3dce5fd38d775ea8aa30ed28a18f5c894b3bdff6d123a046660fe95f4b3ffc855587ace4b814cccb9eb4e6c75f1e015689c863f67c09bbb5dc029af102a305f
 MISC metadata.xml 405 BLAKE2B 3df8b80574d2d5d42ee82fc2056f99d03fdd76190bc4fce6318a7b4ce79765c8c518f34b78181c0252de98dd587f6a48e745f1c094bd20f167a2667c8e64187f SHA512 b11af65ea7f12e4840154047ded852f3a393fecdca6c247d2eee83330a1ca834d210cb5d55db1601534c13a391321b82311fb9d5b288326beacdce2ad743ebb2
diff --git a/dev-libs/tinyxml/files/tinyxml.pc.patch b/dev-libs/tinyxml/files/tinyxml.pc.patch
new file mode 100644
index 000000000000..74cb8042b491
--- /dev/null
+++ b/dev-libs/tinyxml/files/tinyxml.pc.patch
@@ -0,0 +1,14 @@
+diff -Naur old/tinyxml.pc new/tinyxml.pc
+--- /dev/null	1970-01-01 03:00:00.000000000 +0300
++++ tinyxml.pc	2018-05-07 01:46:25.000000000 +0300
+@@ -0,0 +1,10 @@
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: TinyXml
++Description: simple, small, C++ XML parser
++Version: 2.6.2
++Libs: -L${libdir} -ltinyxml
++Cflags: -I${includedir}
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
new file mode 100644
index 000000000000..b355cbf7af3b
--- /dev/null
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs eutils multilib versionator
+
+DESCRIPTION="Simple and small C++ XML parser"
+HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x86-macos"
+IUSE="debug doc static-libs +stl"
+
+RDEPEND=""
+DEPEND="doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	local major_v=$(get_major_version)
+	local minor_v=$(get_version_component_range 2-3)
+
+	sed -e "s:@MAJOR_V@:$major_v:" \
+	    -e "s:@MINOR_V@:$minor_v:" \
+		"${FILESDIR}"/Makefile-3 > Makefile || die
+
+	epatch "${FILESDIR}"/${PN}-2.6.1-entity.patch
+	epatch "${FILESDIR}"/${PN}.pc.patch
+
+	use debug && append-cppflags -DDEBUG
+	use stl && epatch "${FILESDIR}"/${P}-defineSTL.patch
+
+	if use stl; then
+		sed -e "s/Cflags: -I\${includedir}/Cflags: -I\${includedir} -DTIXML_USE_STL=YES/g" -i tinyxml.pc || die
+	fi
+
+	if ! use static-libs; then
+		sed -e "/^all:/s/\$(name).a //" -i Makefile || die
+	fi
+
+	tc-export AR CXX RANLIB
+
+	[[ ${CHOST} == *-darwin* ]] && export LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+	eapply_user
+}
+
+src_install() {
+	dolib.so *$(get_libname)*
+
+	insinto /usr/include
+	doins *.h
+
+	insinto /usr/share/pkgconfig
+	doins tinyxml.pc
+
+	dodoc {changes,readme}.txt
+
+	use doc && dohtml -r docs/*
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-05-17 22:49:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-05-17 22:49:47 +0100
commit	30c53e395853f5bfe805a1e429fcf26666eed8f8 (patch)
tree	a0670eaf9babda7b83503f7d36806a944bb49752 /dev-libs
parent	d302a5d7fc9caafba5c8a404f2891bb6ccdec311 (diff)