gentoo resync : 30.04.2018

24 files changed, 342 insertions, 333 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 60ba59746971..fbe9b9866798 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index 2519ca9207b4..a1524d366637 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1,4 +1,4 @@
 AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
 DIST electron-cash-3.1.3.tar.gz 1643903 BLAKE2B ff7c4f8d10b680c9fe3fcb949349cdbc84acb49939b33af2816f8154c3675241e3637bc326af9c2a662588571aeab37de86eb89a627e934b824114c3907a8158 SHA512 267f434ef09bea23b79a9ad8cb8e734a7e1ece7d17d2e2cc91496af3d0fcb035256ec3977c2fbeff4c7ac16193a0a185041fd526c46129fcea62bcdfe043a208
-EBUILD electron-cash-3.1.3.ebuild 3628 BLAKE2B 50933c6fca1827bf3e45c8a9217a6c70d140f6dff0f83b784e0ba0787f6756d10133e116d08441a14473ab00e090516533752299ff64c65b3a91c495a1bb98c8 SHA512 d3446435ae27a7ad2f72dafde7aced3de4cc29e998628912f03c89f77a9b717ab0e9880f892eb2609715eead959f886a2de0b395a783c85172260c97ad5730de
+EBUILD electron-cash-3.1.3.ebuild 3573 BLAKE2B ddc223792ea38b6f671fb2383aeb44cd29eddef18588aa46a686de3b76d0a8a9bd89f0de8adca5e5585a8bed5d09a408fa6998c96d5c826d40bf3a3af2b63590 SHA512 367b18d0e8e8a9e73922af342947cef9e8c330bf86330371c062c7b9e502b155a360e6b5fa7955cfab353b64e7b7d8d45ff69bd30a803502cd152de1a4da2d85
 MISC metadata.xml 976 BLAKE2B 991083b0233c11e6e5bbb3d7d560b20587332344fca7d3fad40cde8bc4bce1f3455172b7131451e034d0ab9722913667eb9739fe1bbd214354bf7cde974cecf6 SHA512 38383f6b7809ee97e33a777b5eab2593b22ce99d78442c40e9ff4654f350b6ad17da0c2e309b43fed517e2b384ab5f806a5ef60a71f887d72a4dcf06c9bbdede
diff --git a/net-misc/electron-cash/electron-cash-3.1.3.ebuild b/net-misc/electron-cash/electron-cash-3.1.3.ebuild
index bdee3e7c9c5a..cf6422809dd7 100644
--- a/net-misc/electron-cash/electron-cash-3.1.3.ebuild
+++ b/net-misc/electron-cash/electron-cash-3.1.3.ebuild
@@ -41,10 +41,7 @@ RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
diff --git a/net-misc/electrum-ltc/Manifest b/net-misc/electrum-ltc/Manifest
index 6724e406ad20..9b01b63b35b4 100644
--- a/net-misc/electrum-ltc/Manifest
+++ b/net-misc/electrum-ltc/Manifest
@@ -1,4 +1,4 @@
 AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
 DIST electrum-ltc-3.0.6.2.tar.gz 2387515 BLAKE2B 3093aad114dd96d0a0ecac48adfe45c9b7be37d831f67fd8a230617bb45131b5045e70433c0ed0fe87a3028356de3884e78c3eb2c1bda38e5804e97952dcd13f SHA512 c9de8f490eddbf269fb5a034fc4bf5712173a09df8fe4ea01dafe516cd1b684dce253278c4c4128e4284c89bd7f8fbd51e0633710abbb22720b53507ecbd102c
-EBUILD electrum-ltc-3.0.6.2.ebuild 3646 BLAKE2B f625bd03c5699768527b9187e7c54de38b1f14fc3622dbb1b43944928eac414e951e6c6c77d7502fab7bf995365ab66f7eec1a7a6852642590c007a65eeebf2c SHA512 7279621ac1fa24dad08b496d968ed5b0b865e29717467048dffb76ef7c2f960cb4fe5abf2473f5d31445abcde97c7a9566747e4af7e52629f78ac05f7648372f
+EBUILD electrum-ltc-3.0.6.2.ebuild 3591 BLAKE2B 9920de9c5005faf651c79f78b0492b8c2c1973e310c88e0e8232fead6bc4439b8012acd2d3c2653d6d3556302da65ed1f6c054f8b9be5003e2c1b1f4961c87a2 SHA512 eaf2e8b680bf7a067f594bbe790b409245c421db6e92e04893d9f8e709721b27f667961c6ea354a98ebc9aed4fc637b34178775743d8905ab664b52929589bf3
 MISC metadata.xml 893 BLAKE2B 285448da111f6431d8fb440fcf040ee2e22a5fb1fdc8b4b93c75ea2165f6d53a7a7b746add11300c06bc43a3243e423ea57aaa4186dc0dbb91ff8d734216c6c5 SHA512 7881df99b246a3f323270790c2d3c789aa402810418662ef35590d03ea5d82f3877ab465b66e2fe52c4be268ea5965735f5de513ea8d41f260a63a40f3dd3dd9
diff --git a/net-misc/electrum-ltc/electrum-ltc-3.0.6.2.ebuild b/net-misc/electrum-ltc/electrum-ltc-3.0.6.2.ebuild
index 23ae29e955ec..02f697349d2d 100644
--- a/net-misc/electrum-ltc/electrum-ltc-3.0.6.2.ebuild
+++ b/net-misc/electrum-ltc/electrum-ltc-3.0.6.2.ebuild
@@ -42,10 +42,7 @@ RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 36eee689edac..5ea3a85616f7 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -7,8 +7,8 @@ DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df
 DIST Electrum-3.0.6.tar.gz 2640475 BLAKE2B 2e10417fb59629b9e3af8ba10893fb85b3b0d0ed9f7d7226a58dc7a2f91ed682423168092101565b00824bc62cae60d878de0d78271b716c027c8616419037a8 SHA512 4df9d81d954a008c3a14a89a7191b8af94393701b55651ad19acc75addb70fea942876a45c545c89b290cbdd7adb41b2d36e3cbcf73449eaa5d0a39e1529b2ef
 DIST Electrum-3.1.1.tar.gz 2722902 BLAKE2B 31628d18a26f552469454c4f2712eee1aaba6ff5114a7cf0b7f261def5ed5731a267ae369ec3460c7f9bb5ad2b1713b2b464ef05fadb5e0e9ffd563adeee0ce8 SHA512 d7f987dde4a4fe5b2b0e576328c20b56ca650047321ac101dc6c3edd5bcbeedd569870d951262583a5ef1d1e40d6107ac46aa4fe031cc63d3a759d332db056cb
 DIST Electrum-3.1.2.tar.gz 2800714 BLAKE2B 0932932125f1fd7099c090806c669a998c00a70a8f34b20d0afe4b1f6c5c24ced8743a60923e466c3507d29c75ac58e2e3e01b422701be76bbcd8abf54497276 SHA512 e4e6d674817bacefaf9c64acfdf16c4c215264e825dd8b1bcf1d99429963b0da18d442b966ba986cf0ad2d621543c3e0e68e8ba023cca23b6626781c2e69a61e
-EBUILD electrum-3.0.5.ebuild 4313 BLAKE2B 21a41f162be364235d5f4c57c0d55dc9c32df268877048d97985bdd565d3711708f503e59bdf6d38a5cdedbdd191c7c6e0cfeb5a89613155e770de84d3d92d0c SHA512 6ec934d1438b9853e05a7f011d672f02e6542176496c9f5965a188d20dfda409577abfcfef00cbf46bb95b9aeeece89fc9982de0508135d8b4891ca97e0aa7ad
-EBUILD electrum-3.0.6.ebuild 4280 BLAKE2B 994a3247356194c4cd81260c9c18768eb4401666ecaaafea617d4cace28607648ea1dc613b38b0c377d3c4e73087eb61144b9de24f4e7f515410178b08a243b9 SHA512 c4858d54e9acc243291a534af582da363dceed332ee719aa5167651ef21f5b2e9ddd13f23749b6608be1d2cb0df0233b8f1a6836eeacc2d6430c8209e359c9ec
-EBUILD electrum-3.1.1.ebuild 4321 BLAKE2B f1c45a4501ed148c2019ee94b6778886042158f02b021ae1958bc984ac133923c1c6f83ddd5392196df13180efad47364e876f9dcd1b96b1469c8068d27c868f SHA512 0105d9b8197e5597cb9861d673ca373aa450cd3fb80d4e471ff581e5f4e496e8ad754de54dc386a8c23c3c848e55d9715eeedbe8402d811eb99a127dbd2a0d16
-EBUILD electrum-3.1.2.ebuild 4363 BLAKE2B ab576cb5577e82e19a3d1cf78b010e3b6b90ebc6d6342527106700e53e18585413a8e2bedf6f188b2dfdfb7e318482e3f6ffbf6bf3c015993830b827605b305e SHA512 90e9be07d4a7ff40cf1a3df5b7a0fdf4547cbd0b42a2efb506e08581427beeeb21e1a18385f9a2a2d60e0adb0301161e302d5dc5709bfb8d18e0bbb4a091d45d
+EBUILD electrum-3.0.5.ebuild 4258 BLAKE2B c17c9fcdfec66850c979f0b35e8544cca75cb812052c6b437f432a5fb0dd102545c0082e2bbf210171fb379e89bc4f8ba1644a9d0687055c1f14ef272722912a SHA512 e8e97edc343ef92ff8f54c965fe1e9c1cb9428292425c67e591721c0d8d1d685c3cd144a31f96f3c24161d93dd82209f97643a9909bdf5b9b896eff9055ccb0f
+EBUILD electrum-3.0.6.ebuild 4225 BLAKE2B 845f9b71a1b9288b32110658f9d0aed5c841fbde6c3a1f7814a0f87130cb5bde5b8a7982a3dbe814d4901faa7ac92205fbed5e73b4102359841fa1bfa48a5d8f SHA512 488fce80e3ef95a47cc9198dd3c3df263757536a2adec499a33c6836ef391f8c0e9650e7445ac6572be26c9de1db00b8bb541884749a30e72c340068e319f1d0
+EBUILD electrum-3.1.1.ebuild 4266 BLAKE2B f2215c3d8fa7380a11d2afaac31c4c732363a6292f632cad6a4a2a0d7c62cf0e4a2c19925cb7e8c4a28ba01f63b51c684e5e672e701b922aeefb149e413626ef SHA512 dee404b782ec8bf6e67ea9a6ad18f1c84d34b1d2ec785b6e6f0324353ab34c08fcb42b9c25316fcc59960385b6a1f4b6f9ca74dd96f58f953785e8aba528c1a2
+EBUILD electrum-3.1.2.ebuild 4308 BLAKE2B 2c8bde9e2e8624a2a87881bc44197883ea9ae5e1a099452f24053ac753cfd34a66c5e44bd05d8dfa40c6337879754acee815101250aa980d59d9fe3c0b436e83 SHA512 602c93d714e71ac737ac3930f09fc0712026a4c1703923908c63531a1e2b5a52785fe7011ee814a1a715bfbc93efc836721a4ad893488ee4eb3b4dec5803b896
 MISC metadata.xml 1215 BLAKE2B b83eaefbc4e8ff18b6ecc097d9e7a84a0f810b97abe6d9bb0676ac728a0249daba58da27271e2c367365b7770e3e3302e55122ccbde8e5479b5a63f64b7103cd SHA512 227b4091ffbfa3160f44723ac043bb5c95a5a40598c300afe0fb112f64cfd84a110490c634f15e368216eb4459d89cf540adc6557e514932893b596bac3182c1
diff --git a/net-misc/electrum/electrum-3.0.5.ebuild b/net-misc/electrum/electrum-3.0.5.ebuild
index 63e1b139bf83..1f7968812019 100644
--- a/net-misc/electrum/electrum-3.0.5.ebuild
+++ b/net-misc/electrum/electrum-3.0.5.ebuild
@@ -58,10 +58,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
diff --git a/net-misc/electrum/electrum-3.0.6.ebuild b/net-misc/electrum/electrum-3.0.6.ebuild
index f6c1a77ec4bf..dc974d4c43aa 100644
--- a/net-misc/electrum/electrum-3.0.6.ebuild
+++ b/net-misc/electrum/electrum-3.0.6.ebuild
@@ -57,10 +57,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
diff --git a/net-misc/electrum/electrum-3.1.1.ebuild b/net-misc/electrum/electrum-3.1.1.ebuild
index 957704e0775f..ed1b46dc489d 100644
--- a/net-misc/electrum/electrum-3.1.1.ebuild
+++ b/net-misc/electrum/electrum-3.1.1.ebuild
@@ -57,10 +57,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
diff --git a/net-misc/electrum/electrum-3.1.2.ebuild b/net-misc/electrum/electrum-3.1.2.ebuild
index a336ee7a3d3f..b10060186b9b 100644
--- a/net-misc/electrum/electrum-3.1.2.ebuild
+++ b/net-misc/electrum/electrum-3.1.2.ebuild
@@ -57,10 +57,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 0ecad9ac8e11..b39e278d054f 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,7 +1,5 @@
 AUX networkmanager-openvpn-1.8.0-static-key.patch 1273 BLAKE2B 311b87ac48595b3276ce9c5651f813d13c4d39f7355903220a0d2149a52b6ed9e7c8c405a5aa0ef30aae5bd2c8b9f6c13211a68503dcd53ea3c981acdbf676d7 SHA512 2b91e6bdf0994ee276a201c277020e9dc12ef3e9d1f55e9d06d0eebb2599760a0810dc1f8a59e63d2b57c974f81b1dd55d12bfa243f81410d785f5516f91de18
 AUX networkmanager-openvpn-1.8.0-user_cert.patch 1037 BLAKE2B 4034034aa8c983d6a362f342fbb1639e9a691b2abee686ad916c888936eaad39c1bde0a6475a155a2f8d45cf3b34ddcfaa18850b9a93057b00bb4acfbd9be7f2 SHA512 86424821c47925492186a950bb16548a1d57745cb2ca462223d1944a71e8bb4cd330b88e8b60e60014a716505a1bcc80afae0aea2b2987a8e3b304c0064b8480
-DIST NetworkManager-openvpn-1.8.0.tar.xz 530112 BLAKE2B f26901d83ca22d3c3979ce61a558981c3e533a9376785014ecd99c932e9929dbc4b564d980785acb880ab027c2b98fe7fea242215122960025eba93ec423b58e SHA512 fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c
 DIST NetworkManager-openvpn-1.8.2.tar.xz 540912 BLAKE2B e972a1767fa8219aff2ecfb18c69d309f0147db16ff08db2fe50f9154defea2e805142ac38e77854902f430390f0909c692110a8bcb2e18cec27ce9661a1510c SHA512 c17f0de1d41df00b3359ab2dcce939574104b1272896bd403834b426c3fc3f177a5d2ea9cb5a1b98268f63095bc14c5904bd98c2fcf23481e78d8b8acb667927
-EBUILD networkmanager-openvpn-1.8.0-r1.ebuild 1442 BLAKE2B fe7fe98d03e869b1e1c643300c44bfa6514b6a2d487362477eed8204fe91c250f80e96822b8b487dfb0ee76c371c503723f51923f6e55acff4f39a288ebd5732 SHA512 7b769a310afa02e0a4aed20d3ff43fff4e67c452ecf325dfd0a25ad938c6d4e9f1e5d8873a150c66d0277aa88b5018a9c15307ab43095302a8e98781f7a89f20
 EBUILD networkmanager-openvpn-1.8.2.ebuild 1239 BLAKE2B 5fabaf60af8232a3505af4453bf9f5dc38a764497ce79925df896803c4bd5ae4d0921232eee01af83c383d3f7aa590c20912fa01e25bbe38b794e957eb1b9779 SHA512 204909799d3d9df3b9e14de9797ecc20e95c9cf9d3290c0479450a6a87ec90793a94c05925ba75019a7ed02819033d67463f5d86c1adcdcaad904e5f06a9fb3d
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild
deleted file mode 100644
index 5674bfcef671..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-1.7.0:=
-	>=net-vpn/openvpn-2.1
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.7.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	enewgroup nm-openvpn
-	enewuser nm-openvpn -1 -1 -1 nm-openvpn
-}
-
-PATCHES=(
-	# Fix unusable config imports (from 'master')
-	"${FILESDIR}/${PN}-1.8.0-user_cert.patch"
-
-	# Fix validation of static-key in GUI (from 'master')
-	"${FILESDIR}/${PN}-1.8.0-static-key.patch"
-)
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index bd5028ef7ba7..1f20971f8886 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -4,12 +4,14 @@ AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117
 AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
 DIST NetworkManager-1.10.0.tar.xz 3884396 BLAKE2B 62f6ce759188fe1c4337922d4c23145da5029ed6fa70eae1de122bd4ce00209b0f7a0d1fdf0b65083baa9a9b304471a6ec79de63ea8e79779f2e27c1cec26e19 SHA512 f1c479396fe50faaca9dfd90b165ec3158148a2fb5a2d7a71cd8d573597566520610d572d6a8ec2b1d27ac2e5409a2ba899f46f9f38c114c5b90f0431e370958
 DIST NetworkManager-1.10.2.tar.xz 3937636 BLAKE2B b99a115233e6f2761fc042b8b9599db096edea7c35894beed1663013d3845212028f436d92e088c086e0e31941013ad4e75b5601fac0c9db9264ebfa04c53382 SHA512 bc372b334120bc62ce4d9f78baf9f46a880fe6fa24181bcefe71eb1c67868c32edb4c5b323e63aa720284b13189a0704e0b3d13a2c6e6a9be72e5bfb6bca9072
+DIST NetworkManager-1.10.6.tar.xz 4029656 BLAKE2B 0fa99dbb54c3f51755329f229f941e408d883aeff24bbcf0f9df143544190ab59ed5742caca42ea7cced949de0891ecc148394fbff1b9cd87b26c3a84f2a728e SHA512 8406ed561efff13b63dc218babdd2ad9e2816bcc829ba3ef2ce942bb5fa027640de28660381203016fa9cddb61412d3cd5102b7cbd29d0e284b5cb8d13dd8610
 DIST NetworkManager-1.4.4.tar.xz 3762664 BLAKE2B 430f5a15540c43d067c27927b627ecb1c7935f42566e9b14b82b6f70cf7dae3ed7398bb45647911e91d8ce14558b1eccc0f6ffa97eae852dd524219dcc536a90 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14
 DIST NetworkManager-1.8.0.tar.xz 3811100 BLAKE2B ad8026891ed0f29e80d217d0cbc7965bdc67065462e88068cc6f8cd989ddbcec7095b5d98eab85d8e6fba4f5af5485b2ec0feecafcb6d8324c3ee3c257a0dd64 SHA512 1f261a9bbba1013ec7ac88672f2ebdfdb9447874eb711ccfa7383534f003f37aabbcddb51aa868e14cec1d76c33d33a99d681a3858ea6239112fe6fce81a9c6c
 DIST NetworkManager-1.8.2.tar.xz 3818844 BLAKE2B 97929ae1d071b3e88dbacf9bd1131840066edb031df2e2fe7e15ef5029029d0029efff8836df3f2cf857e95728bfd8f77f6a81cadf45ae8c76a986aba1649709 SHA512 7bebea66d8f494c052313224e9d5b1b4cf665482f07ee5d93defc3543f32296545a2d1097ab1fff27dbebb58e07a4bc47fbc0101163db92953ae66ac9b95524d
 DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1
 EBUILD networkmanager-1.10.0.ebuild 10709 BLAKE2B fc7e5d74d6b916ab8018f1a7f3ca773d85a4bcf95daa052e1b30326a9f7bf13922ec17883422d0a771002e1d53ddfe3c4a2d072f48c5f4baa1cfb35c61fb9422 SHA512 c04f31d5cac1c6dd094d0bd043d70cd195322e0fd1acf749c9b2f9d0fbafca185cee0289c93078454d10a3e396613e8b3c28cf8b60f3afbe02b2ca9fd42c128a
 EBUILD networkmanager-1.10.2.ebuild 10709 BLAKE2B fc7e5d74d6b916ab8018f1a7f3ca773d85a4bcf95daa052e1b30326a9f7bf13922ec17883422d0a771002e1d53ddfe3c4a2d072f48c5f4baa1cfb35c61fb9422 SHA512 c04f31d5cac1c6dd094d0bd043d70cd195322e0fd1acf749c9b2f9d0fbafca185cee0289c93078454d10a3e396613e8b3c28cf8b60f3afbe02b2ca9fd42c128a
+EBUILD networkmanager-1.10.6.ebuild 10772 BLAKE2B 04abf058760e6a89a215de2e01e371f85c5a3fae221b79f3c2e1663f0cc9254c0fca3704094eb756cf2ab244e254392aa87bb21cd2ae087ae9999a3e443ccd6b SHA512 8950a84fe560747c914f7e2597860885d08c25a1ac3fe27a65507beb3ffb80889a98d6bb40342f8e68b02161af8b271a2543c8cea16f26b86611f33934d7c91d
 EBUILD networkmanager-1.4.4-r1.ebuild 11420 BLAKE2B 2245516cc7f356c194032729459a96c68e684fd1d3e3f78230424dff74648c29a75225d80376793544d15b9e450d7266a5e3457756fb0db9134981ba2d3c29c3 SHA512 35e42a8b58ebbf86980c15807c010246a2e7b90ae537a039c481266393bc1975ce2f7576dfb8bebd65fed2eb090d053bb8accdc09732549ff586b0ac1a04a956
 EBUILD networkmanager-1.8.0.ebuild 10634 BLAKE2B 5ebd3854eb79ae1e7bdc754584f50c86fac6c93b53cc5a083ed456b4d0f01f11e25ddbcd431cafcddb9842f3bb21a0826941e3db572c19df7303b436ff28da1b SHA512 540491cac8d661c19e36b425261b4c595045577f3194cac666e5d2aa7d8dfff09500ceb84f87532a2570637243412ec7f4240545e7180c3415e487e19618455d
 EBUILD networkmanager-1.8.2.ebuild 10688 BLAKE2B 30ce707b2fde2280d021e76cdebf5e453c32a9490463877a8012cbc2bf65e7e2c3611eca110be09ecd8a0a199a8a876e18ec39366e216c44629a1fba4280095d SHA512 373537eb5ec7a6f002f4ba46d87a8e0b774700622a9155bd0eb5e712b65a98ab8f514c4f820abf8dce245677af53d203d7290afb8b8d25fdc8fecdb02e9d281e
diff --git a/net-misc/networkmanager/networkmanager-1.10.6.ebuild b/net-misc/networkmanager/networkmanager-1.10.6.ebuild
new file mode 100644
index 000000000000..3d3830010e12
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.10.6.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
+	user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( nss gnutls )
+	?? ( consolekit elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( dev-libs/jansson[${MULTILIB_USEDEP}] )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		linux-info_pkg_setup
+	fi
+	enewgroup plugdev
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--disable-lto
+		--disable-config-plugin-ibft
+		# ifnet plugin always disabled until someone volunteers to actively
+		# maintain and fix it
+		--disable-ifnet
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
+		# still not ready for removing that lib
+		--with-libnm-glib
+		--with-nmcli=yes
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		$(multilib_native_enable concheck)
+		--with-crypto=$(usex nss nss gnutls)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	if multilib_is_native_abi && use policykit; then
+		myconf+=( --enable-polkit=yes )
+	else
+		myconf+=( --enable-polkit=disabled )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+			libnm-util/libnm-util.la
+			libnm-glib/libnm-glib.la
+			libnm-glib/libnm-glib-vpn.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libdeprecatedHEADERS
+			install-libnm_glib_libnmvpnHEADERS
+			install-libnm_glib_libnmincludeHEADERS
+			install-libnm_util_libnm_util_includeHEADERS
+			install-libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmvpnHEADERS
+			install-nodist_libnm_util_libnm_util_includeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	# Empty
+	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}
diff --git a/net-misc/pavuk/Manifest b/net-misc/pavuk/Manifest
deleted file mode 100644
index f181589ab862..000000000000
--- a/net-misc/pavuk/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch 937 BLAKE2B a06f7e8dbe69bd59ab6e125098282923d37497cf15a5afb796a8cb744817a8fa1fc432140d5701d638c6b7d82c2b5d49fa911f9cf41989b2ba739161878c5c88 SHA512 45a12440d9ad8ee19418d8ef3d0a8cc37bfa118e81ba1d063eef5e4417ba04f8d78bb7bfdb2fddac59d8bc15495af1728c2470ed6ee21d54140d1f82441b333f
-AUX pavuk-0.9.36_pre20120215-fix-underlinking.patch 409 BLAKE2B b89949ab4d8e57ab6e79615cd014ee76c3f3b0654ef764041e380ff1af18038e097ae2f94907c43bdbfd6393eadbdc7b58eb997611014e48ff9ff25a6e69f24c SHA512 c45c7bdc1d9bf87be53438b90e4e7d418b4864fdde80c8a4b2e3f8d6f39d1f5680d327163dbed4007bc44288fe23fee56edd1d99170812380580a301991bf66e
-AUX pavuk-0.9.36_pre20120215-pcre-fix.patch 427 BLAKE2B 11a7c0b102aa0d562a3251f812d78327e51c9b9cec67670613c008ae3052ef8d9e5d712cb2861b79e03d9dc730544f950733f2771f22d440cc956e0dbb7db3dc SHA512 786d001779e47b98c01232a885b3eb9c9e85817008647cd7038f0797d87b931489e6f4e7d1526ac6f48da8dc0c77a3a261936ec2a32dbffb2ab5b69b33943a11
-AUX pavuk-0.9.36_pre20120215-tl_selectr-overflow-fix.patch 437 BLAKE2B 7985614bfff0579ae35d576f51de4a3e9df26b87bebdeebfc5d3eedcd50fad718927d9e3340e2c67d5cc1fbc471c461f81780b8f9bbba04a75ec67262666560b SHA512 117979bf90e5a1ad880918a2707a478381c5197b830f3d944d0c3c4b04a827600aba360b653ebd2c5c1a8d41eb24642dfb36abb6000cf6160c2522b307756183
-DIST pavuk-0.9.36_pre20120215.tar.xz 810516 BLAKE2B 742f1afd299f6b1ab9c77a32da7fba937557a95d644b29d914b9e0851bf9ed700cdf42b614371f30f30e2e56c68e2550d64cff3f8035604bac7a44ec96d2ee88 SHA512 d7393abb72e328d3c3e8c005282a8b0ec793eee94e5de00c4518aa1a27403da535372679cf3b803a574e6d0dea8c53ccdbb3aa68d9f0c85da5128dba86b65a4f
-EBUILD pavuk-0.9.36_pre20120215-r2.ebuild 2860 BLAKE2B 4aa41d06d33ebcbe74a38f97d333c29afd166560b95a94b7c76248df86b3d89e8decaf2a3c3a98ffd03df6be434ff3380f5f652e6fc6af785b5f81ce24d97b2a SHA512 4ee860d42309a4e78a0c6f4a041a4aadfb4d74023cce0f4e6a62bf83d0ba1df476ee998251e84f33d17826c1d2662a7c4abf20351fde9e5856e74a150283d166
-MISC metadata.xml 368 BLAKE2B 31e81772cae543c1e54e81fd27812b10943d4f2d71a4e9899c996fd378adb9e6e764e0cd7f107d691658aced10caf49b43c1f2e34cc9ff4e4d21ef96a7259d9c SHA512 04f9e9750641c5c70c1e0aea59a690dd353156b2cccbc3452e50ef46a185369a89ec6f24a09b2a64576f253c172048ae21cb255f0c7daee279307b0260adf778
diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch
deleted file mode 100644
index 6ce18c1ed3e2..000000000000
--- a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/gtkmulticol.c	2009-01-21 16:37:39.000000000 +0800
-+++ src/gtkmulticol.c	2012-02-21 09:47:21.680512626 +0800
-@@ -45,9 +45,9 @@
- static void gtk_multicol_size_request(GtkWidget *widget, GtkRequisition *requisition);
- static void gtk_multicol_size_allocate(GtkWidget *widget, GtkAllocation *allocation);
- 
--guint gtk_multicol_get_type(void)
-+GType gtk_multicol_get_type(void)
- {
--    static guint multicol_type = 0;
-+    static GType multicol_type = 0;
- 
-     if (!multicol_type)
-     {
-
---- src/gtkmulticol.h	2009-01-21 16:37:40.000000000 +0800
-+++ src/gtkmulticol.h	2012-02-21 09:47:42.880514545 +0800
-@@ -41,7 +41,7 @@
-     GtkBoxClass parent_class;
- };
- 
--guint gtk_multicol_get_type(void);
-+GType gtk_multicol_get_type(void);
- GtkWidget *gtk_multicol_new(gint nrows);
- void gtk_multicol_set_number_of_rows(GtkMultiCol *multicol, gint nrows);
- void gtk_multicol_set_spacing(GtkMultiCol *multicol, gint hspacing, gint vspacing);
diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch
deleted file mode 100644
index 25338460bd4c..000000000000
--- a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in~	2011-03-02 10:44:45.000000000 +0800
-+++ configure.in	2012-02-23 09:55:28.073709216 +0800
-@@ -1749,6 +1749,7 @@
- 
-     if test -n "$GTK_LIBS" ; then
-       if test -n "$GTK_LIBS"; then
-+        AX_ADD_OPTION([LIBS], [$X_LIBS])
-         AX_ADD_OPTION([LIBS], [$GTK_LIBS])
-         AX_ADD_OPTION([CPPFLAGS], [$GTK_CFLAGS])
-         AC_DEFINE_UNQUOTED(GTK_FACE, [$GTK_VERSION], [with GTK+ GUI])
diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-pcre-fix.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-pcre-fix.patch
deleted file mode 100644
index 3d92fdd4b8b6..000000000000
--- a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-pcre-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/re.c~	2009-01-21 16:37:40.000000000 +0800
-+++ src/re.c	2012-02-18 13:46:30.986959223 +0800
-@@ -193,8 +193,7 @@ int re_subexpr_info(re_entry *ree, int *
-     {
-         if (nr)
-         {
--            pcre_fullinfo(ree->preg, ree->preg_extra, PCRE_INFO_CAPTURECOUNT, &pmatch_nr);
--            *nr = pmatch_nr;
-+            pcre_fullinfo(ree->preg, ree->preg_extra, PCRE_INFO_CAPTURECOUNT, nr);
-         }
-     }
- #endif
diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-tl_selectr-overflow-fix.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-tl_selectr-overflow-fix.patch
deleted file mode 100644
index ec3655f1468c..000000000000
--- a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-tl_selectr-overflow-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/absio.orig.c b/src/absio.c
-index 7be9255..e19d7cd 100644
---- a/src/absio.orig.c
-+++ b/src/absio.c
-@@ -181,7 +181,7 @@ int tl_selectr(int sock, long int timeout)
-             {
-                 if ((rv == 0) && !cfg.stop && !cfg.rbreak && !FD_ISSET(sock, &readfds))
-                 {
--                    char buf[32];
-+                    char buf[64];
-                     int r;
-                     char buf2[64];
- 
diff --git a/net-misc/pavuk/metadata.xml b/net-misc/pavuk/metadata.xml
deleted file mode 100644
index 5dd8ba44d773..000000000000
--- a/net-misc/pavuk/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="hammer">Turn on chunky/hammer mode (DoS) in pavuk: when
-	specified, pavuk will include features to stress test web sites using an
-	ultrahigh performancereplay mechanism</flag>
-</use>
-</pkgmetadata>
diff --git a/net-misc/pavuk/pavuk-0.9.36_pre20120215-r2.ebuild b/net-misc/pavuk/pavuk-0.9.36_pre20120215-r2.ebuild
deleted file mode 100644
index 8f3d5cb6b587..000000000000
--- a/net-misc/pavuk/pavuk-0.9.36_pre20120215-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-S="${WORKDIR}/${PN}"
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils
-
-DESCRIPTION="Web spider and website mirroring tool"
-HOMEPAGE="http://www.pavuk.org/"
-SRC_URI="https://dev.gentoo.org/~pacho/maintainer-needed/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug gtk hammer ipv6 nls pcre profile ssl"
-
-RDEPEND="virtual/libintl:=
-	gtk? ( x11-libs/gtk+:2 )
-	pcre? ( dev-libs/libpcre:= )
-	ssl? ( dev-libs/openssl:= )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	sys-devel/gettext"
-
-PATCHES=(
-	# Fixes a bug in re.c for PCRE support
-	"${FILESDIR}/${P}-pcre-fix.patch"
-
-	# Fixes underlinking, bug #405337
-	"${FILESDIR}/${P}-fix-underlinking.patch"
-
-	# Fixes a segfault in the GTK+2 interface on amd64, bug #262504#c40
-	"${FILESDIR}/${P}-fix-gtkmulticol-segfault.patch"
-
-	# Fixed overflow, bug #450990
-	"${FILESDIR}/${P}-tl_selectr-overflow-fix.patch"
-)
-
-DOCS=( README CREDITS NEWS AUTHORS BUGS TODO MAILINGLIST wget-pavuk.HOWTO
-		ChangeLog wget-pavuk.HOWTO pavuk_authinfo.sample pavukrc.sample	)
-
-src_prepare() {
-	# Fixes a bug in Makefile.am that causes aclocal to fail
-	sed -i 's/^\(ACLOCAL_AMFLAGS[[:space:]]*=[[:space:]]*-I[[:space:]]*\)\$(top_srcdir)\//\1/' "${S}/Makefile.am" || die
-
-	# Fixes a bug in configure.in that breaks non-debug builds
-	sed -i 's/\([[:space:]]C\(PP\)*FLAGS=`\)/true; # \1/' "${S}/configure.in" || die
-
-	# Fix for building with ~dev-lang/spidermonkey-1.8.5
-	# sed -i 's/mozjs/mozjs185/g' "${S}/configure.in" || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local regex="auto"
-	use pcre && regex="pcre"
-
-	local myeconfargs=(
-			--enable-threads
-			--enable-socks
-			--enable-utf-8
-			--disable-js
-			"--with-regex=${regex}"
-			$(use_enable gtk)
-			$(use_enable gtk gtk2)
-			$(use_enable gtk gnome)
-			$(use_with gtk x)
-			$(use_enable debug debugging)
-			$(use_enable debug debug-build)
-			# $(use_enable debug debug-features)
-			$(use_enable ssl)
-			$(use_enable nls)
-			$(use_enable ipv6)
-			# $(use_enable javascript js)
-			$(use_enable profile profiling)
-	)
-
-	# JavaScript bindings: Broken!
-	# ============================
-	# Currently could pass configure phase with ~dev-lang/spidermonkey-1.8.5
-	# yet apparently incompatible with recent versions of spidermonkey
-
-	# if use javascript; then
-	# 	local jspkg='mozjs185'
-	# 	local jsinclude=$(pkg-config --cflags "$jspkg")
-	# 	local jslibs='/dev/null '$(pkg-config --libs-only-l "$jspkg")
-	# 	myeconfargs+=(
-	# 			"--with-js-include=${jsinclude}"
-	# 			"--with-js-libraries=${jslibs}"
-	# 			)
-	# fi
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	if use gtk; then
-		newicon src/pavuk_logo.xpm pavuk.xpm
-		domenu pavuk.desktop
-	fi
-
-	doman "${S}/doc/pavuk.1"
-
-	autotools-utils_src_install
-}
diff --git a/net-misc/yangcli-pro/Manifest b/net-misc/yangcli-pro/Manifest
deleted file mode 100644
index 8097c4905abb..000000000000
--- a/net-misc/yangcli-pro/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yangcli-pro-16.10-8.deb8.amd64.deb 1406108 SHA256 4c69d5fd9c99272a8bb1074cdf3bc9de616866bb078546c214df86eefaa8bc10 SHA512 23db68a22d83a95638f1c155126118290fba38fd1bca524d29c75f227a14b15f20982c47b598c235b4e78e905090c17b242a27d59350cbcd9b4179da070d74c6 WHIRLPOOL a941936193e07f450a866692c5c153f9d67e309728fdf4a47bb27f2ce0a67d5069facb286e2af99700ff5920861aa3275a2b8ccbbf9b812b3e424ea41317b037
-EBUILD yangcli-pro-16.10_p8.ebuild 1081 BLAKE2B 4ef29832875e2245a095b86d3402f74abc00a0d0a792c09c4cd1fd1a1757238b26957451279540366e9f89190e48153645cbf8e0dbe545a029bf579b368a218a SHA512 964b064f542b89997987460e9f6aadd1c5957debec88a3f050eb14c86af245406e224b71d7fad40520dd6ac766ebc5592b08efd956c037f2aa48ec9136812932
-MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/net-misc/yangcli-pro/metadata.xml b/net-misc/yangcli-pro/metadata.xml
deleted file mode 100644
index 5087760546f6..000000000000
--- a/net-misc/yangcli-pro/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/net-misc/yangcli-pro/yangcli-pro-16.10_p8.ebuild b/net-misc/yangcli-pro/yangcli-pro-16.10_p8.ebuild
deleted file mode 100644
index e4181608fce5..000000000000
--- a/net-misc/yangcli-pro/yangcli-pro-16.10_p8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit unpacker
-
-RESTRICT="bindist mirror strip"
-MY_PV=${PV/_p/-}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}
-
-DESCRIPTION="Network manager client that lets you test and manage NETCONF servers"
-HOMEPAGE="https://www.yumaworks.com/yangcli-pro/"
-SRC_URI="amd64? ( https://www.yumaworks.com/pub/${PN}/${MY_PV}/deb8/${MY_P}.deb8.amd64.deb )"
-
-LICENSE="yangcli-pro"
-SLOT="0"
-KEYWORDS="~amd64 -*"
-IUSE=""
-
-RDEPEND="net-libs/libssh2
-	 sys-libs/ncurses:5/5[tinfo]"
-
-src_install() {
-	dodoc usr/share/doc/yangcli-pro/changelog.gz
-	dodoc usr/share/doc/yumapro/*.pdf
-	dodoc usr/share/doc/yumapro/README
-	dobin usr/bin/yangcli-pro
-	dolib usr/lib/libyumapro_{ncx,mgr,ycli}.so{,.16.10}
-	doman usr/share/man/man1/yangcli-pro.1.gz
-	local my_module
-	for my_module in ietf/{RFC,DRAFT} netconfcentral yumaworks ; do
-		insinto /usr/share/yumapro/modules/${my_module}
-		doins usr/share/yumapro/modules/${my_module}/*.yang
-	done
-	insinto /etc/yumapro
-	doins etc/yumapro/yangcli-pro-sample.conf
-}