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 6C17E138330 for ; Sun, 7 Jan 2018 16:22:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88834E0875; Sun, 7 Jan 2018 16:22:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5C425E0875 for ; Sun, 7 Jan 2018 16:22:46 +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 EF2A6335C85 for ; Sun, 7 Jan 2018 16:22:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7828B147 for ; Sun, 7 Jan 2018 16:22:43 +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: <1515342157.db8c3313d3e87dae284b1d2032c989b6f956035b.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/unetbootin/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/unetbootin/unetbootin-625.ebuild sys-boot/unetbootin/unetbootin-647.ebuild sys-boot/unetbootin/unetbootin-655.ebuild sys-boot/unetbootin/unetbootin-657.ebuild X-VCS-Directories: sys-boot/unetbootin/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: db8c3313d3e87dae284b1d2032c989b6f956035b X-VCS-Branch: master Date: Sun, 7 Jan 2018 16:22:43 +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: 6fdcd689-0317-49f9-90ba-796e3408d4db X-Archives-Hash: deffd065f97c15360b90db7ebd931a04 commit: db8c3313d3e87dae284b1d2032c989b6f956035b Author: Ulrich Müller gentoo org> AuthorDate: Sun Jan 7 16:16:02 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Jan 7 16:22:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db8c3313 sys-boot/unetbootin: Test LINGUAS rather than linguas_* USE flags. Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-boot/unetbootin/unetbootin-625.ebuild | 10 +++------- sys-boot/unetbootin/unetbootin-647.ebuild | 10 +++------- sys-boot/unetbootin/unetbootin-655.ebuild | 10 +++------- sys-boot/unetbootin/unetbootin-657.ebuild | 10 +++------- 4 files changed, 12 insertions(+), 28 deletions(-) diff --git a/sys-boot/unetbootin/unetbootin-625.ebuild b/sys-boot/unetbootin/unetbootin-625.ebuild index f6884665740..aabc1aa868d 100644 --- a/sys-boot/unetbootin/unetbootin-625.ebuild +++ b/sys-boot/unetbootin/unetbootin-625.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -19,10 +19,6 @@ UNBI_LINGUAS=" zh_CN zh_TW " -for lingua in ${UNBI_LINGUAS}; do - IUSE="${IUSE} linguas_${lingua}" -done - S=${WORKDIR}/${P}/src/${PN} DEPEND="dev-qt/qtgui:4" @@ -52,7 +48,7 @@ src_prepare() { # Remove localisations local lingua for lingua in ${UNBI_LINGUAS}; do - if ! use linguas_${lingua}; then + if ! has ${lingua} ${LINGUAS-${lingua}}; then sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die rm ${PN}_${lingua}.ts || die fi @@ -82,7 +78,7 @@ src_install() { local lingua for lingua in ${UNBI_LINGUAS}; do - if use linguas_${lingua}; then + if has ${lingua} ${LINGUAS-${lingua}}; then insinto /usr/share/${PN} doins ${PN}_${lingua}.qm fi diff --git a/sys-boot/unetbootin/unetbootin-647.ebuild b/sys-boot/unetbootin/unetbootin-647.ebuild index e449aefee55..0371e75f2c8 100644 --- a/sys-boot/unetbootin/unetbootin-647.ebuild +++ b/sys-boot/unetbootin/unetbootin-647.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 @@ -19,10 +19,6 @@ UNBI_LINGUAS=" zh_CN zh_TW " -for lingua in ${UNBI_LINGUAS}; do - IUSE="${IUSE} linguas_${lingua}" -done - S=${WORKDIR}/${P}/src/${PN} DEPEND="dev-qt/qtgui:4" @@ -51,7 +47,7 @@ src_prepare() { # Remove localisations local lingua for lingua in ${UNBI_LINGUAS}; do - if ! use linguas_${lingua}; then + if ! has ${lingua} ${LINGUAS-${lingua}}; then sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die rm ${PN}_${lingua}.ts || die fi @@ -81,7 +77,7 @@ src_install() { local lingua for lingua in ${UNBI_LINGUAS}; do - if use linguas_${lingua}; then + if has ${lingua} ${LINGUAS-${lingua}}; then insinto /usr/share/${PN} doins ${PN}_${lingua}.qm fi diff --git a/sys-boot/unetbootin/unetbootin-655.ebuild b/sys-boot/unetbootin/unetbootin-655.ebuild index 453496db667..1007cc620a1 100644 --- a/sys-boot/unetbootin/unetbootin-655.ebuild +++ b/sys-boot/unetbootin/unetbootin-655.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 @@ -19,10 +19,6 @@ UNBI_LINGUAS=" zh_CN zh_TW " -for lingua in ${UNBI_LINGUAS}; do - IUSE="${IUSE} linguas_${lingua}" -done - S=${WORKDIR}/${P}/src/${PN} DEPEND="dev-qt/qtgui:4" @@ -50,7 +46,7 @@ src_prepare() { # Remove localisations local lingua for lingua in ${UNBI_LINGUAS}; do - if ! use linguas_${lingua}; then + if ! has ${lingua} ${LINGUAS-${lingua}}; then sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die rm ${PN}_${lingua}.ts || die fi @@ -80,7 +76,7 @@ src_install() { local lingua for lingua in ${UNBI_LINGUAS}; do - if use linguas_${lingua}; then + if has ${lingua} ${LINGUAS-${lingua}}; then insinto /usr/share/${PN} doins ${PN}_${lingua}.qm fi diff --git a/sys-boot/unetbootin/unetbootin-657.ebuild b/sys-boot/unetbootin/unetbootin-657.ebuild index 453496db667..1007cc620a1 100644 --- a/sys-boot/unetbootin/unetbootin-657.ebuild +++ b/sys-boot/unetbootin/unetbootin-657.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 @@ -19,10 +19,6 @@ UNBI_LINGUAS=" zh_CN zh_TW " -for lingua in ${UNBI_LINGUAS}; do - IUSE="${IUSE} linguas_${lingua}" -done - S=${WORKDIR}/${P}/src/${PN} DEPEND="dev-qt/qtgui:4" @@ -50,7 +46,7 @@ src_prepare() { # Remove localisations local lingua for lingua in ${UNBI_LINGUAS}; do - if ! use linguas_${lingua}; then + if ! has ${lingua} ${LINGUAS-${lingua}}; then sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die rm ${PN}_${lingua}.ts || die fi @@ -80,7 +76,7 @@ src_install() { local lingua for lingua in ${UNBI_LINGUAS}; do - if use linguas_${lingua}; then + if has ${lingua} ${LINGUAS-${lingua}}; then insinto /usr/share/${PN} doins ${PN}_${lingua}.qm fi