[gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     8c05c61b85a891b0b86168eb8deb8fdd5ad0420e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 11:46:15 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 11:46:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c05c61b

media-gfx/gimp: Remove linguas_* from IUSE.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/gimp/gimp-2.8.22-r1.ebuild |  7 ++-----
 media-gfx/gimp/gimp-2.8.22.ebuild    |  9 +++------
 media-gfx/gimp/gimp-2.9.8-r1.ebuild  |  7 ++-----
 media-gfx/gimp/gimp-9999.ebuild      | 11 ++++-------
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
index c7a24a6fa82..316df454f0b 100644
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
@@ -16,10 +16,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-lin
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
 
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
 RDEPEND=">=dev-libs/glib-2.30.2:2
 	>=dev-libs/atk-2.2.0
 	>=x11-libs/gtk+-2.24.10:2
@@ -133,9 +129,10 @@ src_prepare() {
 }
 
 _clean_up_locales() {
+	[[ -z ${LINGUAS+set} ]] && return
 	einfo "Cleaning up locales..."
 	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
+		has ${lang} ${LINGUAS} && {
 			einfo "- keeping ${lang}"
 			continue
 		}

diff --git a/media-gfx/gimp/gimp-2.8.22.ebuild b/media-gfx/gimp/gimp-2.8.22.ebuild
index fc037aaa8de..55ab71f2660 100644
--- a/media-gfx/gimp/gimp-2.8.22.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22.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=5
@@ -16,10 +16,6 @@ KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
 
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
 RDEPEND=">=dev-libs/glib-2.30.2:2
 	>=dev-libs/atk-2.2.0
 	>=x11-libs/gtk+-2.24.10:2
@@ -125,9 +121,10 @@ src_prepare() {
 }
 
 _clean_up_locales() {
+	[[ -z ${LINGUAS+set} ]] && return
 	einfo "Cleaning up locales..."
 	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
+		has ${lang} ${LINGUAS} && {
 			einfo "- keeping ${lang}"
 			continue
 		}

diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index 76986e47e6e..52e0827a800 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -16,10 +16,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
 
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
 RDEPEND=">=dev-libs/glib-2.40.0:2
 	>=dev-libs/atk-2.2.0
 	>=x11-libs/gtk+-2.24.10:2
@@ -162,9 +158,10 @@ src_compile() {
 }
 
 _clean_up_locales() {
+	[[ -z ${LINGUAS+set} ]] && return
 	einfo "Cleaning up locales..."
 	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
+		has ${lang} ${LINGUAS} && {
 			einfo "- keeping ${lang}"
 			continue
 		}

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index e448ccbf5ae..2ac820e3f5b 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.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
@@ -17,10 +17,6 @@ KEYWORDS=""
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
 
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
 RDEPEND=">=dev-libs/glib-2.40.0:2
 	>=dev-libs/atk-2.2.0
 	>=x11-libs/gtk+-2.24.10:2
@@ -102,7 +98,7 @@ src_prepare() {
 	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
 	local myconf
 	if ! use doc; then
-	    myconf="${myconf} --disable-gtk-doc"
+		myconf="${myconf} --disable-gtk-doc"
 	fi
 	./autogen.sh ${myconf} || die
 
@@ -167,9 +163,10 @@ src_compile() {
 }
 
 _clean_up_locales() {
+	[[ -z ${LINGUAS+set} ]] && return
 	einfo "Cleaning up locales..."
 	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
+		has ${lang} ${LINGUAS} && {
 			einfo "- keeping ${lang}"
 			continue
 		}