--- ../../../gentoo/net-wireless/iwd/iwd-2.13.ebuild	2024-01-14 08:31:24.734541595 -0800
+++ iwd-2.13.ebuild	2024-02-08 09:01:24.471708516 -0800
@@ -4,13 +4,10 @@
 EAPI=8
 inherit flag-o-matic linux-info systemd
 
-#Set this variable to the required external ell version
-ELL_REQ="0.61"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
@@ -29,7 +26,7 @@
 	client? ( sys-libs/readline:0= )
 "
 
-[[ -z "${ELL_REQ}" ]] || DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
+DEPEND=">=dev-libs/ell-0.61"
 
 RDEPEND="
 	${DEPEND}
@@ -97,15 +94,6 @@
 	check_extra_config
 }
 
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
 src_prepare() {
 	default
 	if [[ ${PV} == *9999* ]] ; then
@@ -127,8 +115,8 @@
 		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
 		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
 		--with-systemd-networkdir="$(systemd_get_utildir)/network"
+		--enable-external-ell
 	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
 	econf "${myeconfargs[@]}"
 }