gentoo resync : 09.06.2018

36 files changed, 140 insertions, 207 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 174595608d41..7bb315aafaf4 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index d4c9e48f5727..da2607937631 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,5 +1,5 @@
 AUX ldns-1.7.0-CVE-2017-1000231.patch 396 BLAKE2B 60225693e684ce9b7850fa416da879b91543b08573b36eaa1da40cb26c6726930d0d0c31a68b7aa99852859ae4554cc7b111c8318ffa832c7140a1a9cae80668 SHA512 c9119730ef74aaa89a362fa5354267da7e0336873a66a9e68b1d634946ab7938ac8833a8b1dbd27d51add226008b0b9336e4e4e06f20d714b225e35cb3efcbcd
 AUX ldns-1.7.0-CVE-2017-1000232.patch 469 BLAKE2B 4e17f4d13928081cef5093b51db1b1b1f393d151a5822ad4d40f385620fd7f78168e581a6e2d50164240ffe368d4926687a860f5555432d2a9b5b389a3287ea7 SHA512 2eaddaa4ab7ecf8e54a7fef341406e1f8bdb278a2caca3d8cafdebcfc349c7e3ba1247f194a5fc0fd50074c8836f29b4e5427b2ce7c3b8513191aa1b4b08c681
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
-EBUILD ldns-1.7.0-r2.ebuild 2250 BLAKE2B f39a9af93e5e1b759824203b25d58861197b5a0cb783ade47ef1e2cde182f89bba869fed308e09ce7721e45ae80e3b1825f36296312e48b5a4deaf44a2a125f6 SHA512 3006861462b80aeb942b791a08e8a1cea3e3947d03777137b92d7a379fd5c07ff4425eb34d8c8d9ffba4bc30ad822b23bced00df444106309a5b9ae0db4ea1f1
+EBUILD ldns-1.7.0-r2.ebuild 2249 BLAKE2B d062305d7326af8b6d945f83163af65be20d3db24f4564973308055efe0af48e1e3258c704c57988109defedb5bba27723ce11b31c9bce53c61965efc8670828 SHA512 50f01f2baac2ce3e6ba676ffc6c9475865164f5decae3574581625300ccd3df19dcfdde83da78c7dfe3ae22a91eb99800786a6e5b611daeda95000c90bdbdc36
 MISC metadata.xml 743 BLAKE2B 31fe371130dca55cc2950a0892ddf2e97f1c7260b57e893932c14d2af254b1c9272a678a4365762247b5fd7a6e2e6c1a58dd326f3837e0e12389bb08f493562a SHA512 b8d5c5fd107fb7dd7dc2d7d19fbb91a07a2a619b6c9ddd9146d9359c06ed96059c87d169b7c2022760e4117283372c01b6f5231edf975bbab9c72a3ee8347f35
diff --git a/net-libs/ldns/ldns-1.7.0-r2.ebuild b/net-libs/ldns/ldns-1.7.0-r2.ebuild
index d42a8c87f9db..3a6c156757c0 100644
--- a/net-libs/ldns/ldns-1.7.0-r2.ebuild
+++ b/net-libs/ldns/ldns-1.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa gost libressl python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/liba53/Manifest b/net-libs/liba53/Manifest
index a8f9c900e9ca..88d123ab0b1f 100644
--- a/net-libs/liba53/Manifest
+++ b/net-libs/liba53/Manifest
@@ -1,2 +1,2 @@
-EBUILD liba53-9999.ebuild 433 BLAKE2B acaa66685fa99355dbbbc766bd190866eae849f964565eef9c659a12a4f68470e137e675a1acd027cbf54da21d246d66ff859e90f740c8410074bd610c7f7231 SHA512 27731b011de4712d5ecb7e63ff1d7bf96bbea64babfc0e950156daa05e454c66bf79eeaf18001c0766181d0b9e57aec4319e6a68e3173d80bbab60454328afb2
+EBUILD liba53-9999.ebuild 434 BLAKE2B 78f8c543a83c0184368e8709e1c6e0405cc27b7bf7d4ba9a6d12ea37a1b39462d114d86cd382548823c407b2a494fac13d70707be6572b0a9cfc6560e3155fcb SHA512 11e70dd5500e4cb1d7ddd8c7ae1a0f53f47426d6e43430aceae4971e5efdfe3e12afd0e40be09f8d5b74702de3b1dcf00152495364ab8e46a5aa853c54703c9c
 MISC metadata.xml 323 BLAKE2B 15cef51763586565faf1d8c4a090289b05a972ef40ba4a5aa3229fd9402b8c5c296b3a10ea59f4a727885fae673d8f029342f669fd5dde048ce41697a8ab8b03 SHA512 e8c544b1f06b9d2527f39d1b259b3d373d6d6b78d2c96e213d9209f4f8a65d332b5d3223ba93e5a6e4df5c10eb74fe0b4e43de491f8f8346db1042147e07fcd1
diff --git a/net-libs/liba53/liba53-9999.ebuild b/net-libs/liba53/liba53-9999.ebuild
index 30b03d7b29d2..72fe4d1689a6 100644
--- a/net-libs/liba53/liba53-9999.ebuild
+++ b/net-libs/liba53/liba53-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit git-2
+inherit git-r3
 
 DESCRIPTION="A5/3 Call encryption library"
 HOMEPAGE="https://github.com/RangeNetworks/liba53"
diff --git a/net-libs/libhackrf/Manifest b/net-libs/libhackrf/Manifest
index e160c479c942..c11fa7a7d68e 100644
--- a/net-libs/libhackrf/Manifest
+++ b/net-libs/libhackrf/Manifest
@@ -1,11 +1,5 @@
-DIST hackrf-2014.04.1.tar.xz 14375500 BLAKE2B 9bf73bb331ee73b60d3e6ec0c0a4ebd11ef0c361960c68a16395c94b74f76351c98f8d78c817c6ae7cec385d1570963a8fff2bec37c6bf7de6835c9abf97eae5 SHA512 1929c7af1de0c9ad1afcf56d53c5db13ef362f3ef896f3549841eeea87aec5e1133c63da740688739278b13e772b70d510a4a1035440b5b6aad2e9438a694892
-DIST hackrf-2014.08.1.tar.xz 14376904 BLAKE2B 6ff096dc3e3072811dcb324c71b56fd2023e8e7bb39f8977ee783edc835b588935f1afb1a26ebcdd16c1e6727be3f82e59d2c34e2f193aff43638c22f3956905 SHA512 2bb2e9398479f635fc4cb73875d9728c689f5d29bfbdcaae661d98ecafe51d38ac8768dd4f38b87766195d9ed08757e76d790030edf6f6f572d547146287c073
-DIST hackrf-2015.07.2.tar.xz 14415212 BLAKE2B c9ef83e7a4c1c0cca9ea592c02cc1fe9fc5f42203d177f15b36893e719cf3c269cdb8c3d0e13ed5c51826b8e346b58d572b96c3d197c615e58f9d4464a306c14 SHA512 a4f7b7800ece9b260d5c8c374f5544aa55cd2e97e10c6a0b33cf476e2ad4811321ffb1308d9dfb2168b2624cd3af616d1c314ad86bcd6f4c3fd0897319fa2cbd
 DIST hackrf-2017.02.1.tar.xz 15409352 BLAKE2B 930c6d30cbcadd366f889add7cd8f9756edf7a6b82a478353ea94662e9d2e0b612ca5ec0473eb0083dcbec761f2d5385eea31608f50f81543449ffa4bc31d277 SHA512 7cd6ad9aa8fef8afed41c48a3358bff18c6b2a9a112b13daabda87726e0e3ca4cf1e0c0c6ff9689bdd49f854e2e5887a84ccd7975abef43a43b75ecf8a5236ce
 DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4
-EBUILD libhackrf-2014.04.1.ebuild 671 BLAKE2B a909955f757c406e2f41942b0810b3bad641c0eb5e7ce36af0519145b216abf992cd4d3f64cd82d90fde7873b4b26c747a01509c368c0250af0250e9e0a22837 SHA512 739ee11926e00ce289b5a80cb39b0f9c0061b99382364c3f8084ef7a9c2092dd19d7a8d0908d07dc03024e677e47f03d7b322615aabb744552efeb8f3d8ea76f
-EBUILD libhackrf-2014.08.1.ebuild 878 BLAKE2B 258be0028e9a87fec2b2ca34e97245e3c9b4af3f4187a2be58d8f1a7d1a625d4fef8f17816eed9e6777de7054ea1349a1ab35f165b7cde66521355fa3fc353ce SHA512 09937011ec15856fd3a0bac7c11f3c8e7ca2fff6a5cbc072ad9a08695982330231ee5c132d98fe72244b19aa46a46e0b46071375882f36cf5125f42198fdf309
-EBUILD libhackrf-2015.07.2.ebuild 1026 BLAKE2B c71be2515b07ae92aebcaba336ddfecabf5bf0c92e170e82b0d76ead28a481e40fe8e5590956fc10e1f6807058c1d030ce072979a2c0f33e3459824b6a1bf079 SHA512 f0edc37331a90968939a1cb0891e37d8ca9f5ccaa7e934a082d3235548cc235563443abcf92bc8d39839c7177bfefcbeababc6bae5a22ac9c218bd2cd494f8eb
 EBUILD libhackrf-2017.02.1.ebuild 1023 BLAKE2B 71fbd223d93a52da2aa85660529a5ef82a65c9150482a58ae648bf3ba6a30750f9a95f87e5bd41aa7871b79a5cc22b3723bc7d35b8e5121f2b4c50580eec4fab SHA512 294a3c13016822a75531d8bde30e9bb1f3832494d0f944f77975dd817be573e332f709f4aa8f20599424396c6e2ba32f122a50822fc344e669d9b5014006ff59
 EBUILD libhackrf-2018.01.1.ebuild 1023 BLAKE2B deb0d52f8c263d439ca72b1351aca7b7413fc14c8c13cb934d52cd113c4b7c2a3b9ad47a61700f1a8ab9fe216bc790df1255449db23ac7ba19f830868270b905 SHA512 b160bc4cd6034f4f423d271f2c07ca851e41471e4ddec39692ea8705f3b527d5047a28af58f521160e9d336ca63318cebf80a4da3d202097376ff763d75e36a2
 EBUILD libhackrf-9999.ebuild 1023 BLAKE2B 71fbd223d93a52da2aa85660529a5ef82a65c9150482a58ae648bf3ba6a30750f9a95f87e5bd41aa7871b79a5cc22b3723bc7d35b8e5121f2b4c50580eec4fab SHA512 294a3c13016822a75531d8bde30e9bb1f3832494d0f944f77975dd817be573e332f709f4aa8f20599424396c6e2ba32f122a50822fc344e669d9b5014006ff59
diff --git a/net-libs/libhackrf/libhackrf-2014.04.1.ebuild b/net-libs/libhackrf/libhackrf-2014.04.1.ebuild
deleted file mode 100644
index d674575992fc..000000000000
--- a/net-libs/libhackrf/libhackrf-2014.04.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="library for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
-	inherit git-2
-	KEYWORDS=""
-	EGIT_SOURCEDIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/libhackrf"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
-	SRC_URI="mirror://sourceforge/hackrf/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
diff --git a/net-libs/libhackrf/libhackrf-2014.08.1.ebuild b/net-libs/libhackrf/libhackrf-2014.08.1.ebuild
deleted file mode 100644
index fc72fea1fd62..000000000000
--- a/net-libs/libhackrf/libhackrf-2014.08.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils udev
-
-DESCRIPTION="library for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
-	inherit git-2
-	KEYWORDS=""
-	EGIT_SOURCEDIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/libhackrf"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
-	SRC_URI="mirror://sourceforge/hackrf/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i 's#plugdev#usb#' 53-hackrf.rules
-}
-
-src_install() {
-	cmake-utils_src_install
-	udev_dorules 53-hackrf.rules
-}
-
-pkg_postinst() {
-	einfo "Users in the usb group can use hackrf."
-}
diff --git a/net-libs/libhackrf/libhackrf-2015.07.2.ebuild b/net-libs/libhackrf/libhackrf-2015.07.2.ebuild
deleted file mode 100644
index 5eccf9765911..000000000000
--- a/net-libs/libhackrf/libhackrf-2015.07.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils udev
-
-DESCRIPTION="library for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
-	inherit git-2
-	KEYWORDS=""
-	EGIT_SOURCEDIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/libhackrf"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
-	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="+udev"
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_configure(){
-	mycmakeargs=(
-		$(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
-	)
-	if use udev; then
-		mycmakeargs+=(
-			-DUDEV_RULES_GROUP=usb
-			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	use udev && einfo "Users in the usb group can use hackrf."
-}
diff --git a/net-libs/libmirisdr/Manifest b/net-libs/libmirisdr/Manifest
index 9e8aaf19e568..7584dcb5d284 100644
--- a/net-libs/libmirisdr/Manifest
+++ b/net-libs/libmirisdr/Manifest
@@ -1,2 +1,2 @@
-EBUILD libmirisdr-9999.ebuild 558 BLAKE2B 7a57c02fe0f4897762a90d1007024a22f9755db332a3f8290da582829556b5f884d8ce4618bc2bc29e421984d8e5dc15dff54cb91a6668aa09dda8eea596d37f SHA512 d6f7b4c4cd1e69f6712b3506e8cbcb268ccc9e721567f3349d795ab60e777d566851da32ea793f51431cd5b0a65d2db3bc0cd31c8f708a8a75a075b74215ed93
+EBUILD libmirisdr-9999.ebuild 559 BLAKE2B 431fa6a5a6ab8820246da0703a1bfb3b8520890a98ead1d046c17c4bdcf2981a2d5baa0ce8bdc98712c5389da1dd4f859091ac1b4145c5a408c112d597153041 SHA512 601028c89afdae89d2419ef6d2bf305748a303e9b35e4a2629799b4e12ff481113ffbcd49a061425909647635197c4cb88ec9d646dae1b1caad3eada97125a24
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-libs/libmirisdr/libmirisdr-9999.ebuild b/net-libs/libmirisdr/libmirisdr-9999.ebuild
index a1f29a9d951b..be4afd7f3f97 100644
--- a/net-libs/libmirisdr/libmirisdr-9999.ebuild
+++ b/net-libs/libmirisdr/libmirisdr-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit cmake-utils git-2 multilib
+inherit cmake-utils git-r3 multilib
 
 DESCRIPTION="Software for the Mirics MSi2500 + MSi001 SDR platform"
 HOMEPAGE="http://cgit.osmocom.org/libmirisdr/"
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index c69268e9fad0..44583c5218bd 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -2,5 +2,5 @@ DIST libnsl-1.1.0.tar.gz 209148 BLAKE2B 1fe1cbd279f317c0ca74a635e7cb7a35e3c70055
 DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0c32a9400d4128e717d93da49f8751caf8de3bb4ba1a23b8670a0e4f8e750f38f4612dd0cc97db4c157421a06 SHA512 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8
 EBUILD libnsl-0-r1.ebuild 578 BLAKE2B 1ad99a98bb11433c7040daffccb5697f3984af7206b7e796a43337d0e1ec2a52c7bbd9dca4f33842b72030ed9576aaba86f4192eb4bf5e506dff0e2be5402f07 SHA512 05da30d3ad8120ee9e710e16edf3d44921e7a40bb2922ef017c9832e8413dd9c59ed40d20612e3897f13619a6c2726fb7638dd4697e82e5e7073abd995571ada
 EBUILD libnsl-1.1.0-r3.ebuild 892 BLAKE2B 1c243867c38ff5726b35d48f60f984fd950c6ca0968b5e8f6487e9b25108ed6cc3464201829424503a6dab92ba4b8e259bdde2533a1be5b8112f3e0fecd5567c SHA512 a3a17f4d91553e6fb5b5f154509e657be6c48454b9023b19410401bd307d7ca932bda806598db4a55644ee442b31ecde910298ac179f87d05f00ed5bf6ee3ad8
-EBUILD libnsl-1.2.0.ebuild 910 BLAKE2B 415ef94be97fd29ffa1896127e2305a5d9c09cc34356ab5b62b0af437e38482f830405c80593200c9a0802138a749b86df9b673ed6eddf760c51f57f905ebebd SHA512 29fa40468e080863124f088e70c828e9bba02ff2fb64b39ebf6c47e03122d9526f627759a06ed8d9d6a47b4b106f5235efbbd41f8c92335ee5e13b6fd97a9a65
+EBUILD libnsl-1.2.0.ebuild 903 BLAKE2B c2c7fb6d0a73b2e0f07bde1f3f7c397101a1940803d6dac7e22bdad354959f4dbb9660e1af40f67d73e140bbdb2f502517807c112b5c88472087e97fbed2793b SHA512 6b308d50d2e962bcfb7731f5739b9bdfe6ecc3eab65fa8eed7abb93c2473a08fe45f7476ab2a30c43e7918ddc31d38ee7cae344594bf66ec1c67c94d81191f35
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index 016c30ac64d5..3d2e8430509b 100644
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.2.0.ebuild
@@ -13,7 +13,7 @@ SLOT="0/2"
 LICENSE="LGPL-2.1+"
 
 # Stabilize together with glibc-2.26!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/net-libs/libosip/Manifest b/net-libs/libosip/Manifest
index d7c4af1bc71a..46f0bb800176 100644
--- a/net-libs/libosip/Manifest
+++ b/net-libs/libosip/Manifest
@@ -1,4 +1,4 @@
-AUX libosip-3.3.0-out-source-build.patch 522 BLAKE2B f4b7b002a4f606b2531cfbda557d33da249ef822de23062a06a699676de58176fe1706a603c70ce41fc4fdbd8a73f6aeabe959838059d9111d0f6cb29d5e788b SHA512 ca4911303c290f635befa93c465ed25cef85c182c6645c1a3700ed6c68da9f268c52fdf07473e116f1a06daa477c4c1aa8803cec3cb151b45cdc1b504f705f4e
+AUX libosip-3.3.0-out-source-build.patch 526 BLAKE2B 096d07ea4cf6c49793eaa4f8fa796626fbfa064020bd41f59b53a638b7bba823e1292bf665c89056aba5ea0e94123288769a2a5bdc8c02d65320e1b075e02e2b SHA512 772d88b7d18bba6112679411afd93be9473b17e808cc5987f582a43877fec9f288597cd0cc2555b45b04d631764bcd9d90350e712d028c9cca58629831b589b2
 DIST libosip2-3.6.0.tar.gz 598496 BLAKE2B 734242e556306eebbd1ca7f1c9dec3db5be9bc97453a71c3803ae4ee6e02e6426b1ff3a00caa8244369ac61857433b7a6976fc76908543429ef5a3bb3386f191 SHA512 58109fdc643673e811ce576374194d6d33b930ecec3221f31834471f52f5f2b2b30e5e331e245e33b2aafbff1aaa411d3a7657c25f3bb0b9d6cda0ae766fd538
 DIST libosip2-4.0.0.tar.gz 644958 BLAKE2B 78dc5477b3f7ea8a750478804d0486a16dcf99101f1c38c4532f18f2dfd3b7c844728115973f8afcd42e384547c38de28660970b020b3df6dbcf854928573057 SHA512 995fc67c9a7536628ebaec9f4500bafa8a2f88081531bbae5194372b51102d556de28aea7d121e20cfda82b302a8a4ceb6488dbad61676930fdc13accb12b961
 EBUILD libosip-3.6.0.ebuild 653 BLAKE2B 9b125b674bf8cb53545a9f4937c810d6069733952f70b56963988736da52423c9e5136e01b8a37029b9d3e8c8d89400334d577dc990161d87d840f1cabfc57bf SHA512 1ed7156a84235c329a296dbbf785934157d83171ca2a0a9090ec17ff14507f1104bacd2e12bc717ee08ac2102baaefb8175e3fbb8d378c765d34262062545dd1
diff --git a/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch b/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch
index 04a64ed39446..fa87b19d0e2a 100644
--- a/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch
+++ b/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch
@@ -2,8 +2,8 @@ Fixed upstream:
 
 http://www.atosc.org/pipermail/osip/2010-February/009864.html
 
---- src/test/Makefile.am	2010-02-11 17:51:43 +0000
-+++ src/test/Makefile.am	2010-02-11 17:52:09 +0000
+--- a/src/test/Makefile.am	2010-02-11 17:51:43 +0000
++++ b/src/test/Makefile.am	2010-02-11 17:52:09 +0000
 @@ -49,7 +49,7 @@
  	@echo " *******************************"
  	@echo " ****** starting tests! ********"
diff --git a/net-libs/libosmo-abis/Manifest b/net-libs/libosmo-abis/Manifest
index 5aedac6d2a45..b609387b5a92 100644
--- a/net-libs/libosmo-abis/Manifest
+++ b/net-libs/libosmo-abis/Manifest
@@ -1,2 +1,2 @@
-EBUILD libosmo-abis-9999.ebuild 429 BLAKE2B cf3223ccdbdc2aacaca0042c0190718840e9badfd580e30b4b1585a743772b84d9a65ab72e2eb14119f93b1e281ef8358323fde6c7a49da5295a12f9ce2dc627 SHA512 49a925a221e7f943ef60fc1dcfc55fb3ef522e11caf218bf4e52723e3c23cc8612c584770fc37760195f57c1dbe612a1750d6fdd79e71502dc0796afebe62fc3
+EBUILD libosmo-abis-9999.ebuild 470 BLAKE2B f67deca8e992f0701d5d3bd34a57bb56783e3ce2e6bd52fa2a38cb210a46ea70b351c17ff525e97c447edb79a6b059f1693ed87d95a41b2ef73e3dd3fff9de8a SHA512 bf886f9acfd03e63f197a21ba83e36cbd51f40fdf7a4e5147a7e42494c2856cff9c8d863b0c77b5ee01aaf1c6100baf1a0323ffa2bf95f3e51ce8d9add8488c6
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-libs/libosmo-abis/libosmo-abis-9999.ebuild b/net-libs/libosmo-abis/libosmo-abis-9999.ebuild
index 00d1ef07ca50..3574747f1b9d 100644
--- a/net-libs/libosmo-abis/libosmo-abis-9999.ebuild
+++ b/net-libs/libosmo-abis/libosmo-abis-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools git-2
+inherit autotools git-r3
 
 DESCRIPTION="Osmocom library for A-bis interface"
 HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/libosmo-abis"
@@ -14,9 +14,11 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="net-libs/ortp"
+DEPEND="net-libs/ortp
+	>=net-libs/libosmocore-0.11.0"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
 	eautoreconf
 }
diff --git a/net-libs/libosmo-dsp/Manifest b/net-libs/libosmo-dsp/Manifest
index 4814bd196910..9b78ffb43abd 100644
--- a/net-libs/libosmo-dsp/Manifest
+++ b/net-libs/libosmo-dsp/Manifest
@@ -1,4 +1,4 @@
 DIST libosmo-dsp-0.3.tar.xz 106792 BLAKE2B 8ba4c06abda550383ff349d11456890062da606f553c4b0eccc3e8b5d70c4a31ec2dd82ec90ff0ef29284ef13702d3d949720b218e7374cbe7553492faeee719 SHA512 079316bb882859787ee26143e3b105aa260c89022b81a38b29713cde39093dc430abea406468774649dd14232c969b2806c47634b64f940f78fa20cb90ffade5
-EBUILD libosmo-dsp-0.3.ebuild 813 BLAKE2B 1392225b388c9e0b3579736b1fe22bc3e967b5a9189adbacca8f0b9e74db8f2b46244e1f9e7ff8b2d803c61079ffe38edfaf1524126c665346609303ad1c46bb SHA512 1c0b5762a8dc2965766a22862f4eca3ebca1a1f45b958f70ef07df7d3608d13bc22ae3a89304fc99ef43a53a7c5cdbc823c59747149adf11d7851e98e6b184d3
-EBUILD libosmo-dsp-9999.ebuild 813 BLAKE2B 1392225b388c9e0b3579736b1fe22bc3e967b5a9189adbacca8f0b9e74db8f2b46244e1f9e7ff8b2d803c61079ffe38edfaf1524126c665346609303ad1c46bb SHA512 1c0b5762a8dc2965766a22862f4eca3ebca1a1f45b958f70ef07df7d3608d13bc22ae3a89304fc99ef43a53a7c5cdbc823c59747149adf11d7851e98e6b184d3
+EBUILD libosmo-dsp-0.3.ebuild 814 BLAKE2B 8aa61c9d25e2749a87c3f41bbeee3ac6850b7b55eec0f90eb8c810fed934a5a6312bf21fb380f873f63649d32fa3fdbeb1461a89bb363feb400e56e6078d9dcc SHA512 9bad89b2dbf29b526d64f3c102dcccd7d772ced4b3c6f0c22c0ae7cadcbeb4fc716eb1cecbc3dc17ddb291aeda8cdd989b48fe8900bb8cff584a833a0f0b1d08
+EBUILD libosmo-dsp-9999.ebuild 814 BLAKE2B 8aa61c9d25e2749a87c3f41bbeee3ac6850b7b55eec0f90eb8c810fed934a5a6312bf21fb380f873f63649d32fa3fdbeb1461a89bb363feb400e56e6078d9dcc SHA512 9bad89b2dbf29b526d64f3c102dcccd7d772ced4b3c6f0c22c0ae7cadcbeb4fc716eb1cecbc3dc17ddb291aeda8cdd989b48fe8900bb8cff584a833a0f0b1d08
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild
index ef65572ce883..b49e28335ba6 100644
--- a/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild
+++ b/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ DESCRIPTION="A library with SDR DSP primitives"
 HOMEPAGE="http://git.osmocom.org/libosmo-dsp/"
 
 if [[ ${PV} == 9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}"
 	KEYWORDS=""
 else
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
index ef65572ce883..b49e28335ba6 100644
--- a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
+++ b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ DESCRIPTION="A library with SDR DSP primitives"
 HOMEPAGE="http://git.osmocom.org/libosmo-dsp/"
 
 if [[ ${PV} == 9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}"
 	KEYWORDS=""
 else
diff --git a/net-libs/libosmo-netif/Manifest b/net-libs/libosmo-netif/Manifest
index 0f80020a9fc9..10f5d9a6c117 100644
--- a/net-libs/libosmo-netif/Manifest
+++ b/net-libs/libosmo-netif/Manifest
@@ -1,2 +1,2 @@
-EBUILD libosmo-netif-9999.ebuild 468 BLAKE2B ed7f73b8a4dfa65ff9aafcb6fb63a9ec8cb0151eae7af8cace0acd8af6bad390950d6ee2cfb9beb338fe3f2bae0b469164cbaca6978d07ceeff40265adcc53fc SHA512 00e2e90a7e9aef3eded853234e6072bffd43204debfe27ca73ebf9a53f249b8a8b46f53873b146dd757afca9ef27a294ae438de18a94f60b6b7db2d57d10c1f2
+EBUILD libosmo-netif-9999.ebuild 469 BLAKE2B befc32dd75b81387007d294f9933cfb1022e7589191972691c0a7d92898930464ac76b59528c22840d5379aa5e5c2014d4f9b83feb9ad412e3edee143829b4a1 SHA512 12d0842931ce28a00531889f6d2e2c08b15bf4182603ce5c19c00d56b5855cfc50d2851f62105b916223d97dc32af8236d9ab7c0614bca1f215da410614b08d0
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-libs/libosmo-netif/libosmo-netif-9999.ebuild b/net-libs/libosmo-netif/libosmo-netif-9999.ebuild
index 7ecc9bb91e45..d2b2772d8afa 100644
--- a/net-libs/libosmo-netif/libosmo-netif-9999.ebuild
+++ b/net-libs/libosmo-netif/libosmo-netif-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit autotools eutils git-2
+inherit autotools eutils git-r3
 
 DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
 HOMEPAGE="http://bb.osmocom.org/trac/wiki/"
diff --git a/net-libs/libosmocore/Manifest b/net-libs/libosmocore/Manifest
index 1a82dab6280d..6fbc63caf0a9 100644
--- a/net-libs/libosmocore/Manifest
+++ b/net-libs/libosmocore/Manifest
@@ -2,6 +2,6 @@ AUX libosmocore-0.6.0-automake-1.13.patch 245 BLAKE2B 776b88a297b1ad6edaaff357bf
 DIST libosmocore-0.10.2.tar.bz2 646555 BLAKE2B 62dbabdbb8a397662b618863aade394ef4638dd266e059ef4c6fa54364aba60db29cce1fc6c2692af095f32b3ce186ee5b788598595fe2128f0d04caad9d83d2 SHA512 a42db3467faec9c814efe40ae8cf4a41e610b97cac04c1da30c211f116e1f7907117aaab89aca8af3dcd8aedc2be73c9e1c194b9062d33856de02feddf4bda22
 DIST libosmocore-0.8.0.tar.bz2 439320 BLAKE2B 2614ddb8a1f7a0a72bae888d601264d90836daf2067716f2a264f0632699929db9b0a3d3f353629c08aaaecc84f429d6fa2c36481c8bd27ecb078f4447c937c8 SHA512 4ffd5943807440f80f70e381e477631a592fef41a3485819d94e7ce9523785e20057759aec6cac7abe57ba21b7d48e38164b7272c5bcd89882a3a8e213d89361
 EBUILD libosmocore-0.10.2.ebuild 906 BLAKE2B 17533a7fba36cf814bde7fb4a6407e919b6f85773dd830013f3e7d11675db8d4d128448755357b2212dbf1db7143c638b1d3e98172b09189a22c6b2f9b44f42e SHA512 21fca38c83177653078fc20df1ae876ce6f91d2e6e3e7e726cd3cc68c5e3248fa9270a64ff9ed03a741f1d933448083b1a566877128ab9effb2b571b264b7ef3
-EBUILD libosmocore-0.8.0.ebuild 1072 BLAKE2B 345c0dcc9366551db87ced603a17ba986680e4da4a7f7ab75a039be268a6926bb8096a20f981c50789e2abf539fd166c5016d3e65cdc25d1c14c28153c48ffc8 SHA512 05f3d6e1d672e9b4bf259a4c4c0523d25d5eff267a93b504b23a96fa1d3ac60b690d9abbb2d2c0151171a646a46a82fe08873e9b705ff41bfa3d859ec8bf6206
+EBUILD libosmocore-0.8.0.ebuild 1073 BLAKE2B da9541dff2ae947ca5846516239d2a35697b942b4d6aa790dcb8f306052d2526e3ecb3c4a0e51c2243d2e61b93a8da187bbc04ccdd2acc58a968373635f37df2 SHA512 366616aa4ac0e675f2f431236ee2fec3cfc11fdee4bd8c75118e4d5595e2c1f544b5b96b869a6dd317efe2fe7ff4659b18f729485949ff5a526e525f3d1cd9df
 EBUILD libosmocore-9999.ebuild 906 BLAKE2B 17533a7fba36cf814bde7fb4a6407e919b6f85773dd830013f3e7d11675db8d4d128448755357b2212dbf1db7143c638b1d3e98172b09189a22c6b2f9b44f42e SHA512 21fca38c83177653078fc20df1ae876ce6f91d2e6e3e7e726cd3cc68c5e3248fa9270a64ff9ed03a741f1d933448083b1a566877128ab9effb2b571b264b7ef3
 MISC metadata.xml 432 BLAKE2B 955701be1bdd728ec1ff6851f1bb84c281a65c63a28c47e4a4328794e26381ec709cbd9dbb2b99f3bdcaaf77793c849b5d30a232edfe5a7866b3b4b927860ddd SHA512 3b4c9d8e510a658b9e1d5ea30042a45aefcd128429d45665b152b238b216bdd8a245479c54ef0842fda7937830b38d33cef6e12b802b7ce525ced80d38951157
diff --git a/net-libs/libosmocore/libosmocore-0.8.0.ebuild b/net-libs/libosmocore/libosmocore-0.8.0.ebuild
index ea57bb86c30e..1154c80eb2a3 100644
--- a/net-libs/libosmocore/libosmocore-0.8.0.ebuild
+++ b/net-libs/libosmocore/libosmocore-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
 HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
 
 if [[ ${PV} == 9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	KEYWORDS=""
 else
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 8c54513401c5..9da035485b46 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -5,6 +5,6 @@ AUX libtirpc-1.0.2-glibc-2.26.patch 276 BLAKE2B 8e557e3c40c4c12339d90c238b26ee39
 DIST libtirpc-1.0.2.tar.bz2 509601 BLAKE2B 7ccf23ca200e2027a66a3105d9b3d0612ac66a08498931f66526a291be6ddef8e7df533af4d44a0e4a1178edd6d51ae39ca50c2536b9b1be7179e7f17cfd165e SHA512 6c819019a8e81d8263d3c509b2eee59ba1ef092222c5a0a8d28f004c711afa252097eca7e6b0b919b2d780883dfd9ee7a363df4cee7fd2c9159a065257637cec
 DIST libtirpc-1.0.3.tar.bz2 509831 BLAKE2B 3f908471b3e10f88329793db2c832754b9bb838d115235d7c25256da883960de8d8c94a6941fc9c2a3cc4dca9a77c32b5cb85bb347cc182e5a6255636b79b06e SHA512 1f1cf7dd6f30ddddc919e4caf6db926f1d532f78d5a93e8aaa2acde6b046be0650c4c46549da0ffd5fa7fb9e550af1a871ed6e02ededf504c6667d2e82eba2cc
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.0.2-r1.ebuild 1629 BLAKE2B 4d4421e028d91d99d299356d21b4c3dac5ff685523fe181896bb5432a4c83d963bb48aeded711411c1d57870705609d2ec0433999dc06c8eb1d45cb7fb016560 SHA512 a901d84990e99b490243b3e2500541d096c854bc79866d596c53cde1695926ddc906798222f5fb94e9a0cc8ad4b014f169cee5a1325ce30c21cde2ad2eda86c8
-EBUILD libtirpc-1.0.3.ebuild 1556 BLAKE2B 02d80480f8ff502134da6ca8a5643da74af2eb60f41dbc1c9db259000cf5e7d6230bf92fc1cabd69cf81c2d7f857eeef3b4634b3cf1a7fa97bc918bff2ea975a SHA512 7b10e7c06b7057738975899deb03559a955739ddd2cd1a08f9b511a1e991a8297729e782134c1ee1010d1f47f06f124c5ec9b87a7aed6b73ca67f534dc59f16b
+EBUILD libtirpc-1.0.2-r1.ebuild 1634 BLAKE2B 1a95787b197965383fbab8f5c7c475df2ced8d21b331c11fc351bda1e17b864ba74bff204d140776a1c1384fce42ae580fc6403ce1b88e946716b4d2274f7881 SHA512 8cb2e688bb9b1b4a8cdfd48ef19e608f68588af6f4d4bb2a1c8d770d44a9909db5634507f664ad305d4ba2e71402fd52a32a3f01096a50d84d32e34f5cf3beaa
+EBUILD libtirpc-1.0.3.ebuild 1562 BLAKE2B 544ee8a721fc1e7f04e41ac1ce778b9d5c13093782282679aa58e16c3fe10dca06fcd7c4deffb99cd7c5b7d46655a4bf036e2233e434a1374c690bca9bc69f38 SHA512 769c5e2666f6621aef826d8b4a2364d8038627004e96e1979029cff0dbae83d22398e031284ad3896490d8fececd4eba9ccc9223ce0861636c4e68a6d6d2b797
 MISC metadata.xml 335 BLAKE2B 57eb0cadaa82d4fefb0adcbc01bc19d720ebd10256a7188a70e7ae69f147acba7370fcc07813352a067a181bb77321677713cd3ed4cf77f0c815a88a30abbf20 SHA512 d6dd857293827907e545dc6e8631d06682d20e13442f8ce6cbd2e2a789d885c8a788f4ed1d062a8c54c4165d22eb096279d4c2f598e462a57faaf8bec1e9777b
diff --git a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
index 4921db42f157..e299ad562072 100644
--- a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtirpc/libtirpc-1.0.3.ebuild b/net-libs/libtirpc/libtirpc-1.0.3.ebuild
index 68d0e2e63358..355ad74c14ae 100644
--- a/net-libs/libtirpc/libtirpc-1.0.3.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index d32f5313a01b..2599004b382e 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,7 +1,9 @@
+DIST mbedtls-2.10.0.tar.gz 2190139 BLAKE2B f4e6da0bc433992a79088a86c7bad48564e5d8eca110633960c8197becf1fb64b77e36f2bd63e241ff0a3eb86aae1b6b538de2043e1bb6626b9b18fa9951db91 SHA512 a1dcb46d3e27c93b511a0dc846b5ed6dc35992cdcf04fce6ad83f5a92440d11d60a07e0fec64f9d6c5e2f27365bdd7a557a35af4ff250b342adbde6193240a95
 DIST mbedtls-2.7.2.tar.gz 2127772 BLAKE2B d66c65f0d974baf97ae361e64db5028af6c402ea248a785009b422d993deaa4facee98dd338ee4b5d36087fd07e679069fc4fb57cce548097d1f788cedb825fa SHA512 52455b68744a3c220aed7346d19c7b9bebd3a065406242b446816a3b02325d72005b5c381b158bfff90e2fe5854064629b297fbec95fea3ad203bfae51a15cab
 DIST mbedtls-2.7.3.tar.gz 2145554 BLAKE2B 442d840f7046ae63508528fe76e9a12d438f14eb0468a2617cc18df8223105aa696c0b676193891359c8fbd56771acc2690760259a9ab6345883c63cc634c6dd SHA512 f1eb1ec4d4cdbe26434df6d17d4af72ef5bd2f370177f5ce787ab86ae6bcf200f221ddfdc5948f87e7da9f9e04ffddf8b68e83e203de2f8c0dca8c8594414b23
 DIST mbedtls-2.8.0.tar.gz 2132562 BLAKE2B ac0a67c51e4aeb59e947d16039b20de680ccd7daf372652c0a7d1a6694ce8fe213f959b47a4335cda236575d8f491c84a413ae2f408e86600519ac66a31f8c1a SHA512 baa2024e26cb1d772a525348cdcc84e2b5eabf58642d8c792fe88cf6c539b36f14e80d592e85bc474f6be036513ed4b8bc86f5808ad4f5b08f25ca7e43dc3921
 DIST mbedtls-2.9.0.tar.gz 2163543 BLAKE2B b47e6242b5bad4f571bd900960e20ec0266e6f9f25c96df85c7d983dfa3d71f8b842b90f112eb69a09bf99ed3ef7c059c2c2d522ba66e92f4c9097754985323a SHA512 5490822aae18dfb3eb2cc94e673a575daf0cdaf9a4867ff84f0df9749376ea5c54a3f67902b4b86e2a853508af0585684618f9edac8bd92352cd3ca4461bda1c
+EBUILD mbedtls-2.10.0.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
 EBUILD mbedtls-2.7.2.ebuild 2416 BLAKE2B e9f164316f072fe0648fc77391f78b14bd25fca8aac75172f086678592be85266236ae28e252d0595b52165016153f363f0b5af2ab799c544b9531070136031e SHA512 3ea0c78f51c759d556e68c51a5006d09004c98e04c7fe331b01b586dea921e39079cf00e7a6399a175c0b51bf07dec05c6a08ee54e622c35602fe5aed1f7f1cc
 EBUILD mbedtls-2.7.3.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
 EBUILD mbedtls-2.8.0.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
diff --git a/net-libs/mbedtls/mbedtls-2.10.0.ebuild b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
new file mode 100644
index 000000000000..a992986693d0
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/10" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
+
+RDEPEND="
+	programs? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=OFF
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake-utils_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED%/}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 9621696c58ec..6a99a9c5865c 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,8 +1,8 @@
 AUX gentoo-global-npm-config.patch 1511 BLAKE2B da2b127df9ac9babc87c1930272244e7f89ac1931543fa524e13fb3c53d2b5a9cbdf0d93dc0cae207822dee3c8f71e2a12fca3d608f6de8589ad2c0064f0855b SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 705ba235f707c750971a64ea3d631925ba457b3914b0cdb2582236c07a44ca060430336948fdada8153a9f5af9ebc5a7a4e948231a0a2c4412326c7188f4204a SHA512 6af7daccd660bfffefe5c155c364feb6cfd2044f1c230a31f138a20830833657c3c5a029d459dbf565ebf3ed5a356d006003693c7112cd37757977781f513eeb
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
-DIST node-v10.1.0.tar.xz 19363748 BLAKE2B 931349d204764472706f44473b2ea0e1399dad84d0595cecfc2cbd71670df25f05c2c2ac77e4c18852f523d5b0cf853ca83739fc96a46e1f5e76ae51cab006c9 SHA512 f98da47849de8a50d9986d0176c39914f3993e579a3d482153cb0fceb64d7c79443fd230a80946361008e4fac58b7b99292c906961fb57ef14ccecfd1da07156
 DIST node-v10.3.0.tar.xz 19464004 BLAKE2B 3bd88c231402728874c9c2916225d995a64e79e311d45869910192b6c46d450e12c4b20c9045bead85de24d3e46eb65793a9a886df87545836c0875c88a98cd1 SHA512 c52c798f16b69c0266014e9f53d5243d49e71af9fb411400d526a054995f0d2d2a150d31842160af0feffbd240e36dd97b870eb8c1fbacd3a7b18a143746df7e
+DIST node-v10.4.0.tar.xz 19659232 BLAKE2B 71f78aa5f652abd8ed06d995efa56e503722c8405ca0fea1a862255f5e266836ad788840a04f568fd06b65cf65f40ec89e8e5c89c8c1162aed654c0caee63441 SHA512 8c94d2686c0b4d0e9d5079469daccc3b8287f7040c35eb0bdb8d45950e09044d5fb5bf20f31fc5856049a528fa5e4adfd507877741101cf8bf57d790fdd80f92
 DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
@@ -12,8 +12,8 @@ DIST node-v8.11.1.tar.xz 18279516 BLAKE2B b06f31571c93455d16899e3ba57d1e5835951b
 DIST node-v8.11.2.tar.xz 18318444 BLAKE2B 04041462526dbcd6c4b852f9ca1dd1ed868a1afef51f6560eecf0c58a659c0cb5adb54e4b791655948ffadd6be4e53a07ca02baffc997c9b2f1b2cd9492b314a SHA512 b1aa109d0c1e498b840d14c91d6c268ed0f11e214a0dd9469ba10c06712909ceb7c38eed56c564a7b262f414ecda399074785c2f757b46827914cda2791102f5
 DIST node-v9.11.1.tar.xz 18500884 BLAKE2B ac086b59144ed7393a7c0293616c1ef2b149e23ac67ba8ccf324c2c1f97b18435889e4fb2f1c205834e3309728853dcdbf34d00cc319a10bfed7cbea9fdf01e3 SHA512 6e5ed333ebb678c08fca8f567708874a50bd9311e326196bf86ca77db3046dd196b50208bcffb7f3435f0c031d47dff5471465c840be12903f3c683802000a1e
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
-EBUILD nodejs-10.1.0.ebuild 6333 BLAKE2B 552ecbfaf9e2c973d3673ebd93df67821c55ba41896fbeeda4386572f8a33a23a39ead9ff04b449c1224bef3f6fd212c94cbb6f08f4b55bae8db6ea78245b005 SHA512 6d43a12494acea5d298517d41dc93abb3b863020fecf0696aee6b4cfa7147696807eeaeaa90ea3e538563bc6311e052ff0682df708be4945d3ab744d7124fe93
 EBUILD nodejs-10.3.0.ebuild 6339 BLAKE2B c1642519de2c47f964c1a8f32ed4cf5caa2fcaa42d0ca3bee0189d1662fdb170b0ddf80e9a2fbbe7bd51d146623aff652d5c6ef7030a94257c90d76eb63992af SHA512 8e276ab90bf81f0f27da9f8b1d393ed608f98dab610ff3b6c48674e9bcad3a4fbe3cc5da8efb2e1aad4c04a19a4b6be1b7638af295462f8e99c7c7938125f04c
+EBUILD nodejs-10.4.0.ebuild 6339 BLAKE2B c1642519de2c47f964c1a8f32ed4cf5caa2fcaa42d0ca3bee0189d1662fdb170b0ddf80e9a2fbbe7bd51d146623aff652d5c6ef7030a94257c90d76eb63992af SHA512 8e276ab90bf81f0f27da9f8b1d393ed608f98dab610ff3b6c48674e9bcad3a4fbe3cc5da8efb2e1aad4c04a19a4b6be1b7638af295462f8e99c7c7938125f04c
 EBUILD nodejs-4.8.7.ebuild 4431 BLAKE2B ebdf991fab56e0e40958ec1d08570a8d32732237115fa6b468e788d4d92245c553d4f0e6187a83bb5cf57ee1aee334002cbf255925cc5f3788d566d9204316a8 SHA512 dfd48068f1f246211a001fd9b180cbf5344b6948714f17eb6435be604e4138f8bcd72812b8d782c33d1569f25b907736ffd92b7852b2542f63f2dadf06ac1ca8
 EBUILD nodejs-4.9.1.ebuild 4432 BLAKE2B 3650a661997bdfeef6097b4e356a186a2b829c0f2224624b71ad832b1e957ce9e841136b83f62c53b8e524993b4eb8e203c1d10176f98f09503047e058804fbc SHA512 98b52c0ebade643785b90d8362fc047b361c4c29e5a7e81b59c581978025a24c9562171fca342d29855f4881985db4d8f017b2711c5ab4e54f0dbdf18aa69a03
 EBUILD nodejs-6.11.5.ebuild 6089 BLAKE2B d1b1c07ac7eb975d28291fca7fc10688e316e1fd62419f6cf87c9ce7952e074afb23eb89f40df0d336dd4c0f0d22ed40157035b7e6b8e2730eb2ef95a538ba60 SHA512 9a4310b2b53b0f58e855f35dd04052f4b1b8e0a8c9341486321b5e78ecd5df0078fcc614c3786d6f54799ce031c3046868d8970a041ad67fc7be0bd6e789cdb1
diff --git a/net-libs/nodejs/nodejs-10.1.0.ebuild b/net-libs/nodejs/nodejs-10.4.0.ebuild
index 6ef2faad5c3a..45f560f36a3d 100644
--- a/net-libs/nodejs/nodejs-10.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-10.4.0.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.19.2:=
+	>=dev-libs/libuv-1.20.3:=
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.29.0
 	sys-libs/zlib
@@ -37,7 +37,7 @@ DEPEND="
 "
 S="${WORKDIR}/node-v${PV}"
 PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
 )
 
 pkg_pretend() {
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index 3383f227d573..0d8539a156f1 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1,5 +1,3 @@
-DIST rabbitmq-c-v0.5.0.zip 234929 BLAKE2B 4b023ff18863190b6a0f7def3dcefd38a84f73f33a0d058ffee7655042b7b065fbacbac57c7ef3be83bc105f6283978de00a7e580394c5138d8e2a5adba3071e SHA512 7b30ecc4831f0145db68a1811b5cb7e4eb55a6b826efa0834a705c03f2ecba3d6d2b8187cdf1472e7da2af8dc77b67674916ec31fa6086e00a01304a097b4430
 DIST rabbitmq-c-v0.8.0.zip 249220 BLAKE2B 171ae0ffc093851089f4dc11cc1e8ef25ae90cbb0cce75ffb93c04a765b7d195e5bde8bbdaa4ce0c598c7f4bb291ed204d157443ed927db373a89f8ab9e7ebc0 SHA512 e386979ce1bc05c02cda06e8582981e0df25f9b31ca950f8a921bd2b249020f751ba65a6f38b8f5ba0be1b3e89492b29b72c6cd1d5ed3d6f19440799d6419ba6
-EBUILD rabbitmq-c-0.5.0.ebuild 838 BLAKE2B 9eb596e2473f3b90b1a32b77571d8de41d001b29f7666225557b6bd93f84016153f776b56f084ade7414ffcb45f316fbdac14070a88992b6178c30dc59ae8ea6 SHA512 8d264f879f19e1bcaa76b16b73fb9afd4dfa6cc90e9c2ea742c568476f68565954a09df5e73c06049ef4813f10a24f27a39bdf7664ef5e937b8234c3bb6d4ee5
 EBUILD rabbitmq-c-0.8.0.ebuild 1107 BLAKE2B 6944fcffe4aed04d2e16630f09b32a56c8699c08c90b6229576500d416a0717755462dc524d4209ba0e46d66f73c88bbf5bc18a783b32c136126c834d12a2597 SHA512 61d32d92f549fd0878bd1bda788335b43d21e0cfedecf95e9bb3e2aae24b86c6399b79678b23727020650ca1cb929abe6dd021aa122fd60e4906f965904d334f
 MISC metadata.xml 334 BLAKE2B 672c5318c4bde4bcece68c54ef2267f870bef399b2f1f245fffbaef00be8debe125362f5e082af20738487636be8116c8dd14cbcced2c6f3d3862bd3ffca4377 SHA512 e28cd79f898d2fc3a02d48b62a572102724cf18951810791479c273f8407f0c4bf8f202bf72f035c8383fe7ab4a8f216a98ce79cbaa9bb1ad82f69c26d762d76
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild
deleted file mode 100644
index 38842119cb7a..000000000000
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils eutils multilib
-
-DESCRIPTION="RabbitMQ C client"
-HOMEPAGE="https://github.com/alanxz/rabbitmq-c"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
-else
-	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.zip -> ${PN}-v${PV}.zip"
-	KEYWORDS="amd64 ~arm hppa x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="tools"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-DOCS=( "AUTHORS" "README.md" "THANKS" "TODO" )
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use tools BUILD_TOOLS)
-		$(cmake-utils_use tools BUILD_TOOLS_DOCS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index c2b8387832ef..96792c9defc3 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -2,9 +2,9 @@ AUX rpcsvc-proto-1.3.1-old-preprocessor.patch 1018 BLAKE2B c65052ebb526976482c59
 DIST rpcsvc-proto-1.2.tar.gz 59883 BLAKE2B 178f9f9fced73dc2e4b587f1bd7924c2811f0b96b5efc048e9a6d3cb4abd32a2c34ff0f5b01576f3dc51f07ca6a06266cd7a055f278f7b205cbb9e30563015e4 SHA512 59e6ac2c3e551daef584878e8ae8fc2da7cb80a04c20f96de561abc972fcfac1fbb57a5ee0dbe7bf5288a1527c9b87fc3f73a259b30393982a9a642cf4b4deb4
 DIST rpcsvc-proto-1.3.1.tar.gz 59174 BLAKE2B d50d958cfad79142d686ae6312cdaa6044f1322bc794dbc95c1b78d088396c5adda292c83d150f3502df859c23d4e370894283ae210e5fe9aa1d0e8ed05553d0 SHA512 d687665ed51fd6fd66ab638813c5020f0c8b8491625b91937ac4b5ee4dd2357eae8e2909394e7651494e7aea77a6279ae907ba6354682ba446de7088b55f54ea
 DIST rpcsvc-proto-1.3.tar.gz 59202 BLAKE2B 88c74806419e097b20fc41bb63ff66401a6c21a2b7100474e55f1b6452a32d669e879248f00349604237e996167b21b9173158e69876f0db3a1394fb922df7af SHA512 5880ea39a750ee1f69dcedfe32afd617e695ee5328d6386977bbd11babb7bd18d8cb50c2d5f8daf35650aa8a94a4f6dda1171c1159917bb596108b1057c5a158
-EBUILD rpcsvc-proto-0.ebuild 495 BLAKE2B c5df8759ec767be4305c031aed71246536b2ea8b9256c7667358e27921d1f421e5b462ace83fa383b7e0e54c634b79e3706f05fb77ecc74336fc78eb2e7f5b25 SHA512 3103a561491eb5afe0b35ea513765297edf42b24c24e24130eccef2af36fb85d066ba648a9938fbf744e0c0be3958040892cc66476a80959ab69dbfdac88850b
+EBUILD rpcsvc-proto-0.ebuild 492 BLAKE2B 147d6d7a2bb633a6da0c7091fbcb772b65985ca55ab4a5aee026ef69468f0a6af7de19a04beafa3eecdb3e03fd1824285fa4f86ee44737c969e5e6b388cf5c00 SHA512 cdaccc05d65d1d4f7bc976b9d13fe097b49a0f7b004a626d5834b7a965305a21a22885459b6f7a7d5a68ce0d623b27da8ff796f257a4b5b25aa3c16b3e51b971
 EBUILD rpcsvc-proto-1.2-r1.ebuild 649 BLAKE2B d95ca842ad48c1fb83a4003cea99ae44312d7e6cb59f777a67dbca0585809a218230f86f2b1237c704bc9805ab36677374b3bbb6f202f4db5178c628faaee668 SHA512 9901e68bd3672ce6689f055d4d79cc73cbf4352c7bb4e1d901450a6ba47f63c0dfe16681a003069a631d31f56b91ed7cc156d3f54a0b1e39b6bb592d180da96d
-EBUILD rpcsvc-proto-1.3.1-r1.ebuild 701 BLAKE2B 4dbb97af693e72b988e9a53f10a14c77c6cb2e8e3e08fb97b2adcfcd01a93516730a09df08f4720737b54b89adf9f8f718fa7a0e3b9efa8a28eee507fe9696f4 SHA512 551299190b219f56c8c35152990218c25ed5f65787d8c31d52a470f9a4db2e63cb5acb08477104cb3cf0b95f1f62a2e89c75bb0a31346a840e3de14c176f905b
+EBUILD rpcsvc-proto-1.3.1-r1.ebuild 694 BLAKE2B f80a4a4741400318132813e36bdca9fea75491035abefb8c256aa06f5bc12e99821f8c55db1a02aa18b5d854631e4d361a2caba51a93a9442ba7dadd1ae71c7a SHA512 f2763bdcfc4b5dcc56006cb8f608f858759641bedb4407c071a7e3462148409298c8b7a4757623200ec1f848397defbdff2cd8652178298d00c218e2e4439275
 EBUILD rpcsvc-proto-1.3.1.ebuild 643 BLAKE2B 7172abfbf67547620ae634f806b19e6dc01a154747096a562bda7ff6a0f50122dcc9c7c1c0978a287421c6d662025342202e227b0552e49d55f15513c49b98fd SHA512 5008ae592acc11837cbaa3100b4f837e4673bf8e152863d41bc4ffb3777425b972851e3195236fcf190e90d4e5b2905ce3d10af4b7a2db909d388733f3269d93
 EBUILD rpcsvc-proto-1.3.ebuild 641 BLAKE2B 384f51cfdca049ba988fbed43765e64232a54d7c3341419a24a0e5df8723cdcb24f5adb4a2c744ef5666c1bba493b6b061bd1986fecd88390e2c83d5120c11ec SHA512 ca768b98578bf6c7b7c6127ac6ac9c33ba8c6c7a28672a9231a085ab78a02fc4745e3c54c54e5584c8903f1a922fcc7ab28b0a9ff8ba304d2fffbacd9ff9024a
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
index fc38a301cfa4..64d9fa1f58a5 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 DEPEND="elibc_glibc? ( sys-libs/glibc[rpc(-)] )"
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
index 414a3aa7a6a0..d2900ad6c89f 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-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"
 IUSE=""
 
 RDEPEND="!<sys-libs/glibc-2.26"