diff --git a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
index ee3ea59a82a8c..2bb07eef33558 100644
--- a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
+++ b/media-sound/lilypond/lilypond-2.18.2-r3.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,7 +14,7 @@ LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa x86"
 LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
-IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
+IUSE="debug emacs profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND=">=app-text/ghostscript-gpl-8.15
@@ -76,7 +76,7 @@ src_prepare() {
 	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
 
 	for lang in ${LANGS}; do
-		use linguas_${lang} || rm po/${lang}.po || die
+		has ${lang} ${LINGUAS-${lang}} || rm po/${lang}.po || die
 	done
 
 	# respect AR
diff --git a/media-sound/lilypond/lilypond-2.19.54.ebuild b/media-sound/lilypond/lilypond-2.19.54.ebuild
index c0d01a0d9e2b7..ba9f48995807c 100644
--- a/media-sound/lilypond/lilypond-2.19.54.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.54.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=6
@@ -20,7 +20,7 @@ HOMEPAGE="http://lilypond.org/"
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
 LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
-IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}"
+IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND=">=app-text/ghostscript-gpl-8.15
@@ -81,7 +81,7 @@ src_prepare() {
 	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
 
 	for lang in ${LANGS}; do
-		use linguas_${lang} || rm po/${lang}.po || die
+		has ${lang} ${LINGUAS-${lang}} || rm po/${lang}.po || die
 	done
 
 	# respect AR
diff --git a/media-sound/lilypond/lilypond-2.19.64.ebuild b/media-sound/lilypond/lilypond-2.19.64.ebuild
index 5dd683dc41864..2388951c77715 100644
--- a/media-sound/lilypond/lilypond-2.19.64.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.64.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
@@ -20,7 +20,7 @@ HOMEPAGE="http://lilypond.org/"
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
 LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
-IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}"
+IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND=">=app-text/ghostscript-gpl-8.15
@@ -81,7 +81,7 @@ src_prepare() {
 	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
 
 	for lang in ${LANGS}; do
-		use linguas_${lang} || rm po/${lang}.po || die
+		has ${lang} ${LINGUAS-${lang}} || rm po/${lang}.po || die
 	done
 
 	# respect AR
diff --git a/media-sound/lilypond/lilypond-2.19.80.ebuild b/media-sound/lilypond/lilypond-2.19.80.ebuild
index 3fae42dbe7e25..893b3b8c81475 100644
--- a/media-sound/lilypond/lilypond-2.19.80.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.80.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
@@ -20,7 +20,7 @@ HOMEPAGE="http://lilypond.org/"
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
 LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
-IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}"
+IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND=">=app-text/ghostscript-gpl-8.15
@@ -81,7 +81,7 @@ src_prepare() {
 	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
 
 	for lang in ${LANGS}; do
-		use linguas_${lang} || rm po/${lang}.po || die
+		has ${lang} ${LINGUAS-${lang}} || rm po/${lang}.po || die
 	done
 
 	# respect AR
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index e451c38deeb9f..27bfc06997d65 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-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
@@ -20,7 +20,7 @@ HOMEPAGE="http://lilypond.org/"
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
 LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
-IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}"
+IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND=">=app-text/ghostscript-gpl-8.15
@@ -81,7 +81,7 @@ src_prepare() {
 	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
 
 	for lang in ${LANGS}; do
-		use linguas_${lang} || rm po/${lang}.po || die
+		has ${lang} ${LINGUAS-${lang}} || rm po/${lang}.po || die
 	done
 
 	# respect AR