commit:     2f707c79ecd73aa7d5683aeb35d0027145909b84
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jun 20 17:13:11 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jun 20 17:13:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2f707c79

net-wireless/eiwd: update to PR #16160

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>

 net-wireless/eiwd/eiwd-1.6.1.ebuild           | 17 +++++++-------
 net-wireless/eiwd/eiwd-1.7_pre20200416.ebuild | 17 +++++++-------
 net-wireless/eiwd/eiwd-9999.ebuild            | 17 +++++++-------
 net-wireless/eiwd/metadata.xml                | 32 +++++++++++----------------
 4 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/net-wireless/eiwd/eiwd-1.6.1.ebuild 
b/net-wireless/eiwd/eiwd-1.6.1.ebuild
index cf05d7d..3214ce0 100644
--- a/net-wireless/eiwd/eiwd-1.6.1.ebuild
+++ b/net-wireless/eiwd/eiwd-1.6.1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit flag-o-matic
-
 MY_PV="$(ver_rs 2 '-')"
 MY_P="${PN}-${MY_PV}"
 
@@ -15,11 +13,10 @@ 
SRC_URI="https://github.com/dylanaraps/eiwd/releases/download/${MY_PV}/${MY_P}.t
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+client +monitor ofono +resolvconf +system-ell wired"
+IUSE="+client +monitor ofono +system-ell wired"
 
 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"
@@ -27,7 +24,6 @@ BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {
-       append-cflags "-fsigned-char"
        local myeconfargs=(
                --sysconfdir="${EPREFIX}"/etc/iwd 
--localstatedir="${EPREFIX}"/var
                --disable-dbus
@@ -44,8 +40,11 @@ src_install() {
        default
        keepdir /var/lib/iwd
        newinitd "${FILESDIR}"/iwd.initd iwd
-       if use resolvconf ; then
-               insinto /etc/iwd/
-               doins "${FILESDIR}"/main.conf
-       fi
+       insinto /etc/iwd/
+       doins "${FILESDIR}"/main.conf
+}
+
+pkg_postinst() {
+       elog "To use eiwd's built-in DNS features you also need 
net-dns/openresolv"
+       elog "or net-misc/dhcpcd."
 }

diff --git a/net-wireless/eiwd/eiwd-1.7_pre20200416.ebuild 
b/net-wireless/eiwd/eiwd-1.7_pre20200416.ebuild
index a70d3ef..1d2ec49 100644
--- a/net-wireless/eiwd/eiwd-1.7_pre20200416.ebuild
+++ b/net-wireless/eiwd/eiwd-1.7_pre20200416.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic git-r3
+inherit autotools git-r3
 
 MY_PV="${PV}"
 MY_P="${PN}-${MY_PV}"
@@ -17,11 +17,10 @@ EGIT_COMMIT="7b5545a"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="+client +monitor ofono +resolvconf +system-ell wired"
+IUSE="+client +monitor ofono +system-ell wired"
 
 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,7 +37,6 @@ src_prepare() {
 }
 
 src_configure() {
-       append-cflags "-fsigned-char"
        local myeconfargs=(
                --sysconfdir="${EPREFIX}"/etc/iwd 
--localstatedir="${EPREFIX}"/var
                --disable-dbus
@@ -55,8 +53,11 @@ src_install() {
        default
        keepdir /var/lib/iwd
        newinitd "${FILESDIR}"/iwd.initd iwd
-       if use resolvconf ; then
-               insinto /etc/iwd/
-               doins "${FILESDIR}"/main.conf
-       fi
+       insinto /etc/iwd/
+       doins "${FILESDIR}"/main.conf
+}
+
+pkg_postinst() {
+       elog "To use eiwd's built-in DNS features you also need 
net-dns/openresolv"
+       elog "or net-misc/dhcpcd."
 }

diff --git a/net-wireless/eiwd/eiwd-9999.ebuild 
b/net-wireless/eiwd/eiwd-9999.ebuild
index 6f3e886..c7fb122 100644
--- a/net-wireless/eiwd/eiwd-9999.ebuild
+++ b/net-wireless/eiwd/eiwd-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic git-r3
+inherit autotools git-r3
 
 MY_PV="$(ver_rs 2 '-')"
 MY_P="${PN}-${MY_PV}"
@@ -16,11 +16,10 @@ EGIT_COMMIT="7b5545a"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="+client +monitor ofono +resolvconf +system-ell wired"
+IUSE="+client +monitor ofono +system-ell wired"
 
 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"
@@ -33,7 +32,6 @@ src_prepare() {
 }
 
 src_configure() {
-       append-cflags "-fsigned-char"
        local myeconfargs=(
                --sysconfdir="${EPREFIX}"/etc/iwd 
--localstatedir="${EPREFIX}"/var
                --disable-dbus
@@ -50,8 +48,11 @@ src_install() {
        default
        keepdir /var/lib/iwd
        newinitd "${FILESDIR}"/iwd.initd iwd
-       if use resolvconf ; then
-               insinto /etc/iwd/
-               doins "${FILESDIR}"/main.conf
-       fi
+       insinto /etc/iwd/
+       doins "${FILESDIR}"/main.conf
+}
+
+pkg_postinst() {
+       elog "To use eiwd's built-in DNS features you also need 
net-dns/openresolv"
+       elog "or net-misc/dhcpcd."
 }

diff --git a/net-wireless/eiwd/metadata.xml b/net-wireless/eiwd/metadata.xml
index 9fb3446..455b339 100644
--- a/net-wireless/eiwd/metadata.xml
+++ b/net-wireless/eiwd/metadata.xml
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <!-- maintainer-needed -->
+       <maintainer type="person">
+               <email>gen...@pogatzki.net</email>
+               <name>Volkmar W. Pogatzki</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>proxy-ma...@gentoo.org</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <upstream>
                <remote-id type="github">dylanaraps/eiwd</remote-id>
        </upstream>
        <use>
-               <flag name='client'>
-                       Enable iwctl client tool
-               </flag>
-               <flag name='monitor'>
-                       Enable iwmon monitor tool
-               </flag>
-               <flag name='ofono'>
-                       Enable support for oFono SIM authentication
-               </flag>
-               <flag name="resolvconf">
-                       Use resolvconf to handle /etc/resolv.conf updates
-               </flag>
-               <flag name="system-ell">
-                       Use the system-wide <pkg>dev-libs/ell</pkg>instead of 
bundled.
-               </flag>
-               <flag name='wired'>
-                       Enable ethernet authentication daemon
-               </flag>
+               <flag name='client'>Enable iwctl client tool</flag>
+               <flag name='monitor'>Enable iwmon monitor tool</flag>
+               <flag name='ofono'>Enable support for oFono SIM 
authentication</flag>
+               <flag name="system-ell">Use the system-wide 
<pkg>dev-libs/ell</pkg>instead of bundled. </flag>
+               <flag name='wired'>Enable ethernet authentication daemon</flag>
        </use>
 </pkgmetadata>

Reply via email to