gentoo resync : 11.07.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-07-10 23:40:16 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-07-10 23:40:16 +0100
commit: 51af5f0eb4cddbe6aa7953717873691d77aae9ff (patch)
tree: 1541525274162b033ebbc3ed38abaf335fbbd49a /net-misc
parent: 7014a5a3ea0feffab9701fdd6b64cc7667a985af (diff)
42 files changed, 487 insertions, 186 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 34cc0609426f..585bf4ce74ae 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/calicoctl/Manifest b/net-misc/calicoctl/Manifest
index 262d1f11aedd..fb8ab2e8ceb4 100644
--- a/net-misc/calicoctl/Manifest
+++ b/net-misc/calicoctl/Manifest
@@ -153,4 +153,4 @@ EBUILD calicoctl-1.5.0.ebuild 4548 BLAKE2B 552ba00a20c61cf2ceab79df6659e401da2d6
 EBUILD calicoctl-2.0.0.ebuild 7370 BLAKE2B 521081083aacd60a72b6c1a18b1d37d9de8a7447f38ca6b12417a884df9a64cbfde747a3461eea18cd8fa88fcd8750dabeec7bc636f3bc3a21f1a443415aa476 SHA512 24f4c1c654d3d6416b730e6bfba3dbceb55733c2795afb22ec0c151f862d9f5f9f496915f64531851b3683a4cc502a158bb62823189bfe9349750fc47dc20961
 EBUILD calicoctl-3.1.0.ebuild 7470 BLAKE2B f94887743cecbd2314584f534514f0520fa13c88aab9314c4e061465a976b4f3564e3e0e7d66aba8642d9f4402dd01a8e52d2037da99d87d1d8988e11dddb6e5 SHA512 01746b4b4226c4ffff1571e110340ed807af89e2b2c7e8cfc2fbe6f4229258c1884ae1f9c2a6e3ca13cd0944c78e1dd893d90c2813e91d2b3114505b6ae257fa
 EBUILD calicoctl-3.1.3.ebuild 7470 BLAKE2B 4275c796f7818af1b086d771a46b60f8bbc95de348665ea705bca8ad9bb5decb12ee7a33c02097977f2fa4304be15bb827924c09e966c0362c8f4e99206837ce SHA512 c34b13ea76ef55bc0983fb61f4e938fd9aa33a6ff633f742e9c480ae5be2a41086b637f4cb19ab38336227cbda1c0d8290d8d036190b72a008644b95106549e0
-MISC metadata.xml 256 BLAKE2B 529f31a3c12c3a50ddc0aca4ca98c8e1465251d5e538a6797532178498bff27cee211c6d4d7e688a8200f3ac6c3a982762f09224d0956f9e1fd73e5708b2b4e9 SHA512 a54493cc73446e0d3eabf497d2e42c835f6d2da48d7bf1cecbcfb20625087699453db4106f7e77efa7bd3a6335b7cf263397d83edffd670bac7cfb797e3a753b
+MISC metadata.xml 255 BLAKE2B 327b939e3f064ebf891076936ec8505f1c4c0aa4651c7afb71b78803ab7088b8212357e1c97295dbd51c7da2ea9bd5cbe1b6082b626d1b6b58c46368c05842a9 SHA512 b2eca26fa24e481e0129a8a44bea385892fa08b2c0997ac719bbfbe4119cb3c2b8a8ea36e4d714cf0143b18e3b1646f9408d4d668d1b7444519b8aed7541ee25
diff --git a/net-misc/calicoctl/metadata.xml b/net-misc/calicoctl/metadata.xml
index c752009243b5..29a7bc2a437e 100644
--- a/net-misc/calicoctl/metadata.xml
+++ b/net-misc/calicoctl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	 <!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">projectcalico/calicoctl</remote-id>
 	</upstream>
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index 6fbc75f83e6a..b884dcbc3177 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -3,5 +3,5 @@ DIST cni-plugins-0.8.0.tar.gz 3249919 BLAKE2B 78c0b20c3745d8ceb3596b65a57323cc3b
 DIST cni-plugins-0.8.1.tar.gz 3253670 BLAKE2B 7de5b53e310b496137c0ea0d6b4d22d5604e49fb4ada456eaad377a0b20d0b8883e7420a8d5f8cf92922e98b493608d495126772fd4205e4efb42b784fe3cea7 SHA512 ed57162fc3d014c897ee2f7f82b738624ca42ad7c238ac6ac5c1eb9ac865fe27f8ded1510cfb131f7b43e44f6cd0366ab83011386bcb6add36ea11235767760f
 EBUILD cni-plugins-0.7.5.ebuild 1070 BLAKE2B 752d58ce8af422059a73dba9dcf25c3695f63fc12b66ceca111c16b0a82b4c419256e454f6ef2618d2b2766d9419ab8fcd8b18c2115542e8c07be98cbc6f7d9f SHA512 da1505026c64b785ea08445748b5f262a4b1a078a220781f367ade8d7b61774829b6c0beb277cb9a6a53a9ad946c1538cd2d6c7e6b23de29c222bca03e7d9364
 EBUILD cni-plugins-0.8.0.ebuild 1131 BLAKE2B 16a64477e9238bacf2d3826ea9da620b2fea26dcb1f49fd61779f3c510d936f81bb7c9c8e82da7e2eb411eb6d276a4522d8e6f050175e45a82e27694ce4e6920 SHA512 2c8a59a874f191a5a6a7d6d367472ada15ff09c65c734df2943897398dbd06f4f6cec975ebdf2eee3c1fab2daa538f290c44c817151a2375a1cc4ccf83d0d495
-EBUILD cni-plugins-0.8.1.ebuild 1131 BLAKE2B 16a64477e9238bacf2d3826ea9da620b2fea26dcb1f49fd61779f3c510d936f81bb7c9c8e82da7e2eb411eb6d276a4522d8e6f050175e45a82e27694ce4e6920 SHA512 2c8a59a874f191a5a6a7d6d367472ada15ff09c65c734df2943897398dbd06f4f6cec975ebdf2eee3c1fab2daa538f290c44c817151a2375a1cc4ccf83d0d495
+EBUILD cni-plugins-0.8.1.ebuild 1130 BLAKE2B 1aa3cef41088f7be1bdbd050a547425ccd2ce2cefc0afcf8ac029980b043ff6f0cca65b576dda9315bdb5613a80abd3088e14a890759a2173009cdc0ce838dae SHA512 acb61386ae8a713f971138ca95e3394807ac238c906308695cac766bebdca5599607311e704fe77224401f42bd7e2c7d7b2db325b8f7278aa6fadb8411544725
 MISC metadata.xml 347 BLAKE2B 3028c057ca5c58bc39b10c01e9989088f0a2498a5a95a1ada88517dffe62daba52c8e6ead2fc8a7245ae06a95ffbc9306de03eecc82464ae0a6d2fbb4cdfb99b SHA512 b977f4287446648ff730c36e71002f524ae9a96c3fb104ee8542da90f6f996926a9b9809007f285e930d79842d9663cf4e462e8ee50da8319dcd3e07cf6dee05
diff --git a/net-misc/cni-plugins/cni-plugins-0.8.1.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.1.ebuild
index c8c1659634b8..47b31cca168d 100644
--- a/net-misc/cni-plugins/cni-plugins-0.8.1.ebuild
+++ b/net-misc/cni-plugins/cni-plugins-0.8.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit golang-vcs-snapshot
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 DESCRIPTION="Standard networking plugins for container networking"
 EGO_PN="github.com/containernetworking/plugins"
 HOMEPAGE="https://github.com/containernetworking/plugins"
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 981b06f845d8..bc68dcdae283 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -8,6 +8,6 @@ DIST dhcpcd-7.2.2.tar.xz 213600 BLAKE2B ae36cc44d32c034b41f9c970fdb154ef2935b53a
 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
 EBUILD dhcpcd-7.1.1-r3.ebuild 4641 BLAKE2B 4bf2bc06ab5ad509960e4730a91ac6cedebb2109ffb285cdc3381e3fcdec239e63d1ec26bb5037fbcb745e7532bfbb57673627a0165d197315da97326e8c63d0 SHA512 06fdb570c0f55e13091f6b12b014304b4e9036fb81194944fe7f53fd4809aa6376fa77e0e6d6cdec77d3649336a18363aa13ba4e921247ce20aa5ac37c688c95
 EBUILD dhcpcd-7.2.2.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5
-EBUILD dhcpcd-7.2.3.ebuild 4407 BLAKE2B 6984ce73636a4ef29bf29143a1ba122b0ab31566af2730907b0e24e9ab7e2d5b61698e3c0608e84004fcedc5c218b419727aca598bb1040859b59d5e0e09ee16 SHA512 d7f5917239a1caf2bf001071eb916ff53b26fd66486ec00c8c4595b95b2ea1c77971b88027d9e3e0e4f99dddd2da5dfe6dfb8eb23417d2418fc2392cb53d9a1d
-EBUILD dhcpcd-9999.ebuild 4407 BLAKE2B 6984ce73636a4ef29bf29143a1ba122b0ab31566af2730907b0e24e9ab7e2d5b61698e3c0608e84004fcedc5c218b419727aca598bb1040859b59d5e0e09ee16 SHA512 d7f5917239a1caf2bf001071eb916ff53b26fd66486ec00c8c4595b95b2ea1c77971b88027d9e3e0e4f99dddd2da5dfe6dfb8eb23417d2418fc2392cb53d9a1d
+EBUILD dhcpcd-7.2.3.ebuild 4414 BLAKE2B 62980ec1533101bf751b0d0b32a1280609f641e56f24ad0707739b4d29d52f25e9b9ac2d74d48466cad85b3b97b6c0b073245812159792f4d72cd25ddda9491e SHA512 09cad2c66e2d9250fa6163a12e4412303fea585b11ca6f41634f348b61b9ee085bb87ce30da483409d4d36f90417a2a3eb91d9e381cc19ba799988638e06b95f
+EBUILD dhcpcd-9999.ebuild 4414 BLAKE2B 62980ec1533101bf751b0d0b32a1280609f641e56f24ad0707739b4d29d52f25e9b9ac2d74d48466cad85b3b97b6c0b073245812159792f4d72cd25ddda9491e SHA512 09cad2c66e2d9250fa6163a12e4412303fea585b11ca6f41634f348b61b9ee085bb87ce30da483409d4d36f90417a2a3eb91d9e381cc19ba799988638e06b95f
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
index b74ad597f96b..491c778680e3 100644
--- a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index b74ad597f96b..491c778680e3 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index f783367c485d..c25032c2e656 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -4,7 +4,9 @@ AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
 DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
 DIST gerbera-1.3.1.tar.gz 2803481 BLAKE2B b6fef9b2f5904eb778279e2e8ff1f9b3cc53713142390c67d68d86d80893957aa55309c23df878766a188c2917bc33b2788d153317d9ef1ce60e96a452039e18 SHA512 dbac60300d2f3e0b7eb520c9cb3026be3a4e1e4a3e1f5a1c6ddb2279ffe7c30ed5c1a59373f0d9e43de2cec751a5ff6644c3af53f866fc6a54f549ae934a26e1
+DIST gerbera-1.3.2.tar.gz 2845728 BLAKE2B 15c8294486e9c5eb804d4b433e491b9db98821e0cc7274696b0056a8dde69beded83e092beddf31a171085d5913533a5d7dfe01afd1385f659da6fadd2eebaec SHA512 32a66dc25340969bbbbc2810199735b72ff258eb2d4a359402469f4ce21690843d37ad4134667d10f03967d113b33b08bcae7329cdda49dfd60dbd01b21d5b27
 EBUILD gerbera-1.2.0-r1.ebuild 2558 BLAKE2B c5f81e11241cb74d63428c263cd0141d61a90f595f8c42ad4f2987d73f885ff6275b85f9ad772b8ff8862847119dd953206972ebe8461e659cf5bc9476b3da89 SHA512 57b790ea36d49c2ecff0116d0aa2e583a8a6bc9847e79396d93061156c06d2b9380f9725a543e4f1cd6f91574b6cd77c26fec65b77552308998b886f6f993495
 EBUILD gerbera-1.3.1.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
+EBUILD gerbera-1.3.2.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 EBUILD gerbera-9999.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 MISC metadata.xml 1209 BLAKE2B b724abc66f5a3111c66a94331e61f9a50ae67344dab4695e7fc68154ddc9843e0295c7a12438e342be409b9429a4f9c60abce02422594df708d7933521bf9673 SHA512 c91dddacee6beab0a3cec3ab317810f77d3715a84384ceeafd3bdc872fff6d352d6bd4312d8194b59a159604794b0197780db6c27b20a327afa1e7bb9cba6a26
diff --git a/net-misc/gerbera/gerbera-1.3.2.ebuild b/net-misc/gerbera/gerbera-1.3.2.ebuild
new file mode 100644
index 000000000000..1b1129c47251
--- /dev/null
+++ b/net-misc/gerbera/gerbera-1.3.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils linux-info systemd tmpfiles user
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
+	KEYWORDS=""
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
+HOMEPAGE="https://github.com/gerbera/gerbera"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
+
+DEPEND="
+	!!net-misc/mediatomb
+	>=net-libs/libupnp-1.8.3[ipv6,reuseaddr]
+	>=dev-db/sqlite-3
+	dev-libs/expat
+	mysql? ( dev-db/mysql-connector-c )
+	javascript? ( dev-lang/duktape )
+	taglib? ( >=media-libs/taglib-1.11 )
+	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	exif? ( media-libs/libexif )
+	exiv2? ( media-gfx/exiv2 )
+	ffmpeg? (
+		libav? ( >=media-video/libav-10:0= )
+		!libav? ( >=media-video/ffmpeg-2.2:0= )
+	)
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	curl? ( net-misc/curl net-misc/youtube-dl )
+	magic? ( sys-apps/file )
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CURL="$(usex curl)" \
+		-DWITH_DEBUG="$(usex debug)" \
+		-DWITH_EXIF="$(usex exif)" \
+		-DWITH_EXIV2="$(usex exiv2)" \
+		-DWITH_AVCODEC="$(usex ffmpeg)" \
+		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
+		-DWITH_JS="$(usex javascript)" \
+		-DWITH_LASTFM="$(usex lastfm)" \
+		-DWITH_MAGIC="$(usex magic)" \
+		-DWITH_MYSQL="$(usex mysql)"
+		-DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
+		-DWITH_SYSTEMD="$(usex systemd)" \
+		-DWITH_TAGLIB="$(usex taglib)" \
+		-DWITH_INOTIFY=1
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
+
+	insinto /etc/${PN}
+	newins "${FILESDIR}/${PN}-1.3.0.config" config.xml
+	fperms 0640 /etc/${PN}/config.xml
+	fowners root:gerbera /etc/${PN}/config.xml
+
+	keepdir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog "Gerbera has been built with MySQL support and needs"
+		elog "to be configured before being started. By default"
+		elog "SQLite will be used."
+	fi
+}
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 92dae81b4a65..59570a404021 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -10,6 +10,6 @@ EBUILD httpie-0.9.3.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81a
 EBUILD httpie-0.9.4.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81abd6fb18f9148a5448b42dce6e3432ba30b5d503acebb3b106a51e3a347aee00dfad4dcb65f28518b4a27164 SHA512 7ea93c3300d0b614babf04ddaab3ff0e8636224d6ff99f8756cc1f7a4eebf4e21494e8afbb920218e1846f71316a212e47e763be7173796ab2528e1334553cf8
 EBUILD httpie-0.9.9.ebuild 517 BLAKE2B d0b2031926effcd24b8d23b1dbf3ea311294dc439f56cefdb30359d82c0e727bae8cc19f37bc6681b4c61b3b715e00a7f20c8245464aefb46899395b5c9a29ad SHA512 880dfc9565f7f3791e97ebd946178e0dfcd2896e00813725f2b726d06091201b055fd759107459524c4d7ff35e6af1cc4cdf18cef2a94e23d11181a51f0fb0b9
 EBUILD httpie-1.0.0.ebuild 797 BLAKE2B 8964804fd47ee2543d5bfd7557a020a5103a4f0cc1534653786baab8d2073421c6ad2ee839ac85a7e39cd2161d3008f49b6e89d32663a6232ea6c3409f30880e SHA512 51b519746529294e151c982c8b45270223310796472b91e3b42ec88decc1daa8b39ec6af34b50319176c9245aa2eadd6010913ef5800c711f9e7efb909454f70
-EBUILD httpie-1.0.2-r1.ebuild 1178 BLAKE2B 7828143ca9265e373282a7f3fbce6e9cad8245dfc870f5dfd915c125770dfd1c8005e71ce07eff5c025eb3bdbce3cacfd8288556c2c0731402f0815d3c6384f2 SHA512 14ef3bb2498ecd3c5a72d867a1c3d0caaefc2f300954af28a5ee81deb075d886e97ace96dc57e6f9361c0a06a194467fb70993036e404fc13e9d2954113a7ce1
+EBUILD httpie-1.0.2-r1.ebuild 1176 BLAKE2B 751f1e157f875752477bc5453de9e592bc39542ccdb998fd5fa14e34da14cfb04e9268742b101e9cc5efadb6087c58fa35a88c5bbd13c2e7bb55b541d37fc173 SHA512 be69977798c726337afeaf9447d800dd9141685894a446e7240ab7dd90c03612710aec61ab14d62c45701c6b8ca1870188eb087d283d04cd3f1a461eeaea0c08
 EBUILD httpie-1.0.2.ebuild 1042 BLAKE2B 54222b437a055f9c3f89a09cc7c14a907db25014556760e2406b9c4bc187d085f791e96e4ac96de761029f6a0be68b296e41a4c2543cd462c815824e34959a81 SHA512 e89cdafdf8e9102447a32e3a6e2eaf635e80aa1f325b70e94730b901cb0491bdbf55cc0ad2ea867fac4e233f9050fb1304d5618a25cf95eba265a362fa5fa602
 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb
diff --git a/net-misc/httpie/httpie-1.0.2-r1.ebuild b/net-misc/httpie/httpie-1.0.2-r1.ebuild
index e7057e9fb651..aac3979a8995 100644
--- a/net-misc/httpie/httpie-1.0.2-r1.ebuild
+++ b/net-misc/httpie/httpie-1.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index d8e7d6635608..c0a4a5874b39 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -4,10 +4,10 @@ AUX conncenter.desktop 194 BLAKE2B 96fdae8892ec9cef05a92e129bba42efb666874a2a218
 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
-DIST linuxx64-19.1.0.9.tar.gz 22074792 BLAKE2B aeeb8df5a63d08c94718d069c2f3e259d22309cab8ba3f046e9b1d6ecadbb9ddc7a7049bd6837944e42cfc9f625146218208802a2bf0f3bdc32f1f7d162a8700 SHA512 21539546fd24f7781e6a114e345392ee85e0f27f0f4b8a641e8b94f9a96c4a0e14f3d81838a3735c6098c251b022b3e30ce0c530b686f7587029cd2983516cfc
 DIST linuxx64-19.3.0.5.tar.gz 22254035 BLAKE2B 7ed276f0096a39a9089c02fba4c2a62f4cf7de524b24210c979c272105f40294a7773e14ecb6a6e6f65f07e9a7400a83d5c5c0dd306cf7dd1cbea4f39f489d73 SHA512 5331ec70771016ef01cb99eed9ea058e1c318b119c245318803a0f72aeaf14fd00a90150fe59b03342894f7a627affa9a383d5bd783fee424f55978db6136489
-DIST linuxx86-19.1.0.9.tar.gz 24175639 BLAKE2B d73d3d438ef272f9571587cd66e357bca4698d797ea813dafb47b6c61a86606b2021b5659908d160e3baec7b668265d4dccbf8f009c4c77c99e1258fec28c22f SHA512 110d1f160f6f4538bb589682bcbb8414b816d0669dc1fb4559243ee335a6e6129af8e50d47feadd7688808affef7bcaa300fc6c01fb05b84938fe449f7e9d05d
+DIST linuxx64-19.6.0.60.tar.gz 101850500 BLAKE2B c292a6dbde3f6b7a52952ceb1c6127729be9c82b2447138bc3487bc3eafba95cbe6b54e18df8b91583330dcd47f30cd51a1ebc0bcbc869baaf003024a889efb7 SHA512 952a81734b8284489a3e03a894ca721ba1f47227217cbc021fcca310ed6ebc53195b7df24985f408062b472b5be580b4b4719d1809ee01b0ab634d5cb5e06258
 DIST linuxx86-19.3.0.5.tar.gz 24360452 BLAKE2B 823a26f23fd4979b633baa2d47034bfb6c71cad9568853dad12d857dd4a3df0e1f885d79d69e440ed01f2f9ec0af4f64a0ab9cd1460aead5cd3d2c36e7436897 SHA512 253d11f2d46928eda958036d398a58d33239beb9f754a381244ed5333277435c7d1f5bff77e8b79ec9066cb2f7e8b67b71b6609d12e8faa869a79d3109d7261f
-EBUILD icaclient-19.1.0.9.ebuild 4989 BLAKE2B c26e3af515365fab7ce09ac1938ab4e4379996075396d86004b7268502497ffaf2f75461f341c2252bfd91ae4a9ed437d7d66479f76f0c80e942d7938a78bcf6 SHA512 28e8147c102fb7a24cc47c2410aa8a863902a5525c741d756f919ff7cd4b7b7d2e8fcc0e2a1e642a00a7001dda75e9f18eedff459f24f1fca055083b6409eb6c
-EBUILD icaclient-19.3.0.5.ebuild 4991 BLAKE2B c54a0bebdce6b4d633315c3305a9bd6cd7f7423211e8254b92c0254230f732c6014aa68a76560ef346251590919bb5e7738afc000ba43a20240decb1f6f25514 SHA512 64ec9b3170350fd13f5046f84d650efa11dd41b9b4f41418757a483ef2e0f6fbe890947010706cd00311f92484572520ff8bc82baa0305fb3ffe473376fce2a7
+DIST linuxx86-19.6.0.60.tar.gz 108052444 BLAKE2B ce784be607ac74a4087a66fa492625fbb6aec6cf04271ecc6114e0a1d8940314f0f715dcfc3842cb145f05cf880f164dd83b4bec7d3ba63fa021bc2a5fde0d9e SHA512 9056d716f0c9f895d5d24eb81582b6f9ac1cc5db5063d2edf892841ad87d4bd58d68ba67b03f7f04f7287d2472b067ae3d2040bc3c773e5c2a79a401dbd04732
+EBUILD icaclient-19.3.0.5.ebuild 4989 BLAKE2B c26e3af515365fab7ce09ac1938ab4e4379996075396d86004b7268502497ffaf2f75461f341c2252bfd91ae4a9ed437d7d66479f76f0c80e942d7938a78bcf6 SHA512 28e8147c102fb7a24cc47c2410aa8a863902a5525c741d756f919ff7cd4b7b7d2e8fcc0e2a1e642a00a7001dda75e9f18eedff459f24f1fca055083b6409eb6c
+EBUILD icaclient-19.6.0.60-r1.ebuild 5008 BLAKE2B 0ca7ba0c28dd86b1a13a34f22e9bd50a177604dbc984c80548e00b5e30d70568f113093bdc9af88ed3660e5e5341cd78c00cd91875fa955a91689f73310004e5 SHA512 20146681e6eacd2ea6711a836c151db203c288f4dce8402b38f2033785110c83e7efc5078f5b98e515b9c0697af2485b9027766e6182767d277e86e7bd299a94
 MISC metadata.xml 678 BLAKE2B 7ca853d90b1492bd1c15b9e0109430afbedae032ef56a035cf75de74796f694b2ab955dca5f3ef93a97a1c61686ead93b1bd1579802b35e0bd381d0d0c35d5ff SHA512 a838a68c22e2f1585960a7699399285c0c9b47b79734a22adc5d74599380c7c7792428dd7287f1e62d1194a4f97c79e902910f4c1569fc227f0f7e1c39afc8d0
diff --git a/net-misc/icaclient/icaclient-19.3.0.5.ebuild b/net-misc/icaclient/icaclient-19.3.0.5.ebuild
index 2d9d98b6226e..e74facfe0cc5 100644
--- a/net-misc/icaclient/icaclient-19.3.0.5.ebuild
+++ b/net-misc/icaclient/icaclient-19.3.0.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="nsplugin l10n_de l10n_es l10n_fr l10n_ja l10n_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-19.1.0.9.ebuild b/net-misc/icaclient/icaclient-19.6.0.60-r1.ebuild
index e74facfe0cc5..e41add9f57e4 100644
--- a/net-misc/icaclient/icaclient-19.1.0.9.ebuild
+++ b/net-misc/icaclient/icaclient-19.6.0.60-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="nsplugin l10n_de l10n_es l10n_fr l10n_ja l10n_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
@@ -35,12 +35,11 @@ RDEPEND="
 	media-libs/freetype
 	media-libs/gst-plugins-base:1.0
 	media-libs/gstreamer:1.0
-	media-libs/libcanberra[gtk]
 	media-libs/libogg
 	media-libs/libvorbis
 	media-libs/speex
-	net-dns/libidn:1.33
 	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
 	net-misc/curl
 	sys-libs/e2fsprogs-libs
 	sys-libs/zlib
@@ -49,6 +48,7 @@ RDEPEND="
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libXaw
 	x11-libs/libXext
@@ -94,7 +94,7 @@ src_install() {
 	dodir "${ICAROOT}"
 
 	exeinto "${ICAROOT}"
-	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+	doexe *.DLL libAnalyticsInterfacePd.so libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
 
 	exeinto "${ICAROOT}"/lib
 	doexe lib/*.so
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 681637225e40..469bb5e7f78e 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -4,7 +4,9 @@ AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
 DIST miniupnpd-2.1.20190502.tar.gz 236052 BLAKE2B 9f2f81769d72fad2191969e0e80b4d2e70619d5674fe6b4ef9f4306e09ac4737577a2146bc04ec9960df092252abe3c9a57e32d5d893a763b85863d1c4892045 SHA512 6423cef89b5af62b6b6a120a3cd13a0e7755d609b33de8f1671f7f9160fb1b5e68b0ebd3f8b7b5758cf05a1c58b416cde253e37bc5ba0bb423c14b5fb44599f1
 DIST miniupnpd-2.1.20190625.tar.gz 240120 BLAKE2B c6cf6b549a1c0c4a411d9487a3dae348d8a37767b9590d29ea763177d876ceb6f521bb7662452e2dff813354fc52f862bcc830079b3ff8af8185de6ee2771e8f SHA512 3b9a14f24c7e753cc71b84622bfbbc0db4a5b5e0fd602ef1129b89b1c729e754c51f5c29b4bf8d1cc37a16f77b33f04cf3f3540afe1ac529105cb91f45fa92c8
+DIST miniupnpd-2.1.20190630.tar.gz 240466 BLAKE2B fe4d4e59a7dad32bef9ed9b4c58b52e378ec9b26ea2439e84284630a7ef7269c6cd53cabdc632ff274cae88aea2552a8808af2ea349138f8b8ed667baf9e87ee SHA512 cd6006e5487652a258f7320e1e28fea7b0790528cc014071109a1abd0f6c249237cf8d0620987c14ee0ce1cca14f4bb4abd439b1d422e0e49a398cd485eaf970
 EBUILD miniupnpd-2.1.20190502.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722
 EBUILD miniupnpd-2.1.20190625-r1.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
 EBUILD miniupnpd-2.1.20190625.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722
+EBUILD miniupnpd-2.1.20190630.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
 MISC metadata.xml 1037 BLAKE2B 9fa42839f13b135ac2b69091b9d0ba1d3749f3b9903bcaa209c0d23ff981615c58df027725a536b4e268c53eb285ab6750bbeb7e0bc8e668dfca61b787ec9c60 SHA512 536ef1fce9d3d76eb33a88707c5750fc0b014cf29b4c20d3459bc0116a68234667689a297e8aae35507f1b6b9fde7590d14b3763f2813c485478e18f396bfeb8
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190630.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190630.ebuild
new file mode 100644
index 000000000000..07c804f35640
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20190630.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)"
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+src_prepare() {
+	default
+
+	# Prevent overriding CFLAGS.
+	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
+
+	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
+
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_configure() {
+	local -a opts
+	opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+	)
+
+	emake CONFIG_OPTIONS="${opts[*]}" config.h
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index 0d14f0ee85ba..be69c421423d 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -2,6 +2,6 @@ DIST mobile-broadband-provider-info-20170310.tar.xz 85016 BLAKE2B a43312e1772fc5
 DIST mobile-broadband-provider-info-20190116.tar.xz 85904 BLAKE2B e41ca1914c8b9c47f52f5b65cbfef577814269a23c5777fb1caf582cfc1c0c9a5125f51907748de8516b8aa3a8cf3fb044c8521d305161b206cc75f06e791764 SHA512 82cbf2c4523bc941d7cbfb1f552057d8259fcccbf95d02a6d43d315136050928ae5a8cf85f9900196214b803bb087446e28254d148af6b004225518f07aa9d23
 DIST mobile-broadband-provider-info-20190618.tar.xz 82640 BLAKE2B 6aad85193297a17c4606bdc700b0d3c7ce59c897d5d8fe0cec4ba3d17168aa519971c52a6b4c1f133c24a8fbd3f2ed1f3d45461248612ac95fbb746a3de9217f SHA512 511e6561b9b0db6c26f2e08bd06bb1dc9bb46696730fe6c6eba82cceec600dad684dc8dbe27adae78956367fb00dd8745070046acaa7a1129f194d8f16df425a
 EBUILD mobile-broadband-provider-info-20170310.ebuild 462 BLAKE2B fe682e0d76f4fd4a394388b40036b5a9923d0a4fc664218424f50ea0a619e1464789d1f013a87bc63d97528b9f21e803af771af7217c714e88f5e4c2e142226b SHA512 ecec2bcf1de8a1fe7a1cde63cb3905555c6611ce55ef3a78f4c2d2e62a8761dcd9599cf486567859b2eb3b46fa095597df9d42055361dedd362fce9ac16f1da4
-EBUILD mobile-broadband-provider-info-20190116.ebuild 461 BLAKE2B de72807866379f9eaabc59247630b621b49b2e3895e0dbff927650ce9a33e6767c53efb3fe5cf8de377eac134ab00ab916ace2115ab35402bfb96ff1971429bc SHA512 d71a1f4fb4db90b8be5d5ebe898d47053d24aa449093152cea5151b38afce7e5ee960d6533e8dad0a084298325e9a94d6818ff2fde394fd93a8b8036156e9488
+EBUILD mobile-broadband-provider-info-20190116.ebuild 460 BLAKE2B 78713b69e4635996aeb9f419f02b3fd2e1b8e10152b2b182bd4470a96568befb2729f474b5e86d9f38174a4e244af4b825a333bd1000c5d2aa002d253f010181 SHA512 6bbd0f2de69bee70664ee763f35d04c12c167dfc6b8620c67188cf2071de9d0df9238d56152fb3be688e9b73e6704b18a6ac967f7b1168f6b8f092b657ed0591
 EBUILD mobile-broadband-provider-info-20190618.ebuild 451 BLAKE2B c8f4bfd36aa1e660190dea24bbb42c5280c15f625f79863f0b03e29df6b8f8afa65d3aac08f1c6be1a0e9326d9a3425512d9e319ffdeefaa2a826d8bcef84649 SHA512 2c61b42043cc65a04e98453338ea16b38acebab94fed8ffbcc91abdbabf067948dc8e4d3bcd21288f21c5ff4d6adc29906b7ba92c8261885923a89051d13621a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild
index 88967bf8f582..a07911ff0b5d 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 369a001f1bec..da0516fab64f 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -19,5 +19,5 @@ AUX sntp.service-r2 324 BLAKE2B c94e72170f46453e94d6fb48b3ee353ba2db1bdf1903f652
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2
 DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075
-EBUILD ntp-4.2.8_p13.ebuild 4564 BLAKE2B 4f5b295213b082f84f881ee4558be6975afb5d2e682e361e0ebc9bb5ddc2f47f55bbef287dfff2a470779db14415f2604e9135dd5d9b81d2c660b8075695055a SHA512 355c117551444818f11aa37267855dec04648e7425ee47cfac6aa16396bb0a27d9f64cf7562e4576e78cf2418c48d27d0c71b01dc3f5903f43a3892a5ff81866
+EBUILD ntp-4.2.8_p13.ebuild 4571 BLAKE2B 1884c38ee5b85477cfa32b39d6c42b0f24548cef45a8542d36b4ca39a5d3d3dc26e2dd964edb731e04e4ecb0eb7fbf2a4eec05254fcf04f5cac18266d6dcd4ea SHA512 ff1997994042aaf04638ad9a14c2c7acd05983faa2f21c78626d0d2596f82b73102082129804a465b4c3cf6974f1a1b510bacd36f639f5272543569de7bcf675
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/ntp-4.2.8_p13.ebuild b/net-misc/ntp/ntp-4.2.8_p13.ebuild
index c925543d0c30..1e6b75a72ab8 100644
--- a/net-misc/ntp/ntp-4.2.8_p13.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index adc4f5b4aa4c..277a33ad4d26 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -3,6 +3,8 @@ AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fd
 AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf459ea335058ff8a7835f3931017505aad6c5ba60e546b608ce26a51ad38f5972675d0a47559 SHA512 dc89a58edf6f83878d42522a015f2c3e12db9505ea3d6bc4b04e6e82947a7be6e8d143e8808bb58644641dd754744fd4be20c8b944a4261b460c30b95436fc31
 AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b4544f1df565828da2b685ce408061bc03f9a7991fbd61a9b42577c4e6db06bd2a4a012949cafe2dc SHA512 b625e993bbeba5da9c0f14ec8ff9d256575d9590a6c506436e834a9dc17877bfd57920b008bd01409d47de71acfb221a0d92c0203e2aacca33083e196466faf9
 DIST ntpsec-1.1.3.tar.gz 2462330 BLAKE2B 903e569ad72939def9df31d7b51b2623b140754de67362213f39e39ad770d903d70c45a10a18e98ae35927792666ae27de40b41a5c0bfe6fd8cfa6a37102d4e8 SHA512 df60c5fa63d4c94529ba1e8b21c7d6b5d0c9fb810ed7546a621b072725a6ff03edbd2dcbc3baf19ac3b3a9b82d7aff3ddee4ab8c93559b7065ed06a211b538c4
+DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67fd9fd16564323ce825cb9e36d7d5fb48a38b734600286cbd039f41f296d9e488e25d2680f08412aa983101987b SHA512 1b74e7cb87e189137e1b66b52ce89498e0061a10abf017c36bfdecb4aefe9c3fb6e8fd7819a9f822fb946dca6ae20ee724b2aed35e03d73f8e3015d8818d02db
 EBUILD ntpsec-1.1.3.ebuild 4068 BLAKE2B a0dc5a6733d392982c0c6a55760974b3ff22b055a220c0841a5e0aa1d1e01291495c115d8751317eaf83e8aad1556cfb48962dec7b5c19d788aee0dc16de51ca SHA512 fc551143326b61f2039e747ccae7d7d82409768d4a447eb51858207aa6c7f3656121e4d7e89a75b94b4b0e5f04bb20cbf19f67a78ea454d4204bbbe25f962f5a
+EBUILD ntpsec-1.1.4.ebuild 4064 BLAKE2B e85f6d74f70f0302d6d93d2dcd1d5769f743d86c85d880113ad25fd483dbbfac97c408efa012e22bd81c94a3bd0a6dcd92a0910a3f39f4ac5a65212544c2482e SHA512 dcd0195ee1c8585d3c88dcb6ce77fb1301cb59b879a5c77e84732d74bf272f5a2b02a2e0661bfe7393f4914c1bd9c917c58cec63c54caf4098151810cf3c299a
 EBUILD ntpsec-9999.ebuild 4064 BLAKE2B e85f6d74f70f0302d6d93d2dcd1d5769f743d86c85d880113ad25fd483dbbfac97c408efa012e22bd81c94a3bd0a6dcd92a0910a3f39f4ac5a65212544c2482e SHA512 dcd0195ee1c8585d3c88dcb6ce77fb1301cb59b879a5c77e84732d74bf272f5a2b02a2e0661bfe7393f4914c1bd9c917c58cec63c54caf4098151810cf3c299a
 MISC metadata.xml 2008 BLAKE2B e4f1a7e79fbaf5011ba2b26143c138f39663be73664ec9f1270e9b6cbcb553c245201c9a5bd0771435a24e1f342907861e8a2b6808cc2e3f6d6a7a10ad6ed021 SHA512 5c8fc24233d577ebc254a6d92d93734bfb10ef287217ef61f4f6e8b28f059ee7e92bc5e18326d61a9e80fa7504f79c820d831cdad489321a9f45bae0a4d54a16
diff --git a/net-misc/ntpsec/ntpsec-1.1.4.ebuild b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
new file mode 100644
index 000000000000..b227382f452e
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic python-r1 waf-utils systemd user
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+	BDEPEND=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
+	RESTRICT="mirror"
+	BDEPEND=""
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+	oncore trimble truetime gpsd jjy generic spectracom
+	shm pps hpgps zyfer arbiter nmea neoclock modem
+	local)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+
+# net-misc/pps-tools oncore,pps
+CDEPEND="${PYTHON_DEPS}
+	${BDEPEND}
+	sys-libs/libcap
+	dev-python/psutil[${PYTHON_USEDEP}]
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="${CDEPEND}
+	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
+	!net-misc/ntp
+	!net-misc/openntpd
+"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	sys-devel/bison
+	rclock_oncore? ( net-misc/pps-tools )
+	rclock_pps? ( net-misc/pps-tools )
+"
+
+WAF_BINARY="${S}/waf"
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+	default
+	# Remove autostripping of binaries
+	sed -i -e '/Strip binaries/d' wscript
+	python_copy_sources
+}
+
+src_configure() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+	local string_127=""
+	local rclocks="";
+	local CLOCKSTRING=""
+
+	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+		if use rclock_${refclock} ; then
+			string_127+="$refclock,"
+		fi
+	done
+	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+	local myconf=(
+		--nopyc
+		--nopyo
+		--refclock="${CLOCKSTRING}"
+		$(use doc	&& echo "--enable-doc")
+		$(use early	&& echo "--enable-early-droproot")
+		$(use gdb	&& echo "--enable-debug-gdb")
+		$(use nist	&& echo "--enable-lockclock")
+		$(use samba	&& echo "--enable-mssntp")
+		$(use seccomp	&& echo "--enable-seccomp")
+		$(use smear	&& echo "--enable-leap-smear")
+		$(use tests	&& echo "--alltests")
+		$(use debug	&& echo "--enable-debug")
+	)
+
+	python_configure() {
+		waf-utils_src_configure "${myconf[@]}"
+	}
+	python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+	unset MAKEOPTS
+	python_compile() {
+		waf-utils_src_compile
+	}
+	python_foreach_impl run_in_build_dir python_compile
+}
+
+src_install() {
+	python_install() {
+		waf-utils_src_install
+	}
+	python_foreach_impl run_in_build_dir python_install
+
+	# Install heat generating scripts
+	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+	# Install the openrc files
+	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
+	newconfd "${FILESDIR}"/ntpd.confd ntp
+
+	# Install the systemd unit file
+	systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
+
+	# Prepare a directory for the ntp.drift file
+	mkdir -pv "${ED}"/var/lib/ntp
+	chown ntp:ntp "${ED}"/var/lib/ntp
+	chmod 770 "${ED}"/var/lib/ntp
+	keepdir /var/lib/ntp
+
+	# Install a log rotate script
+	mkdir -pv "${ED}"/etc/logrotate.d
+	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+	# Install the configuration file and sample configuration
+	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+	# move doc files to /usr/share/doc/"${P}"
+	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
+}
+
+pkg_postinst() {
+	einfo "If you want to serve time on your local network, then"
+	einfo "you should disable all the ref_clocks unless you have"
+	einfo "one and can get stable time from it.  Feel free to try"
+	einfo "it but PPS probably won't work unless you have a UART"
+	einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index ae4a6d35e524..dce6e7b82045 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -3,4 +3,4 @@ DIST seafile-client-6.1.7.tar.gz 2260217 BLAKE2B 96d032d5d9332cd40fabc135a132ad9
 DIST seafile-client-6.2.4.tar.gz 2345481 BLAKE2B 7efc25830c6d4b2203390ae453d2e9162b62e477cc12f58a03c9fed0730630c8c077f37aff2b467dd960671a3ab9f41b18be32283bcc3e6b597b9a4f1cb99688 SHA512 754d317e812d340c1a3d4eddeede6d8fe535b02c2f0aca4bda07c020389dad3bd7bc937b1c13ea7ac8ee3e833c8e2fe8f7b74f1051395b5a35deda46d727beeb
 EBUILD seafile-client-6.1.7.ebuild 1333 BLAKE2B e43343c956390b439e47bf7738b2fb9999b451e6e51c3db0bed3cf05e9d1c9628bf2c6a307663fe182b4db60151da302c250537f1dd0cd145bc6384f8eea878b SHA512 99e4fa02aa9270e7467a7c719f527a8bd892d56fa99fe011fe198fe9d61c652ad62ff4ab3723ab1484821a997d282dcaa9acbbb30bcac5936961e93ac8d6e121
 EBUILD seafile-client-6.2.4.ebuild 1310 BLAKE2B 04ca777eb8579e5f9a03cfada1364606cacf6cb0b27268bfdcc9fb11074e66faadcfb64f2d835eceaa4b2cf1b6b3cd63b89e6637e44776025c211d1f2be3f83c SHA512 d1054c6d049d25bcaf5d172d7707b5b06cdc670aed8c0cac5f0f083cbb1bda7ceab7c5ba22c30b55ce8b62ae9a27c9be51bdd847412250080270be732450d305
-MISC metadata.xml 515 BLAKE2B 3392b5f9ca2c3ad648b045eb8896f417fdab9ab8591b11fe1634272f0738fb5114b22a1b46bf5c618de53d6d7594ba748682210201b9843a55a52b1d37ff2a99 SHA512 80554cfef46d79142fa4a00b3f84ea3ba55ddad45d9b0bb08f76302581e9268f51e16e7ac20de15241fdf1d8765fc515c49a41a14bedea0dae3844e7f7f4ecb6
+MISC metadata.xml 345 BLAKE2B 5bb1b4c7f29473d3796c8c466c2ed836b01251edcbabe2b1800e19be723e206810ea9fd9f1ae9426d7bade242c31c677c9ccffb9c0fa2874c0f852c194980710 SHA512 6365751dd09e9f9caf9441e3c9235e39a47c80daa36697aa8c96ab9015029565ac0ae308916625549115a9a8ed0e5544e584e46928ae44a55aa9d88e5d00c1cb
diff --git a/net-misc/seafile-client/metadata.xml b/net-misc/seafile-client/metadata.xml
index 8f3f704edc2e..f8cd338dfd6d 100644
--- a/net-misc/seafile-client/metadata.xml
+++ b/net-misc/seafile-client/metadata.xml
@@ -1,13 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>moschlar@metalabs.de</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
 	</use>
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 7cf0ec93051e..e0a18816990b 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -2,4 +2,4 @@ DIST seafile-6.1.7.tar.gz 825734 BLAKE2B 204ede4870f15cbfa9da7e51f565078290b4d03
 DIST seafile-6.2.4.tar.gz 705760 BLAKE2B 2fc0d0c370f3a3de11cbee017be3599aa2b099c08de75b23a86a0b586ab83d928d4305f2e2c0571b3b6b1f7de1eaf23a1868febcc3db9e65f08072826a5dd480 SHA512 f9d95990e913ff63835c83d429df6be66f78c993df0c38bb029090a20dfbb4d789e18e679450634f0c6d918c7ff824347301412805b86f797b81719aafa43f9a
 EBUILD seafile-6.1.7.ebuild 1091 BLAKE2B dab7de91b98b99108a2aed235ccfdb5b72e3a3aa5fb56f0ae8cdd5611b6c0b72656a80bf02de318f5ee5656591e73c734417dc4df70db37cc63a710e459f15d6 SHA512 bc9b4513c3c7217c26a0a71dbd140197fd4c762e3718796e1a9a3f871d7a2e838e59525cfff0ea52e0687c8b7ff30b924a6e082eac2dd1617b4b6638259ba290
 EBUILD seafile-6.2.4.ebuild 1092 BLAKE2B d6d273f7665619cca3214411dba88c36fbe6e601b81dff00decaeef82e35f598956e52b816712ccfd46d4dccc9c5cdf34676115e1d8958a687906409c4915b2b SHA512 0c1f06cb14353dfb65d21387d6803834d47807ca6b305fc4a754caab706084d91404c41d0510175f04024d9f6048b121ca782d32e4ac239eeaefaab7bd6d2ac9
-MISC metadata.xml 416 BLAKE2B 72bb9c35eb247e292093a6fc05fc13228080139c50b1b3468fad25d08accd6bdc0a5c0bcbe27e058d123d9b289f6af01d9bde66843583faa7ab59b38f2018bc3 SHA512 e4d42b41560e43e00c0892649631a8f9a2114c95a2dda910b30bb4784c110a46f7effd1af0f09fcefcc7cf9287d5da8dfc51b69dfefc3e7d328387a842a6b000
+MISC metadata.xml 246 BLAKE2B 982e99661e8894a8808c39c6ee396fbe1fcf4430ad6a4c820b357c5e96f45e008d92d3319734f94c7403b926bc7befaf231037e832bc3521952ecf9bc42f51bf SHA512 71bf99d5820faaf9004a517dffec80e1a2240e31b0db7449f672b68926c0e229cd710670468e95cf305d6136edc5e2d825e597d4648a90f68929bf8d82a1d61a
diff --git a/net-misc/seafile/metadata.xml b/net-misc/seafile/metadata.xml
index c3dc18cdb7be..36923d5c8719 100644
--- a/net-misc/seafile/metadata.xml
+++ b/net-misc/seafile/metadata.xml
@@ -1,13 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>moschlar@metalabs.de</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">haiwen/seafile</remote-id>
 	</upstream>
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 98fcfff47abf..2fc99785faf4 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,5 +1,3 @@
-DIST smb4k-2.1.1.tar.xz 3718220 BLAKE2B 99258ac57d3b8ff2861b8635b6a0799a347f3934c8d070d41c09f49b69caa7b59f502db9041d1bc4f875ae15544254faaafaae6429200ddf5526a06812983e1f SHA512 d69cb9f4c22e2afdd111e73c3d99d6868f959aa5476ffe10620862d3659b5a4f3b814856b17a9dced7bf6dde524f5bcf224e62d413d2aa92b0bcc2272ddf22b7
 DIST smb4k-3.0.1.tar.xz 3826160 BLAKE2B e42d761d67ae6b25e75fc673eb18838607dc36d5c76d4cba63257d09c2e138fcc3b1e3600163188117a020327645b7fe320d4a25f7455f2585cdbcf567e3d941 SHA512 de61d7dc2f63657056d721ac5ef5c12e8c8393b674163c2888a63a58f5779b0efcc47c2acaee782979c4bd9abc008eb457b6fce31d085b3e80c0970a195528b9
-EBUILD smb4k-2.1.1.ebuild 1352 BLAKE2B 98f727608542565fb7d3ea95feb5519dbc4c14ca6545ac332e5cf41495bb73f592303cb20f9d9d8a6466674aac6ee79f8f1c9be35fed91fc0b1639b7d2e38959 SHA512 fadf1efd2d4ceb8fc733397435d4ca39d8d336dfd47b6430cfa3009e02169450f47f06a651313056db1bc3e3f119ea375a0340a1727b4961e54da6ce373c45db
-EBUILD smb4k-3.0.1.ebuild 1643 BLAKE2B c977bbcb606b4509d691854a575462f110f1e25874c95de5d1cab1e0cb04e36f29022eafd8b3f0d5f3ddafc915a2d73349bd3929374b731e10397157fa2c389d SHA512 9c065df4523b52a4a3f7bcc99c5e0e9071894adf5ffd0942ed1f55eab1bdfcb0a59a215402da0b440e6bab7210358497496458f62cdcd4b4d3f04e135f160a17
+EBUILD smb4k-3.0.1.ebuild 1642 BLAKE2B 341972b4680fffb18aae1a8c8d20bb62d7a8ad1e7f8c81322249c4bba068fe20cf96594106b5dd1e21b41f8bc0b265bad45039fe0d9ffb40fad5c585979669e3 SHA512 93ff90d6a354248e89b8beb07f30971245f32a55f444f8643bd6252650ff39cecd16e999763fe1b4b0c9a0aebff65e780db5441067e01e1e9349cc71789c3cc9
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/smb4k-2.1.1.ebuild b/net-misc/smb4k/smb4k-2.1.1.ebuild
deleted file mode 100644
index e2bb3549dff6..000000000000
--- a/net-misc/smb4k/smb4k-2.1.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-IUSE="plasma"
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	net-fs/samba[cups]
-	plasma? ( $(add_frameworks_dep plasma) )
-"
-
-src_configure(){
-	local mycmakeargs=(
-		-DINSTALL_PLASMOID=$(usex plasma)
-	)
-	kde5_src_configure
-}
diff --git a/net-misc/smb4k/smb4k-3.0.1.ebuild b/net-misc/smb4k/smb4k-3.0.1.ebuild
index e17b2f59174b..3d15898cf828 100644
--- a/net-misc/smb4k/smb4k-3.0.1.ebuild
+++ b/net-misc/smb4k/smb4k-3.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 648baaabeb8d..a3d2f62fd162 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -2,5 +2,5 @@ AUX sslh.conf.d-2 621 BLAKE2B 095522c582be245f1e49018848be738a33eb722cd9be4bd8a0
 AUX sslh.init.d-3 273 BLAKE2B 01ba7f4347989a6bcf829139ce3a51e7b14265eaae2e32617933c29c5d195a6a3bbe0674a13d52f02e2c418787ed3976987dc79d9c9045b0c7ca6285aa86fb55 SHA512 1508a137c5bc962e1dfa780334c015fb63701867261fc335920fa1847e2ed2093cd02657fc9d2f633382db15bbfd87bfb65f698f5f76aa777aa947ddf39ca10a
 DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a
 EBUILD sslh-1.20.ebuild 1931 BLAKE2B c407cde3ec222bdea752ff518b3ebddfdf86406dc75d5d600f919652c9f1e237d630f1a14fe172468dfbea59e028ef033e1e52fe820720e688ebf6758ed79893 SHA512 f619a6d09f5a9633c97fcebc2c795286ed2ea01cec26a4b8f155fcc390090485ac13322469c93a5bcf22acfe6e5c138b3e3a259e67cc86b38999990f545d8d8f
-EBUILD sslh-9999.ebuild 1936 BLAKE2B 0f91af8934fecdb8da30340aca3d7bb123507e2ddbcd8e345f46a045ad70d71a4d734e62656f8fed6b3d63bcfdc10aec6a82709178422763d3300024bfa46d99 SHA512 5ffb55731ea00f59011dc64597ed970568bdb58ba4ce7de50964d2c44173ec5500df386411bb13dc3593021b74e99c7519a914e899ea7c64b05ddc2818397f90
+EBUILD sslh-9999.ebuild 1955 BLAKE2B 347f4f693aa85bf620213b7b6ebd03034f00d25304202d952b44f7c492cd3a1a5afed4e01e994c842e36c3920f33b926589c09c8115877761556b92845519269 SHA512 4145223faf1e3141cf80784709c7283f237c06d8d848ba415259ca29511c5b28df8ba015b315ca7b4b4f3df11303aac5519e01f8706b9a755982ba6a25c6d55b
 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da
diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild
index f58bdffe2ceb..5e0b8c521124 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit flag-o-matic systemd toolchain-funcs
 
@@ -26,6 +26,7 @@ RDEPEND="caps? ( sys-libs/libcap )
 	tcpd? ( sys-apps/tcp-wrappers )
 	>=dev-libs/libconfig-1.5"
 DEPEND="${RDEPEND}
+	dev-util/conf2struct
 	dev-lang/perl
 	pcre? ( dev-libs/libpcre:= )"
 
diff --git a/net-misc/ubridge/Manifest b/net-misc/ubridge/Manifest
index 0e29d1fa5050..7799bc105ad5 100644
--- a/net-misc/ubridge/Manifest
+++ b/net-misc/ubridge/Manifest
@@ -1,4 +1,7 @@
 AUX ubridge-0.9.14-respect-flags.patch 395 BLAKE2B 746f481789bca31b87759eb879521288e27b4cf16d3e2d83ea593d76bf03f614ecad6a0f2c0b001d47c08ca57ab898b2c4c9d475d34bd0b54ce7da4bdf507746 SHA512 4a86af19f8462ff3d81d509e6d264240cb3769f3175e0b1c0142cee30d7b61354c86ffec57d31f0bfbca46c0dad078efa6d3c61d19e29ca9ab6dec43f401eccc
+AUX ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch 1008 BLAKE2B d518f3d2b5fc5fd9c6c15c39f755d05b04738dc8cd443b55019ba14d858a9796d2e73190a4956f1f13896d30e2cf49f203755c37d3ccfeb73b484da3421a37f1 SHA512 d9afe86a35ff50d9455bac90c0a0fbe830816c043c4580bff10e1a556ef3b0de92a697188b3efcf5f87ce8672015320b5795f393a6916e2d96619c465344c80b
 DIST ubridge-0.9.14.tar.gz 63492 BLAKE2B 4c19bb79c264c9bec2ca39fea8b386817f6eb41d23b35f9fbd0a1407b45398ad5362bd76cbb81597438367a2af8d80308f13d3e8faa4e75c6173bbeb23da177d SHA512 7e92ca6ee8dd5815991c5d157278487cfad69710f0a63fc217d5d0e61678d272bf5a0d31b6afe25b1060df1ad13e229f1d573c03fecb1453167a9ff364283a5f
+DIST ubridge-0.9.16.tar.gz 64106 BLAKE2B ea5292bb7895034f18fde2c78e6ec22a043d3f712af0f699240073778bf72ade4ba9fc9be56d5ff13ce4119c6d90265daf86e84405597483c07c900e80b4e579 SHA512 409b5705e178d0edda17f5a321bc28a4a03d417c59893228e022a88025a51e4d4f9a18e548ec71f1b36df24b204cfdf73bc2efb8fe9e39893d29c16b3695380c
 EBUILD ubridge-0.9.14.ebuild 1003 BLAKE2B ef1bf86ff6eb34a06748f14a98bc086a9ed39247d4a649feff896c06a210c3cc78d7e644be9e9c5f9412cd1b731abc2b7acb8445acf23b8f28182f3ed48f634c SHA512 9fea9b1c5270159bc592d5ba42e14ebd037bce7660fb38b59c02a72184833d48956f4ea53b1c4ded2b1c7dce19beb177fe5a79f1632d87fa532e7da131401109
+EBUILD ubridge-0.9.16.ebuild 1101 BLAKE2B f4c0635d72e6fc2eb2dca231ef68a26d57daedfc060a7dd9425df636912efee26f0990efd8b48338043ddba687b394cfa5eff04b45e9aa1488ba08650c395b3c SHA512 8052e0e2d5028c4b16e0aca688aa234d5048f06447f9c1c9d0a5a4527037249fa8b77a52cb042ddc19b0c26371b4f7ff731aeac5b56793485ec18251b2ea1e23
 MISC metadata.xml 620 BLAKE2B 0b56364ec1f6e18cc56a58c0ed36480114d4ff8b3ef90963d1b964f5dbdeb1fa905336e8fdf0014476927b9b530e9f0be9bf70810d02b8437253813d886e7005 SHA512 ab05ab88363c0d3fbb703af5e98180ac925331b81a50061a53526dbcbfe28ca0aae1dfc2b74e0689a494068251f834e54917e9557eb4e00cf52e69a48b998f19
diff --git a/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch b/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch
new file mode 100644
index 000000000000..4d4825f477aa
--- /dev/null
+++ b/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch
@@ -0,0 +1,36 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile	2019-05-20 10:02:14.000000000 +0300
++++ b/Makefile	2019-05-20 10:32:04.972039000 +0300
+@@ -67,7 +67,7 @@
+ 
+ ifeq ($(SYSTEM_INIPARSER),1)
+     CFLAGS += -DUSE_SYSTEM_INIPARSER
+-    LIBS += -liniparser
++    LIBS += -liniparser4
+ else
+     SRC += src/iniparser/iniparser.c   \
+ 	   src/iniparser/dictionary.c
+diff -ur a/src/parse.h b/src/parse.h
+--- a/src/parse.h	2019-05-20 10:02:14.000000000 +0300
++++ b/src/parse.h	2019-05-20 10:32:04.968039000 +0300
+@@ -24,7 +24,7 @@
+ #include "ubridge.h"
+ 
+ #ifdef USE_SYSTEM_INIPARSER
+-#include <iniparser.h>
++#include <iniparser4/iniparser.h>
+ #else
+ #include "iniparser/iniparser.h"
+ #endif
+diff -ur a/src/ubridge.c b/src/ubridge.c
+--- a/src/ubridge.c	2019-05-20 10:02:14.000000000 +0300
++++ b/src/ubridge.c	2019-05-20 10:32:04.968039000 +0300
+@@ -26,7 +26,7 @@
+ #include <pthread.h>
+ 
+ #ifdef USE_SYSTEM_INIPARSER
+-#include <iniparser.h>
++#include <iniparser4/iniparser.h>
+ #else
+ #include "iniparser/iniparser.h"
+ #endif
diff --git a/net-misc/ubridge/ubridge-0.9.16.ebuild b/net-misc/ubridge/ubridge-0.9.16.ebuild
new file mode 100644
index 000000000000..b09d2fdadaab
--- /dev/null
+++ b/net-misc/ubridge/ubridge-0.9.16.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps toolchain-funcs user
+
+DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces"
+HOMEPAGE="https://github.com/GNS3/ubridge"
+SRC_URI="https://github.com/GNS3/ubridge/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+
+RDEPEND="
+	net-libs/libpcap
+	dev-libs/iniparser:4="
+
+DEPEND="${RDEPEND}"
+
+# Bugs: https://bugs.gentoo.org/647588
+#       https://github.com/GNS3/ubridge/issues/60
+PATCHES=( "${FILESDIR}/${P}_add_slotted_iniparser-4.1+_support.patch" )
+
+pkg_setup() {
+	enewgroup ubridge
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		SYSTEM_INIPARSER=1
+}
+
+src_install() {
+	exeinto /usr/bin
+	exeopts -m 710 -g ubridge
+	doexe ubridge
+
+	dodoc README.rst
+}
+
+pkg_postinst() {
+	fcaps -g ubridge -m 4710 -M 0710 cap_net_raw,cap_net_admin \
+		"${EROOT}"/usr/bin/ubridge
+
+	einfo "\nNOTE: To read packets from the network interfaces with ubridge as"
+	einfo "normal user you have to add trusted users to the \"ubridge\" group.\n"
+}
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 6b6b305a9bf8..007a899392ad 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -5,7 +5,7 @@ DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 8e262e3e28b9f4cbe3925340aa3b08e99f1c30
 DIST unison-2.51.2-manual.html 311981 BLAKE2B 1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05 SHA512 2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997
 DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0 SHA512 170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d
 DIST unison-2.51.2.tar.gz 691251 BLAKE2B 39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f SHA512 9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115
-EBUILD unison-2.48.4-r1.ebuild 2476 BLAKE2B 7c483145b97e885db2e68d46746bfcae88587cd9a96b2deb415ec4ba3e7df1394bb024b9ec8bee0b3167c7c2d2eabec24ae3769cecca499ffb7769f08f295f66 SHA512 303b82ff2168c1ed583c694bbe9b47d073558e804221d10b8821778f21c3092415389272b5986c94f29cfa6139047ccd8448c11538137b943b4187f3e11f38de
-EBUILD unison-2.48.4.ebuild 2339 BLAKE2B 18690805b5ca16fe8e5ecf7906c464459d3a04a8858592a6fe32d40c616a66b3af38e98f13970dca2200d657ff6cf4627e0420008588c4c5192017934cc39e4b SHA512 daf666874caaa8e991136e7ac67281c75d3572e39c4aebdd6422941411dc59f6b5c339c99660339e284984df5b785c3de47b2fbf1e2d450a0b60144d67b787ef
-EBUILD unison-2.51.2.ebuild 2162 BLAKE2B f17fb736c038d256c9f567ffa06489ad3deba275e85f8293432d53fd1b28902a2ee6e2d543b250c861223882d1c846e9c015f78749d21cdfd32a206a3d722053 SHA512 f72c4026f00b9cd116d45d7aa6b0c869d8d6eb3428e68381f95eae3be8c0196cf456567f54cd98768edcae947825494368e4ec4f58be2749fe95acd524bb11d4
+EBUILD unison-2.48.4-r1.ebuild 2460 BLAKE2B 81491952d6cfba07ae5bb03220c044fc0fa05a1a4d531e6b0909a4265620dc56259c24c6d1268b425d45db44210d2e9b4f181e3a0fd68f57a7c0bf6aafc98613 SHA512 d69e3027788b7c58d5f8e9f09c5f717b856e35ad1290ef8afe3a952d4af695d9a12833ee6d85ac97b7d2bf4d90c1f14a81f0027c1dd926327c618a3f5bbccdd2
+EBUILD unison-2.48.4.ebuild 2323 BLAKE2B 5475474bc071741df4c64773a3c7b4cf54b8f7add458e292fd0d5d9b26489133aad898f1458de50adec34a8df23bf2ca351b4e7a29ae91064141f55766520997 SHA512 e2de48ca76e032d7bb4c13fba8c4d99155f23ba9da3ad80f8f90182bb2898634abedc4f4df987bf014ea24bcdfb5440dd836fa650600d311c4a76d4d03a5bafe
+EBUILD unison-2.51.2.ebuild 2146 BLAKE2B 664753004eacd0bb01836b3ecba8646cac1183b32aab412806152f58afd05c76b333a6a9462f422e5418dc044d5a5b4ca53cde6dcdec49ac98b95df98182e580 SHA512 42f8cfcdbd3310c7f016690eccf56df7e109ebad8610737d78b6617a734197ffd2026fd203f19a4e6cb1e6b87b2feb0e2c5f48161c26e3b50dff31838f653364
 MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild b/net-misc/unison/unison-2.48.4-r1.ebuild
index 55e5485844d4..01f53f133dfd 100644
--- a/net-misc/unison/unison-2.48.4-r1.ebuild
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk
 	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
 	>=app-eselect/eselect-unison-0.4"
 
+RESTRICT="!ocamlopt? ( strip )"
 SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
 	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
 		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
@@ -76,7 +77,6 @@ src_install () {
 		HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
 	fi
 	einstalldocs
-	use ocamlopt || export STRIP_MASK="*/bin/*"
 }
 
 pkg_postinst() {
diff --git a/net-misc/unison/unison-2.48.4.ebuild b/net-misc/unison/unison-2.48.4.ebuild
index 1fec2677b4ed..1cbadbf207ac 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,6 +25,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk
 
 #PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
 
+RESTRICT="!ocamlopt? ( strip )"
 SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
 	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
 		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
@@ -78,7 +79,6 @@ src_install () {
 		dohtml "${DISTDIR}/${P}-manual.html"
 		dodoc "${DISTDIR}/${P}-manual.pdf"
 	fi
-	use ocamlopt || export STRIP_MASK="*/bin/*"
 }
 
 pkg_postinst() {
diff --git a/net-misc/unison/unison-2.51.2.ebuild b/net-misc/unison/unison-2.51.2.ebuild
index 25776c6fb519..af6cf20473a2 100644
--- a/net-misc/unison/unison-2.51.2.ebuild
+++ b/net-misc/unison/unison-2.51.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk
 	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
 	>=app-eselect/eselect-unison-0.4"
 
+RESTRICT="!ocamlopt? ( strip )"
 S="${WORKDIR}"/src
 
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
@@ -71,7 +72,6 @@ src_install () {
 		HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
 	fi
 	einstalldocs
-	use ocamlopt || export STRIP_MASK="*/bin/*"
 }
 
 pkg_postinst() {
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 1c030b755bc8..ff837cfef22a 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2019.06.21.tar.gz 3169975 BLAKE2B c8867638147e45f5f1137b89b0259301b717a2249ac96143f70dc3b0b6850f887cf402e8e5e22249afaef40409a2f1c4137051553f5750633f3dc79d42967b59 SHA512 b116f1b636b616e7bd2f5f3d8bbec3b9acebc956f2864391392cfa8bd2af91faa97603d528a13abb6e69ac861582d296870579469e4c6f4f4816dc674e0c27bb
-DIST youtube-dl-2019.06.27.tar.gz 3170966 BLAKE2B f105f246e0f3e7edac2ada6685475d0b35cb3bcba39e36dbccbddf58d5103c25d93c6fe0ec8cf3fb64d35d53ab12283450184a414f551b1937c4547f2b441c4e SHA512 f59f6633b5f516736403e48f21e29684447fd12424d94423b7acca6809e9531ecf2922eec528ba7e8d9b7c62d12201c3194fccce95121ef4fc5430a8f64d4e6c
-EBUILD youtube-dl-2019.06.21.ebuild 2119 BLAKE2B 82163aa22bf146600523fbb31e67d22af5a7a591e6b0c3900ca992f89fb45ec4536000872934b8a2d3beeb0a2d25ead1e8a500878c4db5dc70611d7609e00a0f SHA512 93ba6d18d95c861af5a8224e7ca8ee9947198e3e0b3a66e0bb70e5beb12a2b0bdbd004c5f619a97e6b30985ef3581ebaf163ca69a2dc1d2345de0ebb3c01f81c
-EBUILD youtube-dl-2019.06.27.ebuild 2125 BLAKE2B 50e06196444aee277e8bc2a72c762b76b7de6a9616f3ec6ccd76cfff696c4fcbb6e2c64022fcd5536708441a9009fb06b424fd7cbd86b7a58cee8108f908c6f0 SHA512 ee93e8557d67c11a7ead1bc1f0fefaec1f331aeea30a2fe93efd913d5a866380b62ba8a02d1115fb257d1989818a06eeea4e00d9acc35fe8feee147b8d6ed5b5
+DIST youtube-dl-2019.07.02.tar.gz 3171559 BLAKE2B dd3b672f672ace05f433cbf539a1f00b69000cdfae472dcf1f2c22f4c9414d8e2ca542399e5abf084d197f1f04bbe9dd1651943d8e7f81369d3b3dede6617837 SHA512 5dd4f3b024008d8722e0554f9143d1cbea3ea52971a2a5ff338585f38eb8c8ec256b83249e0145e9bf0012cbe440acf5872edd127d30a0c8803d8d0e74d0ba11
+EBUILD youtube-dl-2019.07.02.ebuild 2119 BLAKE2B 82163aa22bf146600523fbb31e67d22af5a7a591e6b0c3900ca992f89fb45ec4536000872934b8a2d3beeb0a2d25ead1e8a500878c4db5dc70611d7609e00a0f SHA512 93ba6d18d95c861af5a8224e7ca8ee9947198e3e0b3a66e0bb70e5beb12a2b0bdbd004c5f619a97e6b30985ef3581ebaf163ca69a2dc1d2345de0ebb3c01f81c
 EBUILD youtube-dl-99999999.ebuild 2014 BLAKE2B 55abeec62089210469af6edf2cde4f8764eb1a5d20a3cd96985dce8a833023e5dd2e44cc893a7db99d9002fc671601fabd1c26cdbfa0fc0411a9ba11e1715b78 SHA512 bbbfb4e6e8319e383eaf4db4dd4056f34374eb6f1527c6cc1c6ee0d9f61199a913bc99f929bd91ef80aa744ba9a865833395460d8b94125c362c59372f738346
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.06.27.ebuild b/net-misc/youtube-dl/youtube-dl-2019.06.27.ebuild
deleted file mode 100644
index a8b1afbfc11a..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2019.06.27.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-LICENSE="public-domain"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-RESTRICT="test"
-SLOT="0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2019.06.21.ebuild b/net-misc/youtube-dl/youtube-dl-2019.07.02.ebuild
index 4d80cb2b49ed..4d80cb2b49ed 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.06.21.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.07.02.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2019-07-10 23:40:16 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-07-10 23:40:16 +0100
commit	51af5f0eb4cddbe6aa7953717873691d77aae9ff (patch)
tree	1541525274162b033ebbc3ed38abaf335fbbd49a /net-misc
parent	7014a5a3ea0feffab9701fdd6b64cc7667a985af (diff)