gentoo resync : 25.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
commit: 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree: 6208a7f4fc744684fce0f55acbb47511acace498 /dev-libs
parent: 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)
121 files changed, 2177 insertions, 746 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 106d9c5b8a38..622ef63394f9 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index bc26f83aabe7..3c09ea56b1f4 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -2,7 +2,7 @@ AUX apr-util-1.5.3-sysroot.patch 1234 BLAKE2B 58e66e338ae936b7c206eda88a97f99785
 DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a35c9b2ea67323edde52c88e4affc0ea0a25a0a64f42c82f0927482d22dc6049286df8cb6048f8bbb61659beb0ac SHA512 ca877d8e444218c4ba0f28063ee075ddcd6c0a487b692dc80ef442fe775ec4eeb337c6957853772e8082e27edcb450d7e909c2c6c3ab4a95bbf0a5ee5ea4a2d1
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
 EBUILD apr-util-1.5.4-r3.ebuild 3696 BLAKE2B 740a3c17f34c719f7b3d977a6866eb45061504d31c93d5fc59189bb3161ef8dd9b641308e17999789f6c547c4a56ce765fb4cbff8052d6e48f5e54ad279708b4 SHA512 024b8b03d382a0e50f6eac0a6e48d72b5e0852d60824df671e5f7b793c06f323b89037507eb131d05b785c3c03bb42862f133f054d89720dee25ab5b67d2f432
-EBUILD apr-util-1.5.4.ebuild 3226 BLAKE2B af898360f8c4bf407d32c728b947e81caa11fad30ed3c7ee78e8c376a53b404708bd2f9b66b21d206e4628ff697aa2302ae51e56c5b591995aeafee9f4cf1316 SHA512 0240c037252088a9c1317b4092384730b041ff024e456a2f7c86860545447510be4614e97bf9845d4ef93a251aed346f4700159310611af08f67b74248bf45e6
+EBUILD apr-util-1.5.4.ebuild 3225 BLAKE2B da5ff3b9cd371cab9220d3df59dbca2f8705eda3db4842955a30146e9458b6d037ca1d64dfca6d77317bfc3affbfd8ae73c85113ff5e4fe94c4dfa6532313901 SHA512 1811870406d1cf2eff475c9bd13bddf58b7a7b4f86743b003095fff20303cfaec11ef02aaeb312154831a6d2eacaf0d9a612bdd4d5bd880b272a625e8d04e26e
 EBUILD apr-util-1.6.1-r1.ebuild 3603 BLAKE2B 0fc6012bf57e8ad9eb2f64ec9b00572d85da07889094a2eee7b93d79050153bd0f0dbef6c90591d1425e459c1489cf87b87f9415f1e41baa4e4f6e67443bbb28 SHA512 fdbffe248164f9f5a4cf7949058db79195e3883f05f639e4ea42d5eeefcf640263a75e1010db03bfc56e028b11366929958024b3e74b1ee4071b1892567be042
 EBUILD apr-util-1.6.1.ebuild 3602 BLAKE2B 429e1d93762ee3c4ed62b32acd739972f5e389201a63692e2eaa10e62d708c57a595369ed066b65269bad86a5e188ab5e4ad1e57dfc8250c1c019ef734c34a44 SHA512 6045a8af31e1fe8cdbf0e1210ae856badea9b1a80ffbd095fcbd2a3bc9e9e7b94eef8094f670eeb17c26f143e450b986620fdf250bbe74b90772f30ebfa24fdd
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.5.4.ebuild b/dev-libs/apr-util/apr-util-1.5.4.ebuild
index 4cfbc7403195..87915cb78e0e 100644
--- a/dev-libs/apr-util/apr-util-1.5.4.ebuild
+++ b/dev-libs/apr-util/apr-util-1.5.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest
new file mode 100644
index 000000000000..113d4581cafd
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/Manifest
@@ -0,0 +1,3 @@
+DIST aws-sdk-cpp-1.5.17.tar.gz 16424254 BLAKE2B 3beeda2085a487b007c088b149a84b7c561ebc75a3a431d2c0139d1f2c6b3c1182e5e00df349436cd5d1f25fbbf60a963db69b562503903cd4a5ccf4db01aac0 SHA512 1a69098c0ddaba46e0d336875029dbdea0d92a3165ee7eed77d1425ea375b401138235f4fa71604fd3df89db633664cd9c36c1fad7989d974f28f7e1785b95c0
+EBUILD aws-sdk-cpp-1.5.17.ebuild 2449 BLAKE2B 79431fa471037c97362990b9ec4e748357f40190214b876120e2588ad21f34cdc8a339e06ae6ad9f8693e17966678a0a5edc168c74566d036419a28952159291 SHA512 fc1f3103362d0e3f39f7d79b5a5f7efabab84e3515547a1d7164502207da74ed62ba818a948e27d7341faaab9552278bcdecb0dfd39a7a18faae00cf0dd71af2
+MISC metadata.xml 11778 BLAKE2B 5d22b811b6d8bc3d58c5aecad1b16bc167be026f7e84dd95f16803e1f867aea5c706f6367ba4cbeb207d8cab085a2281c233c8f090d4e1fb6a369a42005d6ee7 SHA512 131244cd7adda956a363241139dfa7b6c9eaee3a5a8d6d8e59a0e4a743d51e0336260654fb459db1e9b00131dd5eb9f82842f860044c5e30166c44554dcb1a00
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.5.17.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.5.17.ebuild
new file mode 100644
index 000000000000..81c7a27487bf
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.5.17.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="AWS SDK for C++"
+HOMEPAGE="https://aws.amazon.com/sdk-for-cpp/"
+SRC_URI="https://github.com/aws/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ALL_AWS_TARGETS="access-management acm acm-pca alexaforbusiness apigateway application-autoscaling appstream appsync athena autoscaling autoscaling-plans AWSMigrationHub batch budgets ce cloud9 clouddirectory cloudformation cloudfront cloudhsm cloudhsmv2 cloudsearch cloudsearchdomain cloudtrail codebuild codecommit codedeploy codepipeline codestar cognito-identity cognito-idp cognito-sync comprehend config connect core cur datapipeline dax devicefarm directconnect discovery dms ds dynamodb dynamodbstreams ec2 ecr ecs eks elasticache elasticbeanstalk elasticfilesystem elasticloadbalancing elasticloadbalancingv2 elasticmapreduce elastictranscoder email es events firehose fms gamelift glacier glue greengrass guardduty health iam identity-management importexport inspector iot iot1click-devices iot1click-projects iotanalytics iot-data iot-jobs-data kinesis kinesisanalytics kinesisvideo kinesis-video-archived-media kinesis-video-media kms lambda lex lex-models lightsail logs machinelearning macie marketplacecommerceanalytics marketplace-entitlement mediaconvert medialive mediapackage mediastore mediastore-data mediatailor meteringmarketplace mobile mobileanalytics monitoring mq mturk-requester neptune opsworks opsworkscm organizations pi pinpoint polly pricing queues rds redshift rekognition resource-groups resourcegroupstaggingapi route53 route53domains s3 s3-encryption sagemaker sagemaker-runtime sdb secretsmanager serverlessrepo servicecatalog servicediscovery shield sms snowball sns sqs ssm states storagegateway sts support swf text-to-speech transcribe transfer translate waf waf-regional workdocs workmail workspaces xray"
+
+for module in ${ALL_AWS_TARGETS}; do
+	if [ "$module" = "core" ]; then
+		IUSE_AWS_TARGETS+=" aws_targets_${module}"
+	else
+		IUSE_AWS_TARGETS+=" -aws_targets_${module}"
+	fi
+done
+IUSE="static-libs test ${IUSE_AWS_TARGETS}"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCPP_STANDARD=17
+		-DENABLE_TESTING=$(usex test)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_ONLY="${AWS_TARGETS// /;}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/aws-sdk-cpp/metadata.xml b/dev-libs/aws-sdk-cpp/metadata.xml
new file mode 100644
index 000000000000..4520e67d29ef
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/metadata.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>amit.prakash.ambasta@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="aws_targets_access-management">SDK Support for AWS access-management</flag>
+		<flag name="aws_targets_acm">SDK Support for AWS acm</flag>
+		<flag name="aws_targets_acm-pca">SDK Support for AWS acm-pca</flag>
+		<flag name="aws_targets_alexaforbusiness">SDK Support for AWS alexaforbusiness</flag>
+		<flag name="aws_targets_apigateway">SDK Support for AWS apigateway</flag>
+		<flag name="aws_targets_application-autoscaling">SDK Support for AWS application-autoscaling</flag>
+		<flag name="aws_targets_appstream">SDK Support for AWS appstream</flag>
+		<flag name="aws_targets_appsync">SDK Support for AWS appsync</flag>
+		<flag name="aws_targets_athena">SDK Support for AWS athena</flag>
+		<flag name="aws_targets_autoscaling">SDK Support for AWS autoscaling</flag>
+		<flag name="aws_targets_autoscaling-plans">SDK Support for AWS autoscaling-plans</flag>
+		<flag name="aws_targets_AWSMigrationHub">SDK Support for AWS AWSMigrationHub</flag>
+		<flag name="aws_targets_batch">SDK Support for AWS batch</flag>
+		<flag name="aws_targets_budgets">SDK Support for AWS budgets</flag>
+		<flag name="aws_targets_ce">SDK Support for AWS ce</flag>
+		<flag name="aws_targets_cloud9">SDK Support for AWS cloud9</flag>
+		<flag name="aws_targets_clouddirectory">SDK Support for AWS clouddirectory</flag>
+		<flag name="aws_targets_cloudformation">SDK Support for AWS cloudformation</flag>
+		<flag name="aws_targets_cloudfront">SDK Support for AWS cloudfront</flag>
+		<flag name="aws_targets_cloudhsm">SDK Support for AWS cloudhsm</flag>
+		<flag name="aws_targets_cloudhsmv2">SDK Support for AWS cloudhsmv2</flag>
+		<flag name="aws_targets_cloudsearch">SDK Support for AWS cloudsearch</flag>
+		<flag name="aws_targets_cloudsearchdomain">SDK Support for AWS cloudsearchdomain</flag>
+		<flag name="aws_targets_cloudtrail">SDK Support for AWS cloudtrail</flag>
+		<flag name="aws_targets_codebuild">SDK Support for AWS codebuild</flag>
+		<flag name="aws_targets_codecommit">SDK Support for AWS codecommit</flag>
+		<flag name="aws_targets_codedeploy">SDK Support for AWS codedeploy</flag>
+		<flag name="aws_targets_codepipeline">SDK Support for AWS codepipeline</flag>
+		<flag name="aws_targets_codestar">SDK Support for AWS codestar</flag>
+		<flag name="aws_targets_cognito-identity">SDK Support for AWS cognito-identity</flag>
+		<flag name="aws_targets_cognito-idp">SDK Support for AWS cognito-idp</flag>
+		<flag name="aws_targets_cognito-sync">SDK Support for AWS cognito-sync</flag>
+		<flag name="aws_targets_comprehend">SDK Support for AWS comprehend</flag>
+		<flag name="aws_targets_config">SDK Support for AWS config</flag>
+		<flag name="aws_targets_connect">SDK Support for AWS connect</flag>
+		<flag name="aws_targets_core">SDK Support for AWS core</flag>
+		<flag name="aws_targets_cur">SDK Support for AWS cur</flag>
+		<flag name="aws_targets_datapipeline">SDK Support for AWS datapipeline</flag>
+		<flag name="aws_targets_dax">SDK Support for AWS dax</flag>
+		<flag name="aws_targets_devicefarm">SDK Support for AWS devicefarm</flag>
+		<flag name="aws_targets_directconnect">SDK Support for AWS directconnect</flag>
+		<flag name="aws_targets_discovery">SDK Support for AWS discovery</flag>
+		<flag name="aws_targets_dms">SDK Support for AWS dms</flag>
+		<flag name="aws_targets_ds">SDK Support for AWS ds</flag>
+		<flag name="aws_targets_dynamodb">SDK Support for AWS dynamodb</flag>
+		<flag name="aws_targets_dynamodbstreams">SDK Support for AWS dynamodbstreams</flag>
+		<flag name="aws_targets_ec2">SDK Support for AWS ec2</flag>
+		<flag name="aws_targets_ecr">SDK Support for AWS ecr</flag>
+		<flag name="aws_targets_ecs">SDK Support for AWS ecs</flag>
+		<flag name="aws_targets_eks">SDK Support for AWS eks</flag>
+		<flag name="aws_targets_elasticache">SDK Support for AWS elasticache</flag>
+		<flag name="aws_targets_elasticbeanstalk">SDK Support for AWS elasticbeanstalk</flag>
+		<flag name="aws_targets_elasticfilesystem">SDK Support for AWS elasticfilesystem</flag>
+		<flag name="aws_targets_elasticloadbalancing">SDK Support for AWS elasticloadbalancing</flag>
+		<flag name="aws_targets_elasticloadbalancingv2">SDK Support for AWS elasticloadbalancingv2</flag>
+		<flag name="aws_targets_elasticmapreduce">SDK Support for AWS elasticmapreduce</flag>
+		<flag name="aws_targets_elastictranscoder">SDK Support for AWS elastictranscoder</flag>
+		<flag name="aws_targets_email">SDK Support for AWS email</flag>
+		<flag name="aws_targets_es">SDK Support for AWS es</flag>
+		<flag name="aws_targets_events">SDK Support for AWS events</flag>
+		<flag name="aws_targets_firehose">SDK Support for AWS firehose</flag>
+		<flag name="aws_targets_fms">SDK Support for AWS fms</flag>
+		<flag name="aws_targets_gamelift">SDK Support for AWS gamelift</flag>
+		<flag name="aws_targets_glacier">SDK Support for AWS glacier</flag>
+		<flag name="aws_targets_glue">SDK Support for AWS glue</flag>
+		<flag name="aws_targets_greengrass">SDK Support for AWS greengrass</flag>
+		<flag name="aws_targets_guardduty">SDK Support for AWS guardduty</flag>
+		<flag name="aws_targets_health">SDK Support for AWS health</flag>
+		<flag name="aws_targets_iam">SDK Support for AWS iam</flag>
+		<flag name="aws_targets_identity-management">SDK Support for AWS identity-management</flag>
+		<flag name="aws_targets_importexport">SDK Support for AWS importexport</flag>
+		<flag name="aws_targets_inspector">SDK Support for AWS inspector</flag>
+		<flag name="aws_targets_iot">SDK Support for AWS iot</flag>
+		<flag name="aws_targets_iot1click-devices">SDK Support for AWS iot1click-devices</flag>
+		<flag name="aws_targets_iot1click-projects">SDK Support for AWS iot1click-projects</flag>
+		<flag name="aws_targets_iotanalytics">SDK Support for AWS iotanalytics</flag>
+		<flag name="aws_targets_iot-data">SDK Support for AWS iot-data</flag>
+		<flag name="aws_targets_iot-jobs-data">SDK Support for AWS iot-jobs-data</flag>
+		<flag name="aws_targets_kinesis">SDK Support for AWS kinesis</flag>
+		<flag name="aws_targets_kinesisanalytics">SDK Support for AWS kinesisanalytics</flag>
+		<flag name="aws_targets_kinesisvideo">SDK Support for AWS kinesisvideo</flag>
+		<flag name="aws_targets_kinesis-video-archived-media">SDK Support for AWS kinesis-video-archived-media</flag>
+		<flag name="aws_targets_kinesis-video-media">SDK Support for AWS kinesis-video-media</flag>
+		<flag name="aws_targets_kms">SDK Support for AWS kms</flag>
+		<flag name="aws_targets_lambda">SDK Support for AWS lambda</flag>
+		<flag name="aws_targets_lex">SDK Support for AWS lex</flag>
+		<flag name="aws_targets_lex-models">SDK Support for AWS lex-models</flag>
+		<flag name="aws_targets_lightsail">SDK Support for AWS lightsail</flag>
+		<flag name="aws_targets_logs">SDK Support for AWS logs</flag>
+		<flag name="aws_targets_machinelearning">SDK Support for AWS machinelearning</flag>
+		<flag name="aws_targets_macie">SDK Support for AWS macie</flag>
+		<flag name="aws_targets_marketplacecommerceanalytics">SDK Support for AWS marketplacecommerceanalytics</flag>
+		<flag name="aws_targets_marketplace-entitlement">SDK Support for AWS marketplace-entitlement</flag>
+		<flag name="aws_targets_mediaconvert">SDK Support for AWS mediaconvert</flag>
+		<flag name="aws_targets_medialive">SDK Support for AWS medialive</flag>
+		<flag name="aws_targets_mediapackage">SDK Support for AWS mediapackage</flag>
+		<flag name="aws_targets_mediastore">SDK Support for AWS mediastore</flag>
+		<flag name="aws_targets_mediastore-data">SDK Support for AWS mediastore-data</flag>
+		<flag name="aws_targets_mediatailor">SDK Support for AWS mediatailor</flag>
+		<flag name="aws_targets_meteringmarketplace">SDK Support for AWS meteringmarketplace</flag>
+		<flag name="aws_targets_mobile">SDK Support for AWS mobile</flag>
+		<flag name="aws_targets_mobileanalytics">SDK Support for AWS mobileanalytics</flag>
+		<flag name="aws_targets_monitoring">SDK Support for AWS monitoring</flag>
+		<flag name="aws_targets_mq">SDK Support for AWS mq</flag>
+		<flag name="aws_targets_mturk-requester">SDK Support for AWS mturk-requester</flag>
+		<flag name="aws_targets_neptune">SDK Support for AWS neptune</flag>
+		<flag name="aws_targets_opsworks">SDK Support for AWS opsworks</flag>
+		<flag name="aws_targets_opsworkscm">SDK Support for AWS opsworkscm</flag>
+		<flag name="aws_targets_organizations">SDK Support for AWS organizations</flag>
+		<flag name="aws_targets_pi">SDK Support for AWS pi</flag>
+		<flag name="aws_targets_pinpoint">SDK Support for AWS pinpoint</flag>
+		<flag name="aws_targets_polly">SDK Support for AWS polly</flag>
+		<flag name="aws_targets_pricing">SDK Support for AWS pricing</flag>
+		<flag name="aws_targets_queues">SDK Support for AWS queues</flag>
+		<flag name="aws_targets_rds">SDK Support for AWS rds</flag>
+		<flag name="aws_targets_redshift">SDK Support for AWS redshift</flag>
+		<flag name="aws_targets_rekognition">SDK Support for AWS rekognition</flag>
+		<flag name="aws_targets_resource-groups">SDK Support for AWS resource-groups</flag>
+		<flag name="aws_targets_resourcegroupstaggingapi">SDK Support for AWS resourcegroupstaggingapi</flag>
+		<flag name="aws_targets_route53">SDK Support for AWS route53</flag>
+		<flag name="aws_targets_route53domains">SDK Support for AWS route53domains</flag>
+		<flag name="aws_targets_s3">SDK Support for AWS s3</flag>
+		<flag name="aws_targets_s3-encryption">SDK Support for AWS s3-encryption</flag>
+		<flag name="aws_targets_sagemaker">SDK Support for AWS sagemaker</flag>
+		<flag name="aws_targets_sagemaker-runtime">SDK Support for AWS sagemaker-runtime</flag>
+		<flag name="aws_targets_sdb">SDK Support for AWS sdb</flag>
+		<flag name="aws_targets_secretsmanager">SDK Support for AWS secretsmanager</flag>
+		<flag name="aws_targets_serverlessrepo">SDK Support for AWS serverlessrepo</flag>
+		<flag name="aws_targets_servicecatalog">SDK Support for AWS servicecatalog</flag>
+		<flag name="aws_targets_servicediscovery">SDK Support for AWS servicediscovery</flag>
+		<flag name="aws_targets_shield">SDK Support for AWS shield</flag>
+		<flag name="aws_targets_sms">SDK Support for AWS sms</flag>
+		<flag name="aws_targets_snowball">SDK Support for AWS snowball</flag>
+		<flag name="aws_targets_sns">SDK Support for AWS sns</flag>
+		<flag name="aws_targets_sqs">SDK Support for AWS sqs</flag>
+		<flag name="aws_targets_ssm">SDK Support for AWS ssm</flag>
+		<flag name="aws_targets_states">SDK Support for AWS states</flag>
+		<flag name="aws_targets_storagegateway">SDK Support for AWS storagegateway</flag>
+		<flag name="aws_targets_sts">SDK Support for AWS sts</flag>
+		<flag name="aws_targets_support">SDK Support for AWS support</flag>
+		<flag name="aws_targets_swf">SDK Support for AWS swf</flag>
+		<flag name="aws_targets_text-to-speech">SDK Support for AWS text-to-speech</flag>
+		<flag name="aws_targets_transcribe">SDK Support for AWS transcribe</flag>
+		<flag name="aws_targets_transfer">SDK Support for AWS transfer</flag>
+		<flag name="aws_targets_translate">SDK Support for AWS translate</flag>
+		<flag name="aws_targets_waf">SDK Support for AWS waf</flag>
+		<flag name="aws_targets_waf-regional">SDK Support for AWS waf-regional</flag>
+		<flag name="aws_targets_workdocs">SDK Support for AWS workdocs</flag>
+		<flag name="aws_targets_workmail">SDK Support for AWS workmail</flag>
+		<flag name="aws_targets_workspaces">SDK Support for AWS workspaces</flag>
+		<flag name="aws_targets_xray">SDK Support for AWS xray</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/bitset/Manifest b/dev-libs/bitset/Manifest
index 6a8b44fca098..13797a9e177a 100644
--- a/dev-libs/bitset/Manifest
+++ b/dev-libs/bitset/Manifest
@@ -1,5 +1,3 @@
-DIST bitset-2.8.3.tar.gz 36787 BLAKE2B 1c30d389c83b8c7bd13ec698db4b3d38600521c38014a7f3acaba708d0b7b914877e08dc1b32c2d9caf8baf2f171c518fc92ebbc52b94602bbf0e372af385400 SHA512 7b451139ee9db0b581e552d09f03809185e64f3b1190d887ba58478c4dc10a1ecc687d69cb42045e3c01ad9d065e12aa4f31d14068d7df9f6a8f284344d5b51c
 DIST bitset-2.8.4.tar.gz 37040 BLAKE2B 3a3db906c86fef73c20a038f01f7053efe2f7d2802b8a627657dbfe807c2d043834f7afab6a3fda66f3b4a87c27255c000f0cebffa7620e88e5f3790a3544914 SHA512 709c4f064416b22ae37fc9659a9eb74007fff5ce12eb998c386a268427a012238258bbd0f019682a5172a98b7b2a476fd60017bf34e199159e838b254b48ffe7
-EBUILD bitset-2.8.3.ebuild 761 BLAKE2B a1ddf97414a4137987cb75128f317622009fd3ee37dbb560b3307b3f2fc4d8d36de795406001e752701c40afa46c9e814e557e32263e7085a50dc6d363e6cb27 SHA512 42058787f4f08bb3f59f96d2e90efbabf98a7eef008e2914979fc572e8a6e74ebee842e54bcbcfa24a78262137631ad4b2cb6eabf3d5e6f9052d336292dce2b1
 EBUILD bitset-2.8.4-r1.ebuild 943 BLAKE2B ef2417a00b17526532c0042ac3248518508391ea2d392b382ecbf385dc1dd10dd45e910bc1bf0fa034c1f30c0119a2de90ef0e1d9d10451bd9d78d2d005e7ef4 SHA512 7179d196b836ff6e601f62d85e5ccfaf008d0eff5ae4f817301bac92b73f2dc38310389e0c8f501089f93b922279d85bf1e3edb91b08ef2cb0199813f2c18119
 MISC metadata.xml 522 BLAKE2B 7034e76df939a176a138b0016b1ee37b632f5822c2ca8f1b38f15242e06fe9ea836e9295ab907493a30e32a7ac76504a7bba9ddf1f3f643b264f8b02706c3712 SHA512 5c0fb4abffcc6da6ed48fec3e52e19b6526a526909463da6f9e4b8c0094f5701548d782c65a5b4c9787eb1143429ec4d0cdf71a7677e99331a9891a4acd3b537
diff --git a/dev-libs/bitset/bitset-2.8.3.ebuild b/dev-libs/bitset/bitset-2.8.3.ebuild
deleted file mode 100644
index 0f9c70752602..000000000000
--- a/dev-libs/bitset/bitset-2.8.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
-DESCRIPTION="A compressed bitset with supporting data structures and algorithms"
-HOMEPAGE="https://github.com/chriso/bitset"
-SRC_URI="https://github.com/chriso/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="jemalloc static-libs tcmalloc"
-KEYWORDS="amd64 x86"
-
-RDEPEND="tcmalloc? ( dev-util/google-perftools[-minimal] )
-	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="?? ( jemalloc tcmalloc )"
-
-DOCS=( README.md )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with jemalloc) \
-		$(use_with tcmalloc)
-	)
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index c69016f313f1..03bbc2584789 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -9,7 +9,7 @@ DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3
 DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765 SHA512 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
 DIST boost_1_67_0.tar.bz2 87336566 BLAKE2B 85ea00fc2197b1bbfc35d69427c87f23ea43d7592f1c9ce66e2afcde8476bdec86f6debdac815b23de59f4665a8e0c7f1519ab66a31d39df629723bc45710058 SHA512 82bf33d7d2c3db109c9d1f12d40bc2d364c8c95262386f906ccd1a71cd71433bcc01829e968b4a13a5003cf0b50cbdf0b435a1d76530cea7bb05725c327411e8
 EBUILD boost-1.63.0.ebuild 12466 BLAKE2B 7aedf34bbef100bb52457e3906422ae22435a34486a921f60a7b0a5a4f48f251228331f1cebb9317c1c43355a8dffb4f9f555e4477136fc4cfc51f057b118c0f SHA512 215acc04fd1fc80271bb1d64c5e508a1c9162613ea526aabf291445f58a6f547155c0d000987a3a98c8dde8387db012978c42b140d03352b52f91df33d18aa5a
-EBUILD boost-1.65.0.ebuild 12442 BLAKE2B 961453196627d0671eb5e3e38292156ddaa94418941f503312aad0c949b320c14d98a88f8c8e91f8b76f3ce150235f66f80f7dade71b710ebfb5a94517f8897d SHA512 e11e282a61f07cdfa1bd24d3032baacf064518f1fbd65c432d04ebf1e1f890879302f64e800cb005bda5c3cee015cf86c327fa546ef8f7bd7f937871f6129fef
+EBUILD boost-1.65.0.ebuild 12441 BLAKE2B a3247e46d19dea522de4a15915575d6fe1ee1b441d1fc75d7bab8775561b4d8571f180397d2357c50c30347e1dca75be6508672da649bfdbcf5788ba6f7515eb SHA512 ca1bdd45fd9905595d03e25d20f422571b2c1f03df63922485557de1cbeab7eee9cc5c00358f5fa49580fac6480fbd54fc3d3a996cdaba96efdf97ba0436fb81
 EBUILD boost-1.66.0.ebuild 12459 BLAKE2B 6653ddd8bc307f9c91166bac312ee146e174bf09cfbc28afb3dbb8aff8bf286bb37f766bc2735f0cedd5cb113bd26637a3116bdeb6be0afca93d6bd80a89c093 SHA512 6ccbd309c502220afb9da6abedb36fb52791dcaee848acc102c1fcf69f538e3477939b14c0a1892fd31babf3002307adae2b310503d1f9bd17d2393611b2ce6a
 EBUILD boost-1.67.0.ebuild 12358 BLAKE2B 5d420ea8d2209632e8fb7a0a49fdf31b24ab07e4986ef4d5f7ec9c08ef239d9b06c9d4e4fd61efdd73aa211566a664cddc76f48b2af0482ac5ebd83de2f46e41 SHA512 649f9d15de4c8c6d614fe1103cf7357c7b96ad37a2fa18679ee3640a3e174299d40489f8497876ec68118fca4c11765c8ff6b287b916375958a5419ce7f6a9c8
 MISC metadata.xml 1526 BLAKE2B 11c2e9eb5b41e3fa0b100d58d672acefe4a949d0fa428b4ce1d100cc8f95eec7c1279c725741033ca50f61cb258b388270c18361a5b714a684398cc3ae1a445c SHA512 4ba131f2492ae41f642a28dd69e5bd1d5d79c013e42a6c18ba135b36d470990ea20c8aa7cec6e3cb1d6ea8d7f6b6a5b45efb4b3dcba198bcf43809eff0f65ae6
diff --git a/dev-libs/boost/boost-1.65.0.ebuild b/dev-libs/boost/boost-1.65.0.ebuild
index 837f83b5b200..82f898a937d0 100644
--- a/dev-libs/boost/boost-1.65.0.ebuild
+++ b/dev-libs/boost/boost-1.65.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 
 IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
 
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 6d2bacc847d9..0f78c738f579 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -5,5 +5,5 @@ DIST Botan-2.6.0.tgz 6599127 BLAKE2B c45a974f89571c1050e28108267ca6ec094171be3d7
 DIST Botan-2.7.0.tgz 7021654 BLAKE2B 3f18b7ba660a72a409beeaba8bd1b1bd021f645c135bed56d75b6ba906b7c28d1e14eac9550862500dda9c4b3ac3135cfc9c340e073c573deb66b236e09f8054 SHA512 992138d83e18aedf80337d825f80c34dd3d2177eb30967573c57cf9fb7e7f9a9965ae3d75f23635f4c93b4efb7bb5adbb3423702663c78a5eb905dd567561858
 EBUILD botan-1.10.17.ebuild 4221 BLAKE2B 463e3e2b0893b5c9330c7d317fb089f70cc8adf2f60654711674bfb1eeb3c2b34e44e5695b230078510821cb7f45a23745016ebfd6c30cc660d6a132f4ef3223 SHA512 00065423d5f3600a08542e8722ce63dcf6147bce0b2104e466acf444c7e107f191652b588d7b7054652099cb89973b646987084c39678a8472d565249e064f6b
 EBUILD botan-2.6.0.ebuild 2339 BLAKE2B f3871202e70810f7003a16a02befc4bf69ff04baa451a80a2bfb13a96cb1cbc645a1f622941c9af27b2a6b8617fe69f81d601a1fc0738ac4f922465a8014277a SHA512 f46c844b7df21647876f933f4263427625fc2da6a6688c5333f4205fad06da0c99a68de152036778ba0a6b4890b772c8e41f95687786e6153ace2d52856be3b2
-EBUILD botan-2.7.0.ebuild 2343 BLAKE2B f1afad9cd5595cd440c4c5690a89bcb3221479bebae4d55b2655a87e05e894667fca6f065de30dd825d777fff644830d9cd675978097f6fb4c244cce29ba0ee6 SHA512 cace49e3060744b8470a1e71a3f24f0469808d4f5f0c6a6fa71d4fcf1304a90af3b62396ece497d7c84b9bb8e8c73835007e710059892dd8f108bebc07d86c4a
+EBUILD botan-2.7.0.ebuild 2339 BLAKE2B f3871202e70810f7003a16a02befc4bf69ff04baa451a80a2bfb13a96cb1cbc645a1f622941c9af27b2a6b8617fe69f81d601a1fc0738ac4f922465a8014277a SHA512 f46c844b7df21647876f933f4263427625fc2da6a6688c5333f4205fad06da0c99a68de152036778ba0a6b4890b772c8e41f95687786e6153ace2d52856be3b2
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-2.7.0.ebuild b/dev-libs/botan/botan-2.7.0.ebuild
index 5b1383c390d7..9ff13b7881c5 100644
--- a/dev-libs/botan/botan-2.7.0.ebuild
+++ b/dev-libs/botan/botan-2.7.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="https://botan.randombit.net/"
 SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
 SLOT="2/$(get_version_component_range 2)" # soname version
 LICENSE="BSD"
 IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index a1ed7dab2b86..4d8b60e488ef 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -3,5 +3,5 @@ AUX crypto++-5.6.5-CVE-2017-9434.patch 1728 BLAKE2B 0cfd25fca89d59486ba9c49a87f0
 DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
 DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec
 EBUILD crypto++-5.6.5-r1.ebuild 1529 BLAKE2B 986777433697a41644c784a03c574b46b8342354fd487750340410ed0721ac7b92f30f69606c948735e6f61c3864917ea362fb43e8d543aaca96b15d82bc4aa6 SHA512 ce3bbb0be152c64998b4f8d242b1481fe1e1ac9d541867095e0d9405833f043153a1eaf4b848710ca7dc58481e626fc535042253319f0c65836b5c3ff4fc34ce
-EBUILD crypto++-7.0.0-r2.ebuild 981 BLAKE2B aa372f9507a732c7a63703671efcde61e989068380ebbe0e1844b23b77f0cdee9abb7f86e8998497f8c8e6fd01adb67ebc956acce422281ce2e0ede4274eb7d4 SHA512 aa75b99f040ef699cd643846e43f42d9cd2b287dc419e81da2b60056bfb9953aeaf4f647ade43c78a362da2982727a10372934c12662216d176402c1f35d6f4a
+EBUILD crypto++-7.0.0-r2.ebuild 978 BLAKE2B bde9d9e58cd8352a2daadd29b43e36f6a9f32c34f12ef5df79d7118c31597d93a3d550a25cdc96d0644bb551423ee9956ca1b62ee47e21dfe13e7822a2fc105f SHA512 4d4f243f149afa182131b6b22e0f91ce7d15fa7202ba6a5bdf2ec419854ef098bff8e60e453e97bf509087f7f2d5f45fde5456c4fca1d92585d70602cf656421
 MISC metadata.xml 597 BLAKE2B 8e8dd9fb9a60f2a5e7fdda6de99b6a07264d54aaa666a41d7fb30da338f91867bdda7135bd21e92191722de7e14ac10f394ac8d8f3118109f4ce6800fb12ebc0 SHA512 e20fd2e76765968417d659a6342ff9229dc822c2291bca00dd6cccd55dc3195563574aaf3a88c68b111821b41c9bce172f4d79bbb462f2b913ab15bcc2c2ee5a
diff --git a/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild
index 24273393bf5f..e117e4eabc3b 100644
--- a/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild
+++ b/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0/7" # subslot is so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 DEPEND="app-arch/unzip"
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index bc7172315470..b0d2f5ce7b4f 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -2,7 +2,9 @@ AUX efl-1.17.0-gnutls-3.4.patch 1303 BLAKE2B 74368829bd2cc3ebf1878384dfa6fc5a429
 DIST efl-1.17.0.tar.xz 43485360 BLAKE2B 97a79bda40658eac6e50886a01821bb8c98d6f56d18fcd51dc3827154506064bec3bf665c8f471919aedb03ae83ce4045293afa9a0bf8d3eaf947221ef7cba9e SHA512 e4f28f938daf4ec1cb3d761407a443e401b59c6bb0f9fa6cd771dbd256b95f4a32a5f9e6bd8ad8328708a382f732e67abd1a23c7be2ff222f08bc8135a2435da
 DIST efl-1.18.4.tar.xz 64609944 BLAKE2B b36e5ee7c64a57772c5826e990a85110fffc3488e605d72515d4db7a6ec56eee25eb68c7136840f24cb8cdcdc8d7050e2825c17f0e4c5566db7d9ec2c96fd557 SHA512 2cfdcde8b5adb93310e75e4923e3845392bed97563ca1a68f4537e346b51f59acefaa85a425bdbb5619e5bfd6c9ff92b4bd1888b5d4ddd8db94c8a555e3934c9
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
+DIST efl-1.21.0.tar.xz 71030532 BLAKE2B 3480e261aef05b169a850d27f3d9fa6da0ad9bc9ac04548137829e662546cd7d85c87596576e561bba33f9f1be657d81f261595e34c711ff9e35d551ae5f09a8 SHA512 497735f518976d70b96023b013a6d821f6695fe56def2abf5bd1e1c7ad89d324428017d7909c7b73bfb332b811b5596592b105bb4c3d2f6a40929f1cefc2b789
 EBUILD efl-1.17.0-r1.ebuild 7068 BLAKE2B e0ce5cf1e86f41918799a7ceebfa341726ea9a700c7e2e4d89acedaf595171b12bef11261fed2bea14c4099fa63fcf063d0eddb49c1dcf490449f936ec4dd1c8 SHA512 a5293c2f97a4976fe3681ad8da97918f37a0bd47bf37cf38d4f025ad7512782e967deaef1d2f80c624ccf57c8b68b74f8288a9b223f710dcee3bde515d454be2
 EBUILD efl-1.18.4-r1.ebuild 7298 BLAKE2B d88740f4081b53d274f36e1f8200dd917030b6246cc88d8f9f2b24569ff79a69f2b7e68e76d61e2123297315850d03c3273894ffc0a508d425724fb25395ddd3 SHA512 2e2992916f6af3acec5af00c3d5c3e781414fb2c35c13000a18786dfd0e46ba27506130010900cbe75da80f33fa62410ccfb597be4b77d2770773bdf87be7faa
 EBUILD efl-1.20.7-r1.ebuild 7785 BLAKE2B 6f9cff3f6fbf9a8169251b5e89b447cf20a9d9a187efe24681dc6d6e5e6fa912018df393444fd7720d0605116c68f0ad0c7173192ca720ccb3472da57d11e6b0 SHA512 3433be6e2fe8913671f8028fbd2566ea98fb4f14c9184086f4bd13760aaa153769b024dd57faa7e0c5327b6de961f55175c5d35ecc515b7e76a11c595f6e0d0d
-MISC metadata.xml 2242 BLAKE2B 5bcbcb78454bc3640d839857c026114a69f485bbbe934cc2db098168368c34e0840e37389628e8c0425e9045833735c58c8c1a36132a76d36c3eeef4d8c557f7 SHA512 65a10606f3e77f82a26b4cf9fdba2a4ef1358fcd041ee5bbffe2a932477597479cdc604dd5df1a4cb0384709116b1d9430f1815f5020b1ff7cf4eeea7d8cd0f3
+EBUILD efl-1.21.0.ebuild 6780 BLAKE2B b172687994d6794457cbfc4f282b12646e2865ae909b7348f4776570c4a95020457c59aded59a9abc7d133804293ce5d7755221be5aede6f58cffef04792b7de SHA512 58c326f5cb419931a15c4745c0fef5b4fb3b5034611fc5d3acbcd9e8df9deee2bd14f3d67b98d9d6d49805600699ddbadfe6da0c0c9f2b79c6d1bd5af32324e4
+MISC metadata.xml 2316 BLAKE2B d7401c2e633366d6c74a9bb5633160b868ee0ec2c8a04c3cc4da43898c50192238ac19eb7fc9aad88593d974c5fcf0cd2cf0413e66ecb4134d19581ff002fd10 SHA512 5e0a520c7854a1837dbf4c1e7f6e5e64695f62892118ca99e41f389efd4145066348f5023a0e4bf2d5b061d36dfa66ae9ce979f3b614fcb6498dafd9609c0530
diff --git a/dev-libs/efl/efl-1.21.0.ebuild b/dev-libs/efl/efl-1.21.0.ebuild
new file mode 100644
index 000000000000..77750924fd50
--- /dev/null
+++ b/dev-libs/efl/efl-1.21.0.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils pax-utils xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org/"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="avahi +bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm"
+
+REQUIRED_USE="
+	?? ( opengl egl )
+	?? ( opengl gles )
+	fbcon? ( !tslib )
+	gles? (
+		|| ( X wayland )
+		!sdl
+		egl
+	)
+	ibus? ( glib )
+	opengl? ( X )
+	pulseaudio? ( sound )
+	sdl? ( opengl )
+	vnc? ( X fbcon )
+	wayland? ( egl gles !opengl )
+	xim? ( X )
+"
+
+COMMON_DEPEND="
+	net-misc/curl
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/zlib:=
+	virtual/jpeg:0=
+	avahi? ( net-dns/avahi )
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	egl? ( media-libs/mesa[egl] )
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib:= )
+	glib? ( dev-libs/glib:2 )
+	gles? ( media-libs/mesa[gles2] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	harfbuzz? ( media-libs/harfbuzz )
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:0= )
+	libuv? ( dev-libs/libuv )
+	luajit? ( dev-lang/luajit:= )
+	!luajit? ( dev-lang/lua:* )
+	nls? ( sys-devel/gettext )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? (
+		media-libs/libsdl2
+		virtual/opengl
+	)
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	valgrind? ( dev-util/valgrind )
+	vlc? ( media-video/vlc )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	X? (
+		media-libs/freetype
+		x11-libs/libXcursor
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		opengl? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+		gles? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+			xpresent? ( x11-libs/libXpresent )
+		)
+	)
+	xine? ( media-libs/xine-lib )
+	xpm? ( x11-libs/libXpm )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	!media-libs/elementary
+	!media-plugins/emotion_generic_players
+	!media-plugins/evas_generic_loaders
+"
+
+src_prepare() {
+	default
+
+	# Upstream still doesnt offer a configure flag. #611108
+	if ! use unwind ; then
+		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
+		configure || die "Sedding configure file with unwind fix failed."
+	fi
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	local myconf=(
+		--enable-cserve
+		--enable-image-loader-generic
+		--enable-image-loader-jpeg
+		--enable-image-loader-png
+		--enable-libeeze
+		--enable-libmount
+		--enable-xinput22
+
+		--disable-doc
+		--disable-gesture
+		--disable-gstreamer
+		--disable-image-loader-tgv
+		--disable-tizen
+		--disable-wayland-ivi-shell
+
+		$(use_enable avahi)
+		$(use_enable bmp image-loader-bmp)
+		$(use_enable bmp image-loader-wbmp)
+		$(use_enable dds image-loader-dds)
+		$(use_enable drm)
+		$(use_enable drm elput)
+		$(use_enable eet image-loader-eet)
+		$(use_enable egl)
+		$(use_enable examples always-build-examples)
+		$(use_enable fbcon fb)
+		$(use_enable fontconfig)
+		$(use_enable fribidi)
+		$(use_enable gif image-loader-gif)
+		$(use_enable gstreamer gstreamer1)
+		$(use_enable harfbuzz)
+		$(use_enable hyphen)
+		$(use_enable ico image-loader-ico)
+		$(use_enable ibus)
+		$(use_enable jpeg2k image-loader-jp2k)
+		$(use_enable libuv)
+		$(use_enable !luajit lua-old)
+		$(use_enable neon)
+		$(use_enable nls)
+		$(use_enable pdf poppler)
+		$(use_enable physics)
+		$(use_enable postscript spectre)
+		$(use_enable ppm image-loader-pmaps)
+		$(use_enable psd image-loader-psd)
+		$(use_enable pulseaudio)
+		$(use_enable raw libraw)
+		$(use_enable scim)
+		$(use_enable sdl)
+		$(use_enable sound audio)
+		$(use_enable static-libs static)
+		$(use_enable svg librsvg)
+		$(use_enable system-lz4 liblz4)
+		$(use_enable systemd)
+		$(use_enable tga image-loader-tga)
+		$(use_enable tiff image-loader-tiff)
+		$(use_enable tslib)
+		$(use_enable v4l v4l2)
+		$(use_enable valgrind)
+		$(use_enable vlc libvlc)
+		$(use_enable vnc vnc-server)
+		$(use_enable wayland)
+		$(use_enable webp image-loader-webp)
+		$(use_enable xcf)
+		$(use_enable xim)
+		$(use_enable xine)
+		$(use_enable xpm image-loader-xpm)
+
+		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
+		--with-glib=$(usex glib)
+		--with-js=none
+		--with-net-control=$(usex connman connman none)
+		--with-profile=$(usex debug debug release)
+		--with-x11=$(usex X xlib none)
+
+		$(use_with X x)
+	)
+
+	use fbcon && use egl &&	myconf+=( --enable-eglfs )
+	use drm && use wayland && myconf+=( --enable-gl-drm )
+	use X && use xpresent && myconf+=( --enable-xpresent )
+
+	if use opengl ; then
+		myconf+=( --with-opengl=full )
+	elif use egl ; then
+		myconf+=( --with-opengl=es )
+	elif use drm && use wayland ; then
+		myconf+=( --with-opengl=es )
+	else
+		myconf+=( --with-opengl=none )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if host-is-pax && use luajit ; then
+		# We need to build the lua code first so we can pax-mark it. #547076
+		local target='_e_built_sources_target_gogogo_'
+		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
+		emake -C src "${target}"
+		emake -C src bin/elua/elua
+		pax-mark m src/bin/elua/.libs/elua
+	fi
+
+	V=1 emake || die "Compiling EFL failed."
+}
+
+src_install() {
+	einstalldocs
+
+	V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed."
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 591fc67fc6f0..221e9e373197 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -23,13 +23,14 @@
 		<flag name="ico">Enable Ico image loader</flag>
 		<flag name="ivi">Enable ivi-shell support</flag>
 		<flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
-		<flag name="luajit">USE <pkg>dev-lang/lua</pkg> instead of <pkg>dev-lang/luajit</pkg></flag>
+		<flag name="luajit">USE <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
 		<flag name="oldlua">USE <pkg>dev-lang/lua</pkg> instead of <pkg>dev-lang/luajit</pkg></flag>
 		<flag name="physics">Enable Bullet physics effects and support</flag>
 		<flag name="pixman">Enable PixMan for software rendering</flag>
 		<flag name="ppm">Enable PMAPS image loader</flag>
 		<flag name="psd">Enable PSD image loader</flag>
 		<flag name="scim">Enable Smart Common Input Method</flag>
+		<flag name="system-lz4">Use system liblz4 instead of bundled one</flag>
 		<flag name="tga">Enable Tga image loader</flag>
 		<flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
 		<flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag>
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index b05aff87084d..94ebb5639cf9 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -4,7 +4,9 @@ AUX expat-2.2.1-posix-shell.patch 1027 BLAKE2B bfdeb67f4f41cfcf1db8bf4a9e0501789
 DIST expat-2.2.1.tar.bz2 405441 BLAKE2B 273960016692f3b9a1121eb07b67c28e5b3066fa324df0d7249329b2dc346c2601e4548def5e14b7f76d58f89f3cd12edad72fbd32da9f4c04ac61dfce23e15a SHA512 74089b55872df16f214a4baba0143e6353736dfa34063391293bb2760aa3e5118d9ccb3592e07c74c9d52a2a5b91496e15153f28214c4c01242d95b3019b67ea
 DIST expat-2.2.4.tar.bz2 505038 BLAKE2B 4d40629621bde41b44cdef4fa37937ce064cdbd621cc0d466b50a1a4626aff8bc8c8f6e9fbd94a36b709d449384da76ade683f31cf0aec0470006b750fc0a6ea SHA512 788249e2c6edf8521c4a99830fd5e51a55c062b834516f6775759cd71accf6375f12d3bd38f8b069777d081a4380b9549049921386ca0cb4b9b9daa4861d6592
 DIST expat-2.2.5.tar.bz2 510868 BLAKE2B 9d4709c2d157a04c08afd80b05f120407dc320023c3dbfe9e6872fadf0de2d6fa497f85ad9a21679fa0689c13cbb25adfd92912ae374d08de791dfeb4eb6918d SHA512 8226970a7e5d2b8d7818081758ca59bb6ce2d655feaa9d3a92481629000b73fde4782f50343d58ec4e1cebe75649e1980f636775a731d8aa4b55ceb843d9f637
+DIST expat-2.2.6.tar.bz2 513322 BLAKE2B 386736da1f2204fa8f15ee4d1b3d11f01ed691efe6951b9f24f2bd30ab5494e75da6a97ceb1ffe4a0a8ecdc80f96f51d21c54f35a2cbc352a9fe9425545bf15b SHA512 dbfb635a5fe7b190722664263a0dd437b512fdf519bc53bd4905567f4bfb4b1e89a021562da63df8cacd48b706d1dea60ccde47f279e57400ad3c846b6e9c4e6
 EBUILD expat-2.2.1.ebuild 2209 BLAKE2B f4910c2e5a6462c7c1859d2f20a2d9892c72572077c9e479851a47d49882f8ff578e399b40b93bb162e50052b0374ac7f632a02a6accdf509646cd6ee5e37bf1 SHA512 ea6413bb3948b72797acda79e186da6416ab0f95c5313391d158d4ddad549622f85fe0f69ec81811ed84a5c4497b63bd07feffaf964476bc64becfa66246a126
 EBUILD expat-2.2.4.ebuild 2409 BLAKE2B 1db61d230d3038095018a1f4a996ada84ca9f93df5b0f8de4bcfa258d4c8f0e56f00ba449ebed7c8e5c605856d28df2530f64c8f62b16b6463d6b756123bf793 SHA512 7d0ebe8c7ff822bec9908c5118eeee8a3145a9ecbb6986acb08806dce5134184706bf5c017ce766901671c7d733a1d59b700a3a889f62857726fdc38847a80a0
 EBUILD expat-2.2.5.ebuild 2466 BLAKE2B 5f4b6db129c491de37e2da970e2143c69f12a830a1aff5125d8b149f7ea3a668bc98df055c1999363d0b968cafc8f3528a6f0d8fcb0bdc02567dbf892de3d232 SHA512 526292962f0f8a1ae6032061ff3f8b6d681ca128692726734e81686e52e3f1113810640bb2f5f48aba89824731689cac5a4345804ee3c6714697986a2ff95e7a
+EBUILD expat-2.2.6.ebuild 2476 BLAKE2B 9d16cd9fe9c3c7da4bbd225d975976e757ca4020e8744df17fef6d62e33808fb3d2f2e4b03cdd020d82b20482a7c86221ffce391688a330badda83a2c6901574 SHA512 11ad1abf2fe9961cb877f5a5b86e7ce0ba6a440ef1672675c95cbcb9a92099cde4a4af7e7064c8f307a70fe5f152d1f2e1c1712ab81bced3faa513a8a230f523
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.6.ebuild b/dev-libs/expat/expat-2.2.6.ebuild
new file mode 100644
index 000000000000..508815f0741e
--- /dev/null
+++ b/dev-libs/expat/expat-2.2.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils libtool multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Stream-oriented XML parser library"
+HOMEPAGE="https://libexpat.github.io/"
+SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="elibc_FreeBSD examples static-libs unicode"
+DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
+RDEPEND=""
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	# fix interpreter to be a recent/good shell
+	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
+	if use unicode; then
+		cp -R "${S}" "${S}"w || die
+		pushd "${S}"w >/dev/null
+		find -name Makefile.am \
+			-exec sed \
+			-e 's,libexpat\.la,libexpatw.la,' \
+			-e 's,libexpat_la,libexpatw_la,' \
+			-i {} + || die
+		eautoreconf
+		popd >/dev/null
+	fi
+}
+
+multilib_src_configure() {
+	local myconf="$(use_enable static-libs static) --without-docbook"
+
+	mkdir -p "${BUILD_DIR}"w || die
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
+		popd >/dev/null
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_compile() {
+	emake
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib
+		popd >/dev/null
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib install DESTDIR="${D}"
+		popd >/dev/null
+
+		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
+		cp expat.pc expatw.pc
+		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
+		popd >/dev/null
+	fi
+
+	if multilib_is_native_abi ; then
+		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
+		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
+		use elibc_FreeBSD && gen_usr_ldscript -a expat
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
+	docinto html
+	dodoc doc/*.{css,html,png}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.c
+	fi
+
+	prune_libtool_files
+}
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index a5dc9645b62b..dd2772383ea4 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,5 @@
 DIST fribidi-0.19.7.tar.bz2 648299 BLAKE2B 496d010f29dd8fc3d349ad3f89d60a596dfceaa5350663442d5965cb09bc7a23e2ab8a876d7ca5b05ec3f4c5e178060cae2b493ccc46a6cdfc022d139e778259 SHA512 4bfdda43d961030a8a2ae2c98d2ca5d43c1b59633fa0987920c5537ec69f3f624204ceacc4c474d878cbb417ee2d9e708dfe169cfce6ad584d2f2d5122678b63
 DIST fribidi-1.0.5.tar.bz2 2082617 BLAKE2B 99b088a37600d1b3e556b4dd978cafb04af0fea9c7db8ed9b0aa90d6a6a60f8ca312c214151ce386d2d61ae382d6ff0e6ae240bd44dfde28eb8c25a5c5f4cd1e SHA512 c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2
-EBUILD fribidi-0.19.7.ebuild 1201 BLAKE2B 8f221f227b6fb6643841c3227862ac81ce4589a256044e111b09a77828f99b4102081c31830cc5b85a4414e084624587b6f31b31dcc048f4dbdc88108bc5e9e8 SHA512 ef4e35b977db7532f370559422e8a8d877365abd04a3c1d8d7962b3941a8babd1260efe2f804ed24df355ec0914408c9f98e72da19607209b2b343fea5dbb65e
-EBUILD fribidi-1.0.5.ebuild 947 BLAKE2B 527e0b3218abbb1d54d0e5bf57bfe5c7a6b2e8e8efec71a68b4f6b63738678e7fa329b43a49c48a3be9f2bc1cbcf75e6375672d87064238ec8ac765527a883aa SHA512 8508aba273bd92639bda17ce9fe2190a6390a85631c625878d44897ccc3580010192c59a26c59dfce7e05671c4d0e9ed5ec30da6bdc25e8adbe1bd2a537a9ad8
+EBUILD fribidi-0.19.7.ebuild 1206 BLAKE2B 69477c5d99446c25db1abc77cffb07ea695e3e57b1474311038e1991c3c6ae387752cd18f5b0a24d9e022e95aadab597baa38f9fe9350a796a45f852286019a5 SHA512 c49e9a76d0a3c41bb03c74ad9af627969ea5c462cd837366a7df52343d7f02a3fc05bd62e2ffcdb57ded1a58c20bd9426469e0ef736ea0210db43e34512ba024
+EBUILD fribidi-1.0.5.ebuild 953 BLAKE2B c06ea09ffa1997473e7a17de264b5f9f12d2ef9e329e0d97119994e041fa4a453271a18b9c95b00f8c37b7f4c27e68e41d874394506dd38d74b2639d1ec19028 SHA512 da3d6654e0e4b7be0db9790bc1a1bc85ed49b197a538c2de565724b345a346162653dbfa21d05b3e98e2dd69cb52e84256740628e3088de43819a50f98eb8dbd
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-libs/fribidi/fribidi-0.19.7.ebuild b/dev-libs/fribidi/fribidi-0.19.7.ebuild
index ff457b67bf78..b6a42a4fab1a 100644
--- a/dev-libs/fribidi/fribidi-0.19.7.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/fribidi/fribidi-1.0.5.ebuild b/dev-libs/fribidi/fribidi-1.0.5.ebuild
index 415d53968ef9..0a73b1eb314e 100644
--- a/dev-libs/fribidi/fribidi-1.0.5.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index c317974b095e..7435d775ac79 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -3,7 +3,7 @@ DIST geoip-1.6.10.tar.gz 161506 BLAKE2B 968ae25afe8345def099b82acf5bca4b7bcba05f
 DIST geoip-1.6.11.tar.gz 161934 BLAKE2B 628dd37bbcfffe36970d6bc8cd12ff1d504d9dc7bb760860ce59fbeeac631317556077ca5b50ae42c9cc8567ed41194379ed0743a0c2b0b0bef65504b13e62cb SHA512 9c017a95c7903898b9a2bc10c34e51b390326c181c46e6f99daf3bc4d8f84cfcf640c5cc92d527e4c7428e2b5bfa835cc57040507eb836062139a795726349b9
 DIST geoip-1.6.12.tar.gz 160826 BLAKE2B a6cb17141e4e9d00c15d19d7adfecb5492b14591911dc85de403afc9f94801fe1ec92b6106478448074d3679d6c9fa6a44f210b9cc751aba0c0425a5fae699c1 SHA512 d1ed2dae091548f555cde4d26e4b51ae1e8fbb12ef1695fd95963229d9a1bf241e6f09e5d77b151d51edd0cef78ddef490c6a3f3a70ff122bdd9c0ac5500fc7d
 DIST geoip-1.6.9.tar.gz 158576 BLAKE2B 797dce578c0e2b92b02cf125be5448746025e86c6d9a2efd4ec2c99de99b3874c9da0ef20c7c76308121420ea8099a0744c0240640ff9732b961789ce334b8d1 SHA512 a3a34511ba32e6c7d0b46b0e608c5be54411cf5b095c867c3225941b55e5714ec7c68de64e0aefcf4ee2081fbd626480067d6bc9822d775decef1f8e26d7e976
-EBUILD geoip-1.6.10.ebuild 1298 BLAKE2B 5b0cf6d75001526470983b3708a09b688838e49391c0a33c7d23323c91250a549da873cfb4ab45b162c53c792f6d9944b2e236660fb31d2718923f6ee4650b90 SHA512 d5213267d816a56c195cb7140d81706f9a738edde0d4ac4be7ddc859d9abf3b16ceb107a94c85e10d815f9add31aa038df7f37cdda919344b16eea041c3fe9f8
+EBUILD geoip-1.6.10.ebuild 1297 BLAKE2B c5650da4bbaf1c0290a26223f2b231a9e479f586dec8fc1b77d2d66833b095abc77f04af2ad7ecc59477c56199f45d302f154443c5a9c989b727093ce10ad0ca SHA512 e870c08e13c5e590938624e9788dfde74a4a420c70a3ef6b1d6399e337d09450ccdef14a04d05321d6b359b8992c487580fb483f1126255cd8bcb66544c0c094
 EBUILD geoip-1.6.11.ebuild 1307 BLAKE2B 84e94af04f2eb38d052b05da1aa90ff0867484d061b33c4fdb241bd5e62a582ad1b3b6e1296b5fa1a90a1330ad817bda392fb73aefa0829209b4ab19f2bf70ff SHA512 c204420951256782aead397071b203cf80a20352a96dd225240820c462b40ccbc81fcb062a393f70df89d699569348250ef89ffbc5a93ed2ed704cdda4b38369
 EBUILD geoip-1.6.12.ebuild 1307 BLAKE2B fbc239ba46ce020779604db81bed0d045f4bddd94030b85b2f0d8fa99275fbd437cc549872365f93a1f3de5b764a98f101ffff9794897a42259aeb9c1e70fe58 SHA512 c35f094f380323e364f20650e6c0fc9dbc48d47b02767060e1eddf885c20649f25ac9589b7532e018710fbd6b2404eaad169fcd3d2ca7155c6957aa4981cddee
 EBUILD geoip-1.6.9-r1.ebuild 1297 BLAKE2B bc58561a0be7e6d6916eead747add1bdacecfbf806644aeecf235f65cc5d142c482b7dcfa7885a4ba664f0bc687abb30f7a0ac342c75a99684001176876029a8 SHA512 47e87b89e2477917040b777f8f6d7490984cb4c2124b5d0707b44a41eae80e4e16a4b55eb3264fd280229c06401bed25273edd3599576424b0e96955cb6b19cf
diff --git a/dev-libs/geoip/geoip-1.6.10.ebuild b/dev-libs/geoip/geoip-1.6.10.ebuild
index 498eb160a8c4..deb21a6110f6 100644
--- a/dev-libs/geoip/geoip-1.6.10.ebuild
+++ b/dev-libs/geoip/geoip-1.6.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 890da03b0555..c94fc4c4ca59 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -3,7 +3,9 @@ AUX glib-2.54.3-external-gdbus-codegen.patch 3233 BLAKE2B 6b96851b7485164ef6c94d
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec2428a5b67e363e6ea61e2bab1e672506c438c80c602e87ec7d221ad92ad5c52adf7b57fb13441835e41f1e1208c26c6db SHA512 3d880c2681893da9267c8b2ba9a695eddbb1cef63f4ea26e052ce2f69e1e9d78eccdb27b235cbf0693ecd262bd70d020b24f82fc72ab11a4dbc2c929cfb72942
 DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
+DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 EBUILD glib-2.52.3.ebuild 9547 BLAKE2B 042a59e8fdee8c0de912c224e2bd51aad8ce17ccfb33c123ef5a52225f1b993e9133469fd4e1577d27c47effe3315e0117f64acf41fccdba760f38df83acb6e3 SHA512 82508386cbee8cf9e49a04c22ce5a81bfd62b9aef1270da2ed885081797e6229a74a4313cea713830df6d74b99dbb7acb1f07bf7b0e588208656eb37a81143c6
 EBUILD glib-2.54.3-r6.ebuild 9998 BLAKE2B a6aa0197dfc2d787654970ab5d8086b181c97b8ed40bb5a1bebe5127f4bc5d9c62ecdb82e46a7c3eb99b150fbf3880be3846259501ddf1467827ec172b3d8990 SHA512 31a17d1552181e001bda28ced508699b757ceb892ca64955c65eb57ad8b1761261b966c6d272dfce5a9515f96d6a3ab14247dea83c875c3f1d56c0de63851d31
+EBUILD glib-2.56.2.ebuild 9687 BLAKE2B e9d239d2eaa1265d7312a8d9ce8467ca7eca6fd66c7e317605f0ecfc94c9f3a52177d2642894f3840e58ca772fc887e96ebdc883b01505ad5d8b1e42aa55a4b7 SHA512 bc7591a1eb4ec4475cec8e98e2e1c0ddb054d9bf41a7f3fd62a6af0f9763e2c0a05683543c4ac42e523dd8074dc7fb6a348f7198b897b37a1236fe297499bdf1
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild
new file mode 100644
index 000000000000..f18c2acdc30b
--- /dev/null
+++ b/dev-libs/glib/glib-2.56.2.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+GNOME2_EAUTORECONF=yes
+
+inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
+	multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx
+
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+# Added util-linux multilib dependency to have libmount support (which
+# is always turned on on linux systems, unless explicitly disabled, but
+# this ebuild does not do that anyway) (bug #599586)
+
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	utils? (
+		>=dev-util/gdbus-codegen-${PV}
+		virtual/libelf:0=
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-libs/libxslt-1.0
+	>=sys-devel/gettext-0.11
+	>=dev-util/gtk-doc-am-1.20
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/gdb
+		>=dev-util/gdbus-codegen-${PV}
+		>=sys-apps/dbus-1.2.14 )
+	!<dev-util/gtk-doc-1.15-r2
+"
+# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate
+# python depending package, which can be buildtime depended in packages that
+# need these tools, without pulling in python at runtime.
+RDEPEND="${RDEPEND}
+	>=dev-util/glib-utils-${PV}"
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+	if use test; then
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+			ewarn "Some tests will be skipped due to missing terminal program"
+			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
+	fi
+
+	# gdbus-codegen is a separate package
+	eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch
+
+	gnome2_src_prepare
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
+		if has_version sys-apps/dbus; then
+			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+			export DBUS1_LIBS="-ldbus-1"
+		fi
+		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+		export LIBFFI_LIBS="-lffi"
+		export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
+		export PCRE_LIBS="-lpcre"
+	fi
+
+	# These configure tests don't work when cross-compiling.
+	if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		case ${CHOST} in
+		hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		*)            export glib_cv_stack_grows=no ;;
+		esac
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
+		export glib_cv_uscore=no
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
+		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
+	fi
+
+	local myconf
+
+	case "${CHOST}" in
+		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
+		*)        myconf="${myconf} --with-threads=posix" ;;
+	esac
+
+	# libelf used only by the gresource bin
+	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable xattr) \
+		$(use_enable fam) \
+		$(use_enable kernel_linux libmount) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
+		$(multilib_native_use_enable utils libelf) \
+		--with-python=${EPYTHON} \
+		--disable-compile-warnings \
+		--enable-man \
+		--with-pcre=system \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+	if multilib_is_native_abi; then
+		local d
+		for d in glib gio gobject; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	# Hardened: gdb needs this, bug #338891
+	if host-is-pax ; then
+		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+			|| die "Hardened adjustment failed"
+	fi
+
+	# Need X for dbus-launch session X11 initialization
+	virtx emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit with meson
+	rm "${ED}usr/bin/glib-genmarshal" || die
+	rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}usr/bin/glib-mkenums" || die
+	rm "${ED}usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}usr/bin/gtester-report" || die
+	rm "${ED}usr/share/man/man1/gtester-report.1" || die
+
+	# Do not install charset.alias even if generated, leave it to libiconv
+	rm -f "${ED}/usr/$(get_libdir)/charset.alias"
+
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+
+	# Completely useless with or without USE static-libs, people need to use pkg-config
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	# force (re)generation of gschemas.compiled
+	GNOME2_ECLASS_GLIB_SCHEMAS="force"
+
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 1aa60ef12bf7..c0c0428b2783 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,5 +1,5 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.0.tar.xz 1962544 BLAKE2B 2d5f9bbd2fb69015dfe52b7b9a8aaeba5d06c3c00e853212f098181efd1a30cb4588ebf173f1370dccc03d5a137ec1a0823608a7271ffd7d7e882a214c0e4189 SHA512 bb45f34b80ff237478602ff05ce0f736373185b7aa260c17aaf00a519d0b75ce9e24b0f6b256ce0f17b613e9f67174c54e302411110bf5f143947591f5f5aa43
-EBUILD gmime-2.6.23.ebuild 1735 BLAKE2B 53f9f6f52467235a3de521c880fcf55a6a9f3498000c52557fcac809d7ae118640c35204a61c2f69ac2d99db68b3232c6a672b99dbe658a0d5eac299ea987fa9 SHA512 2fbc586acb1dea60334039199a75f796bdd222ac5451c47ab76b2f8453adb4a2850d52dabb0c9d30af9a31332d5804bcc7891ceff5c58b78a61b2b54d0dd0354
+EBUILD gmime-2.6.23.ebuild 1736 BLAKE2B 2661694f8a00f0548c276ace8e9efe295545c6806f5cd12ddf324f4e8b9eb73dbef1a3378b6bde0c1efbb10f2479a63ec746b442e15e43f46704738d4bbecc54 SHA512 132d038b1c3ffadceb04131d4531539dbea6041de75d1e2e2db952b289b21c862ad3c330fcf7302ba255076fc05b0e12152d1ffa8dbb8657667b68c5b792c5ff
 EBUILD gmime-3.2.0.ebuild 1565 BLAKE2B d2b07d8e77c51f0df053fe29aa5cb5ddd684d0c0b328ebed6ba5df1269e5130343fc8d11fe71bd08eb965d8d97713bc4d1d2c55e8791bfb1a7fca73cc304770b SHA512 eaa6764d31758a82b3e53c93174f7e2c3bbbd2a6c86ab9a7a3438d2213026880af0a31c33e9280902d8f4fbe2d04e3b6a0d0f525fd349d0beaf213bff211b009
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-2.6.23.ebuild b/dev-libs/gmime/gmime-2.6.23.ebuild
index e9b4bef636fc..4a089f9280cb 100644
--- a/dev-libs/gmime/gmime-2.6.23.ebuild
+++ b/dev-libs/gmime/gmime-2.6.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="2.6"
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc mono smime static-libs test vala"
 
 RDEPEND="
diff --git a/dev-libs/hashit/Manifest b/dev-libs/hashit/Manifest
index 8109328ccbe0..e8fd2464a3aa 100644
--- a/dev-libs/hashit/Manifest
+++ b/dev-libs/hashit/Manifest
@@ -1,6 +1,3 @@
-AUX hashit-0.9.7-pkgconfig.patch 782 BLAKE2B b71dd4d8b16d802750443bc92bf4de45b2a7bc0667cbc5eed7df19b5501ce2cb5ff178a43288de4bd8a149961a0ab4f52d3df284a2b9297bf2023a3767520d33 SHA512 dcafb388565779ae6a087b55dd31fc84879768c6a23edcf07ff0329a6a962edc83b67a3276bf8d4da853eddd132a500b094ac5ac8c950ef9bc2586925a19315d
-DIST hashit-0.9.7.tar.bz2 16368 BLAKE2B 99db8e0c83c63835d5265ef0d4bf39223214210a1762a869f1bccf08ce345a42f5bd0d4ec2dec7824e05c081e18f0b24c84254f4d3527fb67926ddbd8c1dbe21 SHA512 ce692cc1dfec12f2173f39c32f24ab96223feae6fca5c5ea1bc9dc815be4113936741c620e08cba35feeea26288503d1a42e6a4fe14cf2f854915e5bebcf4eff
 DIST hashit-0.9.8.tar.bz2 18127 BLAKE2B 63a36e644dced8dfbf0bb049adc811ac526c519c4fe85f47ae631eba8d989b06325199fafa43abd0e98d014c7adc90c97bde75fbaacd5a215384a9e6e2f6b505 SHA512 b6a85cb8a7c97d2214fe91409006973de1b452dc7f5b412ad870a5a8d2b937957947ca47c314fd4d05b2683b20a9b8eb4241e0cbbc57e3b68b5cdfa024b80dce
-EBUILD hashit-0.9.7-r1.ebuild 463 BLAKE2B 68b434425668b619a769b9fd4f64014ea537b2d70dd98d4fc65230f58a82672c93081e7338aa1d7055523ec542b786d4241dac642da4cfb52bc7ed018c2fa5b1 SHA512 a496300ca75420704f6e3cb72b02d480223aa3339bf803da8d078c1e36588b8abb38e74165e6408f056905d4d2381edb3ced71afbc0939e72d449596e853aca6
-EBUILD hashit-0.9.8.ebuild 422 BLAKE2B 6739ddd1bf9cded891ce736d8b4edf5608c35173c22cf00ba054f09d5124fcef7c1fc0836c090eefd4d474aba24087c822cf6c2262d806dd1a502e7623a24856 SHA512 8eb250ec2ec13995836da20935015e855de78db4ccd921fae7138d643843d026e5a437de453c91e1c1584be6669d5184bddb92b09ad788d1b41abc7ee3a096ee
+EBUILD hashit-0.9.8.ebuild 420 BLAKE2B 61b0dfcf12f3aa6faecfb7719fb94c96387f155d33e17bbd0ca0a251943a2a710b821a4ef3c341439c8ae486c1aeabbb34afba2f8a033ab2673553ac95057ce7 SHA512 73852bfcf46dc0b6cabb9efd6c52056347235a0da5d8c7c09dc88a7f29e2c03089fc3f4623a45b6058e8902ad6638197f98ca963a34189d560efc9ec273c3f21
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/hashit/files/hashit-0.9.7-pkgconfig.patch b/dev-libs/hashit/files/hashit-0.9.7-pkgconfig.patch
deleted file mode 100644
index e88a28dba5d3..000000000000
--- a/dev-libs/hashit/files/hashit-0.9.7-pkgconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/hashit-0.9.7/CMakeLists.txt	2010-03-12 08:35:03.000000000 -0500
-+++ b/hashit-0.9.7/CMakeLists.txt	2010-05-28 19:24:52.000000000 -0400
-@@ -9,7 +9,7 @@
- INCLUDE (FindPkgConfig)
- 
- IF (NOT PKG_CONFIG_FOUND)
--	MESSAGE (FATAL_ERROR "pkg-config not found...")
-+	MESSAGE (FATAL_ERROR "pkgconfig not found...")
- ENDIF (NOT PKG_CONFIG_FOUND)
- 
- ADD_DEFINITIONS (-DDATADIR=\\\"${CMAKE_INSTALL_PREFIX}/share\\\")
-@@ -28,7 +28,7 @@
- 
- INSTALL (TARGETS hashit LIBRARY DESTINATION lib${LIB_SUFFIX})	
- INSTALL (FILES src/hashit.h DESTINATION include)
--INSTALL (FILES libhashit.pc DESTINATION lib${LIB_SUFFIX}/pkg-config)
-+INSTALL (FILES libhashit.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
- 
- SET_TARGET_PROPERTIES (hashit PROPERTIES VERSION 1.0 SOVERSION 1)	
- SET (LIBRARY_OUTPUT_PATH src)
diff --git a/dev-libs/hashit/hashit-0.9.7-r1.ebuild b/dev-libs/hashit/hashit-0.9.7-r1.ebuild
deleted file mode 100644
index 74e133ba4f8f..000000000000
--- a/dev-libs/hashit/hashit-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Generic C hash library which supports multiple collision handling methods"
-HOMEPAGE="http://www.pleyades.net/david/projects/hashit"
-SRC_URI="http://www.pleyades.net/david/projects/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug"
-
-PATCHES=( "${FILESDIR}/${P}-pkgconfig.patch" )
diff --git a/dev-libs/hashit/hashit-0.9.8.ebuild b/dev-libs/hashit/hashit-0.9.8.ebuild
index 134d03741b64..f6272eea360f 100644
--- a/dev-libs/hashit/hashit-0.9.8.ebuild
+++ b/dev-libs/hashit/hashit-0.9.8.ebuild
@@ -11,5 +11,5 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug"
diff --git a/dev-libs/injeqt/Manifest b/dev-libs/injeqt/Manifest
index 46ed8f801df8..96b08a0b9ad7 100644
--- a/dev-libs/injeqt/Manifest
+++ b/dev-libs/injeqt/Manifest
@@ -5,5 +5,5 @@ DIST injeqt-1.1.0.tar.gz 74112 BLAKE2B b8fda39422458d9b140081fd2362de5be5d7d030a
 DIST injeqt-1.2.0.tar.gz 73787 BLAKE2B 1b265c14a04dff8380297905f1b717c09baff6e24aedf473a36ff37be83d7e58b7ccae7df0eaf9690cee8c40d5646cb0af43a54427630db5595a9fa59d10e194 SHA512 4783f662af3b7711ef639695350bf136e84a218c8e2f0ddd8a44cb9790e1db5dcb69168fd46c21a82bd76eaebc01e5067e11be87823409d6ca032d2b95bfb880
 EBUILD injeqt-1.0.1.ebuild 667 BLAKE2B bf427758c344c5ef1f2341d3c31c6dd77e18004ce6f858bea55c89c27832b879598b877a4c3083c5e4f005267a03f9a220406761406e6516e16bae9c0aa9cf09 SHA512 59e38fa2a8ba2f3bce52d7652ec2ca55aca09bd2714345b57dbc61a3bdd903346acc5752906a129e41d64983c3982c5ca9de9cd4c1f292d17df2613bba34c1b5
 EBUILD injeqt-1.1.0.ebuild 656 BLAKE2B b35e5a01851d29ccc04f27cd70d333353a973e0193cc3e1d3c22b6e2c55ae7e5067bae7123b427c9d8468a76f2f1671f59d2dbdd700000a014de6ec0cd23837c SHA512 46635b31b88ecde6be2d127ba94fee42a4725c146424e86bea433b752c31ca338973df9545ec3e3e60034197d7be00a6c9d4d838f36fd26dc63f36e48d67657e
-EBUILD injeqt-1.2.0.ebuild 698 BLAKE2B 4004f3a7a258f54bdc0e586db3161b0c2561c29f17b6c7fdc63816fb63433cafb970f0ce4f41a6d8edfc1e9e943a16257ad519c70a08724730c502b13ee2c231 SHA512 855c31e77b6f0cf761e26c9c36c1438e6d268a927faeb6a3d1467f7d9eb140ce210c3ba11c9d4343b82c56d1a1eb22d4b724fcd3f0eed92cc693315afd0c466a
+EBUILD injeqt-1.2.0.ebuild 697 BLAKE2B bc64c9e7a20c79a5b66619a5e9028053a89ffad6fc506541741c91d4b1a6b9a39086b048bf66a5287c2bad0f9a8c0d777f4457cb152d815fc0e65940275f705f SHA512 d473ce5d453b58de09cc2c242bd1e6ca563d17acd38ba550205c7e11eedd2982bf366ffae48a19241d50259ece512d0d837b8799f3fdbab27028d4efa2453172
 MISC metadata.xml 328 BLAKE2B d23a1f7b8bd482bfec92060b9f20f94efee5ec28fae5cd8e8df35c8d80d2b93a8e6b7474138ae53762f3e1c96f5bdda99d93841bd5f5598ce0698f6f72024dd7 SHA512 b095ba0bbe9d89d1d7b18fc13b3c03c23a8c2ad38f9871f3814dc4595e88a93d7682d3f18c31fd810bffeae25cc04de9c2681e933a7de103b8d1bc1e1bf4c3b3
diff --git a/dev-libs/injeqt/injeqt-1.2.0.ebuild b/dev-libs/injeqt/injeqt-1.2.0.ebuild
index 30decc181335..3d9de6be309d 100644
--- a/dev-libs/injeqt/injeqt-1.2.0.ebuild
+++ b/dev-libs/injeqt/injeqt-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vogel/injeqt/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 4fea51eac28d..6139fec96e0d 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -8,8 +8,10 @@ DIST jemalloc-3.6.0.tar.bz2 338964 BLAKE2B a5edacc85c5bebf3b373e7fc8bafd9449273f
 DIST jemalloc-4.4.0.tar.bz2 440144 BLAKE2B 6acb91c5be6c5b17c209341dd08e6973e3ad5ecdfe7ebe5d8c78181cddca1fccba3c11628e736d66acd7698f7813f38077033d39093bf2e4bd704c8b4de60e7b SHA512 2f88fb17ede3bf87e334e9c80949870e0dd85b5adcdd89a1750ccf6df5240f35293159ac0a360d3a29cf0b1d17edf86dcc7997c6bf3190ae7da7442d3a3cc14e
 DIST jemalloc-4.5.0.tar.bz2 449992 BLAKE2B 6141c71f7f5f9cee91a59eeed9c69b0a69b3cc39666aa608445073c11ee3ca9b4777a851c5cb5adac80d42bfbf10a6726e5dc1340ffe85ea1ee884d87c7865da SHA512 76953363fe1007952232220afa1a91da4c1c33c02369b5ad239d8dd1d0792141197c15e8489a8f4cd301b08494e65cadd8ecd34d025cb0285700dd78d7248821
 DIST jemalloc-5.0.1.tar.bz2 499300 BLAKE2B 551933fcd93315968cbf89bfadc40313717ff216141af8a131f2333d10090438ddf36fbfdc0ee831cbec6f930ae15aa9cfaafae72ed4f38dd97b00712ca918e8 SHA512 8cb5957a5724eb2bbad120cf0028ea8b2b14b4a416c1751b7c967351a7fd51135058ea0d3c4dc1d127c86f3aa7e9fd5ef101857110aabfdb7789427791c432c3
+DIST jemalloc-5.1.0.tar.bz2 515622 BLAKE2B 3c8b35d30fca0018e3e32452e6fa41c7ac59f9f2f7d4bc243237fde95025ab5a7562fb86b5afe2ca9b7bb072f7baf6ac7589a4862d9ebaafddae187d93e20da0 SHA512 d9abebe54d303ca931b8c31c1033f23ff5fb060f2377ec8386f4d79c352e65c78ed34f680c352dac14f7d7115d10245782d553d988bc13df2eb34a2f0942ef6f
 EBUILD jemalloc-3.6.0.ebuild 1907 BLAKE2B 798433f1866bc808756d99cc69e34081671ef537e1c428f6d03dbe9266bdebab79e7d5852ae5b73fa7b3127eb5805ff197a623aba5515f20376de7f19d2fd048 SHA512 f13a892b9457ab2e13e13654dda6ec372bc8e3d30e0c625a5f67546c56608beb1d16ba1a1d17c10ca8f4145e2536100406d2afb45767e87fe3a99b4c873506bd
 EBUILD jemalloc-4.4.0.ebuild 1751 BLAKE2B e39f6707e796afe8ea28e055d994f17e5f683e1bf1ab4ac67d492740cca2490553bf88685e8458dfaeb197a5b98ee6b58f242afee337d9cf73e9435c84f8931e SHA512 5d3a5d490de405548f193e29178cb41c876e093fb56af071bef0a8fd330c740b826127ea314e844583652380d02364729e3f8a0ab6ed76a97058ee93103e2712
 EBUILD jemalloc-4.5.0.ebuild 1787 BLAKE2B 06f3036d060df40707bb79c6520b62c13c55c3753d6f40fad5d82509baf76446de952b418c5fed71160a29331398167ceb7c199a872e553555ad6611506e5a4a SHA512 2fbf17ce207095a1948d0180b0769294fb90e5500297152629dc8c666fae1f8c6d182d1d823a2efeaf8b36cd9f9016cc036c9ed3f4be52bc371ab858f9dbcd2e
 EBUILD jemalloc-5.0.1.ebuild 1915 BLAKE2B 7ece59bb02fb7a809814e4925bdc3934660aeddd5ce9f28f51e545b79d0794e3861114cf48bfdf35f56a5e23453655cded7858a1f634f662b6a328273129b2db SHA512 fff3e8afea78b30f2ec4a4675c218779426d93c1437521c9532acf1f1cc3c417758a49765616a30d9b54c5dc8c51f7a8f66bb7fd5db4362c8a3c6bcfcf5496b5
+EBUILD jemalloc-5.1.0.ebuild 1872 BLAKE2B f777715cbde72411ee128c992b122556bf1de06e418e113d66968b3cbe5de1ad00903370d115d43b89c3cafeae46b03bc6680868181ee5d0f40584a6f285c396 SHA512 4c1c05b235c548f959a2e00b23b434a794d78478b818cdaf70e12fae58d9c018c1747525b93a93400454e38309f813de29cd51414b3bd6a30011665b310619c7
 MISC metadata.xml 762 BLAKE2B db6f1712f7b716c824f199ec10e566fa543aa594a6bc75f60adca55e249163a96adbdff109a49327799bee090b3abadd9961c74878c0b0a9c54aa0cb4118f2a1 SHA512 4fdae623c6f76fad566807e7a48c3cf11b5818bf2f93e32f6c0a53558732642f0011dabb7bd4d7f637c8df141cccdb1075c48177a83caac78f9f375b3e57278a
diff --git a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild b/dev-libs/jemalloc/jemalloc-5.1.0.ebuild
new file mode 100644
index 000000000000..7eda36ea909c
--- /dev/null
+++ b/dev-libs/jemalloc/jemalloc-5.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs multilib-minimal
+
+DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
+HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc"
+SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE="debug hardened lazy-lock static-libs stats xmalloc"
+HTML_DOCS=( doc/jemalloc.html )
+PATCHES=( "${FILESDIR}/${PN}-5.0.1-strip-optimization.patch"
+	"${FILESDIR}/${PN}-4.5.0-fix_html_install.patch"
+)
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
+# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
+# but jemalloc doesn't implement them in its configure; need this here to
+# supress the warnings until automagic is removed from the eclass
+QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if use hardened ; then
+		myconf+=( --disable-syscall )
+	fi
+
+	ECONF_SOURCE="${S}" \
+	econf  \
+		$(use_enable debug) \
+		$(use_enable lazy-lock) \
+		$(use_enable stats) \
+		$(use_enable xmalloc) \
+		"${myconf[@]}"
+}
+
+multilib_src_install() {
+	# Copy man file which the Makefile looks for
+	cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fixup install_name, #437362
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libjemalloc.2.dylib || die
+	fi
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 9db0b606f722..24417f3a4e32 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,4 +1,6 @@
 AUX libatomic_ops-7.6.4-gcc7.patch 1669 BLAKE2B b37d7940e2a793fcda7f20d509e326fd002260294ae90726a7c23262e97d2f27cf985ce3f2a7e0038441b1d6e2fa39202d800d774d44b8dd69662acc8a35aa7b SHA512 a7e2efa8feb5c8e9f4468f6a74a4191c1e95112a5f646dd9635e76790899504242f94500a1599fa72b781159166b61c39e88da6c01e7febab91afad6f099bcf8
 DIST libatomic_ops-7.6.4.tar.gz 497571 BLAKE2B 151cd518a346dcf2540c2e8229c2309aa83a7cecc3d66e3e8bab3d09c8688d725e26b27c836c0a3a3a46cde40fedfe26b0cca53cf2b2017f67e72d4a4993371f SHA512 2e6ef0bfd4b77e9260383feb2865c96388fb1ebed9d37605eeb83ac87e3b6a565495d588808129ac7b3ee5f6a58a37440da7784b680cc6590842b09c2625983b
+DIST libatomic_ops-7.6.6.tar.gz 498187 BLAKE2B 343ebda3a37aef6541efae9e646778cf8b1ea74e722979de4336d6819007f3fb37121d53c7e789f69fe6411c05ca2557a18d10db47c68e95e59c92c991bf9fa7 SHA512 ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8
 EBUILD libatomic_ops-7.6.4.ebuild 777 BLAKE2B 0f1a533dd9fe6603a0b8b4b02263d67830c3751aa31e4b12fcee2eb9c0f93af9f0cad132d2ae7705ccee3645c333ee893f9763aa6f949dbcc3a3a14c0c4b4c26 SHA512 a5ce9721e64aaeb642587edcb6219f0f4ef64448bd995c96b90bd69e75ef390b462ae58f773fc808068797416693ec81bc0e758fd36b79006ef4d6ae15c9c0be
+EBUILD libatomic_ops-7.6.6.ebuild 745 BLAKE2B c9d6b20254bd433ac8476f72899da3b685766a616aa7daabfadeca9d465efdba968688ef7b34696bea398326015e2d21295adb92b0879b8713dcf6dda8ef1016 SHA512 378ebdd16491c91003704bf6c846828dc95d8b08cd0e0e3f009efe1474132b7fbace2be840201e482150080c9ad19f2940a5462beaae0a42060cb0e7159b6d9d
 MISC metadata.xml 347 BLAKE2B c8fa80a777d85e172d52bd7eae6523981b9fcc79fa8d6cb7378960adda45dd6489def86930704bb845e64437ff33b39f5401cda0d11ed021342235c7020759e5 SHA512 7a4acee1ccb58c4694e9100d556046c55f508050f6e09dc3d4dd509db9eb747b94eca152e1e98c2ebacd8b8c9c75c362426ad9545cac490f959ec16464f809e5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
new file mode 100644
index 000000000000..fe183db38ec5
--- /dev/null
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal
+
+DESCRIPTION="Implementation for atomic memory update operations"
+HOMEPAGE="https://github.com/ivmai/libatomic_ops/"
+SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT boehm-gc GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 1897955331bd..9fc6de848c7c 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -3,6 +3,7 @@ DIST libbson-1.1.10.tar.gz 4431658 BLAKE2B 1e542797c6617296c0ca7cb6dbbd34be5b317
 DIST libbson-1.1.2.tar.gz 4492014 BLAKE2B 684c5053faf5a7f3afe6063e34247cfe7709afe0c17e8f387cfb337e6cc62e7b79c3cbf018e245bc189899e094858e1caff156344e126ba889964b1112820d21 SHA512 03e2ee337445286c14b846cd7545707959b1d351fa466c6292379a85e48ea1a171dae37dd7aff092212239ad59aac6f1ab216ee5de74ef00a8a2a124559e34da
 DIST libbson-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726 SHA512 47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603
 DIST libbson-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b1284be7ef0f223b777d5884d795102910aedb8d4f516d5d50cdecfa9219835a884b237aa98ab3742067c36944f0abdc67a8e4 SHA512 d20d83c9470972641407550bf835701df28c196b1cf19097450a062fd3c560c452c658aa5080bb28066079cea27888731f3670e81bd1b0cd5be1b97a2988074e
+DIST libbson-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
 DIST libbson-1.3.5.tar.gz 4547720 BLAKE2B e5e258344aea0969ac74d88d040a464b72d460a13776c5c8c639e569ed3208fabd2641e850bf035c6889b466ddcc33d487da0aeab58f308bee7446b5fd0a31a1 SHA512 b55ae1d424f786aabed6567a77cd09aa26c74ab0a09392e88faef8c156b1650c026f86f245bc8431a0ebcf404c4f80eb1b22e978a24289d32692c84375a66596
 DIST libbson-1.3.6.tar.gz 4546329 BLAKE2B fa9102cd02e40e0ddb7518d34502f6ff63109b91af18a2285422530dae8c6cc04041b7589f340f2e6ed7a80e2474fea2684001b7ced5e8c911d4ba51e1a6edcc SHA512 a7da914ed0f03212d4fb01879543f0b2c7629923e33200fe30335a9a90a1082ffa2566c7a556b90a6c7ffbef5665a45ec67f87ffff2a5fcb89830769b1df5130
 DIST libbson-1.6.2.tar.gz 4835257 BLAKE2B ebe20a6c9ac8a4fcbd8e838d1a7cd319a6b31956690aa2dfca2be42eaafb646405ea01fe2bf20b2dc21bf933c0eafc330fd45409f7c902a7bf0c0641cfe0891d SHA512 f95f5bb829cff3aac6c1d95a159e38396d8fccef66d3026dac8085ba13ec376274cddeb92277d711ac4d40cafd8b89b73e9a9d1cf29e22f7f79aa9422c69488b
@@ -13,6 +14,7 @@ EBUILD libbson-1.1.10.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560ab
 EBUILD libbson-1.1.2.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560abbf6a9d85a055c5ede7967d42a430c0be809a98ead267bc1a34fb4a0453a90cd6a19f61e0a3d43d52334049b3b SHA512 e6abbe7790ebe385d047629eedd6574edd9685000424e8350dd3d1e8e861b2459ed7dd3d3f02a1f5fc33e34e0b8bf7cfd5088c8aeef0713c590399eb91cf423a
 EBUILD libbson-1.10.3.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
 EBUILD libbson-1.11.0.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
+EBUILD libbson-1.12.0.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
 EBUILD libbson-1.3.6.ebuild 1123 BLAKE2B b568b6ba2dad1c940d0a77e04b9b3aacc119377f378a496edf2a4757c37110bb89a8325c3f1b6682dfe87209f582e37165290387b0ab4cc98bad51529550a3f8 SHA512 1abff3af97b0a699689d92f5f80affa42228b5abeac36a0eba830c4ae6eacd87e67c192045aa1921d43f4a2fad5e407bea728cee6f2100bb4d0a4df7765b6c57
 EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843
diff --git a/dev-libs/libbson/libbson-1.12.0.ebuild b/dev-libs/libbson/libbson-1.12.0.ebuild
new file mode 100644
index 000000000000..e229e5ac1bdd
--- /dev/null
+++ b/dev-libs/libbson/libbson-1.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="examples static-libs"
+
+DEPEND="dev-python/sphinx"
+
+S="${WORKDIR}/mongo-c-driver-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BSON=ON
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libbson/examples/*.c
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest
index bceaa8c2743d..fe59b568cc22 100644
--- a/dev-libs/libcgroup/Manifest
+++ b/dev-libs/libcgroup/Manifest
@@ -6,9 +6,10 @@ AUX cgred.confd 485 BLAKE2B 93bb177b184deb718836e0abba411fd6f007cf376bebe2babe8f
 AUX cgred.confd-r2 160 BLAKE2B 17bc7c1ce54d490071324a670ecb150027e322c938f305930330a8505af3b9f332e8a80b25ae65a363319c2e14b071a4544713179cbf6882d92063e744bf4bda SHA512 5b83b2413e36184671cfd7d654fa0b06940360790aed3c235cdb8eb168c17a703c1a72654fdbf57459ac493f79fd87e90deb33e89297929ca5f681dfa80a7078
 AUX cgred.initd 950 BLAKE2B eb42533e40d33af728a460bb495a62a39662cea47edbb2223c880092ea9b792423ad4a1873a2b14846de8640bad575bb7bd5196bddaa565745487cc2fe658cf5 SHA512 cfa70c25c40c29d3dc1249f808f58365fa5ec09f4918edd971ac088a33a810cefa15c7ccf5b7ce75813301b104bf5fad23f752363600c10af7f1ecbb30f4aa15
 AUX cgred.initd-r1 457 BLAKE2B 6d2a79af91daaf77be9530d69473aa8b67c24fc7be2366486b2c2e82ae8962160576d8d778c5ac817aeb17a9371b1db0127853a4c431844d268a9e371755a8f1 SHA512 2ef66c697b56e4c29c4a224480a6a7270205359d254c07847e57feb8d5e219cd0d0c2c4f6161f9e6c001f14a9419f9be18b3fd1750d7b4e5a0082985821062bc
+AUX libcgroup-0.41-remove-umask.patch 975 BLAKE2B f9f377e840b972733f0aa5afb101d01aca286a2dbe779ddb435b57283b745fcf2dd00a6dfd59964523e45eb031decace34264c4ec323ca9cb12c138f23285fac SHA512 2c601724362492311b15654328478848d5277597a1301463b6dc774ad254c20d698beeb9ba383996187f485699e68a11bc54e2a775c17d4bede28b5ff599c678
 AUX libcgroup-0.41-reorder-headers.patch 953 BLAKE2B dcc4936227cfc67ddc0c32b207403326236b22a05814349385833a887598014277e99744825e4d6ec0e64ccdf35bb19b470d685d5f2ebf1957130ea1af071a01 SHA512 4f8d4b49668dc0ddae373ab922422a0e933cb6c46af05d01da498c657b5a8df1ea62e644b8ac3db7e7818d33ba21c06d1902b7915f6aaf76f8f96107515433d4
 AUX libcgroup-0.41-replace_DECLS.patch 5193 BLAKE2B d22bded7e356b31e9f1e8ceec50f7987311f36453ffd13acaf48e95eacce06052c19a89aedfbcd068218a5fdefc26e5aec737d1c00576f25fdef0b1fe658513a SHA512 c7601810e491764c30e8adfadd65e1b1b578a07af24df62cc9a7b291622d806fc196a98e01957b5acbd3bca072617bd0ff54cae200a8e6c21b5cca4d18cd45db
 AUX libcgroup-0.41-replace_INLCUDES.patch 3064 BLAKE2B 1947d306117beb62dba48d46b9e3caa7e2d5195c6d661b2d061c982220b7d3d92d42d4ef23172e34bf32be2e54b6c82c531aa839432e0489c2abe463b93e25f4 SHA512 17c8fa471347da4973969b954f966501d54889050766dfdd225235dd4539bb4249d57e719fa7a894aadc2e0f7296d233c89c44c96291a9266c958ca3a319541b
 DIST libcgroup-0.41.tar.bz2 500120 BLAKE2B 3410b430aa58613b5b9abedba05bef99b1b8a1fd619d55fb446ab951e052a336efc918879217055bceee886a03d97c3ff46028a87e8231212653a886cfb80521 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd
-EBUILD libcgroup-0.41-r4.ebuild 2238 BLAKE2B f75aebe90185575c88a447cf21f16044f0a59a45e8b5489a7bccfd000e62294039bbd9e71579bd5ae1beee572a078ffcdff63a8f8cd71bcdc53ef0cf8d8e9ba6 SHA512 0e480164da2bcf1da53a63d9d41afe645d4cdb3d2559b1dced7973381eda939d123e088b174a37410a01b2afe5134ebbe95faa46f28a2ca5d544d4e8db0813c7
+EBUILD libcgroup-0.41-r5.ebuild 2282 BLAKE2B a994a721cda527122b1e2db64304d687b02d66aae23eb0c9404be6fcf26ec554b5312f0c056434f6cfbd7ba66da50a091053fc50a8567da350e33da345b714da SHA512 480db6875b5372327be45b3571b86d87906ba1c1b25e8b9be0c674299d948c52cdc825be4d444a4cf4263ab6c4096b0bd1bf3768e12dd43fb7f0526923a72a0f
 MISC metadata.xml 700 BLAKE2B 4638c1287da7cb72c04f77ab1f8c9a46888f0c45194a1221fcc03e2f0ea0b148e7edd4608d2bf61a527dcd8f1701f91a123ecde3118b5f93bad67e56afd6e714 SHA512 faddc728ee6971cbf5e52bc89999f3bec9d312fe04d2c876a2ee69e6533ca1ba85350d0b504bff0c7da668b58a3531606fb3d67cb4f6925c08f65df2190ec0c1
diff --git a/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch b/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch
new file mode 100644
index 000000000000..42286ae8785f
--- /dev/null
+++ b/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch
@@ -0,0 +1,28 @@
+commit 0d88b73d189ea3440ccaab00418d6469f76fa590
+Author: Michal Hocko <mhocko@suse.com>
+Date:   Wed Jul 18 11:24:29 2018 +0200
+
+    cgrulesengd: remove umask(0)
+    
+    One of our partners has noticed that cgred daemon is creating a log file
+    (/var/log/cgred) with too wide permissions (0666) and that is seen as
+    a security bug because an untrusted user can write to otherwise
+    restricted area. CVE-2018-14348 has been assigned to this issue.
+    
+    Signed-off-by: Michal Hocko <mhocko@suse.com>
+    Acked-by: Balbir Singh <bsingharora@gmail.com>
+
+diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c
+index ea51f11..0d288f3 100644
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@ int cgre_start_daemon(const char *logp, const int logf,
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();
diff --git a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
index 67b609f2dfec..3b10e13da1aa 100644
--- a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild
+++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="+daemon elibc_musl pam static-libs +tools"
 
 RDEPEND="pam? ( virtual/pam )"
@@ -37,6 +37,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-replace_DECLS.patch
 	"${FILESDIR}"/${P}-replace_INLCUDES.patch
 	"${FILESDIR}"/${P}-reorder-headers.patch
+	"${FILESDIR}"/${P}-remove-umask.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index b2ec2d53b4fa..1dbe02e1c3fc 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,7 +1,5 @@
-DIST libclc-0.2.0_pre20170929.tar.gz 138719 BLAKE2B 05a3d47626a5e1918f32510b1254f846c88c642f60920377dda73568d34656fecd53872ebc01114b2cc8b2161b196c89efe119bfd785875f723fcee4c1ce3662 SHA512 08f3a21fb1dc103a3b33980c420506fd142294b2d8b4a3eeb100ea55036fb87b9740a2489a0a9a5793d71ebb157e6f3ad7854d1916fc1fa472de72374cdeaea3
 DIST libclc-0.2.0_pre20180319.tar.gz 161608 BLAKE2B b8e4f2d475c0425cbe5b41a5ba3b7b40d14c045f5c23d007e87cdfedc7a01a8317218e5f3b881e944256f04b9fb68a130bff2a137e51cb961b3d5bb7f2e2261d SHA512 5a4130eeb416f90901b66708adc17c825baa757d00d983a12e217f36503e4ed5d208f3a49cc26d7f9b71134ee3d258748153bf52cf7769bcbc06ec0510087a36
 DIST libclc-0.2.0_pre20180610.tar.gz 170102 BLAKE2B 3f8c33a9961db34e68cebc328a88a71173000972b5540d099fa79fe89fd186b7f2f8791a86b45b1be135383d26a92fd4ccdc2827b5620b5f86f0b48467fc092f SHA512 0c75c3e7b81754c175c5c43614ad313cda2fa09a1865794c904675b8d2527f78ffa357178f7d4a471b52ac3d7d96b0184303439b69060df4bf482a01871fcb95
-EBUILD libclc-0.2.0_pre20170929.ebuild 1391 BLAKE2B 45569e8b40dee2c80bf035bc719becde88dfdf3dac19eec45563c35d0edcf565bfe2ececece4285b0cb20c0f45fbbd424c7526c9eb376443f645c92f9ca04aed SHA512 d97c5ad240eacb62d73fa079c48b30ef2af61fce5e06a833f1e857605e6ff02f7a9e7cf90ae6f4386151a044df16077bd0e98346af87c410b1df88cfb0ffba27
 EBUILD libclc-0.2.0_pre20180319.ebuild 1433 BLAKE2B 3fa277010d42c6398ffa618c06397df166d2e37c38d9d9932813a979ec8a57ba57893dc67cbbacefa2fd47fad5aeac2799eefceadfbfa20a7096d53a571e3715 SHA512 ce2cdc8905a750c428a4a706cc2e4eeccabb27b800c37997414586fc3c43588b37b15b05f5e8c81a87199c9727c8f8de1b2af4bc37629f88f129aaeea54f3fdf
-EBUILD libclc-0.2.0_pre20180610.ebuild 1934 BLAKE2B d35749cdba040817e6bbea60be46fa4b4ce183818c17e08329d3938075c7f0d6d04ac6ebac6bbe1748cb5863b6101c0fce8bf7b8cfa77d58506da6e777c9ce97 SHA512 f9a7d649723475cf42043b7ab1a82aff2df1566347ac21501ba8027e0857526f6994021a78d047d6474c8fb2e12a28f2910cd446685bea120fb33cad3539d624
+EBUILD libclc-0.2.0_pre20180610.ebuild 1932 BLAKE2B 9eb087a81ddd16613022bac2322113b6ba2545fbe9dddd5b7bbc481eb4b41d02468d0f1cead297760ca2cd435dbbfde539668ad0fc9b9d8554afdfa6874fe1a1 SHA512 b46cdb18fb0a0559f11d09d6005940eb644da63f4501613c604f549f470617e1f28f31db243872642474ce8b4f645c85954dd001c59b213c7d0a4058ec657fce
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20170929.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20170929.ebuild
deleted file mode 100644
index 58c4b2f64c1e..000000000000
--- a/dev-libs/libclc/libclc-0.2.0_pre20170929.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-
-EGIT_REPO_URI="http://llvm.org/git/${PN}.git
-	https://github.com/llvm-mirror/${PN}.git"
-EGIT_COMMIT="0c31bd5e8d277bee26f34162c246a321f086ad55"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-else
-	GIT_ECLASS="vcs-snapshot"
-fi
-
-inherit llvm prefix python-any-r1 toolchain-funcs ${GIT_ECLASS}
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="http://libclc.llvm.org/"
-
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://github.com/llvm-mirror/libclc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-		${SRC_PATCHES}"
-fi
-
-LICENSE="|| ( MIT BSD )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	|| (
-		sys-devel/clang:5
-		sys-devel/clang:4
-		>=sys-devel/clang-3.9:0
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-LLVM_MAX_SLOT=5
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify configure.py
-	fi
-}
-
-pkg_setup() {
-	# we do not need llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	./configure.py \
-		--with-cxx-compiler="$(tc-getCXX)" \
-		--with-llvm-config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \
-		--prefix="${EPREFIX}/usr" || die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20180610.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20180610.ebuild
index c7b0adde63bf..381fc1aed20d 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20180610.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20180610.ebuild
@@ -30,7 +30,7 @@ fi
 
 LICENSE="|| ( MIT BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 IUSE="${IUSE_VIDEO_CARDS}"
 REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 84b84fc595e5..7f5b559da5e4 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1,5 +1,5 @@
 AUX 0.6.12-CVE-2017-7960.patch 1285 BLAKE2B 10118fd008c5c009052f8802db3d65693806c4e90a29d06ae8cc9124b3ce4d2868d7cc689285b685841d989f66100ce50ccab0ea145152bfc818beeb1efff4fb SHA512 736240327aeddbb9a2d7272a7dd3dff2b459e5b99bd81ab9d881644c995e51879d9b3e9c8080571bd387d8dd46ab5cf656f8e2b4e3715fd5548ca32b1d77d58d
 AUX 0.6.12-CVE-2017-7961.patch 1437 BLAKE2B 8678147cc24ff674b067691a3eeae42a5731faec2740c23a4679f689b51b160e51f0ec451b38954fb644b2545fab120aa2e97bd22bce253f5f4e5c1b7c21e22a SHA512 88cbcaf64e4c8ceb7002ffd05ce5f42880bd37a25f8c89e927760f0fa982122cde3819ace2e730cc0dd0e093812ad8470e8783477bc2bd10fe05aacf0b3e0e4f
 DIST libcroco-0.6.12.tar.xz 482028 BLAKE2B d43b73ba21f600ec6d549b867a58db956e081ca8b0787db577062e36487d23cd99b384ca3269421d26aff9825725b262fd6a3e48be73448fe984548ab3eb080b SHA512 af9a171d5ccded255b57f170576e67155f12fa0f61ab3e379e907975f77afc37e82e22772c6019b2897cffc15b2425faf3ccfda92b1a45b23eda2519debabeb6
-EBUILD libcroco-0.6.12-r1.ebuild 1454 BLAKE2B 84850e5df4810ab53635a451be8958b388bd3a2a4fd7534d2f5f460efd3454fd8089e2937897c96c777ba445a28d3e565e1916a4d1cf61104874715741bc70de SHA512 6d62ee1abb2edb46a10c2b8746bd69bafac2f1abd9372299b79a182bdbd43f241ce194622b1f006203fd0c55974fc8863333e04bf462209a934973c8b8182a95
+EBUILD libcroco-0.6.12-r1.ebuild 1453 BLAKE2B 7e5432e3ef939b1c612367c670b49ae92757f21bb164a6105e738b4af00a86f67be47ce30e0aa5b7f55ab2b89f87b03b0b12c7bd164eef797542a5402d65d3a6 SHA512 4ec27a3f313424c49fabc213d0848dfd3b4c9909863c6fafe4dbd65c4c740f7f535650fb8d9c98a839e8a784bf3043d9812bcb2f136475248b89bac4fda5a033
 MISC metadata.xml 597 BLAKE2B 93f85899d5ecfde37206061e57a03b1eaa181d9e2c105999621da011bbed2b11efaae603c2dbba0b405917653adc75cf849e92682e798e9514984e5577fee90f SHA512 9161b1cf0d796d0aeb681374b278be7938bc551316d6d7fc4fc1e19bfff4477f6b12bf606df0eb17c57e08ecb257f358f579a232ce6dbd6cc2f838aee4e2b9bf
diff --git a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild b/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
index 19b49bd64c69..6967b79a1068 100644
--- a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 013c82618a6b..ebb3c037e331 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -3,5 +3,5 @@ AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d
 DIST libdbusmenu-12.10.2.tar.gz 735730 BLAKE2B 0c0ee66a1044ded26dcfdebdbf8d4501592b4a57dccec80fd196707588eeccdbd162528d3c60e895b38180e893106332b2ea4273f1408d86872bc678bea1aefc SHA512 cf2e50dc3adbf35d0a4ccdd62a3efd9fae2d079b8d06e6522b70f077f89ac2cf72188e380f476e38d184b69549e90b801bf1e32174fa94bbe612dd52aec94496
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
 EBUILD libdbusmenu-12.10.2-r2.ebuild 3455 BLAKE2B cc11d393df54088a8b4fccad722f2b4a496272d8894ea54ff5df4d897e5c8289d1375948989ae2f83f9d17104f7fc9715c0facaad606775659a4edf50cea4c68 SHA512 a2a38070422f02554b039213ee071f49d8b62578273e9adc87edc643c3550ebdbd67f161544785edec94ae48439f7ee720d11c537cc34aec6a56731c493f925f
-EBUILD libdbusmenu-16.04.0.ebuild 3996 BLAKE2B a803f22de43483042d82a1d9f6a3909fd3d32fcdb9c514a85af57fb153f5df923f09419cbc5affa43afcdd6b33a55109bbfc5ae4574f7687bb0d3a831f8e3369 SHA512 c58923554236b1fdbe71ad64474863961747967afbc42163b804baa23fbddf24a1533ba308911756139f57a9317f86d96f99bf699dc8b85eb34ec5ffd22a03a9
+EBUILD libdbusmenu-16.04.0.ebuild 3993 BLAKE2B 4807cef3808347c947f47fbbd2f44b3b97c2e9968e59f15367fa3bb38afd0688497eee71a1086e18954dcc98fd24b155975e5ac4c3753d4b85f94f54727557fc SHA512 598d80e5a7e5f9def5e5b111190c1869c07ef9a0a7aae58b06b21d3f7ae8220f3d12ca7a5866e8ba0eaff4621ca3a2c638aa09e1e05c9884e1bf7612da35d88e
 MISC metadata.xml 491 BLAKE2B 2cf408454b7544b7db725159845410fc104e6b73f3629a7e81b42154ee9700fe94587408cbb95e91f28a9233972c0c0c06dbbbbb9d11d171b809d33ad7cd8e01 SHA512 9183ab899735954d60ecb8b7ca394a72bc519b291fb2032cf5888711ab0f748bed9bc1cfb657ea6c34224b657df5634ab4d54a5bf89fbb0762d5a23d90425d12
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
index 1abf95c7910c..9aca9d743aa7 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="debug gtk gtk3 +introspection test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index c998a80c78c1..f29f7d2a2674 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,5 +1,5 @@
 DIST libevdev-1.5.9.tar.xz 408200 BLAKE2B b99974eab572693c9e2a915b21adf2e6c09e26af70011ce661084ac9add51cb6257f36bcfeb89d76c8987cf8724e69b027d30eda17c4457a40f3e047302efa19 SHA512 4496ab4d9dc165f416a574c21a7fcee54ae104c21ef4785a4dd0311fff428020cdbb5da7bf3f835e78dae05effdb1a557d189347f6e62dd6be2d8bcdc845850c
-EBUILD libevdev-1.5.9-r1.ebuild 1069 BLAKE2B ce9fc469b63870e17fd86864afe1e18d154b6a2d9bd05e4f3fc71937c45aece02391275d960bece94ce998ba4f40fc7e1b0c73f8fbb1de83bd1e1d84fed19879 SHA512 0fe984fb6a8efe9692532041e9adc37e209d93641e4c4b00693242332610b6f6e6139738ed53ea2014ceef19c5615aac9e2948b3b7e3cc58819f2123a0b22bfa
+EBUILD libevdev-1.5.9-r1.ebuild 1063 BLAKE2B bf6c32fe22abc2536268059db2c41d1b81dd6f562e43a84a1783e92e619f4a5119c139bea69003182ac60b357886d3d601cc15ed6739114719a8d3deab244858 SHA512 729f64e90c9b48e9baa065abe1c8c1a2c5ad8ba6ccbe139b10167def3ba4ae8cbbbffe7f3502b351339cd3f3fc1772736890228bf8a233bfa347360fac4b618d
 EBUILD libevdev-1.5.9.ebuild 661 BLAKE2B 7652efcfaec06d2115d750a2ea48b82e3126af8ae9b017b7b90e706f05a44f5a5dc361870a2b4cbe5ea356a009c44078419b234fefaf9fa83175d2de2ec0645f SHA512 2274dca24677c9e60ca05c2430eb1903da437e6c3dcd81843750378d0a9570d206933baab589be3050296e95e8cd6e15c70a96278ed04db0b2210f81ec02fb0b
 EBUILD libevdev-9999.ebuild 1069 BLAKE2B ce9fc469b63870e17fd86864afe1e18d154b6a2d9bd05e4f3fc71937c45aece02391275d960bece94ce998ba4f40fc7e1b0c73f8fbb1de83bd1e1d84fed19879 SHA512 0fe984fb6a8efe9692532041e9adc37e209d93641e4c4b00693242332610b6f6e6139738ed53ea2014ceef19c5615aac9e2948b3b7e3cc58819f2123a0b22bfa
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild b/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
index d551ca6aecf2..23337f81f384 100644
--- a/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
+++ b/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	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"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 8105cc53f738..c0a6bc5cdfdc 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,9 +1,5 @@
-DIST libinput-1.10.6.tar.xz 495536 BLAKE2B 3f23808635406eeb66cd6b4ce2a2dbaed69ee0917045f75ad262a59702d72923493b6faa7951ea3f7cc2591d4c9e1fc49cffc53b6dfbcb2aadc7b9f40c20517b SHA512 b76963c3429c5590ee04f1da94d08775c8bb8584830e678804fb1d4cf0e2af84826782eae71fdd57492461f85df87ac2fc940c280b0672c75cd81d5f34702fe4
 DIST libinput-1.10.7.tar.xz 494648 BLAKE2B ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892 SHA512 b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
-DIST libinput-1.11.2.tar.xz 485600 BLAKE2B 97b07493693e24be1bde3e7792c83c33b9ed4d64afbbecc1a5b77b4470fe9ff03cfbb2b4dc36f6cc5a9d58003410797979d7fbbb539d921bb9cddb5f8fb1cf0e SHA512 cb6ada877fc3c09f634f3db39d5507e66d4b86c3d632bb8f7498c7b01fdf8372b2053a79b641293900b7fcc0aa4e920f7c830d9c7b2d9ff3cd61c58eb7c20b65
 DIST libinput-1.11.3.tar.xz 487408 BLAKE2B 38dc14cf018ca59279e8b6e85fd91f4b29545b4a55ab968cb11d9a8afc8d80c311efc6e57339b9baa9fb270f52cfb0758ff8ea313991867c35f3da47910977ac SHA512 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949
-EBUILD libinput-1.10.6.ebuild 1441 BLAKE2B 3310fc527a72be6d0561091a4fd20cf637b66651e6668bb12357feb3f92f52c570db613bbcb45398ea9e38bbb685a82faeaf6a0299acdf156d3f7db01e80bfd1 SHA512 2281dfa10a76434333a54fa69c444a6a54b89b797344646ca4316e86b7292ccfa9047136f3f62dc631988ce1a4d92f35514915c8829fe469f1a35f454a772002
 EBUILD libinput-1.10.7.ebuild 1440 BLAKE2B 203a9e8e20785cb93d221d8614aec3488a316d301672d3bbacbd223cd959c31edae176c17d1d575426cec24bd6e89c82b80244bcb7273a4531743555c4ba3b42 SHA512 c0e320acdb66994bcb5fe11b60ac4dc88955cae25da1dc3de028738bfb86c57eba90d23f258ed076ddba0da2737af9027ccde6a73705e6ff4feb8beffb591f0b
-EBUILD libinput-1.11.2.ebuild 1528 BLAKE2B e3daf3472281d8a9dee058de497bcb2c0155f273a89fd5cf7334fbe40486e540e02d793bfa30d08342a1123aba2936dad4a921132d6cf802541635f6836cf8c7 SHA512 d601843c5a1a729de144c7b63a2a8efa3a4ff7ce60727a964a1d48419ef7a8c1b7b3bbd54853f71707a1071613cee9fba7434d91960236b467c7086b8224c4fd
-EBUILD libinput-1.11.3.ebuild 1528 BLAKE2B e3daf3472281d8a9dee058de497bcb2c0155f273a89fd5cf7334fbe40486e540e02d793bfa30d08342a1123aba2936dad4a921132d6cf802541635f6836cf8c7 SHA512 d601843c5a1a729de144c7b63a2a8efa3a4ff7ce60727a964a1d48419ef7a8c1b7b3bbd54853f71707a1071613cee9fba7434d91960236b467c7086b8224c4fd
+EBUILD libinput-1.11.3.ebuild 1443 BLAKE2B 95c2a74f98abe1b021f14df89375e8acba26cad0df3ebbd753844cdbe477fcb7d2d9606c76b51676ee0fb27623a5de658a6326d74d7d90e9d1cf5be0cb8d8428 SHA512 2e91a777ad1f5a3a849ad7a559f34f43dffbeda2c5be97a06c0870d52d558c916045ff98229f155527cca58e38e155e76a48473a8f03c7d3b8ad045bb595fcd6
 MISC metadata.xml 340 BLAKE2B b555474c5acc545a4a81d86b590620ed4eab35e091d012d740f3d0f08add99bc0b5d09db251c03e1191df719135c92251d98849944fe41f76336526a96f9ae7a SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09
diff --git a/dev-libs/libinput/libinput-1.10.6.ebuild b/dev-libs/libinput/libinput-1.10.6.ebuild
deleted file mode 100644
index 9e10a1005467..000000000000
--- a/dev-libs/libinput/libinput-1.10.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit meson 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="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc input_devices_wacom test"
-# 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
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=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 )
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		-Ddocumentation="$(usex doc true false)"
-		-Dlibwacom="$(usex input_devices_wacom true false)"
-		-Dtests="$(usex test true false)"
-		-Dudev-dir="$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/html/.
-	fi
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libinput/libinput-1.11.2.ebuild b/dev-libs/libinput/libinput-1.11.2.ebuild
deleted file mode 100644
index 0635ed1b8faf..000000000000
--- a/dev-libs/libinput/libinput-1.11.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit meson 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc input_devices_wacom test"
-# 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? (
-		>=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 )
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		-Ddocumentation="$(usex doc true false)"
-		-Dlibwacom="$(usex input_devices_wacom true false)"
-		-Dtests="$(usex test true false)"
-		-Dudev-dir="$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/html/.
-	fi
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_postinst() {
-	udevadm hwdb --update --root="${ROOT%/}"
-}
diff --git a/dev-libs/libinput/libinput-1.11.3.ebuild b/dev-libs/libinput/libinput-1.11.3.ebuild
index 0635ed1b8faf..e26ac3c3c0ff 100644
--- a/dev-libs/libinput/libinput-1.11.3.ebuild
+++ b/dev-libs/libinput/libinput-1.11.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/10"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc input_devices_wacom test"
+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"
@@ -39,9 +39,9 @@ src_configure() {
 	# gui can be built but will not be installed
 	local emesonargs=(
 		-Ddebug-gui=false
-		-Ddocumentation="$(usex doc true false)"
-		-Dlibwacom="$(usex input_devices_wacom true false)"
-		-Dtests="$(usex test true false)"
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		-Dtests=false # tests are restricted
 		-Dudev-dir="$(get_udevdir)"
 	)
 	meson_src_configure
@@ -53,7 +53,6 @@ src_install() {
 		docinto html
 		dodoc -r "${BUILD_DIR}"/html/.
 	fi
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 }
 
 pkg_postinst() {
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index 6b174d091816..f0ca09c8f7e8 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -2,8 +2,8 @@ DIST libmateweather-1.12.2.tar.xz 3394620 BLAKE2B b95af472d88c6c4495422251cd8f10
 DIST libmateweather-1.14.3.tar.xz 3345244 BLAKE2B 1db6f13507a10c6ad9bc0eed69b9cbdc35fa9f601ef80993a419238234c8a62a1d45f0c215d2c9347ee6622a9eb30faef76452acf8a210695051654bdf1dd227 SHA512 51e1a29b5faca6d433f6a84fc3e08bf39e87ac48d77ff90085cd7d394b3f31388f7b6b3382e4b75dbdf3b2d07f16e9f9f92bff713d3a038270314313f614af36
 DIST libmateweather-1.16.1.tar.xz 3346620 BLAKE2B 4bf5594b879517f00faf3c41b97642945cf0a8dbb65eaf66672f5d5c70432c136802743109ef74dcc67c3cf8e64ed2099f98d2167f5ffccf28a93d1b03931e76 SHA512 7cc49cc3fc16a3f06cd50db49f868d8f31a2acc95cf0c6912724248a1b35700ae0600363cd891d5bdf9961d3ae373841a0df412382933084f5e5224ff21aa386
 DIST libmateweather-1.18.2.tar.xz 3455940 BLAKE2B 15cb57c0202c1117f203bd9550c86d255404984e9163a7f79b8f81a0c436ff6bf9e1945536a15078ad479c9379798966337b6b8851ec84384ccc08c352d06260 SHA512 9b0f9b11f0c9b472a13adc1cfd26076dffd278e0154efa4248f8cc4a999250c88c761985b9a18978a7581e5459232fe2314181ae26a1c7c4fd4c80b536827504
-EBUILD libmateweather-1.12.2.ebuild 1369 BLAKE2B 99530b5e0f0e06b62d00fceff0c83112f5ccb85744a375d5fd98548f7a472be7b1ab7a0be35b4d0d50f20e2acb2b48b4a75869591896aec90511dc7f950f9fcf SHA512 7dd9f6843bbc6b22c006a4eeffe1dd26653f6425eb2a7ea011e2c8c6d347b6562d968f0a9989dd66bc34ce34112acd82c31878ea0266185168efc076a8448636
-EBUILD libmateweather-1.14.3.ebuild 1411 BLAKE2B 7a8b1141d1e2e17535328174a18bbce986ade49a38ae668333aef29cfa8acc6f574e48f1f3076adcde0cc708d453e6863ff4b351210616ad5b89635db231a83d SHA512 b9c09ce5c1e64bf664efaa8d93bc7a46c9f87ad11d266c0558f98d34384400eda7969ef245ae9d2be43696a78a2d0920c090f3dfb75771a991e15e00ef6a2a41
-EBUILD libmateweather-1.16.1.ebuild 1411 BLAKE2B 7a8b1141d1e2e17535328174a18bbce986ade49a38ae668333aef29cfa8acc6f574e48f1f3076adcde0cc708d453e6863ff4b351210616ad5b89635db231a83d SHA512 b9c09ce5c1e64bf664efaa8d93bc7a46c9f87ad11d266c0558f98d34384400eda7969ef245ae9d2be43696a78a2d0920c090f3dfb75771a991e15e00ef6a2a41
+EBUILD libmateweather-1.12.2-r1.ebuild 1351 BLAKE2B d32c05e9f3b19d85e983006bac8b5a7e213473e89df0d85477c8650ea91adbb3f7e16013a612330c548c54aab3fcbbf2a1db680499d2fd4a7a5d8dad4e7475c7 SHA512 a8c4479e2b4a2aaa5079598906a3b005b8fbfb6f45101c5cf14890c4fba168b65219080507e163e486477cf91342ccbbcf9beba7c407e378e249555b70257951
+EBUILD libmateweather-1.14.3-r1.ebuild 1393 BLAKE2B 9f9a6f172ce2fb888f88b4bffc1f3da0aa38c6899de7c3b17fe8274020e9a634ac97df71442c8055154c635d9154de2c15384f888aa0f35dfc76f16f390e2d24 SHA512 a8e6b2fa6abcc518c0ca56f7b770578209a508ffbb5b97b2b147ff7fd602cc3c2a1cbe657f198b525a6f91f8d0bb13fa89aa63cd9e578a39512d26707a7690d5
+EBUILD libmateweather-1.16.1-r1.ebuild 1393 BLAKE2B 9f9a6f172ce2fb888f88b4bffc1f3da0aa38c6899de7c3b17fe8274020e9a634ac97df71442c8055154c635d9154de2c15384f888aa0f35dfc76f16f390e2d24 SHA512 a8e6b2fa6abcc518c0ca56f7b770578209a508ffbb5b97b2b147ff7fd602cc3c2a1cbe657f198b525a6f91f8d0bb13fa89aa63cd9e578a39512d26707a7690d5
 EBUILD libmateweather-1.18.2.ebuild 843 BLAKE2B 3809f709cb0c4cb796cc07e703f9c81807ce4bf2073738c85254f220c019c28f591f3d7e8d091f0a7cbd711cf38ed326ab4f39bf197b3577c0c97e416cb02fb8 SHA512 641c1c04e885011b1a1d55cd6c385b7353053c28cd709aa573392156f003181d87ebee753dbd3201a66b21c0f9dcf87cac036f450186a0a5403946874e3364d3
 MISC metadata.xml 419 BLAKE2B ce791bdb7144ed1cece755cdf8d85dfff6ea4f06f44066de84e73087817e113e2087fd9c33f10e3480c363d46c5e4b08a7771c3cdcc2766a0b60c315be0a0449 SHA512 72aa11bd406832fed28f2a95e1ed19af5c483ce4238ac76a3d3364bfded1a6d823ca62e2c9e794b37a9d58d9270f92aa03f392b5307611b6b17cb148e826f5fe
diff --git a/dev-libs/libmateweather/libmateweather-1.12.2.ebuild b/dev-libs/libmateweather/libmateweather-1.12.2-r1.ebuild
index 903ee582dd41..594d5bf14f73 100644
--- a/dev-libs/libmateweather/libmateweather-1.12.2.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	"
 
-RDEPEND=">=dev-libs/glib-2.36:2[${PYTHON_USEDEP}]
+RDEPEND=">=dev-libs/glib-2.36:2
 	>=dev-libs/libxml2-2.6:2
 	>=net-libs/libsoup-2.34:2.4
 	>=sys-libs/timezone-data-2010k:0
diff --git a/dev-libs/libmateweather/libmateweather-1.14.3.ebuild b/dev-libs/libmateweather/libmateweather-1.14.3-r1.ebuild
index 4b1232fdf3c9..6858f117b265 100644
--- a/dev-libs/libmateweather/libmateweather-1.14.3.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.14.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	"
 
-COMMON_DEPEND=">=dev-libs/glib-2.36:2[${PYTHON_USEDEP}]
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
 	>=dev-libs/libxml2-2.6:2
 	>=net-libs/libsoup-2.34:2.4
 	>=sys-libs/timezone-data-2010k:0
diff --git a/dev-libs/libmateweather/libmateweather-1.16.1.ebuild b/dev-libs/libmateweather/libmateweather-1.16.1-r1.ebuild
index 4b1232fdf3c9..6858f117b265 100644
--- a/dev-libs/libmateweather/libmateweather-1.16.1.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.16.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	"
 
-COMMON_DEPEND=">=dev-libs/glib-2.36:2[${PYTHON_USEDEP}]
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
 	>=dev-libs/libxml2-2.6:2
 	>=net-libs/libsoup-2.34:2.4
 	>=sys-libs/timezone-data-2010k:0
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index df82bec7b483..5e96e83cc93d 100644
--- a/dev-libs/libpthread-stubs/Manifest
+++ b/dev-libs/libpthread-stubs/Manifest
@@ -1,4 +1,4 @@
 DIST libpthread-stubs-0.4.tar.bz2 57565 BLAKE2B 0c59ba509aa24ce0d255790363d78d670be0bae5fd9556798f276466ecaf70c4d93064b531dd9870da8f934da6660fba71a7f0b402bb6ba5420fd6ee5ca546df SHA512 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
-EBUILD libpthread-stubs-0.4-r1.ebuild 814 BLAKE2B 32d51c2d5a14a72c1d9b88a413331966b20dff6957d6c7b920e2f0c0315da325cec14d8957ab17fd783c46a065f42e0a399a0de01f9dcab502cde30164b8a3e3 SHA512 dcf57e1df4bbcc60155074cbab63b79af0a0f4be1f81b35f17d64094ea6da72aa944b912ae711df9945fb7b7e090b3dd21b0b22de9ce67b23f19532abb0e44d4
+EBUILD libpthread-stubs-0.4-r1.ebuild 807 BLAKE2B 9cd1d7dd3baea215a92cd538a05ecf4858c5479e7834625884ebf8364c2060788dbd0ff36a00049535242b07a0f287f54c937d12e415f6179c84a27af56bd593 SHA512 827319c423a00961f5db28cd939422025c34619ce18f9d7b7f0a8f6c647f87fad2002d6fef317d5b7117f890a48ab897a055c469d1c3ebace6a8a504d313ca3f
 EBUILD libpthread-stubs-0.4.ebuild 558 BLAKE2B fbdf5eb277d82abd40c467575f23c62518d5202be6bbfcb6bdea017da32d57cf8c9a022e9b5a1149735aba6270d321c4d30aec83a40569bdf58f8b9180a4d0d8 SHA512 11c659e774a557599cec8388436eb85628b191d602f378a2e9e233f26309ff4b6ced321aa0e6947a84f7fa270ec904720502c1319d59409be46f1cde6ae2395a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
index 594762ecbbf1..34cbe4bdab8b 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest
index 3def35b43ca0..0f8a2f416e41 100644
--- a/dev-libs/libspnav/Manifest
+++ b/dev-libs/libspnav/Manifest
@@ -2,4 +2,4 @@ AUX libspnav-0.2.2-custom-flags.patch 2151 BLAKE2B 90868c4c60627a16c247a99cf3dd1
 AUX libspnav-0.2.2-makefile.patch 926 BLAKE2B 28533b0e1b91de397d150302be3ea35dfab22fd1fe2235ff41c5a755db48a4eac2365e2f5b03306157336cd9b09b422877c63c9798ddd2d8525ece94af7d8697 SHA512 ebaa5f5685fc55c0f5c0783efd20b2970be8a4ce3e5564b23c65348b1c72e1840d8c2277843cb4d7d3899579810228835f4aa59f99188e79a5543dca93522a21
 DIST libspnav-0.2.2.tar.gz 11615 BLAKE2B 470a533d9ae58b37cd1c1603381bfd3a3bca79b2fe15a81464727e2543433df2fdf32b8683464ade9aa9670f3c9af1ffddde58299678d89d977577ed324f1ebf SHA512 78b26e6fe4a98af579738743ac4bc2f1de5ccfa9316a103a58ebb935f281fba04b8c6c28c0d63abda15a52c0288e371231425a3a21b26c083a5de7ab101f1940
 EBUILD libspnav-0.2.2.ebuild 1083 BLAKE2B dcd24705baba8b43e0cf62f92d5568a7edf84422851c0012349d45fbac7fc775be3d5f3014ec8b395612681565c6d16038392fcd3798ac46f241fb937f56959f SHA512 a6a7ff7c37d855cc4a53908b5dc6f4b9be3e176a409ba7431f9a068339470301d17dfb5e172daee032d7e7f09bcf23bc0d0ba5739f7dca5b2c380249c165bc16
-MISC metadata.xml 1051 BLAKE2B 964339ac3fa7b2db5174f1a8fcea691118701433e9bf39f50125ca78ab224fdd6084cc50e59bf83bde7658a4e47c6d0561e4c04549b70c8c8826ebbb78b2672c SHA512 7b9a136b25f0f9775ffdc07814659b5d8029ddb8a96d3eed4b111c89ce12819a47c2a7798324ab2789caa6ab5364bc72a4720aa558e679fdd6011ff5381bba6b
+MISC metadata.xml 811 BLAKE2B a39e9937eb3d7f59833369b4e983ac30dfdf7cce0e895916c5cb934b03fc41ea9b4a4fef3c7c8c8e98ffb0ff7398a3ed5c94015772481c2cd60a019f1fe714f4 SHA512 61f35f0ad4015cd020f0292d139bed2a5bb3c8ef7f11cc96c816ca6003941de0f8295a75ccd6da961bf4256988b788784ca4b41e98be0a9f96c04e0663d566e9
diff --git a/dev-libs/libspnav/metadata.xml b/dev-libs/libspnav/metadata.xml
index 9168a893a04d..4eb1adc52267 100644
--- a/dev-libs/libspnav/metadata.xml
+++ b/dev-libs/libspnav/metadata.xml
@@ -2,17 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>anthoine.bourgeois@gmail.com</email>
-		<name>Anthoine Bourgeois</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		The libspnav library is provided as a replacement of the magellan
 		library. It provides a cleaner, and more orthogonal interface. libspnav
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 70724a8113a8..73a15ceb2d6e 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,3 +1,3 @@
 DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
-EBUILD libtasn1-4.13.ebuild 1178 BLAKE2B f39428b20b2579ce482769b4281306c567ef7514685d8bc268c3018d38d3ef2ca6b318e4e5c473f52adc1e189dd9a20eb5b74efbe6fa91a7c5aa8b0aa507da52 SHA512 ddce3d4de8fe70619d3cc485faaddc4f8328524e225776eb4d9a55e3f5b326838213df0567b0482fec5bc16233dc645dc014db1cfda6ef20cbdd08f1fb0a5ab7
+EBUILD libtasn1-4.13.ebuild 1177 BLAKE2B 34fdf4a4deb945bf9529bcf09976011a77c0b86f61ab31c226f98f347aaedea70b32af227c027d512ba2cd18b6f7cd320cb596cfbf4f03a847dd883e70f8040d SHA512 e7efc304860cc9ee726fd51df8f14ade7122e16a1a97de2addd208d2081c985ff2873e2999e3d36fffc7d26d423e6ebdbd21d3215623ef5d680d0b29cda23fb1
 MISC metadata.xml 347 BLAKE2B d1cb59aca28df43f3b322b98daf2cefd4c91d45120bd47c5cb883dde59ae0ac9b8fcb092e0bd4b51e1f09aff48b97a6e1880568ae6796025a989b67902b01a7c SHA512 2f70d06c9e91e2d9305cce180c302b6b04b4831fd93c1897fd2027a1bf5855700c5531ba3f9c3fe93748df1db923d6ad4ea78bbe3cfd2458c0006457ed43a450
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
index 62b3a9b13d66..dd05e0d8d309 100644
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs valgrind"
 
 DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index c72865d16db4..b4d4d74d7eef 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -3,8 +3,10 @@ DIST libuv-1.20.0.tar.gz 1180231 BLAKE2B 8ba258477c685acc1ed5486211b65719419757f
 DIST libuv-1.20.3.tar.gz 1181741 BLAKE2B ee68f975c9f150034b02772b297a05692305155449dac75f35ca32761ffa2803385b22cce5c0fe1b2ad73a52144e6218e2c62d73c92e098017bee74a99e16062 SHA512 60ebc0059ec9fdd022aa9d60b2a0340f29e037bf79fa08707f6f2ecca9ec263c7a6466bdc1f94e0875a6a627ee749efa86117dedb22119676a7bafed8b5d77a0
 DIST libuv-1.21.0.tar.gz 1187827 BLAKE2B e534eb4a7cdde3988a34047c999fd20e83f443bcf3ac1c62e07b7e4ddd95f62ac8221d58197b5f8fed618686d6003e35793b1b91e1dcfd6245a05d8bff1b881c SHA512 ab6b52f8bee1900953d9136e4d281f81ba9f14287760f7bfc8633289699cb9eeaab15d9146ed05b164631fcb3c2b5abcee8c10499d080a82a411bb1f02564c48
 DIST libuv-1.22.0.tar.gz 1186080 BLAKE2B 5e909c36e5ff75fb199f52d5910bb092ca4117ca0c53f8d3e7c9dd7e57f4959dca6e46db095cca93f3a079850268e5cc0fc68b2916a20773f09b2ba5f1531cc0 SHA512 e79cae6aa1d9cf2c8f7c0262c866fea2858d7104ece7c556e537e7d1cf884f191d5cd3e56539bfe857fa15dc50b57fdcb33019824cd585a2ca250a77d923af73
+DIST libuv-1.23.0.tar.gz 1189014 BLAKE2B 1bb2330773b8e7e7ee00e7000ea4076e0d93c3f54f7dc4e8ae0c6c73c652a406c907ee16a2364fc8688c7cc7a367fd3dab7a8b4885caf06a0196cb3d09fe7fb3 SHA512 d1622ea9c03661ce2dfa18e1725fc1bfdf3b16d7e40babc552dcc5b2f86d52f4dd81cac9bf89914024b11e4ed3671264dfcfba867cfa3b1a2206b89c59c95851
 EBUILD libuv-1.20.0.ebuild 1167 BLAKE2B 822424c522ba27df7624d2b3e1fabb522e15865b8eb8a56127f6565da3d1ae55f519d47ddfe7cb7cecf406626487fba48d77a164a67e9d48be613cc2e36bf93e SHA512 3eb698ab1c3e9d31a90f79293a9484cf7a27e7a7945577bb241b74e6390bc4efee13e43b28de51c38c5fe3b921ca886f0ea8d26c752ea5f0437f5a4d0ab7bfd4
 EBUILD libuv-1.20.3.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 EBUILD libuv-1.21.0-r1.ebuild 1223 BLAKE2B b722de91966dfb7612e4beec9e266099a83624183ae0d7b647c886e2b03d9b0de6cff5fc0e8c668db39c14adeb0469d38a2708adb7095c59c651bac3995cdda5 SHA512 e9743686b9e24773e37800b8437d58e6d1c3d6ab5fd664586d67b93b98981537ac1b3bdabbfcb13b1bc1b7b7bb0b06f8eab6d9f3b9c075da31c83279c95a86ea
 EBUILD libuv-1.22.0.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
+EBUILD libuv-1.23.0.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 MISC metadata.xml 1262 BLAKE2B 0bcb30d58c10147ecb831f1805c89a9cf8d4c8545c7fd8a834a5be6cdfe80e5d7d4b2e7c41df9c2e0b545e199dfcf5de26651f04131442ca8bddf86792fa3e48 SHA512 f95931c1bd8f6bdf6b06fa48e4c66e5bcc567f23fbce82ab46593a3e8b540a582b1e3ea023287ce02d42d3e013e85e3260a300b1d0609d95a98fcd5d7dbea668
diff --git a/dev-libs/libuv/libuv-1.23.0.ebuild b/dev-libs/libuv/libuv-1.23.0.ebuild
new file mode 100644
index 000000000000..1edbef416b0b
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.23.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 4e6448444e0c..59a32984c8d6 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -5,5 +5,5 @@ DIST libwacom-0.30.tar.gz 119261 BLAKE2B 4f76fcbed42c5453701e3b5dda880a26f9956a8
 EBUILD libwacom-0.24.ebuild 1079 BLAKE2B 63e046663de6133c9396f23da3971620024de275e918749e5cfd39e314515fe9b06c3c6964950d363df03d2225326a93baf9847c061bffaf188245dbe3f21df3 SHA512 b538779a85fec5a6b63ae0e0269c96e84fc74e1bb8a651a637eedeb57dee1195d2e12dbf165f030b88a5f1ff3b47e2632c0b1b901812850a41cb5f585923ef37
 EBUILD libwacom-0.25.ebuild 1089 BLAKE2B 59837e9e7569797e5cefd876dcfd0a131096c147e418bee54391c4bc3aaa4755714aa5c2ef58799411b88df74b45c367b07c48103b9727c2a7704d755bc6b560 SHA512 40d0da1e92752643fe8305a75eb109ae94905376ca53c0cc0ee6e3d60c4ef6d251936249c56b11c3a90d1465ece431e5d0903e7cfd78f5cc07f8f1cafbb62944
 EBUILD libwacom-0.26.ebuild 1096 BLAKE2B 5a7b22119e2f81952f47beb72cf663d9f286db7887a8e4385884446112569e665bf3fb312b553db9902cbb0f66bb6d96e7c6ade4614c0fe92add7a07da2de5cd SHA512 a33a370fb8938c7b4676a580cd821c6647096f7111b2dcc15b1d44b016f29425059155eb42e004a337af36c827151ed35fd6a8d4f35f107a7dce0974aaed907f
-EBUILD libwacom-0.30.ebuild 1186 BLAKE2B f62888bf7e88e0a8a1a23286b08becf0d7ce92728aae105cca53ed7de2933e0b07037d3c86926a1d7a0cd8281fea5dc0d0f13a59799397b2e504f5a3a5814bf8 SHA512 8de553d2382fe19e51e57333c8300e5a6be3ff229a6477e75c1bbc2892511b0a66d1ba5b665bdcee59168e32b820c604196352091c1cc0ba8511a292767e6ac1
+EBUILD libwacom-0.30.ebuild 1183 BLAKE2B ad3e7869bc193d0664dc1bd71725ccca43286c963cf3e59b473b9f64f7d0e194e4d37c3ce7e2ecf5210da260a590980540fcc2b79c5eff1487ba0341b07c344e SHA512 139f5a12c5cabe0094d21786b365513c2585c82ad16f3ac9208af17a6481ecaf55682e5c5df41add6fcbebb8a1827619197dd48ff43f1614f82a636ba627cd65
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/libwacom-0.30.ebuild b/dev-libs/libwacom/libwacom-0.30.ebuild
index 245f3d5f7845..a08f16940e64 100644
--- a/dev-libs/libwacom/libwacom-0.30.ebuild
+++ b/dev-libs/libwacom/libwacom-0.30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 696cd77b9a52..85f2710e2805 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -4,5 +4,5 @@ DIST libxml2-2.9.8.tar.gz 5469097 BLAKE2B 0b7836db46edebf6e7108c28da4bb7e3fb5ddc
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.8.ebuild 6434 BLAKE2B 40de078886a4046c208e16b3490778acc89424a3549ec69e42a89e7fbc98c666b5c4c5ddb63a5c128caa07d6abfede96d6ccd551a2e956314b1b42868bbf7e30 SHA512 5bef9eee3c7fadade993c72c2d0309e84226c92dfa8b60d766ad94a5c3aa16373f8ab1ff5e8e10e3d38d4eaa851aaf2d444ae1019e133f32c742973b169d0470
+EBUILD libxml2-2.9.8.ebuild 6433 BLAKE2B ea543a19bd079f6846a305c0a2e8863ea737535a92cceecd4e139329c3b247ce5d4d490c2f2bf81e55d0ff22efa5b2eff45ac7d869f2ebf0f7c0a11f972c7d75 SHA512 bbf2b4369055ba8f7207603ede8a13f4a6555330967098b95fceca3a8d26680e731c64417650a474accff156deaff14955488b1d4742a9b3dcf6493a4843692d
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.8.ebuild b/dev-libs/libxml2/libxml2-2.9.8.ebuild
index 2bfe2d2c50d8..9f5dc9055c6c 100644
--- a/dev-libs/libxml2/libxml2-2.9.8.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 7fc140f7b689..13c01a6c83a1 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -1,6 +1,7 @@
 AUX 0.8.1-api-version.diff 421 BLAKE2B 77cd7452029021c098f3d9a40a94e0af63a30c986148101f9b86d0dc416873f6081d8530001e9c478cf3c1b6d933fefee227987b9ac7e2305c82c16903259a24 SHA512 0ee058b1f16feef966cbddc9502507f8890d9a9ce5a6eca70bd0b831909d286caf7c09cfdded4ac97a28efda2215b11df8e9f747ace727b4b972c79841a7400e
 AUX mongo-c-driver-1.10.3-enable-tests.patch 866 BLAKE2B b4abf32f0915f28185b8e036ed5083a37795cb84980dee755649ca63322f29469d1be614c1d2d97455ca37639c25956cdba08efa320db213561cddd337b1bc31 SHA512 23e41702d7e1d64c3baab4045f87945c36f028f9802701c37316bbddba667c2e1c038c1234b3374c66b252e9b2ff068f3dfd513a397ee56d170397cc268277c2
 AUX mongo-c-driver-1.11.0-enable-tests.patch 866 BLAKE2B d07afeb06dc61ddf15bbb46576e21c773a87e71ef8618130f8055b03080147e68a5c9a9b805149eb328510ccea172b790df8a512b45241173c5f1a5052ce7db6 SHA512 ce81feab28a06d003c731d4b14a611f705c0f45123282b7a1836d7eb0befdca4a1a041896b3d4b9bb49027c3fafa72feebfff2a26657df56f21862d0125c13c6
+AUX mongo-c-driver-1.12.0-libressl.patch 637 BLAKE2B df52868ae9253125cc77973de4d385bdbebd1b90bfc7bc49bed4a4d6cbcb02768fd98b9bf110e9b463893131d44538f1d2ff2b4cba3ce2242832d1149cbd7498 SHA512 fd4b083695e7db3e407e2068fbc76ec063040f200f2087fdad6b21b15bb0da4a8eb74123908a3798af2b81811e8813c047d44117aebdc0d5393069c1ac653ed6
 DIST mongo-c-driver-0.7.1.tar.gz 108537 BLAKE2B 29d7f6680d700d15d02b3d5deefbdc27b4e0841a2ac30205ed148216d15e95fe487f4cea4decacdf573a4ce78248cfd12cba72b9dbf90065e127fa7fb56cad27 SHA512 5c6996dc47ecbe4d77971e3aa983a877e7de736bf358c467808eceba8b1a5eea342376249cdc682a034fc7ec39290d234527cec3c3732686f184281a72aec724
 DIST mongo-c-driver-0.8.1.tar.gz 124053 BLAKE2B 1c6b0d3998c6497c39fc2f6597021e84571c717e5d6f288d79d3862e7f15f131604648595ca0e12200352a7fbf40652803afd0f60a80eac657b9853a1de51173 SHA512 7b61ac4b1b154ee1f518eddb2bbc0cdafe0da8786eed4475e5703c2a735ec5a09efde59f5bfa45fb226cbce24d8c0ba0de403d8fc3e561c0e48507dfb07962b1
 DIST mongo-c-driver-0.98.2.tar.gz 5342760 BLAKE2B 399fb03464234c87dcb66647c5383c505e654238e72e86794fdbc56716590ea6637aa7bfb0d25c0fb6aae8fce6055741753ac33125cb1b475c7bfe1e198a0a1e SHA512 6e3abc31b1e0e02d3bb864882444a95aa01ec4a85ee77abdc52675a730790be7f1924f3c6ea36405ff0f2066e332302ca567bbfa35ba7b918bce81fb409600eb
@@ -8,6 +9,7 @@ DIST mongo-c-driver-1.1.10.tar.gz 5321144 BLAKE2B d63ba4b1a256b8b29654398a53d9ca
 DIST mongo-c-driver-1.1.2.tar.gz 5443153 BLAKE2B f8004486baf6d2d3086e458bdb4bc8060462fd52ba700cbf05fdb9827adcbd087b61d7e0e00169cf635c8021983dc851b7f34c3e08d66efc65483fce98a85f74 SHA512 d420fc407f6a04c06a959b8971dc2643c987df5c3d82f2b13bfdf6a44e96bc377478c4d0e385abf67f21b56892c915c79675fe9ebf6efa9aab51fe452c5e6f95
 DIST mongo-c-driver-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726 SHA512 47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603
 DIST mongo-c-driver-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b1284be7ef0f223b777d5884d795102910aedb8d4f516d5d50cdecfa9219835a884b237aa98ab3742067c36944f0abdc67a8e4 SHA512 d20d83c9470972641407550bf835701df28c196b1cf19097450a062fd3c560c452c658aa5080bb28066079cea27888731f3670e81bd1b0cd5be1b97a2988074e
+DIST mongo-c-driver-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
 DIST mongo-c-driver-1.3.5.tar.gz 5860804 BLAKE2B a55de56d285638f21caff06446e3c0c19a5b8722a2ed69fdf046c35973c9bedcc1686065e4355db28afc83c1415872eee2972a6fb3f21647d2cafce12706adc0 SHA512 23844ffe20580998308aa9c8409afcb87dccde874077eefc6806b705e5de5743846ba0513f3a3fe83147fc47842ab8c7438ad1de5f3f55b81586b9e19046aabf
 DIST mongo-c-driver-1.6.2.tar.gz 6907818 BLAKE2B 7922a50ba58d92d2954eb5c2ccb02fd3b70861bd26516fd12fe6bdf79a926799fbc3a367e1c24a57932870726aa5abc1d264215ea964a56bc318ab0f413afc60 SHA512 b3fe08a31bc83707a4d94f8ea2742fc9b17d024d6c2f92b49cfc4fe012e58cd441c9f0fa4bae9f4205fca44b2a0d8c6d5bc32a05fc9ede9bab0011839a1394af
 DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de062804f0f8637a36ec197efe434ae23a387ec0e6b2e4aa3e9c8bb2434a3cef48fecd17fc4b159a92ad86b8b940b17598a SHA512 af23601ba33694d80acdb890c1b85a354fda966491c4bbfb341a884bcd6314886e405efa3a09e47398adf8dbfdeb1b05ae8b022a72f04a66265bfaeddb661f76
@@ -19,6 +21,7 @@ EBUILD mongo-c-driver-1.1.10.ebuild 1803 BLAKE2B ed8a0f4296418db9836fe3cc4052a9d
 EBUILD mongo-c-driver-1.1.2-r1.ebuild 1800 BLAKE2B 61782ec9c74e2d67bd884c1e1aa1b51eda2aa7148b3df90de3b45187c2823efb3afff7edff1eb5047bb205004a3b9cb8977c0945e6609df7a7c037ca97ab2bf1 SHA512 0183addeff7e2bac1add74db48b727edaf09f1b24b774bafe717c43c0e9a4a083081f12ab1d2afb743b61fd3591d6d3fa04f1b6c2be9339a2ab55a27ef4791ea
 EBUILD mongo-c-driver-1.10.3.ebuild 2191 BLAKE2B 43dba477bba4672c2846b940e30f87a1db9d22b20f2f8b333b73ca0903236fc10da2f5a2a022121b06d09f0037418eca3aad1f54ddc13e2813e9c64c8a4b665e SHA512 cc8ddbdfd8dcbb8ac48315ac880e7c36036c42ab87357661a1ba50caa375590371550415c4f4b4a934a65556549c5208fdaa565dd9b4fda143c26a650af82633
 EBUILD mongo-c-driver-1.11.0.ebuild 2293 BLAKE2B edd5b631add3c2f7813c82be5938141edc54ae59634b8c2ef8980f3b553551b340e01837006e88d9f30a2c0ab7c5f8865e3817ac126ed251b88386167594a59b SHA512 58baa8d3f4f66ab6cae3d4b27c9dab1fa0435b4d7f94169d32563c0f9e7bbdb479244e7ae09a8106a810e774bdbe975ae4a49fd4c5a166795a38a01f5283dc68
+EBUILD mongo-c-driver-1.12.0.ebuild 2340 BLAKE2B a9ac25791b3c66a7b9192bbe4ac3ec0274d191fdc4d0994bc223afa144d2159e83190c0f13d52454a8aabde00e4331fdb7cfcf54ae697afca1c967c5f195f8b6 SHA512 b0288069c8776c6d5ddc5953526dfe44911e0f88d4e6b0274577d9133370ada1c7679912fe53a24021b4d7b5f549f784560a73e6910e45a351787bee1bc6557e
 EBUILD mongo-c-driver-1.3.5.ebuild 2023 BLAKE2B fc14f7ffb1d3f6c6d8495b10276944240d57a712d76ce58f909de934ee3f1ddd9f9d57723d1e686692de422033859dbec384aff65eb0e16a4a915674980d923f SHA512 30eb5a0bdd2d92de202dc28df98b3038a8015af39d6bc8fdc7b76299efd509bc9bf0690f824d34c1d7ff4a59dabd036567d18e4846411759560a65ae027f4469
 EBUILD mongo-c-driver-1.6.2.ebuild 1963 BLAKE2B 6a65450eb17c0de23d4525d9028ecba3b69f8cf6b8be52af3ec81893d3295d30cb25f06869b915da4c6f87e2344777356dac99f1aeb506eaca2def1e1550bae4 SHA512 776b41fa17aa7859aae0a8861647cfa4072e31c75a9189cf59da53b3798d5832b45abb60073cf37176ee05a2abc734da3c9e1f9e5fdad718002670bb99e54cfc
 EBUILD mongo-c-driver-1.8.2.ebuild 2150 BLAKE2B 1ff46d08933c2d525b4dd60cfbd1ba4c3e8183cea11923f3b851b9fe1e0b25bdaf1d08e70f68a3dde383ff4ee7ca9127ea0cb7d0ac011c4aac2f42f46dd4a6f8 SHA512 55338086d4a8c91527f62758b153031751385b975eec7b8dc35a0d07132eb8120b4d0ccf8cdce419f4623ddb8b7deea62556dd7c9c41ad8a01abf04bad6869a9
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.12.0-libressl.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.12.0-libressl.patch
new file mode 100644
index 000000000000..e61bffafeed6
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.12.0-libressl.patch
@@ -0,0 +1,15 @@
+diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
+index d09d706..5d84225 100644
+--- a/src/libmongoc/CMakeLists.txt
++++ b/src/libmongoc/CMakeLists.txt
+@@ -109,7 +109,9 @@ if (NOT ENABLE_SSL STREQUAL OFF)
+       if (LIBRESSL_FOUND)
+          message ("--   Found ${LIBRESSL_LIBRARIES}")
+          set (SSL_LIBRARIES ${LIBRESSL_LIBRARIES})
+-         include_directories ("${LIBRESSL_INCLUDE_DIRS}")
++         if (${LIBRESSL_INCLUDE_DIRS})
++           include_directories ("${LIBRESSL_INCLUDE_DIRS}")
++         endif ()
+          link_directories ("${LIBRESSL_LIBRARY_DIRS}")
+          set (LIBRESSL 1)
+       else ()
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild
new file mode 100644
index 000000000000..06783997aca2
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Client library written in C for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="debug examples libressl sasl ssl static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="app-arch/snappy:=
+	>=dev-libs/libbson-${PV}
+	dev-python/sphinx
+	sys-libs/zlib:=
+	sasl? ( dev-libs/cyrus-sasl:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		dev-db/mongodb
+		dev-libs/libbson[static-libs]
+	)"
+
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11.0-enable-tests.patch" # enable tests without libbson
+	"${FILESDIR}/${PN}-1.12.0-libressl.patch" # Bug 662654
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# copy private headers for tests since we don't build libbson
+	if use test; then
+		for f in bson-fnv-private.h bson-iso8601-private.h bson-private.h bson-thread-private.h; do
+			cp -v src/libbson/src/bson/${f} src/libbson/tests/ || die
+		done
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
+		-DENABLE_BSON=SYSTEM
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=ON
+		-DENABLE_SNAPPY=SYSTEM
+		-DENABLE_ZLIB=SYSTEM
+		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
+		-DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+		-DENABLE_TESTS="$(usex test ON OFF)"
+		-DENABLE_TRACING="$(usex debug ON OFF)"
+	)
+
+	cmake-utils_src_configure
+}
+
+# FEATURES="test" USE="static-libs" emerge dev-libs/mongo-c-driver
+src_test() {
+	local PORT=27099
+	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
+		--dbpath="${T}" --logpath="${T}/mongod.log" || die
+	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
+	kill $(<"${T}/mongod.lock")
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libmongoc/examples/*.c
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-libs/nanomsg/Manifest b/dev-libs/nanomsg/Manifest
index c2553ede7013..37ab5569008c 100644
--- a/dev-libs/nanomsg/Manifest
+++ b/dev-libs/nanomsg/Manifest
@@ -1,9 +1,3 @@
-DIST nanomsg-1.0.0.tar.gz 305040 BLAKE2B d4b8ab89a642dd10e9b2aae1e06c3eb8af9b5392db9019838f68fade65c051858a13d5b7aa4fcb7f4381a8358db1b41f6b0e0136b242c5aa2c935178c03f5e80 SHA512 06fc4eadac29439024bd24230c73f43ddc46e6b6848ad75952b67bf301066be5752a844173597c1b42e55c1ebb66a2d2cb7693e4cbfc07584b4398597cbc9200
-DIST nanomsg-1.1.0.tar.gz 308801 BLAKE2B 15f07f20c84944c3411959310374936d03f9661c0b2241960cf3d878da647693d7255d4cdb7c1ae334bc6bc421faa94325dc0e9d5b9f690cab87f3e1d5f5ce8a SHA512 2d7d4b36e5c50cb7590e7dec0c271a021f05478cadeced6b5c9e27b76c3c5b59a11318c70b51e10efed6be2681dea7881a2f883f576fa5343c2aecfa18cbee50
-DIST nanomsg-1.1.2.tar.gz 308420 BLAKE2B 67e6e51d2e722db58cf719766fd991c3527d7f441891ce7cda0d4641b680308d63e28d05c5eefb69b681d93c9700ac8d8baab4527449ecd3b84178e70f40dee4 SHA512 f95ce24b34c25d139cf3de46585f6354e0311a9d5e7135ad71df62b8bb5df26f81a58b9773c39c320df2d0e97cd2905a8576f9f00b0a4d33774f1b610271cee5
 DIST nanomsg-1.1.4.tar.gz 310182 BLAKE2B d47d270bb1f631e332b6b9c2be1a29aebc2f3e0a2190aba1f4d0ccccbc5415899bd1bda5608dea1510b4ac8b1c8a076c8b6a5d126de6bfc938b54e8a34becd5a SHA512 a1f002f988f2d98eff03387b496fe15a099fef4eb9ccd1c46ade63fbbe5a4ad4cf9fa0fd1e612e1a6f2747bc2af63b7044ec1e920e1c9a0d8c8bc2191ad7046a
-EBUILD nanomsg-1.0.0.ebuild 791 BLAKE2B 8f69f635f0c0fa48f34b3a7f8ec903a00bc9cb2b42b8bb3b1852d186b7a4120d798c67f187591e1182ff14c3446fb25c2dbc7d7ba384cd714839055cb630db10 SHA512 038224aa6563f924ec3777e601ca04b729220b31f66c6c5579e59d8e57dfe3b9909adee0c677c356427d3d8eab7bcb6ce479e49de117a32f3f6694a05215a21e
-EBUILD nanomsg-1.1.0.ebuild 791 BLAKE2B 8f69f635f0c0fa48f34b3a7f8ec903a00bc9cb2b42b8bb3b1852d186b7a4120d798c67f187591e1182ff14c3446fb25c2dbc7d7ba384cd714839055cb630db10 SHA512 038224aa6563f924ec3777e601ca04b729220b31f66c6c5579e59d8e57dfe3b9909adee0c677c356427d3d8eab7bcb6ce479e49de117a32f3f6694a05215a21e
-EBUILD nanomsg-1.1.2.ebuild 796 BLAKE2B 9e1dbf7b041d317b96b96c15c0a37f3e303b74c80243521b0a0a05132936e976ebafe4a56de5eb4c887aa247833f4826cabf57009a686b83f8fa88b5b3071eb2 SHA512 a1c5e667cb2117e3734077333f5af85b376b7653b47ea925afc2a2c99372506956ebb6a6031a1fefcba27cd075b1065f13568096124a814997b8e353c6e80157
 EBUILD nanomsg-1.1.4.ebuild 796 BLAKE2B 57d916a6f2f05f8735e2781b6a1b8f0c829880a4d0ada0cf2b6bb902622ab1d819c401641f887184c721b920b24c4e1d42669892dd1d6359fd6337dc34684321 SHA512 ae8902a982fc294c13c6836ca66d9ee93f7c58fe4a9375f43783dfbebccc1611fc62a38bee62711562dd4e5eeb6101dfeb5df76498e18b4b141d92104b189576
 MISC metadata.xml 433 BLAKE2B e0f53ba20bd2976c331ffed8c188bd0bb4e90a6c703024ec7de86ca239733d9f080fbc3400e423afdd295d684b4d3b02790d9791c44da066868effc0ac716716 SHA512 3fd07647af6e9d7c4b3996674b0376a22ec9727a86b9e1af89a3a9695d547f36a745b9c448aa1cc57c37f094965ca64524f1ba465b6cf1938f731b0d0caa9d6d
diff --git a/dev-libs/nanomsg/nanomsg-1.0.0.ebuild b/dev-libs/nanomsg/nanomsg-1.0.0.ebuild
deleted file mode 100644
index cff38d473fb8..000000000000
--- a/dev-libs/nanomsg/nanomsg-1.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="High-performance messaging interface for distributed applications"
-HOMEPAGE="https://nanomsg.org/"
-SRC_URI="https://github.com/nanomsg/nanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/5.0.0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( dev-ruby/asciidoctor )"
-RDEPEND=""
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DNN_STATIC_LIB=$(usex static-libs ON OFF)
-	)
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DNN_ENABLE_DOC=$(usex doc ON OFF)
-		)
-	else
-		mycmakeargs+=(
-			-DNN_ENABLE_DOC=OFF
-			-DNN_ENABLE_TOOLS=OFF
-			-DNN_ENABLE-NANOCAT=OFF
-		)
-	fi
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/nanomsg/nanomsg-1.1.0.ebuild b/dev-libs/nanomsg/nanomsg-1.1.0.ebuild
deleted file mode 100644
index cff38d473fb8..000000000000
--- a/dev-libs/nanomsg/nanomsg-1.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="High-performance messaging interface for distributed applications"
-HOMEPAGE="https://nanomsg.org/"
-SRC_URI="https://github.com/nanomsg/nanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/5.0.0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( dev-ruby/asciidoctor )"
-RDEPEND=""
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DNN_STATIC_LIB=$(usex static-libs ON OFF)
-	)
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DNN_ENABLE_DOC=$(usex doc ON OFF)
-		)
-	else
-		mycmakeargs+=(
-			-DNN_ENABLE_DOC=OFF
-			-DNN_ENABLE_TOOLS=OFF
-			-DNN_ENABLE-NANOCAT=OFF
-		)
-	fi
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/nanomsg/nanomsg-1.1.2.ebuild b/dev-libs/nanomsg/nanomsg-1.1.2.ebuild
deleted file mode 100644
index a6dff5c1b8b0..000000000000
--- a/dev-libs/nanomsg/nanomsg-1.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="High-performance messaging interface for distributed applications"
-HOMEPAGE="https://nanomsg.org/"
-SRC_URI="https://github.com/nanomsg/nanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/5.0.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( dev-ruby/asciidoctor )"
-RDEPEND=""
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DNN_STATIC_LIB=$(usex static-libs ON OFF)
-	)
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DNN_ENABLE_DOC=$(usex doc ON OFF)
-		)
-	else
-		mycmakeargs+=(
-			-DNN_ENABLE_DOC=OFF
-			-DNN_ENABLE_TOOLS=OFF
-			-DNN_ENABLE-NANOCAT=OFF
-		)
-	fi
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 6d68398c856b..c0b6a6315040 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -7,5 +7,5 @@ DIST newt-0.52.18.tar.gz 180425 BLAKE2B 96c10d6eb63b62a51cd75f3cc34671954abd8e0c
 DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
 EBUILD newt-0.52.15.ebuild 2009 BLAKE2B 60893c4f48b7e26939b65cca8f47047fb4d13558b363fc2ce7be362b77c9c3a2bbb0a833b15c3bd3a44e93a75f6bc3e8bcd2529aefd78e28c5ffc1b9dff2cf01 SHA512 342cc64da9f59c34785897b768e48687dc700e9f66c4bbf9ec0ddff1ef53eafd7cfd90971df67d2cf1c668712f793a75583ee61ae07d4dae5fbb44c2fa5c1d4f
 EBUILD newt-0.52.18.ebuild 1946 BLAKE2B c94b8d8ea555381f8a5561a983de9dedbba63eb36c76bfb7550351947f044ef4df7b3bb7316e213adda862a235ea816a5450fe1ec06a28f6f7e7689786327465 SHA512 8914e08dce91d768dead676763eccbe41ba6cea208d28348e80bf0b5e7bc5f1cb70f54c382f14642726ad64d2512edd661af18172e37577c2fb1176a76da5a30
-EBUILD newt-0.52.20.ebuild 2034 BLAKE2B c8929d9ed74bb600e635575386ab9b380bc0544ec0d3b5f12f40d7e2f21ca469d9cabee7f9c9d2b802539ee0ea242c00790d744dbf54c3376c66241c6f5862ea SHA512 592ce420dba256182a48a97b60e4dcd40e77fdd3e0a9ad9338c3b15ef434c1271936483ebb3cd997f0f8291c4ce253cc4efc645896b20dc59df7ea97109857b4
+EBUILD newt-0.52.20.ebuild 2032 BLAKE2B 5c360b4f84b5d8359a6a500552df7dd40867e87f33df1fd583177e60be4d7c925517e28133ce3d59c63ba6560affeb33c5d45c79933872601703473f9c1f6682 SHA512 f3f351213f4ea5c7a03628c95b9fd56c48d0a0e1f693ff8384cfe7702faf78c2cb863df5ef4483dd653a763214d41a09c0117c392f3861829876c40e0bae6464
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/newt-0.52.20.ebuild b/dev-libs/newt/newt-0.52.20.ebuild
index b119f1dfaf3e..124c79dc29f8 100644
--- a/dev-libs/newt/newt-0.52.20.ebuild
+++ b/dev-libs/newt/newt-0.52.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="gpm nls tcl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index 9641285cdaeb..badfea916879 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -1,5 +1,5 @@
 DIST openobex-1.7.1-Source.tar.gz 131091 BLAKE2B a30e96a89edeb2f07ab78b1e7eaa341de62b9ad15b0251eaac93300cbf21b073034c672eb753e9dfd44c678a99e4bf0b10cf5c1e5841565ab727c2e082d66d92 SHA512 df38b363bd4c6eb6c0181fc7858fb03ac2bdfa85d8496faaa514d5cc4473b33c883956d4e1c94c3fefa5e44e5eed35a8dfcab889ce6ca8c29694f2b18334754e
 DIST openobex-1.7.2-Source.tar.gz 127248 BLAKE2B c0405aef2f15f16e31641f4a60ac01da26c2a61a5114b8f3990f0fcf64bd55c730ff7aa5f524b450c1e6b5653b9616c0861686102594818ba3bdf2314a3c51ff SHA512 22f1b0d99e7186da9fa12b510ef9dbb6f7d76777d58b235ab2f627703d07b6f6b0488cdc9c6d8c0ab7bc86d6d19117c55fff9273fed02736c0210f9b1788bf4d
 EBUILD openobex-1.7.1.ebuild 1141 BLAKE2B 0e3d8c0b2b9a87c228f5fce53cbc54395bba805a87cb89489e2f105f343b1c5b31139ed8afb3d4725a91127506cc6abe562aadb5a883d03a394c347b4d2cba3a SHA512 9697124b1e9ff41254c75d4b5a7f32cced7b6e53fc6ed0cedd781c61198e156eccf21d4e9027951baae62ace634c0c1f67e7722cc4d4c1470bde9a01743dd4a4
-EBUILD openobex-1.7.2.ebuild 920 BLAKE2B fbdcbfbcfafa515a6ad49df53424cdbc188f43b8cb5c435b4a50f81e2c86af8c594c8b9dd2fcd54add6a0a357f1340e911ab8012faab73e29cd8b0c0c0d80598 SHA512 3188b5d060ec26d18918f499f43f4f155fbee439401e8b5fca68a4eaa1a0b79db82e5882d83c8e4441ef750be3bc5b3169dcda7416db530de1e533703dbdd13e
+EBUILD openobex-1.7.2.ebuild 915 BLAKE2B c54c4903a1c3f03284c1cdfc4cf354147b7c64aa22ea048885f35e3fd9b60ce3f657630e872f5cc390a3f336acf23f753170851d541924a2d408a31c76a1c88c SHA512 dd2b3c22c5fb5815916e2f4a62bd422b2f18d755040f5649de4ba63661f4725efd7a32b450d6b9a7114d82cf52b21823556441a50812b61070f27d01e4717e41
 MISC metadata.xml 467 BLAKE2B 6465b304f41324406f6e641b7e08268a19e1154a35d5dffdc3f57cb0b4925cbc0a6eb0e617a8bc309e9fe237352b5395a8afbbaaa61f1082dc63e336f16a4461 SHA512 947ebd0891b57e986712a13177719a300679db7a90e91210d8f9f22919d38dd7c391deaee73de43282b0b01ce80746cd6d387d53ce6f4409c82be44a98df41f4
diff --git a/dev-libs/openobex/openobex-1.7.2.ebuild b/dev-libs/openobex/openobex-1.7.2.ebuild
index 51f4b0d3d0a6..b03a5bf4590e 100644
--- a/dev-libs/openobex/openobex-1.7.2.ebuild
+++ b/dev-libs/openobex/openobex-1.7.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86"
 IUSE="bluetooth irda usb"
 
 RDEPEND="
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 44f172abd15f..0be7470512da 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,10 +1,10 @@
 AUX opensc-0.17.0-build.patch 3577 BLAKE2B 0ad69e4305a21d613f93e76818d442983b1b1b642ba8e5c7030e44c96d4e86ed03f72c7623ba6b08ef9b620f6a5c5f43ea00a670880f070c165cb1f60235c529 SHA512 0412a0d0ee3caca534098357e7778f2aa6800ef6d8d559614cd892de13c6dd05d3a6f78dc12cdf834ab6a4c0160234342b46efda0ac844e2411f54aa08a94016
-AUX opensc-0.18.0-build.patch 788 BLAKE2B 809f109bfde3f40929d5e487c5f766210d1520bff0d857219d226b7d67a3301c9ba5f10b9e54409e75174a170501654a276bce97556bab8a2819980971ca03f8 SHA512 f1f74ef670826901d0302119fc914b7cd82295573d2f2e7b4e2121c81bd58a148021287bb544053dc1eeaf7f056db25b51603ec9bab3b4c27f692eb49214f36e
+AUX opensc-0.18.0-build.patch 2053 BLAKE2B 6b5d90a5290b5366a75e299ff55e64924a12e900eedd8aa66b835624c8d5e3b037ddadc72d1f423d24bd31a97320876e024c0698156ed341688fd8ddeb1f45d5 SHA512 05ccaad103f5ccfe82261a258d3d16f2a948a284aafc28b0902b00b43795b9aaa12454823d27b3a981ea8d499db1e4dfaa2e4ea2ca1f9692ac1d33470a82e20a
 AUX opensc-0.18.0-libressl.patch 3145 BLAKE2B 2e1c0c789adf7c21db1cfd4ab2bf0ba077a463f74ee5bc3293278260b5531cfb231f70d594c491fdaaad0d09f4e7107804f3937d316816ea62eb0e6956ac1c6e SHA512 fedb3906104c02d08d5c44a0da49764556e19653a9d52a3e1ddc5254a2f13abee92b23fc3101779bdc6b9c623388ec9242f198402c022505dffc7e932d1b0dfe
 DIST opensc-0.16.0.tar.gz 1760418 BLAKE2B 7f5799445e285010392f315fa57919c7f0b038170a19e83dbda664d5d73898f075cccad4304275402c900b9fc50564ed5515a10d31156a6c76a68f170ca3e439 SHA512 15f7d62388dde6dad226acab3cd54f8e2f2f53684dc0cb976c6fc6fbdb4487be931ca69bf965ab07c51efd16be64d5411f10bacea11a07fc823c92dd7bb25139
 DIST opensc-0.17.0.tar.gz 1950547 BLAKE2B 861dbb60e211d503332228c9d75d667f70cb9e15883c571821bb2f7703ca62dd4ce56c5ea7965e2d5e8c6a81b5063fc689013670294426baf1bfaec88282e20e SHA512 8991c1724d187d3c34a2ed591b21f0085f767c0d866edc2decfda85a2b3dedf717838f4937d1dda3e1bbc17f02e6eca6740299660128bc448a29e8bfc2962922
 DIST opensc-0.18.0.tar.gz 2037073 BLAKE2B f2b339d1f9c616f6f706acb3c55289deb5b1749a8b5561142c69db4ed1c7dee554ce1f8d820e6e69bb9e462ca460379badf3017ed35fa6cd395702c995326c3e SHA512 dc90cff3e0e639c14bfb11d1d0455964d24d08aa27728592ab0d8b487a1ffee1ca71cb9bbf5d0f101b2ebd85cf9478988f686d45effa72315e6ffc843d398768
 EBUILD opensc-0.16.0.ebuild 1390 BLAKE2B 14cd6dacb0ebc6d688ac0c0c6628cf11cb10337e13cf390a72d83bd755a589f8b8a61e4961a66b4de0b479e39f43ae30725dddd91aea27e33242cab1955de7ca SHA512 ab05e282f226d4c194b292330cdd132c23e92abff34aa8acdb75b3e2e97d5c1dad29089fe79f8e48d0ba93ed4150c7a287a497da20322ec9f44e8c6850230b4e
 EBUILD opensc-0.17.0.ebuild 1467 BLAKE2B 87f9b57bfeedd29319951e7e88e96f67dbdb6517ecef4a185f6f61c396a1943b7967b2e6ac9080dfc4f54b6bcf017c81169702a0e6b035eec6f4bd40a3f34f42 SHA512 50b49c15558621c22addc53dd2ed3b5379e1c185b098c1b4caee9a3af8557f87dc1de3c0d4f6d8c6ae8c73399caf7780aa2a984ff1f64d30814eb2082c8792d4
-EBUILD opensc-0.18.0.ebuild 1502 BLAKE2B 7ab09ea688fcb9f3d1b138546558eafb6fd65fcb5678cbb97e3e08c359ea43d004af773668877d1922494b738a064afe0f9b2230ca0d70a8f4e05198b04dd4ad SHA512 886c333f75a7827779c14606106afa8d95031d2f46eaf97d91aeec383fdda85f1181da26bb25025531a43a6ffc17641a4a4a273c3a24f56790fa18ee14cfa13e
+EBUILD opensc-0.18.0.ebuild 1497 BLAKE2B 50d99d8c463ae0b49415070fec5510999bc581ae09c1a8417366c842af3514a53a2d7844b1327328fa9893a4919f0e631353ce63cd10da5d761958e64c3908e5 SHA512 cea13e5a0f4de7713e8ee72a7427a9e62d7638aca82031964b8b4c062071884cbf5c21597b32673f09a8ab0283913d503428cbba0f4069da2b0bcd1de221e98e
 MISC metadata.xml 1164 BLAKE2B d512f5bb01592e7f864a09e7d537a94e89ac2226be34fa999d746701e3b0b9fc8495700f5dc6ec1c866ec9f2fa59ed23d737de53204e4cbc401eca176d1a8ac6 SHA512 eae0e3d7c795c452f65730138d867bff881778d9615b1cea1aba362d374e4d8ae8949d01204ce14bb8ea80021ca3328cb2657f3e25b95b93a7848e76f577c761
diff --git a/dev-libs/opensc/files/opensc-0.18.0-build.patch b/dev-libs/opensc/files/opensc-0.18.0-build.patch
index 2bea2e53d595..342abd83eb01 100644
--- a/dev-libs/opensc/files/opensc-0.18.0-build.patch
+++ b/dev-libs/opensc/files/opensc-0.18.0-build.patch
@@ -30,3 +30,37 @@ index e2af52b9..a609f612 100644
 -- 
 2.16.1
 
+From a6b4605b863d45978ebd681c4bbaa3aaf0ab90e7 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Date: Tue, 10 Jul 2018 14:49:42 +0200
+Subject: [PATCH] card-piv.c: initialize variable to fix a ppc64el build
+ failure
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes a build failure with optimized ppc64el and new gcc builds
+card-piv.c: In function ‘piv_validate_general_authentication.isra.3’:
+card-piv.c:2390:9: error: ‘rbuflen’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+    body = sc_asn1_find_tag(card->ctx, rbuf, rbuflen, 0x7c, &bodylen);
+    ~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+---
+ src/libopensc/card-piv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libopensc/card-piv.c b/src/libopensc/card-piv.c
+index e85dfc45..13b0cc21 100644
+--- a/src/libopensc/card-piv.c
++++ b/src/libopensc/card-piv.c
+@@ -2334,7 +2334,7 @@ static int piv_validate_general_authentication(sc_card_t *card,
+ 
+ 	u8 sbuf[4096]; /* needs work. for 3072 keys, needs 384+10 or so */
+ 	u8 *rbuf = NULL;
+-	size_t rbuflen;
++	size_t rbuflen = 0;
+ 
+ 	SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE);
+ 
+-- 
+2.16.4
+
diff --git a/dev-libs/opensc/opensc-0.18.0.ebuild b/dev-libs/opensc/opensc-0.18.0.ebuild
index 784b2c5735ce..5572f8c5297d 100644
--- a/dev-libs/opensc/opensc-0.18.0.ebuild
+++ b/dev-libs/opensc/opensc-0.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc +pcsc-lite secure-messaging openct ctapi readline libressl ssl zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index c1a6e7a4e4b4..9b06035e5d49 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -7,25 +7,31 @@ AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162
 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.1.0h-CVE-2018-0732.patch 1192 BLAKE2B 4a13508674020519756b3d33530673527f31a66a731bb79a6081692901a7d0bf7e6e9345d7a9613407a485f4b7961de26e3c87c1cd76756449821ae4b890e472 SHA512 27d55677ff3d60cf7ae0b8f1a5fb8ab529fc9d3e7072eb4cfabd2b50aefcf9cb88291262eccf68efc44a432ba25424b25dec40dc03bb85b7c6c3003260cd5012
-AUX openssl-1.1.0h-CVE-2018-0737.patch 996 BLAKE2B 4b4d6e619a508f36f4fdc00c0066d1160ff7f6cd301cd799405d37b3236ebb69b11a4ccf9baa9ea3a69f21c6fe8550b440c1a3503ec27a5a9c5d1e4d472e2b57 SHA512 833712f0ae355aed6547ccf49447d50bdb7be1ea3c3b3b51f182f6e0eb17692c78ca90341a151985b35b86800cf6229926f3e3af936741d437ab9ac5444987c0
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
 DIST openssl-1.0.2-patches-1.4.tar.xz 12864 BLAKE2B ace6a782ef97b61af44988f978d089adffb06894617f9d66d3fce664c04d360b2774e1dd38c2171151fa93fe92428d405674bc2d452d520f10da426f95d09aee SHA512 d152af2841f1bf11c7f2a5ebba9a2b903fb4bcdef0468c56af0f9cc8c020adbf4490ac1a62f5bae8cbe18e379934fa997bfda1c2d49ec62365c07a0c0515a72d
+DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2o.tar.gz 5329472 BLAKE2B 30226db49be04317da3a76cce68d5aa401decd198f92505bddb0c72a7ef6a79f3c9c06d4a816db734e2a0991ebcab8b207feced26d83639e50c821d9e76ddc45 SHA512 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd
 DIST openssl-1.0.2o_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2o_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
 DIST openssl-1.0.2o_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
+DIST openssl-1.0.2p.tar.gz 5338192 BLAKE2B fe4c0e2bf75d47a76e7377c7977be7bcaaa532061ab89ee989786eeb6495295711a29a88bf026c85d9ed55c97e71b0e9c8cf4c29b6e58a3dc56bcff518666823 SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16
+DIST openssl-1.0.2p_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
+DIST openssl-1.0.2p_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
+DIST openssl-1.0.2p_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
 DIST openssl-1.1.0-build.patch 3028 BLAKE2B f8cf981ed3717af234ce02fa50f27cdbcbf2b766968a5957fc6f0a4ea997549505fa77398444d7f3b9a75f66048447fe62542b9cb1d5f0268add87c44915a6fd SHA512 b19a912900970052f80c67f28975e793ae9e70ebfc62efae0544e09931079e98c4cd29ce1cc8d937ceca97aff9a12fdc1ff9ce6c2b47fea68c79e7065464a0f0
 DIST openssl-1.1.0-ec-curves.patch 2967 BLAKE2B 1c639514445ea85cf731732aa7901b5a03ddb5f637b0483ab2ec6825433ad978723c5a07316db684bdaca4a12fc673b4e049a49c0cd4dbe5f25a5e2bd3b75cf5 SHA512 8fb9c6759ae2077ad3697ba77e85ab3970fd8b3f64b21eb260b4f6333b7ebf2f5a53c7eee311229edfbd96a2b904ec5e5e00dfa5b62cf1105fece13069077bd2
-DIST openssl-1.1.0h.tar.gz 5422717 BLAKE2B 11de1468855c0bb1836fb346c8efdfedd06139a774fc4dbae1b0e95fea7a33aa39b541e3d2d27f83f2b5f4dd3846cca2356020aa6ec81793085842ab78b3a127 SHA512 fb7750fcd98e6126eb5b92e7ed63d811a5cfa3391d98572003d925f6c7b477690df86a9aa1fa6bf6bf33d02c6c7aee6cff50a38faa8911409f310645898fda39
-DIST openssl-1.1.0h_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879
-DIST openssl-1.1.0h_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae
-DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
+DIST openssl-1.1.0i.tar.gz 5453234 BLAKE2B ae6bec9c116769d98a77165b96fb7d201fe2ede8ee98e3cb68eba496cc90a5fae38dbcbb68b824c9eeacb25605aa80c3ccca9b4f00725658da3ad646834b0f9d SHA512 4a9d454031f644a3072a980f4ea20df976f6c5c58178549dfa62fd4dcf1417509e3be517d2ccb265c87688836f2993531b142fc5971bac5c41d33060057627df
+DIST openssl-1.1.0i_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879
+DIST openssl-1.1.0i_ectest.c 29908 BLAKE2B b398bafd5d5aea71daa9c3e2749dece9e515950e35547a6191d83987907aae73e090a4b552636af4d1ab2b39f7e3b1ea3fde2012c99f068f9c99d247996c1212 SHA512 e4445f8959b040caca6a7494da2026b840f84348df5d4eab47a68570d274333f62fa0c381955093edd86c857dad98595ffa2980c54afdcf2a8d32f32d0c70450
+DIST openssl-1.1.0i_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
 DIST openssl-1.1.1-pre8.tar.gz 8334954 BLAKE2B 97cd018908925abd5a4eb660b3488b23efb582dd49dd87504e5522b2e9c5c6500417ef4893590a60ce35cfa316de51bfbf3e448e9cb2a5858ecd8ae72722922d SHA512 33b20f8589e0ba67500993635e1ba7f7f7ce2b6fa1eb8d4d7c44711ff047045dde57ad7e0605377c2b030fc954a3fb9b1f1d68feac2080991ef2b1b72a761041
+DIST openssl-1.1.1-pre9.tar.gz 8411103 BLAKE2B 93ac540afdf734c67aabbaf0682b43f044e8c05f80c0b1e7af926dd4179b215f68d569de24e45ae78a6915923ab5f77a8aa5690873e01c16478bf61d1f1c2a9b SHA512 cf23c11d7591cfa6dfd8b1086c2cdd33bd56f9eb44721cd60b228ef4d3c0c5de650dca53ae7becf7c8f0a9dd4bdae287f48116a3ac11d106b36919deb3214aa2
 EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
 EBUILD openssl-0.9.8z_p8.ebuild 4860 BLAKE2B 8c78442920df3443d9601c3e9246caa838e0acbe9541b5c250a6a96253b2d28fca65878cf9cddaae62f6fab6fd6d264997b168888cfcd1e53ea90b34a804e3e2 SHA512 60bcce7807ee7d0a68df11cdb2ab76560ef23b6e3df43a506263fcbdf54d0571dcfe0d16188159d13a268425b16798eb28c3c1ed985123ae095c8ea146c1e4d6
 EBUILD openssl-1.0.2o-r3.ebuild 8092 BLAKE2B 66f9d07e6757aeffde65bd525f3a6bd66c0da6b6f503778de37a8172cb37656baf0c5a501699d426b18d63d0dac5bb1e7df9ea9f7d30dc19021c15985e8f2114 SHA512 f6aa3f6a4b89aa947d78ea28b8de2c9d3efd3eae2dac98de742784542d71700b5fb68b79392523d41a06dc9784522206637ee525e9fd1635f3907af172dab7a8
 EBUILD openssl-1.0.2o-r6.ebuild 9818 BLAKE2B 193ff450b056ceb4a496d79bd8afa1f2313918eb703de5e8c79375180ff385751f2bdd777a35d1e9d793ce3054703e785f73dc5941b0a05a4a18254d364a0593 SHA512 a15e7bf3d03c6c5fd8d9eda699d82a15ee693417844a328a0eff0ffc80593d783f589a253796dcd416496bb454938706157e85574eea7461e03c173ebef12040
-EBUILD openssl-1.1.0h-r2.ebuild 9198 BLAKE2B a65f3b3bc4104901ca271003f3363596279077273c0b2cbfd5eb54fb315db0974269673abedef3de103b2d85d436ab167cb973ae4d546ae2a4ebf4ae5f60599a SHA512 82ab0bab945bbb723c5329376c629e9dab88dc8f81d74e201f428bc5fc519d677ea21807c2d32d3517657a80db24e71170a4bed4ef4cfb25009a4d32ea9b15a3
+EBUILD openssl-1.0.2p.ebuild 9927 BLAKE2B a50b0a0da21d01c6028ee7fea3c15c62a15bf95f63df335597d81c3f489e1d10e093d4c3aecca0e86c15fd557dec7acb6873b588205fafc67cefb7106e620968 SHA512 362f0eeb4eb870bf8018e9ab5cc2262cf76f2632a6469d3c60644b1f740e067cdcbc1fef79a42e56d8937a20d9ae65aa1eb54c49eb6b34a04bf9cdf92ea702bd
+EBUILD openssl-1.1.0i.ebuild 9118 BLAKE2B de0a775bb48d3994a6c0fcdda7a7343dd539e0c1319df2283c2d1b7c70b3c802128abed45a3c1f32a2e58a6e47894565c11c825959494714ec05253fe2f7b524 SHA512 3fe656125909fa88a9d5d336c66b914c715fce35a355768e6872c3e5642857d3043188edbee2ee34e7744d3ae43e640d3bc933243ee14265403c5785eb26f052
 EBUILD openssl-1.1.1_pre8.ebuild 7652 BLAKE2B 8eff1ae544126b8a1ebda7f5d13ce8d18ae8a5ecd8b58caf8bea6733c8a6e879ab509a60e8d13871f27ea38a6a5e326d23b6a06c7d02499f04b5a1cc87bfd88e SHA512 14e1db47322d86f44c15d07036f2f7a56b0156b6298728a33b72a5a89dbb772d8ef7683900195eda17a29b64ea19d181729a04c912ff3c7fc05f7837b08ef201
+EBUILD openssl-1.1.1_pre9.ebuild 7694 BLAKE2B 5a7ba23b5766511fc377ca34902f2e07a24a3330a0993d4f733b6b58bd40bc691105e611cd056cbeb611456e453c1794cc01a54a129b8bca3d1ebf74a617bf85 SHA512 4dea415e40f592715e54c1bf7606054a08d4ef61b7ae1ed43e774fe38661e9006dd6ec1b306b18625bb7622d67c7a42f7aeb3dca9fbe3f65ddeb787d2dc5e6de
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0732.patch b/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0732.patch
deleted file mode 100644
index e7dfba43f2a5..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0732.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ea7abeeabf92b7aca160bdd0208636d4da69f4f4 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 fce9ff47f36..58003d70878 100644
---- a/crypto/dh/dh_key.c
-+++ b/crypto/dh/dh_key.c
-@@ -78,10 +78,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.1.0h-CVE-2018-0737.patch b/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0737.patch
deleted file mode 100644
index 34c9cc02fa71..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0737.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 349a41da1ad88ad87825414752a8ff5fdd6a6c3f Mon Sep 17 00:00:00 2001
-From: Billy Brumley <bbrumley@gmail.com>
-Date: Wed, 11 Apr 2018 10:10:58 +0300
-Subject: [PATCH] RSA key generation: ensure BN_mod_inverse and BN_mod_exp_mont
- both get called with BN_FLG_CONSTTIME flag set.
-
-CVE-2018-0737
-
-Reviewed-by: Rich Salz <rsalz@openssl.org>
-Reviewed-by: Matt Caswell <matt@openssl.org>
-(cherry picked from commit 6939eab03a6e23d2bd2c3f5e34fe1d48e542e787)
----
- crypto/rsa/rsa_gen.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
-index 9ca5dfe..42b89a8 100644
---- a/crypto/rsa/rsa_gen.c
-+++ b/crypto/rsa/rsa_gen.c
-@@ -156,6 +156,8 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
-     if (BN_copy(rsa->e, e_value) == NULL)
-         goto err;
- 
-+    BN_set_flags(rsa->p, BN_FLG_CONSTTIME);
-+    BN_set_flags(rsa->q, BN_FLG_CONSTTIME);
-     BN_set_flags(r2, BN_FLG_CONSTTIME);
-     /* generate p and q */
-     for (;;) {
--- 
-2.7.4
-
diff --git a/dev-libs/openssl/openssl-1.0.2p.ebuild b/dev-libs/openssl/openssl-1.0.2p.ebuild
new file mode 100644
index 000000000000..f6f695eb5869
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2p.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+PATCH_SET="openssl-1.0.2-patches-1.5"
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+# This does not copy the entire Fedora patchset, but JUST the parts that
+# are needed to make it safe to use EC with RESTRICT=bindist.
+# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
+SOURCE1=hobble-openssl
+SOURCE12=ec_curve.c
+SOURCE13=ectest.c
+# These are ported instead
+#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
+#PATCH37=openssl-1.1.0-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f25'
+FEDORA_SRC_URI=()
+FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
+FEDORA_PATCH=( $PATCH1 $PATCH37 )
+for i in "${FEDORA_SOURCE[@]}" ; do
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
+done
+for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
+done
+SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		# This just removes the prefix, and puts it into WORKDIR like the RPM.
+		for i in "${FEDORA_SOURCE[@]}" ; do
+			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
+		done
+		# .spec %prep
+		bash "${WORKDIR}"/"${SOURCE1}" || die
+		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
+		for i in "${FEDORA_PATCH[@]}" ; do
+			eapply "${DISTDIR}"/"${i}"
+		done
+		eapply "${FILESDIR}"/openssl-1.0.2o-hobble-ecc.patch
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		eapply "${WORKDIR}"/patch/*.patch
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 V=1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake INSTALL_PREFIX="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
+	einstalldocs
+
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.1.0h-r2.ebuild b/dev-libs/openssl/openssl-1.1.0i.ebuild
index 5881fe74d35e..9cbb018e24ca 100644
--- a/dev-libs/openssl/openssl-1.1.0h-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0i.ebuild
@@ -56,8 +56,6 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-	"${FILESDIR}"/${P}-CVE-2018-0737.patch
-	"${FILESDIR}"/${P}-CVE-2018-0732.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/openssl/openssl-1.1.1_pre9.ebuild b/dev-libs/openssl/openssl-1.1.1_pre9.ebuild
new file mode 100644
index 000000000000..c869ecb3ce06
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1_pre9.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		$(use_ssl !bindist ec) \
+		$(use_ssl !bindist srp) \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	# Fix quoting for sed
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+		-e 's:\\:\\\\:g' \
+	)
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED%/}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED%/}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED%/}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED%/}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 74035d3eec9f..66da44492a54 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,7 +1,8 @@
+AUX pkcs11-helper-1.25.1-build.patch 932 BLAKE2B 792082e48c6566c47ec4b043ccd7762d2c94d8c6f6d7fe8233f91e8f17c2361cb1786644ad7e77f8f0c398cc8d86167f675257a9dbf62a40bd56f1e7c9cb6d40 SHA512 81494d947f62b9cf4aa45fe35a88afb0044a5b36fa89e7f175cb9ab4e1d17ffc6afc81a8da17ab18f087b47894460d0d8c26ca8024c98a73a4bc2a14bbf00346
 DIST pkcs11-helper-1.21.tar.bz2 417527 BLAKE2B 39b2b405ada79e0077c810b3537853051bbaf1cb4d79bedaedf04156066b573c9186ee587c869ed49053a0b471fa239447edef71184d421fb6ac2e65e3a58830 SHA512 064b04c1ece2db0757e14263955c0f7488edde5f5f4415ebda9c4370e608d7df681706ddefcdba2392e5642d00ebd4c211f15266bb39baf8da46ffaec4f3e572
 DIST pkcs11-helper-1.24.tar.bz2 425627 BLAKE2B 2489af89dc4be6d056facedecf38fc42079c18ee74ca4f9621cf11b1060e2f463318d0efc263df5009eab01771c98e44a3efe7246ccbdc8982a130592327beca SHA512 28e9b53dd36e4e3fa8e30b7ad76af3bcfce1947d228f07e607a26aa6b06ee3bf1fd6f5a0ebf8ec581a16074de7b21e53f3b225e1cb1f58d4ded7bff2c50a6376
-DIST pkcs11-helper-1.25.tar.bz2 425599 BLAKE2B 6272b5ff2d3eb2ea366ec2b9a6772f93877455b3349a51d696e0450ebd6c6947ced9a2565b2d11a4407abb80348aafabc8e56eb95bce720e3d01bb339fc2f8f7 SHA512 2b425d010cd0a7d6a21b3189f65d2db93d904e1634fa4b23df9a1417521d72fda7bcd595951295bbcdec8151dc5a167fdd7c4310a16474e404f578e2d20db69d
+DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
 EBUILD pkcs11-helper-1.21-r1.ebuild 993 BLAKE2B ab38240b1b8872fc624526b86b28efe4b947f586f36bbac74468e3e06b9bc640f2a5f82d7e419a2f27f74bb4595043a11f20c3bb3a78972ef76bcb45bf53218d SHA512 6c1b9cfc5ce449010a0c7fee9d7fcdfd45821b582aa68bbcb70aa0ed211528aafd6ae434388b16078663911069b014f6fe7cd2df79f71a93489410226b4e8272
 EBUILD pkcs11-helper-1.24.ebuild 1002 BLAKE2B 72f811926ec93cd90e805705b8642faa93150c13b9f1ecf6c0c9243375e2903e41642ef2463846ebd10aa7bd8515dfbcc295291b585833c7b0f8257960b6543a SHA512 884b85e55231f025b8f55e5b74b82eeab5d1803755b63dd767df7e336e7a9584b94aff1c4f71eaf9e8d5c8f1cfe5429d5beaaaa4856cf1d6aee49ba6617bbb25
-EBUILD pkcs11-helper-1.25.ebuild 1002 BLAKE2B 72f811926ec93cd90e805705b8642faa93150c13b9f1ecf6c0c9243375e2903e41642ef2463846ebd10aa7bd8515dfbcc295291b585833c7b0f8257960b6543a SHA512 884b85e55231f025b8f55e5b74b82eeab5d1803755b63dd767df7e336e7a9584b94aff1c4f71eaf9e8d5c8f1cfe5429d5beaaaa4856cf1d6aee49ba6617bbb25
+EBUILD pkcs11-helper-1.25.1.ebuild 1060 BLAKE2B ad7da4e7aba600cf143aebf0761bc44959a7a12003012d3c304c9722a2da5559171aab4741261c2c8ed1ebb0a437be41230e6a3b956677815f5abc67895c9e6f SHA512 273ad805064811f571195d9f240c3b856d460f3bdc548c6df29376b879dff75e962ea2a1cff6b6c17e136a24ca36a4f1326ddd7b7628fac8bf438590d2b05008
 MISC metadata.xml 442 BLAKE2B 83c40281896d78612f6e624c6335ade3b04be710debd1a8a40da1c569c84a66f6b61eceb07bc4f31d659d2ccc2d5c6fb6fa5ed3a22e5839656e210147a8ddc2e SHA512 ec42c4dd8aaba2001a76530f2cbe2869791f2d88c8ecaa323eb418ed6156751bb5cb143ecc1ba3901afcff42ba78ea099c42a3a2b3b8ae258bbaf9c8990116dc
diff --git a/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch b/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch
new file mode 100644
index 000000000000..a657dba14ce2
--- /dev/null
+++ b/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch
@@ -0,0 +1,33 @@
+From 0e2ae10ef9611beef92457171e8c78d8e936dfca Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 22 Aug 2018 20:24:19 +0300
+Subject: [PATCH] openssl: build with openssl ec disabled
+
+---
+ ChangeLog             | 1 +
+ lib/pkcs11h-openssl.c | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/pkcs11h-openssl.c b/lib/pkcs11h-openssl.c
+index c981e21..4ebc211 100644
+--- a/lib/pkcs11h-openssl.c
++++ b/lib/pkcs11h-openssl.c
+@@ -263,6 +263,7 @@ DSA_SIG_set0 (DSA_SIG *sig, BIGNUM *r, BIGNUM *s)
+ }
+ #endif
+ 
++#ifdef __ENABLE_EC
+ #ifndef HAVE_ECDSA_SIG_SET0
+ static int
+ ECDSA_SIG_set0 (ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
+@@ -275,7 +276,6 @@ ECDSA_SIG_set0 (ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
+ }
+ #endif
+ 
+-#ifdef __ENABLE_EC
+ #ifndef HAVE_EC_KEY_METHOD_GET_SIGN
+ void EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
+ 	int (**psign)(int type, const unsigned char *dgst,
+-- 
+2.16.4
+
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
index 02e44a3a603b..f207f2094d9f 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc gnutls libressl nss static-libs"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+IUSE="bindist doc gnutls libressl nss static-libs"
 
 RDEPEND="
-	!libressl? ( >=dev-libs/openssl-0.9.7:= )
+	!libressl? ( >=dev-libs/openssl-0.9.7:=[bindist=] )
 	libressl? ( dev-libs/libressl )
 	gnutls? ( >=net-libs/gnutls-1.4.4 )
 	nss? ( dev-libs/nss )"
@@ -23,6 +23,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( >=app-doc/doxygen-1.4.7 )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
 src_configure() {
 	econf \
 		--disable-crypto-engine-polarssl \
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 8258f0579a6a..88bb680425c1 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -11,8 +11,10 @@ DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
+DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
 EBUILD protobuf-3.4.1.ebuild 2523 BLAKE2B a774fdcde73cd91848e3d9ce0a04af49d2716598d3437db4dad303653173aea1d0348a35e8676323d8e80c55c56423ad8e1d521ef335eb055ce83082cf03a1ea SHA512 61f7adaeb0b4c88aa3955ebeb4e703f007d1c98e04d6856becac21be0378af85dc18b60b3f8d36a5e7fb639f4a61f5c8f518c724544ce7bd2e5faed93c2e6980
 EBUILD protobuf-3.5.1.1.ebuild 2617 BLAKE2B 59fd5152cae402cae46bd4b3e03cdae43a5ebd74c2035ee21bebe4bdfe9449388eec1d54adef01ff0912e4872aa1aae390f862b644724d4b6403ef2c654fba43 SHA512 3189220abf34c044eab311e9d86d30aa57873b172ac57b86fb33bbd98a367b6d4a4c101884bfce152e78d949bb7c2bd66bea6c35b6e7371c4d1fbf306ef2e23a
 EBUILD protobuf-3.5.2.ebuild 2487 BLAKE2B ba8dc1715f5ef4bd5aab3ac71854774774b2d8e45025fd2dccbf7d43b0d1f0f0edb3b13bd2ded9324472806d5d62cb60b2d15bc338b44280a4a87a05a364ce2e SHA512 f7b2324fb9deed34549e70b6340e98934388e212e3610a41cc019b4faa6d0f2ff2a84f6e681623c0f978e2bba0c112a6a9d900808f09808e58569c5226d6b784
 EBUILD protobuf-3.6.0.1.ebuild 2487 BLAKE2B fcb28f8c2adca162d0a1e0460b428c232cf8124616b5a4c6c6b3914071fa0141d06f20bf01333238254f004126213456d573c74c3472b32f7d7881e741e4278c SHA512 d96ef1201556409abbbbc6966db3d351c88a8bf7ff40636d5aaf393c4635027ecc64438fbead24c22b56a5c09ae3aae74a6d71b103bce7a8b6b96beeca0cd414
+EBUILD protobuf-3.6.1.ebuild 2487 BLAKE2B 6a8e5d3257b39ed30325a92fa92b49250e8ef99a5447ca2c575c6dcef4bc2926496d03eb79b26d7b9fca58b4a8ab2b4a69fa0abbc5e470814fe4d986fd0f3260 SHA512 2089ed4d07dfe518fd0a30196e5484b1494276ab21639bb804a5b59375f93ff9186aa226ebd253d6cefd3f5059df5bf63e181208f7658e2a28a9d25c84905127
 MISC metadata.xml 534 BLAKE2B b5ffe91fcd25e8285f33e178fdf39f6c5e2e477e5db4bf80ffb144dc8e2c982a586329eb27239ea2867efdbc771ecde26197aa12c67441ede2bf08e1d8e78f0c SHA512 f9b4a37461edbf530940c86f2b0a3838fad80395f1c5e4738b40519fec2df24867e005cf55884f126d2a3a1dfc894cfd1a26fa085268da2dc4b0e562390ebb3e
diff --git a/dev-libs/protobuf/protobuf-3.6.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.ebuild
new file mode 100644
index 000000000000..b4ba0f76dfa0
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.6.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="emacs examples static-libs test zlib"
+
+RDEPEND="emacs? ( virtual/emacs )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index 7b3ad921c6a0..03546bfbcc00 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,5 +1,3 @@
-DIST softhsm-2.3.0.tar.gz 992417 BLAKE2B dcb462a7d50be465c306e2208d2d446879ec093ce3a3233e338ba4df3b29a4f70050cd10ff513bff70ef37f98341230d061d48273a6fc54b668804311cb11bf8 SHA512 ef9ee41aa6eaeeb004d4ff5c78ca6e00895cc47e36551025a4422806eee8eead985cfd28476a867761a810f6957b0759edaac769bcdedf4ad974e426cfefce0f
 DIST softhsm-2.4.0.tar.gz 1042566 BLAKE2B 01a0f4bdc589847c4a1f860c3e3f572644d874b11d7ab8e149e598fc123b75e898de9a46f73f5f2a107edcaeabdda29e4b9b6d54af5b95ad79a3c7b7b77b8bbf SHA512 f14f65de32206500f708523ee88d8d5e3d1fd40175f1a9cd24c7760c829e2de9dbcb05453022df8186836c49a57e4eae7f2e75ce6a5346a426114f4d610a8a84
-EBUILD softhsm-2.3.0.ebuild 998 BLAKE2B e966f3d60d0cc9ec1a3d8208d99387732480889d08c43068060d00029df4b4791b0b56695cc7bc1fd58ea1c629543fd4e4673e0fba6b54b051edb11956b1f4f4 SHA512 2d5e3d022faa02727b8bfbd887bc5f6ad55d66a2c3a7375e04406fb695f68721507bed4f713f8072f953ec0bbab8b3a61069c216f9d268f6221d87e74d67f2b2
 EBUILD softhsm-2.4.0.ebuild 1041 BLAKE2B d723f065d6b76ee5132af9f6b5c7e6d330a0ce283c71fd1b1a40187cfdf6d91e3d42edae2270ee71757b47e0ffc7b278a1d98b534be224c0e57c371fdeeffd8f SHA512 9442882ac0c14345d5c16b02f25fdf4eee75352c22f385c809973fca18edc5f15c4ef195d32dcf5793b5cceab719b8f9fa372ba38a72a09275a775a5c22e7be8
 MISC metadata.xml 322 BLAKE2B 64433451cd97495272e25d2bd1a4ad951781f7a61e47f1f048b13b4a1b4f577f9eb37f1145f1d9710969cfd9e38dd89aacc83641ec8b3bf0b36027c39a8dfe8b SHA512 b145c1ee8c20a9aad9c9b8e6f6526c596dd80a993faecb8e8caf6e930cf05e32f3e6ef5ad72c337a43c48cf57224f209e65d177567e3c5c577d3872eb11841a8
diff --git a/dev-libs/softhsm/softhsm-2.3.0.ebuild b/dev-libs/softhsm/softhsm-2.3.0.ebuild
deleted file mode 100644
index 52c594d46092..000000000000
--- a/dev-libs/softhsm/softhsm-2.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune
-
-DESCRIPTION="A software PKCS#11 implementation"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bindist libressl migration-tool test"
-SLOT="2"
-LICENSE="BSD"
-
-RDEPEND="
-	sys-devel/gcc:=[cxx]
-	migration-tool? ( dev-db/sqlite:3 )
-	!libressl? ( dev-libs/openssl:=[bindist=] )
-	libressl? ( dev-libs/libressl )
-	!=dev-libs/softhsm-2.0.0:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/cppunit )
-"
-
-DOCS=(
-	NEWS
-	README.md
-)
-
-src_configure() {
-	econf \
-		--disable-static \
-		--localstatedir="${EROOT}var" \
-		--with-crypto-backend=openssl \
-		--disable-p11-kit \
-		$(use_enable !bindist ecc) \
-		$(use_enable !libressl gost) \
-		$(use_with migration-tool migrate)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 8e656df7f9c1..1591e14da720 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -2,7 +2,9 @@ AUX spdlog-0.17.0-unbundle-fmt.patch 790 BLAKE2B 68a51e9dde9d25f0ec8978f4037c10f
 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
 DIST spdlog-1.0.0.tar.gz 183855 BLAKE2B 30d54fef03a83f968cfebacf95a484ff397126771a7ea022556aebd07e2f7694af35b278f75ee24372283ff1428e21247fd4329794d64a65bd6220a93f21db3c SHA512 4d3cbc1926be513256b5837a53fce425f6d352bb4ab262074f205450cd4eadc09feea9dc8d8c03b3f1e9792bcfbcff414be79e51d58234f540946428bbd88cd1
+DIST spdlog-1.1.0.tar.gz 183937 BLAKE2B 51af49f641df69e78835bd6b9545da53c0e111bab60a5f0dbf4a1d0e70101309394ffea195176ea371f08b772c2be1c22c2da16006fc9699f47593cf82a6c0fd SHA512 65fbe6e9dffb25e814f72f2ef7982eed213fc16edfabb1377f865c94fd0488190e160dfea83ac06979a41f2fb2fa47a454989ebee0a2c5012bd404b977648439
 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-9999.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.1.0.ebuild b/dev-libs/spdlog/spdlog-1.1.0.ebuild
new file mode 100644
index 000000000000..03aaec9bd608
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.1.0.ebuild
@@ -0,0 +1,39 @@
+# 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/1"
+IUSE="test"
+
+DEPEND="
+	>=dev-libs/libfmt-5.0.0
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.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 4a19630cc175..71dfcfda197a 100644
--- a/dev-libs/spsdeclib/Manifest
+++ b/dev-libs/spsdeclib/Manifest
@@ -1,4 +1,5 @@
 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
 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
new file mode 100644
index 000000000000..db6e46f2659b
--- /dev/null
+++ b/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+
+	# Remove MSVC compiler-specific attribute
+	sed -i -e 's/__cdecl //' ../LibIPF/Caps{Lib,FDC}.h || die
+
+	mv configure.in configure.ac || die
+	eautoconf
+
+	# Fix permissions, as configure is not marked executable
+	chmod +x configure || die
+}
+
+src_install() {
+	default
+
+	insinto /usr/include/caps5
+	doins ../Core/CommonTypes.h ../LibIPF/*.h
+}
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index 366e4e41c64e..b1881c84d6cc 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -12,5 +12,5 @@ EBUILD tinyxml2-3.0.0.ebuild 673 BLAKE2B 2295bb669f272e5ba1fac220d5447524be9144c
 EBUILD tinyxml2-4.0.1.ebuild 762 BLAKE2B d3a802a3813a9f99c16feec006f07a5e136b3415098a6e8793a757ca7583fec0d0b5989d80cc38efb2803a4eb564dc3ad53a76d649655c415101e3ac233c108e SHA512 0405efdf3fb5621653f620331050de75edae080e9bb7e41132ff532a7595d76dc9231e31102df0992f88be15321908ead5fd23d69544fed2e66cf697864d02bc
 EBUILD tinyxml2-5.0.1.ebuild 625 BLAKE2B 4e212a8cd13d3cdf62d89a1735e8e5d49e99426e5fd7b00e74049af868840a8be5997626356a42a04b86b39f2912342816ca56bf4b65da114ba5bae92fb6d84c SHA512 ef5934e90c628ab8a15e7824e930e19c7d461321cdbd1e69bff07226172bdb59bc228e992959f5d9373c5fe3b8513cdd1d42e0e51faf802dbdd3cc7340391af9
 EBUILD tinyxml2-6.0.0.ebuild 625 BLAKE2B 0d327c832f502b523d9e3479bcb474dfb0fa161a771ffdcb01af25253f29203c720bed574f2353c9effe0a1a65072bceae5d2357f17eac4f233e1b9a93f50b86 SHA512 c65e97a56c42b1cb81bfb4a116c534cdb9bae5ab67a42e104dbc4d95b01eba8a9b47537fa43c92baa84415d8df754bf1c0d74682eff24b3df7e946bc456cbb02
-EBUILD tinyxml2-6.2.0.ebuild 625 BLAKE2B ead2b56c418540aa5b6089ed93afef5238a559cac6b9c95b109c65cdaa4f22b62cbb00893e974f35bbab20d55017b36e37156fb40c8406b4e2b731cb9d73015c SHA512 efd8b521755ddbce7f5d9eece04b6ae137d862bd06fb2a4c1c7d4cfdd0778b53337c5f9d4a40cf931bc480bfbfe87bf8499ca78edd828396c1c518cd1ddd118c
+EBUILD tinyxml2-6.2.0.ebuild 621 BLAKE2B 8ab8beee48cc0eafd9e1e3d4e2bfa020da42161533a25d3edd133aeb4e9b6282ffecd57fe5a6b92b38af1675784a8f65fbed3af881735892d46f91f2b9c3ed5e SHA512 fbfe662d555224092a37922b6a9db00a4c1636602feb38c51e5d7639f26871e70a83cbf784911aea829c2fe3bdad27f65fd6e7110005a8c5423f20c8d60fc9e2
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild b/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild
index b6ae40344cf8..0cdc6766266d 100644
--- a/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="ZLIB"
 SLOT="0/6"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa sparc x86"
 IUSE="static-libs test"
 
 multilib_src_configure() {
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 35c4a6be1f8b..e3b274a8653b 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,6 +1,8 @@
 AUX uriparser-0.8.4-doc-install.patch 615 BLAKE2B 593418040cd88f9753918320d6ee454fd2ddc5386a8190cd4da8e07c76e47ebb374df6b9a11d171815256927adb09b056927d33b19bd52b189842e9975817421 SHA512 80d77d07c43001c4e50363c66e05245ffc61fac35ee0c771019ae175e5eacd3c02fa050dcc910f5430c8531ea73fc289f7a18e989bff0dd7e14f7e438c6e28d1
 DIST uriparser-0.8.4.tar.bz2 358408 BLAKE2B 1f270442a4812fa3e86a495109f95cfac6980c8145a701990dbe6f6396743de9ce0dfbce7b9cff2b331e8c9038a2b6c5281d2e562596543b660c168d3e678187 SHA512 b6238c6495eaa9f7178269d66dbea05a39c51c27137d8ebf39cd02d1c3fa96aa0d1608f5ccb36bf7b454f3238830dd46d7de8299b608f185b2520fc2c955aa1a
 DIST uriparser-0.8.5.tar.bz2 359469 BLAKE2B 44fb7d8bd5dac8bb0dd68bfbc4fb2adec310a913a7ebb92850fb2b8833c159db7cb29fa4f8b5de3e3b3def018024d1e69a0814bcd12aa24b6a14deca6f6768fb SHA512 e9b0228092cf12b824975000b0a6dbe2e413d3642203666d77c5b42f04bc13e0ec3f61d6a2c44d9613bea15e8cf7ec42cc4c92c5bc4318ee3349c1b380409d5c
+DIST uriparser-0.8.6.tar.bz2 360214 BLAKE2B 18a0e02f5dc6efa840cd6647c4595f238f811e8131750959b31f5283c5632b8892fa38767f883110ff2fbcb9dd07afabcaef64b206b9a951a773bd9d4b1cd9e9 SHA512 b95e6d7c7f835002f6ea1a9c0962f4d385cd16519c40b921e9a9679140fd5d6cd326002b452fc73431aa2f36d049ae510c034a423eca143a6285f9b4b3dd7b83
 EBUILD uriparser-0.8.4-r1.ebuild 1065 BLAKE2B 1ae3176b5642f9fb5e037dd3eb06d8e1ac1f00027f7e5226e1063172148054efc4dd49b42b6f21f0ab5f21e44849e93957651457836e20649507aa26c8e0243a SHA512 1e4f875b4e8a88540ed16d0043d728485df7d92a20d4a89cd7fa1b00ea40f01587532e7e4ab1705bcb2bccc35f9345f945338f86030917daa71dbae8fe8d0ffc
 EBUILD uriparser-0.8.5.ebuild 980 BLAKE2B 145266c02bcac0f9129cd644b3950161ee68a04fceb41a8002bf7275ada1c3fb3d681dd214aa9b604a10c7a5cd1006945a2536e45728b88152d9fdd9fb7717b0 SHA512 0af97e47d0b3bccd0d9b2eada5e9145a239729818991aef769b26ff6ef6258ae919a8b6bf0d644d01f93a4a4b36735f0fe2b8ee5ce8aa83aa85f12dc17058f68
+EBUILD uriparser-0.8.6.ebuild 980 BLAKE2B 145266c02bcac0f9129cd644b3950161ee68a04fceb41a8002bf7275ada1c3fb3d681dd214aa9b604a10c7a5cd1006945a2536e45728b88152d9fdd9fb7717b0 SHA512 0af97e47d0b3bccd0d9b2eada5e9145a239729818991aef769b26ff6ef6258ae919a8b6bf0d644d01f93a4a4b36735f0fe2b8ee5ce8aa83aa85f12dc17058f68
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.8.6.ebuild b/dev-libs/uriparser/uriparser-0.8.6.ebuild
new file mode 100644
index 000000000000..94133b732358
--- /dev/null
+++ b/dev-libs/uriparser/uriparser-0.8.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
+HOMEPAGE="https://uriparser.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc qt5 test unicode"
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig
+	doc? ( >=app-doc/doxygen-1.5.8
+		qt5? ( dev-qt/qthelp:5 ) )
+	test? ( >=dev-util/cpptest-1.1.1 )"
+
+REQUIRED_USE="test? ( unicode )"
+
+DOCS=( AUTHORS ChangeLog THANKS )
+
+src_configure() {
+	econf \
+		--disable-sizedown \
+		$(use_enable test) \
+		--enable-char \
+		$(use_enable unicode wchar_t) \
+		$(use_enable doc) \
+		--docdir=/usr/share/doc/${PF}/
+}
+
+src_install() {
+	default
+
+	if use doc && use qt5; then
+		dodoc doc/*.qch
+		docompress -x /usr/share/doc/${PF}/${P}.qch
+	fi
+}
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 9b6ed0671e97..3229d4bca007 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-1.14.0.tar.xz 413960 BLAKE2B b6d6bb35d3b664ef4cb91cbb9fc9687475730466306d9d2722991ce912be26fd4b3440fd0b94aba2b707911fe43a7c91e053b379261a17197c414ebc08818f83 SHA512 bd38b2b8963d4d98d42c270e5d7dbff6323789a173b19b67a18258424fd8adee5021b282c9d7f6dad0bd25aa0160e76aecd8ed803d4eb25d911ef0a81cd713a5
 DIST wayland-1.15.0.tar.xz 432932 BLAKE2B d86e5ba52c16664926e4688317db3fad4f9629c3903239dde46ee238ef7874f28e39daa6bbda96519dfda4ff83a1f540522f21fbabe9b71aa263523481d4eb5b SHA512 f908917f1b575d2dc4d9770d3303e2637e8744fcb5c81feb2af2fe82cc51f54e22beaddfbe775fcf9623584169b7a062c75076132abeb888717180bfab53b3a8
 EBUILD wayland-1.14.0.ebuild 1716 BLAKE2B 7da42f2763831e108e5b13cf648da2bf72a7e113ef4e7aeca149f225a0a2127f10bcd2df3e1a8f191d814345f7aafe3b75c92152db970561279ed86e7b81b416 SHA512 33aae7d701a910cfb9cec52d861c81d232d21a2802054d434944656fb0e8f103944e35606b7e522766d9cc5e2d8207baa6b893add6a6f93d16f22a6d5a88c303
-EBUILD wayland-1.15.0.ebuild 1754 BLAKE2B 50866a6550a519455d7ecf23aa60d8ae9b6097bd8c9be01de66c677b82fc5e13f948df5ee7c1af912889ae9e56382766180f2ce351cbd04d21f235563c25e415 SHA512 854feab61f9939344d34a7a69dcb0eb97bbd4d8135628c885bd36de3a81058750e5ed0587c355e5400afb675cbe249c6c42f7256b88f16a1faf81c884df0a022
+EBUILD wayland-1.15.0.ebuild 1748 BLAKE2B 6a101262dda24c27e5cd484d8a72e782c940ff6d8f5023382ec71055b4bad92421b10cbfdd84ae9a03139b2014338a4e209239a8061685b4de04d695bad3fe60 SHA512 2112502a4c5ef0f5844551cb396a4a3416aa042cc2c036a71afbee2635862c87db93eda165bd72ed83857befd7aeedd72787761296a7356acff372116d64093e
 EBUILD wayland-9999.ebuild 1755 BLAKE2B 43f897b83819708141c70c1b8d678509101c5497a21d4ded684901c43295ada64934f95693a2458597a1bcfa7bb508a638a8447789ed511769219fb7d271bf0e SHA512 24b4b3d664e4cdd331d78f8f22ea3670513411577849c8f980b5b9f7c7687b692bce959dd25970055b940aa835fac1d22766dc40bba23d989b0300d29fd6474b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.15.0.ebuild b/dev-libs/wayland/wayland-1.15.0.ebuild
index f61983c572e6..1ea64ca6370a 100644
--- a/dev-libs/wayland/wayland-1.15.0.ebuild
+++ b/dev-libs/wayland/wayland-1.15.0.ebuild
@@ -18,7 +18,7 @@ if [[ $PV = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 5dd9a61d732e..55aa311f9d76 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -2,4 +2,4 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
 EBUILD weston-3.0.0.ebuild 3471 BLAKE2B fe1bf52314d12e30c3ae4ee664c156a83a817b3150e27ed60286d06bb115169a459c8a934d89faeb1deb30bba2b6965ca1a30d8ba16d8e9b244f29c8267e2c03 SHA512 fd281abc3d24c558d996670fac22106501d8d94ef394b23112023d95d4987bcbc4f0208796d5132cdd1ae3033073da2cc3f8067afefdc7b55fc9100a70ca39b2
 EBUILD weston-9999.ebuild 3461 BLAKE2B 9e0e7004d2f0f70228cd396a98d926a66a250978fabdc2ef1e09e2981a0a610df03c56e3b552f3e3fb9534e42a99718144b9c8208ec29834ac89f0f2fa478822 SHA512 420518c195308a359df897e377c3bd71c0e17a000cf8c0c25831332031ca1704cfbd598c10e9b475054f52407a9021e581db6b4dcc13dba2605dad2912e3f7ca
-MISC metadata.xml 1296 BLAKE2B 7fe16b9e7e0a23f8ebc5361f3649031ec0897871964e00031a399462042d228e957344383a7c49509cb37703af54ecaf06526a83dea92b3eee2d1f6858715956 SHA512 e73e72586bd57e83c1a2d6de04982054029f65bfbb78b904f9eff049bf044c795fa6641d109eeae334b51a12a5240f185617e18f3a81150c03fa20f674349bbd
+MISC metadata.xml 1309 BLAKE2B 3d7f849f84c4270533b9f13b7edae39c405f9ac0fdd61eca140d7244bc8cc9310600b349f611706200210f36d190d5b99917551edc3338876f4ce5aae75e8438 SHA512 537d4e99af7a368f16758fde18d271bdc76957c416b920934ff9248c1ee2172a95b3fb83cdaa8d138bdfc6cbef4224cc492e0c55d499f2f8e45314156330666c
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index 661f699a5e5a..92b7b9cd58b3 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
+<maintainer type="person">
+	<email>chewi@gentoo.org</email>
+	<name>James Le Cuirot</name>
 </maintainer>
 <use>
 	<flag name="colord">Allow setting color managment</flag>
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 1200fb54b7f1..808724fbe424 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,5 +1,3 @@
-DIST xmlsec1-1.2.25.tar.gz 1839160 BLAKE2B af480affa84c47c5656889c8114f147e1d9a5ad0f9a494c8913fd180aa5e2cba4773451c4a5f41781026e7617cccf329057182fc3fc3f2bd4e6f007cbe8ac190 SHA512 ac61547a1cbf9016d7f75be3dc5249d6bc8a526bc51715e53ede13f056c1c72c57433a6be200c886000a25826c3e473954ded3ae988f25d37ac4ef4d777c66a6
 DIST xmlsec1-1.2.26.tar.gz 1922183 BLAKE2B 8cb8557a7d24df756655a7dfa45091445adc89cb67169a7620d9d1116f3fb3d982ea45199a53475e29300478c07e8e1168cec79cf9c3b5ff1dd6c840123b982b SHA512 1e3dc3c8c192eefee7b055787bef52ce3bcfafa786224f68af065aa45f4d7da93232da973359b3135615c5981ad4df7c124047d3934e552ab78439472685a7a4
-EBUILD xmlsec-1.2.25.ebuild 1480 BLAKE2B 9bd318bfcc77816da5daa4b1fb0ad6171be99fcf9d25e0b3efb25b961f8f80b7fe633dc359e686688c9a947d460ac4b54642573c4f2d14c2862a97748add2d88 SHA512 76395779c179b42bd9f86fed6efcf8c849c0e76297158f8cd5883fe034bdf94a7ff54c1ea88bd4bfa52d495be3960c0b36e1cac0b52fa6b817d7074551dfa1af
-EBUILD xmlsec-1.2.26.ebuild 1483 BLAKE2B 55593f4d4b5da90588f3c649f194211f593952501e63c14bcd4e69fae3944872c384ed582194f5bc1730c78baeb74e1d74655ddcef62d98227bf2823befdc9ce SHA512 157843ed0b4e18953b474266d4ad6fa887e16a8ecd0745aae846fc143f2cdbf7bcf27e7f4c84aa8c7ce42127b89a87566a1a92144051e9f192fdc93721965ca6
+EBUILD xmlsec-1.2.26.ebuild 1480 BLAKE2B 9bd318bfcc77816da5daa4b1fb0ad6171be99fcf9d25e0b3efb25b961f8f80b7fe633dc359e686688c9a947d460ac4b54642573c4f2d14c2862a97748add2d88 SHA512 76395779c179b42bd9f86fed6efcf8c849c0e76297158f8cd5883fe034bdf94a7ff54c1ea88bd4bfa52d495be3960c0b36e1cac0b52fa6b817d7074551dfa1af
 MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
diff --git a/dev-libs/xmlsec/xmlsec-1.2.25.ebuild b/dev-libs/xmlsec/xmlsec-1.2.25.ebuild
deleted file mode 100644
index e4393747d0bd..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.25.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune
-
-DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
-HOMEPAGE="https://www.aleksey.com/xmlsec"
-SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86"
-IUSE="doc gcrypt gnutls libressl nss +openssl static-libs"
-REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
-	gnutls? ( gcrypt )"
-
-RDEPEND=">=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.0.20
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 )
-	gnutls? ( >=net-libs/gnutls-2.8.0 )
-	nss? (
-		>=dev-libs/nspr-4.4.1
-		>=dev-libs/nss-3.9
-	)
-	openssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}1-${PV}"
-
-src_prepare() {
-	default
-	# conditionally install extra documentation
-	if ! use doc ; then
-		sed -i '/^SUBDIRS/s/docs//' Makefile.am || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-pkgconfig \
-		--with-html-dir=/usr/share/doc/${PF}/html \
-		$(use_enable static-libs static) \
-		$(use_with gcrypt gcrypt "") \
-		$(use_with gnutls gnutls "") \
-		$(use_with nss nspr "") \
-		$(use_with nss nss "") \
-		$(use_with openssl openssl "") \
-		$(use_enable openssl aes)
-}
-
-src_test() {
-	emake TMPFOLDER="${T}" check
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
index 70e0604bb856..e4393747d0bd 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index c5cb072fdedb..aa96d9a81cd7 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,3 +1,3 @@
 DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
-EBUILD xxhash-0.6.5.ebuild 761 BLAKE2B e9930421c3742c978819198388338f49f6b8341a9c1f1a01987f60787aa751f94e068e824f2f2589e5ddc8a55f0c1806c0da00cc5199d0123b762d1816f15c8b SHA512 b2b0ba10747e34d678814830d1e2602c631d805d11d8d5ac330ff2e761e31a5d3834ae716ede7bece8579ec6fdbddfb72b3cbbe9d893c5d92dfc866c13622b71
+EBUILD xxhash-0.6.5.ebuild 766 BLAKE2B eb8f2808fbf511e3f7e07b3658c98ec1de7ab9c3fa9f4136874db7614fbdc6204e2218d768752356ed0d987f05d7c430667f40da4bc6fdf5ddd66d4e5cf53e98 SHA512 782f1312e2f94994ee4bf4a8c4181a253d3f822817a7c1ecf7286c9fd46c3f04478548853f44c8bcb27790016f8003e52acdf209631edb00f9d6b79d2a8cb975
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild
index d44a7c332a6f..b7bfec9671d0 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index f1097fe1dcbd..1715af1cd141 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,7 +1,5 @@
-AUX yajl-2.0.4-pkgconfig_multilib.patch 1584 BLAKE2B 7fbe24ea90fa7fbc3007538a01b7e643c462404eb23b31e450ed6e6b8fd9f523f9b6d2104e4ce1b26fe2d008d5acb9cb1549ebeb7be47f30a7d05114220d95e4 SHA512 fc0a4d508e48bc8e005e0ad50fb44f3a0dbdd5e8e4eca4784e29a11498a480bd8ffe5558b512be9d54cd2b22bed53399f277796c413230e7c49abbd0dd98530f
-AUX yajl-fix_static_linking.patch 1019 BLAKE2B 04a28ef7efa8f8b2dc4da26260bd4c52a172a5798d8b88533b0baa9e66c21e1bf29c5032700474c8ffafeb321e948fd38f06692a6176e8a420d2f0434aa0cc10 SHA512 14e2708d979b59dd5764757f26ad4008a6229fa571c8b40e1fb2b5a4a6a68c5308d97aa78e1e06b274672cbbf6d07195d2d8291d78452c61738585af8142e32b
-DIST yajl-2.0.4.tar.gz 82814 BLAKE2B 4a84916c5ba6cd43aa484af559c23c05ea0b36078d1f4489d97c8c47404aa2771f9c2238f6fcbb344cb2e84f8b183b918ff2d95c50c7da8a781731614d88dbf6 SHA512 ab99fdd6b7e6f7add5530fff2d3ac6171ed3698267016d6cd23449742d36c9d848f065ba920dc2abb934488239e11e4ceda571c05fa472ab5d3f0480e9033a13
+AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
-EBUILD yajl-2.0.4-r3.ebuild 988 BLAKE2B 481a498b4e7b5c49c5fdc4e0588558e34dc86891e6b9ad5f33beae03face25cbedb906ca268c3062bfea10c12ca2373476c6ef52972d2ca48e5fc2818cb11f0e SHA512 544e6bf2d61883fb09882d5ef78ee39246715951e35d0bab41c73c9a783c8a3c28d1e77cc447f990e721e98f12417c081bbdf55047e864b9d9ab14dd3576f552
+EBUILD yajl-2.1.0-r1.ebuild 938 BLAKE2B 643b858c69462911616a1b7aa1cbdd2678dcd74e459a1538017cba672b3158ddb9cdbbdcb9d66c78cd3ac5fd0ff2651ef5276199350f5a1762a6ad04329919bb SHA512 94108784b1245ec434427c3ee9cc99221b452c7b4a15998e73db68e57044c77ac0a87298f19d37a37206e13097917a3e81d0b541599528646309bf4e249ce092
 EBUILD yajl-2.1.0.ebuild 894 BLAKE2B b264eef4b077162606be918a7a2af354c7a6ed46b39bf4307649703727b8de7b222d231fd34e9d7c1a234021069c13de5840a18b5b534950da694f1276677411 SHA512 74b0cc65f70342aa512fb7da7322bc06f6e6acd635427d836c383dd42eee55f61af85968d0a624fe72c18aa9e5b19f6f42d49049717e45bc09be06a5b55cfe8a
 MISC metadata.xml 446 BLAKE2B 84c4b6dc7569e85ba3925a34c96c67c8f7d23a5d8861a296ba4fde89122645cd6e49d0ec8749cb6028d10d9b945735ed732ea4473c98393d8b83874eba9c06ec SHA512 6cbb37575c23168f216682c7f2decadcb18a11d9c0af71e6de531b1002541d913fa84f98ed78f13ad1c995c332b87d61c658ac0f3fbbef39e01fe2786e1da6f9
diff --git a/dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch b/dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch
deleted file mode 100644
index 4a01848acd49..000000000000
--- a/dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 409098e97292aa1698ddff7f34dd8099db41a550 Mon Sep 17 00:00:00 2001
-From: ksergey <inndie@gmail.com>
-Date: Tue, 28 Jan 2014 00:35:36 -0500
-Subject: [PATCH] fixed pkgconfig file path
-
----
- src/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e36b736..27b7c7d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -30,7 +30,7 @@ ADD_DEFINITIONS(-DYAJL_BUILD)
- # set up some paths
- SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
- SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/include/yajl)
--SET (shareDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/share/pkgconfig)
-+SET (pkgConfigDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib/pkgconfig)
- 
- # set the output path for libraries
- SET(LIBRARY_OUTPUT_PATH ${libDir})
-@@ -61,7 +61,7 @@ FILE(MAKE_DIRECTORY ${incDir})
- # generate build-time source
- SET(dollar $)
- CONFIGURE_FILE(api/yajl_version.h.cmake ${incDir}/yajl_version.h)
--CONFIGURE_FILE(yajl.pc.cmake ${shareDir}/yajl.pc)
-+CONFIGURE_FILE(yajl.pc.cmake ${pkgConfigDir}/yajl.pc)
- 
- # copy public headers to output directory
- FOREACH (header ${PUB_HDRS})
-@@ -82,5 +82,5 @@ IF(NOT WIN32)
-   INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
-   INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl)
-   INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl)
--  INSTALL(FILES ${shareDir}/yajl.pc DESTINATION share/pkgconfig)
-+  INSTALL(FILES ${pkgConfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
- ENDIF()
--- 
-1.8.5.5
diff --git a/dev-libs/yajl/files/yajl-2.1.0-uclibc.patch b/dev-libs/yajl/files/yajl-2.1.0-uclibc.patch
new file mode 100644
index 000000000000..2e6f176de648
--- /dev/null
+++ b/dev-libs/yajl/files/yajl-2.1.0-uclibc.patch
@@ -0,0 +1,14 @@
+diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt
+index da4032b..d48e218 100644
+--- a/reformatter/CMakeLists.txt
++++ b/reformatter/CMakeLists.txt
+@@ -26,7 +26,7 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
+
+ ADD_EXECUTABLE(json_reformat ${SRCS})
+
+-TARGET_LINK_LIBRARIES(json_reformat yajl_s)
++TARGET_LINK_LIBRARIES(json_reformat yajl_s m)
+
+ # copy the binary into the output directory
+ GET_TARGET_PROPERTY(binPath json_reformat LOCATION)
+
diff --git a/dev-libs/yajl/files/yajl-fix_static_linking.patch b/dev-libs/yajl/files/yajl-fix_static_linking.patch
deleted file mode 100644
index 56bf0e737319..000000000000
--- a/dev-libs/yajl/files/yajl-fix_static_linking.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN lloyd-yajl-f4baae0.old//reformatter/CMakeLists.txt lloyd-yajl-f4baae0//reformatter/CMakeLists.txt
---- lloyd-yajl-f4baae0.old//reformatter/CMakeLists.txt	2010-07-22 00:12:15.000000000 +0200
-+++ lloyd-yajl-f4baae0//reformatter/CMakeLists.txt	2011-02-11 19:28:40.006756997 +0100
-@@ -42,7 +42,7 @@
- 
- ADD_EXECUTABLE(json_reformat ${SRCS})
- 
--TARGET_LINK_LIBRARIES(json_reformat yajl_s)
-+TARGET_LINK_LIBRARIES(json_reformat yajl)
- 
- # copy the binary into the output directory
- GET_TARGET_PROPERTY(binPath json_reformat LOCATION)
-diff -urN lloyd-yajl-f4baae0.old//verify/CMakeLists.txt lloyd-yajl-f4baae0//verify/CMakeLists.txt
---- lloyd-yajl-f4baae0.old//verify/CMakeLists.txt	2010-07-22 00:12:15.000000000 +0200
-+++ lloyd-yajl-f4baae0//verify/CMakeLists.txt	2011-02-11 19:28:58.296756998 +0100
-@@ -42,7 +42,7 @@
- 
- ADD_EXECUTABLE(json_verify ${SRCS})
- 
--TARGET_LINK_LIBRARIES(json_verify yajl_s)
-+TARGET_LINK_LIBRARIES(json_verify yajl)
- 
- # copy in the binary
- GET_TARGET_PROPERTY(binPath json_verify LOCATION)
diff --git a/dev-libs/yajl/yajl-2.0.4-r3.ebuild b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
index b0670a2bb73b..b296aac066ca 100644
--- a/dev-libs/yajl/yajl-2.0.4-r3.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
@@ -1,23 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils cmake-multilib vcs-snapshot
+inherit cmake-multilib vcs-snapshot
 
 DESCRIPTION="Small event-driven (SAX-style) JSON parser"
 HOMEPAGE="https://lloyd.github.com/yajl/"
 SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0/2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix_static_linking.patch
-	"${FILESDIR}"/${P}-pkgconfig_multilib.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-uclibc.patch )
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -27,7 +24,7 @@ src_prepare() {
 
 src_test() {
 	run_test() {
-		cd "${BUILD_DIR}"/test
+		cd "${BUILD_DIR}"/test/parsing
 		./run_tests.sh ./yajl_test || die
 	}
 	multilib_parallel_foreach_abi run_test
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
commit	43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree	6208a7f4fc744684fce0f55acbb47511acace498 /dev-libs
parent	28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)