net-misc/connman: stabilize on arches supported on musl

Package-Manager: Portage-2.3.40, Repoman-2.3.9

5 files changed, 1 insertions, 180 deletions

diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index e6482c0e..f6fd7eaf 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,13 +1 @@
-AUX connman-1.32-execinfo.patch 685 BLAKE2B ceda7daea151239333ecddc188660a2cf44af756109f92d8f0b18b9c6e03a6bf83e06822e36250835ee877ff84586d1a418d6c14cf833edc0c78eed04bb466b6 SHA512 b646dc610f2f1aa20ecadae293289e6c2fb1fc55c80b457a3230291112bf9700da620cb02267c1235b99b9eccc840d978a4392cbf51149982e9ce43bd18ff09c
-AUX connman-1.33-polkit-configure-check-fix.patch 665 BLAKE2B ffe1a6ae19fe163ad84391f1d974df976fae943f73863200eb3acdde630c68db2979be03cc072c663a1e8198e7eb598ccfbe6ee5f20b8cadac4a6df6ff77194f SHA512 630ac9d147046f084a960795de87183c5c446006df7a6a74c02416e972a3bd55390e1ab9c3f0ea4449324d0fb7c271ebd6b64727ede834128ca8515853a9e905
-AUX connman-1.33-resolv-conf-overwrite.patch 354 BLAKE2B e72099b97477c3549d3a9082c06419f736ebb79bc12d37d3dd0acdd39a0454d62a9d5053b9fa349534be5171426a8fbca6aeed30e017404baf21f32d77a04948 SHA512 1998d0d2923f8dca3706c7c75ad87ffa2570a785ed3e5ec1c85cc539bbfb7ea9173dae5320c3f95fbeee9c9c72870607b8eb4b3fd2c36a1962ad8925d72e24e2
-AUX connman-1.35-musl-fixes.patch 5518 BLAKE2B 492aa37e29ee270291251522068107e6c984a1cbefad27162c7765466f0edf6e3dfdaee5c2e9a19955b9680b5c2ee3202b72f8d0f49861dc84e5e96d5337a661 SHA512 de2b5015fa50cb3da69c7f3e95bfec7093c91ea545f9bc9b1a2bfec7f79e9d9b74240c774a93f17b5d244f05926ca3f68843123cb267ab9de038c7dabbea2ab5
-AUX connman-musl-libresolv.patch 1554 BLAKE2B 496cae4e748089c6f2fe46850a4940660bcaff8289f477e1c4b019f2a854d33022a171d7f16e2b8193c94964806542560e00fbf54e63deea9038845201120aa8 SHA512 c258e747e13b86c81ae96ac1743abf0c1461b9053c5b386d594a49f0b1890f10d89bea92610762ff609a4cc5fea04a43fab83894702f552b05af400f01cb011e
-AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
-AUX connman.initd2 490 BLAKE2B 9bf533adbb6cee1144b2f21c147df0a7f1bdbcec7299389bf373499988ce0f8ee643615086cadeb286dd27456efdd84dfbb4df6a77281c71cba116b96543b53c SHA512 73fa3e30c621efd57a78e9f28bdde1cd34c4bb938d027789a5e9ec32cb83443a3d1a9ef1eec21176bc795128050a41c196529321f6991ea83bec45c6fa00d651
-AUX connman.service 198 BLAKE2B 8b943dc995fed630b15bcfe1040598e13a5b2118967f9fb681e36beaec4e1bf2f9c25e10f9c2d19bc7cd56c10e811b3722d12048b5180bae57bd8af074697ad4 SHA512 a769961922c40b5ed3e5a09d08262b20b84aa27fc278678063b348431ba2976de9f2ebcd9f9b0afa6241540d255ba4cdf7120b75184510d41444b7dd3209b825
-DIST connman-1.29.tar.xz 653324 SHA256 2a5a69693566f7fd59b2e677fa89356ada6d709998aa665caef8707b1e7a8594 SHA512 19f623dd23c6312f29bbd570dcb22d31154ffcd16ee66ed2280df3d9d844301f18538418363222d99eabdc33da0021488ed66ba2e4f88df30646004b724538ee WHIRLPOOL 9439cadeb20b72c922b1426da213f8567fe7b0da45f9a4abf270c38687a9d9161a8ee14250623344864d612e130e6f28926918468aaf4346a9e5ff41e6ad22bb
-DIST connman-1.33.tar.xz 669800 SHA256 bc8946036fa70124d663136f9f6b6238d897ca482782df907b07a428b09df5a0 SHA512 5670124d2e17ffde4bd5fb878198843b712a31f5840e8523e8247373c8547619e32a4d6dda9cf993eebd5c65bdd256cfc570708a79da1d10f969662b5b750566 WHIRLPOOL eda8176d0d6137b0b94581c9ace23367d7af5722b7d7ea53e173e9466b555f26c9a18a05a07c1533ab11e3197e4303c6c77685a214c3dec2de926d7924f019f2
 DIST connman-1.35.tar.xz 686092 BLAKE2B 706d8333dc2fcbee8d0ef3849325c4975dfe312a7a542ee96859a1724e05b1302c244a0108ab70033b398301c235fb13cb9509e9147dc2bb049e900f3799cd98 SHA512 2234b4d18b038f9a33939035cddebd31c74ce962e5616c2c30b2912476612ef3f7d5b9edca64bf6e69fa358252ed432124e036ac3516b291b86695cb9a96c6a8
-EBUILD connman-1.35-r1.ebuild 2593 BLAKE2B 2998d9e040e66b439c9702411f82b227b5fa064cf7f41c25205fa4e53cefeb7ef9e759f6cab04d827031e8f4e2f0b9867d94f4c947396026eba53ad69f27e449 SHA512 7a67d8e8b3473d3f3416ff632f20bfbc0021ce95102ae97c53fe9b402d741fef957bc1f7ad7e202490eb2a1bc88d7039d52ef65b3b75dba03bbc073158d11396
-MISC metadata.xml 1259 BLAKE2B 9c4804b5e650d4823a129d3d64e59ca3165ea04a171dfdbf669c184c14eb6e3ab923e5f0834952aaadb734e5867d4ad241084c0388d52a29b8e208e23c72d44e SHA512 02189e5081b74da0b4a8d23dfb27c1b71e34b2f8b3e5bdac8817e50206470e5b6591979b65dede6dad0f5b14b3fe5ca627ba50f8856a5c586fe8b8996f813322
diff --git a/net-misc/connman/connman-1.29.ebuild b/net-misc/connman/connman-1.29.ebuild
deleted file mode 100644
index 93d90591..00000000
--- a/net-misc/connman/connman-1.29.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools base systemd
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://01.org/connman"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86"
-IUSE="bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=net-firewall/iptables-1.4.8
-	bluetooth? ( net-wireless/bluez )
-	l2tp? ( net-dialup/xl2tpd )
-	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"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-musl.patch"
-	"${FILESDIR}/${PN}-musl-log.patch"
-	"${FILESDIR}/${PN}-musl-libresolv.patch"
-	"${FILESDIR}/${P}-musl-sockaddr.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(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) \
-		--disable-iospm \
-		--disable-hh2serial-gps
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin client/connmanctl || die "client installation failed"
-
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/connman.service
-}
diff --git a/net-misc/connman/connman-1.33-r1.ebuild b/net-misc/connman/connman-1.33-r1.ebuild
deleted file mode 100644
index 454c89ed..00000000
--- a/net-misc/connman/connman-1.33-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools systemd
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://01.org/connman"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=net-firewall/iptables-1.4.8
-	bluetooth? ( net-wireless/bluez )
-	l2tp? ( net-dialup/xl2tpd )
-	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}-musl.patch"
-	"${FILESDIR}/${PN}-1.32-execinfo.patch"
-	"${FILESDIR}/${PN}-musl-libresolv.patch"
-	"${FILESDIR}/${PN}-1.31-xtables.patch"
-	"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
-	"${FILESDIR}/${PN}-1.33-resolv-conf-overwrite.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 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) \
-		--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}
-}
diff --git a/net-misc/connman/connman-1.35-r1.ebuild b/net-misc/connman/connman-1.35-r1.ebuild
index 67deff8b..5263dd3f 100644
--- a/net-misc/connman/connman-1.35-r1.ebuild
+++ b/net-misc/connman/connman-1.35-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~mips ~ppc x86"
 
 IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables l2tp nftables"
 IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index 9bf64dff..e0b4e8fa 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="ethernet">Enable ethernet support.</flag>
-		<flag name="iwd">Enable wifi support via net-wireless/iwd</flag>
 		<flag name="l2tp">Use <pkg>net-dialup/xl2tpd</pkg> for L2TP VPN support.</flag>
 		<flag name="iptables">Use <pkg>net-firewall/iptables</pkg> as firewall.</flag>
 		<flag name="nftables">Use <pkg>net-firewall/nftables</pkg> as firewall.</flag>