gentoo Easter resync : 12.04.2020

4 files changed, 2 insertions, 115 deletions

diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index b78ff4c4b9ac..5e5c0a78d4c6 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,9 +1,6 @@
-AUX connman-1.33-polkit-configure-check-fix.patch 665 BLAKE2B ffe1a6ae19fe163ad84391f1d974df976fae943f73863200eb3acdde630c68db2979be03cc072c663a1e8198e7eb598ccfbe6ee5f20b8cadac4a6df6ff77194f SHA512 630ac9d147046f084a960795de87183c5c446006df7a6a74c02416e972a3bd55390e1ab9c3f0ea4449324d0fb7c271ebd6b64727ede834128ca8515853a9e905
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
-DIST connman-1.37.tar.xz 707752 BLAKE2B ad8993764a444d205b0a8cf1ad38acc249a1a28014e6f4e5a89c8662194ad2e2ee6091b51445b88a885808461413b3aaf88eeb7b75a32f417b578d2da80a2e9f SHA512 5d5363105aedd0c9d609dd5c64eb832d9ff80923a944d9d3738337a61f180ded227f2ae1ff7912bed8826b35f0cfd20488e3ffd3801f0e53e90f98498e19efb6
 DIST connman-1.38.tar.xz 749288 BLAKE2B 3f0ec95c87d9b3bf4f188e2523cb8ed97f462953ed95180fadf98bfe0d01c67a3b73e18e39d616e9299fa0251b9a86afea6161b9e280ae6999eb66e6bd5c4406 SHA512 9c8f77c4dd62763ccb9ea5cc5d285a8a1c51bb09a82eafc73246231557a4f627ae1e5e4a9df5e104457390ebba643349d7d67800a4ee4c17c6dceff192afe8d4
-EBUILD connman-1.37.ebuild 2596 BLAKE2B 6c8ccfffaaad05f5a09b93b11dd9fc5000c3899db79f84d6bad9a959ebea5c01f21f0bef203fa1524aec6a16e384c0167167b8c3915bd230fb721b15e863ba8d SHA512 ff3f15f3258908c623d8ba0b6295a825984db6a905189595ae7fe506d316b3076d03b396324187852161245e555f257f4c0e8f560284bcdd38d3c593164bfb5c
-EBUILD connman-1.38.ebuild 2728 BLAKE2B 40425b699009ba247ea64db4db90c86914c5d69c70614e9c1fd4071ad30d6ad73f1e7558befe877788b00d3e551973d93cd38f28519dc7f11c4e0b3f7d14751e SHA512 7b15cf1018816892e0d11011e9f6bdf823f140e10158b9a55a230b88e2f1a2980fcabee4d681c23f4939eb387fb8d93cc9400bd64a58dc61e9bddee1718161da
+EBUILD connman-1.38.ebuild 2722 BLAKE2B ed9392bee5e97012fe13b77fd3ed5c50f15dd64aeea641695505c7c4f0d575c949e51e04e21ff801de9d8d8609807593b2d7279a5adc6aa87ac99da16473d654 SHA512 829b20d249c16a550819d00cba1b42afa44895f287c48a47176576280d3d6dd231c446c5bcae91ef662f78d0e0e828429377365482426d2b29115494c9247b70
 EBUILD connman-9999.ebuild 2728 BLAKE2B 40425b699009ba247ea64db4db90c86914c5d69c70614e9c1fd4071ad30d6ad73f1e7558befe877788b00d3e551973d93cd38f28519dc7f11c4e0b3f7d14751e SHA512 7b15cf1018816892e0d11011e9f6bdf823f140e10158b9a55a230b88e2f1a2980fcabee4d681c23f4939eb387fb8d93cc9400bd64a58dc61e9bddee1718161da
 MISC metadata.xml 1220 BLAKE2B 0d56b48507231a37eed6f84e5875ea55571a8cfc0379b7b16c3d74650fa011876b7466a96bfbcf7a9db9cc931c2662d678d33872082dec7b444dc404430e71bd SHA512 591edad65cd7efc59a63b207c5ea7b60b624ee91b3ab1d4aa165d4b2824640fffeca662d7f6ba34822e38777ceae9aa3caafd39d328294f245e988c77fbede5d
diff --git a/net-misc/connman/connman-1.37.ebuild b/net-misc/connman/connman-1.37.ebuild
deleted file mode 100644
index a81c15709fc8..000000000000
--- a/net-misc/connman/connman-1.37.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://01.org/connman"
-SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-
-IUSE="${IUSE} bluetooth debug doc examples +ethernet +iptables iwd l2tp nftables"
-IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
-
-REQUIRED_USE="^^ ( iptables nftables )"
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	sys-libs/readline:0=
-	iptables? ( >=net-firewall/iptables-1.4.8 )
-	bluetooth? ( net-wireless/bluez )
-	iwd? ( net-wireless/iwd )
-	l2tp? ( net-dialup/xl2tpd )
-	nftables? (
-		>=net-libs/libnftnl-1.0.4:0=
-		>=net-libs/libmnl-1.0.0:0= )
-	ofono? ( net-misc/ofono )
-	openconnect? ( net-vpn/openconnect )
-	openvpn? ( net-vpn/openvpn )
-	policykit? ( sys-auth/polkit )
-	pptp? ( net-dialup/pptpclient )
-	vpnc? ( net-vpn/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
-	wispr? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	virtual/pkgconfig"
-
-#PATCHES=(
-#	"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
-#)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-systemdunitdir=$(systemd_get_systemunitdir) \
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable iwd) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable l2tp l2tp builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openconnect openconnect builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable pptp pptp builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wispr wispr builtin) \
-		$(use_enable debug) \
-		$(use_enable tools) \
-		$(use_enable networkmanager nmcompat) \
-		--with-firewall=$(usex iptables "iptables" "nftables" ) \
-		--disable-iospm \
-		--disable-hh2serial-gps
-}
-
-src_install() {
-	default
-	dobin client/connmanctl
-
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	keepdir /usr/lib/${PN}/scripts
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf
-}
diff --git a/net-misc/connman/connman-1.38.ebuild b/net-misc/connman/connman-1.38.ebuild
index 937b54ecf834..d2079bf83776 100644
--- a/net-misc/connman/connman-1.38.ebuild
+++ b/net-misc/connman/connman-1.38.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Provides a daemon for managing internet connections"
diff --git a/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch b/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch
deleted file mode 100644
index 57ef5e8ccbac..000000000000
--- a/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- connman-1.33/configure.ac.old	2016-10-09 11:26:43.137856416 -0700
-+++ connman-1.33/configure.ac	2016-10-09 11:26:52.819722799 -0700
-@@ -281,11 +281,11 @@ AM_CONDITIONAL(NMCOMPAT, test "${enable_
- 
- AC_ARG_ENABLE(polkit, AC_HELP_STRING([--enable-polkit],
- 				[enable PolicyKit support]),
- 			[enable_polkit=${enableval}], [enable_polkit="no"])
- if (test "${enable_polkit}" != "no"); then
--	POLKIT_DATADIR="`$PKG_CONFIG --variable=actiondir polkit`"
-+	POLKIT_DATADIR="`$PKG_CONFIG --variable=actiondir polkit-gobject-1`"
- 	POLKIT_DATADIR=""
- 	if (test -z "${POLKIT_DATADIR}"); then
- 		POLKIT_DATADIR="${datadir}/polkit-1/actions"
- 	fi
- 	AC_SUBST(POLKIT_DATADIR)