net-dns/dnsmasq: Test LINGUAS rather than linguas_* USE flags.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild
index 27f157cd660e4e9d5a277623cc8d16bb05c1bffc..95de5790dac29dd509b726a76d520e3bcc179ccf 100644 (file)
--- a/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,9 +14,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp"
 DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
-for dm_lingua in ${DM_LINGUAS}; do
-       IUSE+=" linguas_${dm_lingua}"
-done
 
 CDEPEND="dbus? ( sys-apps/dbus )
        idn? ( net-dns/libidn )
@@ -141,7 +138,8 @@ src_install() {
                install$(use nls && echo "-i18n")
 
        for lingua in ${DM_LINGUAS}; do
-               use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+               has ${lingua} ${LINGUAS-${lingua}} \
+                       || rm -rf "${D}"/usr/share/locale/${lingua}
        done
        [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
 

diff --git a/net-dns/dnsmasq/dnsmasq-2.76.ebuild b/net-dns/dnsmasq/dnsmasq-2.76.ebuild
index 3b3d54b64eb965e88d41c4e12d8453522326f64f..77842fc8f91960932a07a729339158776ab4f762 100644 (file)
--- a/net-dns/dnsmasq/dnsmasq-2.76.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.76.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,9 +14,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp"
 DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
-for dm_lingua in ${DM_LINGUAS}; do
-       IUSE+=" linguas_${dm_lingua}"
-done
 
 CDEPEND="dbus? ( sys-apps/dbus )
        idn? ( net-dns/libidn )
@@ -141,7 +138,8 @@ src_install() {
                install$(use nls && echo "-i18n")
 
        for lingua in ${DM_LINGUAS}; do
-               use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+               has ${lingua} ${LINGUAS-${lingua}} \
+                       || rm -rf "${D}"/usr/share/locale/${lingua}
        done
        [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
 

diff --git a/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild
index 754968a7d31780587080798f75df82b31a2b7b60..17fb4b4ab3a659adc1c907b905936b2ffa7ec275 100644 (file)
--- a/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,10 +18,6 @@ IUSE+=" ipv6 lua nls script selinux static tftp"
 
 DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
 
-for dm_lingua in "${DM_LINGUAS[@]}"; do
-       IUSE+=" linguas_${dm_lingua}"
-done
-
 CDEPEND="dbus? ( sys-apps/dbus )
        idn? (
                !libidn2? ( net-dns/libidn )
@@ -147,7 +143,8 @@ src_install() {
                install$(use nls && echo "-i18n")
 
        for lingua in "${DM_LINGUAS[@]}"; do
-               use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+               has ${lingua} ${LINGUAS-${lingua}} \
+                       || rm -rf "${D}"/usr/share/locale/${lingua}
        done
        [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
 

diff --git a/net-dns/dnsmasq/dnsmasq-2.77.ebuild b/net-dns/dnsmasq/dnsmasq-2.77.ebuild
index 3b26668c2df58fe880abbdb2fd3541245f7893e9..3c45c1db5b185e0d29bc80b42ef3b4c9f2a2e206 100644 (file)
--- a/net-dns/dnsmasq/dnsmasq-2.77.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.77.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,10 +18,6 @@ IUSE+=" ipv6 lua nls script selinux static tftp"
 
 DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
 
-for dm_lingua in "${DM_LINGUAS[@]}"; do
-       IUSE+=" linguas_${dm_lingua}"
-done
-
 CDEPEND="dbus? ( sys-apps/dbus )
        idn? ( net-dns/libidn )
        libidn2? ( >=net-dns/libidn2-2.0 )
@@ -145,7 +141,8 @@ src_install() {
                install$(use nls && echo "-i18n")
 
        for lingua in "${DM_LINGUAS[@]}"; do
-               use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+               has ${lingua} ${LINGUAS-${lingua}} \
+                       || rm -rf "${D}"/usr/share/locale/${lingua}
        done
        [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
 

diff --git a/net-dns/dnsmasq/dnsmasq-2.78.ebuild b/net-dns/dnsmasq/dnsmasq-2.78.ebuild
index f01b5ac6f7b245287c26487c003ac81fa9b441ba..ee66cd35d3b70204d16abdf3490b6f5400c94f16 100644 (file)
--- a/net-dns/dnsmasq/dnsmasq-2.78.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.78.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,10 +18,6 @@ IUSE+=" ipv6 lua nls script selinux static tftp"
 
 DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
 
-for dm_lingua in "${DM_LINGUAS[@]}"; do
-       IUSE+=" linguas_${dm_lingua}"
-done
-
 CDEPEND="dbus? ( sys-apps/dbus )
        idn? (
                !libidn2? ( net-dns/libidn )
@@ -147,7 +143,8 @@ src_install() {
                install$(use nls && echo "-i18n")
 
        for lingua in "${DM_LINGUAS[@]}"; do
-               use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+               has ${lingua} ${LINGUAS-${lingua}} \
+                       || rm -rf "${D}"/usr/share/locale/${lingua}
        done
        [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/