gentoo resync : 25.08.2020

4 files changed, 14 insertions, 66 deletions

diff --git a/net-misc/ubridge/Manifest b/net-misc/ubridge/Manifest
index 7799bc105ad5..73e5c27f890c 100644
--- a/net-misc/ubridge/Manifest
+++ b/net-misc/ubridge/Manifest
@@ -1,7 +1,5 @@
 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
+DIST ubridge-0.9.18.tar.gz 64340 BLAKE2B 7ac540ccf180adc8bf0bb0d440d6a0335626181ba680f7f94cea43d6b6b70745cd64f8ee8048aa1621b7407fea83cf03039147ffe38236e70970c014771ab09b SHA512 f2c9e9d0242f61363a3f4ce6f1acf4013245ff0854a7f64c96d6b8737bd3cc505a38aaf43a0928e2a5a88bcd39f786e00fab68748ad56770d18d713005750c60
+EBUILD ubridge-0.9.18.ebuild 1089 BLAKE2B 26e9f3dde16372a76c98da998844c51dc1adb387c8fad068ac412e1ae37285f438f6b6b1e336bf46857bcb5fcd3c8e97bf0d3dfe4aa7fdb93f461c80f9af1e2f SHA512 d86fba30cb6d18dbc74b2da231c2c89df2b72d5614c3b11554d0d2f47db336a4e8d3cbf5223949df55f123b0392d3388935646149a76ff6beaa286e2c3a82dc3
+MISC metadata.xml 736 BLAKE2B d85c09cd99c67395cbfe18605835f109a5b2db0b29982eed9ed78895f6a754d17737aa947c1d07edf804395dd8e6776963424c07797ee77633782a8d78891f60 SHA512 c744f3033a7af7a876bf4b7d2800638d383c4b42ad07477fa52359f4230b7c99d097c8351ce6816010634fdb57a79314305b2133f25662662fdb7cdcc41ff553
diff --git a/net-misc/ubridge/metadata.xml b/net-misc/ubridge/metadata.xml
index fe85611a44da..8a7b8ca468d1 100644
--- a/net-misc/ubridge/metadata.xml
+++ b/net-misc/ubridge/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>mmk@levelnine.at</email>
+		<name>Michael Mair-Keimberger</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>g.djavadyan@gmail.com</email>
 		<name>Garri Djavadyan</name>
 	</maintainer>
diff --git a/net-misc/ubridge/ubridge-0.9.14.ebuild b/net-misc/ubridge/ubridge-0.9.14.ebuild
deleted file mode 100644
index 4ae6e8746b18..000000000000
--- a/net-misc/ubridge/ubridge-0.9.14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	net-libs/libpcap
-	dev-libs/iniparser:=
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=( "${FILESDIR}"/${P}-respect-flags.patch )
-
-pkg_setup() {
-	enewgroup ubridge
-}
-
-src_configure() {
-	export SYSTEM_INIPARSER=1
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-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
-
-	ewarn "NOTE: To read packets from the network interfaces with ubridge as"
-	ewarn "normal user you have to add trusted users to the ubridge group."
-}
diff --git a/net-misc/ubridge/ubridge-0.9.16.ebuild b/net-misc/ubridge/ubridge-0.9.18.ebuild
index b09d2fdadaab..adfeeba6492c 100644
--- a/net-misc/ubridge/ubridge-0.9.16.ebuild
+++ b/net-misc/ubridge/ubridge-0.9.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit fcaps toolchain-funcs user
+inherit fcaps toolchain-funcs
 
 DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces"
 HOMEPAGE="https://github.com/GNS3/ubridge"
@@ -11,21 +11,18 @@ SRC_URI="https://github.com/GNS3/ubridge/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 
 RDEPEND="
-	net-libs/libpcap
-	dev-libs/iniparser:4="
+	acct-group/ubridge
+	dev-libs/iniparser:4=
+	net-libs/libpcap"
 
 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
-}
+PATCHES=( "${FILESDIR}/${PN}-0.9.16_add_slotted_iniparser-4.1+_support.patch" )
 
 src_compile() {
 	emake \