4 files changed, 196 insertions, 24 deletions
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 9214db004a3c..6baa38924283 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,7 +1,9 @@
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
 AUX libresolv-musl-fix.patch 1554 BLAKE2B 496cae4e748089c6f2fe46850a4940660bcaff8289f477e1c4b019f2a854d33022a171d7f16e2b8193c94964806542560e00fbf54e63deea9038845201120aa8 SHA512 c258e747e13b86c81ae96ac1743abf0c1461b9053c5b386d594a49f0b1890f10d89bea92610762ff609a4cc5fea04a43fab83894702f552b05af400f01cb011e
+DIST connman-24180d1243bf005c721be6f9d8d6da67bb669c55.tar.gz 744924 BLAKE2B 87b1b1dc09c483fb69d75c5c43b89492b32d0e0357fb25208c369a446f85641e5e364ce3bd21f0e43c95e06a8578f28dea4b26decb8a0ebf591bf4c44616645f SHA512 dd6eb7684aeac7a07c504de018b6efda2ceab4ff3b66e4942bf8d8a37e1feee609a63a5b9fa73ce3b3582b6949ea3399f8740bcb7dc39885d239610d3b280d0c
 DIST connman-9971144ae862e83f1f5d8cb84c0b62f2542dcdec.tar.gz 743500 BLAKE2B 513380639f02c103f4e9aca73571e00edc42894e612712c20319c3ee9b8845bff41ce05b17016b52b7d34f09c8f74f877a639fd21455b13a5a2ef1554eb0b093 SHA512 bc37dabb13b76e3fa0efd811d664f321b47118d378285dfa06710ec227822c409ed0c60c2f42c00ae081e47ec879ec1b19f784e9fc2346d1d57f6e87550dda22
-EBUILD connman-1.42_pre20230116-r2.ebuild 3537 BLAKE2B 02f1324b1eba8bbadee34c5ec3b6176a20b5d1c9e69b2657db32ab70e604afbd6a3da461487fe9ad29f773ef56a7256031a6c344ba90538ef300c0946d1a60de SHA512 9c0f750a32f3c42dcec609adb862162969f363a367e05bd81ce71e8e292bfd5933ab8d1e58809f392cbb09eddeb51930eb4a355f2e3ef28d6086637f8267730b
-EBUILD connman-9999.ebuild 2768 BLAKE2B 941f992ea03c199415c7c453a58335bc14f5d1bea965a676c364052a4dacaa3b95f28e7b8258f8069d2d4551142a0cd96c4eb748900778612372f79085141446 SHA512 b0e4d9b12c0a509899304e021b36a24ccae6e60334a50561224065b7ab022b14c31336cb4032cbaec05f8fd49db4fdc1c13775cccd434eef2cabc24203b8b495
+EBUILD connman-1.42_pre20230116-r2.ebuild 3570 BLAKE2B eb090ff16da8122c317af57b906e4e6b01879efb113f8dbcb9095bca7449f6e137deb7fd89af45416800149a3a9e1fdebce10ecf9ee4edc02aabd0deffbd70d1 SHA512 bca0b48231be5bb11d8ce274c5935d5fa294b1679a828e2f61011e9a40844ddf30b8309f51f51568f1383f1b1158c9eaf271cc1b7ae4408270e2c19ecb9c6149
+EBUILD connman-1.42_pre20230411.ebuild 3576 BLAKE2B 93c0b79a39959262dc57eadd8c47600a8e9e9d002ef34ef195d41f120b32792a8d0ec07e86ace132c8619aaad64048ab2c7f268e36e216a72adf574a694af468 SHA512 3ecb87a3df8aface6dcf956f411f9b1bdad1c44b387c8c4e0874f0a99607238aae800a09409b8c78519cc9b71f8dcd0ef199b037bc572e8993d74625ea61269d
+EBUILD connman-9999.ebuild 3532 BLAKE2B 1af7dd81bb71adb568072d0b2e817c99b96fa2b2fea6be7a35ddface9169564787b9a79fa8f4fce64612b4d3e1efcd4c6aa92f064e9a521e3eb2d251790337ed SHA512 c6da057d5c9a3bee4b203c9c5c3bbcdca8f5f5d0d44ffb4cb3674ddeb317474a89e980fd2248c3ffdfff758ad0957ae9003f6468b49334bd508241cecd708761
 MISC metadata.xml 1314 BLAKE2B 8ac27df91b77d2da814c0f35368359f2c55c9cf9c9b8db56748ca9a6128f59514dbcba5c966777a1dda27ed37ccdc6e7e37b57724f7bac83e383c3f8e5b427ce SHA512 98dcfc78d0d4a7abab5282efc2cd10419ab067d6f52f9743f7b72dc446f6e0cc0c5a63266ffa3b9cdb4df3935fc5e7f96faa143bf796ccd90e709c26e7a652b7
diff --git a/net-misc/connman/connman-1.42_pre20230116-r2.ebuild b/net-misc/connman/connman-1.42_pre20230116-r2.ebuild
index 251c12ba31e8..9d426a8103da 100644
--- a/net-misc/connman/connman-1.42_pre20230116-r2.ebuild
+++ b/net-misc/connman/connman-1.42_pre20230116-r2.ebuild
@@ -53,7 +53,10 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-2.6.39"
 
 PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" )
-S=${WORKDIR}/${PN}-${COMMIT}
+
+if [ ! -z ${COMMIT} ]; then
+	S=${WORKDIR}/${PN}-${COMMIT}
+fi
 
 src_prepare() {
 	default
diff --git a/net-misc/connman/connman-1.42_pre20230411.ebuild b/net-misc/connman/connman-1.42_pre20230411.ebuild
new file mode 100644
index 000000000000..3bc9dfd2dc65
--- /dev/null
+++ b/net-misc/connman/connman-1.42_pre20230411.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+inherit autotools systemd tmpfiles
+
+COMMIT=24180d1243bf005c721be6f9d8d6da67bb669c55
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
+else
+	SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${COMMIT}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~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"
+COMMON_DEPEND=">=dev-libs/glib-2.16
+	net-libs/gnutls
+	>=sys-apps/dbus-1.2.24
+	sys-libs/readline:0=
+	nftables? (
+		>=net-libs/libnftnl-1.0.4:0=
+		>=net-libs/libmnl-1.0.0:0=
+	)
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wireguard? ( >=net-libs/libmnl-1.0.0:0= )"
+RDEPEND="${COMMON_DEPEND}
+	bluetooth? ( net-wireless/bluez )
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	l2tp? ( net-dialup/xl2tpd )
+	ofono? ( net-misc/ofono )
+	policykit? ( sys-auth/polkit )
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-2.6.39"
+
+PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" )
+
+if [ ! -z ${COMMIT} ]; then
+	S=${WORKDIR}/${PN}-${COMMIT}
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+
+	cp "${FILESDIR}"/connman.initd2 "${T}"
+	if use iwd; then
+		sed -i \
+			-e "s/need dbus/need dbus iwd/" \
+			-e '/start-stop-daemon --start/ s/ -- / -- --wifi=iwd_agent /' \
+			"${T}"/connman.initd2 || die
+		sed -i \
+			-e "/^ExecStart/ s/$/ --wifi=iwd_agent/" \
+			src/connman.service.in || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--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 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 wireguard) \
+		$(use_enable wispr wispr builtin) \
+		--with-firewall=$(usex iptables "iptables" "nftables" ) \
+		--disable-iospm \
+		--disable-hh2serial-gps
+		)
+	# wifi USE logic to match networkmanager ebuild behavior
+	if use wifi; then
+		if use iwd; then
+			myeconfargs+=( --enable-iwd --disable-wifi )
+		else
+			myeconfargs+=( --disable-iwd --enable-wifi=builtin )
+		fi
+	else
+		myeconfargs+=( --disable-iwd --disable-wifi )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${T}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process connman_resolvconf.conf
+}
diff --git a/net-misc/connman/connman-9999.ebuild b/net-misc/connman/connman-9999.ebuild
index 9f0547208dca..7e8c30b36e79 100644
--- a/net-misc/connman/connman-9999.ebuild
+++ b/net-misc/connman/connman-9999.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 inherit autotools systemd tmpfiles
 
+COMMIT=""
+
 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"
+	SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${COMMIT}.tar.gz"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Provides a daemon for managing internet connections"
@@ -24,36 +26,56 @@ wispr"
 
 REQUIRED_USE="^^ ( iptables nftables )"
 BDEPEND="virtual/pkgconfig"
-RDEPEND=">=dev-libs/glib-2.16
+COMMON_DEPEND=">=dev-libs/glib-2.16
+	net-libs/gnutls
 	>=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 )
+		>=net-libs/libmnl-1.0.0:0=
+	)
 	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}
+	wireguard? ( >=net-libs/libmnl-1.0.0:0= )"
+RDEPEND="${COMMON_DEPEND}
+	bluetooth? ( net-wireless/bluez )
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	l2tp? ( net-dialup/xl2tpd )
+	ofono? ( net-misc/ofono )
+	policykit? ( sys-auth/polkit )
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)"
+DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-2.6.39"
 
+PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" )
+
+if [ ! -z ${COMMIT} ]; then
+	S=${WORKDIR}/${PN}-${COMMIT}
+fi
+
 src_prepare() {
 	default
 	eautoreconf
+
+	cp "${FILESDIR}"/connman.initd2 "${T}"
+	if use iwd; then
+		sed -i \
+			-e "s/need dbus/need dbus iwd/" \
+			-e '/start-stop-daemon --start/ s/ -- / -- --wifi=iwd_agent /' \
+			"${T}"/connman.initd2 || die
+		sed -i \
+			-e "/^ExecStart/ s/$/ --wifi=iwd_agent/" \
+			src/connman.service.in || die
+	fi
 }
 
 src_configure() {
-	econf \
+	local myeconfargs=(
 		--localstatedir=/var \
 		--runstatedir=/run \
 		--with-systemdunitdir=$(systemd_get_systemunitdir) \
@@ -65,7 +87,6 @@ src_configure() {
 		$(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) \
@@ -75,12 +96,24 @@ src_configure() {
 		$(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
+		)
+	# wifi USE logic to match networkmanager ebuild behavior
+	if use wifi; then
+		if use iwd; then
+			myeconfargs+=( --enable-iwd --disable-wifi )
+		else
+			myeconfargs+=( --disable-iwd --enable-wifi=builtin )
+		fi
+	else
+		myeconfargs+=( --disable-iwd --disable-wifi )
+	fi
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -92,7 +125,7 @@ src_install() {
 	fi
 	keepdir /usr/lib/${PN}/scripts
 	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+	newinitd "${T}"/${PN}.initd2 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 }