[patch] app-text/texlive: Migrate from LINGUAS to L10N.

0001-app-text-texlive-Migrate-from-LINGUAS-to-L10N.patch (text/plain), 42.83 KB, created by Ulrich Müller on 2016-06-23 05:21:54 UTC

From f1d8cc3b9c53832e00f8ee9b5b0e833f7ae1ddfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <[e-mail]>
Date: Thu, 23 Jun 2016 07:14:41 +0200
Subject: [PATCH] app-text/texlive: Migrate from LINGUAS to L10N.

Package-Manager: portage-2.3.0_rc1
---
 app-text/texlive/texlive-2012.ebuild | 189 ++++++++++++++++++-----------------
 app-text/texlive/texlive-2013.ebuild | 145 ++++++++++++++-------------
 app-text/texlive/texlive-2014.ebuild | 151 ++++++++++++++--------------
 app-text/texlive/texlive-2015.ebuild | 151 ++++++++++++++--------------
 4 files changed, 320 insertions(+), 316 deletions(-)

diff --git a/app-text/texlive/texlive-2012.ebuild b/app-text/texlive/texlive-2012.ebuild
index 81ab1ed..5311ede 100644
--- a/app-text/texlive/texlive-2012.ebuild
+++ b/app-text/texlive/texlive-2012.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,12 +15,12 @@ IUSE="cjk context detex doc dvi2tty dvipdfm extra epspdf games graphics
 humanities jadetex luatex metapost music omega pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
 
-LANGS="af ar as bg bn bo ca cs cy da de el en en_GB eo es et eu fa fi fr ga gl
+LANGS="af ar as bg bn bo ca cs cy da de el en en-GB eo es et eu fa fi fr ga gl
 	gu he hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no
-	or pa pl pt ro ru sa_IN sk sl sr sv ta te th tk tr uk vi zh"
+	or pa pl pt ro ru sa sk sl sr sv ta te th tk tr uk vi zh"
 
 for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
+	IUSE="${IUSE} l10n_${X}"
 done
 
 TEXLIVE_CAT="dev-texlive"
@@ -100,98 +100,99 @@ RDEPEND="${DEPEND}
 	jadetex? ( >=app-text/jadetex-3.13-r2 )
 	doc? (
 		>=${TEXLIVE_CAT}/texlive-documentation-base-${PV}
-		linguas_ar? ( >=${TEXLIVE_CAT}/texlive-documentation-arabic-${PV} )
-		linguas_bg? ( >=${TEXLIVE_CAT}/texlive-documentation-bulgarian-${PV} )
-		linguas_zh? ( >=${TEXLIVE_CAT}/texlive-documentation-chinese-${PV} )
-		linguas_cs? ( >=${TEXLIVE_CAT}/texlive-documentation-czechslovak-${PV} )
-		linguas_sk? ( >=${TEXLIVE_CAT}/texlive-documentation-czechslovak-${PV} )
-		linguas_nl? ( >=${TEXLIVE_CAT}/texlive-documentation-dutch-${PV} )
-		linguas_en? ( >=${TEXLIVE_CAT}/texlive-documentation-english-${PV} )
-		linguas_fi? ( >=${TEXLIVE_CAT}/texlive-documentation-finnish-${PV} )
-		linguas_fr? ( >=${TEXLIVE_CAT}/texlive-documentation-french-${PV} )
-		linguas_de? ( >=${TEXLIVE_CAT}/texlive-documentation-german-${PV} )
-		linguas_it? ( >=${TEXLIVE_CAT}/texlive-documentation-italian-${PV} )
-		linguas_ja? ( >=${TEXLIVE_CAT}/texlive-documentation-japanese-${PV} )
-		linguas_ko? ( >=${TEXLIVE_CAT}/texlive-documentation-korean-${PV} )
-		linguas_mn? ( >=${TEXLIVE_CAT}/texlive-documentation-mongolian-${PV} )
-		linguas_pl? ( >=${TEXLIVE_CAT}/texlive-documentation-polish-${PV} )
-		linguas_pt? ( >=${TEXLIVE_CAT}/texlive-documentation-portuguese-${PV} )
-		linguas_ru? ( >=${TEXLIVE_CAT}/texlive-documentation-russian-${PV} )
-		linguas_sr? ( >=${TEXLIVE_CAT}/texlive-documentation-serbian-${PV} )
-		linguas_sl? ( >=${TEXLIVE_CAT}/texlive-documentation-slovenian-${PV} )
-		linguas_es? ( >=${TEXLIVE_CAT}/texlive-documentation-spanish-${PV} )
-		linguas_th? ( >=${TEXLIVE_CAT}/texlive-documentation-thai-${PV} )
-		linguas_tr? ( >=${TEXLIVE_CAT}/texlive-documentation-turkish-${PV} )
-		linguas_uk? ( >=${TEXLIVE_CAT}/texlive-documentation-ukrainian-${PV} )
-		linguas_vi? ( >=${TEXLIVE_CAT}/texlive-documentation-vietnamese-${PV} )
+		l10n_ar? ( >=${TEXLIVE_CAT}/texlive-documentation-arabic-${PV} )
+		l10n_bg? ( >=${TEXLIVE_CAT}/texlive-documentation-bulgarian-${PV} )
+		l10n_zh? ( >=${TEXLIVE_CAT}/texlive-documentation-chinese-${PV} )
+		l10n_cs? ( >=${TEXLIVE_CAT}/texlive-documentation-czechslovak-${PV} )
+		l10n_sk? ( >=${TEXLIVE_CAT}/texlive-documentation-czechslovak-${PV} )
+		l10n_nl? ( >=${TEXLIVE_CAT}/texlive-documentation-dutch-${PV} )
+		l10n_en? ( >=${TEXLIVE_CAT}/texlive-documentation-english-${PV} )
+		l10n_fi? ( >=${TEXLIVE_CAT}/texlive-documentation-finnish-${PV} )
+		l10n_fr? ( >=${TEXLIVE_CAT}/texlive-documentation-french-${PV} )
+		l10n_de? ( >=${TEXLIVE_CAT}/texlive-documentation-german-${PV} )
+		l10n_it? ( >=${TEXLIVE_CAT}/texlive-documentation-italian-${PV} )
+		l10n_ja? ( >=${TEXLIVE_CAT}/texlive-documentation-japanese-${PV} )
+		l10n_ko? ( >=${TEXLIVE_CAT}/texlive-documentation-korean-${PV} )
+		l10n_mn? ( >=${TEXLIVE_CAT}/texlive-documentation-mongolian-${PV} )
+		l10n_pl? ( >=${TEXLIVE_CAT}/texlive-documentation-polish-${PV} )
+		l10n_pt? ( >=${TEXLIVE_CAT}/texlive-documentation-portuguese-${PV} )
+		l10n_ru? ( >=${TEXLIVE_CAT}/texlive-documentation-russian-${PV} )
+		l10n_sr? ( >=${TEXLIVE_CAT}/texlive-documentation-serbian-${PV} )
+		l10n_sl? ( >=${TEXLIVE_CAT}/texlive-documentation-slovenian-${PV} )
+		l10n_es? ( >=${TEXLIVE_CAT}/texlive-documentation-spanish-${PV} )
+		l10n_th? ( >=${TEXLIVE_CAT}/texlive-documentation-thai-${PV} )
+		l10n_tr? ( >=${TEXLIVE_CAT}/texlive-documentation-turkish-${PV} )
+		l10n_uk? ( >=${TEXLIVE_CAT}/texlive-documentation-ukrainian-${PV} )
+		l10n_vi? ( >=${TEXLIVE_CAT}/texlive-documentation-vietnamese-${PV} )
 	)
-	linguas_af? ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
-				  >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	linguas_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	linguas_hy? ( >=${TEXLIVE_CAT}/texlive-langarmenian-${PV}
-				  >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langarmenian-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langother-${PV} )
 	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
 		   >=dev-tex/cjk-latex-4.8.2 )
-	linguas_hr?    ( >=${TEXLIVE_CAT}/texlive-langcroatian-${PV} )
-	linguas_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} >=app-text/vlna-1.3 )
-	linguas_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
-	linguas_da?    ( >=${TEXLIVE_CAT}/texlive-langdanish-${PV} )
-	linguas_nl?    ( >=${TEXLIVE_CAT}/texlive-langdutch-${PV} )
-	linguas_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	linguas_en_GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	linguas_fi?    ( >=${TEXLIVE_CAT}/texlive-langfinnish-${PV} )
-	linguas_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	linguas_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	linguas_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
-	linguas_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
-	linguas_he?    ( >=${TEXLIVE_CAT}/texlive-langhebrew-${PV} )
-	linguas_hu?    ( >=${TEXLIVE_CAT}/texlive-langhungarian-${PV} )
-	linguas_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_sa_IN? ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
-	linguas_la?    ( >=${TEXLIVE_CAT}/texlive-langlatin-${PV} )
-	linguas_lt?    ( >=${TEXLIVE_CAT}/texlive-langlithuanian-${PV} )
-	linguas_lv?    ( >=${TEXLIVE_CAT}/texlive-langlatvian-${PV} )
-	linguas_mn?    ( >=${TEXLIVE_CAT}/texlive-langmongolian-${PV} )
-	linguas_nb?    ( >=${TEXLIVE_CAT}/texlive-langnorwegian-${PV} )
-	linguas_nn?    ( >=${TEXLIVE_CAT}/texlive-langnorwegian-${PV} )
-	linguas_no?    ( >=${TEXLIVE_CAT}/texlive-langnorwegian-${PV} )
-	linguas_cy?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_et?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_ga?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_is?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_ro?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_sr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV}
-	                 >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_sl?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_tr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
-	linguas_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
-	linguas_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	linguas_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	linguas_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	linguas_sv?    ( >=${TEXLIVE_CAT}/texlive-langswedish-${PV} )
-	linguas_bo?    ( >=${TEXLIVE_CAT}/texlive-langtibetan-${PV} )
-	linguas_tk?    ( >=${TEXLIVE_CAT}/texlive-langturkmen-${PV} )
-	linguas_vi?    ( >=${TEXLIVE_CAT}/texlive-langvietnamese-${PV} )
+	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langcroatian-${PV} )
+	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
+	              >=app-text/vlna-1.3 )
+	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langdanish-${PV} )
+	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langdutch-${PV} )
+	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	l10n_en-GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langfinnish-${PV} )
+	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langhebrew-${PV} )
+	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langhungarian-${PV} )
+	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langlatin-${PV} )
+	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langlithuanian-${PV} )
+	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langlatvian-${PV} )
+	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langmongolian-${PV} )
+	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langnorwegian-${PV} )
+	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langnorwegian-${PV} )
+	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langnorwegian-${PV} )
+	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langswedish-${PV} )
+	l10n_bo?    ( >=${TEXLIVE_CAT}/texlive-langtibetan-${PV} )
+	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langturkmen-${PV} )
+	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langvietnamese-${PV} )
 	xindy? ( app-text/xindy )
 "
diff --git a/app-text/texlive/texlive-2013.ebuild b/app-text/texlive/texlive-2013.ebuild
index e4aa6a3..6d7c8d2 100644
--- a/app-text/texlive/texlive-2013.ebuild
+++ b/app-text/texlive/texlive-2013.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,12 +15,12 @@ IUSE="cjk context detex dvi2tty dvipdfm extra epspdf games graphics
 humanities jadetex luatex metapost music omega pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
 
-LANGS="af ar as bg bn br ca cs cy da de el en en_GB eo es et eu fa fi fr ga gl
+LANGS="af ar as bg bn br ca cs cy da de el en en-GB eo es et eu fa fi fr ga gl
 	gu he hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no
-	or pa pl pt rm ro ru sa_IN sco sk sl sq sr sv ta te th tk tr uk vi zh"
+	or pa pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
 
 for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
+	IUSE="${IUSE} l10n_${X}"
 done
 
 TEXLIVE_CAT="dev-texlive"
@@ -96,75 +96,76 @@ RDEPEND="${DEPEND}
 		app-text/passivetex
 	)
 	jadetex? ( >=app-text/jadetex-3.13-r2 )
-	linguas_af? ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
-				  >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	linguas_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	linguas_hy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_hy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
 	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
 		   >=dev-tex/cjk-latex-4.8.3-r1 )
-	linguas_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} >=app-text/vlna-1.3 )
-	linguas_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
-	linguas_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	linguas_en_GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	linguas_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	linguas_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	linguas_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
-	linguas_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
-	linguas_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_sa_IN? ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
-	linguas_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
-	                 >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
-	linguas_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
-	linguas_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	linguas_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	linguas_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	linguas_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
+	              >=app-text/vlna-1.3 )
+	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	l10n_en-GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
 	xindy? ( app-text/xindy )
 "
diff --git a/app-text/texlive/texlive-2014.ebuild b/app-text/texlive/texlive-2014.ebuild
index f229da7..da868e9 100644
--- a/app-text/texlive/texlive-2014.ebuild
+++ b/app-text/texlive/texlive-2014.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,12 +15,12 @@ IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music omega pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
 
-LANGS="af ar as bg bn br ca cs cy da de el en en_GB eo es et eu fa fi fr ga gl
+LANGS="af ar as bg bn br ca cs cy da de el en en-GB eo es et eu fa fi fr ga gl
 	gu he hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no
-	or pa pl pt rm ro ru sa_IN sco sk sl sq sr sv ta te th tk tr uk vi zh"
+	or pa pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
 
 for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
+	IUSE="${IUSE} l10n_${X}"
 done
 
 TEXLIVE_CAT="dev-texlive"
@@ -92,78 +92,79 @@ RDEPEND="${DEPEND}
 		app-text/passivetex
 	)
 	jadetex? ( >=app-text/jadetex-3.13-r2 )
-	linguas_af? ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
-				  >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	linguas_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	linguas_hy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
 	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
 		   >=dev-tex/cjk-latex-4.8.3-r1 )
-	linguas_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} >=app-text/vlna-1.3 )
-	linguas_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
-	linguas_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	linguas_en_GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	linguas_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	linguas_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	linguas_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
-	linguas_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
-	linguas_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_sa_IN? ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
-	linguas_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
-	linguas_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
-	linguas_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
-	                 >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
-	linguas_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
-	linguas_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	linguas_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	linguas_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	linguas_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
+	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
+	              >=app-text/vlna-1.3 )
+	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	l10n_en-GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	l10n_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
+	l10n_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
+	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
 	xindy? ( app-text/xindy )
 "
diff --git a/app-text/texlive/texlive-2015.ebuild b/app-text/texlive/texlive-2015.ebuild
index 30099eb..3c98063 100644
--- a/app-text/texlive/texlive-2015.ebuild
+++ b/app-text/texlive/texlive-2015.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,12 +15,12 @@ IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music omega pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
 
-LANGS="af ar as bg bn br ca cs cy da de el en en_GB eo es et eu fa fi fr ga gl
+LANGS="af ar as bg bn br ca cs cy da de el en en-GB eo es et eu fa fi fr ga gl
 	gu he hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no
-	or pa pl pt rm ro ru sa_IN sco sk sl sq sr sv ta te th tk tr uk vi zh"
+	or pa pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
 
 for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
+	IUSE="${IUSE} l10n_${X}"
 done
 
 TEXLIVE_CAT="dev-texlive"
@@ -92,78 +92,79 @@ RDEPEND="${DEPEND}
 		app-text/passivetex
 	)
 	jadetex? ( >=app-text/jadetex-3.13-r2 )
-	linguas_af? ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
-				  >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	linguas_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	linguas_hy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
 	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
 		   >=dev-tex/cjk-latex-4.8.3-r1 )
-	linguas_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} >=app-text/vlna-1.3 )
-	linguas_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
-	linguas_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	linguas_en_GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	linguas_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	linguas_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	linguas_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
-	linguas_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
-	linguas_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_sa_IN? ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	linguas_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
-	linguas_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
-	linguas_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
-	linguas_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
-	                 >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	linguas_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
-	linguas_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
-	linguas_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	linguas_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	linguas_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	linguas_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	linguas_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	linguas_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
+	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
+	              >=app-text/vlna-1.3 )
+	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	l10n_en-GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	l10n_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
+	l10n_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
+	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
 	xindy? ( app-text/xindy )
 "
-- 
2.9.0