From 1fd01c26b6ce5ae14850f5df99973b2a51856b01 Mon Sep 17 00:00:00 2001
From: "Volkmar W. Pogatzki" <gentoo@pogatzki.net>
Date: Sat, 6 Jun 2020 11:25:38 +0200
Subject: [PATCH] net-wireless/eiwd: Add resolvconf to RDEPEND

See https://github.com/kisslinux/repo/blob/master/extra/eiwd/post-install

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
---
 net-wireless/eiwd/eiwd-1.6.1.ebuild |  9 +++++++--
 net-wireless/eiwd/eiwd-9999.ebuild  | 12 ++++++++----
 net-wireless/eiwd/files/iwd.initd   |  2 +-
 net-wireless/eiwd/files/main.conf   |  4 ++++
 net-wireless/eiwd/metadata.xml      |  3 +++
 5 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 net-wireless/eiwd/files/main.conf

diff --git a/net-wireless/eiwd/eiwd-1.6.1.ebuild b/net-wireless/eiwd/eiwd-1.6.1.ebuild
index 3880b77a8e..89de5dd7fa 100644
--- a/net-wireless/eiwd/eiwd-1.6.1.ebuild
+++ b/net-wireless/eiwd/eiwd-1.6.1.ebuild
@@ -15,10 +15,11 @@ SRC_URI="https://github.com/dylanaraps/eiwd/releases/download/${MY_PV}/${MY_P}.t
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+system-ell"
+IUSE="+resolvconf +system-ell"
 
 DEPEND="system-ell? ( >=dev-libs/ell-0.31 )"
 RDEPEND="${DEPEND}
+	resolvconf? ( || ( net-dns/openresolv net-misc/dhcpcd ) )
 	!net-wireless/iwd
 	net-wireless/wireless-regdb"
 BDEPEND="virtual/pkgconfig"
@@ -38,5 +39,9 @@ src_configure() {
 src_install() {
 	default
 	keepdir /var/lib/iwd
-	newinitd "${FILESDIR}/iwd.initd" iwd
+	newinitd "${FILESDIR}"/iwd.initd iwd
+	if use resolvconf ; then
+		insinto /etc/iwd/
+		doins "${FILESDIR}"/main.conf
+	fi
 }
diff --git a/net-wireless/eiwd/eiwd-9999.ebuild b/net-wireless/eiwd/eiwd-9999.ebuild
index 12c7868b4b..78157c427b 100644
--- a/net-wireless/eiwd/eiwd-9999.ebuild
+++ b/net-wireless/eiwd/eiwd-9999.ebuild
@@ -15,11 +15,11 @@ EGIT_REPO_URI="https://github.com/dylanaraps/eiwd.git"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="+system-ell"
+IUSE="+resolvconf +system-ell"
 
-DEPEND="system-ell? ( >=dev-libs/ell-0.31 )
-	dev-python/docutils"
+DEPEND="system-ell? ( >=dev-libs/ell-0.31 )"
 RDEPEND="${DEPEND}
+	resolvconf? ( || ( net-dns/openresolv net-misc/dhcpcd ) )
 	!net-wireless/iwd
 	net-wireless/wireless-regdb"
 BDEPEND="virtual/pkgconfig"
@@ -44,5 +44,9 @@ src_configure() {
 src_install() {
 	default
 	keepdir /var/lib/iwd
-	newinitd "${FILESDIR}/iwd.initd" iwd
+	newinitd "${FILESDIR}"/iwd.initd iwd
+	if use resolvconf ; then
+		insinto /etc/iwd/
+		doins "${FILESDIR}"/main.conf
+	fi
 }
diff --git a/net-wireless/eiwd/files/iwd.initd b/net-wireless/eiwd/files/iwd.initd
index 673bc47dda..6a1e0862bb 100644
--- a/net-wireless/eiwd/files/iwd.initd
+++ b/net-wireless/eiwd/files/iwd.initd
@@ -9,6 +9,6 @@ command_background="yes"
 depend() {
 	provide net
 	after bootmisc modules
-	before dns dhcpcd net
+	before dns dhcpcd
 	keyword -shutdown
 }
diff --git a/net-wireless/eiwd/files/main.conf b/net-wireless/eiwd/files/main.conf
new file mode 100644
index 0000000000..72ec4fbeab
--- /dev/null
+++ b/net-wireless/eiwd/files/main.conf
@@ -0,0 +1,4 @@
+[General]
+EnableNetworkConfiguration=true
+[Network] 
+NameResolvingService=resolvconf
diff --git a/net-wireless/eiwd/metadata.xml b/net-wireless/eiwd/metadata.xml
index 12f4ea9d03..31efe3fa5e 100644
--- a/net-wireless/eiwd/metadata.xml
+++ b/net-wireless/eiwd/metadata.xml
@@ -9,5 +9,8 @@
 		<flag name="system-ell">
 			Use the system-wide <pkg>dev-libs/ell</pkg>instead of bundled.
 		</flag>
+		<flag name="resolvconf">
+			Use resolvconf to handle /etc/resolv.conf updates
+		</flag>
 	</use>
 </pkgmetadata>