gentoo resync : 03.11.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-11-03 08:36:22 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-11-03 08:36:22 +0000
commit: f65628136faa35d0c4d3b5e7332275c7b35fcd96 (patch)
tree: 021998302365c5652e37824b6c26d4d969a62055 /dev-libs
parent: 70b82ae359a5538711e103b0e8dfb92654296644 (diff)
90 files changed, 1606 insertions, 737 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ec69b97f647f..2d6a83386a54 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/ace/Manifest b/dev-libs/ace/Manifest
index 77a8ebd82014..1f38ccccd367 100644
--- a/dev-libs/ace/Manifest
+++ b/dev-libs/ace/Manifest
@@ -4,6 +4,6 @@ DIST ACE+TAO-5.7.2.tar.bz2 26111373 BLAKE2B 85a50a8db3ec8c6b37ecb26720550dc18c01
 DIST ACE+TAO-5.8.3.tar.bz2 21366503 BLAKE2B 61819eaf6c7208fe8ca646853bf4d2f86ec4637d059b3d3220344eab1c26b887f0a4a7dac5a587f56d2661dd93f70a7410b23bba76d240a615418b7c8360772c SHA512 9474251a0dff0659cf0951ad7ef48bf98503e6aa293121fecaaa6d4eba665dc557b17d004f4a589b13a45bccf9ddba893fc9ea454b257c7117d8747bbc04c886
 DIST ACE-5.7.2.tar.bz2 9724175 BLAKE2B 9338bf66a13187ee1040ba41489da83e4272d9b45d805b5f67529be85cb37c353b4a6a561444266511a2b8fb99da63dc74c1aced15ac9cf4b48432779dc5c716 SHA512 7f5d77ea9ab1f03ad615cf6b01cb75b0484c5e828790609b8492463153a34c62d974000c0f3952dfdab143cad3c0aa6e2ddc7ea089989b6e9b9797bc6430d38b
 DIST ACE-5.8.3.tar.bz2 8956345 BLAKE2B 81b01b223a0d232ad42df12cc3eddd869abf720788b517b2f898846259127ee0e8ab4026f127c9118142c82d7f4698d61b61d18c6c98632da397f5d3762e2210 SHA512 3b1e0dfdd59dacbfd987499653e42ad41273de28bb5e920105b897567eed96f6e1b09a03c7f342277c2cf82231426b2bee4ed76ad98fec05e0fe589c9d86c469
-EBUILD ace-5.7.2.ebuild 2457 BLAKE2B 0da976b623d31de4e0a0d88c5a385895b2411431065fefe1293074dbc626f848f53ff441e3a2e995588f894fbdb34f4292da14bd9394ad085a86fdcf7baa8e3e SHA512 c599d50a8dafb5fca828113cac18241a891fffe2994932ccdb74f03484b4ca64aea77edffeaa5b3fafba7df064a23bbd01fd32fe4524e8eaa61ba33b2497c838
-EBUILD ace-5.8.3.ebuild 2433 BLAKE2B ff0a207173d8c0dc9d5d003df5734a5d3a4051ca5aff0da5f6ba076d91a788db9498f6c0ec14a6053c1cf4961cc40ac0306b4da328cd9eef211aea8384ba2a58 SHA512 d67761f1bcc7cf5dff30d4c8d39913cdb3f1ec424d201f5b2a6457e7441b03e16a3650bbb18651a1b08bb1f05564800b8ed7accd5a699011d5dc7c7b272f2fd6
+EBUILD ace-5.7.2.ebuild 2463 BLAKE2B 11ccc979c270d9eec37fd49ca521d82b6e49991946fe1d85b5bed77c1a3500dcd542763824ebfdcb10b33ab91e53571aa2629174cbddce5fe51a42a85dc2cafd SHA512 e231fa4cdad81f282cff9c406fb6a36919a4e4ef598cefb7d2268ba56c67f7bb1c66ac526afa024d55288eb8b47c969febd1eb1cd4878b3803ede560b59973dd
+EBUILD ace-5.8.3.ebuild 2439 BLAKE2B fb8bbd6262a0c8e35fff6e34eb9ef74308e0429da7cb55f6cf8a8714fb827f7926a4b75b28a3511f8de18b8548510f73680157dbc7d13a0d23d928901c9e37d0 SHA512 95e6875eec96e69a46f759c242ced39ef711d2fd5186591084f1539471f2a269274c249507312104bad4f69332ca4562445faf62b43c60bd259833a3a27edc4d
 MISC metadata.xml 450 BLAKE2B e4e2693d417d61efacc6b62538b49c1e77a2ec101945bf04bcf0e7eefc36001c6c05f01c15af12d8a550d9bd0b855da90da4374e8f6c0d0c8fec60528e64cd69 SHA512 a1f66a959567a84d6440486b368e9b727eb7e7b3ece31c8b8ae6c54bba822da453bce3f2ab0f50f1efc962fd4a443ba0889ca75af6d077636864d72bf0a0ec05
diff --git a/dev-libs/ace/ace-5.7.2.ebuild b/dev-libs/ace/ace-5.7.2.ebuild
index 9eef7e48a630..f665b6787f51 100644
--- a/dev-libs/ace/ace-5.7.2.ebuild
+++ b/dev-libs/ace/ace-5.7.2.ebuild
@@ -6,7 +6,7 @@ EAPI=0
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="The Adaptive Communications Environment"
-HOMEPAGE="http://www.cs.wustl.edu/~schmidt/ACE.html"
+HOMEPAGE="http://www.dre.vanderbilt.edu/~schmidt/ACE.html"
 SRC_URI="!tao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE-${PV}.tar.bz2 )
 	tao? (
 		!ciao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-${PV}.tar.bz2 )
diff --git a/dev-libs/ace/ace-5.8.3.ebuild b/dev-libs/ace/ace-5.8.3.ebuild
index 295e81552a44..88a0d31621fc 100644
--- a/dev-libs/ace/ace-5.8.3.ebuild
+++ b/dev-libs/ace/ace-5.8.3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="The Adaptive Communications Environment"
-HOMEPAGE="http://www.cs.wustl.edu/~schmidt/ACE.html"
+HOMEPAGE="http://www.dre.vanderbilt.edu/~schmidt/ACE.html"
 SRC_URI="!tao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE-${PV}.tar.bz2 )
 	tao? (
 		!ciao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-${PV}.tar.bz2 )
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index ab07b97a9a15..1cf072733544 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -6,4 +6,5 @@ AUX beecrypt-4.2.1-icu-61.patch 1348 BLAKE2B 7412a407e6da0349913733590c1fe650af6
 DIST beecrypt-4.2.1.tar.gz 882758 BLAKE2B 7ca25613cf95df8657c762d932618979783ea2ddfbaecdf066701d61a5f9ac76bd474a51eb65e140c83ef01880477cb7104e3d67c2fc078ae7b710637d18bb53 SHA512 59995d53c024efe6344a21ac0d6d55fbe652488a4a22cc6719f9fc3851d56697fa8738937d48aa1e6f9ebe749de61ac3c79a5f0cea793872213c3bdf922e71bc
 EBUILD beecrypt-4.2.1-r4.ebuild 2227 BLAKE2B f66a1cb5bea84db49c4bfb3928526e6d7927ac57ce04a0a525e8d75c8b49989d03e96e7e8be7c272af07adf8595635c142d4210fc1ec9f7e4f93e643b6c8d872 SHA512 bc49a21bada431dbfcd5be9233602d7c0feda3585c8a10887dfffcca99f781a5b6a1749b583b479360022ce20838282c47932643ba1816d0308c3de5698ca78f
 EBUILD beecrypt-4.2.1-r5.ebuild 2259 BLAKE2B 0e7149000256b0d7a64ed5192c6dcc7bfbd9ea675d7547c68bdf013faf12ce02dadbc6125da1516aa94b43da20a9885e85ffc4d7bf59d65995ab7e679f83a8bb SHA512 79065b8d809de043f36e326657536df01bf39d239f8d9551706511324ecc337f59544ba98b1acb25fd7a9a4eeb632754f41e72c5049c1e23b3da8a63da8c30fc
+EBUILD beecrypt-4.2.1-r6.ebuild 2468 BLAKE2B 63cb3711ef43f45554f3a74f87511e6bdd590bb780c168c1f1cdfb0268712287b9a055bceed2192b14e976c9ce8f5f29305339c29eef51da9fe0125edd42a473 SHA512 35675e39d39cd18bb11932e7c985ae5d8a40f29999f8ee4293e47560bb4d7d68a13962fe30eb4395cae30768f002bf97665ebf691dfde7deff9c157da4a0c1ff
 MISC metadata.xml 245 BLAKE2B a937157650e974ab296da9c19930deffad940d0c256541ea0338121f36fde942eb41529c5f3f39d37fdd3fe6e30eb8e9b987a0cb5c2b7736ff837c2e332ddf95 SHA512 7da531ddd382748b46b2be3d6324c0f654e772ca0d1b87884a5de0ae1f4cf8a6e32d9cd0e4b87b7fd632aa176f873d7e315adbb974c367b4539045fdeffde98b
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild
new file mode 100644
index 000000000000..7ec1630ce8c2
--- /dev/null
+++ b/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="General-purpose cryptography library"
+HOMEPAGE="https://sourceforge.net/projects/beecrypt/"
+SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+threads java cxx python static-libs doc"
+REQUIRED_USE="cxx? ( threads )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="!<app-arch/rpm-4.2.1
+	cxx? ( >=dev-libs/icu-6.1:= )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.4 )
+	doc? ( app-doc/doxygen
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+	)"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.4 )"
+
+DOCS=( BUGS README BENCHMARKS NEWS )
+PATCHES=(
+	"${FILESDIR}"/${P}-build-system.patch
+	"${FILESDIR}"/${P}-gcc-4.7.patch
+
+	# Fixes bug 596904
+	"${FILESDIR}"/${P}-c++11-allow-throw-in-destructors.patch
+	"${FILESDIR}"/${P}-cast-uchar.patch #618676
+
+	"${FILESDIR}"/${P}-icu-61.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# ICU needs char16_t support now
+	# bug 649548
+	append-cxxflags -std=c++14
+
+	# Crudely disable amd64 assembly code
+	# as it assumes 64-bit 'unsinged long' size. bug #461960
+	local x32_hack=()
+	use amd64 && [[ ${ABI} == "x32" ]] && x32_hack=(--enable-debug)
+
+	# cplusplus needs threads support
+	ac_cv_java_include=$(use java && java-pkg_get-jni-cflags) \
+	econf \
+		--disable-expert-mode \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_with python python "${PYTHON}") \
+		$(use_with cxx cplusplus) \
+		$(use_with java) \
+		"${x32_hack[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		pushd include/beecrypt >/dev/null || die
+		doxygen || die "doxygen failed"
+		popd >/dev/null || die
+		HTML_DOCS=( docs/html/*.{css,html,js,png} )
+	fi
+}
+
+src_test() {
+	export BEECRYPT_CONF_FILE="${T}/beecrypt-test.conf"
+	echo "provider.1=${S}/c++/provider/.libs/base.so" > "${BEECRYPT_CONF_FILE}" || die
+	emake check bench
+}
+
+src_install() {
+	default
+
+	if use python; then
+		rm -f "${D%/}$(python_get_sitedir)"/_bc.*a || die
+	fi
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-libs/cgilib/Manifest b/dev-libs/cgilib/Manifest
index 09e82c38e72e..323525f2b71e 100644
--- a/dev-libs/cgilib/Manifest
+++ b/dev-libs/cgilib/Manifest
@@ -1,3 +1,4 @@
 DIST cgilib-0.7.tar.gz 268783 BLAKE2B 525487df43b9a936af8e32aa1e9b979bb93197cee7d7eb730e31d756201bab441e46d21b05b2c9e92a518fe761d7e6a643545160587e462b604780d52a88c261 SHA512 9feaa6c18e0c8ebbffa2682c07e584ab4970e0b98b61507ba67b83c920d9ba9012244fa96c95ab71121728b9945269683a2eef274cd56660576ae9b055861c83
+EBUILD cgilib-0.7-r1.ebuild 588 BLAKE2B fe19edfcf36eafe85d42d916b8649c751c8adf4e3e69018e78f7b1e99e27273364dfe01b4635e90697e7f7a3d369b8272c7890668bac9c3a4a0a9df77b985fe8 SHA512 2bb945ce8f7c64044a81d4008a90c5a6968127b6712e2ace17d2e45f9db4c7d4705205f0f963f2af2e9b2c117a6d91bdd805ad1b1d52cca89ce255106b02e716
 EBUILD cgilib-0.7.ebuild 582 BLAKE2B fd601c877a2eb64c4bf996c290b3b31529c658bd91e73f99bbd022663385af170f1f413c35d9921f3ebb5a928dd3f82286d051e498a74b6f899cef66ebd60bb6 SHA512 c056ce8d29e102cabaabb07c4c9a03aee93583d7be137250c2013c4c34b350d06f9081bcaa826881eb3e342c2c962b1e42ea33cb7f98a384189661098e4b8955
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/dev-libs/cgilib/cgilib-0.7-r1.ebuild b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
new file mode 100644
index 000000000000..1f29dddb4b3d
--- /dev/null
+++ b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A simple and lightweight interface to the CGI for C and C++ programs"
+HOMEPAGE="http://www.infodrom.org/projects/cgilib/"
+SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+DOCS=( AUTHORS ChangeLog README cookies.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
diff --git a/dev-libs/g-wrap/Manifest b/dev-libs/g-wrap/Manifest
index 238f5dc245b9..041dcfd73a51 100644
--- a/dev-libs/g-wrap/Manifest
+++ b/dev-libs/g-wrap/Manifest
@@ -1,9 +1,7 @@
-DIST g-wrap-1.9.11.tar.gz 625359 BLAKE2B 10a48ef14dd2e7917eb12025b7ad61cb5161da7578a08271e62effaa59cf31164fb23f28caf4ac3db501819181741e947aafbdf1329e6f2132ae3029a5c50dfc SHA512 3574658d4c5b52ddf350e499fdf009baa48a8cefaccb20c705eb7b2bda556db8f662fe75c78d76e927b0a0dc5757eec2af8b72f315d3655a35f7f7766ff89e65
 DIST g-wrap-1.9.13.tar.gz 613577 BLAKE2B 7b91a92e28c5f0757a1de95f7c6324653abfadad69737f96766dcf208d6366e3d525a40e07dde3e5b42a00eeead2a676fef5807281e0ecef564706a3820f6b7e SHA512 56001aa877f706eda5f40ac2d06f7214b52aa3d46a1c5cc64c1d195d3e3d619a0d8dac50dabc5b73453784351512e1e35ed53bc44151a61c4b8a9f6e851f6264
 DIST g-wrap-1.9.14.tar.gz 655812 BLAKE2B c4b937d156b0677e597120ec250537b9667242d0359b41a5e184f226c3cfc0086be9e35e265b02e857fb8e0074642aa93588352a07a10d1df95c55a70bbced5a SHA512 681d85caf24335db9f266e8350488d36c2b20a5ec02346189c866c7c1de9bcd4a942f092827cbf5fc30474dff70064abe8139069752a6d82657e51542000194b
 DIST g-wrap-1.9.15.tar.gz 701601 BLAKE2B 510264580a01c715a6f73647291debb4f4cdda473e394a9da2db7b8e458f620fa2433a4c911a3640c43e314e389e57c6b365bc5c4eae0e0db67ff04511bd8887 SHA512 599d7e5bda7a4fe8a74729a9cac29c8fe34eed4568d1ddcea778035c6695738e8ce545f84142c5876421db58a108347c1a860b9187c36d1af9b272c4219ae2ca
-EBUILD g-wrap-1.9.11.ebuild 957 BLAKE2B 8e77d2f72e4a7857fde7e176ecb701db8aa2c593e48bd717400f091fbdd0d8879192dbfff08b5d7474a66b04576a7dcde61cf374852e7dce13e1f60be0ac00a1 SHA512 fd29df48ca86a3108f66196d6e9044edadaa46cddfc2323df695390b83e2afe19670dd43294a7fb850ac02d0b67603f7e4b9482e4a3d45e9a9379b713eae3d1f
-EBUILD g-wrap-1.9.13.ebuild 634 BLAKE2B b064c8ef18e64246e229e46ce2f93078de09e442ce18cd1ba457ba9894c4734f73ffbb74bec38bb2f9e72a77ddc347b5b7d44604e04ae3a02c44c771abf26022 SHA512 31ee903cf5deccd4af92553aa346c54992922b02fdc79c09b6b838291dd5e1ed3d8855874ba90ac119b6b802ba57826dde8a80b52a3c2ecbc4b71619bf0d8920
-EBUILD g-wrap-1.9.14.ebuild 703 BLAKE2B feeda63bf344ac47aaa1920ae60c707f4e355042061aa15e9e84253518f89e24b95647d0ecec4c19331b2206c7add311d86debe51f12736c252fbc5501873e67 SHA512 760cc18f2b5afc0801191033580c4f9fb381ca8a79598e90590ba44f84f7f401fa87ff9bef37db4dd021615ec867cf3063f46b4128a5527cd13c7df97ed2665c
+EBUILD g-wrap-1.9.13.ebuild 635 BLAKE2B 97add4ccb66616f3bfbc24db7ebb83b49a64aaba5195bc6c8e531b6dd4ac0afb226d065f0dfa6e63e9c70e4de2a1abd7ede505c445238e497d47d6519ac9a884 SHA512 ecaea1e53331e876ab0c05252f383237368407e91e0cfa9ac6b4a28d38bf3afb3842cf1e4ffaaca5045b0f061d4ca9511d0a1ea6e3a00c0a00364f81922833f8
+EBUILD g-wrap-1.9.14.ebuild 704 BLAKE2B 87fe1a988aa9a5a766685488827aec3ebf2eb41ba9628c64eef167df4f418e55d805bcd71ab2c66ff3f4b82ef0ff6dda5f1e3a5f53ea2caba2595954435b3827 SHA512 2055c752cd0dd25a64e27651c87b3bb8123b9e30341c471f87d63de5925c0c70a63527e9379ad1da87c8cb52c62d6b1ada94f5d502bab2da2af0f07e20b4b8db
 EBUILD g-wrap-1.9.15.ebuild 694 BLAKE2B 9141ea71e2198b67f0b821d0c8a8410d6b45c334695304a2ee13850b73f40a3d129aa989e4d828a85cc662978049fdf1c290598dc46ac4a243a35c50e06b624e SHA512 150a292363d211b625c10eaa0b74a3d0938989bcdbbcc08cc7034f867258a9e89b94fd15db1701ac38b6d1242064b94b0ca64d8f5c515fe7c8956b74c6a78de1
 MISC metadata.xml 470 BLAKE2B d84738809f2d8a2999a9e9d22b342885cc9d55ff1328ff15720eb5a7887d03d64ef170db8723a8a080c738cac5495a4a396bf56c0288e021414affacf1c7195a SHA512 1a0ed70c7e3de5204dfbc75a6c470e0b833973b8b0922ce679ee4b4d5cd5c208f6e48f815d66b2d086e3ae9c9258c306c2480afe00c227b27e6f892362cc1c48
diff --git a/dev-libs/g-wrap/g-wrap-1.9.11.ebuild b/dev-libs/g-wrap/g-wrap-1.9.11.ebuild
deleted file mode 100644
index 571b1a538804..000000000000
--- a/dev-libs/g-wrap/g-wrap-1.9.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A tool for exporting C libraries into Scheme"
-HOMEPAGE="http://www.nongnu.org/g-wrap/"
-SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/${P}.tar.gz"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-# guile-lib for srfi-34, srfi-35
-RDEPEND="
-	dev-libs/glib:2
-	dev-scheme/guile-lib
-	dev-scheme/guile[deprecated]
-	virtual/libffi"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-#	cp guile/g-wrap-2.0-guile.pc.in guile/g-wrap-2.0-guile.pc.in.old
-
-	sed "s:@LIBFFI_CFLAGS_INSTALLED@:@LIBFFI_CFLAGS@:g" -i guile/g-wrap-2.0-guile.pc.in || die
-	sed "s:@LIBFFI_LIBS_INSTALLED@:@LIBFFI_LIBS@:g" -i guile/g-wrap-2.0-guile.pc.in || die
-
-#	diff -u guile/g-wrap-2.0-guile.pc.in.old guile/g-wrap-2.0-guile.pc.in
-}
-
-src_configure() {
-	econf --with-glib --disable-Werror
-}
diff --git a/dev-libs/g-wrap/g-wrap-1.9.13.ebuild b/dev-libs/g-wrap/g-wrap-1.9.13.ebuild
index c843ccce7a30..e204a071fc99 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.13.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -7,7 +7,7 @@ inherit eutils
 
 DESCRIPTION="A tool for exporting C libraries into Scheme"
 HOMEPAGE="http://www.nongnu.org/g-wrap/"
-SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/${P}.tar.gz"
+SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/old/${P}.tar.gz"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/dev-libs/g-wrap/g-wrap-1.9.14.ebuild b/dev-libs/g-wrap/g-wrap-1.9.14.ebuild
index 0ae727652962..189c24d4a7ca 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.14.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -7,7 +7,7 @@ inherit autotools-utils
 
 DESCRIPTION="A tool for exporting C libraries into Scheme"
 HOMEPAGE="http://www.nongnu.org/g-wrap/"
-SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/${P}.tar.gz"
+SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/old/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/dev-libs/gost-engine/Manifest b/dev-libs/gost-engine/Manifest
index 50fcd512246b..4c8ea9231207 100644
--- a/dev-libs/gost-engine/Manifest
+++ b/dev-libs/gost-engine/Manifest
@@ -1,2 +1,2 @@
-EBUILD gost-engine-9999.ebuild 669 BLAKE2B ae0d1bfdd19a6c6f0c2ed395fd46d7aa6c59ce131993a3a0b8cbdf6d8ab7d16aa6336db1b7e6bc863c4ac02c06f62dfebde43be9c7d6ecc488a8160bc355455c SHA512 3f861aaf80855beeeac4d773bbaac7091b7a4932d3edb4c68d02048387bae59a4f0344e061546664a7c39ec3b9c75c7ca4dee11eb1ff5503b7552049b08c7328
+EBUILD gost-engine-9999.ebuild 794 BLAKE2B e6553e9b9eba78c1eb645f92441b914a793211a2a3b85963efc1ae1a2296fb5b9af5f51b6bf1a4f7c6c8ebf41d5c81163be66350e4857686dbde74ceba7a2f33 SHA512 65d132bcc08af5a75968184d38cded64315556bcf5dca9f659bc5b95b983ddd46461abac215e4a602c94f18acb64135a663d28d1708de42ca1967d5abf7900d4
 MISC metadata.xml 464 BLAKE2B 9c303e26fd69fa53be0d278f86502ced45a06a8e07a14a954ec999445f774f606e6db0a4892b325bc715c1c7062c62a8104ffdbaebfb97bc9b03f5555f0c0b3e SHA512 0b13e24bbe8d4d629a886000eee238df48d31fdc697e6ae86fc1b4d71284799f3a714df10ddee243139479a632eedd72e11235760cad0f45d9471637d140891a
diff --git a/dev-libs/gost-engine/gost-engine-9999.ebuild b/dev-libs/gost-engine/gost-engine-9999.ebuild
index 782e02fbd454..424b0bc09f56 100644
--- a/dev-libs/gost-engine/gost-engine-9999.ebuild
+++ b/dev-libs/gost-engine/gost-engine-9999.ebuild
@@ -7,11 +7,17 @@ inherit cmake-utils
 
 DESCRIPTION="A reference implementation of the Russian GOST crypto algorithms for OpenSSL"
 HOMEPAGE="https://github.com/gost-engine/engine"
-
+IUSE="test"
+RESTRICT="!test? ( test )"
 SLOT="0/${PV}"
 
-DEPEND=">=dev-libs/openssl-1.1:0="
-RDEPEND="${DEPEND}"
+COMMON_DEPEND=">=dev-libs/openssl-1.1:0="
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	test? (
+		dev-lang/perl
+	)"
+RDEPEND="${COMMON_DEPEND}"
 
 LICENSE="openssl"
 
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index c549c04e0313..311e27aecd8d 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -3,8 +3,10 @@ DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba
 DIST leatherman-1.4.2.tar.gz 814263 BLAKE2B 5ca8123f264ed0f7843c6fc1b0966c577fb9d12933e5baa375e0beef8ba17afe4388f1e05e1022e392c50e32e159b765531137cf069bd0f5b8baa3626c860949 SHA512 e0cb19605163b68ac5a8fc74e875d856af5e34345f19c38f0db45da7536ec27ba6cf4b4e8c5883ceb9a5978cdc8831181ec89ad4105252366b198af4f3f22bff
 DIST leatherman-1.4.4.tar.gz 814289 BLAKE2B d53ff660e28eaea1c11f95cc70348a2a5883e0dc5ae56482b0afe96e61938e4d15688f8abf9783976443c00b6a69e9037b5080194babb97200e25e2c548b9153 SHA512 a1955a3f7a7fd190f7d85ad07e30dee74b0f4b7ed670a4a9a7613317d2898faf776cbed0c5c7b6da25ddd5099c9638e9abb2aca16aec61c568fc2f8c9789ffe4
 DIST leatherman-1.5.2.tar.gz 814349 BLAKE2B 1bc2d85426683e9f82d31ba9e3b63b4c9185b0bfa5ae832ea252ecbd922b44dfa67b6011145489d5c5809a76011aef8b143f6b705ea0436d914fc0d8ca8091a2 SHA512 9cef854fd7a95c54fcfc2e639e469dfaa4625757ea8aceeb9ac2162bfc89cbcbc1d5e8217af5f1fad4f31d98528475e22157ca6b1046a36e0928074f866ddafd
+DIST leatherman-1.5.3.tar.gz 814340 BLAKE2B 7dec42f1a62511a4f63ca197212f3b81f5baa862b0a7f825c2caa7e9af6bdd15e7b5aad39649d7e5dbb6bd62df19895bbf851421f9aa2795ced785c2e28bcdcf SHA512 e2616a42c6879755f338f9f0291bf28c7465d51caa3326be521ae3e0d5d79e82099c8720dc19223ad9112cde81c4579faf28a2b467f802baefc99dd59212b818
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
 EBUILD leatherman-1.4.2.ebuild 1151 BLAKE2B 8cde9882d7506f59fc13ebd6395efbdf8ebaf413eb17edff53b790f24394a6f68620ac39b9a4eb61c107cd8b898462fd603107764c805de52e24227e205a9dd1 SHA512 49c05ce146a7e89f9b18a856a96d8864f98a2e7dfde2818029c61c15da2b73409c44d5eb7d56015e6d32d9b21bff96176021a22937a3f768174e68a0d55dc04e
 EBUILD leatherman-1.4.4.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
 EBUILD leatherman-1.5.2.ebuild 1150 BLAKE2B 57977d3e1690caf8fd64c78e9c765e5bbe8f8d21faf82a53994a70a89d9f9667adfd8850784029b151b158dc8391edc97e6e875543bd43eeba0165ac717c100f SHA512 5c3e73bcbfdbc1f334b38ede1855e673e9d403c00b5352522844c7b25644212f31c1bf9d1e40e103d197b08a008f90c378acc9eabe90815309c5c19b0b57c160
+EBUILD leatherman-1.5.3.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.5.3.ebuild b/dev-libs/leatherman/leatherman-1.5.3.ebuild
new file mode 100644
index 000000000000..cc7a76208a23
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.5.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/${PV}"
+
+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
+	)
+	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/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index 4fe704be81f2..3cca89901f6e 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -2,5 +2,5 @@ AUX libappindicator-12.10.0-conditional-py-bindings.patch 2019 BLAKE2B a57b1b2e3
 AUX libappindicator-12.10.0-vala-inherit.patch 561 BLAKE2B 481ebe7b58af89df6a326b79a65f9ac7110c9d82a61efb993051d691d5cc728075bdd5ac904e9986cb0e41780d3e36e1637e5bd58532781934587b8c1bdf458e SHA512 b021bc0ec7fc1b311add7d6f8a9018fa6f5e807168055c95440e5f5d3d6d5b48375e11542b906058a0786194b1911c8bdcab9632573c1f128772ff6d54aa9173
 DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
 EBUILD libappindicator-12.10.0-r201.ebuild 2230 BLAKE2B c4d8027aca60142ed183ec9248b4ef6f5d4346727c36f69559bd19e77c77fe1a6c4a0045134ee190c2ca31c974fe1ed5a6e4b7161a9afda2c095031d3c66eec2 SHA512 34710e0c796dfc2091eaa98d2e72f6a27bbb5d45a00ed13981e83f892ca9ee3ca867a47faf65cc3a5318c654ae2fe8f13bc40c837862473d0a9e56f9c1998c4c
-EBUILD libappindicator-12.10.0-r301.ebuild 1920 BLAKE2B f83995d9896948c37b25184c21cbe6f708f040d393a1b1586d7e3e7a3b2de56c7307f9f5af25ed7fe4bcb309734af0577a6c5a4ef7eb9c81f36da01f1e0f6a1a SHA512 93dc214df5f47eecca89e5b4ee51f71ed14d09e734305a80b81ab7e08f57c2c42e7e1728f57811fe9adc91bfccfaa29a1b17a2d256ba465dc81b60fa55407666
+EBUILD libappindicator-12.10.0-r301.ebuild 1926 BLAKE2B c94a0c84d9b88b14cfa8c7f6b7b1612eaf00d86e0bb8797f4af3ca33e6b31d04d71544e8c5b20b14146427c750d95697b0414693f5d194f78399d61d188cdd9b SHA512 38fb0806c0327b8f8f4ffda1ccba65999acf36f9cd0a91bff90b47fe9a7d9cd89030560ebf58a49536c22edd3b955f1b04aa7af12442c9562126cdccafdbbdde
 MISC metadata.xml 250 BLAKE2B 8bd202d452582a51ddf3c4bc92840531d0fee0262d112e5fc1173c8fb95a0776efe14ff15613373fd4acab6082ad6f672e278a9b942e072a643b351e8af4d467 SHA512 161da1b732e0f23b06e0732db24f27cb486e7c673e8585d2f6403dc23147b56b5a64dd09978e3dd2db20e9e6a462daf50fe8bc73774d52445d1f6549d82104e0
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
index 7a9ad414002a..03668d4c29df 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 607b749ed757..82db234043a6 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,6 +1,6 @@
 DIST libassuan-2.4.3.tar.bz2 559867 BLAKE2B b80f73573449aa1705ac3b4f12f89cac6a19bf4b2ed8f46d5576164196300baeaeb782c997078ac252a564b9f6067df87a340b46c68058d4a28c8291bbecf96b SHA512 2b0f58682b408fc58fa0ec2980b36e54ba66701bf504cf6c98ec652af43501bc7c18573bc78c5b83260f5a3bdb0ec8f4e0662bafd9bba3fe7287e77598e8e4c1
 DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80445b48aec1366d0b997386c57187f9b7a848973d0930ca8d2be3f138e83c22ef9292e4c8bf5614a99ea3065c7827 SHA512 c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
 EBUILD libassuan-2.4.3-r1.ebuild 1088 BLAKE2B 458d0bc83d786010d8baa61a4a7c195a1c0081ee6e592ca3d29be23aaaccea5497e4927b706eb3ff63a9d07360046e02474c31ca03f8bab94af695db3611faaa SHA512 e37bd3bb1d513367b556210b9a395958f42773f5ecb4252a525717fbaa769c9a0911f6586a920c264ef388c382aad148747166c02e4bf8919c960b16c129638f
-EBUILD libassuan-2.5.1-r1.ebuild 1218 BLAKE2B 6f0705cb8c942e8de261a0ceb7252b8074ecb427451a8be29bd163f4342f5becebfc5332e48c05d2e491c002dfd1d34fa191ae3a809da0a129357ca4c3b0259f SHA512 ab6659c42a059ac9443204f9550ad86667593a29b760614a50f86a001e7d83499701079c85b7f063a555e27d5145e69f175a2fa05926fdba3eecea454d0c3098
+EBUILD libassuan-2.5.1-r1.ebuild 1270 BLAKE2B c7aa9f7ba00f6d3f37bd5666c13d11ba2f07abce6559e6d8759af85cdd8dd764f48765043971b4c2da0512dd0f814f945f6fc876f0147657dbc44f00c9b04fee SHA512 b40b6f117adacd997d147e9f44e8b72221d8cb5cef41583e07e7157c0f9b301bfe084d45a5a969a2e1673c33341a8e7ef51191e2ebd742791fa3d8db7da9f5eb
 EBUILD libassuan-2.5.1.ebuild 1087 BLAKE2B 16d92a4b99e67f950b73ffd544b112833b3da5ec14d7eca14d40651bae83a5b96eee71f751190b4522aaf969fd4fd8df492a85b5cc71baa41d7c284795c84639 SHA512 8d9b67ceaa45c369d93c0fff2a56061d49c056aefe9a67dfee92d508d8bdf323f5651e912480d246964e4a0bb653a22f107d1ee141b3978affccd3798ece6194
 MISC metadata.xml 858 BLAKE2B 2fc69cd4f58f8764d9d43c0b89be8765fe6d8bdab1dc8c0de634899d6ae22702ae1d7cac1b9cd69999fc297dcaa7a7386872cabb63f905558a20f736b500ad5b SHA512 cb46245a5f02ad762cb86bb18ca13fee1e9df22c6e1e367c16c9392680722d4852834c6d4d259d7ca71d817ecac22bda120da75513d6f17d243fd8db062f4303
diff --git a/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild b/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
index f834f0c7a39c..8474c9c7dc66 100644
--- a/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,8 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
-		$(./configure --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
 }
 
 src_install() {
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index cbf217fc6156..f3955b2323df 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,6 @@
 DIST libevdev-1.5.9.tar.xz 408200 BLAKE2B b99974eab572693c9e2a915b21adf2e6c09e26af70011ce661084ac9add51cb6257f36bcfeb89d76c8987cf8724e69b027d30eda17c4457a40f3e047302efa19 SHA512 4496ab4d9dc165f416a574c21a7fcee54ae104c21ef4785a4dd0311fff428020cdbb5da7bf3f835e78dae05effdb1a557d189347f6e62dd6be2d8bcdc845850c
+DIST libevdev-1.6.0.tar.xz 411512 BLAKE2B 0e9190fd4c28b36bcf325953aa634c0d8c604cef7f56e46679fc88351536d78b0bddedbbdfffe4164e0039c7d56ef604b143e23de2c4bb9a66653a03d6844fa9 SHA512 73046da447773716c9f0c9f511f3a0a6ababcf92a146eba363014afcbdb465f4c3cd8be0917f2f01561a72f24f20fe8ecd333467437d9d85c03afcb433d05060
 EBUILD libevdev-1.5.9-r1.ebuild 1056 BLAKE2B 2e4ea381cd4e29845cc5109716cc657ef499329b9d9ddfd9c8b7bf9ab703ae404f2c62fe94c904c31905292f0848adfe51efce67990768dda9f298ce67a62bf4 SHA512 22b4f94635dc0cf44c75c4926d02c1efd3e18e8ae1f533f46faff30d40c3c1d0947518e5783af47d0678401a52fd987c86b0947911877c79c9b08b46655c25fc
-EBUILD libevdev-9999.ebuild 1069 BLAKE2B ce9fc469b63870e17fd86864afe1e18d154b6a2d9bd05e4f3fc71937c45aece02391275d960bece94ce998ba4f40fc7e1b0c73f8fbb1de83bd1e1d84fed19879 SHA512 0fe984fb6a8efe9692532041e9adc37e209d93641e4c4b00693242332610b6f6e6139738ed53ea2014ceef19c5615aac9e2948b3b7e3cc58819f2123a0b22bfa
+EBUILD libevdev-1.6.0.ebuild 1066 BLAKE2B 204149dd3eea3aa65af01c1d9af0621e734f083febdcc1ec58cc98279c1bca348f1196b668612d6cb6b43c8a2417be12ce18d2122c2f4b650b87dcdc5e407ac3 SHA512 b53e29f31aa98864889d4e5410ab1d0f05f8f5053ae767b7fb3b595edebbf2b85609b70237d832bf986b93ba1bcd5e408df68c0c37e8e26d6924c12bf94a2b33
+EBUILD libevdev-9999.ebuild 1066 BLAKE2B 204149dd3eea3aa65af01c1d9af0621e734f083febdcc1ec58cc98279c1bca348f1196b668612d6cb6b43c8a2417be12ce18d2122c2f4b650b87dcdc5e407ac3 SHA512 b53e29f31aa98864889d4e5410ab1d0f05f8f5053ae767b7fb3b595edebbf2b85609b70237d832bf986b93ba1bcd5e408df68c0c37e8e26d6924c12bf94a2b33
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.6.0.ebuild b/dev-libs/libevdev/libevdev-1.6.0.ebuild
new file mode 100644
index 000000000000..2f3e3b8ac97a
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.6.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit multilib-minimal python-any-r1
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libevdev.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc static-libs"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+RESTRICT="test" # Tests need to run as root.
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999* ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use doc ;then
+		local HTML_DOCS=( doc/html/. )
+		einstalldocs
+	fi
+}
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index d551ca6aecf2..2f3e3b8ac97a 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 4a9bda2c9bfa..4bb531b28399 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -6,11 +6,13 @@ DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9
 DIST libgcrypt-1.8.1.tar.bz2 2967344 BLAKE2B f259d08427f76238576e3897a821d457b6ff47c99716301b54b20a21ae7574a7ef1f4aa62947c443efb8274d5cb3d64dc1d9c4ea45568f6df6f29c2c1717860b SHA512 27c9d2fd9cba5afca71d421c9299d6942463975fae0bd10d4ff42cda2d7ea213e6b73c071a40fcf23ff52a93394cc7505ab332f8a4a3321826460e471eda5b4e
 DIST libgcrypt-1.8.2.tar.bz2 2966534 BLAKE2B 1a0768dc1c4fc64913256575ec9ebe77fe8c4297c648972c93865271f0a18e60954d2f37c264bad5f1941b5e80753f34349ded9626e5c26ab469cc076da9ac2e SHA512 1e8c414f95bf6b50e778102ca7c1b3b1f30d8320826d9fff747a0a098ef85499cdc3e6de736853b9cd4e5dadda35c7c0a291e13643dcac5eaef44f2ddc7a6c09
 DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b287226f26eb59536e1a32512004af739a64a3817ac38fa1132fdfc3424c21ca49c81db93535a23d590a5dc4f4518f3cce1 SHA512 8c873204303f173dd3f49817a81035c1d504b2fc885965c9bc074a6e3fb108ceb6dca366d85e840a40712a6890fc325018ea9b8c1b7b8804c51c44b296cb96a0
+DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
 EBUILD libgcrypt-1.5.6-r101.ebuild 1668 BLAKE2B 1b8591c2613fd7d281b69718e296724b297b218357d334d79a70e85a2c088ea1dbdc38b3206290dee728e43393c0f8ed9f53b86a2758c9cd07acf2ad8b7c8424 SHA512 1479228533afab05f4e90413b9c5134452c0a041d27cdb05bf2e5e878f883c9a488140dd84d07e772aa52316ed543e29a76a40e0be202a98022f05b541ecd58a
 EBUILD libgcrypt-1.8.1.ebuild 2087 BLAKE2B 3fef7833b394d4adc5a21b6e725029e222d5b8d824d082e4bc4a1cfbadc3731e8e485c4b00953d9d3e459030d53187ba944b2f1db628d2e68fb1d3b004929c57 SHA512 907ac75b859a782ab48814c12ce47b8d36157f91c10e9824b805efe791fdd28c61b08ce6fe10fe2b7e37ba69867a652bd7695c13e83411afce7354c468806efb
 EBUILD libgcrypt-1.8.2-r1.ebuild 2134 BLAKE2B 337e99d2b43af15fcacf52bfc1dc2f58ffcebdc1d9ddb5441afa887dc14d0ef3c01129862133cd9d1cbc589985822bca6aa48a6527ae624e8d5c51183e1ac066 SHA512 81266f185d38869b311ee901a476e001d4d08ad49dbc789a6c196145b3203439398eb31dac171490340146aab09b69b9b01183a404506f3a42b57745819b604f
 EBUILD libgcrypt-1.8.2-r2.ebuild 2199 BLAKE2B d89c6479ecfe6ba8aefa19e8a3a93acfc1b36f96b3d24442918c9265829623564e11fbb447f953677c68ee88512705bd760e72a66265b2f4f65712372916d7fb SHA512 fd32c5982155cd59683efe845834c861048135330b1a6677c04780be1545183865a2880ef712e2f68a38fe130efe8b6f9f39268b0ffa147edb1ee608750d9f46
 EBUILD libgcrypt-1.8.2.ebuild 2100 BLAKE2B f5b19c9a2df7e882a440b8efcad581bc20df60805ced3ac31e289a36095008d6d89167d89780185a2313516779938d0a151714d06f6d12f93cb5456ea695b6c0 SHA512 c9966023f681b53bf9d2c9b9f0da01f888e14b15c360e4b565e752c0013883b4a91a08dbb06aedd75678930376a8aef240e2cfa193b2b7978d4a15d84acd060d
-EBUILD libgcrypt-1.8.3-r1.ebuild 2333 BLAKE2B c9d9679dbcb7d316b0da41b3be1f9b9c9da2564cb35269e70b89244882857364ece908dcd2c4521f351e2aea2e575ea7dedbb93b268c2070c7a592d69ff159f9 SHA512 09c1ed28c41f64f5520319682e4abb327c29f4dbb34a5689383515ecc81cd6d46ac8ee2afa5dfd2c2f81e6224109d35375fa08a594cc230900d7aa41a2383aa3
+EBUILD libgcrypt-1.8.3-r1.ebuild 2314 BLAKE2B 6487043c0cdd0129411e11726e29878d99fce2f075d17f043b97640c73ef147184fa832576a5dd57c40b59d2b7f4c2559f7bbb03576eafd9d64dadb9ce17b68c SHA512 1ac41888cea18aa75e5cd3190c89999ce1ec4dcbf4376890c9a8cdabf414fe8022644976d7c75f6ef26a883f7a0863d5363f9979af45f68e5eb539db890a776a
 EBUILD libgcrypt-1.8.3.ebuild 2186 BLAKE2B d1c56ad5f0182fcac6ab2fa237e5205818a0f61a7edea666b1f0f1fc4fe1f95fc6ad4a410262b293fb6e47f3e570d71f552a717887a9efb921bf902bb4f12061 SHA512 8f902c37512a01fcbc83026281e8ce9f5a8dc18d975c180f4f4206c38538dad8192ff15fc3782bcb6475e37c4bfcb4b3a96ab5321e79268a91a623f890aebbae
+EBUILD libgcrypt-1.8.4.ebuild 2314 BLAKE2B 6487043c0cdd0129411e11726e29878d99fce2f075d17f043b97640c73ef147184fa832576a5dd57c40b59d2b7f4c2559f7bbb03576eafd9d64dadb9ce17b68c SHA512 1ac41888cea18aa75e5cd3190c89999ce1ec4dcbf4376890c9a8cdabf414fe8022644976d7c75f6ef26a883f7a0863d5363f9979af45f68e5eb539db890a776a
 MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
index 02488a6c3c14..ffd3b99f24b0 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,7 +57,7 @@ multilib_src_configure() {
 		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
-		$("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild
new file mode 100644
index 000000000000..ffd3b99f24b0
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--enable-noexecstack
+		$(use_enable o-flag-munging O-flag-munging)
+		$(use_enable static-libs static)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index f2adaf637eb2..b3df56661929 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -2,5 +2,5 @@ AUX libgdata-0.17.8-disable-demos.patch 1941 BLAKE2B e8c3b0b558d3c446f3e383268b7
 DIST libgdata-0.17.8.tar.xz 1464812 BLAKE2B 787b5d6e4a62e70f76ca4080fb5c3ff1e7d68745f388be646dd980ef8be18275997bca46a1f3639c9457c8310f9c3f4cd34892be88db284a9ee5e5f43e9723fa SHA512 dfc4c825a7053a6fd7659d04c7077bed8539b4cf3ef3da1d5ece4da3ce17941900e960a300a50b284010ed890dcab87e4c4726403f04481c672832fd34b975b0
 DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce
 EBUILD libgdata-0.17.8.ebuild 1641 BLAKE2B 8bab41b7e782b93b1c0be447f60aea096d9b18284c4e684034cf7475be39db2751f34c9c80791396c39a95ce3df16da72573bc979c18ee21793306a1f1c5cb6d SHA512 7bce4dfccc02a77a70f0d1ecd8e1c6d121016004138917fa5505aa2cdc33205e5665c367aee3b3b45ee7524ffe041c8f3a561e8c11e835d213fd01f2a2910b6e
-EBUILD libgdata-0.17.9-r1.ebuild 1642 BLAKE2B 321c30895eb77a491229ee3d840566e0146f1a6231e2776f2c7248e467a753101c8df2c636c08f70f3267c9afa11a46556438d4f4c5d6035fc664ba3cb1c5d3e SHA512 028410e52156c9deeecdff4c0f8f4b64d4053cfca4fd52980eccf1cfd6767282bb27cd82c21ee745257a88ccbe17994b1b77315c089a830356062f92b7b5ab1b
+EBUILD libgdata-0.17.9-r1.ebuild 1660 BLAKE2B c6bf2351b9110cf44b9f01b95edfe0a09f98765c9582c447d1c533d3fbdbb95764e6d7a88692893606f17d6ae4f2cd9e878e71b4d1140406ca53f869485d4813 SHA512 edc1a67aec6a1646f9c8d6da9f241bc0323b1c7a49412564bbaf7abb00eee680831043e7b4e65481fdc4ecb1569ef9d6565ad96e3cbec63c6c5c11f222d80ecc
 MISC metadata.xml 362 BLAKE2B f10a4dba3d98334e8c3092595559b1a0e9036388c3d9b72a53fd1dda5935721198ef7c751efd2179701c4805b6116b3f61965fb5037fe63ef9bccfcb8b37bdfb SHA512 00513b8910b0cf0f0c42b1723c8e22a93c95a702ba3ba9f139ba8e2a25a6c408f1e8f97302ee300189ea534717b1f7d21a909cab0ebf6ba8d6cd19d38df2f30d
diff --git a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
index d990cb59243e..fcd0587a527e 100644
--- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,7 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.25
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 320f3fcc31f1..471d2928e2df 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,10 +1,7 @@
-DIST libgit2-0.26.7.tar.gz 4737641 BLAKE2B dd87ab3048dec361619ff0e42d19161e4b20a07d334ad42aa077b77202bf5e84b85e33a6d6668afef36a7ff23f85a68f28049e08dd7502b241e40a730a78bb44 SHA512 5ad0c514b6c1c58031029f4ada278a164cc112f25c36745973df27711f12888000c054816b65889576124e93b71ec9a1c4f4cc0b538f177d93a57bc145fea1e1
+AUX libgit2-0.26.8-disable-oom-tests-on-32bit.patch 1775 BLAKE2B 4c3df3edfa76a57f2c14433b7be1cec2afadcaffa30f2f2559ba9f1e0cf915f6ccba43abc038cf3a42949f12e78e532d29a25ae74e41f303838c839036d6e3a4 SHA512 db77d1cd4876ed45a579c9dcec67e7fa0feff2d98db4635257961588734497b5818efcf4ce748742018c6775bb65f2394515fc2854c691194b93b6d9c65c6cf2
 DIST libgit2-0.26.8.tar.gz 4742478 BLAKE2B 31326987961ed42740f6c0ddce6a80c278175899a62cabd65ce9eef60854553e6a91fd9947ca23945104d4e1b46f9ab0bb1a1a793d8dd87bed792528e5c32839 SHA512 efb9229b2882ac36910d75778d7431bec40f3529f2ad2dd6a950d5580ceb0d4dd798242a422ea6cbb880f515df4dfbb7055a65dd5a8106696d3d458851fca56e
-DIST libgit2-0.27.5.tar.gz 4775158 BLAKE2B 118af462a4969bc802451b887386e87da0f855641a774ce7460d6fe7ad9c62ce71a4b35a7461a95c7c4a96c59143c9c1acc78c5a1b21143a651491713f4fa15b SHA512 318b981456d55f60f8aa1897f1f70274329e48f09769b661eb4bbe76399071eca0fbc7deacb3191db16bc89dba8cc69a64adaf8cbc65e34a65b6e72ca122e21f
 DIST libgit2-0.27.7.tar.gz 4782856 BLAKE2B c844eca24b5053b3391ace6ebeea047bbba4fd429786e08144151109bfbd22f5c1b2609a176816a5d7eff63f1fe91122f88d89d3613dc4c770051cf095ae5ac3 SHA512 de2e266939bd40bc580603539e1156906b97299523336ddc6a66c3bec26729495bef2daa2d240b83b7e011e93852381e95a4407132b0440a5aa1e1b7642c0011
-EBUILD libgit2-0.26.7.ebuild 1943 BLAKE2B 1b307186052d51167fa1cc022aac4f847de31e36398c8ba58b178399e2aa527e0619a09bbcca20414f122008a4e7f8344ffd8f67b0948b605ce42d3c95c4fba9 SHA512 11a0a56558a263784838c185f6967a9fba0f2206591cc1bce6f18be73ea2a990c6012cde6c370fcb7ceace0433a07353735a6d0cb0d0580cf27005f090581fb1
-EBUILD libgit2-0.26.8.ebuild 1823 BLAKE2B 3cab4e9d924618f0ae65fc074087c4db0d3b2c73b57e7196083d9194101ff67b8d91b68ec78e45275984eec1d94ee9d2e34fc8180f7b30ddd8ae8f42a8f0e67f SHA512 6adac344bac4a817955037e60b42caf18d2eb95e6c91fe15995f7f8591cf3e193e773c1fdb40b7264d6195ebf2e6b79b6af1d116834e49d193ceab3d20f65798
-EBUILD libgit2-0.27.5.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
-EBUILD libgit2-0.27.7.ebuild 1823 BLAKE2B 4a34b7c5f15e9191bfb2b236166fb1e68e8908b30c2fccffb7f80ccfbc32607f6ac03314a2d2ace2b43496cbb4f76b180ec4692ee47b91ad63870418c1c18c0b SHA512 e9c84a0e241c83359a8fd04d9374e94f6be46345b942c6344f655ce955fdd815dd9ca08c6c7bcb9aa15f5befdc5898457236f280b078a892419e1d31a143a430
+EBUILD libgit2-0.26.8.ebuild 2053 BLAKE2B 1de5648ae2d9500af644cb1e8519962a463497f25bed279e6148d14dcc0235b4c388f9c94a53f7c0075896f46ba395ed6030d8a577061284c4ab11fe68a566c9 SHA512 2afea3b4bcd0bcf9602ae226762d4c7de609cf97408ea9ac560646d3c001467578adb6512df0c63eb9ed618606355f7087a041b0c2b12e549ac93dc23d1faa84
+EBUILD libgit2-0.27.7.ebuild 2055 BLAKE2B 1fc9de00757bce342fc97176725cd608244d6c22acb3517249cd6bd6df4aed15737345f42a76dd7ac76dccbe100a858e7bc92a23863f7bdc16ab578a6b03cf8f SHA512 5a40ae4d935ce482df78558d7aff2fec2368ad0286121bfd6b02433a4e5889dd8cc9a521696bfe5b0f753a3c61fa3092d89ad991160fb1d4f039e6d91f67c632
 EBUILD libgit2-9999.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch b/dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch
new file mode 100644
index 000000000000..40be2aee8fdc
--- /dev/null
+++ b/dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch
@@ -0,0 +1,64 @@
+From 16b5a7baf67169ff12a9a2de9c2853c6f921317c Mon Sep 17 00:00:00 2001
+From: Edward Thomson <ethomson@edwardthomson.com>
+Date: Thu, 13 Sep 2018 13:27:07 +0100
+Subject: [PATCH] tests: don't run buf::oom on 32-bit systems
+
+On a 32-bit Linux systems, the value large enough to make malloc
+guarantee a failure is also large enough that valgrind considers it
+"fishy".  Skip this test on those systems entirely.
+
+[rebased for v0.26.8]
+---
+ tests/buf/oom.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/tests/buf/oom.c b/tests/buf/oom.c
+index 16a03cc1a..86f5e7239 100644
+--- a/tests/buf/oom.c
++++ b/tests/buf/oom.c
+@@ -11,12 +11,8 @@
+  */
+ #if defined(GIT_ARCH_64) && defined(__linux__)
+ # define TOOBIG 0x0fffffffffffffff
+-#elif defined(__linux__)
+-# define TOOBIG 0x0fffffff
+ #elif defined(GIT_ARCH_64)
+ # define TOOBIG 0xffffffffffffff00
+-#else
+-# define TOOBIG 0xffffff00
+ #endif
+ 
+ /**
+@@ -25,13 +21,18 @@
+  * will fail.  And because the git_buf_grow() wrapper always
+  * sets mark_oom, the code in git_buf_try_grow() will free
+  * the internal buffer and set it to git_buf__oom.
+- * 
++ *
+  * We initialized the internal buffer to (the static variable)
+  * git_buf__initbuf.  The purpose of this test is to make sure
+  * that we don't try to free the static buffer.
++ *
++ * Skip this test entirely on 32-bit platforms; a buffer large enough
++ * to guarantee malloc failures is so large that valgrind considers
++ * it likely to be an error.
+  */
+ void test_buf_oom__grow(void)
+ {
++#ifdef GIT_ARCH_64
+ 	git_buf buf = GIT_BUF_INIT;
+ 
+ 	git_buf_clear(&buf);
+@@ -40,6 +41,9 @@ void test_buf_oom__grow(void)
+ 	cl_assert(git_buf_oom(&buf));
+ 
+ 	git_buf_free(&buf);
++#else
++    cl_skip();
++#endif
+ }
+ 
+ void test_buf_oom__grow_by(void)
+-- 
+2.19.1
+
diff --git a/dev-libs/libgit2/libgit2-0.26.7.ebuild b/dev-libs/libgit2/libgit2-0.26.7.ebuild
deleted file mode 100644
index 4b2a77205814..000000000000
--- a/dev-libs/libgit2/libgit2-0.26.7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
-inherit cmake-utils python-any-r1
-
-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/26"
-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}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
-	# skip online tests
-	sed -i '/libgit2_clar/s/-ionline/-xonline/' 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-0.26.8.ebuild b/dev-libs/libgit2/libgit2-0.26.8.ebuild
index 5936e8a00286..34bc03ffb55f 100644
--- a/dev-libs/libgit2/libgit2-0.26.8.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
@@ -40,6 +40,13 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
 
+PATCHES=(
+	# skip OOM tests on 32-bit systems
+	# https://bugs.gentoo.org/669892
+	# https://github.com/libgit2/libgit2/commit/415a8ae9c9b6ac18f0524b6af8e58408b426457d
+	"${FILESDIR}"/libgit2-0.26.8-disable-oom-tests-on-32bit.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
diff --git a/dev-libs/libgit2/libgit2-0.27.5.ebuild b/dev-libs/libgit2/libgit2-0.27.5.ebuild
deleted file mode 100644
index d10065358a4f..000000000000
--- a/dev-libs/libgit2/libgit2-0.27.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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,5,6,7}} )
-inherit cmake-utils python-any-r1
-
-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}
-	${PYTHON_DEPS}
-	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-0.27.7.ebuild b/dev-libs/libgit2/libgit2-0.27.7.ebuild
index d39c0a7a0268..3815701da066 100644
--- a/dev-libs/libgit2/libgit2-0.27.7.ebuild
+++ b/dev-libs/libgit2/libgit2-0.27.7.ebuild
@@ -40,6 +40,13 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
 
+PATCHES=(
+	# skip OOM tests on 32-bit systems
+	# https://bugs.gentoo.org/669892
+	# https://github.com/libgit2/libgit2/commit/415a8ae9c9b6ac18f0524b6af8e58408b426457d
+	"${FILESDIR}"/libgit2-0.26.8-disable-oom-tests-on-32bit.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 130880a681d6..65e619934822 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -3,6 +3,6 @@ DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88
 DIST libgpg-error-1.32.tar.bz2 904382 BLAKE2B 92141af9e00725015ef31152ccfe4db9535a7a6ba0aa6d011f2404bc998d7b0932fdce742a45d271995c838d34342e5197a081a42eb2e5e29c11271a1c11c6f7 SHA512 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20
 EBUILD libgpg-error-1.27-r1.ebuild 1287 BLAKE2B d8b77035b21a5d67fb35fa94c7581a1c2229aff20fab7ad47ab4a0bc18490d4331dbdfb81e2114b5f3fdfb4184837067a3afcca141710b1f846d3e40de2f3c98 SHA512 59121052137fb7f122a048bc320076d1d54320a41748aa5647e3d660be4b53d1d89868eb4ae23335b0492ee5b530f912449c45f1e1a5a8567b386fc7f077993a
 EBUILD libgpg-error-1.29.ebuild 1289 BLAKE2B 0d86eb4d6815b150aa7f9514e44368af4a45ab36462e4f8d858552c7b88df9e82ca103d2f742f42e5d93ea5df9721b47f08026ba99eb9fa5c63bf27bfa80059d SHA512 6b22dbb50879e62a76df64f957a23a718177a37f610b793c09c6e08c073fd882e421ecf820a0499e77edaac7cb3095003e1ccb5b62ceddb46fa88513395284ac
-EBUILD libgpg-error-1.32-r1.ebuild 1428 BLAKE2B f70906a053dd6a9731cee51b131c22152aa221ea12083353e457acc69246dcc302288bd646759d85c08321d21d03ce11e9d98ff33034f375e7516942cf8f6a2d SHA512 5e74d9b2ed48ec553d24eb088c40dbae89b9bc784494461bacd92bb8feba1920e6b48ad590592c3fb0b3ae95cc55a6bee9a69397f624d40cd2787d81861d7cf4
+EBUILD libgpg-error-1.32-r1.ebuild 1409 BLAKE2B f0cde481c3f551321a384ed1b322255e5c8ced45edb655d744ede766ade0e930a540d9dad756da5d1107ddb52499fd102b1c4500b02064bb816948bdfe1fe9f5 SHA512 09e05389ff67906dfc1b93d57b4fe556b07ecb5b758b0567f90b5bc0c58ea4ae3aa5aef638fcec7a3baa1a1a7d0925ba1545c03342689f84c79600bbc95426c9
 EBUILD libgpg-error-1.32.ebuild 1300 BLAKE2B f7367cc13a9db8e3e671459d9dea8884633c5f401af615c28670c4902c52e9f461ad4d40b2cee61ba4aaf0b76f205ab55a32b724083a14d3762d469109894f66 SHA512 ae3d6a4c73e9ba6631a1f852278ea3a5827e81271ef90bc8cb991cd7c4b69cdf81df660ac768cd76d3a5b8010bfb7da9c7cef1421dfa1ba01138d2b03a3b0282
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild
index 92257a968e2a..f43692029854 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ multilib_src_configure() {
 		$(use_enable static-libs static) \
 		--enable-threads \
 		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		$("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 9888a80650f1..2f4bee710a21 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,5 +1,5 @@
 DIST libgweather-3.24.1.tar.xz 3350680 BLAKE2B 9265cb3c280446d5f380f62b60efb5578a7a401e3291d12e3824d8e7eacc582761226b0aaebb0439318bd48b9ad5429a1b6d89eb0220a82650c43be8aa337e2d SHA512 564464d7a18a8e0320871ea418b1163163941c950c5acea5ee65a087e44c4d81e019e2e3e4cb6751989f823cbb7c5691713d3dcef72aeaf6ff264e61b6f7b4b4
 DIST libgweather-3.26.2.tar.xz 3409528 BLAKE2B 1c5cdc7125aac8df95e97db8fa1d63bcb06865e70691621bc3a1c0ece2e602862cef9a2a5daa2ebbc5fa7eaefa32bf89507f1eef8fa4eeff294d43132e83fab4 SHA512 75b936f93814005b4317dcb51777036f589f343526428d9a74de96aac1badd4fe81c117184e2bff84a7a3078d6f2a2000e7b63f1e1d80f839b3513cc470fb25b
-EBUILD libgweather-3.24.1.ebuild 1304 BLAKE2B e7ef00a8d93612dffc721875d07ec588f21a70a41b55dd6684106300d9e73a838d39a4670d9d096879e026ca4357aa6726578b50acba76a0fb903bc117408723 SHA512 cc354dae7c6e20c66781a972dd224bc65404ee144ac4133c449a34e9ea68e6c89fc9182492ef9d66f7c72ed3bd6c56223274abe4e315fbbb6af70aadefd5a319
-EBUILD libgweather-3.26.2.ebuild 1306 BLAKE2B 4c2259dbe97f8ccb677e7b440d8fd22b04989737712446461fdfb5cd9a07c9d58e555274d664544ff5c1c735443d73c3eec4c0fc15a9a5e9a8289a092bf17be2 SHA512 1f8e44c5db07d318af3ef818a289d53bc75b49528aaac32d520067f8bc6a0119a23959af1b7d1fe20d8b7a1fe7cfcf30d104335b4e83e7e796af5d34d9fc05ab
+EBUILD libgweather-3.24.1.ebuild 1322 BLAKE2B 105efe6d6f95643f2b98f5bc5ddc0ad9ddbd95ada17e085830e1617ae84ca8518584fb001c9d149c6fc9597965248a8502c92dc9b4cc78deb54f89076747746b SHA512 5c6bcafce98f58aaa43954eab525215f1b60df96b8b35ee72eb4fe794fcae3e8fd13cfe9524bbfb93e2fb8112f65418417b02b0a9ca715db71a2be37e0912252
+EBUILD libgweather-3.26.2.ebuild 1324 BLAKE2B 3dd629227ddea275fc27c2dd90049e29b6c23289a8c5b18036c07506a4adde288dc89ce393c6d57f0417f4f38da820c8650fae56350a771bfcc7d98437890348 SHA512 d932b1409e199220dbbd947813792ba707bec218cc4347f58ed31814d3cd715e0a1aded278a93bbe2add82470dd7b7bc72bbe292c9d0be0c808a7fd141bd939c
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/libgweather-3.24.1.ebuild b/dev-libs/libgweather/libgweather-3.24.1.ebuild
index 30745aa57e2c..8c03a0bfffd6 100644
--- a/dev-libs/libgweather/libgweather-3.24.1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,7 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gnome-applets-2.22.0
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	>=dev-util/intltool-0.50
 	>=sys-devel/gettext-0.18
diff --git a/dev-libs/libgweather/libgweather-3.26.2.ebuild b/dev-libs/libgweather/libgweather-3.26.2.ebuild
index 81bb7f8332d6..20d2fa6e6999 100644
--- a/dev-libs/libgweather/libgweather-3.26.2.ebuild
+++ b/dev-libs/libgweather/libgweather-3.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,7 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gnome-applets-2.22.0
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	>=dev-util/intltool-0.50
 	>=sys-devel/gettext-0.18
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index 9c3738a63079..08aaca6aa597 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -1,5 +1,5 @@
 AUX libindicator-ldflags-spacing.patch 298 BLAKE2B 2d0fb361e2980d429beee418d9bf8d2f786de0d2b337b6775f9457158aa30d02b4dcbccdc488fa79236f04bf766aad49df732d25f48f1ecba923c46a4e239280 SHA512 fa283a8d6b88da0e2b6f5d0711ebe8a5cc0d4ab87cb07c3cecae9974dd68be751169b89503ae66751bca6cd73df2b2a262ac55a667c5c8e00e129d51f4452c67
 DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
 EBUILD libindicator-12.10.1-r201.ebuild 1207 BLAKE2B d69e47daa9bf13333d31fdfde8f00e5dc49bb0ab8c3219ccc5e88698fdb8b12c3089fd1aa221e46452515a39bc938eb0127db19d927db57622df701d6e9730f4 SHA512 aad48d226c41fd1a282e4349a1686ffc2aa5c556a7d849ad40ebce9dcfe6fe8b2dc5d5ab60bf54d689fca4a579b3c3977bcd5bf9da2c0edc2156a540d573a355
-EBUILD libindicator-12.10.1-r301.ebuild 1176 BLAKE2B d795a1098a5a6e9f73e62a7c0046b88f42dc2679d466240cc79385f3001e4cf203e3c48b6286d2cd9295719f2d2a05fd2c553b4572f0fe9728c0c873020e4412 SHA512 554c24774f4d4f3bec43625015ea6f22a174f5423424136a92c4033977335935462b10fd9c8a099e66bef91fb208d83dafe799e8a17a92335434d1e244ba0027
+EBUILD libindicator-12.10.1-r301.ebuild 1182 BLAKE2B 2e189f65164fa1eaebdde14487088b0b9513a4bcf8ae7671fb506802e175589469bfdcf7e24d045d406fa98fbc42e87cf848d139fe0eef0e64f0dc2ffb5062a2 SHA512 c39f24ee8f1ed913f37d25a0ffcc92fb284a042ede3ec10e3cef84c7c18013eb0acc6e21de135956550c177e0a119cd4dc2e223f637f9f96de82d88b2492cf68
 MISC metadata.xml 247 BLAKE2B 216107f32a44b828d5bd65432dbdf2f3b71d81e96ee3580fc551392310b9ee554715698dfcba215fa2181a90f361564b6d04546c61848c3a2d176f3590602f69 SHA512 f24203e0188dd8311689fc59007368585764703b92f6fde9b4ea01666d37304193fc728a9f99b7f6c936f5a5a51a58a8402a101dc4eddc0bf2bf09f221bb0054
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index 0f80459205ab..e624f40f5466 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 x86"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 96830071059e..37e25bfb9a0a 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,8 +1,10 @@
 DIST libinput-1.10.7.tar.xz 494648 BLAKE2B ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892 SHA512 b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
 DIST libinput-1.11.3.tar.xz 487408 BLAKE2B 38dc14cf018ca59279e8b6e85fd91f4b29545b4a55ab968cb11d9a8afc8d80c311efc6e57339b9baa9fb270f52cfb0758ff8ea313991867c35f3da47910977ac SHA512 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949
 DIST libinput-1.12.1.tar.xz 520072 BLAKE2B 2d2b2d82f27ac01ff25b3bf6fd7b77ca56467ab818cdc5d4a641629fed623ef5042915889f54f71b1881595af1d85770bbf4ecfd798c079878efa0a0546c4a36 SHA512 de1714526ee1244e3086729efa5b72724b2b989fa8d04418e633d1ef5a8ea777ae3cd4b8c5b015ca0da2b8cf5b07111bff2283c7d6068abcdfa81c3f71b81d68
+DIST libinput-1.12.2.tar.xz 517712 BLAKE2B 3a8b1e5120334d44dcd14461fef4d20d51ec2f910c95bf10e54201dcd8b6ef2913a284940f05f0088ed810c0841b7e3cbfd1b33d7bcce3a81031330cb42bfe18 SHA512 f7122a1d18dd2d0072a34fd9897ebe25a065100b3754052d7ec133bddb56d5c2a5a94950cfc8366ef5d117180c28b3ff99b1a62f3ab95df5ac22f86721fbdc67
 EBUILD libinput-1.10.7.ebuild 1440 BLAKE2B 203a9e8e20785cb93d221d8614aec3488a316d301672d3bbacbd223cd959c31edae176c17d1d575426cec24bd6e89c82b80244bcb7273a4531743555c4ba3b42 SHA512 c0e320acdb66994bcb5fe11b60ac4dc88955cae25da1dc3de028738bfb86c57eba90d23f258ed076ddba0da2737af9027ccde6a73705e6ff4feb8beffb591f0b
 EBUILD libinput-1.11.3.ebuild 1443 BLAKE2B 95c2a74f98abe1b021f14df89375e8acba26cad0df3ebbd753844cdbe477fcb7d2d9606c76b51676ee0fb27623a5de658a6326d74d7d90e9d1cf5be0cb8d8428 SHA512 2e91a777ad1f5a3a849ad7a559f34f43dffbeda2c5be97a06c0870d52d558c916045ff98229f155527cca58e38e155e76a48473a8f03c7d3b8ad045bb595fcd6
-EBUILD libinput-1.12.1-r1.ebuild 1854 BLAKE2B d6f9387dfff57346bf5daa581c2426004244a77a23d86463370518ef9798dc2b497b0369c194784b8adb806063d9fc0f4e5aeb6d3356421c251aba3cef830ba5 SHA512 3b6f6bd4e80a894f474dc1ac66e206f3e9e12add2e682ea69c80d8a3661b3622397e2466038e2b2186eeb76d264610444755c378f6905c90a7a3fe812d8d1814
+EBUILD libinput-1.12.1-r1.ebuild 1860 BLAKE2B 10a278346e6f1acf237b68be86537244b72621a32e3a806e1c8141638d9e4e7049377fbb7d04801a1793c0d5c5c254521564a7e116a9f9891d6caf1d052a83be SHA512 87930976319b00b134ae86bdc48d0ef2885bebf8bdb321f2f07eeeb5894ce41d7057d7c1c5fb0093984ab3b5d68f015724d061fd8b5cbec35eba30e19ebeebe3
 EBUILD libinput-1.12.1.ebuild 1460 BLAKE2B 066dfe5ee976f24475f2572d040c685b2a429cc27d22d2199bcaaa0e92886a9e76b2dc489457e5657f8b4ac6a0e61af75cd7041af96647bc1dd911d5c84e3585 SHA512 3bd9c1fb51fee929bcf85349996e679b202d2e064bcb88926a4d0cda0453f82c7ec9f8bd0ba0e4870781fc936a36da034b91e23223ad3f9764b4781468bf8b19
+EBUILD libinput-1.12.2.ebuild 1860 BLAKE2B 10a278346e6f1acf237b68be86537244b72621a32e3a806e1c8141638d9e4e7049377fbb7d04801a1793c0d5c5c254521564a7e116a9f9891d6caf1d052a83be SHA512 87930976319b00b134ae86bdc48d0ef2885bebf8bdb321f2f07eeeb5894ce41d7057d7c1c5fb0093984ab3b5d68f015724d061fd8b5cbec35eba30e19ebeebe3
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.12.1-r1.ebuild b/dev-libs/libinput/libinput-1.12.1-r1.ebuild
index edf6037ad99c..20a7cf9b8399 100644
--- a/dev-libs/libinput/libinput-1.12.1-r1.ebuild
+++ b/dev-libs/libinput/libinput-1.12.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libinput/libinput-1.12.2.ebuild b/dev-libs/libinput/libinput-1.12.2.ebuild
new file mode 100644
index 000000000000..20a7cf9b8399
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.12.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="doc input_devices_wacom"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? (
+#		>=dev-libs/check-0.9.10
+#		dev-util/valgrind
+#		sys-libs/libunwind )
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		-Dtests=false # tests are restricted
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT%/}"
+}
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 49eeb4694194..d4dd84e6f16f 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,4 +1,4 @@
 DIST libksba-1.3.5.tar.bz2 620649 BLAKE2B 6ed250684e40b4efcc07a86584adfbc659f886919d0306e82e2275c9acb8a1df698c7cc9a917fa66dd906fe473d14fa29507c03e681aed86286d65d9551cb5f6 SHA512 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
 EBUILD libksba-1.3.5-r1.ebuild 803 BLAKE2B 9efcc44c2c4eed76d727ba908068e13edacf642d0136b54c4d310e168661c5a1cb8a9a4af90628493748d4fbcbe5c0a6489c71ac2fa401dedd076b131d98f0e4 SHA512 1f648c845434fabc1a9ebd5650e9a17a9943f82ed5963c8e5400cf5fbd8d13fc281be2f82a571616f3c55a59430f19aed69c8696c0d3ecc61a3aee3523c67c0a
-EBUILD libksba-1.3.5-r2.ebuild 927 BLAKE2B bc4a9c94d9a9ba57047f0ab165fa918fb57466e9c5745655553238f59f26d5aeb7426d4a0d8ec4283a7eab9bfc874c21dc52930adc22733a2b460dbc090748cd SHA512 9ca0cdcf38fa02a84613515bbf9bbc23c2ee250be4a6935d0bdd8aee11364f747214b81e7b3009ea842b58648d8e17b8c2aade1604e39022362eb15aa4f9216f
+EBUILD libksba-1.3.5-r2.ebuild 1045 BLAKE2B 58212516e7875782be3a2f7b4ed297e0e6dd77b5c4b83d65107a7f73c437a9f84c186b597d24e0cba66388a98e4768ce645c2c86a72b2a3e48b0ce25c5d324e4 SHA512 ca22de6543bb31af3a4596d63007857ef9af1f725cc7c241121b1ea22b0d61e074a5f2c162983a34d1113e6e8396f8fe48f5842c600ab561c0daed3de3240eae
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/libksba/libksba-1.3.5-r2.ebuild b/dev-libs/libksba/libksba-1.3.5-r2.ebuild
index ef29c486e9a7..e184aa1c7980 100644
--- a/dev-libs/libksba/libksba-1.3.5-r2.ebuild
+++ b/dev-libs/libksba/libksba-1.3.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,9 @@ DEPEND="${RDEPEND}"
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
-		$(./configure --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
+		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
 }
 
 src_install() {
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 6b64e4dd7bfc..7356a618e0d4 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,5 +1,7 @@
 DIST librdkafka-0.11.4.tar.gz 1900117 BLAKE2B 3e755c91d6a2e12829ba841749977f8c05c9f243d79db64247547e4a49790e67d07f7d82633f45689dcc5f88caaef200027e6af3866de283c1de6120d7f98467 SHA512 6b34e7c476d328a2f8e8321f6ddcaeaf43730284bb3aaddac81c3cd9a1fa5d7f7ef7481f1093b36d89edde7b766da6cd27a9eb9a635b12b640e8a46a269bafc8
 DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 55a27482275726233b5c9b39dfac1b9f34235c68600b5720c1a9dec782de6a4d7d084ad71e50857c32a93b39beacc891933e02f45162d0de144ecaadb3640c41 SHA512 4a8dc46ad66f23cff4d4ef2fc8daa7207bfa3e77fd3580b3f141a73b449e60ea5381e97263235b4d0d762df027a8a2cad08637d88162d9605c82d74a1e64b67c
+DIST librdkafka-0.11.6.tar.gz 1994337 BLAKE2B 7b61e6ba02c5ed58c20e604d6765f6a57ff63ab0c61f2a4c64eff55bfb6c854ef089ac9eea9acc6d44b6abdb6d1425ff23e9d4e6037c733bc5719d6b69c74ae0 SHA512 9657dc53220bbff3eb44941cff2f50ab7f71a82f7486d64ea14f67eabd4abe8c67f225a752cc1f0339439a1cc512e99ade6536d087857979cd198c0102015718
 EBUILD librdkafka-0.11.4.ebuild 1251 BLAKE2B 27576a7d2421373ed2d13d9f0ec566d6575c137372f08000271ad0e7f492c22d19a817d803816b2aacd9ceeda28a5f2c4307f56b7302efa8734a52b3b0b2db37 SHA512 9cdeeee1606f1108e4ad3e203ddcb4f99dace5768e4fa37bfade9b4630e60e7fe6899b17d231c8fdbda9d1ef513a2f5f3868fd7153348f386090db3bc3f94e1c
 EBUILD librdkafka-0.11.5.ebuild 1251 BLAKE2B 7f395b4ae2c92b1ff4a0c110cebb46a30379b0bce1994bcf2e0038fb81c2408f6bd2ac3e902fbcf3018dbd249be3c65f0b334cd4d27d93963a03554292cb1875 SHA512 83a55f1104a0f7061e377358b040f86ce932f469de90ab4296ecf5229e8b9883d236ce785695277ad4dae84aa7dc0a731e48110502d8aafc461566c003925fee
+EBUILD librdkafka-0.11.6.ebuild 1253 BLAKE2B cb931d8cf04fee7b97182eb268c1a76bfb3d302d19ed58e1bcc11f3febd584c437d1e2c69ae81891b328b9a1138dbeb0a392784b87e2059ddb97c79b50d8f0a2 SHA512 eda212f59c06a0ac273b9872faabc856421e5524081015df5919ebe77650df798b02e096b4d2663fafcd187bf084b1a02c1c87c44d6dc28abdc88a1922064891
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-0.11.6.ebuild b/dev-libs/librdkafka/librdkafka-0.11.6.ebuild
new file mode 100644
index 000000000000..b0cc10771fde
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-0.11.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs"
+
+RDEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(-)?] )
+	sasl? ( dev-libs/cyrus-sasl:= )
+	ssl? ( dev-libs/openssl:0= )
+	sys-libs/zlib
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+	)
+
+	econf ${myeconf[@]}
+}
+
+src_test() {
+	emake -C tests run_local
+}
+
+src_install() {
+	local DOCS=(
+		README.md
+		CONFIGURATION.md
+		INTRODUCTION.md
+	)
+
+	default
+
+	if ! use static-libs; then
+		find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die
+	fi
+}
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index d65bd87b07d0..e52da73c3b0a 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -5,10 +5,12 @@ DIST libressl-2.7.3.tar.gz 3364724 BLAKE2B e245cd0e3c4819e12f3f05898429c10894959
 DIST libressl-2.7.4.tar.gz 3359012 BLAKE2B 07b98fdc6bcdf9d888fb1b1d301c95ab6f998fb7ff2c6dfd2ecf4558768e200dfa96c394e5b321bc27ba390e92646c319ef5be5915872a7c086de8017ff8f855 SHA512 1cd82a1bff4f655251b5feb0c850f4164e0fd548e4b404407370f74dcc75c205f42efc7787a157eecac84cbbe46af48cb63f46b3fef75f4a0a9ea19a5863a691
 DIST libressl-2.8.0.tar.gz 3377310 BLAKE2B 2a2027d86e99a09a349f3f123223a8544f49410ae53dbf4b97f898895758d00b1e8f73889f0b0ad8cec6f7ba5e85f033080d0e4af92b0fd10d048136337a0213 SHA512 3004cd78a9d52dece9f24272389778d6afca549de245852004ddd57b01a0c3a6fa1cee2d56980d067d23b3ead7f7a4aa6bcf4e0c57a56f5f7d9fd3f8d23f3ca2
 DIST libressl-2.8.1.tar.gz 3375642 BLAKE2B 39b550e09cfe286e92c6b1168525bac927b37ed7c03db159e456e71abba1d411a78c7a3ad9084b28d41a3f132a959ea82e877ed159daa2c69fa59fef67fec1b8 SHA512 57af2c7a1a8522dca25c4e6371cb44f5ab074be1aded153e6e5fca4fa0844518710f7ce834d4dd309086686c492f10fca83f4d45c084eb49607cb5861f07ac99
+DIST libressl-2.8.2.tar.gz 3373599 BLAKE2B 61b774129ef93081b4a7c94a66fe696520a3f2922d58950e907ad9f047c9fa6495d7753c71d0bb3aec6aa266f16b75fd1d8d485fc3988b97d3d67893dd3db319 SHA512 bfcc55904efbb591c9edd56169d611e735108dfc6a49f771a64ad1ddd028d3a658f5593116c379911edc77f95eba475daec9c0adea0549e8b4b94d1072adf733
 EBUILD libressl-2.6.4.ebuild 1454 BLAKE2B 9c0b73409f09cc0148f30c1b5464892f5ec66b275c571163c79798af7ca20600d4a1803870019cd5f3d80f31edd408c92db70129a74fcbfc104689ac7a749f24 SHA512 ad98eb1ae5dd53874030af1ddf9b813ff42fe07f3158987f314e5faecc1cabd83c5d454b0c4d5eb4fec2645959fe0eb37912046045c21b65080a4d99d1ed4190
 EBUILD libressl-2.6.5.ebuild 1454 BLAKE2B 9c0b73409f09cc0148f30c1b5464892f5ec66b275c571163c79798af7ca20600d4a1803870019cd5f3d80f31edd408c92db70129a74fcbfc104689ac7a749f24 SHA512 ad98eb1ae5dd53874030af1ddf9b813ff42fe07f3158987f314e5faecc1cabd83c5d454b0c4d5eb4fec2645959fe0eb37912046045c21b65080a4d99d1ed4190
 EBUILD libressl-2.7.3.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 EBUILD libressl-2.7.4.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 EBUILD libressl-2.8.0.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 EBUILD libressl-2.8.1.ebuild 1379 BLAKE2B a86a70b97ca897d22a9fc2d704ded84ef17e16835a27a80c10eb2e6c430e99583d6661ad726fb0a3331033b1d9ac5e7ba715a897f2d3ab7a94044678623a7056 SHA512 0e22d04b2d5f4bcbc519c07472d3b9d24f1c67323d256afa2e4f9fd43b45a92058cfc0f750a2b1aed4f3f4e388e7a6e0310cd8730ff545104e8081691a4b151d
+EBUILD libressl-2.8.2.ebuild 1376 BLAKE2B b5d260eac077e536dad5d1ff7e00961d1f1c9bfdb86d4b06877dbf6de0d73a7ab580ec71b66a944ac181626416508644e670a9d1f9fa4fa125b768ff60d9b6e0 SHA512 c2ff0a0bbc4b08110ac0bb73bf88c3c38b6b7cb44bd3c81ab76f6816b9d96e595d77ef0207327d743a5cc1d01ad4f96391c4610b5e766695f5b9f663055cd036
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.8.2.ebuild b/dev-libs/libressl/libressl-2.8.2.ebuild
new file mode 100644
index 000000000000..4ca27fb26c11
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.8.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/46"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	eapply_user
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 01b394fbbea3..7112851c2694 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -2,6 +2,8 @@ AUX libsigc++-1.2.7-fix-install.patch 457 BLAKE2B 70e53fc5931a8f11390da226297edf
 AUX libsigc++-2.10.0-make-disable-benchmarks-work.patch 445 BLAKE2B 250bfea450badf2960a15bcb639b1dbb33c6efbfa313b02dd66c10613996d42d11e106ae9cc778095621a0a8d79e46e3da39ee63e9475619d63410b5b7a23bd8 SHA512 ffd0c863dc973849bbd71d748f0dbdf0a1c7bfa332e119706ff8d63bd2113e6fe90c284683685a7fd5f7fe266a0ddc6d585b94d924776c5cf530b213eba888c5
 DIST libsigc++-1.2.7.tar.bz2 326205 BLAKE2B b316460178224c0b8177ce9a236c69a8b737bf7356b290b59eaeb60b09285c61d113bfc7de89bd712c3c049a492f5cc36d205ac77816aff73e587e8a42ade520 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f
 DIST libsigc++-2.10.0.tar.xz 3794612 BLAKE2B 205cd8cedbe25d04108df888c392fe6a14829826cf1b6b7604a03f357788dfa83a5ba213d6365c48965dd16fcd7b545c9e76d4e4d10971cc1c9ccb172ec0400f SHA512 5b96df21d6bd6ba41520c7219e77695a86aabc60b7259262c7a9f4b8475ce0e2fd8dc37bcf7c17e24e818ff28c262d682b964c83e215b51bdbe000f3f58794ae
+DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2
 EBUILD libsigc++-1.2.7.ebuild 953 BLAKE2B bbded60c997517150857e66d1d1bce9123666391c0328862ef3da2abb75519ef06585ff4209803277352e49c5059606975ec963b564a075229d4fe7243d92dc1 SHA512 8fd16c8a79761172d2674ba2935d07d13d16c20db687a00e53241a2f5d7b1c9f7b61510968960e02be85a6f5e52aa622cc0d09af19c2ba19a274e997596850b2
 EBUILD libsigc++-2.10.0.ebuild 1656 BLAKE2B 06f822384e9c2fcbf52fe91a783ca9266d4ea7f728d9c9c14db04bea4a8b69cd1d863f719f4031028d30b074563b5cc401eeee2fd3693e33497e9b3449910e79 SHA512 f28e3fc55596383da213da6941015162cb7b2983d40990b030673fe6aecae01ab88b842e1b75cfccb70d235134cbfb8da6db626b22822bed277c5f2f4e7bcbc6
+EBUILD libsigc++-2.10.1.ebuild 1518 BLAKE2B c761da7400510944c7cbafc1dda91bc2ba8723aaaa572ea055d57043703a118ac2c05bd9730a4b57d966d27ca4c6da31a4e397ad29f6c1fffe8ed85f6f2855c1 SHA512 6772a72fc8bae1e50af421a5169bfb4bc71b731ce40dd4d9c6bfd945ac0d1f5d9be352dd66d94230421a941ddd4192774604607ad2c60cf77a286fec4140178f
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
new file mode 100644
index 000000000000..8bb40813d761
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 flag-o-matic multilib-minimal
+
+DESCRIPTION="Typesafe callback system for standard C++"
+HOMEPAGE="http://libsigc.sourceforge.net/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+
+RDEPEND=""
+DEPEND="sys-devel/m4
+	doc? ( app-doc/doxygen )
+	test? ( dev-libs/boost[${MULTILIB_USEDEP}] )"
+# Needs mm-common for eautoreconf
+
+src_prepare() {
+	# don't waste time building examples
+	sed -i 's|^\(SUBDIRS =.*\)examples\(.*\)$|\1\2|' \
+		Makefile.am Makefile.in || die "sed examples failed"
+
+	# don't waste time building tests unless USE=test
+	if ! use test ; then
+		sed -i 's|^\(SUBDIRS =.*\)tests\(.*\)$|\1\2|' \
+			Makefile.am Makefile.in || die "sed tests failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	filter-flags -fno-exceptions #84263
+
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		$(multilib_native_use_enable doc documentation) \
+		$(use_enable static-libs static) \
+		$(use_enable test benchmark)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Note: html docs are installed into /usr/share/doc/libsigc++-2.0
+	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
+	use doc && dodoc -r examples
+}
diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest
index 286b346385e6..ffcffe99c708 100644
--- a/dev-libs/libunique/Manifest
+++ b/dev-libs/libunique/Manifest
@@ -5,6 +5,6 @@ AUX libunique-1.1.6-include-terminator.patch 1150 BLAKE2B 19bb13cc29b4aadd12c52c
 AUX run-tests 500 BLAKE2B ff93701e0eb4c78416581d5758e83654d1c3ce197a1c6834ce1170f6da63bcdedf7502549ad0dadacda7e36cf62695acd897be60d6cb4320438a5496adb0081d SHA512 2ff3662e87cb00f33e68a342740c56ae8294e3cae069f1191156fb58077e7a7c1a1aad75018673b494b0be71f9c7cb15c9e2c5b826fd733a72baa761b4994547
 DIST libunique-1.1.6.tar.bz2 335534 BLAKE2B 79f04c514620c5247609660bf58fa207589e9d1a011837f31d782864bdb5f6dd2ee8a44dddbce746cdb5e62df28d1ab20ee0e069cf21ab3d36e8edb2db06a5fc SHA512 82893e1d51a553b3c1413498e48a3a132e2c05779b4442c3732b5429d698e133741615657432a3d05c82a05c79bb59acc13df500bb08010212155db5e4ee6bde
 DIST libunique-3.0.2.tar.xz 294712 BLAKE2B 6045abb17862188940c81389883eeea88b75166b0dc64aba93dbd59c94cc117dc4d410dcb855fd6f3bc7eaf6d918aafb1a0683ca03315f5df0f2f2cde3790aca SHA512 b053b9f265c751bd581d15bf73246fb087075eaf75760565671c09a4ab80db342b4d2185050a877c4e25276d24f7895f4325ca60b918a7c4acd9d1591e97a8b4
-EBUILD libunique-1.1.6-r2.ebuild 1575 BLAKE2B 1677a23a247556b86d7e8a05bd05974e7f79a796fe7ea4d0cb21bf21b92e2cae78b5ec123bd5114c2f442c83f024c1549119856bdf76bd05c3d18e40bb4c1a28 SHA512 6bbe8d63b9b6124195fe7cb6570d6d2ec85eae96c1c1b8f32a5388968a575e403b7a4b0e677021ceb77e3e8114b627329a6378fbffcd2b0090e0af81c0c8e6ab
-EBUILD libunique-3.0.2-r1.ebuild 1134 BLAKE2B 70ef69b22cd71b037aad41c4121e04b14b6f4874aa7e2c759bb846e7a6982789da0bbf1ce84e3a99a0e3aa57bd9ebca23ef311dc5ddac56157ff416b51f57228 SHA512 433ede24a80795a93f5299dd0ad6dbcd5961665881ceaac91a2d6444305db7afff039a5e2c449da05842f7f14e0617bfe8919f4b3da898d002cd84356a428c98
+EBUILD libunique-1.1.6-r2.ebuild 1593 BLAKE2B f2f8eff3839009aabfde7b95ae429f8292d6eafc9e944e5c887430c4b002b6874f61d1f166cf3db3e5005927acdc1f277a9b53a5ae2226bbb43aa719020efb2d SHA512 e439e83b6210e617a99507b0baef52f6b8679bfffc9ea6eed0060deb09ae95faf6d3e40139e60f0f423fbf917c5798db19893fb3080c0fe682baacd25fae683a
+EBUILD libunique-3.0.2-r1.ebuild 1152 BLAKE2B 8b77d73c6500c1266ef7913ac9abc27d447950ca6a4743c186c1d0abe290bb2781cb6b3f4a26bb097c5147e0a6a1444ef68728ece9dd0954b95a043754026dfd SHA512 5a18b2ec4b73927f8fbc02a1d42e4c1f84c82d992118e01dd993abec9f8b0b4af559e862e84becd046c504c64a0f8e95a851eadfcbca23087bc1a7411e533d4a
 MISC metadata.xml 500 BLAKE2B 3416f2d8574c38adee051c11070f680ec248b554f3945872561aec335a42b712634416b9d1087b7cb6ca8504ae1ecf246f0dc9f4e0ded538c24a1ff0b09bc9fa SHA512 bcdaa87134abaef8a3490e11fb9716a20594a0dc862f5b07b446c266f39d4954e0fe3f7f89d6412687bc7a126387d469454d7d1b7ba46684e8cf174a8f78c169
diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
index be83f6a510cd..363759d8bf9c 100644
--- a/dev-libs/libunique/libunique-1.1.6-r2.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
index 1688d8bfa665..8d23f7f79e75 100644
--- a/dev-libs/libunique/libunique-3.0.2-r1.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,7 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	virtual/pkgconfig
 "
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 5461b299fe18..192baa746ebe 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,4 +1,4 @@
-AUX libzia-4.14-ldadd.patch 474 BLAKE2B 65dab719d72ef136692fe4e047d93005976b0408894cfe408130db6aed93accee9388276e78042b4a59b9c2bdc9ddcb83ec14e1d19603a243f464d38ba31631e SHA512 6e2cd1766fa51d935bfd903577286ed3b167f7baee043b75573132e2425f4a75978db7863a1ebe4cb5a8a0df115a2e35a99c9f9d7004cad91f340155a5b77b9e
+AUX libzia-4.14-ldadd.patch 548 BLAKE2B 655b2d21e8c5a90c7559381ed546df0b661b2cabe9880eb78bcfe7a0d35463f064d078c396c0bd261ad476a131a4f6e16a9eac73a8408faff73d85aec725edf7 SHA512 3b7820de0dbda89ad571b6a98b8fc601c289fcb9981586a63391c9de6ee9eb9b71cd4626434b2c4341fc9155e183c5da6a292cc61327600312e122f99a662dd0
 DIST libzia-4.11.tar.gz 577185 BLAKE2B 80de10d5852742870ff7a7995b743eddf76a966695fd7ad786537ed4ad430b60a88b2f5bcb74fb41ecd01a84f02e126a0bfffa932761cb8bf73bbeb097cca181 SHA512 6d616ca12e1db20c8bbbe0a18b4e1e0ce1b086b38123762c2e4c3f46390ff5772dd27eb9b97b332b20f3430905f6eae0fdce70aca48fd56d5e43043369233964
 DIST libzia-4.13.tar.gz 583226 BLAKE2B 088c199c188fbbee54ed533565d3509a510db5f1d3bafeb1be76cb6b2f38d40244fe768ccfa2ee62aaba856ffa7b890dc6d5ea20ec7e1289cbce609d5a56b476 SHA512 b1dc294812342d8c4cf34b013d26c3e8d56da924ef22991b47bdf5ee18990e006a7cd216e9989a6fb3ffb3cb151fa04d5aff7707a7541ec7125b39a6f17eb80b
 DIST libzia-4.14.tar.gz 597138 BLAKE2B 200e0682c6bc28248646775c5e5a71bad329edf031d0950ad8ab5244e5e925903147467d23eb3a04f9be05cca6b34947692df15620331ffc5357b73f20d363b0 SHA512 c382ef352e80df69daf3d3e4da0c0de5d8037b32182a760f88a1edf7d2b9cc7d5112de942a5a85973ccf82ca1e0771c2e92de7972ff9bec745fdb525419a2365
diff --git a/dev-libs/libzia/files/libzia-4.14-ldadd.patch b/dev-libs/libzia/files/libzia-4.14-ldadd.patch
index a8636e1d1273..4d0becc5306c 100644
--- a/dev-libs/libzia/files/libzia-4.14-ldadd.patch
+++ b/dev-libs/libzia/files/libzia-4.14-ldadd.patch
@@ -1,10 +1,12 @@
 # add local .libs directory to library search path during build of zsdltest
---- src/Makefile.am.orig	2018-10-19 18:19:54.067784664 +0200
-+++ src/Makefile.am	2018-10-19 18:20:26.419265774 +0200
-@@ -71,9 +71,10 @@
+--- src/Makefile.am.orig	2018-10-27 19:44:55.332591275 +0200
++++ src/Makefile.am	2018-10-27 19:45:54.268730862 +0200
+@@ -70,10 +70,11 @@
+ library_includedir = $(includedir)/libzia
  
  zsdltest_SOURCES = zsdltest.c
- zsdltest_LDFLAGS = -lzia 
+-zsdltest_LDFLAGS = -lzia 
++zsdltest_LDFLAGS = -lzia -lm
 +zsdltest_LDADD = -L.libs
  
 -gpiotest_SOURCES = gpiotest.c
diff --git a/dev-libs/nmeap/Manifest b/dev-libs/nmeap/Manifest
index 8ddbf5ac326d..1bfe0c2fe4ee 100644
--- a/dev-libs/nmeap/Manifest
+++ b/dev-libs/nmeap/Manifest
@@ -1,3 +1,5 @@
+AUX nmeap-0.3-fix-unitialized-variable.patch 275 BLAKE2B ad143d8be7c773eceb10413d2ac7c06474ac4a565da9afa09c6b2e3d2c16de8b9ac905a996420dfd5239a5eb3d060bfb2306241fff13805a05a1af5691f65e06 SHA512 cc8626e1b6e71c45550f9bb1de83c1f3aba41dbd05da904d29825179107bb79df88a19eb96955aa9f9a811cea25d46f58a0f6a94c534f8ed872b84ce01b01e59
 DIST nmeap-0.3.tar.gz 29380 BLAKE2B d4828a1a3d8a66ae529e40c034bf180da9657c2a3dec1ab09f32a9062430952a568612d2071acb887c6f1afdb19de82cb4b6d1788c6e9c2e1e859d9914209b3a SHA512 064a7fe27a192b4abe1393f8f343c8956bd9dd1d0de1441ca96597ab1f155001905b9b0b35d47b61e1f68891b820c602c024e4c74fb809719108711c5b1df815
+EBUILD nmeap-0.3-r1.ebuild 1220 BLAKE2B 1673b7e758cddf1540fc71db39bd7de9bcfa857dfc51d545b2517010739be5493efa35b8648aea636ae7407e4684fbb64b276cf7f2ea5f8489f58ffaecae939f SHA512 8a5c0a54a1c7179cc7aa60f414bb1a5d8ff8ec6828531cef21529d1b078dae0afd3021de59bf048d3af0b6f6dbf32f4304ee1da8a6734774e38aa7c6ff4e9a19
 EBUILD nmeap-0.3.ebuild 1153 BLAKE2B a01bf2c0f8f88e064ce543ba3ebc38bb10e43dd954d24d12edf598275720d010a432410df8a1f8b41c29cbe2174cdc9c3e6944c34810dad3402b20da8c4627c0 SHA512 c34d035f1398dcb4918fb1fc52da0989cb8c00c24d57162489834e36b3e46f07df0a447d212221392f58a3ce43cc3006e0e0df1dee90c4d747daa704ed9d8bd7
-MISC metadata.xml 654 BLAKE2B 523e88d73eb697049f2ac07c0ee3d42afc2e5f349f32e872d3671f5c70f5122565c108fb869b4a93644f55af82dd488ab85a38480ca68ac7481a63c4791e33d5 SHA512 84398ecadc7c15731e396625fd3f428760bb3797cf35627fffc96d741b3328582b75a4b80d510bfd44a81e1659b3d2a7757d3ce5998573e11641fff3c55d64bd
+MISC metadata.xml 713 BLAKE2B dd782c425806e40afa0f98bc8d54b90fbcb47f830f79f6258418de215617ba86059a666354db7947dc91f114516a14652f236658f78baacee8c9f5b59e58a5b8 SHA512 994674b694ac64762ec12af6dd76c6ca1c3a9062bb3d0d35dbd1d8203385820dbdf792bb344dac7a021d2ebd29550de114021491c3da1d0287602550027b3a5f
diff --git a/dev-libs/nmeap/files/nmeap-0.3-fix-unitialized-variable.patch b/dev-libs/nmeap/files/nmeap-0.3-fix-unitialized-variable.patch
new file mode 100644
index 000000000000..46dcbea64079
--- /dev/null
+++ b/dev-libs/nmeap/files/nmeap-0.3-fix-unitialized-variable.patch
@@ -0,0 +1,11 @@
+--- a/src/nmeap01.c	2005-05-06 20:29:41.000000000 +0200
++++ b/src/nmeap01.c	2018-10-28 19:10:49.000000000 +0100
+@@ -282,7 +282,7 @@
+  */
+ int nmeap_process(nmeap_context_t *context)
+ {
+-    int id;
++    int id = 0;
+     int i;
+     nmeap_sentence_t *s;
+ 	
diff --git a/dev-libs/nmeap/metadata.xml b/dev-libs/nmeap/metadata.xml
index 10629cc31d68..8a6d20835c54 100644
--- a/dev-libs/nmeap/metadata.xml
+++ b/dev-libs/nmeap/metadata.xml
@@ -9,12 +9,13 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">nmeap</remote-id>
-	</upstream>
 	<longdescription>
 		Extensible NMEA-0183 (GPS) data parser in standard C.
 		A directly linkable library intended for applications
 		that want to embed GPS support, like app-misc/lcd4linux.
 	</longdescription>
+	<upstream>
+		<bugs-to>https://sourceforge.net/p/nmeap/bugs/</bugs-to>
+		<remote-id type="sourceforge">nmeap</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/nmeap/nmeap-0.3-r1.ebuild b/dev-libs/nmeap/nmeap-0.3-r1.ebuild
new file mode 100644
index 000000000000..61aa260e3f1a
--- /dev/null
+++ b/dev-libs/nmeap/nmeap-0.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Extensible NMEA-0183 (GPS) data parser in standard C"
+HOMEPAGE="http://nmeap.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}/${P}-fix-unitialized-variable.patch" )
+
+src_prepare() {
+	default
+
+	# Repsect users CFLAGS for the static lib archive
+	sed -i -e 's/CFLAGS =/CFLAGS +=/' -e 's/-g -O0 -Werror//' src/Makefile || die
+
+	# Don't build test programs, as they are not needed
+	sed -i -e '/TST/d' Makefile || die
+
+	# Silent output of Doxygen and update it, since it is quite old
+	if use doc; then
+		sed -i -e 's/QUIET.*/QUIET = YES/' Doxyfile || die
+		doxygen -u Doxyfile 2>/dev/null || die
+	fi
+}
+
+src_compile() {
+	local myemakeopts=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+	)
+
+	emake "${myemakeopts[@]}"
+
+	if use doc; then
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	dolib.a lib/libnmeap.a
+
+	doheader inc/nmeap.h inc/nmeap_def.h
+
+	if use doc; then
+		local HTML_DOCS=( "doc/tutorial.html" "doc/html" )
+	fi
+
+	einstalldocs
+}
diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index c64f636619e0..4b07ef96aa15 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -1,3 +1,5 @@
+AUX openobex-1.7.2-version.h.patch 621 BLAKE2B 90ef501688d2313b70d755a5d6233c027eade70870bb135c018eea180993d5138fdaf614fd1cc396a1521a2d522f8d03c132dc3d3c14839664c7021fc2e657b4 SHA512 9c060d3f4af4ca78ccbc931df26311d1e37c1a86279a56358eb468162746ef3e3d6324fd419f9b38c072ae4c1bb0e9df64643b5de0cdb876aff54530daa83262
 DIST openobex-1.7.2-Source.tar.gz 127248 BLAKE2B c0405aef2f15f16e31641f4a60ac01da26c2a61a5114b8f3990f0fcf64bd55c730ff7aa5f524b450c1e6b5653b9616c0861686102594818ba3bdf2314a3c51ff SHA512 22f1b0d99e7186da9fa12b510ef9dbb6f7d76777d58b235ab2f627703d07b6f6b0488cdc9c6d8c0ab7bc86d6d19117c55fff9273fed02736c0210f9b1788bf4d
+EBUILD openobex-1.7.2-r1.ebuild 1060 BLAKE2B 69d4df78a89b265aa9a4acce3ea2b54afd1a141f84161ff4b0a1682ab010c02c7f46b0fa40fd83b6ed7de71053ca723c948e97a42f9caf1e0fd364f659c50dee SHA512 743a72998268d0f863c927a70bd785e6f825aa0868ce1c22535e10580e5deb8c6255078b3876bf0054a52000c481a1f707599a985d2f4b430cb65a53aeed970e
 EBUILD openobex-1.7.2.ebuild 915 BLAKE2B c54c4903a1c3f03284c1cdfc4cf354147b7c64aa22ea048885f35e3fd9b60ce3f657630e872f5cc390a3f336acf23f753170851d541924a2d408a31c76a1c88c SHA512 dd2b3c22c5fb5815916e2f4a62bd422b2f18d755040f5649de4ba63661f4725efd7a32b450d6b9a7114d82cf52b21823556441a50812b61070f27d01e4717e41
-MISC metadata.xml 467 BLAKE2B 6465b304f41324406f6e641b7e08268a19e1154a35d5dffdc3f57cb0b4925cbc0a6eb0e617a8bc309e9fe237352b5395a8afbbaaa61f1082dc63e336f16a4461 SHA512 947ebd0891b57e986712a13177719a300679db7a90e91210d8f9f22919d38dd7c391deaee73de43282b0b01ce80746cd6d387d53ce6f4409c82be44a98df41f4
+MISC metadata.xml 550 BLAKE2B 4505f0b70a901fbbf3cebe1a066d4c9275853a7667abf221ff439cb6783f485c5d43a24c8abf05df5757a8578712fffbc8a1ff43e0f16f8f8507417e32654ef2 SHA512 19bbed2e27c2fd9ebf00552d3443d09bb295f81c7637d2d09850d5bfc6128f6f3a7642ae55760c36308f7fe333319d6d8324cde0fc75781d32a486abb32be4fe
diff --git a/dev-libs/openobex/files/openobex-1.7.2-version.h.patch b/dev-libs/openobex/files/openobex-1.7.2-version.h.patch
new file mode 100644
index 000000000000..cfcf68595b43
--- /dev/null
+++ b/dev-libs/openobex/files/openobex-1.7.2-version.h.patch
@@ -0,0 +1,13 @@
+--- openobex-1.7.2-Source/include/openobex/version.h.in.orig	2013-07-21 21:27:14.000000000 +0400
++++ openobex-1.7.2-Source/include/openobex/version.h.in	2018-10-27 19:35:53.921795023 +0300
+@@ -1,6 +1,6 @@
+ 
+-#define OPENOBEX_VERSION       "@VERSION@"
++#define OPENOBEX_VERSION       "@openobex_VERSION@"
+ 
+-#define OPENOBEX_VERSION_MAJOR @VERSION_MAJOR@
+-#define OPENOBEX_VERSION_MINOR @VERSION_MINOR@
+-#define OPENOBEX_VERSION_PATCH @VERSION_PATCH@
++#define OPENOBEX_VERSION_MAJOR @openobex_VERSION_MAJOR@
++#define OPENOBEX_VERSION_MINOR @openobex_VERSION_MINOR@
++#define OPENOBEX_VERSION_PATCH @openobex_VERSION_PATCH@
diff --git a/dev-libs/openobex/metadata.xml b/dev-libs/openobex/metadata.xml
index 94f17e3f7349..b6f5436a0b06 100644
--- a/dev-libs/openobex/metadata.xml
+++ b/dev-libs/openobex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
 	<longdescription>Free open source implementation of the Object Exchange (OBEX) protocol, 
 used for transferring data to/from mobile devices.</longdescription>
 	<use>
diff --git a/dev-libs/openobex/openobex-1.7.2-r1.ebuild b/dev-libs/openobex/openobex-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..814f435076c3
--- /dev/null
+++ b/dev-libs/openobex/openobex-1.7.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils udev
+
+DESCRIPTION="Implementation of the OBEX protocol used for transferring data to mobile devices"
+HOMEPAGE="https://sourceforge.net/projects/openobex/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-Source.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bluetooth doc irda usb"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez:= )
+	usb? ( virtual/libusb:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${P}-Source"
+
+PATCHES=( "${FILESDIR}/${P}-version.h.patch" )
+DOCS=( AUTHORS ChangeLog README UPGRADING.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DOPENOBEX_BLUETOOTH=$(usex bluetooth)
+		-DOPENOBEX_IRDA=$(usex irda)
+		-DOPENOBEX_USB=$(usex usb)
+
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)/rules.d"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 785c3620b33a..9d43bd0321eb 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -5,9 +5,9 @@ AUX openssl-0.9.8h-ldflags.patch 1151 BLAKE2B b215e46c380e571f153445f902803cf5d0
 AUX openssl-0.9.8m-binutils.patch 684 BLAKE2B 35650e98595910d2e6b6fc846b49fecbb2a8e4a8b647bbec009a829ae4af8afdc7e7edac7a1eec8f13af1ad69b7036ca6af28bfd9509e6bba58f2b3906d6bdd5 SHA512 5e8a20111bd4809e7375c7323dab2c2edd6a131d1ec2377ee99c5e06ceb7b4b000e9606ba6d0e68cd67d8e001cc8194e11e301eace0feb066d5f3c5b331b5f04
 AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162a8b931e455f35f9e045372102d1461e3e3fd4cf4e4f544ec06a0b46a573d2009c8decf22678df03707c2487bade64f27b5 SHA512 b8e745ff90e447b000ace9cfd5f746c1bc8f3bb8249064d1d2f1072a1a628f5a89c405c7f384c73f0310f2a2f7af672950a9b7adbc583b1ee94b41d911b8a708
 AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
-AUX openssl-1.0.2o-CVE-2018-0732.patch 1194 BLAKE2B bd06c5b1289f7a3dca52bbfab7ae17c9d103b07ffd2649c5b5a8cc60163aa3056e4bd86108548dfcd3690d2ef94c3e0d3a911694199b5a3822215dd01c7467d6 SHA512 ff91298629f157496a012da00ba7325923f5d087bfa54b60e205bf2dfb06374e958912e0df39dbdf39773555455c1a3afa3dcde1ddfec6e85cf89b0b62cc0eb4
-AUX openssl-1.0.2o-hobble-ecc.patch 11987 BLAKE2B 28c1217e500a9d6578dac3ee8aeb08f6e3b1d2c6749336ef05e4142828c7c4b176ec16707dcbbf97e1e2e91d51f85f2a02c076cfcc8bcef1aa9d3fd5ba50eb6a SHA512 817a5a1cbab171d9e6d3fce9c612985d2ce3f9f0b3781b3681ef42da1ac6389d8a8a11e6d696eb7f051d3bfc2d045f1999cc4076d1257b10e9fb65620aee3ee2
 AUX openssl-1.0.2p-hobble-ecc.patch 10875 BLAKE2B fc8240a074f8cc354c5ae584b76b3fc895170e026767d2d99d8bd5e5028614c861dd2b3c7b955c223883062f9a057ee302ae0deecfbbed00ddc53ae8a4d50919 SHA512 29f64bacac4f61071db6caf9d92131633d2dff56d899171888cc4c8432790930ff0912cea90ad03ca59b13ca0357f812d2f0a3f42567e2bd72c260f49b2b59aa
+AUX openssl-1.1.0i-CVE-2018-0735.patch 1612 BLAKE2B 44402dc7e1a39f47fb3b359edbd3deeeb2aedba5d6b9b12ff86c93c7e80699f8109b327d94c2a6cf443c8b087ad461d959bd5307b17bfe0ff429d33e4949dc1b SHA512 4f2e586021f049f9c2dd6ee9925568fdd82b0372ddb81172540acd4093c9b033db312ab0a722dfeab918d18405562100d7ed061c986fc1a0f5557ba5445a955f
+AUX openssl-1.1.1-CVE-2018-0735.patch 1642 BLAKE2B dffad919b1acd1af05044211b24a71cd4e972e0bd1cea3095610e06e06fafa1f61021a92eb9f8e2d800d20c86c8dc99b783509d124d444f6ff56f24871a8e31e SHA512 754f1290cb91f154e8614e145bea2df29e82cfc87ebb3b9ec506af70b0d8ea6785da8b76e7ac49ecd2e5e975f7d2a93b443acd60d2e8494141911d1afd81d750
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2p.tar.gz 5338192 BLAKE2B fe4c0e2bf75d47a76e7377c7977be7bcaaa532061ab89ee989786eeb6495295711a29a88bf026c85d9ed55c97e71b0e9c8cf4c29b6e58a3dc56bcff518666823 SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16
@@ -23,6 +23,6 @@ DIST openssl-1.1.0i_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131e
 DIST openssl-1.1.1.tar.gz 8337920 BLAKE2B 266fb97bad4e1e7c0694c67a065d6669560695c92ad8fa10824169288a3fdfb9798faf408274a1e0c4e10a83a12b57367611bf4037dd2ab7ee74d7edab580a7b SHA512 c0284a4fe84bdf765ca5bc5148da4441ffc36392cfecaf9d372af00cf93b6de5681cab1248b6f8246474532155dc205da5ad49549ad7c61c07c917145e7c9c71
 EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
 EBUILD openssl-1.0.2p.ebuild 10101 BLAKE2B c0e4eb3bd9dd21687d7a4be4c329baa6ca569b97ec16a090d0b5eaece0171a6f656facaab06fe085592038dd3d9d9aded69a5426e8605a32c3af8f295f74f34f SHA512 fc0affd0d6fe6dc12a6301135c6fed7beb5ca74fb0940d0af05551b402e09b6e130acc19de6f7b2853278f743c44a5f8c7da773c5324877b95bdc25b1b51b623
-EBUILD openssl-1.1.0i.ebuild 9107 BLAKE2B 8bee8407c13fbd1cfc7e13b4d11fb57ce9dd494d3ca8cf6cbd34f9f0e57dff824e421c31fc29e408ebf3a752896dc631f045b32757f2d89bacd2b9a52abe4722 SHA512 0cf7fd1a3957e197ac6b0d61a384a673b8216b0a07a90f61708759ef80e59afa1ab8e9f5761c1896439ee0cc6902bdd5bc83f4723302c648944d10d78d8396f4
-EBUILD openssl-1.1.1.ebuild 7877 BLAKE2B df40954123b720ad283e694d22406c79287bf394d7cc52a76badad76aa33a81e20a44aa25f79e16bcaaa2c87eddf68973653cafe6884c476baafed3aba5c95e9 SHA512 e41af66f74829bce5210e659e5a9330c319ee572eecfeec5c59bd11eb117e95ef5ff7e9e880299291231069100873148b562865322e87a5db7cadd64013e62f1
+EBUILD openssl-1.1.0i-r1.ebuild 9145 BLAKE2B a8221eac616d96a039e579122ff6f8d40015fba33ed604a2a0058b4af6c40caaa26ab69627ad0153852cee2711ddfce9bf4049e9a2035db4499b755212b2bf2a SHA512 7a67c698a8dad600ec522694df303d5077ce51d54908dd21cdbf6a6d3655aab81534accc22629c5c7544abdba3bf560d98bb8d74406b5de9b2764f308d49bcfb
+EBUILD openssl-1.1.1-r1.ebuild 7930 BLAKE2B 7a4c38b0c2088834cf285fbdb38c2a509149f85b2435427d7fd4d57f469003afca1fa1755087931b20a67a87e07bcd70dc6430703ae9e8a51b4b12ae558c382b SHA512 dd42cb4022bcceb40f741195cb09da480dd61c4e4abad7e71083379f572382806d6c4489e1fa6365cf60025d39cc3795e984f05ec730cd967f20d129abd30165
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.0.2o-CVE-2018-0732.patch b/dev-libs/openssl/files/openssl-1.0.2o-CVE-2018-0732.patch
deleted file mode 100644
index 148e7c3bc1a1..000000000000
--- a/dev-libs/openssl/files/openssl-1.0.2o-CVE-2018-0732.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3984ef0b72831da8b3ece4745cac4f8575b19098 Mon Sep 17 00:00:00 2001
-From: Guido Vranken <guidovranken@gmail.com>
-Date: Mon, 11 Jun 2018 19:38:54 +0200
-Subject: [PATCH] Reject excessively large primes in DH key generation.
-
-CVE-2018-0732
-
-Signed-off-by: Guido Vranken <guidovranken@gmail.com>
-
-(cherry picked from commit 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe)
-
-Reviewed-by: Tim Hudson <tjh@openssl.org>
-Reviewed-by: Matt Caswell <matt@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/6457)
----
- crypto/dh/dh_key.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
-index 387558f1467..f235e0d682b 100644
---- a/crypto/dh/dh_key.c
-+++ b/crypto/dh/dh_key.c
-@@ -130,10 +130,15 @@ static int generate_key(DH *dh)
-     int ok = 0;
-     int generate_new_key = 0;
-     unsigned l;
--    BN_CTX *ctx;
-+    BN_CTX *ctx = NULL;
-     BN_MONT_CTX *mont = NULL;
-     BIGNUM *pub_key = NULL, *priv_key = NULL;
- 
-+    if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) {
-+        DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE);
-+        return 0;
-+    }
-+
-     ctx = BN_CTX_new();
-     if (ctx == NULL)
-         goto err;
diff --git a/dev-libs/openssl/files/openssl-1.0.2o-hobble-ecc.patch b/dev-libs/openssl/files/openssl-1.0.2o-hobble-ecc.patch
deleted file mode 100644
index e105fe45e459..000000000000
--- a/dev-libs/openssl/files/openssl-1.0.2o-hobble-ecc.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-Port of Fedora's Hobble-EC patches for OpenSSL 1.0 series.
-
-From https://src.fedoraproject.org/git/rpms/openssl.git
-
-Contains parts of the following patches, rediffed. The patches are on various
-different branches.
-f23 openssl-1.0.2c-ecc-suiteb.patch
-f23 openssl-1.0.2a-fips-ec.patch
-f28 openssl-1.1.0-ec-curves.patch
-
-Signed-off-By: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude ec_curve.c -p openssl-1.0.2m.hobble/apps/speed.c openssl-1.0.2m.mod/apps/speed.c
---- openssl-1.0.2m.hobble/apps/speed.c	2017-11-02 07:32:57.000000000 -0700
-+++ openssl-1.0.2m.mod/apps/speed.c	2018-06-10 19:00:09.264550382 -0700
-@@ -989,10 +989,7 @@ int MAIN(int argc, char **argv)
-         } else
- # endif
- # ifndef OPENSSL_NO_ECDSA
--        if (strcmp(*argv, "ecdsap160") == 0)
--            ecdsa_doit[R_EC_P160] = 2;
--        else if (strcmp(*argv, "ecdsap192") == 0)
--            ecdsa_doit[R_EC_P192] = 2;
-+	if (0) {}
-         else if (strcmp(*argv, "ecdsap224") == 0)
-             ecdsa_doit[R_EC_P224] = 2;
-         else if (strcmp(*argv, "ecdsap256") == 0)
-@@ -1001,36 +998,13 @@ int MAIN(int argc, char **argv)
-             ecdsa_doit[R_EC_P384] = 2;
-         else if (strcmp(*argv, "ecdsap521") == 0)
-             ecdsa_doit[R_EC_P521] = 2;
--        else if (strcmp(*argv, "ecdsak163") == 0)
--            ecdsa_doit[R_EC_K163] = 2;
--        else if (strcmp(*argv, "ecdsak233") == 0)
--            ecdsa_doit[R_EC_K233] = 2;
--        else if (strcmp(*argv, "ecdsak283") == 0)
--            ecdsa_doit[R_EC_K283] = 2;
--        else if (strcmp(*argv, "ecdsak409") == 0)
--            ecdsa_doit[R_EC_K409] = 2;
--        else if (strcmp(*argv, "ecdsak571") == 0)
--            ecdsa_doit[R_EC_K571] = 2;
--        else if (strcmp(*argv, "ecdsab163") == 0)
--            ecdsa_doit[R_EC_B163] = 2;
--        else if (strcmp(*argv, "ecdsab233") == 0)
--            ecdsa_doit[R_EC_B233] = 2;
--        else if (strcmp(*argv, "ecdsab283") == 0)
--            ecdsa_doit[R_EC_B283] = 2;
--        else if (strcmp(*argv, "ecdsab409") == 0)
--            ecdsa_doit[R_EC_B409] = 2;
--        else if (strcmp(*argv, "ecdsab571") == 0)
--            ecdsa_doit[R_EC_B571] = 2;
-         else if (strcmp(*argv, "ecdsa") == 0) {
--            for (i = 0; i < EC_NUM; i++)
-+            for (i = R_EC_P224; i < R_EC_P521; i++)
-                 ecdsa_doit[i] = 1;
-         } else
- # endif
- # ifndef OPENSSL_NO_ECDH
--        if (strcmp(*argv, "ecdhp160") == 0)
--            ecdh_doit[R_EC_P160] = 2;
--        else if (strcmp(*argv, "ecdhp192") == 0)
--            ecdh_doit[R_EC_P192] = 2;
-+	if (0) {}
-         else if (strcmp(*argv, "ecdhp224") == 0)
-             ecdh_doit[R_EC_P224] = 2;
-         else if (strcmp(*argv, "ecdhp256") == 0)
-@@ -1039,28 +1013,8 @@ int MAIN(int argc, char **argv)
-             ecdh_doit[R_EC_P384] = 2;
-         else if (strcmp(*argv, "ecdhp521") == 0)
-             ecdh_doit[R_EC_P521] = 2;
--        else if (strcmp(*argv, "ecdhk163") == 0)
--            ecdh_doit[R_EC_K163] = 2;
--        else if (strcmp(*argv, "ecdhk233") == 0)
--            ecdh_doit[R_EC_K233] = 2;
--        else if (strcmp(*argv, "ecdhk283") == 0)
--            ecdh_doit[R_EC_K283] = 2;
--        else if (strcmp(*argv, "ecdhk409") == 0)
--            ecdh_doit[R_EC_K409] = 2;
--        else if (strcmp(*argv, "ecdhk571") == 0)
--            ecdh_doit[R_EC_K571] = 2;
--        else if (strcmp(*argv, "ecdhb163") == 0)
--            ecdh_doit[R_EC_B163] = 2;
--        else if (strcmp(*argv, "ecdhb233") == 0)
--            ecdh_doit[R_EC_B233] = 2;
--        else if (strcmp(*argv, "ecdhb283") == 0)
--            ecdh_doit[R_EC_B283] = 2;
--        else if (strcmp(*argv, "ecdhb409") == 0)
--            ecdh_doit[R_EC_B409] = 2;
--        else if (strcmp(*argv, "ecdhb571") == 0)
--            ecdh_doit[R_EC_B571] = 2;
-         else if (strcmp(*argv, "ecdh") == 0) {
--            for (i = 0; i < EC_NUM; i++)
-+	    for (i = R_EC_P224; i <= R_EC_P521; i++)
-                 ecdh_doit[i] = 1;
-         } else
- # endif
-@@ -1149,21 +1103,13 @@ int MAIN(int argc, char **argv)
-             BIO_printf(bio_err, "dsa512   dsa1024  dsa2048\n");
- # endif
- # ifndef OPENSSL_NO_ECDSA
--            BIO_printf(bio_err, "ecdsap160 ecdsap192 ecdsap224 "
-+            BIO_printf(bio_err, "ecdsap224 "
-                        "ecdsap256 ecdsap384 ecdsap521\n");
--            BIO_printf(bio_err,
--                       "ecdsak163 ecdsak233 ecdsak283 ecdsak409 ecdsak571\n");
--            BIO_printf(bio_err,
--                       "ecdsab163 ecdsab233 ecdsab283 ecdsab409 ecdsab571\n");
-             BIO_printf(bio_err, "ecdsa\n");
- # endif
- # ifndef OPENSSL_NO_ECDH
--            BIO_printf(bio_err, "ecdhp160  ecdhp192  ecdhp224 "
-+            BIO_printf(bio_err, "ecdhp224 "
-                        "ecdhp256  ecdhp384  ecdhp521\n");
--            BIO_printf(bio_err,
--                       "ecdhk163  ecdhk233  ecdhk283  ecdhk409  ecdhk571\n");
--            BIO_printf(bio_err,
--                       "ecdhb163  ecdhb233  ecdhb283  ecdhb409  ecdhb571\n");
-             BIO_printf(bio_err, "ecdh\n");
- # endif
- 
-@@ -1242,11 +1188,11 @@ int MAIN(int argc, char **argv)
-         for (i = 0; i < DSA_NUM; i++)
-             dsa_doit[i] = 1;
- # ifndef OPENSSL_NO_ECDSA
--        for (i = 0; i < EC_NUM; i++)
-+        for (i = R_EC_P224; i <= R_EC_P521; i++)
-             ecdsa_doit[i] = 1;
- # endif
- # ifndef OPENSSL_NO_ECDH
--        for (i = 0; i < EC_NUM; i++)
-+        for (i = R_EC_P224; i <= R_EC_P521; i++)
-             ecdh_doit[i] = 1;
- # endif
-     }
-diff -Nuar --exclude ec_curve.c -p openssl-1.0.2m.hobble/crypto/ec/ecp_smpl.c openssl-1.0.2m.mod/crypto/ec/ecp_smpl.c
---- openssl-1.0.2m.hobble/crypto/ec/ecp_smpl.c	2017-11-02 07:32:57.000000000 -0700
-+++ openssl-1.0.2m.mod/crypto/ec/ecp_smpl.c	2018-06-10 18:45:36.909911848 -0700
-@@ -187,6 +187,11 @@ int ec_GFp_simple_group_set_curve(EC_GRO
-         return 0;
-     }
- 
-+    if (BN_num_bits(p) < 224) {
-+        ECerr(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE, EC_R_UNSUPPORTED_FIELD);
-+        return 0;
-+    }
-+
-     if (ctx == NULL) {
-         ctx = new_ctx = BN_CTX_new();
-         if (ctx == NULL)
-diff -Nuar --exclude ec_curve.c -p openssl-1.0.2m.hobble/ssl/t1_lib.c openssl-1.0.2m.mod/ssl/t1_lib.c
---- openssl-1.0.2m.hobble/ssl/t1_lib.c	2017-11-02 07:32:58.000000000 -0700
-+++ openssl-1.0.2m.mod/ssl/t1_lib.c	2018-06-10 18:46:55.329811812 -0700
-@@ -271,10 +271,7 @@ static const unsigned char eccurves_auto
-     0, 23,                      /* secp256r1 (23) */
-     /* Other >= 256-bit prime curves. */
-     0, 25,                      /* secp521r1 (25) */
--    0, 28,                      /* brainpool512r1 (28) */
--    0, 27,                      /* brainpoolP384r1 (27) */
-     0, 24,                      /* secp384r1 (24) */
--    0, 26,                      /* brainpoolP256r1 (26) */
-     0, 22,                      /* secp256k1 (22) */
- # ifndef OPENSSL_NO_EC2M
-     /* >= 256-bit binary curves. */
-@@ -292,10 +289,7 @@ static const unsigned char eccurves_all[
-     0, 23,                      /* secp256r1 (23) */
-     /* Other >= 256-bit prime curves. */
-     0, 25,                      /* secp521r1 (25) */
--    0, 28,                      /* brainpool512r1 (28) */
--    0, 27,                      /* brainpoolP384r1 (27) */
-     0, 24,                      /* secp384r1 (24) */
--    0, 26,                      /* brainpoolP256r1 (26) */
-     0, 22,                      /* secp256k1 (22) */
- # ifndef OPENSSL_NO_EC2M
-     /* >= 256-bit binary curves. */
-@@ -310,13 +304,6 @@ static const unsigned char eccurves_all[
-      * Remaining curves disabled by default but still permitted if set
-      * via an explicit callback or parameters.
-      */
--    0, 20,                      /* secp224k1 (20) */
--    0, 21,                      /* secp224r1 (21) */
--    0, 18,                      /* secp192k1 (18) */
--    0, 19,                      /* secp192r1 (19) */
--    0, 15,                      /* secp160k1 (15) */
--    0, 16,                      /* secp160r1 (16) */
--    0, 17,                      /* secp160r2 (17) */
- # ifndef OPENSSL_NO_EC2M
-     0, 8,                       /* sect239k1 (8) */
-     0, 6,                       /* sect233k1 (6) */
-@@ -351,29 +338,21 @@ static const unsigned char fips_curves_d
-     0, 9,                       /* sect283k1 (9) */
-     0, 10,                      /* sect283r1 (10) */
- #  endif
--    0, 22,                      /* secp256k1 (22) */
-     0, 23,                      /* secp256r1 (23) */
- #  ifndef OPENSSL_NO_EC2M
-     0, 8,                       /* sect239k1 (8) */
-     0, 6,                       /* sect233k1 (6) */
-     0, 7,                       /* sect233r1 (7) */
- #  endif
--    0, 20,                      /* secp224k1 (20) */
--    0, 21,                      /* secp224r1 (21) */
- #  ifndef OPENSSL_NO_EC2M
-     0, 4,                       /* sect193r1 (4) */
-     0, 5,                       /* sect193r2 (5) */
- #  endif
--    0, 18,                      /* secp192k1 (18) */
--    0, 19,                      /* secp192r1 (19) */
- #  ifndef OPENSSL_NO_EC2M
-     0, 1,                       /* sect163k1 (1) */
-     0, 2,                       /* sect163r1 (2) */
-     0, 3,                       /* sect163r2 (3) */
- #  endif
--    0, 15,                      /* secp160k1 (15) */
--    0, 16,                      /* secp160r1 (16) */
--    0, 17,                      /* secp160r2 (17) */
- };
- # endif
- 
-diff -up openssl-1.0.2a/crypto/ecdh/ecdhtest.c.fips-ec openssl-1.0.2a/crypto/ecdh/ecdhtest.c
---- openssl-1.0.2a/crypto/ecdh/ecdhtest.c.fips-ec	2015-03-19 14:30:36.000000000 +0100
-+++ openssl-1.0.2a/crypto/ecdh/ecdhtest.c	2015-04-22 19:00:19.721884512 +0200
-@@ -501,11 +501,13 @@ int main(int argc, char *argv[])
-         goto err;
- 
-     /* NIST PRIME CURVES TESTS */
-+# if 0
-     if (!test_ecdh_curve
-         (NID_X9_62_prime192v1, "NIST Prime-Curve P-192", ctx, out))
-         goto err;
-     if (!test_ecdh_curve(NID_secp224r1, "NIST Prime-Curve P-224", ctx, out))
-         goto err;
-+# endif
-     if (!test_ecdh_curve
-         (NID_X9_62_prime256v1, "NIST Prime-Curve P-256", ctx, out))
-         goto err;
-@@ -536,13 +538,14 @@ int main(int argc, char *argv[])
-     if (!test_ecdh_curve(NID_sect571r1, "NIST Binary-Curve B-571", ctx, out))
-         goto err;
- # endif
-+# if 0
-     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP256r1", 256))
-         goto err;
-     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP384r1", 384))
-         goto err;
-     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP512r1", 512))
-         goto err;
--
-+# endif
-     ret = 0;
- 
-  err:
-diff -up openssl-1.0.2a/crypto/ecdsa/ecdsatest.c.fips-ec openssl-1.0.2a/crypto/ecdsa/ecdsatest.c
---- openssl-1.0.2a/crypto/ecdsa/ecdsatest.c.fips-ec	2015-03-19 14:19:00.000000000 +0100
-+++ openssl-1.0.2a/crypto/ecdsa/ecdsatest.c	2015-04-22 19:00:19.722884536 +0200
-@@ -138,11 +138,14 @@ int restore_rand(void)
- }
- 
- static int fbytes_counter = 0;
--static const char *numbers[8] = {
-+static const char *numbers[10] = {
-+    "651056770906015076056810763456358567190100156695615665659",
-     "651056770906015076056810763456358567190100156695615665659",
-     "6140507067065001063065065565667405560006161556565665656654",
-     "8763001015071075675010661307616710783570106710677817767166"
-         "71676178726717",
-+    "8763001015071075675010661307616710783570106710677817767166"
-+        "71676178726717",
-     "7000000175690566466555057817571571075705015757757057795755"
-         "55657156756655",
-     "1275552191113212300012030439187146164646146646466749494799",
-@@ -158,7 +161,7 @@ int fbytes(unsigned char *buf, int num)
-     int ret;
-     BIGNUM *tmp = NULL;
- 
--    if (fbytes_counter >= 8)
-+    if (fbytes_counter >= 10)
-         return 0;
-     tmp = BN_new();
-     if (!tmp)
-@@ -532,8 +535,10 @@ int main(void)
-     RAND_seed(rnd_seed, sizeof(rnd_seed));
- 
-     /* the tests */
-+# if 0
-     if (!x9_62_tests(out))
-         goto err;
-+# endif
-     if (!test_builtin(out))
-         goto err;
- 
diff --git a/dev-libs/openssl/files/openssl-1.1.0i-CVE-2018-0735.patch b/dev-libs/openssl/files/openssl-1.1.0i-CVE-2018-0735.patch
new file mode 100644
index 000000000000..5762c04fa340
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.0i-CVE-2018-0735.patch
@@ -0,0 +1,44 @@
+From 56fb454d281a023b3f950d969693553d3f3ceea1 Mon Sep 17 00:00:00 2001
+From: Pauli <paul.dale@oracle.com>
+Date: Fri, 26 Oct 2018 10:54:58 +1000
+Subject: [PATCH] Timing vulnerability in ECDSA signature generation
+ (CVE-2018-0735)
+
+Preallocate an extra limb for some of the big numbers to avoid a reallocation
+that can potentially provide a side channel.
+
+Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
+(Merged from https://github.com/openssl/openssl/pull/7486)
+
+(cherry picked from commit 99540ec79491f59ed8b46b4edf130e17dc907f52)
+---
+ crypto/ec/ec_mult.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
+index 22bb30ffa1..ff882cce20 100644
+--- a/crypto/ec/ec_mult.c
++++ b/crypto/ec/ec_mult.c
+@@ -177,8 +177,8 @@ static int ec_mul_consttime(const EC_GROUP *group, EC_POINT *r,
+      */
+     cardinality_bits = BN_num_bits(cardinality);
+     group_top = bn_get_top(cardinality);
+-    if ((bn_wexpand(k, group_top + 1) == NULL)
+-        || (bn_wexpand(lambda, group_top + 1) == NULL))
++    if ((bn_wexpand(k, group_top + 2) == NULL)
++        || (bn_wexpand(lambda, group_top + 2) == NULL))
+         goto err;
+ 
+     if (!BN_copy(k, scalar))
+@@ -205,7 +205,7 @@ static int ec_mul_consttime(const EC_GROUP *group, EC_POINT *r,
+      * k := scalar + 2*cardinality
+      */
+     kbit = BN_is_bit_set(lambda, cardinality_bits);
+-    BN_consttime_swap(kbit, k, lambda, group_top + 1);
++    BN_consttime_swap(kbit, k, lambda, group_top + 2);
+ 
+     group_top = bn_get_top(group->field);
+     if ((bn_wexpand(s->X, group_top) == NULL)
+-- 
+2.19.1
+
diff --git a/dev-libs/openssl/files/openssl-1.1.1-CVE-2018-0735.patch b/dev-libs/openssl/files/openssl-1.1.1-CVE-2018-0735.patch
new file mode 100644
index 000000000000..295f5dbe8d82
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1-CVE-2018-0735.patch
@@ -0,0 +1,44 @@
+From b1d6d55ece1c26fa2829e2b819b038d7b6d692b4 Mon Sep 17 00:00:00 2001
+From: Pauli <paul.dale@oracle.com>
+Date: Fri, 26 Oct 2018 10:54:58 +1000
+Subject: [PATCH] Timing vulnerability in ECDSA signature generation
+ (CVE-2018-0735)
+
+Preallocate an extra limb for some of the big numbers to avoid a reallocation
+that can potentially provide a side channel.
+
+Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
+(Merged from https://github.com/openssl/openssl/pull/7486)
+
+(cherry picked from commit 99540ec79491f59ed8b46b4edf130e17dc907f52)
+---
+ crypto/ec/ec_mult.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
+index 7e1b3650e7..0e0a5e1394 100644
+--- a/crypto/ec/ec_mult.c
++++ b/crypto/ec/ec_mult.c
+@@ -206,8 +206,8 @@ int ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
+      */
+     cardinality_bits = BN_num_bits(cardinality);
+     group_top = bn_get_top(cardinality);
+-    if ((bn_wexpand(k, group_top + 1) == NULL)
+-        || (bn_wexpand(lambda, group_top + 1) == NULL)) {
++    if ((bn_wexpand(k, group_top + 2) == NULL)
++        || (bn_wexpand(lambda, group_top + 2) == NULL)) {
+         ECerr(EC_F_EC_SCALAR_MUL_LADDER, ERR_R_BN_LIB);
+         goto err;
+     }
+@@ -244,7 +244,7 @@ int ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
+      * k := scalar + 2*cardinality
+      */
+     kbit = BN_is_bit_set(lambda, cardinality_bits);
+-    BN_consttime_swap(kbit, k, lambda, group_top + 1);
++    BN_consttime_swap(kbit, k, lambda, group_top + 2);
+ 
+     group_top = bn_get_top(group->field);
+     if ((bn_wexpand(s->X, group_top) == NULL)
+-- 
+2.19.1
+
diff --git a/dev-libs/openssl/openssl-1.1.0i.ebuild b/dev-libs/openssl/openssl-1.1.0i-r1.ebuild
index f97d4157d7e4..4cc9eb656d0e 100644
--- a/dev-libs/openssl/openssl-1.1.0i.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0i-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -56,6 +56,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
+	"${FILESDIR}"/${P}-CVE-2018-0735.patch
 )
 
 src_prepare() {
@@ -98,7 +99,7 @@ src_prepare() {
 		-e $(has noman FEATURES \
 			&& echo '/^install:/s:install_docs::' \
 			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
 		Configurations/unix-Makefile.tmpl \
 		|| die
 
diff --git a/dev-libs/openssl/openssl-1.1.1.ebuild b/dev-libs/openssl/openssl-1.1.1-r1.ebuild
index 3b7cd3fc0197..01dfbd3ec61f 100644
--- a/dev-libs/openssl/openssl-1.1.1.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1-r1.ebuild
@@ -34,6 +34,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	usr/include/openssl/opensslconf.h
 )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-CVE-2018-0735.patch
+)
+
 src_prepare() {
 	# keep this in sync with app-misc/c_rehash
 	SSL_CNF_DIR="/etc/ssl"
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index da1674e57e2e..f9d51e50305c 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -15,5 +15,5 @@ DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94ae
 EBUILD protobuf-3.5.1.1.ebuild 2621 BLAKE2B f5d279625735d30a1025c414b20f60dd0385c7d8449fde3e45e6540fc1dcc90614c7e5d3c22c26ef89e7c0374f112ea84a5702ef679d01448923bfccb3364133 SHA512 fe1689582cbd86d2cb31bf85e44a1968524350b7fe62d2f97b20ec368e3046d567c746c26d7d773cba6f1d498f2527ad59dbb749e738458912e90b8b44d7e070
 EBUILD protobuf-3.5.2.ebuild 2491 BLAKE2B 7d13d39cca5329ea99664f9ebc22c38d5a88f013e0e8dabe7f8a8b4229b993943a7cba2cdb81c28e3070e9fc5a652185d17e988efc32883da34615a1453dd198 SHA512 5f4aa9d253c246d6420badffb87eb66939c3e2faf765426da34c85977431341e2ae7b9aac2595cbd24d1ae8be9ec836771b02e66508af84b74ddc0d695c3418d
 EBUILD protobuf-3.6.0.1.ebuild 2491 BLAKE2B 00444b7406baff1560defc88f3e3cde102cd24db454684fb2a919141fae3ba9000486b062f9a8128e0627930794af0f825555526d5a822363d944f2d064c7c52 SHA512 98ebec7694e6a0a47fa98b52371f74ca538f00ae649973e82eed51e4a3600e44c385a028dc3156c0a6c2232a305e317a95b389249090ebba6c77f77375ce49c1
-EBUILD protobuf-3.6.1.ebuild 2537 BLAKE2B f8ab500061fc434db98568270a6babc1b33a407997a5084d60378d851000cd9d4669bae169ff4091d3745005bb1c37618a1771d40a456d0664a9d052cd4bec38 SHA512 bd1c242e1741f51f5d4e4592226b8b2958ad788d2ef2224428dc2445b121e3efc38039549ca32b4991a61a721f4e63f728696253501acb21c2b8c7f52f2fdfed
+EBUILD protobuf-3.6.1.ebuild 2536 BLAKE2B e34a0da11d07855f4e9cf4aa60874f951d880ab1dd34e3729c14fc4d40b0dabf086a1d527389e3eb531c40d4b5020efea3a5c31e76f146f67035ca1d246f662f SHA512 a1b5a8123dccc5990372120458990cf585f56dd622d533266c4c48bca89e8dc379e8bfe30eec8761395d28aff3d023e6d7d09ab49a552bc4d6f7d1f88d0ec814
 MISC metadata.xml 543 BLAKE2B 43724e6d32707c62de4e1daffe50ba943c66286f6fe2357ec7171dad9feb7407049c26da517442957d61c11229617bd639d60bf070e7eedab8c871956cb3577a SHA512 f5a65ed219ff9f36c9d7bfdfe3bfe080ce0920e72f31f69820cc16822a04cdb38ec3c5d6b776b3c6cfde0bfc74c474558d048b706ac89e9405376e88504b8983
diff --git a/dev-libs/protobuf/protobuf-3.6.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.ebuild
index 380f12778c9f..592dd11bce45 100644
--- a/dev-libs/protobuf/protobuf-3.6.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 95f1f64ca01b..3ead241f43f5 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,10 +1,7 @@
-AUX spdlog-0.17.0-unbundle-fmt.patch 790 BLAKE2B 68a51e9dde9d25f0ec8978f4037c10fb6c8aa6cdc24d6a9b374b51ae85a0ff78a5bb6803c4a6ee1c9b2a68134e7ece90832c79dd0c86ef615b4e469dcb97cb05 SHA512 884893c67e3753efc7565aaa30694dcd0709cd472cd2e08a47584aca6b8aed4385b7f1da860777ba7f93eaf96c068b270f520c5a7aaa21c0d279994edc2addd1
-AUX spdlog-1.0.0-unbundle-fmt.patch 707 BLAKE2B a62f2c48007de2a48fb1f6f28bd0aa6066a80162043671a0469ced1d6f3cbb694adae7c527f78e5b03834698757bc81b1df364030d24b7ef3590088c5c0a6bd7 SHA512 331df98d98d76c5452321710f5ff0927ec9b10e27065e259118b1d4ec1b723853ca13e0930f7054b0bb9b411bb60f57f2dd3015481c26a6c886eca4da1c33c27
-DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6 SHA512 c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef
+AUX spdlog-1.0.0-unbundle-fmt.patch 700 BLAKE2B d98e7dc4ad4b2911192053d1aec564f1e07c5dd7a5bfca39f30fd08e7210bc79749fed03b6e6137671156f814f4c07b6e47f56e11c69806cdb28a1a478cae8dd SHA512 cf86983ccbb975df3804f10fd581a4edbe11ba1d2b43312fb27c05ffc95269c8eeca75e38970697f34d9c5861b925537bc0a9b0bcfd84617d328d640cf668db8
 DIST spdlog-1.0.0.tar.gz 183855 BLAKE2B 30d54fef03a83f968cfebacf95a484ff397126771a7ea022556aebd07e2f7694af35b278f75ee24372283ff1428e21247fd4329794d64a65bd6220a93f21db3c SHA512 4d3cbc1926be513256b5837a53fce425f6d352bb4ab262074f205450cd4eadc09feea9dc8d8c03b3f1e9792bcfbcff414be79e51d58234f540946428bbd88cd1
 DIST spdlog-1.1.0.tar.gz 183937 BLAKE2B 51af49f641df69e78835bd6b9545da53c0e111bab60a5f0dbf4a1d0e70101309394ffea195176ea371f08b772c2be1c22c2da16006fc9699f47593cf82a6c0fd SHA512 65fbe6e9dffb25e814f72f2ef7982eed213fc16edfabb1377f865c94fd0488190e160dfea83ac06979a41f2fb2fa47a454989ebee0a2c5012bd404b977648439
 DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B c3491a9c44d8a94c51d50c9ef36a2105f77e8fb61bb7b2b81a341609f433abbe3a74e7b4a467dd715a5d906f976740716488d07b4510f366556ab59d160ceefe SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1
-EBUILD spdlog-0.17.0.ebuild 778 BLAKE2B ca2793ad8aae142f0d08453d22f0369fd11d5cde01d7c94055af10d24bd987cf7ef995d142d43bcbb06961a693677f6b332373fe145d5e3270517f99ea2bf18d SHA512 f07f53320df02c39b51683d4ad461be31f8362f087e8c5f3d15112f14468df9bd8a881404bc1d75c0ddadecdae4301fa275ce8fdad17be5dddf92a7ce49f8e2d
 EBUILD spdlog-1.0.0.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
 EBUILD spdlog-1.1.0.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
 EBUILD spdlog-1.2.1.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
diff --git a/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch
deleted file mode 100644
index e3e0df833537..000000000000
--- a/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
---- a/include/spdlog/fmt/fmt.h
-+++ b/include/spdlog/fmt/fmt.h
-@@ -18,16 +18,11 @@
- #ifndef FMT_USE_WINDOWS_H
- #define FMT_USE_WINDOWS_H 0
- #endif
--#include "bundled/format.h"
--#if defined(SPDLOG_FMT_PRINTF)
--#include "bundled/printf.h"
--#endif
- 
--#else // external fmtlib
-+#endif // external fmtlib
- 
- #include <fmt/format.h>
- #if defined(SPDLOG_FMT_PRINTF)
- #include <fmt/printf.h>
- #endif
- 
--#endif
-diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
---- a/include/spdlog/fmt/ostr.h
-+++ b/include/spdlog/fmt/ostr.h
-@@ -11,8 +11,6 @@
- #ifndef FMT_HEADER_ONLY
- #define FMT_HEADER_ONLY
- #endif
--#include "bundled/ostream.h"
--#include "fmt.h"
--#else
--#include <fmt/ostream.h>
- #endif
-+
-+#include <fmt/ostream.h>
diff --git a/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
index 9b04f276ba55..c039dc47a6ae 100644
--- a/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
+++ b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
@@ -1,18 +1,18 @@
 diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
 --- a/include/spdlog/fmt/fmt.h
 +++ b/include/spdlog/fmt/fmt.h
-@@ -16,10 +16,7 @@
- #endif
+@@ -17,9 +17,7 @@
  #ifndef FMT_USE_WINDOWS_H
  #define FMT_USE_WINDOWS_H 0
--#endif
+ #endif
 -#include "bundled/core.h"
 -#include "bundled/format.h"
 -#else // external fmtlib
 +#endif // external fmtlib
++
  #include <fmt/core.h>
  #include <fmt/format.h>
- #endif
+-#endif
 diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
 --- a/include/spdlog/fmt/ostr.h
 +++ b/include/spdlog/fmt/ostr.h
diff --git a/dev-libs/spdlog/spdlog-0.17.0.ebuild b/dev-libs/spdlog/spdlog-0.17.0.ebuild
deleted file mode 100644
index e42aaade7db6..000000000000
--- a/dev-libs/spdlog/spdlog-0.17.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Very fast, header only, C++ logging library"
-HOMEPAGE="https://github.com/gabime/spdlog"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gabime/spdlog"
-else
-	SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-DEPEND="
-	<=dev-libs/libfmt-4.1.0
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.17.0-unbundle-fmt.patch" )
-
-src_configure() {
-	rm -r include/spdlog/fmt/bundled || die
-
-	local mycmakeargs=(
-		-DSPDLOG_BUILD_EXAMPLES=no
-		-DSPDLOG_BUILD_TESTING=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/spsdeclib/Manifest b/dev-libs/spsdeclib/Manifest
index 71dfcfda197a..e7143a5664cf 100644
--- a/dev-libs/spsdeclib/Manifest
+++ b/dev-libs/spsdeclib/Manifest
@@ -1,5 +1,4 @@
 AUX add_symlink.patch 804 BLAKE2B 2b0eec3a3a9008b887cd4af8f2900631fa347890cd37ced2930fbbe21b05cf213e6b088d2798173ae6c89a75467db0e6111e3e3e738d37eca7fbc884725b66ee SHA512 ca370e101057851e214009ef6880afa4a96711407d28e3ce34592317200c7da623996c7fcf7c31aefe55ffd6b649ab5ff970fc0134435114234f4436919b93ad
 DIST spsdeclib_5.1_source.zip 282236 BLAKE2B 6f37a3f0791baf9ca7a6bb3532be4cd7bcf90cdc2fc51def4d5daf4419c6b8c08aef87275555f359394e37e5ab6cf34d1e4903bea542ff99f7dc317238dd52b7 SHA512 26db037096c7c98c1af800577ce298c6b572541f665b512e80c6268818075d3c46d296b282268bd27a73a34f4063607ae8dd9d6d7a9301c441eb9cfce780f439
-EBUILD spsdeclib-5.1-r1.ebuild 1229 BLAKE2B 6f5db61971d14f698a331613e9b3f1007bba66589ef1775c6bec44c37d9909d515858cc120cfec3eafe1b8567a51208126ada351bc933851aedc593434da54de SHA512 05b957be77ba2f89e1030837fcde2e6b1cf420e2f79baeaeb74f5fbee8c2075c060046338a1e6d48e9ec76c2ed9edb8d49449a5201ec44043f9cfc394f49ee00
-EBUILD spsdeclib-5.1.ebuild 1029 BLAKE2B 65695616f1bc264cd585b93711d3a9f3b2e8433202176f46385f5d6a455302b872ef0fa93a5ef890098c6c1bea10e770efa66a13d90838900346cc06a749ca6e SHA512 f217e9898f7cfa87a0d72c70f0a7e597724df95fcd95363ac71200856ee75c55a7980bff1845bb3a724fe08a491173528465b7e33f0dca6ace202dda086ae1c2
+EBUILD spsdeclib-5.1-r1.ebuild 1189 BLAKE2B 77d87f09fc6c259018139f23c64ad02d738e9b677ac0e7ee4f77f6dc34b95aeca13faee82703a8e8936fd4f1ffa386d506507b5e7ba7cb1f7d64453a11a96fa3 SHA512 d833fe947a78438856640fe25b8a266996020b2037d12e47a7e5a69e961a20cecef4f3019eaba072737e18edf79ebdde1a33f37b509ce228876439befb132b19
 MISC metadata.xml 564 BLAKE2B 12f28c6acaf31c25b52acaf1bd5853216ffb6f0924c9f815e814c56b50aa657603ef0f3e0e89daf072e463feb34c135d59c7351174bdf3a4b347215937311ce1 SHA512 42781e4e7c15a066141221c92421c174dbc748de3ef94cd419d23c0c9ff85cadb90295543d126362ca8e346ba5171ec3a527a46f6018d0b16beda68c7b432b45
diff --git a/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild b/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
index db6e46f2659b..013853297f05 100644
--- a/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
+++ b/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Kryoflux SPS Decoder Library"
 HOMEPAGE="https://www.kryoflux.com/"
@@ -17,7 +17,7 @@ DEPEND="app-arch/unzip"
 
 S="${WORKDIR}/capsimg_source_linux_macosx/CAPSImg"
 
-DOCS=( "${WORKDIR}/DONATIONS.txt" "${WORKDIR}/HISTORY.txt" "${WORKDIR}/RELEASE.txt" )
+DOCS=( "${WORKDIR}"/{DONATIONS,HISTORY,RELEASE}.txt )
 
 PATCHES=( "${FILESDIR}"/add_symlink.patch )
 
diff --git a/dev-libs/spsdeclib/spsdeclib-5.1.ebuild b/dev-libs/spsdeclib/spsdeclib-5.1.ebuild
deleted file mode 100644
index 22f948e91481..000000000000
--- a/dev-libs/spsdeclib/spsdeclib-5.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="Kryoflux SPS Decoder Library"
-HOMEPAGE="https://www.kryoflux.com/"
-SRC_URI="https://www.kryoflux.com/download/${PN}_${PV}_source.zip"
-
-KEYWORDS="-* ~amd64 ~x86"
-LICENSE="Kryoflux-MAME"
-SLOT="0"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/capsimg_source_linux_macosx/CAPSImg"
-
-DOCS=( "${WORKDIR}/DONATIONS.txt" "${WORKDIR}/HISTORY.txt" "${WORKDIR}/RELEASE.txt" )
-
-PATCHES=( "${FILESDIR}"/add_symlink.patch )
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpacked ZIP-file contains two ZIP files, use the one for Linux
-	unpack "${WORKDIR}"/capsimg_source_linux_macosx.zip
-}
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS and CXXFLAGS
-	sed -i -e 's/-g//' configure.in || die
-	sed -i -e 's/CXXFLAGS="${CFLAGS}/CXXFLAGS="${CXXFLAGS}/' configure.in || die
-
-	mv configure.in configure.ac || die
-	eautoconf
-
-	# Fix permissions, as configure is not marked executable
-	chmod +x configure || die
-}
diff --git a/dev-libs/wlroots/Manifest b/dev-libs/wlroots/Manifest
new file mode 100644
index 000000000000..318e2ea4afe4
--- /dev/null
+++ b/dev-libs/wlroots/Manifest
@@ -0,0 +1,4 @@
+DIST wlroots-0.1.tar.gz 436459 BLAKE2B 8545adb7a9ffe1c4b071ddad1093472f45b24638b29b3c2898b4aa3629c364936be7bec348c9aac5a7d3ecda677df108361fbef08cda8fca9c6bb21639883c86 SHA512 43897ac5a512ea26ad9703182dab5de9c714a087449b108472f638148538a632a67cfc778edf3e77940fdd7bdba91d64a4dc4e4ed1903a150f13ca59237ce01e
+EBUILD wlroots-0.1.ebuild 2626 BLAKE2B 9f4a1587211f67948f6a8cccf173318231f76dde8fa39ccb329b7cc91579872870486e41eb064cbabdeb53708b6bb120dcd2ba138b263c7e457eb3fa5f6d5fd3 SHA512 4990121b1a5ef0d24361997ce6a2d41378c462f14c83b021cc03d19e4f4661cb48e2b9becbfbcd2891ed30e1690b6bf3f4d86f0b83889a96056f5ac233b2fefb
+EBUILD wlroots-9999.ebuild 2626 BLAKE2B 9f4a1587211f67948f6a8cccf173318231f76dde8fa39ccb329b7cc91579872870486e41eb064cbabdeb53708b6bb120dcd2ba138b263c7e457eb3fa5f6d5fd3 SHA512 4990121b1a5ef0d24361997ce6a2d41378c462f14c83b021cc03d19e4f4661cb48e2b9becbfbcd2891ed30e1690b6bf3f4d86f0b83889a96056f5ac233b2fefb
+MISC metadata.xml 1685 BLAKE2B b765b48a93cf34274cbb12f9ecf98aa5b51a6cc29800cd2871b37f2e04f1bb20ac9168dd2d1940bd7a3937de4dffa89125dadfaa139518f05cc3920b67aecaff SHA512 f815d97c115285f2c23f833979137e0622f14a38344e3c04da11075c13fd4d83fe3d2bec78c2da448fc88b09bb2259e66b2bbdf8479cebb5e0ff1443959ecf0a
diff --git a/dev-libs/wlroots/metadata.xml b/dev-libs/wlroots/metadata.xml
new file mode 100644
index 000000000000..b97edbb562b5
--- /dev/null
+++ b/dev-libs/wlroots/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>speedjack95@gmail.com</email>
+		<name>Niccolò Scatena</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Pluggable, composable, unopinionated modules for building a Wayland
+		compositor.
+
+		wlroots implements a huge variety of Wayland compositor features and
+		implements them right. By using wlroots, you get high performance,
+		excellent hardware compatibility, broad support for many wayland
+		interfaces, and comfortable development tools.
+
+		wlroots is developed under the direction of the <pkg>dev-libs/sway</pkg> project.
+	</longdescription>
+	<use>
+		<flag name="elogind">Enable support for rootless session via elogind</flag>
+		<flag name="icccm">Use xcb-icccm (from <pkg>x11-libs/xcb-util-wm</pkg>) util library for improved Xwayland introspection</flag>
+		<flag name="rootston">Build the rootston example compositor</flag>
+		<flag name="x11-backend">Enable support for handling input/output devices through <pkg>x11-libs/libxcb</pkg></flag>
+		<flag name="X">Enable support for X11 applications (XWayland)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">swaywm/wlroots</remote-id>
+		<maintainer status="active">
+			<email>sir@cmpwn.com</email>
+			<name>Drew DeVault</name>
+		</maintainer>
+		<bugs-to>https://github.com/swaywm/wlroots/issues</bugs-to>
+		<doc>https://github.com/swaywm/wlroots/wiki</doc>
+		<changelog>https://github.com/swaywm/wlroots/releases</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/wlroots/wlroots-0.1.ebuild b/dev-libs/wlroots/wlroots-0.1.ebuild
new file mode 100644
index 000000000000..eae2493458cd
--- /dev/null
+++ b/dev-libs/wlroots/wlroots-0.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/swaywm/wlroots.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/wlroots/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit fcaps meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind icccm rootston systemd x11-backend X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND=">=dev-libs/libinput-1.7.0:0=
+	>=dev-libs/wayland-1.16.0
+	>=dev-libs/wayland-protocols-1.15
+	media-libs/mesa[egl,gles2,gbm]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-237 )
+	icccm? ( x11-libs/xcb-util-wm )
+	systemd? ( >=sys-apps/systemd-237 )
+	x11-backend? ( x11-libs/libxcb:0=[xkb] )
+	X? (
+		x11-base/xorg-server[wayland]
+		x11-libs/libxcb:0=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/meson-0.48
+	virtual/pkgconfig"
+
+FILECAPS=( cap_sys_admin usr/bin/rootston )
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		-Dlibcap=$(usex filecaps enabled disabled)
+		-Dxcb-icccm=$(usex icccm enabled disabled)
+		-Dxcb-xkb=$(usex x11-backend enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+		-Drootston=$(usex rootston true false)
+		"-Dexamples=false"
+		"-Dwerror=false"
+	)
+	if use systemd ; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
+	elif use elogind ; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
+	else
+		emesonargs+=("-Dlogind=disabled")
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	if use rootston ; then
+		dobin "${BUILD_DIR}"/rootston/rootston
+		newdoc rootston/rootston.ini.example rootston.ini
+	fi
+
+	meson_src_install
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+	if use rootston ; then
+		elog ""
+		elog "You should copy (and decompress) the example configuration file"
+		elog "from ${EROOT:-${ROOT}}/usr/share/doc/${PF}/rootston.ini"
+		elog "to the working directory from where you launch rootston"
+		elog "(or pass the '-C path-to-config' option to rootston)."
+		if ! use systemd && ! use elogind ; then
+			elog ""
+			elog "If you use ConsoleKit2, remember to launch rootston using:"
+			elog "exec ck-launch-session rootston"
+
+			fcaps_pkg_postinst
+		fi
+	fi
+}
diff --git a/dev-libs/wlroots/wlroots-9999.ebuild b/dev-libs/wlroots/wlroots-9999.ebuild
new file mode 100644
index 000000000000..eae2493458cd
--- /dev/null
+++ b/dev-libs/wlroots/wlroots-9999.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/swaywm/wlroots.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/wlroots/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit fcaps meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind icccm rootston systemd x11-backend X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND=">=dev-libs/libinput-1.7.0:0=
+	>=dev-libs/wayland-1.16.0
+	>=dev-libs/wayland-protocols-1.15
+	media-libs/mesa[egl,gles2,gbm]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-237 )
+	icccm? ( x11-libs/xcb-util-wm )
+	systemd? ( >=sys-apps/systemd-237 )
+	x11-backend? ( x11-libs/libxcb:0=[xkb] )
+	X? (
+		x11-base/xorg-server[wayland]
+		x11-libs/libxcb:0=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/meson-0.48
+	virtual/pkgconfig"
+
+FILECAPS=( cap_sys_admin usr/bin/rootston )
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		-Dlibcap=$(usex filecaps enabled disabled)
+		-Dxcb-icccm=$(usex icccm enabled disabled)
+		-Dxcb-xkb=$(usex x11-backend enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+		-Drootston=$(usex rootston true false)
+		"-Dexamples=false"
+		"-Dwerror=false"
+	)
+	if use systemd ; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
+	elif use elogind ; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
+	else
+		emesonargs+=("-Dlogind=disabled")
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	if use rootston ; then
+		dobin "${BUILD_DIR}"/rootston/rootston
+		newdoc rootston/rootston.ini.example rootston.ini
+	fi
+
+	meson_src_install
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+	if use rootston ; then
+		elog ""
+		elog "You should copy (and decompress) the example configuration file"
+		elog "from ${EROOT:-${ROOT}}/usr/share/doc/${PF}/rootston.ini"
+		elog "to the working directory from where you launch rootston"
+		elog "(or pass the '-C path-to-config' option to rootston)."
+		if ! use systemd && ! use elogind ; then
+			elog ""
+			elog "If you use ConsoleKit2, remember to launch rootston using:"
+			elog "exec ck-launch-session rootston"
+
+			fcaps_pkg_postinst
+		fi
+	fi
+}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 6301949c3ad7..88a45744c111 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -5,10 +5,12 @@ DIST xapian-bindings-1.4.4.tar.xz 1117140 BLAKE2B 2240ecbe136443e9beea8871731a72
 DIST xapian-bindings-1.4.5.tar.xz 1118884 BLAKE2B 507b06f0121e5a56224250bfe7b19795eb9fd2fba977d12022d054e7b832fd70af70085ad576dab41efcde261f9ecd48179646f1ea67aaa266fb6272358eb69a SHA512 e39ece495e25077990db3d06554306567c52c6f45ad55a65005cb97e18086ee18947e41d0d612157b891b61e015881385bcb082a03aa0c6452565e90d09e8275
 DIST xapian-bindings-1.4.6.tar.xz 1121532 BLAKE2B ecac35f9510fadb39f260c1ebd03220ebe01131e4a5fcc2842778adccdf9bf3e3ae6161dd66dc75774bfb1643f1dccc99a3bbb99894e49dbbdd65f838f827a4d SHA512 e1d8d4c79ef8eb1b890be955b14eca7e9c7aafc6051cf9080d67948455f82ed68ab518343f532cde2a1c9e07d94b3aae8b8f5130db158c6badc9b6d118ceb733
 DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a627a32e5209d8b79f435dc85c899cf14619af6165265e624e2ba8806f3c91dd35d71d98c4a47f5d6f4fba1b7fb83700c0d0 SHA512 c904cd3abf19d68495b0487ea77265fdc92a3cd8b1c2437b89034efd349ce41198bbc4abca49f259f71a1ba0fd269b2cf9b6dd4c1607678a73cbed4de9c5a1d5
+DIST xapian-bindings-1.4.8.tar.xz 1123812 BLAKE2B 5aa496ff3cfe06a40fa8db6a04cdc9041f4a0d9f12c7a61565f10c7d360490a7c8a7c745d91c9eda45b9d9bc58bd6a2bbae02aa9dd7ff1949ac59f7e09b090df SHA512 f979c32b096ecdc7a71b2bd032c6d0e7131f3d304e47e44005989ca79ea1f940c39626c60a8e52ff3cdb2cb380aa5ddf82a99bae08e06629c0bd47d8e0bfa7cc
 EBUILD xapian-bindings-1.2.24.ebuild 5543 BLAKE2B 77c5f97e4c056eb60674e59a94736fd1276569ac8e7bb89bbb42d9360ffa36ad94065a0b378a9eae21568333dbb3ffbc80877ec69bdf8a98bcbd884b55f07cc7 SHA512 b219ee45083693768bb086e1cb4e4ed2da83786dfa8786210d26bf3b50e0d42efcd2a5b73a90ce1144fd36d666d2c61e20380a13614ff3ddb69e1af09f62179e
 EBUILD xapian-bindings-1.2.25.ebuild 5551 BLAKE2B d0e1431b390f2ce7f43bc5ceddb0e205dc0118255cb6a9a9844a3005845a1de10ff9834369118532ee956ebdd8f5d4fb43e5636df4d488502967ad26b37e78d6 SHA512 cea9b9dbb61721ce41ec481099c8cdc27fc7d6da5b88c7777503348b124442aecb70b0c888d3d1560332679ae3c8a3ab60eacde4b6154abba9c2be60a853c36a
 EBUILD xapian-bindings-1.4.4.ebuild 3522 BLAKE2B 1dcaa9c2383685db410e9d7421cc55990598444c3360b698ece2d9ce051cf11d28966ec93d08f599e6036154fb5fb7a07855cf5b7dc6319f140a90d6d989312e SHA512 f57942ee1c7b2ffdb42799df989fc3634f3bdde4b61f9e423d7c5e343645cf28eb67b99694a6b82695f371f52c2b235e9e3dff7d07112dda1267a80dbcacadf1
 EBUILD xapian-bindings-1.4.5.ebuild 6502 BLAKE2B a19fd69e1d7366ddd9da3ea04a9052d0cba77115599815ff40b9cd22c30a38c9802e1f6a22b328fd9d06925dbdc5ba1ebd383eb8495236312dc5f9221ea31729 SHA512 7c25358e53d2e57b16068b260df9d6b3929586c6d8ff2288d9a68fb8e1f2b9054d3b50843d3bb275bd137efd696074c15c7181b57697e06f706ea51e2c9813f6
 EBUILD xapian-bindings-1.4.6.ebuild 6509 BLAKE2B 01fbe871700b6d4d7f7f5a93c971c1ec4463dff5a2a7165e7e1b603b5f02fb2b09e3a1286ac0f22b65ed8e7ef6794f5ae692abc8aab59541a9e0537ba67e96e8 SHA512 5ca05c47b2f9344c698b2825c28a378a0c15ea2cb44adc4f4de0a227ae1240dee21b2272d3d3db187e05a4facaa5c1ac877ccdf4448ac2b262a01c336a3ce603
 EBUILD xapian-bindings-1.4.7.ebuild 6509 BLAKE2B 123fddd3675c9006a6d1b284660346e4d5f02f3ab399613d0c492bc0a0beb7abde3fe8dc9daa2eb25739cf7b21ea845aefcde99dc66fd23b879158ded7fe0d9d SHA512 ff467ef72f453a6e860a5509e40f26e5d34c07484e318a1ccb472e337d1c094e42fa5cfdb21b0390203691371086999c0de4fd64c0a9fd6ecf0ce4156bdbfd40
+EBUILD xapian-bindings-1.4.8.ebuild 6506 BLAKE2B b694b49a182513a041891384e190b2322ee9fe00a7d67714d63ef24379c6eeb8b3c051d410c8fd17f083686ccc206d61f4eac85ef87233c48272ea14f5bd5d81 SHA512 c8e3b5fe54651c9825badcad0093f83d6e9f819f335a42f5aa686aa58e29c6ff2493bb38bb9b8a7ccc6436f044139ecb8718f7cbc96035d3fea47df7bcf8aa96
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.8.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.8.ebuild
new file mode 100644
index 000000000000..88203e937fa1
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.8.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads(+)"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+USE_RUBY="ruby22 ruby23 ruby24"
+RUBY_OPTIONAL="yes"
+
+inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="http://www.xapian.org/"
+SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java lua mono perl php python ruby tcl"
+REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+COMMONDEPEND=">=dev-libs/xapian-1.4.8:0/30
+	lua? ( dev-lang/lua:= )
+	perl? ( dev-lang/perl:= )
+	python? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	tcl? ( dev-lang/tcl:= )
+	mono? ( dev-lang/mono )"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}/${P}"
+
+has_basic_bindings() {
+	# Update this list if new bindings are added that are not built
+	# multiple times for multiple versions like php, python and ruby are
+	return $(use mono || use java || use lua || use perl || use tcl)
+}
+
+php_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_copy_sources
+}
+
+php_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_foreach_variant "$@"
+}
+
+ruby_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_copy_sources
+}
+
+ruby_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_foreach_variant "$@"
+}
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			# Unfortunately required for php-ext-source-r3_createinifiles().
+			mkdir "${WORKDIR}/${php_slot}"
+		done
+	fi
+}
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+
+	# http://trac.xapian.org/ticket/702
+	export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+	if use php; then
+		php_copy_sources
+	fi
+
+	if use python; then
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		ruby_copy_sources
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	if has_basic_bindings ; then
+		local conf=(
+			--disable-documentation
+			$(use_with mono csharp)
+			$(use_with java)
+			$(use_with lua)
+			$(use_with perl)
+			$(use_with tcl)
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+		)
+
+		if use java; then
+			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+		fi
+
+		if use perl; then
+			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+		fi
+
+		if use lua; then
+			local -x LUA_INC="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_INC lua)"
+			local -x LUA_LIB="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_CMOD lua)"
+		fi
+
+		econf "${conf[@]}"
+	fi
+
+	php_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-python
+			--without-python3
+			--without-ruby
+			--without-tcl
+		)
+		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
+			myconf+=(
+				--with-php
+				--without-php7
+			)
+			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
+			myconf+=(
+				--without-php
+				--with-php7
+			)
+			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		fi
+
+		econf "${myconf[@]}"
+	}
+
+	if use php; then
+		addpredict /usr/share/snmp/mibs/.index
+		addpredict /var/lib/net-snmp/mib_indexes
+
+		php_foreach_impl run_in_build_dir php_configure
+	fi
+
+	python_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-ruby
+			--without-tcl
+		)
+		if python_is_python3; then
+			myconf+=( --with-python3 )
+		else
+			myconf+=( --with-python )
+		fi
+
+		# Avoid sandbox failures when compiling modules
+		addpredict "$(python_get_sitedir)"
+
+		econf "${myconf[@]}"
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+
+	ruby_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--with-ruby
+			--without-tcl
+		)
+		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
+
+		econf "${myconf[@]}"
+	}
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir ruby_configure
+	fi
+}
+
+src_compile() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake
+	fi
+
+	if use python; then
+		unset PYTHONDONTWRITEBYTECODE
+		python_foreach_impl run_in_build_dir emake
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake
+	fi
+}
+
+src_test() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake check
+	fi
+}
+
+src_install() {
+	if has_basic_bindings ; then
+		emake DESTDIR="${D}" install
+	fi
+
+	if use java; then
+		java-pkg_dojar java/built/xapian.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso java/.libs/libxapian_jni.so
+		rm -rf "${D}var" || die "could not remove java cruft!"
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		php-ext-source-r3_createinifiles
+		# php-ext-source-r3_createinifiles() changes current directory.
+		cd "${S}"
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	# For some USE combinations this directory is not created
+	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 288805f4ae3a..33e6e57200a8 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -4,10 +4,12 @@ DIST xapian-core-1.4.4.tar.xz 2807952 BLAKE2B 92f30c063dca4bd7806c1ab025d6b75564
 DIST xapian-core-1.4.5.tar.xz 2810612 BLAKE2B 7784e69e3ca064751d829173949fcde65661c2c2070fdc8392cf2b6d40874a3e5b1265e61f25dd39b33e179b3fe3842b67f33a55523c3a18e9b65528e6a23a1e SHA512 cff97a856a406583ca81164ddb704a0eeae7d8d6f94ce3b3f53d5208d657423e87dd06bdc7acb5e5904765bce1cefbc98365cde315c1d46f7b18cfba7b022ae6
 DIST xapian-core-1.4.6.tar.xz 2839964 BLAKE2B ab35e3098d8cf99656539968171073683811dc9a98b7d26e389c0cb1e8d1b70f9007e0ba61defe496713cb0f304a0fed7afa253174e900c0756084ab40721573 SHA512 f08168eba26a24ea00c2219d2cdfac1d904b51162fdd98d437564786375245e00010986a7d6e9c8c7548ae19aab80434b5cb0051252f902b40db2976b1008fe2
 DIST xapian-core-1.4.7.tar.xz 2874172 BLAKE2B 917a35ca717ed4437f4a617ce0b6ac07d5936e07aac6bfa9d6878c12ed0c38e7ca994ad943b6dc7a5cd2fe131a445c5a7859f2286c2201dd048020569ce1a0bf SHA512 9e77a78bd63036966ebb9bbed91e36fef17b37c9465c8d4b7dc8041f0e24b040e6520de645babfeeade952771d145176a204328718cfa8bc2291bb6fdbe840d2
+DIST xapian-core-1.4.8.tar.xz 2880432 BLAKE2B 8468a33614d8c7617755cfe4cc79e72ab42612a79be9fb684525e268efe80c42ce902a60a44dc5548c70b719d752e15927ce24b4ab457905022ae806bffb1f11 SHA512 9ed1f34ec1bf53a4dc628ebb8d080af79a4ac6a315bf1ae52441f0ac3a63e5478ed02887382116b28157b926e685fdc730489426edce560aa4bba27cb7295e48
 EBUILD xapian-1.2.24.ebuild 1553 BLAKE2B 77d756575e5d0fdabd59f970ad6edfa4a197c1083a9080392725b6d74e6d9d0f948bed1dd7dbdeb29c0a16bbe70490af0a5b4505e539cee62272949768ddb931 SHA512 9e7f9ed40d9087f3c1fcb1cfe32e30646d2041e4abcc4f5f26940356b40e6d8bf9a80d7d57c86d3f4ecae369d974bbc0f141628fae831903f16d0b81ca336a48
 EBUILD xapian-1.2.25.ebuild 1827 BLAKE2B c5482b6cab85fcc237ef1c6b8728af9ab3438538a117f378bfb1e32c8779990465054e6235bf184da0f13744fac80498bdba85a22b142ce905064d832a9b320a SHA512 32bf0df37b927f5c1a470d6706d0097edf4b270e7e5251a614eb12fba11068caffaef31ee77cfeb9098c2e5c737642bfebd1f7fbc70736144de6523c8dbbda6f
 EBUILD xapian-1.4.4.ebuild 1908 BLAKE2B cbb63641f65e5bd48dcf353a5131e5199d9b9574a166528375a8dbffeb324e89b8c0129778241486e9cc8e9ac9ff18c464651e63f09b21a9e9e473698ad31444 SHA512 d1369efedd3aebc02ae4bbb7e2c201accad3a825248cb51cc14682266692a860c57e621ae3f7c2fc2a8183b612a9d824d99dff5ad5bbb6d3a9dd47f199a31b2d
-EBUILD xapian-1.4.5.ebuild 1910 BLAKE2B 6cb7b9aebebd2635c27b8a00757bb850917202844074f2f365ff0283a6f72c423deebe71ee6fde786f554ef3cbff84d1ba5706089071d6dcd7a63b9fba6f7c6c SHA512 92d3339e7e78b32941bd0c73873aa579b1013296f6979816d0f68f85f9bbc0d217684a8f46ac59e71e4ba829b39fb0b7dfd08663cddb36bdba1421f332ab78f2
+EBUILD xapian-1.4.5.ebuild 1906 BLAKE2B b7402f69fb0d7f5e2dffa92651cafbb588533d9eba1eacb1a3dcc91245f7b609ab74ddbfdcef014acb267a85a1dc819deaa2b7ad0b83845b923ea7350e79561c SHA512 eeb3f0d3e7cacb4c8be2c92a889d53c470023fc3ae583509af879e3a546f8212d64527afe38cbef6d7e674292b4c20d03ab5454d48f510bb0f98c1f20bb2d68a
 EBUILD xapian-1.4.6.ebuild 1917 BLAKE2B f7a307085cc7322e471a9e0418c6d8f2f65b78b387f32dd4cd8a0bab719c8646cb22d18ffa6707ae5689288b7d6cefdd324e2b10cec20882828d9c6bde89022e SHA512 64b7c6a931b1611795cd62327529a7eef4a4897e0c345c20ba8c5e4c559e7d45ec2f932d87174b49fdfe8a309de8d9cf4c298ded68fb1b67214db8fd637ee032
 EBUILD xapian-1.4.7.ebuild 1917 BLAKE2B f7a307085cc7322e471a9e0418c6d8f2f65b78b387f32dd4cd8a0bab719c8646cb22d18ffa6707ae5689288b7d6cefdd324e2b10cec20882828d9c6bde89022e SHA512 64b7c6a931b1611795cd62327529a7eef4a4897e0c345c20ba8c5e4c559e7d45ec2f932d87174b49fdfe8a309de8d9cf4c298ded68fb1b67214db8fd637ee032
+EBUILD xapian-1.4.8.ebuild 1914 BLAKE2B 8d08a55a1db74ba1d71d6f5208627a41861d7b5759670e58749ff52a796c471b1e4fd1293ecee3748c719ed82842bf8af7a2b84107d63aa5b4b515774fe3d048 SHA512 5d143c95dad7d470705065bbb23508b774b9557a65d80bd22f8b56519f49d82144354fe05192574daa7a4c4518c129795d1b1eb5b3917a7b1159cc63a00d0497
 MISC metadata.xml 932 BLAKE2B 303ba679d42d5917930aa698ca96fa22e2000b4ffbfe3113b67119b61dd51140b1662bc090078027f7b00d0ad04e0e61792e74d1bddfc625e46258568b5c5f57 SHA512 874335952e31a9da1d105b82eac0c209259a85dfcdc8b7171cc1ff7d48694838bf9c3037fc4ff0450298b3c6b6fbb143ecfe7497727e8f18b684ff630caeb49c
diff --git a/dev-libs/xapian/xapian-1.4.5.ebuild b/dev-libs/xapian/xapian-1.4.5.ebuild
index 7eb786501531..5b1d30b476f0 100644
--- a/dev-libs/xapian/xapian-1.4.5.ebuild
+++ b/dev-libs/xapian/xapian-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.8.ebuild b/dev-libs/xapian/xapian-1.4.8.ebuild
new file mode 100644
index 000000000000..311fd46fc567
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.4.8.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils multilib-minimal
+
+MY_P="${PN}-core-${PV}"
+
+DESCRIPTION="Xapian Probabilistic Information Retrieval library"
+HOMEPAGE="http://www.xapian.org/"
+SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/30" # ABI version of libxapian.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-solaris"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="inmemory? ( chert )"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myconf=""
+
+	if use cpu_flags_x86_sse2; then
+		myconf="${myconf} --enable-sse=sse2"
+	else
+		if use cpu_flags_x86_sse; then
+			myconf="${myconf} --enable-sse=sse"
+		else
+			myconf="${myconf} --disable-sse"
+		fi
+	fi
+
+	myconf="${myconf} $(use_enable static-libs static)"
+
+	use glass || myconf="${myconf} --disable-backend-glass"
+	use chert || myconf="${myconf} --disable-backend-chert"
+	use inmemory || myconf="${myconf} --disable-backend-inmemory"
+
+	myconf="${myconf} --enable-backend-remote --program-suffix="
+
+	ECONF_SOURCE=${S} econf $myconf
+}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/xapian/postingsource.h
+	/usr/include/xapian/attributes.h
+	/usr/include/xapian/valuesetmatchdecider.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/types.h
+	/usr/include/xapian/positioniterator.h
+	/usr/include/xapian/registry.h
+)
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# bug #573466
+	ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
+
+	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
+
+	dodoc AUTHORS HACKING PLATFORMS README NEWS
+
+	prune_libtool_files --all
+}
+
+multilib_src_test() {
+	emake check VALGRIND=
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-11-03 08:36:22 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-11-03 08:36:22 +0000
commit	f65628136faa35d0c4d3b5e7332275c7b35fcd96 (patch)
tree	021998302365c5652e37824b6c26d4d969a62055 /dev-libs
parent	70b82ae359a5538711e103b0e8dfb92654296644 (diff)