From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E8BB5138331 for ; Sun, 7 Jan 2018 14:33:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 347D2E0887; Sun, 7 Jan 2018 14:33:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0937DE0887 for ; Sun, 7 Jan 2018 14:33:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4807340BB9 for ; Sun, 7 Jan 2018 14:33:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D693147 for ; Sun, 7 Jan 2018 14:33:27 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1515335588.7d223f93fd4194cee5ce05fbb0e556b1710c1073.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsmasq/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild net-dns/dnsmasq/dnsmasq-2.76.ebuild net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild net-dns/dnsmasq/dnsmasq-2.77.ebuild net-dns/dnsmasq/dnsmasq-2.78.ebuild X-VCS-Directories: net-dns/dnsmasq/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 7d223f93fd4194cee5ce05fbb0e556b1710c1073 X-VCS-Branch: master Date: Sun, 7 Jan 2018 14:33:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0f9de4a3-8bdf-47a3-9289-375d78339597 X-Archives-Hash: 70d6b28afcd60918664f959df46f2b7f commit: 7d223f93fd4194cee5ce05fbb0e556b1710c1073 Author: Ulrich Müller gentoo org> AuthorDate: Sun Jan 7 14:20:43 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Jan 7 14:33:08 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d223f93 net-dns/dnsmasq: Test LINGUAS rather than linguas_* USE flags. Package-Manager: Portage-2.3.19, Repoman-2.3.6 net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild | 8 +++----- net-dns/dnsmasq/dnsmasq-2.76.ebuild | 8 +++----- net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild | 9 +++------ net-dns/dnsmasq/dnsmasq-2.77.ebuild | 9 +++------ net-dns/dnsmasq/dnsmasq-2.78.ebuild | 9 +++------ 5 files changed, 15 insertions(+), 28 deletions(-) diff --git a/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild index 27f157cd660..95de5790dac 100644 --- 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 3b3d54b64eb..77842fc8f91 100644 --- 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 754968a7d31..17fb4b4ab3a 100644 --- 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 3b26668c2df..3c45c1db5b1 100644 --- 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 f01b5ac6f7b..ee66cd35d3b 100644 --- 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/