gentoo resync : 20.05.2018

20 files changed, 57 insertions, 272 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0772968955c4..f167427a7df5 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 7c02af76e4a6..4db8af5cf440 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -5,5 +5,5 @@ DIST Botan-2.5.0.tgz 6596225 BLAKE2B ffb5647e5734a8bef14b6c52ad12a211844e9c73f84
 DIST Botan-2.6.0.tgz 6599127 BLAKE2B c45a974f89571c1050e28108267ca6ec094171be3d7dbcb033b86b7dac3f8074703c40c42d5737074a86c19266b4b47c266d0864ce08ee26fad05116a50c48a8 SHA512 2082b4aaac0802f117a5f75c67a69e6d364b436a0ebe543032e370c3f085752bbe1ca48051462066e13bd42e47573ebc532d1d45074fe406df032f33346ee645
 EBUILD botan-1.10.17.ebuild 4217 BLAKE2B 4af0e21d562a01017e28bf55d78788fedd731d390edcb6786b1cecbd9dd637a79c525b74920b9516925795e88eade82ecd3db88ac26df888300cbfe8e525564f SHA512 5cc5ff02202de8b9cc131f0c7346206f40a26fa6ca222dafecd90dba4946980bdc85c9411008c2975a234d077d7acf5f979af5c9be5d6651305a5fa148c9ee97
 EBUILD botan-2.5.0.ebuild 2298 BLAKE2B 9f08544892b00175f01336e4057673f549a69b33b5c6537a444b508f58c05a731f2b18c5c4836148c4c4700f212c9828e2d25c4c1d509538e93a8280a5908b23 SHA512 6530a683b3ecbffce4ff08588ebe4d0860152e17d9004190df44211d45abffbd9371f74a497819c70eadddf7d1caa4d73a423f890df6c3324757eeeddc31ebd9
-EBUILD botan-2.6.0.ebuild 2341 BLAKE2B 487581eace3a4d3d5a1161d4922f898877b2f0db837583201fa8e22224014af7ea86d37106ae7996cae928f4000ba4b0dd6c3e40e1721b80c17fa402865132f2 SHA512 ba47d2f932e28d33dfcfab1a07fb1112b941bac4df62e8b7ba469461b044b571e35764798817d7407cd581ca9fbc001c41a8b971ec2d97c83086568011cd82be
+EBUILD botan-2.6.0.ebuild 2340 BLAKE2B 340f5a07bae12741e3a5b7f2272017b70ba36d540fee49cb5d878e3558369929dee2d01105be2e7fe2dd27a5e2bfffebfc8f891bb9bfb6a7cde439c9f3505b63 SHA512 f5e0448f7f4abad004f3b5b1d777f53f919d77eb503d6a1f2ba5ac71b14c172a85623b7999ca8a320088792f06e9fe1c0a9f0e1f242a156d8de06376b4da5e4d
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-2.6.0.ebuild b/dev-libs/botan/botan-2.6.0.ebuild
index 6c7f96f10875..267b5220f719 100644
--- a/dev-libs/botan/botan-2.6.0.ebuild
+++ b/dev-libs/botan/botan-2.6.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/libressl/Manifest b/dev-libs/libressl/Manifest
index dc9ae1b50254..0152a5452bb7 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,5 +1,5 @@
 DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aebd376506de73773a5eb9cb0bb4c5b93aa16353b4892abaee97ec933ad77e89775c3f52263d77bb17c68e481b4f70 SHA512 181761da573ff392aaee17dd3dde416d7cbb299ab3e07b49c97e279ceb3f619e78d1dc9ec4c59b0af024f0a8270ff31fe37f8282d0392be34c3143c9647cd246
 DIST libressl-2.7.3.tar.gz 3364724 BLAKE2B e245cd0e3c4819e12f3f05898429c10894959d9bbe27bfca38543ec304a84abc8edda7c968eb8d25e5c589011c5482060d05bd1e5aef71c13708ec804cd05a72 SHA512 5fafff32bc4effa98c00278206f0aeca92652c6a8101b2c5da3904a5a3deead2d1e3ce979c644b8dc6060ec216eb878a5069324a0396c0b1d7b6f8169d509e9b
-EBUILD libressl-2.6.4.ebuild 1353 BLAKE2B a7885671883289a1723ebe3c8d02885b30668bb1dfc37a418b5c0ca964c75a01c688279f43ba863cf28e4eacf61d0ff1946c651eacb48684efa7767026ac68ee SHA512 52257e618750254f0fc49c881c30e7058f6d82724930710e7cb19b5ab02dfba3cfa0b201058444c840e2b695de3fd85f13dddb0e9bae9b0562c9b02be3d61cc5
+EBUILD libressl-2.6.4.ebuild 1352 BLAKE2B 0f668e823133a6ca603056574a56de5397f068f041b8ba564fbc15ec181d721d706b281588eb59c86eb832ab5afcd90181dab6609566431cc63b254da415a29d SHA512 c09043f0de7ace4f1034d6a38af383447ea5ed65ec7c1e8bee4b6153c1e85630c8401238d5266dc9323ff40cc8394b7b33625590a23baccc342f9d0cd87ba7e9
 EBUILD libressl-2.7.3.ebuild 1358 BLAKE2B 55a2f05f0042d113c2bbf0c01831e41dc08960d34a8aebd00b15b9c866581a928d9a1ef02bf7f2fea67b3a7f6eadd9cebcfe92a52ca28707efe18fdf2e49c330 SHA512 45499b0db8205bcb7f3d7d1cd0b2aca1cc6433918af9d94016c96d5b95ce9308615571221882ba9e6d0717ca6a6ce8a6c360e5f3de0e34e0d08e922f359ee70e
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.6.4.ebuild b/dev-libs/libressl/libressl-2.6.4.ebuild
index faa38895b6c3..152d3751d355 100644
--- a/dev-libs/libressl/libressl-2.6.4.ebuild
+++ b/dev-libs/libressl/libressl-2.6.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/44"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index b91229b0b559..64eb48e2f08b 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -26,7 +26,7 @@ EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d
 EBUILD openssl-0.9.8z_p8.ebuild 4860 BLAKE2B 8c78442920df3443d9601c3e9246caa838e0acbe9541b5c250a6a96253b2d28fca65878cf9cddaae62f6fab6fd6d264997b168888cfcd1e53ea90b34a804e3e2 SHA512 60bcce7807ee7d0a68df11cdb2ab76560ef23b6e3df43a506263fcbdf54d0571dcfe0d16188159d13a268425b16798eb28c3c1ed985123ae095c8ea146c1e4d6
 EBUILD openssl-1.0.2n.ebuild 8029 BLAKE2B 03b66a7d81e954f811b87314dd56bce86ba3e2dd4b15678d3a72ee40f03cf8d27fe70493c0727c640c96cf21dcab8b8a6a0f022af8505d68f49e6e024d2166c5 SHA512 0da731451be5903656e4035f7eb30b1565b0b5a9fe277e300e9272bc2bebcd97a1043a5e8ebcf62808f50e7a2f8c9433e15f4a6fa44aa86d5efee94fffce8a54
 EBUILD openssl-1.0.2o-r1.ebuild 8042 BLAKE2B 8e8f266dad8dac9192f3484d3334a2253c23858e9fadc7cb20e3c1d9742c65e9b1f072cc65ba82f329c94b45d8bdaf33576cfba90ff13bdaf65535910f867a03 SHA512 af301ed141db94a1a3095458219ac1daf1b9d0fb9d9bb0dddfb01249fe436d64f9e0adba83f3ef818952397d39755dd413bd2d8e8c4f9dd31024107d5c1e40b4
-EBUILD openssl-1.0.2o-r2.ebuild 9629 BLAKE2B f452cd495b29e0c3cad5e0fdae87fd5b19efd1ef95673cdd43c28edce46599b254ac522fcf80c841e205fa17164b2264154d5706e8947c6acf47315eda4f427e SHA512 088ab213ed79ed97997a6e33e2137f8a0703a07cc3d2a53bfa0d9e18fd41f35f86783b2500f75ccdcba240deb7d588b373792a1e59739e33d2bd637ace690e05
+EBUILD openssl-1.0.2o-r2.ebuild 9625 BLAKE2B fcabeb6b7119b8b5a55ac37b36b16463d3d01e3b338246761eabad5653580996955da883f453d7096ea2ac9db7cbde1a8f0bdb94b71ce84a39cb8af85c0f7104 SHA512 2826b3e3b1e2c8478ace451519270e07272104328374bcd287e701eb337012681dea5a9da037f9005b45b2a8788ead5aafa55e30fc07e7dbb2d23c204f322df9
 EBUILD openssl-1.0.2o.ebuild 8033 BLAKE2B 63a4108de7e3468d1671c8f2f71da0d96a1f34b82e995036aaa4d184a3c3448af3fbf0aea93d336e5859bd3eb26aaec6ab0dc4eb64d404fc1d7f2e1408b751bf SHA512 bd462f8fd05e348098dab2ab4e00ceab831b399df60c9502caeb30ca3ef2fb21490b05eda829cd9bec0b93dc70e64e7d5ca3781c0a6042dda049ec4a590d95b1
 EBUILD openssl-1.1.0h-r1.ebuild 9158 BLAKE2B c0c4257218e9ef0a2460d5b19a9d43741d3c67a4cbed2714f352951c6d051973a6851bb9a33733e539ad98f0f5be6051b4da157adb421fb79704f995b119f894 SHA512 b1e6dec42afd6c9ca00697cc7942c6b192aebf6ef914c45949c8e3592a11162ce3954b07b484166331035ce421a4dd0a6d463652ab21c25fb3bcfc14239a4cac
 EBUILD openssl-1.1.1_pre6.ebuild 7587 BLAKE2B 34eb743824c977e7b5f793a1837251dd29621ea5949497023a2254f5fad1e49fcf8b91b0962f0405f298e10e6a1b86326c0d0409cb9b4d75a795efa4f1978e52 SHA512 ab71eff89c32dea33dfe95bc52dbee60be75c837730b0324a20d13922aff380c9615576c6712971cbeba86bf2c70366e25fafaaaac20188f471eca9e7684a288
diff --git a/dev-libs/openssl/openssl-1.0.2o-r2.ebuild b/dev-libs/openssl/openssl-1.0.2o-r2.ebuild
index ce7b536e3ab0..8959ecc12131 100644
--- a/dev-libs/openssl/openssl-1.0.2o-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2o-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.openssl.org/"
 SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 	mirror://gentoo/${PATCH_SET}.tar.xz
 	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz"
-    
+
 LICENSE="openssl"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
diff --git a/dev-libs/pcl/Manifest b/dev-libs/pcl/Manifest
index e59c8b72790e..6b79e752e39a 100644
--- a/dev-libs/pcl/Manifest
+++ b/dev-libs/pcl/Manifest
@@ -1,3 +1,3 @@
 DIST pcl-1.12.tar.gz 384986 BLAKE2B f549dd9205ad12a8bd157b4e04e94e156f056e2190c25afcf3c9a0d4488d3e442f9cd3159c6ba68570bff61998b5d6b058c0cec5c57bfe00046379f09bf741ce SHA512 bf0168d8bb3bef8edc36085f6157661cc15f6587c847ed236983612e08955cd1fddcf2b95bbf6c04d275201aecc3842c2ab3679e7ebedb4f5fa9691c73771279
-EBUILD pcl-1.12.ebuild 304 BLAKE2B fdbeb8d5dc9a12e5cf9b49cf5a72ff0fc91c592de4c43642209f4a3fcd1092661116c293f8458fb4fe1354079a56d76182c70980a6fe323e01bbd30c2d43d21c SHA512 74341d3fcbbbeee46922ea577011ebe4e7e1f181544d71e3eca7803e46d8dfd0c3a45544fdc489e362e1d69c0216a565a7330b754716c31f91fd799ec3b9c0a0
-MISC metadata.xml 506 BLAKE2B 6d12fef589e077badc4f1c82285913d9043d7f9795b0967de18981f99749621d1bd0e99f3d69c0d44aa5dfa66c08c05e67827d44704d6892de75584777c21442 SHA512 4e94091d99437d130fc5687978b42159475ea45792bdd6021897b820006f0da731404697438358707eb1ed15a1c53ae46fb12c07cd25f4573d52847ccae6c2f1
+EBUILD pcl-1.12-r1.ebuild 304 BLAKE2B 463631120fda1446c9e4021c68d545f54a078f1046f21fbb6a89ddebfa49f26ead48d5b76564759dd3600e0e5a78288c34620528a51a93f2580dadee606d647c SHA512 5f78cf45042ed7c79d2aa2e0cf280094ffb437ff546c588db08f30f1d6b5fc646a1b7b8e42a1431e8e83e97245205808be5f77a7539be78ccbcd0926d55f9f12
+MISC metadata.xml 312 BLAKE2B dfa077775d15071c5ec983c38cc443e693d0c2998b583c56a685145a523ee58cb473a872d418018e8366fa73e2cef4235315fc45c9291c93c5dbf4f1388d50d6 SHA512 e90839ce3cf7ce5848f665f2fb70b8ce8619db0c6b0b005f37765fc621a7bbec305680ea4d4cf10111220d390a622c00c43f239530640d3328fb7aeb64a58582
diff --git a/dev-libs/pcl/metadata.xml b/dev-libs/pcl/metadata.xml
index 64dbed2929ba..1d859a5cde83 100644
--- a/dev-libs/pcl/metadata.xml
+++ b/dev-libs/pcl/metadata.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>longlene@gmail.com</email>
-		<name>Lixiao Chen</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The Portable Coroutine Library (PCL) implements the low level
 		functionality for coroutines
 	</longdescription>
 </pkgmetadata>
+
diff --git a/dev-libs/pcl/pcl-1.12.ebuild b/dev-libs/pcl/pcl-1.12-r1.ebuild
index 14a525dda63c..9be9a04989ca 100644
--- a/dev-libs/pcl/pcl-1.12.ebuild
+++ b/dev-libs/pcl/pcl-1.12-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Portable Coroutine Library"
 HOMEPAGE="http://xmailserver.org/libpcl.html"
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index feba1375cf04..00b791272895 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,6 +1,3 @@
-DIST serd-0.26.0.tar.bz2 369280 BLAKE2B 4543357663bce0c532e944fcf85f42dcc09138cc8e1a5d6810ab329c9fa047a12fe9ddb1c28da7d68609a909e0992c3c8097961004107971211373e1a3db0828 SHA512 749bf161d38cb8489f196ece2bf2b7c22e9113d05b38452592d92f9ffdec25d340e680e697e9531dab80d2ef04600690f9333208a4ef22307b8ed8e238d5c7b8
 DIST serd-0.28.0.tar.bz2 371592 BLAKE2B 143e858b5947cd52d01341ec7ff5fb36f98aefceda4e748b2a999c2e6d2c972b2f5d30053d8538f04f236597da93a595d0fabbfa4c667397e27d4c897458d1ee SHA512 b25cc70af17ff821812ab2a70c2812c1713ff811a0f18fb5d5c54f3b67e0c68293aabedfacd687afe6b7acdfd81602ef81764d7e11bc0d933de738bc6d4fce3e
-EBUILD serd-0.26.0.ebuild 889 BLAKE2B 81b4e7ef3ff900e5ccb1b27058f6ed716cf022c3e2de82fa3481ab417d01ba108cd07ee20b09875ff964e9fd995099472ac7eb16f2b4bf5473bc7722c600801f SHA512 e813f26aa1c7c84057a49be987e90f2e9b9cd7c2c7eef411a616b7fe633d13de16175beffcc66d347b72a7b5a8893280298bbfab3c36baa3e1149a94f61fe1cd
 EBUILD serd-0.28.0-r1.ebuild 1104 BLAKE2B 9c87e861eca99b01c20281793527eceec9e34b04589517589bf01492050ec1bb0eb14e5c16d1b070fe4124e7e12f9cb42bc021df18ab35c659bc62907617fbed SHA512 13b92204381e8f8c3e14997738a9d2f962a3c7fcb05e1ba61df6dea0fe57317b74ae7659a8eea8c0a549c4c052b3ee53f6f290e36887990f3f7f3d8b7ab1e67d
-EBUILD serd-0.28.0.ebuild 894 BLAKE2B c614e6c4866526d949e0f151d388873b29c60e9e970f49c5ffcc18dec1121832fe4ebcba87aaeef32651f6f101390e0d2db855ff1e2a6b4e4a52ed655d3abfe7 SHA512 9018d896a97fdaa0998a0bf76621334b7fc8fd7415e7188a9f977358ae2c15d8f303a33804ffd0deab50e99aefe85359cae6e2014d7b961f73b51c277469797c
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.26.0.ebuild b/dev-libs/serd/serd-0.26.0.ebuild
deleted file mode 100644
index 96ff52951afa..000000000000
--- a/dev-libs/serd/serd-0.26.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
-HOMEPAGE="http://drobilla.net/software/serd/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc static-libs test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( "AUTHORS" "NEWS" "README" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(use test && echo "--test") \
-		$(use doc && echo "--docs") \
-		$(use static-libs && echo "--static")
-}
-
-src_test() {
-	./waf test || die
-}
diff --git a/dev-libs/serd/serd-0.28.0.ebuild b/dev-libs/serd/serd-0.28.0.ebuild
deleted file mode 100644
index 72a8bf533c1a..000000000000
--- a/dev-libs/serd/serd-0.28.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
-HOMEPAGE="http://drobilla.net/software/serd/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc static-libs test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( "AUTHORS" "NEWS" "README.md" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(use test && echo "--test") \
-		$(use doc && echo "--docs") \
-		$(use static-libs && echo "--static")
-}
-
-src_test() {
-	./waf test || die
-}
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 6b12c66822e6..f54f6bfa3b43 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,10 +1,3 @@
-DIST sord-0.12.0.tar.bz2 285075 BLAKE2B 302e14283bb6517f6c0286f5d908a825dbde69f949566601796c6dc1bf47c492189369ed9a30407be10841b3435c712402500d2b4e601396d8bfd27b0516e395 SHA512 c24c82fd4d9f74d10923d0cf405d2eabbaabd66b3b11e29719115515edcd8ccbc4a32866ca510dc676ca6ca833b0d9c8ccf43d36f6b0ef010d0211cee821db02
-DIST sord-0.12.2.tar.bz2 303365 BLAKE2B 8c4760c072d278229ac830d79a2f5a3bfc49a73af4697ec56b7db2b877211279559f9e0e75eefe3c608491310f87bc4d6782804eabc880298bf503485eb77e04 SHA512 2906808138658f89cb6ab939c20e0a092180535629c75b1a0277648af18fb019055dd3cde53f57d7b0d635666be98848bed021ba0bd922a34cfaae3a98c66cbd
-DIST sord-0.14.0.tar.bz2 311442 BLAKE2B f3aa81b3df44ac248b2b73d16e60db3decdbb1af5335afa012de77e2ac9de0cef28c048c5583232adca0e97645e405918f4a839e90828ec63d70a9f1b167790f SHA512 7c59997752fec7db00f2fca3bf5400b3a57141efe1cee031ca24e69e2c31b3aefbb78f51fe9d46a96b06fe685bc896210bd8271846b878c266a90ec257dc7b55
 DIST sord-0.16.0.tar.bz2 316331 BLAKE2B 27702600e48e14c75be18cc2b83705cdea1eed7158223ee685821ae80b18b61f5db82f804ee6a32236143cf8287ee875c3b3354edc6ccd1d4f25eaa3a04c785b SHA512 e18c6de62f2cbffedd4c200f6452f4fd37f719aed764ccc1b77c8da04a0f3394d47e8b57e19eefd6d600770926f505fdfa5da91564bbff5f4ead49f1adaba249
-EBUILD sord-0.12.0.ebuild 885 BLAKE2B 47e8bc55cd80ce9fbe0faf115d261e8a2dca7e1cda19278894484f01a4fdb3f36265cbddbcf99220501e9fa94ab2072f11483eb0ce81709f188e00790079e1a8 SHA512 4ed34e11c3131b02a8945abb5ac7b1757f76a722ae12f5ed98e17de3d4e9c9ff2f614754c8c3f71d98b304aaa4e52340dd167b0655538ae6254a312dca1d717f
-EBUILD sord-0.12.2.ebuild 883 BLAKE2B d9505d53ceb717aff9dd85107709a85cff3047c3f8e4f9a19e726be99ad2b40fea6a12410ff43486638022ad19c8a853b696e37365418036c83813bbf5d4e79b SHA512 2913e2c542e35ccdce230f892be569ebb92a86332589141e995f7c196148998c8d6d0701bca732c612cf2b542edd9158d2dfa5df0ac4d5a595accdaa7bf5131a
-EBUILD sord-0.14.0.ebuild 885 BLAKE2B 47e8bc55cd80ce9fbe0faf115d261e8a2dca7e1cda19278894484f01a4fdb3f36265cbddbcf99220501e9fa94ab2072f11483eb0ce81709f188e00790079e1a8 SHA512 4ed34e11c3131b02a8945abb5ac7b1757f76a722ae12f5ed98e17de3d4e9c9ff2f614754c8c3f71d98b304aaa4e52340dd167b0655538ae6254a312dca1d717f
 EBUILD sord-0.16.0-r1.ebuild 1106 BLAKE2B 34e7d07ac8348d062e5cfd7b3f0e92e23be4aaf23ac346c278b8ba469eafc04cea7d482deb1e8fd2cecfeee86a5a53a515167f3a70fe24fcb96bb1a6710dbc7f SHA512 ccf7ccae7c9cf967c2cc418aea6dc15dcd64f5811c2f929f878aafb1a10958fa8953173653308c22c3eb7ba3ee33e84503e56a715bef34a13c26004cf7518618
-EBUILD sord-0.16.0.ebuild 891 BLAKE2B f508743bc7f363dd14e2d1daa71a7097fe711101b27eb31610e4751cc6252b76d04369fca20033de8ec360ad08993db45edab5030d3cbf2fc758a478e7930064 SHA512 af9a89904bb6cc64ae423b53767fe1713f816db06bc341fd7c8d41c10447c270722785d9796127825319b4c77ac6bc4f1ac4b2d8b5f2ba2957ba1bf40892c1c3
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.12.0.ebuild b/dev-libs/sord/sord-0.12.0.ebuild
deleted file mode 100644
index cdf6b7b08526..000000000000
--- a/dev-libs/sord/sord-0.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="Library for storing RDF data in memory"
-HOMEPAGE="http://drobilla.net/software/sord/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/serd-0.14.0"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( "AUTHORS" "NEWS" "README" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(use test && echo "--test") \
-		$(use doc && echo "--docs") \
-		$(use static-libs && echo "--static")
-}
-
-src_test() {
-	./waf test || die
-}
diff --git a/dev-libs/sord/sord-0.12.2.ebuild b/dev-libs/sord/sord-0.12.2.ebuild
deleted file mode 100644
index 4ff132693eee..000000000000
--- a/dev-libs/sord/sord-0.12.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="Library for storing RDF data in memory"
-HOMEPAGE="http://drobilla.net/software/sord/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/serd-0.14.0"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( "AUTHORS" "NEWS" "README" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(use test && echo "--test") \
-		$(use doc && echo "--docs") \
-		$(use static-libs && echo "--static")
-}
-
-src_test() {
-	./waf test || die
-}
diff --git a/dev-libs/sord/sord-0.14.0.ebuild b/dev-libs/sord/sord-0.14.0.ebuild
deleted file mode 100644
index cdf6b7b08526..000000000000
--- a/dev-libs/sord/sord-0.14.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="Library for storing RDF data in memory"
-HOMEPAGE="http://drobilla.net/software/sord/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/serd-0.14.0"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( "AUTHORS" "NEWS" "README" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(use test && echo "--test") \
-		$(use doc && echo "--docs") \
-		$(use static-libs && echo "--static")
-}
-
-src_test() {
-	./waf test || die
-}
diff --git a/dev-libs/sord/sord-0.16.0.ebuild b/dev-libs/sord/sord-0.16.0.ebuild
deleted file mode 100644
index 4c2c086209af..000000000000
--- a/dev-libs/sord/sord-0.16.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="Library for storing RDF data in memory"
-HOMEPAGE="http://drobilla.net/software/sord/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/serd-0.22.4"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( "AUTHORS" "NEWS" "README" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(use test && echo "--test") \
-		$(use doc && echo "--docs") \
-		$(use static-libs && echo "--static")
-}
-
-src_test() {
-	./waf test || die
-}
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 0f2886e93088..c5e3560c9c3f 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,8 +1,10 @@
 DIST wayland-protocols-1.11.tar.xz 117852 BLAKE2B 314f247efdffd0dbc46664e2abe7fade0cb0a36ef77310660f978ea9677c33acd60b1512a5dc2fdbfc40b8e1444da7bb4089e091433bbf2bc4b5ab41e97514ca SHA512 6a6f816dd24f338182ddf11e2daa2db4f048f9153c618bd75712b6e02fccc41294c6c5f33692e858f54bab6b644b1dff49ca223ca2c8410a4afb8aa1b39e34a6
 DIST wayland-protocols-1.12.tar.xz 98920 BLAKE2B f6625f91ce5ba9e4ef88b296969e67d99f2889e405f3a416ab00c62d866a78fb554ff9baccfcd8cad2662ab0e5c7908866a9a04a1f16ec36c8a5af250c42564d SHA512 84f913aeaf9786c5ddff4952fa4c318435569ccdc00c625f088b1dc9d6e61f3c439b2d217db9fcf2f0c37da954e266314749e2c3130bf3328cffdc3bdce5695a
 DIST wayland-protocols-1.13.tar.xz 99680 BLAKE2B 6bb0ecf08e6b0950c50ba40cffc07d79dd95244abc7d2622f9c232bc2b1cfdaeb9fb1e9f1650ff60defc99ae184abf47f13888f44f429136f2a631afe1c2d5e8 SHA512 f35c21da289038651b75af064ec7c10779158829f578e7320faf401e980da3c958d85e5bcad00994c574cac6319a3ab975aa5483a9b438f781b767bd6303e194
+DIST wayland-protocols-1.14.tar.xz 99844 BLAKE2B 55298d24dbaa6cce017775313e9f4cfccbf3176d7ef24c786f1384111a274c3a0164ac753ebfb4e708094199105cc32ccb58cdb22711e0e0711441dde45883bb SHA512 78d2b47c462618ece0c9c19f250b28efb39436e715f624205c7705dbbae4f125ff2eafa2454e7dce527d3b13449dcb037b282bbbb9ea9d9f52809d6b8187a204
 EBUILD wayland-protocols-1.11.ebuild 891 BLAKE2B 89bd528ac051ac71795318ed2bb4b68a32585dbf28ee72dd5e1284819d9acc28154d6bf7c0e6acc784461a8ee948bb0e25dabfe8d1745e0ea41ae62f027604f7 SHA512 d246c9ff9a9520dbf039f67cede7150892366748a26f8f3eb7d6f4650efa1f43a2bfcfe33961a98174061dbbb74665edd7cd74d0b2a1b2e7acd971862a60791f
 EBUILD wayland-protocols-1.12.ebuild 885 BLAKE2B d492535004c630e7a2ed6096b5c1983526fdbad572a565c04428d3f5a02cf4f2c09b61d796df394f33d803d6afcdd796fbb6f637cdc99561abd95741083a250a SHA512 72e4d27a56920ebc5e5164f606327f1a5799513ae2fd0a9891889838ae1a5b75706b3f8e6da392e4ef2d3280d07a3d74b63fdd40982e09fb4b24e3ffa9f1df4f
 EBUILD wayland-protocols-1.13.ebuild 877 BLAKE2B 01a97dcee97c229dc2126381ef15f5e88aa3b92c908b538bb6485f893075786efd248f6dc511a5b8b73b58426627a9f4e059889b0e00abe493f395dd827f64a7 SHA512 b3efdd3adf3b81649e7a93f5dc15c2b8fc204206f2b5d608f14534d064aaefdb51866fb7b9b0ba380e9e612405d192c7525c06507503866b2ab8bb3133073a85
+EBUILD wayland-protocols-1.14.ebuild 885 BLAKE2B d492535004c630e7a2ed6096b5c1983526fdbad572a565c04428d3f5a02cf4f2c09b61d796df394f33d803d6afcdd796fbb6f637cdc99561abd95741083a250a SHA512 72e4d27a56920ebc5e5164f606327f1a5799513ae2fd0a9891889838ae1a5b75706b3f8e6da392e4ef2d3280d07a3d74b63fdd40982e09fb4b24e3ffa9f1df4f
 EBUILD wayland-protocols-9999.ebuild 885 BLAKE2B d492535004c630e7a2ed6096b5c1983526fdbad572a565c04428d3f5a02cf4f2c09b61d796df394f33d803d6afcdd796fbb6f637cdc99561abd95741083a250a SHA512 72e4d27a56920ebc5e5164f606327f1a5799513ae2fd0a9891889838ae1a5b75706b3f8e6da392e4ef2d3280d07a3d74b63fdd40982e09fb4b24e3ffa9f1df4f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.14.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.14.ebuild
new file mode 100644
index 000000000000..4948be07ff86
--- /dev/null
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.14.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland-protocols.git"
+	EXPERIMENTAL="true"
+
+	inherit git-r3 autotools
+else
+	inherit autotools
+fi
+
+DESCRIPTION="Wayland protocol files"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ $PV != 9999* ]]; then
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/wayland"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_test() {
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	default
+}