gentoo resync : 21.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-21 18:00:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-21 18:00:10 +0100
commit: 265dbe5dbc14c199299496c6db8fce3f76647015 (patch)
tree: ab18b5617d138f6684566b619405090989d55a2c /net-misc
parent: 586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff)
37 files changed, 1136 insertions, 403 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5d8fc4584242..24573c97d23c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index b06ae505d680..32e319b89c4d 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -7,9 +7,9 @@ AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae197
 AUX chronyd.service-r2 261 BLAKE2B ac29cdd2e717060b5af68608db8a7b3dd8aeb90225edc5b48ea84a8537017d531519a00fb394934c270eb965a615b0b53188bf8bd16edd645074b497ba91fa9e SHA512 671415208e123628e123575d708dbe4ed7946bc45832dce506d539cc747e84ae63783b53398e96a60d815f1758fe44836f34d804e28859538cf560715474dffe
 DIST chrony-3.1.tar.gz 424109 BLAKE2B eb6bc13905a05eab15b00919577cceb4c8c881b4881fbd0e19d966dca86ed6973c31618b1ae56b59cad989144bf59a0206328d50d9eb436fdb058684e74a1661 SHA512 4ba3a75c3634050bb63ba9ee80d9be7a295f44ce4d195a050e4be4738bd7dd807fe37f2289d7ead4a75272bd5ebadbd03c233c67f859e9b68871fca5a6671427
 DIST chrony-3.3.tar.gz 443571 BLAKE2B cc35f55b8d63eed85495f88b71c9285c68867a28b27c6c5e7d4475a77857ce4a09fbe561906757d66fee13b19d9ee750d41518050048776b2c0ef600407632e9 SHA512 36975d863599141e8e5b071d35cf67326b27f5b0da7ec942dbb4530377d10472b0729eea632e0702718b515cb2d5fd41a7eba158e6dade7f05adfb1bdffa5df0
-DIST chrony-3.4-pre1.tar.gz 451934 BLAKE2B 4cd5aaeacb3bed5cc3c9b79d9fe5f02b79f6e2a9f7eb6be6f159e257c9780ce3b77d379633e9136cea8d4ffbb1f024e71c8e3bddbaab9b4a126cba30be4f4b23 SHA512 b45c2f94060ee4f5917d49420a726c412231cb8c3fdc4475465daee6d24d809ae6cb146332e88c975d58f969de357d1b9e2fb3a1c66e35f988f6c8828b39f9a3
+DIST chrony-3.4.tar.gz 453056 BLAKE2B 088eb18bfc9ae4a7a3d656dfabddc565bc4a0da995c172183bed12bc5df59e87ab7363ba64e3579cdb414da77bd7f1fe05b66e33474282df57daf1fd8a55e182 SHA512 4fbb0311c8d363a87edd6f5d1be3d8554da169f260ba23c1ad9e8c567808258c6fd7513ba630d6fa27453ecfd81f0ece0e26d5ee2f98ca47fbc9887181a36918
 EBUILD chrony-3.1.ebuild 2825 BLAKE2B c3af56079c3130002499dda974bb5117a2cce988f8a1aaca7cb6f9f11a0aa011fefe3f600262939b72b4f41d7e096a94dd1305572a04aabe96519cff36ec0165 SHA512 f97265a0a7006c1f8fc07f4a25f27ff0f78b123fdeabe2329a0e48ba33409e16a8373d6c114c2d25f463f560b47e8ef5510c140e5e045a02ccfd4eb669f463b3
 EBUILD chrony-3.3.ebuild 2909 BLAKE2B 2d314e96402839948b95e9f8650e8523676f201deab27230ac9d006a0a73c878239c23c7118d0698bec9d7c2796b3a08be9cfa695c21b84ee333c23161d963ad SHA512 0ef1db3668f626dc07057728f7d33d9a200f1e4fcb93e6fb3b69e874b8d5d0e3bbb2d57c21513d7825151b08b0a86a36ef1838c44f27e536aa7abd5b9e973cdf
-EBUILD chrony-3.4_pre1-r2.ebuild 2913 BLAKE2B 407081e189b5664f6899671ae75d28e544aa5bff61e4a510083f45155d06a82ca6c1589284bf73018fdfd79d0cd411456231519eb802de68a1b2bc1e42893ca3 SHA512 7502287f4b9a2e5f9d006dfdf744756b66abd4f920a4214ac2ab4183b7bab3b4427babf16eda204857b839f79cd7d7aa6ed223e8c7de2c21975e9629d722c757
+EBUILD chrony-3.4.ebuild 2913 BLAKE2B 407081e189b5664f6899671ae75d28e544aa5bff61e4a510083f45155d06a82ca6c1589284bf73018fdfd79d0cd411456231519eb802de68a1b2bc1e42893ca3 SHA512 7502287f4b9a2e5f9d006dfdf744756b66abd4f920a4214ac2ab4183b7bab3b4427babf16eda204857b839f79cd7d7aa6ed223e8c7de2c21975e9629d722c757
 EBUILD chrony-9999.ebuild 2800 BLAKE2B 39990629d85aab317f84e1e083e3b94b28c27834116108d509c213f297ca4e2d1b1d87b7d7ccf75206004b5813c1f6d3b50b33b4fa9bd50f04f485865465f7c8 SHA512 b8120434e2646b91727b63560f5002ea7c97696f780eeb02a91c97ee1de053a093eb3009b8721c139ab20ff15dce857e7d4af00fd51ac9aa3624b5282dadd386
 MISC metadata.xml 1566 BLAKE2B 94f800f032197823ff746e93dcb8955a273a0712add991415852d5192c09b465aad40aca121f959442b83fd225becacb063f4ac28b8a7bd035ca65aab2ed3ecb SHA512 bc9d33fa4f146feb7b934ffa6cf8e4d235316f23b9e08dbd6bf6d071496508a9c1dfbed2fca686244360ef848acdeec0d3b96992601aeb669c30482f9ca5ee84
diff --git a/net-misc/chrony/chrony-3.4_pre1-r2.ebuild b/net-misc/chrony/chrony-3.4.ebuild
index 2b17b91c999e..2b17b91c999e 100644
--- a/net-misc/chrony/chrony-3.4_pre1-r2.ebuild
+++ b/net-misc/chrony/chrony-3.4.ebuild
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index edc1795c7ad0..4245988018bd 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -1,5 +1,7 @@
 DIST cni-plugins-0.7.1.tar.gz 862546 BLAKE2B 9d13c616396017e3cb54dfdd5bde2c06d2ad572e55009b883d82757c173119694a40157f28fce5818bb8bd33325f2edb0ec197ff77aa2ab08615bfc55ce2bbe8 SHA512 23d3b35c22fdc85d087922fb59c63622a9283ff11d34d1a1043c323f9b07b3837418f333d2f2ab9c6a22514351d71aeeab6a57234b14f53ba29847cffa382ea0
 DIST cni-plugins-0.7.2.tar.gz 862552 BLAKE2B 6dfa8842fb86a50610d1d4b512a0d6199ac8c4981dfe609b0be544e1a37b696f15dec2431b6030a4238926685a5f0153840345093e34b1efe218c58a410dd9d5 SHA512 d73a0ffb8e5977781a3f9fa93c1615633f74dfbcfeb78eb4c877992ed30d62b782714620667f14b133348d3c253df3e4219dc7ed5f353c7ec6df6c11c25905dd
+DIST cni-plugins-0.7.3.tar.gz 863596 BLAKE2B 8a4eda2b4ac9b6f53fda5a83cdeab4da862f5e48ddc9ae7c08f8ffa4c65c600543fcb968fa42182051a21a7233ea4e3a613aa6ff60d0e971284703de634e90d0 SHA512 d5c9744de2075270dd2a3e87ddf183c12e9f77b2d9df954d266105285042475b2f1f068f0024671f855c3aecc1269e49d6a146dd2f7647df0208aa8a9ec5195f
 EBUILD cni-plugins-0.7.1.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
 EBUILD cni-plugins-0.7.2.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
+EBUILD cni-plugins-0.7.3.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
 MISC metadata.xml 347 BLAKE2B 3028c057ca5c58bc39b10c01e9989088f0a2498a5a95a1ada88517dffe62daba52c8e6ead2fc8a7245ae06a95ffbc9306de03eecc82464ae0a6d2fbb4cdfb99b SHA512 b977f4287446648ff730c36e71002f524ae9a96c3fb104ee8542da90f6f996926a9b9809007f285e930d79842d9663cf4e462e8ee50da8319dcd3e07cf6dee05
diff --git a/net-misc/cni-plugins/cni-plugins-0.7.3.ebuild b/net-misc/cni-plugins/cni-plugins-0.7.3.ebuild
new file mode 100644
index 000000000000..b07a467bf91d
--- /dev/null
+++ b/net-misc/cni-plugins/cni-plugins-0.7.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="Standard networking plugins for container networking"
+EGO_PN="github.com/containernetworking/plugins"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+src_compile() {
+	pushd src || die
+	local i
+	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}"
+	done
+	popd || die
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+	pushd src/${EGO_PN} || die
+	dodoc README.md
+	local i
+	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+	popd || die
+}
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 8ec76f2a137e..32fabb7d0cbd 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -14,6 +14,6 @@ DIST connman-1.36.tar.xz 692616 BLAKE2B 7d8cea55365fbfe78cd897b5b65d8edf475a7372
 EBUILD connman-1.29.ebuild 2013 BLAKE2B 8b80a54f1e7db67aaf16b7ba31d27aa4e9533260944944d6e3877d3794f67963b420a074bafdc5b5ec1f26fe29f6a24e29bd618a9eec52b3c3c2d690db21975e SHA512 e77846ca1759957f4d898fd76b06f126d6181c85384eed8f6ffee4d9e6845eb43f831a0db1ea349b387392e60e43dda8c364f87b1f98c5ca84652e2fa858e35b
 EBUILD connman-1.33-r1.ebuild 2280 BLAKE2B ac059303eeae7e2eefa254a874ff80c254c8dda3b80bbbf27ea62f6a9a59c5033bb0b244d30c68dc2dd3cb8117af6c0204b766911804cae6323a8056f7b1852e SHA512 8c396fa66e67a4519d2fe067e43f11cff3cb751e7f610e6ccb2cc75836cf74784fde1f8ae291b4b2189e92c941885b3c67e55556807eb1c9fdf619c9bc247ce0
 EBUILD connman-1.34.ebuild 2490 BLAKE2B bd804da85d0d880e69cf9fd6ea2b8fe813c508ffc3196cb82774d59966b9a4468f271e7e9472e74814c8c6a3df22c934ca2fcac5c792e64bb72226f0172d4b4a SHA512 51b456ca18a681392a9ffdc44ca31d1838cfe597e43ecef28b5202f69415465ee29a70d26a6ead153acaf7028b3da18049ab7d2c465b21fffd443c8b07afe302
-EBUILD connman-1.35-r1.ebuild 2557 BLAKE2B 4a24da33f7d40a1b0ae339e7031e83b01fbce6da1da149b7ea8de388b859a48f24c50acf85a0d432e516c2da0de74ec0480304d0fcf0e40f5ad2a461ffa5dbe3 SHA512 bd20274ae49359ce891711a0e8e56320b9e63fca510403171f40a4f71d996b5d88d71972076eb4cb62d8dc7c6ed21b0fb7431598fcf1424049f4699ea2b22d95
+EBUILD connman-1.35-r1.ebuild 2555 BLAKE2B 7369ceafa9bd072bd8020da45453bd07ddacb10606bb3d61ceddfd3367b15bdbf890a00aa579536d548b52fd6c6656d79cdb31d290d2ac6301a6f04ffbd0724d SHA512 640be0029a8c6568a47973743f968cc641a579523f4288cc5ac0347b72721f547f608729c2865b2a31e15394e2c85a18b360936e082ac3f7069296e9977870b8
 EBUILD connman-1.36.ebuild 2568 BLAKE2B 902e767beeeb20850f0387485444905ac4b607dbdcca5fe73b4db808df7534829d2a2ccec1636c1ecaf8cbcc0c60bea9dc8b8865d8da13b1d748fd778a62d551 SHA512 f9c93a7263ce7d683dcfb6e1fc2d6798a222159bdcaf432ab75fb37d5c8a37e200ad6ad2ba5efef8438eff2eaa486545d4593817aa9ff3532833c1a15f9acb27
 MISC metadata.xml 1259 BLAKE2B 9c4804b5e650d4823a129d3d64e59ca3165ea04a171dfdbf669c184c14eb6e3ab923e5f0834952aaadb734e5867d4ad241084c0388d52a29b8e208e23c72d44e SHA512 02189e5081b74da0b4a8d23dfb27c1b71e34b2f8b3e5bdac8817e50206470e5b6591979b65dede6dad0f5b14b3fe5ca627ba50f8856a5c586fe8b8996f813322
diff --git a/net-misc/connman/connman-1.35-r1.ebuild b/net-misc/connman/connman-1.35-r1.ebuild
index 67a8c779709e..d0e352566077 100644
--- a/net-misc/connman/connman-1.35-r1.ebuild
+++ b/net-misc/connman/connman-1.35-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 
 IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables l2tp nftables"
 IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index ac3691cd0f2c..71c308af466b 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -4,6 +4,8 @@ AUX hylafaxplus-init 3150 BLAKE2B 67b27c9e773d141c462b62882fa1ec592bdd30397c21c0
 AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c
 DIST hylafax-5.5.5.tar.gz 1353495 BLAKE2B e1b41a5cf5502ad28467625495171c085f43f4352b73bfd633da851a1366502aca04a157790ad4a7f3d634a6adbb5dab4c1eeb294283352e9eedaf03c565cb42 SHA512 ee6225ae044c567093103f35c30d848db757636c1d8db78e8f7cb43eb01ea34ab229a81ca4175e2bf30d3c87b598d5b5797b7d92b0dc852bf4b69c697baca8cf
 DIST hylafax-5.5.9.tar.gz 1364807 BLAKE2B 1e63d28dbe42170af65369ceab6b76b30fb264515992bb7f3561722eccae21e2d790e50eab3f1f9bdbb8c48e369166c90271aa8cf37c1905fda44c3b31b18b71 SHA512 67ac84df2619db7fb88cd7ad3af4beff9918b2481fc8edf7cc7574941161dd7aa6186cfc49c6cdb2a1f073f6cbf2f2a4ed084ca70ebe288bf7cd8e752cd56b2d
+DIST hylafax-5.6.1.tar.gz 1370677 BLAKE2B bd93d54f2c3e2c5c4c33617a0d95569c82bcbd32f669fb2ea513b86e112a5743ae6b4ddc8d43f3bd4af6006517e8787392c84bf60e715c104ddb0d819b22985a SHA512 c86c33dc9e8feec4e265156fa3bbda18cf187feeef5c812ff3d3c7857de048a688bb979fcd3494ee8fe58a004a384a2a161d05245c86d0c304311d63f62a9eb1
 EBUILD hylafaxplus-5.5.5.ebuild 4715 BLAKE2B 9d6ca4008ad1c725374ea961f7573daa2ec4fff75506b5d131a6680ba95dfdae6bbd734e1d003f07093d47bbfe07fd5db0b7001bf226e50360968e1deae3cf82 SHA512 e3b531d0ea6ed7039abbf2488f8ac5955b41691d1fa47da7182c06e7f44ec2f59082f8b3a1b7493c6129859e477bc72c2b8f21dfc795530fcf5e89de01bab05f
 EBUILD hylafaxplus-5.5.9.ebuild 4293 BLAKE2B 5c3e2ba530b2f8ad984f3db95189f77194fe1bfdd529c3ab5ece560c1fcf0ae97eba2fb56f20f1313ec2ee0c5ba960341acd2d29b8704f27a86d0329d078dc8d SHA512 4b19d97455b3679981d316dbb5f063df8056b4a95e8cb229978bb06e62e43e79ac8af018c79faa5d4f8e175ded1b490b6bc657a2ab876adc175902707af22665
+EBUILD hylafaxplus-5.6.1.ebuild 4293 BLAKE2B 5c3e2ba530b2f8ad984f3db95189f77194fe1bfdd529c3ab5ece560c1fcf0ae97eba2fb56f20f1313ec2ee0c5ba960341acd2d29b8704f27a86d0329d078dc8d SHA512 4b19d97455b3679981d316dbb5f063df8056b4a95e8cb229978bb06e62e43e79ac8af018c79faa5d4f8e175ded1b490b6bc657a2ab876adc175902707af22665
 MISC metadata.xml 578 BLAKE2B 2188942965a0a84ce976c7447444c4858651f4a36ec29a21b169e5224137d7a03eb8dca7522c4ab5ce0d58356ba6de3a276810ba4bf37955628ec0a6ae3940d0 SHA512 1f8cbc639c7ed84086201f71010c2ed662ebad39a3529cf0d9450be66f2d0d4660dde88b16050ef6e112672ce5d23db2210ea3d14a44452233f55aa22f28215d
diff --git a/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild
new file mode 100644
index 000000000000..18d1e65d47a1
--- /dev/null
+++ b/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit pam toolchain-funcs
+
+MY_PN="${PN/plus/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
+HOMEPAGE="http://hylafax.sourceforge.net"
+SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="hylafaxplus"
+KEYWORDS="~amd64 ~x86"
+IUSE="jbig html lcms ldap mgetty pam"
+
+DEPEND="
+	>=sys-libs/zlib-1.1.4
+	app-text/ghostscript-gpl
+	virtual/mta
+	media-libs/tiff:0[jbig?]
+	virtual/jpeg:0
+	jbig? ( media-libs/jbigkit )
+	virtual/awk
+	lcms? ( media-libs/lcms )
+	ldap? (  net-nds/openldap )
+	pam? ( virtual/pam )
+	mgetty? ( net-dialup/mgetty[-fax] )
+	!net-dialup/mgetty[fax]
+"
+RDEPEND="${DEPEND}
+	net-mail/metamail
+	!net-dialup/sendpage
+"
+
+S="${WORKDIR}/${MY_P}"
+
+export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
+export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
+
+PATCHES=( "${FILESDIR}/ldconfig-patch" )
+
+src_prepare() {
+	default
+
+	# force it not to strip binaries
+	for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
+		hfaxd sendfax sendpage ; do
+			sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
+				"${dir}"/Makefile.in || die "sed failed"
+	done
+
+	sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
+
+	# Respect LDFLAGS(at least partially)
+	sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
+
+	sed -i -e "s|-fpic|-fPIC|g" \
+		configure || die
+}
+
+src_configure() {
+	do_configure() {
+		echo ./configure --nointeractive ${1}
+		# eval required for quoting in ${my_conf} to work properly, better way?
+		eval ./configure --nointeractive ${1} || die "./configure failed"
+	}
+	local my_conf="
+		--with-DIR_BIN=/usr/bin
+		--with-DIR_SBIN=/usr/sbin
+		--with-DIR_LIB=/usr/$(get_libdir)
+		--with-DIR_LIBEXEC=/usr/sbin
+		--with-DIR_LIBDATA=/usr/$(get_libdir)/fax
+		--with-DIR_LOCALE=/usr/share/locale
+		--with-DIR_LOCKS=/var/lock
+		--with-DIR_MAN=/usr/share/man
+		--with-DIR_SPOOL=/var/spool/fax
+		--with-DIR_HTML=/usr/share/doc/${P}/html
+		--with-DIR_CGI="${WORKDIR}"
+		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
+		--with-PATH_IMPRIP=\"\"
+		--with-SYSVINIT=no
+		--with-REGEX=yes
+		--with-LIBTIFF=\"-ltiff -ljpeg -lz\"
+		--with-OPTIMIZER=\"${CFLAGS}\"
+		--with-DSO=auto
+		--with-HTML=$(usex html)"
+
+	if use mgetty; then
+		my_conf="${my_conf} \
+			--with-PATH_GETTY=/sbin/mgetty \
+			--with-PATH_EGETTY=/sbin/mgetty \
+			--with-PATH_VGETTY=/usr/sbin/vgetty"
+	else
+		# GETTY defaults to /sbin/agetty
+		my_conf="${my_conf} \
+			--with-PATH_EGETTY=/bin/false \
+			--with-PATH_VGETTY=/bin/false"
+	fi
+
+	#--enable-pam isn't valid
+	use pam || my_conf="${my_conf} $(use_enable pam)"
+	use lcms || my_conf="${my_conf} $(use_enable lcms)"
+	use ldap || my_conf="${my_conf} $(use_enable ldap)"
+	use jbig || my_conf="${my_conf} $(use_enable jbig)"
+
+	tc-export CC CXX AR RANLIB
+
+	do_configure "${my_conf}"
+}
+
+src_compile() {
+	# Parallel building is borked, bug #????
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
+	dodir /var/spool /var/spool/fax
+	fowners uucp:uucp /var/spool/fax
+	fperms 0600 /var/spool/fax
+	dodir "/usr/share/doc/${P}/samples"
+
+	emake DESTDIR="${D}" \
+		BIN="${D}/usr/bin" \
+		SBIN="${D}/usr/sbin" \
+		LIBDIR="${D}/usr/$(get_libdir)" \
+		LIB="${D}/usr/$(get_libdir)" \
+		LIBEXEC="${D}/usr/sbin" \
+		LIBDATA="${D}/usr/$(get_libdir)/fax" \
+		DIR_LOCALE="${D}/usr/share/locale" \
+		MAN="${D}/usr/share/man" \
+		SPOOL="${D}/var/spool/fax" \
+		HTMLDIR="${D}/usr/share/doc/${PF}/html" \
+		install
+
+	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
+	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
+
+	generate_files # in this case, it only generates the env.d entry
+
+	einfo "Adding env.d entry for ${PN}"
+	doenvd "${T}/99${PN}"
+
+	newconfd "${FILESDIR}/${PN}-conf" ${PN}
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+
+	use pam && pamd_mimic_system ${MY_PN} auth account session
+
+	einstalldocs
+	docinto samples
+}
+
+generate_files() {
+	cat <<-EOF > "${T}/99${PN}"
+	PATH="/var/spool/fax/bin"
+	CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
+	CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
+	EOF
+}
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index 06503487671f..ce7a93541eb1 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -17,7 +17,7 @@ EBUILD netifrc-0.3.1.ebuild 2102 BLAKE2B 6b07a4a1e6721997c73da81fc6eb551f26905fc
 EBUILD netifrc-0.4.0-r1.ebuild 2188 BLAKE2B 3144b7633e7d5f6520d55bd75084c317d6be68dec524128f5ea2348ea26d9e5e085e1bac19e1ee8789295279783998b128d8f41dd8f0df2f799a22725710df95 SHA512 95ba2089b9549bdadd8cc9248161e3398441867366901a1978fccbfa764c94be6cedff207ff3d1f9e7ac3f73645528ca6455b2216c9b4ac4169d4f2712f9cf76
 EBUILD netifrc-0.4.0.ebuild 2102 BLAKE2B 6b07a4a1e6721997c73da81fc6eb551f26905fc9402209134da16e6627308c53210df7d888f75911eed08a6e650b85b24b519d22d08d48d39b9bdc682c5b18c0 SHA512 e3f28f1740679972ab31d9c7c43a425b8e080184b75a9ed07e1a3d5715becf6c6b0917f7911461369e2ae0065475cab741b202e5c65db3bebc2b5650cecd8366
 EBUILD netifrc-0.5.0.ebuild 2132 BLAKE2B ec73c3fb538437115efd47030c476a01b6366d44addfd894a60012e8e6fff0b76011cdab6aa932b457820d1f540a5491d46450899db8952ac96ce516d9bc79f3 SHA512 f790c3c20cb8f6caec7a5ab8264efe40feb8d68f80a8272e5958c739d3928d69ecae624962510c8a379664992846328c48078ad22672de5eac78e9faf9d89da0
-EBUILD netifrc-0.5.1.ebuild 2120 BLAKE2B 2b713fe73b37fc4910742562f71fdb52485125cd9adbf5e69c669ee1a05c8ec38266b1354e208adc50071c349724738209655ea653532916d2509cec0e7367c9 SHA512 a905529a725ab32d1dbbf34d1710e65a191d77c9c29ad84cd5dcf77f57651ea9be27bbb84bc311d8a27b64c6f1e557c0b29521ff0e20a7b4ab2b36e8cdf1574f
+EBUILD netifrc-0.5.1.ebuild 2119 BLAKE2B 48ddf2632cae4c01ff3c3997520218642bc65d700e54d00023773b7d5ac5d62eed87ac5c45c100abd87914282061f589ba59ffc998e7371a332e0ba2b0a05516 SHA512 59232da1b4da38e84df4ec82c56b28bd25ed55d5cee2b31f8984ac97b924fc150b39f19b9e5e9fd47c438c0a69a52bb07e6f689a0560c458e292ac204b753b40
 EBUILD netifrc-0.6.0.ebuild 2132 BLAKE2B ec73c3fb538437115efd47030c476a01b6366d44addfd894a60012e8e6fff0b76011cdab6aa932b457820d1f540a5491d46450899db8952ac96ce516d9bc79f3 SHA512 f790c3c20cb8f6caec7a5ab8264efe40feb8d68f80a8272e5958c739d3928d69ecae624962510c8a379664992846328c48078ad22672de5eac78e9faf9d89da0
 EBUILD netifrc-0.6.1.ebuild 2129 BLAKE2B 68a9324b1efa5c16d53281858e6c7228702cb4f0e344e4e6fe53e40efee3679d53a1af4b435f05c623c211b129ed66bf036c2d795d7d25dab5525c4ca84a3c34 SHA512 ee254f37080a9556b823cc288afc0a1cbeeef6e0af768917a5d4035e3debfc75d41719ef683ab298538b30d211824f1aa75f1e87aa2cedf48848bfb67b7661fa
 EBUILD netifrc-9999.ebuild 2132 BLAKE2B ec73c3fb538437115efd47030c476a01b6366d44addfd894a60012e8e6fff0b76011cdab6aa932b457820d1f540a5491d46450899db8952ac96ce516d9bc79f3 SHA512 f790c3c20cb8f6caec7a5ab8264efe40feb8d68f80a8272e5958c739d3928d69ecae624962510c8a379664992846328c48078ad22672de5eac78e9faf9d89da0
diff --git a/net-misc/netifrc/netifrc-0.5.1.ebuild b/net-misc/netifrc/netifrc-0.5.1.ebuild
index 7d558a3cdb65..275f19dc9272 100644
--- a/net-misc/netifrc/netifrc-0.5.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.5.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/networkmanager-libreswan/Manifest b/net-misc/networkmanager-libreswan/Manifest
index 90e39e124ec9..e808bf81fbc9 100644
--- a/net-misc/networkmanager-libreswan/Manifest
+++ b/net-misc/networkmanager-libreswan/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-libreswan-1.2.6.tar.xz 348312 BLAKE2B e27180b94807db3bab7d41502674fb9e950fc8eb79447a901f2c69f9fdbbf99032e007cb1e631ef5f8eec5dbed40e74f1e0eadecef7fdfc3b618500447a3a9a8 SHA512 385b7e7cfc0720be1eae0a3c7e080efd17eb6f243d069ba881b97c9638fc3bb951b3c8f1c9b44422fe81a2dc9fc85b675f977284111aeaa6304ad31750f62798
 EBUILD networkmanager-libreswan-1.2.6.ebuild 837 BLAKE2B d6683af55cc293b35cd492e6862b8958243b106b9e0d8742be124134b9e83251448dd9b74afc486cef1bc88df3026e4569e3c6fa089653586f0c4be6da7c4269 SHA512 5c046e22b2c49e4dac512de88f8dab8c578145865763bd6f5f3cb31c94d68ea28ddadffb5307624b2b193b9e0b36d33a191b5f057944706197dc9cd9f63784d0
-MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/networkmanager-libreswan/metadata.xml b/net-misc/networkmanager-libreswan/metadata.xml
index de09ffd8b089..7a38bb900964 100644
--- a/net-misc/networkmanager-libreswan/metadata.xml
+++ b/net-misc/networkmanager-libreswan/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index a23ff76a5512..45a2b3ebe457 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -4,9 +4,13 @@ AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117
 AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
 DIST NetworkManager-1.10.10.tar.xz 4038552 BLAKE2B a0a3c2a74dd641d25267ec7932f0801e30720334cb905c86abfaeb9bc3c60a2c1e9372b738b1eb43c55a34edf952905d94e3513cef653ea62e470d56bc575b65 SHA512 e536598b19064e0ab7fe3e92362de9c380281ff53a1481438216c2247b2d5287244e735be41c56c53040a5861bf36bbb979e36578244fabd6448a50ea42c4645
 DIST NetworkManager-1.12.2.tar.xz 4193776 BLAKE2B bc2b55f33e85dc8381eb18148cef02059e96abe1863da35af2b8f5671e3b2a4296eb1f9b79d864f3d0e6b362f7dbebdea4518a96d255acda9141b9ae95b49038 SHA512 cf5dae6ca8b6d3819a79485082f959907213d43413d15c41b79eb7da40edb913a41e7c18586b14bbf84f30ac493e2d9d466f5e66130c636f041ce939aaf49f35
+DIST NetworkManager-1.12.4.tar.xz 4195812 BLAKE2B 11c59da430cdf6f70cc841d980e0bc0280244a1a1ee52311946f27c1f61ae23b14e115caba02c80738ef35d67eab6f1fadc1a0dee3250510d05fd1e90aed5ac1 SHA512 6fc891a6f8c3b4cc43449dabf0c025a9e706b723f602085f34cc93bda885c300de293004390c4926b95e26201b86d97ecd23160f82ef03e4d2b680f822c827c3
+DIST NetworkManager-1.14.0.tar.xz 4389692 BLAKE2B 1d1b12764503d5f56d27f11449f3a0149491887312ed735c5cd25c0eeb6928fead30544d32cdd65262e00c4bdaed55dfb6dbc731c82de41ff8c49ff85937211e SHA512 cb0add2585c586ad36b4fb986a654de30047dc77f038927437156227f42622ac1045c58b76573f4e1acef22aa9f695da417f392a50fde70f4a086504701cecf1
 DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1
 DIST networkmanager-1.12.2-patchset.tar.xz 4944 BLAKE2B 3ab6e395b4e13fd019fbcf851286f1cc8a08eff9d93891174c19949efe10390c69d9aaf6cdbe81f33503ec96838eb001eda67f6d1da034195327e172527cd72b SHA512 bdb22c42a8c53dce2f81ecfd026685240c8b790c44b0f13767ccfa0834cb2edec61ade69c828fb21c54ad3d37412e89b15f1fff4a98577a5bea460ba78d43bc3
 EBUILD networkmanager-1.10.10.ebuild 10769 BLAKE2B 0adb377fc034856e1e1045a9134f231009e9e4181e13e9b7a9e990dcf562d3b98984ebcb27c15ee475b9024a76e3e262b9a9a162f58c16510a86ac920cca7d57 SHA512 af2868a2490d80ecaa0e703b5f2091fe481e6c47e3362a781344cd2313e2cbf5bd5cfdd0ee5c404b1dcebc70e9ebc32f2bcc59416718659b2e0af6925f0b97f1
 EBUILD networkmanager-1.12.2.ebuild 11210 BLAKE2B 5ce9200cb1c0f400ff27a5f0f0266035e2878f8f80b800feb8383b41a16dbdccaec312299483ba679ca5b56f955b54553195a1b960504664d585c3af932b5662 SHA512 53d07fe10d655729f24e1697f025740fb2000d532fec057912e9947eed43c5bdb3f917d589dc346c6d66ee10ece6ff04a95d0cd7ab4698c737ce004de0112258
+EBUILD networkmanager-1.12.4.ebuild 10955 BLAKE2B c7f6e7e1308dac603b48984d7910ca14b19d562e49cf52ec610eebf44d1ade0467b45150e97380a6fee9d5f2286ddecf8ebdfdb863f8c7af908994b065412c22 SHA512 7777538aebc1e0db66782e416c02c0d98da2aa849cb2828bbec0f00ce45323c8c8e9b3cf54ac0cc4443d261835908695ae27363dfacbf727396885c7c9efcc37
+EBUILD networkmanager-1.14.0.ebuild 10955 BLAKE2B c7f6e7e1308dac603b48984d7910ca14b19d562e49cf52ec610eebf44d1ade0467b45150e97380a6fee9d5f2286ddecf8ebdfdb863f8c7af908994b065412c22 SHA512 7777538aebc1e0db66782e416c02c0d98da2aa849cb2828bbec0f00ce45323c8c8e9b3cf54ac0cc4443d261835908695ae27363dfacbf727396885c7c9efcc37
 EBUILD networkmanager-1.8.4.ebuild 10683 BLAKE2B 2c60630cbefd554f11e77b18a3bde0e0cc0dc361410ebcf36cb8e4223d715516268e862377fe2d2319ba67e9121153e6b6ec140254fdc159757a1d4a2e95b2d9 SHA512 93d62548e37ae437d7cd04801fdf723ba9e61034f605ab2e966a8958ac75d02ee210e6e7241ebcd7b47e6e9cca5212f0596421bacac7b07a6699996b0546bed5
 MISC metadata.xml 1808 BLAKE2B 836dc65487a0e7ab3e527726f7d34698b48ac1529f9d87113b4cfb8c3330449ae3c3c61b11c9b37bd62884e9ab9f2cd8a3aa6abf7272b0836cc24b395990f32a SHA512 9088a30ef5c513348e76303a00e6e0cc4c8fc82d03d52d4c55a9bd27d1bfdf9fc1a08037b162cd6bd28ca68afc50cf2c8f7aafa69c1fc441eff0355e8e189661
diff --git a/net-misc/networkmanager/networkmanager-1.12.4.ebuild b/net-misc/networkmanager/networkmanager-1.12.4.ebuild
new file mode 100644
index 000000000000..3f8a4080c5ba
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.12.4.ebuild
@@ -0,0 +1,338 @@
+# 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 vala 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 iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	iwd? ( wifi )
+	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.40:2[${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-2.5[${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? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	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
+		--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, bug #665338
+		--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 wifi iwd)
+		$(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"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# 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/networkmanager/networkmanager-1.14.0.ebuild b/net-misc/networkmanager/networkmanager-1.14.0.ebuild
new file mode 100644
index 000000000000..3f8a4080c5ba
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.14.0.ebuild
@@ -0,0 +1,338 @@
+# 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 vala 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 iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	iwd? ( wifi )
+	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.40:2[${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-2.5[${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? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	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
+		--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, bug #665338
+		--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 wifi iwd)
+		$(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"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# 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/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 5e932dfb55c1..fe4a8d843761 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,7 +1,7 @@
 AUX nextcloud-client-2.5.0_beta1-fix_cmake.patch 783 BLAKE2B e02f2df582ec0e1a2872e2d200fd20916b45a7c654be270b4cfb698010c494dd8babc1ead29daafcd2b80ffdc94e381de939619d1cf46080b9b170be8b3a1db9 SHA512 e3cd2de00c7baa00085498b05f4a64c63dd5e73f2ca435143e9069708e31d68a99bb3e903721a335256889c1e244b38c95ab8be7956a15ac3fd5c4dad2123343
 DIST nextcloud-client-2.3.3.tar.gz 708611 BLAKE2B 8f0a1f433ad18743e7d78bf4ab523e57f2c40cc1527508e940bb14c75f944723d728a5ee188c06a181ded535b910bea68620e8eb950c290af7556423fc28264f SHA512 fd02c61a7a92b77f9063e4f15be426be84d02033bead4b176d876134f8b85d7385e4a361959b68c332f1ccb55d43e2a8b55e0d5c8e5a54f645a5816a37790bde
-DIST nextcloud-client-2.5.0_beta1.tar.gz 18930446 BLAKE2B cb6630950e26013c96151a6f8fc236a9e25313fa6479e00de754fe9c45762c62042b039f18d11febfed4cac4e36c9d7bc2fdb25a522d1a6c153343eca03d46f7 SHA512 0d6a7b24965b4cdae41aacb06804ea5463309f219d39cefbf970ba57697035b4113d1f185166b51ab296745d26e43591896fa1c8fb7430a9d624f7547fafaea4
+DIST nextcloud-client-2.5.0_beta2.tar.gz 18860182 BLAKE2B 9d6ab5f326c5280f0e9835c0c382b0ff78c01920f8bd2a6babbc3df20096d4c803fadfd1bc0f52798e5cbce503f241dc46b82923b8bdd19fe968b2d9c14189cb SHA512 ed5ec8c0fd79d3f7f843ef1aefb9b94088b85dacca442388bc9a42e1ddbf1ee90482595135ffaffc85e40d223406964c903949ca1c2161fa0f6a2d6770a77cea
 DIST owncloudclient-2.3.3.tar.xz 33801712 BLAKE2B 7642148a4f503a2702d56f920067202699b4a55bb6216337ecbd9df141e0a7467aaf2db8d7d6871502061d3866294f8c44c791fdbf9597ca8d761f360f7ffda1 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2
 EBUILD nextcloud-client-2.3.3.ebuild 2453 BLAKE2B e953f8c60f10101c891e46c98ba4c6c2f3ec09a17c40cdfe66687b31dcc0e17a9c3da8c4c8d6e7f27c1c0786f756dd98df2b979d671fa8d649d18eb1861fc7e2 SHA512 42614380bd5945afc39fb3b653c1d03e7afcd61f7bdb3715983198bb8dc7e75a029150189bf800ab39d9a0d9775aa3b05439269b6a0a987f9c02443167dc447f
-EBUILD nextcloud-client-2.5.0_beta1.ebuild 2073 BLAKE2B c71f9f29633bfd6bd7da1bac441267234a427fbbccf4837e97d4935b620783a7327eabb62e5aaaf82d1942bfcfd22e82c8d736833accc5ed483db084572caf71 SHA512 1187ec4c134cad98547e5132d1677bba9d9f6e05d221598e62ab28c9e645f47a0f66367b03bed9b2083aa7e918f8bb78cd43bfbdc9eea656461202fb99d8a1d5
+EBUILD nextcloud-client-2.5.0_beta2.ebuild 2025 BLAKE2B ce04f2727e59d7ed86038bc46760ca0bc06f6ebf7fa9d18eea87bbbe7a75a8f41270b961dc8992fe67d592e3e1bc530a8f42a4c7236ffba521587f9161863549 SHA512 c31768ac25786a3fd3f5a60b2768b264e25db4338d103cf22a9286547735e792f9f9991934ba58594e3197e1e6cc24b62cb839b77785c8b74b19b7ec92a9fbc8
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta2.ebuild
index 388cf73e7697..d5fc16019e40 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta1.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta2.ebuild
@@ -54,8 +54,6 @@ DEPEND="${COMMON_DEPEND}
 
 S=${WORKDIR}/desktop-${PV/_/-}
 
-PATCHES=( "${FILESDIR}"/${P}-fix_cmake.patch )
-
 src_prepare() {
 	# Keep tests in ${T}
 	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
diff --git a/net-misc/ptpd/Manifest b/net-misc/ptpd/Manifest
index 21a680f5a554..23fc802709fd 100644
--- a/net-misc/ptpd/Manifest
+++ b/net-misc/ptpd/Manifest
@@ -1,6 +1,9 @@
+AUX ptpd-2.3.1-fix-libressl-compatibility.patch 1154 BLAKE2B 3b229bda14d65c610606225e7a9bac0f381a7173cee358f760dbbdb7266a7c87b7bf535a2d7d593b5c9f556b811f560ac98850f0b9d469b70bf778363bf3facb SHA512 19b6c3b3e248514d3374ac17f37070f60b43b5ba8d38b7564abd00896e2aecc29813f9a36bba2da7be33d6ff47aa029644d735f4325e948fe73ba81b466abc1d
+AUX ptpd-2.3.1-fix-snmp.patch 420 BLAKE2B c3b9da6337671c9a502bc36a8b2ad85bc7ff041cdc496a05c0e4e32d22dd5a933150d6e65252afb1c79c7fc45e148d4f2ba63adca8b18e6227581ee2515069fd SHA512 40e6f89dc922da9b3a68f7513a4d08f8708a1f4ebb87147c6ab3e6a75d8aaa5a627045e967c5256445897175205c7b95e77f0ca7322062fa6265b7e909097978
 AUX ptpd2.confd 61 BLAKE2B 0724014663c4e18dd2205982e4ebb20b6cc5af2eda0d1070515b2823924882f34b1f1879ba3ee3540d4918203c4b6f23d04da276aaf5f938963794e1eef7f87b SHA512 40ea56a92222eb10dc429343a23bdcc0e75f626e34fea139a09ca545a50aee0550253965de036218889554a2c0c7928c0051e3e71d9b9cd0a9d44d334e0bac47
 AUX ptpd2.rc 1372 BLAKE2B 071dce26d1343050b212312381a07af6b24d4923d715e4b7c4e065ab67283a3bcf4b350d1c28a9270cb9c03b8e04cffff6b3e422a80460d6210b546b684bd37d SHA512 37af776a265fbabdabed381d98cf50d78a512634fd84ce07466a47a0e96a6b2cccfb762732a043139b6c136eefdc6443ab9a5cba1c30234b6c66acc23e98a5b2
 AUX ptpd2.service 228 BLAKE2B 89bb7a7b4352f9905032ca7efc778cc220282df8389f1da4f60af653cc71b2bc15d08c73730f326c9311f97ebeff2602b73cdbd55683a2d69cb57d0a63a28a47 SHA512 72d609c9b803921b55cc0528aafa5cbbff0b7ed2f1267fa5f06e410ec640295642717928bbf38c849f632d157132f01f60a8bad826428b846d8248bac27e932a
 DIST ptpd-2.3.1.tar.gz 884161 BLAKE2B 029eeff4ff427aec7a24365bd7f62a4f5d6bfe4bc0a003b0fa8ca1f7581b2395cb96c27bfa59c6333b0354ac0fb12fb11fd24319506c2168e0ff4ddfb3df9117 SHA512 25c128ce1920ae2c1469e986bfa5d5b8ebca04ec14b838fb8232b36e0a1ef94646507e1b25034846d11cf0f71d7e2da983b9f6408f8fcfc608904ecfec2a15c4
 EBUILD ptpd-2.3.1-r1.ebuild 1358 BLAKE2B bbd67fb82dabd88f2f0885df34dea7e4a26406a86c5329aa72fa66f93327a842eeb7b0c20aa6f5874157e4acc461ffe1fd1befa37825ed96f7ee331c6985854e SHA512 157ebd631b8066ce73f1d1bc8133e23dea20fcf34585e219c59a792ff90d0b80be4fd74bed2d30e0f256c99e5f24ac2a861fba14f69904ad899330b32dcafc97
+EBUILD ptpd-2.3.1-r2.ebuild 1418 BLAKE2B 03563a0e1e386d9d2a25f54497262adbf12b7abcd9554c23893d0b38a4865ce7a92e209d43d49dfb948fdf4aec284f5afaaa09eb6a5f54d476e8db94c65eb946 SHA512 24f1927b4fd1b526ad503fd92d5c0d87f8dfdbc1838b47f02a341a6b549afbedd025fa936b31e45aa3cc7815a1ef8a07a18afd9feed65380c684da6beb600d4e
 MISC metadata.xml 988 BLAKE2B 25f10292189622b3e50d058fc2faadd46959bab489a65a77f4bf4b4d5b8c98ec86e4b54e987b87dab497d4fd39c2c786b743987166ada6d9c4a61e15a5960a1b SHA512 a96ee23e21b8230c4756022e5678df1f72c61576b0aae1de04c10328417f64535129ed4a10beb7545c7316e36b9fe658e8c5ced5f28177ff84b106caf525ec06
diff --git a/net-misc/ptpd/files/ptpd-2.3.1-fix-libressl-compatibility.patch b/net-misc/ptpd/files/ptpd-2.3.1-fix-libressl-compatibility.patch
new file mode 100644
index 000000000000..4fa25797ff06
--- /dev/null
+++ b/net-misc/ptpd/files/ptpd-2.3.1-fix-libressl-compatibility.patch
@@ -0,0 +1,24 @@
+diff -urN old/src/dep/ntpengine/ntp_isc_md5.c new/src/dep/ntpengine/ntp_isc_md5.c
+--- old/src/dep/ntpengine/ntp_isc_md5.c	2015-06-29 17:13:29.000000000 +0200
++++ new/src/dep/ntpengine/ntp_isc_md5.c	2018-09-15 22:56:18.469044902 +0200
+@@ -262,7 +262,7 @@
+ {
+ 	u_char	digest[64];
+ 	u_int	len;
+-	EVP_MD_CTX ctx;
++	PTPD_EVP_MD_CTX ctx;
+         pkt[length / 4] = htonl(keyid); 
+ 	EVP_DigestInit(&ctx);
+ 	EVP_DigestUpdate(&ctx, (u_char *)key, (u_int)strlen(key));
+diff -urN old/src/dep/ntpengine/ntp_isc_md5.h new/src/dep/ntpengine/ntp_isc_md5.h
+--- old/src/dep/ntpengine/ntp_isc_md5.h	2015-06-29 17:13:29.000000000 +0200
++++ new/src/dep/ntpengine/ntp_isc_md5.h	2018-09-15 22:56:11.852020732 +0200
+@@ -80,7 +80,7 @@
+ # define MD5Init(c)             isc_md5_init(c)
+ # define MD5Update(c, p, s)     isc_md5_update(c, p, s)
+ # define MD5Final(d, c)         isc_md5_final((c), (d)) /* swapped */
+-  typedef MD5_CTX                       EVP_MD_CTX;
++  typedef MD5_CTX                       PTPD_EVP_MD_CTX;
+ # define EVP_DigestInit(c)              MD5Init(c)
+ # define EVP_DigestUpdate(c, p, s)      MD5Update(c, p, s)
+ # define EVP_DigestFinal(c, d, pdl)     \
diff --git a/net-misc/ptpd/files/ptpd-2.3.1-fix-snmp.patch b/net-misc/ptpd/files/ptpd-2.3.1-fix-snmp.patch
new file mode 100644
index 000000000000..31b466d1468c
--- /dev/null
+++ b/net-misc/ptpd/files/ptpd-2.3.1-fix-snmp.patch
@@ -0,0 +1,12 @@
+diff -urN old/src/dep/snmp.c new/src/dep/snmp.c
+--- old/src/dep/snmp.c	2015-06-29 17:13:29.000000000 +0200
++++ new/src/dep/snmp.c	2018-09-15 22:54:11.818589001 +0200
+@@ -221,7 +221,7 @@
+ 
+ #define SNMP_LOCAL_VARIABLES			\
+ 	static unsigned long long_ret;		\
+-	static U64 counter64_ret;		\
++	static struct counter64 counter64_ret;		\
+ 	static uint32_t ipaddr;			\
+ 	Integer64 bigint;			\
+ 	struct snmpHeaderIndex idx;		\
diff --git a/net-misc/ptpd/ptpd-2.3.1-r2.ebuild b/net-misc/ptpd/ptpd-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..cfca56347ad2
--- /dev/null
+++ b/net-misc/ptpd/ptpd-2.3.1-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Precision Time Protocol daemon"
+HOMEPAGE="https://github.com/ptpd/ptpd"
+SRC_URI="https://github.com/ptpd/ptpd/archive/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="BSD"
+SLOT="0"
+IUSE="debug experimental ntp +pcap snmp slave-only +statistics"
+
+RDEPEND="
+	pcap? ( net-libs/libpcap )
+	snmp? ( net-analyzer/net-snmp )"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	ntp? ( net-misc/ntp )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-fix-snmp.patch
+	"${FILESDIR}"/${PN}-2.3.1-fix-libressl-compatibility.patch
+)
+
+S=${WORKDIR}/ptpd-${P}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	local myconf=(
+		--enable-daemon
+		$(use_enable snmp)
+		$(use_enable experimental experimental-options)
+		$(use_enable statistics)
+		$(use_enable debug runtime-debug)
+		$(use_enable pcap)
+		$(use_enable slave-only)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	insinto /etc
+	newins "src/ptpd2.conf.minimal" ptpd2.conf
+
+	newinitd "${FILESDIR}/ptpd2.rc" ptpd2
+	newconfd "${FILESDIR}/ptpd2.confd" ptpd2
+
+	systemd_dounit "${FILESDIR}/ptpd2.service"
+}
+
+pkg_postinst() {
+	elog "Do not forget to setup correct network interface."
+	elog "Change the config file ${EROOT}etc/ptpd2.conf to suit your needs."
+}
diff --git a/net-misc/redir/Manifest b/net-misc/redir/Manifest
index 2e324ee543df..102717c4f741 100644
--- a/net-misc/redir/Manifest
+++ b/net-misc/redir/Manifest
@@ -1,6 +1,3 @@
-AUX redir-2.2.1-include.patch 272 BLAKE2B 5aa7a0b9d299e554fae83cebaa0128b26900ee139f5edbdf5ddaeaef4f93fb9ef82c0b39012ad12e4940bae038cbe4e3925883774ba64132488af73bcd2264b8 SHA512 b30607a0cbb55d5963512535b8ad519f1f97c1fef751c7fc01ab2515124bb8b7232107bddb888b56ae320dd350353f02da1bcd24d76780ffa9bfdc2ec3710dd9
-DIST redir-2.2.1.tar.gz 42247 BLAKE2B 779b9c754b83ac78cf32dde738dec29d55dc9a4e5a3fe43b978d25f2935249e89f3a0a15ae875672424026faf5d346446dab13e76f0fb73c7b94d6341cdfae0a SHA512 1e311e9ca81bcd7baec26f22634e43b2881873c80ef58a21aa5807d00ff5298227d2d4882a7cc1e218e55a19e64cf0634f2bef417bb89733ae0b3e23942be423
 DIST redir-3.2.tar.xz 84240 BLAKE2B d1b48a14ea83cdcd58b7b2449e340e5cc110e212f17ec2f56cb8a914bc2c880d009d102dcb2cb1ee723ec4e3ceb48cd396731863fdc9ae864fe4fbf15ed90eec SHA512 b379047e94f377847b15c4e4c94fa34be996fbf6b26a83670061d705791902b184e89270887a967b2aed993f9ca46c3d0a41cde6b162ff9b32dbb689c1384c6f
-EBUILD redir-2.2.1-r1.ebuild 612 BLAKE2B c68392b7433ca09c420b98814507027036904d8726d070438d87febce0ae07d336a069a49429f0854f983c8d1da78cd11323295c2130de8db1a76ffb0c468b84 SHA512 8cc9fe9db0fb9321d90f314e96748058e37f66c227591ff8733e91f745e4cf5e4558221ed1b9205290ead8e7f0c5b2dda7cc58e30ecca1ca73225d8de6c4f9d1
-EBUILD redir-3.2.ebuild 420 BLAKE2B 35438ec35b31a29bc2c49ed429c2c68ee02f2975c406156e574c8608290735925f6b17ac4e3921e884b3a3827de005dcd114f76776aca1f84f3f7056b9630f10 SHA512 35b3e77e973f99b5f4c4095503386f3eb1303774b225daf34d0fc8dc3e565a04b8da36d23c939065d7538f9012319c44efe6504326f87fff15266832309b8a06
+EBUILD redir-3.2.ebuild 418 BLAKE2B 5029224479a247f22f095931f7ef54b549fd2bfd79fdfa0e61a0a8461686f5e9902c7d400e8c2c2da46b3ffee769df054141029ca6eccc3122f67dabc3e3fdcd SHA512 74671c09ad7a9f308edec0f464ece0d6ebe41b7f84f2286469ca220586ba9c4c29f7a67b7a42bc6a860b518b1d7b94dcffc4aade27fde128cdd9ea03b4defee4
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/net-misc/redir/files/redir-2.2.1-include.patch b/net-misc/redir/files/redir-2.2.1-include.patch
deleted file mode 100644
index 5fea475d31a0..000000000000
--- a/net-misc/redir/files/redir-2.2.1-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- redir-2.2.1/redir.c.orig	1999-12-26 21:50:06.000000000 +0100
-+++ redir-2.2.1/redir.c	2009-10-23 15:01:26.000000000 +0200
-@@ -78,6 +78,7 @@
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <errno.h>
-+#include <time.h>
- 
- #ifdef USE_TCP_WRAPPERS
- #include <tcpd.h>
diff --git a/net-misc/redir/redir-2.2.1-r1.ebuild b/net-misc/redir/redir-2.2.1-r1.ebuild
deleted file mode 100644
index 7d813844581b..000000000000
--- a/net-misc/redir/redir-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Redir is a port redirector"
-HOMEPAGE="http://sammy.net/~sammy/hacks/"
-SRC_URI="http://sammy.net/~sammy/hacks/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~sparc x86 ~amd64-fbsd"
-
-PATCHES=( "${FILESDIR}/${P}-include.patch" )
-DOCS=( CHANGES README transproxy.txt )
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin "${PN}"
-	newman "${PN}.man" "${PN}.1"
-}
diff --git a/net-misc/redir/redir-3.2.ebuild b/net-misc/redir/redir-3.2.ebuild
index a7f76dc07410..617fdbb69991 100644
--- a/net-misc/redir/redir-3.2.ebuild
+++ b/net-misc/redir/redir-3.2.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~sparc x86 ~amd64-fbsd"
 
 DOCS=( ChangeLog.md README.md transproxy.txt )
diff --git a/net-misc/snarf/Manifest b/net-misc/snarf/Manifest
index 5e82d2421fd1..73b7f3ccfd35 100644
--- a/net-misc/snarf/Manifest
+++ b/net-misc/snarf/Manifest
@@ -2,6 +2,5 @@ AUX snarf-basename-patch.diff 4438 BLAKE2B 0d5e9ee5efb26de8d622b6bbcacd2efe49c9d
 AUX snarf-fix-off-by-ones.diff 1592 BLAKE2B 5d6e72b792ceb95c40185211d3e1221afec730013ae8ae58f2406f2c71a230e34df282ed4323e5d27eecf7f16c1ea63d59d605e80b00e88db9fadfd9f05d4b8c SHA512 0e42437031fbfacbfaaeb76432b19ff65cd979cfebb0b17adef230fae75bc69cafccc386f95f656c1d40f01a849f0e4daa0d027fb78d97932ac5881c22e0cfb6
 AUX snarf-unlink-empty.diff 1581 BLAKE2B 09cd54db80c7b427cf84f413ac9253eb1aab44d3c4999e5c005c4fc9cfe45dfc280c2a7cf855545ab3f41896a1a5196662d628264f7384730450d7f0b6e7619f SHA512 bb33a2b5c4d929d8a35fce94812c8231f76b54914c9dc57d07dee7bf311e4fd034a97a343c588eba5479cbacd406cb82acc1835e15c911cd04100eff2dd3d398
 DIST snarf-7.0.tar.gz 64495 BLAKE2B d91930e0578a4a89b200a76aa69834d5f7c974a280c56d3c5f4a6f6b4e127145c90a397c410cb339d0865468a53aa433c7387dc2cb205ef8decd2f7a794168d0 SHA512 311c3e4a1b32fd024da8a5c8167888f254608d538695e30b3c632c606f67d1e3d94d8c88deb7850f782f38412f1bfd9022b0ee780c8644655f0648ccf0a0354e
-EBUILD snarf-7.0-r3.ebuild 873 BLAKE2B 6491965a46adebe68e9d65e4af1fa4d68bfa0cdbe53407454102cff3e45dfdaa95ba3bed1ffa79e13c3cd574585827d27643d7c4a5c427cc9ecba9ee6513b195 SHA512 c7c4958ddb62a03f42c0ac655e2ec780f715354913448f1aab950596e66ed0e82578f65e6bf194f56ef6b38aad186d0a68e8b8d5e7be7bf051d98f8d57c076ed
-EBUILD snarf-7.0-r4.ebuild 878 BLAKE2B b79750db0ec78a66e801bce3d6a11415009b206f6396cf78916cc17607228d8983fc36e5ef620475452ca690854b55cc33b5269aa666c884c98b82cc74f8a583 SHA512 2f6257daeca2f279befed04db8c055555f01bf8ee95441ce180ee8cf49bafae2de53b5f21db0622d02db87a4512e599a23fe293358f632cd9db7718ee6f60a6e
+EBUILD snarf-7.0-r4.ebuild 876 BLAKE2B dd935e4c0429d688d9a6662738ff1cc262ea106a74709a42c88c22b59ecb9539402e096d60ef5385248fafb776caf3905f3df1c8b04ef5ad49d94273b8c99372 SHA512 9a501c0e44f0b5ffdb276123550a51b23d97ea458229627d322776293fdbad4f2ee05fa60354bd38965d7e3b858b99ebdd16f9fb5ab04edca27d955a4daa8082
 MISC metadata.xml 386 BLAKE2B d3a94565f431c48179a81f6699a36b362e12acdea5565186d5ca41286308c943c7ee99c3511ae22acba8128b82608f3feb076147ec95d53f98e159421934b8b7 SHA512 07d79153adfb5b7d447668c0fb6d22db9c2c026d5adfca658999107018ca392e55fb673273de986263479e493133e143a2523ef6133867db5c65a8f84f6a220a
diff --git a/net-misc/snarf/snarf-7.0-r3.ebuild b/net-misc/snarf/snarf-7.0-r3.ebuild
deleted file mode 100644
index 398ad27531d0..000000000000
--- a/net-misc/snarf/snarf-7.0-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-IUSE=""
-DESCRIPTION="Small and fast CLI resource grabber for http, gopher, finger, ftp"
-SRC_URI="https://www.xach.com/snarf/${P}.tar.gz"
-HOMEPAGE="https://www.xach.com/snarf/"
-KEYWORDS="alpha amd64 ppc sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/snarf-basename-patch.diff
-	epatch "${FILESDIR}"/snarf-unlink-empty.diff
-	epatch "${FILESDIR}"/snarf-fix-off-by-ones.diff
-}
-
-src_install() {
-	dobin snarf
-	doman snarf.1
-	dodoc ChangeLog README TODO
-}
-
-pkg_postinst() {
-	elog 'To use snarf with portage, try these settings in your make.conf'
-	elog
-	elog '	FETCHCOMMAND="/usr/bin/snarf -b \${URI} \${DISTDIR}/\${FILE}"'
-	elog '	RESUMECOMMAND="/usr/bin/snarf -rb \${URI} \${DISTDIR}/\${FILE}"'
-}
diff --git a/net-misc/snarf/snarf-7.0-r4.ebuild b/net-misc/snarf/snarf-7.0-r4.ebuild
index df683bcced37..82102a8b71f6 100644
--- a/net-misc/snarf/snarf-7.0-r4.ebuild
+++ b/net-misc/snarf/snarf-7.0-r4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Small and fast CLI resource grabber for http, gopher, finger, ftp"
 HOMEPAGE="https://www.xach.com/snarf/"
 SRC_URI="https://www.xach.com/snarf/${P}.tar.gz"
 
-KEYWORDS="alpha ~amd64 ~ppc sparc x86"
+KEYWORDS="alpha amd64 ppc sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 1bae5f2ded52..81e66df8b947 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,12 +1,11 @@
-AUX teamviewer-9.0.32150-gentoo.patch 3876 BLAKE2B 3989e1b27851217910ca76e834d7df1449c46aea16077d9048183113a77f01ab58aec151d3f225c5bb0e080fb040faa5c66447ebc197c1dc294c2ca1ae23ca5f SHA512 7eef0090c836ca304554dd064ef105a8ed141e8300a829ebeb6b73e233413efdbdf8662a48da340c11f4e8cddeb00d4cfe7d761e3adf532e48f61fccf642752f
 AUX teamviewerd13.init 285 BLAKE2B 7e81248f94f173569a76ec0a87926302b621c2086eb61796313d2fb4ea6decb26561398f6b435a7b55f93b22f7b9b64a6f996f7c3964af4de8e4271bff283c59 SHA512 2dc110140dc89b649cfd6ebc4312f23406a911b19b6aa59e877d8206f242c6ec8143cdbe63317909001becf253be216e081f31bcc667dc6a8b176cc31b79517d
-AUX teamviewerd9.init 482 BLAKE2B 841a1d6894aec1ed1249195613c01df526abb4833f7a81d266d708d39a0324197db46b433aa4cd937f1b5579ff7e66beee7272463429d9c99e99d9eadb1a2d0c SHA512 a229cf976e5ce7142dbb57989bb0e802a5b8cdf222f52ad768dfaaacb3ba160ab05d3e1ff1ca7770daf37d9c06e391c6a3c1843ec2be78a86450bcf2a3e4fca9
-DIST teamviewer-9.0.32150.deb 22898922 BLAKE2B 799aa6f48b69247a2695ca745e85d02ffa73df1375203dfc9da339673e6c18d861c4146ddbdc509bdc1114d5a2a7e5fdd4acf3c6e5da61fbba5aaa02fa4e3cfd SHA512 3e72ed5cab7a754a0aa75e533da92292ad004f66c55ac4c386b6f4a65cc41b14a8d9d7a5410dccdb90c1172cd33e52383289339ab44f0847a061655498ab8e4d
 DIST teamviewer_13.1.3026_amd64.tar.xz 11500188 BLAKE2B 98dab12224ea65cdb7c45f01a835cb50fd052e044cb2908a27e0324d5647c1bcc38565eca0c1e70e86fd96a9f70ddd4b6250f13cde1fd3c381be9af8ecb1805c SHA512 30914b761833dd2720458eb3a3076f59e521bdf4fd50489e1cb7c0c80a05ef73c2fd5a9a59a33644e73b96d8db1616665a130e2781c39f35f6c5bfb64c7c7b9a
 DIST teamviewer_13.1.3026_i386.tar.xz 11343300 BLAKE2B c0170acf9c67f34755800a0200016dacb6f93f3f3805932fbf467dc19bb0213fce74363a0bc703af1c62b4c1bafda2257bd0cc2c52aad4dd1f22ae5a9fb2d486 SHA512 f7dac040de4a0ac3489ee5e911c3c278723cee2372bd42a4a929d3cb268f735eb73cccc514a8d72cc49c82277869533289e3195936218be6db323e732c9c380e
 DIST teamviewer_13.1.8286_amd64.tar.xz 11574812 BLAKE2B 9941a3c1894e4b1a285ac61bdeffb47629c7972d19a573016c357275b3fc5ede51838f35acb2debe36ccd96c20cab6478868b78c831ab7137cb1196440e62297 SHA512 76b10c1df368f4c639ff60a69dc541f791b82b73a19accce4c60fdfcff2922a4a674e08da73df570587e840088b466f4791f8da0691582451259965044a18ccb
 DIST teamviewer_13.1.8286_i386.tar.xz 11422756 BLAKE2B 0bc408cbbf44bdeb84ce8c1d1274e8253ec261571670bce46130a325729eb801f101afae768a38cc43719abe625ebc89b12f3eacba507c9193e1049366b1c2c0 SHA512 1fdbdacfdd2f7884af246326e63f6bcfaf8efc95ec326f566216a173509a21891e4c66d85ef1290648a890135ae3fe23f185da36346d68c016da923b7c9c644a
+DIST teamviewer_13.2.13582_amd64.tar.xz 11472084 BLAKE2B adcec9bfb9ccedbc958eceef611f0f04b9b192313d3c060202166b77a4c2623008cbac147e9136925156446ef10a143283735f13c52cebd30e924329d1ff2453 SHA512 82a7cce2046a0dd268181044093e0d0bccfef0cbc2e842a94bc9a9fda87062b7236ff23606dd482e68baf8194b189ae6994603ac0584fad624d7f47366f34af3
+DIST teamviewer_13.2.13582_i386.tar.xz 11406728 BLAKE2B 91bd8fe9c30f8be9de2ce089a0f678e90cb371233c2e8a05e695aa203634846510f1381b449007648a4b0e6b2b201a654b71dae1c63ade0eb08e732ae343766b SHA512 9453b289ba99f63c75e1acb03d3e5a343db4814cffc4464b46116b269a6556e9fda4b1d963fa35e2e912ae959b09fd5dcfbc26ca31ccd76e6d3235be2d9cf55e
 EBUILD teamviewer-13.1.3026.ebuild 3703 BLAKE2B 5a6f0fd7fb45b4f79b9fc4be5198aaa0416d709f4d5883c2b7e54bd2158aef15171caf7861cc47986cc773bbe82d9cf14a40975070e9910333850281eb7fbff1 SHA512 af6fa5e352389a40dcd222b9ed6b25d43179d9eecea6f9d87aef2df66543fa26ab5c7e358caf17fe18a6a10f84045fbfe1cce3cf158f114b7ff959b6b3497709
 EBUILD teamviewer-13.1.8286.ebuild 3704 BLAKE2B f3811ce525af9e8fc62cf4563e575b2176930a6de394250b160959c14dc06d3df03c743d26292dd8385b069b3c99245f7f5024ccb125dde8f959ed48ab266ccd SHA512 0530eab9b9a03d04c7485245378816368611a897b2e87d6aecce42496ef9200a4103ddb1f07510c36d546ae60d2848237048d82c06e420abe14c1919dd0b8259
-EBUILD teamviewer-9.0.32150.ebuild 3254 BLAKE2B 42f581bc583d8f825a0f1f54fab320ddfc568f8f95542fed854c291356d24ac2ee9ad0d845671ce67e1e4ce2e9c23d6bdbc74bb7cc53ed340b79445fc6876e26 SHA512 ef00b858f78c0c9aaa0ec95009acd37ea024327a5a861cfa012c2e61a5be413aa5fb075b0860daddbe76c97d1f62da24069c716862322025321f6425335f0a84
-MISC metadata.xml 352 BLAKE2B af36f96af1efbb8c53eefbb51808382c6e2c374a18ee5af04fd99e27f57d0a636ff8e5da31baecb7cffeae221c7eff275a874549dffc601ac930d19b10c45fd2 SHA512 b415e73db6a9881413297f75d3fa15ae32c44ac4e0197c8f13ae09016ba2a22c3d62b3d2115f44ee1b156a3ad482f25fce51b36acbfd52c8948b3d56d225f535
+EBUILD teamviewer-13.2.13582.ebuild 3704 BLAKE2B f3811ce525af9e8fc62cf4563e575b2176930a6de394250b160959c14dc06d3df03c743d26292dd8385b069b3c99245f7f5024ccb125dde8f959ed48ab266ccd SHA512 0530eab9b9a03d04c7485245378816368611a897b2e87d6aecce42496ef9200a4103ddb1f07510c36d546ae60d2848237048d82c06e420abe14c1919dd0b8259
+MISC metadata.xml 250 BLAKE2B 94de840f3a83c87af4ee3224855111d06a5c77ebbe20d6691dd5a95b4677075a0e9e2fe405a327ac485056269bf3146d5ee6726843447f6436a97d1f7ef44288 SHA512 1ec261c858ac8824789dab07b4b01fde96e8d2a13add9b05617a4b824085d77c181057a7c602db5f4fd3b864b864e6314a64512159d174304fc4fba393b49734
diff --git a/net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch b/net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch
deleted file mode 100644
index 1df4632795bc..000000000000
--- a/net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/opt/teamviewer9/tv_bin/script/tvw_extra b/opt/teamviewer9/tv_bin/script/tvw_extra
-index 71164aa..848cd25 100644
---- a/opt/teamviewer9/tv_bin/script/tvw_extra
-+++ b/opt/teamviewer9/tv_bin/script/tvw_extra
-@@ -16,13 +16,6 @@
-   isInstalledTV || return
-   ABecho "teamviewer --passwd [PASSWD]"	"set a password (useful when installing remote (ssh)"
-   echo
--  ABecho "teamviewer --daemon status"	"show current status of the TeamViewer daemon"
--  ABecho "teamviewer --daemon start"	"start		TeamViewer daemon"
--  ABecho "teamviewer --daemon stop"		"stop		TeamViewer daemon"
--  ABecho "teamviewer --daemon restart"	"stop/start	TeamViewer daemon"
--  ABecho "teamviewer --daemon disable"	"disable	TeamViewer daemon - don't start daemon on system startup"
--  ABecho "teamviewer --daemon enable"	"enable		TeamViewer daemon - start daemon on system startup (default)"
--  echo
- }
- 
- function PrintVersion()
-@@ -37,19 +30,6 @@
-   PrintDaemonStatus
-   echo
-   PrintTeamViewerID
--}
--
--function PrintDaemonStatus()
--{
--  local cmd="$(daemonCtl 'status')"
--  local txt="n/a"
--
--  if [ isInstalledTV ] ; then
--    txt="$(eval "$cmd")"
--    [ $? = 0 ] || txt='n/a (error)'
--  fi
--  
--  ABecho "teamviewerd status" "$txt"
- }
- 
- function PrintTeamViewerID()
-@@ -64,20 +44,21 @@
-   ABecho "TeamViewer ID:" "$tvid"
- 
-   if [ -z "$tvid" ] && isInstalledTV; then
--    echo "Try restarting the TeamViewer daemon (e.g. teamviewer --daemon restart)"
-+    echo "Try restarting the TeamViewer daemon."
-   fi
- }
- 
- function SetPasswd()
- {
-+  echo "Stop your teamviewer daemon first, then press enter."
-+  read
-+
-   local pwd="$1"
-   [ -n "$pwd" ] || die 'no password specified'
- 
-   installedTVorDie
-   isSuperUser || die 'You need root permissions for this operation'
- 
--  Run_Daemon 'stop' > /dev/null
--  
-   "$TV_BIN_DIR/teamviewerd" --passwd "$pwd"
-   case $? in
-     0  ) echo 'ok'	;;
-@@ -88,12 +69,14 @@
-     *  ) echo 'unknown response'	;;
-    esac
-   
--  Run_Daemon 'start' > /dev/null || die 'failed to restart the daemon'
--  echo
-+  echo "You may start your teamviewer daemon again."
- }
- 
- function ExportLicense()
- {
-+  echo "Stop your teamviewer daemon first, then press enter."
-+  read
-+
-   local license="$1"
-   local path='/tmp/tv_global.conf'
- 
-@@ -101,8 +84,6 @@
- 
-   isSuperUser || die 'You need root permissions for this operation'
- 
--  Run_Daemon 'stop' > /dev/null
--  
-   "$TV_BIN_DIR/teamviewerd" --export-license "$license" "$path"
-   case $? in
-     0  ) echo "ok - license exported to '$path'"		;;
-@@ -110,8 +91,7 @@
-     *  ) echo 'unknown response'	;;
-    esac
-   
--  Run_Daemon 'start' > /dev/null || die 'failed to restart the daemon'
--  echo
-+  echo "You may start your teamviewer daemon again."
- }
- 
- function StripPersonalInformation()
-diff --git a/opt/teamviewer9/tv_bin/script/tvw_main b/opt/teamviewer9/tv_bin/script/tvw_main
-index 8984db0..c6dff8d 100644
---- a/opt/teamviewer9/tv_bin/script/tvw_main
-+++ b/opt/teamviewer9/tv_bin/script/tvw_main
-@@ -4,7 +4,6 @@
- source "$TV_SCRIPT_DIR/tvw_config"
- source "$TV_SCRIPT_DIR/tvw_exec"
- source "$TV_SCRIPT_DIR/tvw_extra"
--source "$TV_SCRIPT_DIR/tvw_daemon"
- source "$TV_SCRIPT_DIR/tvw_profile"
- 
- function Main()
-@@ -18,7 +17,6 @@
-     --help )			PrintHelp				;;
-     --version )			PrintVersion			;;
-     --info )			PrintInfo				;;
--    --daemon )			Run_Daemon $opt			;;
-     --winecfg )	shift;	Run_WineCfg "$@"		;;
-     --regedit )	shift;	Run_RegEdit "$@"		;;
-     --kill )			Run_KillTeamViewer		;;
-@@ -170,18 +168,3 @@
-   Init
-   wine regedit "$@"
- }
--
--function Run_Daemon()
--{
--  local opt="$1"
--  
--  installedTVorDie
--
--  case "$opt" in
--    ( disable )					removeDaemon	|| rootSuggest	;;
--    ( enable  )					installDaemon	|| rootSuggest	;;
--    ( start | stop | restart )	cmdDaemon $opt	|| rootSuggest	;;
--    ( status )					cmdDaemon $opt					;;
--    ( * )						echo "unknown option '$opt'"	;;
--  esac
--}
diff --git a/net-misc/teamviewer/files/teamviewerd9.init b/net-misc/teamviewer/files/teamviewerd9.init
deleted file mode 100644
index 3a625c95d3b7..000000000000
--- a/net-misc/teamviewer/files/teamviewerd9.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="daemon for TeamViewer"
-
-PIDFILE="/var/run/teamviewerd.pid"
-
-start() {
-	ebegin "Starting Teamviewer Daemon"
-
-	start-stop-daemon \
-		--start \
-		--pidfile "${PIDFILE}" \
-		--background \
-		--exec /opt/teamviewer@TVV@/teamviewerd -- -d
-}
-
-stop() {
-	ebegin "Stopping Teamviewer Daemon"
-
-	start-stop-daemon \
-		--stop \
-		--pidfile "${PIDFILE}"
-}
diff --git a/net-misc/teamviewer/metadata.xml b/net-misc/teamviewer/metadata.xml
index d3f49802a300..468f2c9086fb 100644
--- a/net-misc/teamviewer/metadata.xml
+++ b/net-misc/teamviewer/metadata.xml
@@ -5,8 +5,5 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
-	<use>
-		<flag name="system-wine">Use <pkg>virtual/wine</pkg> instead of bundled wine.</flag>
-	</use>
 </pkgmetadata>
 
diff --git a/net-misc/teamviewer/teamviewer-13.2.13582.ebuild b/net-misc/teamviewer/teamviewer-13.2.13582.ebuild
new file mode 100644
index 000000000000..a897021c7c98
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-13.2.13582.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=${PN}${PV/\.*}
+inherit desktop gnome2-utils systemd
+
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
+		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
+
+LICENSE="TeamViewer MIT"
+SLOT="${PV/\.*}"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/dbus
+"
+
+RESTRICT="bindist mirror"
+
+# Silence QA messages
+QA_PREBUILT="opt/${MY_PN}/*"
+
+S="${WORKDIR}"/teamviewer
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
+		-i tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_PN}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
+		fperms 755 ${dst}/${exe}
+	done
+
+	# No slotting here, binary expects this service path
+	newinitd "${FILESDIR}"/teamviewerd13.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
+	done
+
+	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
+	# have the undesired result of installing subdirectory 'doc' in /usr/
+	# share/doc/teamviewer-<version>)
+	for doc in $(find doc -type f); do
+		dodoc ${doc}
+	done
+
+	keepdir /etc/${MY_PN}
+	dosym ../../etc/${MY_PN} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_PN}
+	dosym ../../var/log/${MY_PN} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "Please note that parallel installation of multiple versions of"
+	elog "TeamViewer is currently not supported at runtime. Bug #621818"
+	elog ""
+	elog "Before using TeamViewer, you need to start its daemon:"
+	elog "OpenRC:"
+	elog "# /etc/init.d/teamviewerd start"
+	elog "# rc-update add teamviewerd default"
+	elog
+	elog "Systemd:"
+	elog "# systemctl start teamviewerd.service"
+	elog "# systemctl enable teamviewerd.service"
+	elog
+	elog "To display additional command line options simply run:"
+	elog "$ teamviewer help"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/teamviewer/teamviewer-9.0.32150.ebuild b/net-misc/teamviewer/teamviewer-9.0.32150.ebuild
deleted file mode 100644
index 3481c9c27e63..000000000000
--- a/net-misc/teamviewer/teamviewer-9.0.32150.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils systemd unpacker
-
-# Major version
-MV=${PV/\.*}
-MY_PN=${PN}${MV}
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="http://www.teamviewer.com"
-SRC_URI="http://www.teamviewer.com/download/version_${MV}x/teamviewer_linux.deb -> ${P}.deb"
-
-LICENSE="TeamViewer !system-wine? ( LGPL-2.1 )"
-SLOT=${MV}
-KEYWORDS="~amd64 ~x86"
-IUSE="system-wine"
-
-RESTRICT="mirror"
-
-RDEPEND="
-	app-shells/bash
-	x11-misc/xdg-utils
-	!system-wine? (
-		media-libs/alsa-lib[abi_x86_32(-)]
-		media-libs/freetype[abi_x86_32(-)]
-		sys-libs/zlib[abi_x86_32(-)]
-		x11-libs/libX11[abi_x86_32(-)]
-		x11-libs/libXau[abi_x86_32(-)]
-		x11-libs/libXdamage[abi_x86_32(-)]
-		x11-libs/libXext[abi_x86_32(-)]
-		x11-libs/libXfixes[abi_x86_32(-)]
-		x11-libs/libXrandr[abi_x86_32(-)]
-		x11-libs/libXrender[abi_x86_32(-)]
-		x11-libs/libSM[abi_x86_32(-)]
-		x11-libs/libXtst[abi_x86_32(-)]
-	)
-	system-wine? ( virtual/wine )"
-
-QA_PREBUILT="opt/teamviewer${MV}/*"
-
-S=${WORKDIR}/opt/teamviewer${MV}/tv_bin
-
-make_winewrapper() {
-	cat << EOF > "${T}/${MY_PN}"
-#!/bin/sh
-export WINEDLLPATH=/opt/${MY_PN}
-exec wine "/opt/${MY_PN}/TeamViewer.exe" "\$@"
-EOF
-	chmod go+rx "${T}/${MY_PN}"
-	exeinto /opt/bin
-	doexe "${T}/${MY_PN}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	sed \
-		-e "s#@TVV@#${MV}/tv_bin#g" \
-		"${FILESDIR}"/${PN}d${MV}.init > "${T}"/${PN}d${MV} || die
-}
-
-src_install () {
-	if use system-wine ; then
-		make_winewrapper
-		exeinto /opt/${MY_PN}
-		doexe wine/drive_c/TeamViewer/*
-	else
-		# install scripts and .reg
-		insinto /opt/${MY_PN}/tv_bin
-		doins -r *
-
-		exeinto /opt/${MY_PN}/tv_bin
-		doexe TeamViewer_Desktop
-		exeinto /opt/${MY_PN}/tv_bin/script
-		doexe script/teamviewer script/tvw_{aux,config,exec,extra,main,profile}
-
-		dosym /opt/${MY_PN}/tv_bin/script/${PN} /opt/bin/${MY_PN}
-
-		# fix permissions
-		fperms 755 /opt/${MY_PN}/tv_bin/wine/bin/wine{,-preloader,server}
-		fperms 755 /opt/${MY_PN}/tv_bin/wine/drive_c/TeamViewer/TeamViewer.exe
-		find "${D}"/opt/${MY_PN} -type f -name "*.so*" -execdir chmod 755 '{}' \;
-	fi
-
-	# install daemon binary
-	exeinto /opt/${MY_PN}/tv_bin
-	doexe ${PN}d
-
-	# set up logdir
-	keepdir /var/log/${MY_PN}
-	dosym /var/log/${MY_PN} /opt/${MY_PN}/logfiles
-
-	# set up config dir
-	keepdir /etc/${MY_PN}
-	dosym /etc/${MY_PN} /opt/${MY_PN}/config
-
-	doinitd "${T}"/${PN}d${MV}
-	systemd_newunit script/${PN}d.service ${PN}d${MV}.service
-
-	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
-	dodoc ../doc/linux_FAQ_{EN,DE}.txt
-	make_desktop_entry ${MY_PN} TeamViewer ${MY_PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if use system-wine ; then
-		echo
-		eerror "IMPORTANT NOTICE!"
-		elog "Using ${PN} with system wine is not supported and experimental."
-		elog "Do not report gentoo bugs while using this version."
-		echo
-	fi
-
-	eerror "STARTUP NOTICE:"
-	elog "You cannot start the daemon via \"teamviewer --daemon start\"."
-	elog "Instead use the provided gentoo initscript:"
-	elog "  /etc/init.d/${PN}d${MV} start"
-	elog
-	elog "Logs are written to \"/var/log/teamviewer${MV}\""
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index ee96ecc84887..b5a23a3ed82e 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,10 @@
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
 DIST youtube-dl-2018.08.22.tar.gz 3025389 BLAKE2B e8d2d8bccab8c169d08de35544e5efb05c65799c26894807e075edfe090d36de30fea787f54d59e4fc8b671356ce2e1d9002627948fb05becc9d2e3bc634164c SHA512 ef17c744ac27b3bf547124f18a155908a66ee75f3f6fb5d7dd8a1d8da61a5a598bbade6cf0362e8c93c337dcf47750db5f56357919226430f02d0b764011ffb5
-DIST youtube-dl-2018.09.08.tar.gz 3034241 BLAKE2B a388c707c771abd57814de119edc4a12c2fc569f72ed2881cc1906a30c2148d44b97c9866513eb8db0d95ce4c25e2275e41002bda796463eaeaeb0c99cdf6b31 SHA512 c1cbf38a185d6ba1525eb08064f95aa252cf8d461f140cb48dc4a795e209f5d31bc1583f4d52c2ea9f1c15dac46c563603e46f72cc896a7fec54dcb2d0a49c0b
 DIST youtube-dl-2018.09.10.tar.gz 3036301 BLAKE2B 341e74da88ccb890cf41ce81b3f541118b6afcae6baa6bc7722e41730894ee466e57b3475622309de12dec01e15d51534db90fe5751f785287665416e3ba71de SHA512 ebc0b0357231173718be3b94c2c2974496170e039a69cb58d809a1973a56306af058d91f485d2bacee5d665fea1f96d9f7243960556b42a7280a647611dca750
+DIST youtube-dl-2018.09.18.tar.gz 3041086 BLAKE2B 6cca8e87c26f9b2d1c9aa117d4e798cd80b12a423a9f63f2d79a6b55d21f497f372a1d5d72f48ebdf52d658f26934c7f1db9e44b5b6ed030bcb55a452a3e8f44 SHA512 9ec58e05fb7db0e08ffeea3810631b21654dda9a57849db76a7a8f9dfb6fc95fd685b36188354c9b28f6e35c818a56c44e4c55bc826d2d1c19b96cecfcc8662e
 EBUILD youtube-dl-2017.11.15.ebuild 2365 BLAKE2B cff79a16ba920a6b85b9e7970a12065fade413701a7b0fbd86e739887ea86dde832e7d9344f73fef2480e32d689c8c89ed3926afc9f2cf702b9385550dd38c04 SHA512 5be26dbc448c37d37db450f7b70aed88124794e7f80ba584485ee99fdb6288093e5bae05ca8b2e58eb783b7a398fc5b866728711588d43da6bf46c07f47bf1fb
 EBUILD youtube-dl-2018.08.22.ebuild 3286 BLAKE2B 998db6c1bf8f4bdb39152fa75712e4ebe98a9d69422b464328da90fb986e8ea07ddeb9e90cbff52dcd8012cce96ab06e48d7e4c87e6a660cc5fd90dfa5bd731a SHA512 927eab9548db77ce0a3455023a2f85bab64a0dae9a03d09d8b1ce96ec891bf32e49b2b2292abc5688db940eefae51473918df6449469f054a859820398782a11
-EBUILD youtube-dl-2018.09.08.ebuild 3289 BLAKE2B a166bf5cd416617633a5809e712fa972fe9ff5c52d550e93e94e4c7c82a03832e6f9d515af8f4316d49cf4332e78f353b74578a85128daa911d748641452bbaf SHA512 be1262c6cda81052b15b443b4c1a5613c50c930fee336cc0dc34ba504db9bdc80afce105cd838e20997ade21cc22185390abc209c2639975efcde017aa72f994
 EBUILD youtube-dl-2018.09.10.ebuild 3289 BLAKE2B a166bf5cd416617633a5809e712fa972fe9ff5c52d550e93e94e4c7c82a03832e6f9d515af8f4316d49cf4332e78f353b74578a85128daa911d748641452bbaf SHA512 be1262c6cda81052b15b443b4c1a5613c50c930fee336cc0dc34ba504db9bdc80afce105cd838e20997ade21cc22185390abc209c2639975efcde017aa72f994
+EBUILD youtube-dl-2018.09.18.ebuild 3289 BLAKE2B a166bf5cd416617633a5809e712fa972fe9ff5c52d550e93e94e4c7c82a03832e6f9d515af8f4316d49cf4332e78f353b74578a85128daa911d748641452bbaf SHA512 be1262c6cda81052b15b443b4c1a5613c50c930fee336cc0dc34ba504db9bdc80afce105cd838e20997ade21cc22185390abc209c2639975efcde017aa72f994
 EBUILD youtube-dl-99999999.ebuild 3156 BLAKE2B 3e94ee7379ea96aa47c6276d78bab9683bc2317980a7206d119c9710ccf99ec2da383bb8744208bf4d82af91990b12a769dc66760614330a2ef276c3051f3d05 SHA512 b45f8856a4d7067dfe53f1a7689373c001f0e1b98540cd1654001c9e23c442a245bf41d014945b2b84d818f0e26d0995fd7b35b73d3e3871a6c567c8e664c5e4
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.09.08.ebuild b/net-misc/youtube-dl/youtube-dl-2018.09.18.ebuild
index 1c433fb38eca..1c433fb38eca 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.09.08.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.09.18.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-21 18:00:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-21 18:00:10 +0100
commit	265dbe5dbc14c199299496c6db8fce3f76647015 (patch)
tree	ab18b5617d138f6684566b619405090989d55a2c /net-misc
parent	586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff)