gentoo resync : 24.06.2021

3 files changed, 2 insertions, 105 deletions

diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index a7c3783ba0cf..138bbd1d077f 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,8 +1,6 @@
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
-DIST connman-1.39.tar.xz 755688 BLAKE2B f18018a0c2b58a89e613dba70672c27631ecbb0c0e44c84fe4c9097753aaeb7b278cd3ab0bef9b5e1928c34ee90b287754356e525cc318ecb6347370ee3043b4 SHA512 5bec2830971e34966a7a3a40c505b8a14cf6fa639262d4f1eaeb38f5e602d7a234f7d4f2c4919517b0832664382389e20a59fdb027753cd20059a23589de1764
 DIST connman-1.40.tar.xz 758516 BLAKE2B 66834032f82e80a6f950d7ff823dc5f1f45090f3444b5a0241cabd0346cf9749b8780b624ce6a8e505305cc1a75423e5a95a7b1f77a282d231845bc33389924a SHA512 33df90814b7499aeafcd51fca4f8ffbc07efacfa29dda46d3b9bcd3ff26264dc53c3991e7e53a8563ca403015c345e59c7ad29427c38ee3d88dd282479db7a0f
-EBUILD connman-1.39-r1.ebuild 2782 BLAKE2B 255776bae74077773674f5707a1febb7aff81792cf47c54c5cb173801cdba6017550c0dc19866016357a950062c7d5a520365817aa91424fe459dcf99b04afe9 SHA512 04efe423622186f7e2ae043f38320c0b30ce485f9ce544bcc5ace99155bb152d4f92b94d1ecb9c4f59922c007c75d85ef8deb5958cff78d10b527ddf8f8adc42
-EBUILD connman-1.40.ebuild 2783 BLAKE2B 9464125aa911374c6639adaa4683d1713df23864168cb0dc47ab3e8ff177ead4830a88f50b6065505d2f9257cd270fa0cc4320ca7a337d97229492e287b3edd2 SHA512 d075c6c04dc22b38f565d1b84cb8a6b00a2ac2a809c5c3eca8344965aa4ad586f6e63df424dc8632933aecd8a913912c516d83b07898def94254fbe9e1edfa23
+EBUILD connman-1.40.ebuild 2782 BLAKE2B 255776bae74077773674f5707a1febb7aff81792cf47c54c5cb173801cdba6017550c0dc19866016357a950062c7d5a520365817aa91424fe459dcf99b04afe9 SHA512 04efe423622186f7e2ae043f38320c0b30ce485f9ce544bcc5ace99155bb152d4f92b94d1ecb9c4f59922c007c75d85ef8deb5958cff78d10b527ddf8f8adc42
 EBUILD connman-9999.ebuild 2788 BLAKE2B 78e75bd78bb645b80931465d72ab2d51de070cf7538f289078d0bfb08c7f5421be5194dccd3b4482e641611a133d41092a9caf5086dc74bfeedf6e46329ce2d6 SHA512 612a4fdeb5cef9e435b8e59c53f869e052d530ee2e66917184d0bcd227eba1d22839b38b2bad182bb1ad2d98763cf3fdf43ed10426098685f9dd5e86fd85544a
 MISC metadata.xml 1302 BLAKE2B b6cea3b784c7f217c5d0befc833fe573ff68f010f9fb1043b11ce9c70473c45b2a9c03d59495e8a04f58e1657ce6a9ca531da9675bdd545493cd1bab8a583ae9 SHA512 3df49e8184d319601df17ff8238404c673026a6953f0a566c7d9134215841dab8cb6a4ec507e2c6467bfbc463678568696828173b80a96a4035a449ff886bb3f
diff --git a/net-misc/connman/connman-1.39-r1.ebuild b/net-misc/connman/connman-1.39-r1.ebuild
deleted file mode 100644
index 86e7435576ad..000000000000
--- a/net-misc/connman/connman-1.39-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit autotools systemd tmpfiles
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	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"
-fi
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager
-+nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard
-wispr"
-
-REQUIRED_USE="^^ ( iptables nftables )"
-BDEPEND="virtual/pkgconfig"
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	sys-libs/readline:0=
-	bluetooth? ( net-wireless/bluez )
-	iptables? ( >=net-firewall/iptables-1.4.8 )
-	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] )
-	wireguard? ( >=net-libs/libmnl-1.0.0:0= )
-	wispr? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--runstatedir=/run \
-		--with-systemdunitdir=$(systemd_get_systemunitdir) \
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable debug) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable examples test) \
-		$(use_enable iwd) \
-		$(use_enable l2tp l2tp builtin) \
-		$(use_enable networkmanager nmcompat) \
-		$(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 tools) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable wireguard) \
-		$(use_enable wispr wispr builtin) \
-		--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.40.ebuild b/net-misc/connman/connman-1.40.ebuild
index e3e9006076ab..86e7435576ad 100644
--- a/net-misc/connman/connman-1.40.ebuild
+++ b/net-misc/connman/connman-1.40.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"