aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolkmar W. Pogatzki <gentoo@pogatzki.net>2020-06-06 11:25:38 +0200
committerVolkmar W. Pogatzki <gentoo@pogatzki.net>2020-06-06 11:25:54 +0200
commit1fd01c26b6ce5ae14850f5df99973b2a51856b01 (patch)
tree103359002d58fba8af3c160c9d4fe6c980732b75
parentx11-themes/obsidian-icon-theme: drop 4.11 (diff)
downloadguru-1fd01c26b6ce5ae14850f5df99973b2a51856b01.tar.gz
guru-1fd01c26b6ce5ae14850f5df99973b2a51856b01.tar.bz2
guru-1fd01c26b6ce5ae14850f5df99973b2a51856b01.zip
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>
-rw-r--r--net-wireless/eiwd/eiwd-1.6.1.ebuild9
-rw-r--r--net-wireless/eiwd/eiwd-9999.ebuild12
-rw-r--r--net-wireless/eiwd/files/iwd.initd2
-rw-r--r--net-wireless/eiwd/files/main.conf4
-rw-r--r--net-wireless/eiwd/metadata.xml3
5 files changed, 23 insertions, 7 deletions
diff --git a/net-wireless/eiwd/eiwd-1.6.1.ebuild b/net-wireless/eiwd/eiwd-1.6.1.ebuild
index 3880b77a8..89de5dd7f 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 12c7868b4..78157c427 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 673bc47dd..6a1e0862b 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 000000000..72ec4fbea
--- /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 12f4ea9d0..31efe3fa5 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>