2016-06-24 21:42:12 UTC

4 files changed, 11 insertions, 27 deletions

diff --git a/metadata/md5-cache/media-fonts/acroread-asianfonts-9.1 b/metadata/md5-cache/media-fonts/acroread-asianfonts-9.1
index 9d6d7ed50867..2279ec7589c9 100644
--- a/metadata/md5-cache/media-fonts/acroread-asianfonts-9.1
+++ b/metadata/md5-cache/media-fonts/acroread-asianfonts-9.1
@@ -2,14 +2,14 @@ DEFINED_PHASES=install
 DESCRIPTION=Asian and Extended Language Font Packs used by Adobe Reader
 EAPI=4
 HOMEPAGE=http://www.adobe.com/products/acrobat/acrrasianfontpack.html
-IUSE=minimal linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW
+IUSE=minimal l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
 KEYWORDS=amd64 x86
 LICENSE=Adobe
 RDEPEND=!<app-text/acroread-9.4.0
-REQUIRED_USE=|| ( !minimal linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW )
+REQUIRED_USE=|| ( !minimal l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )
 RESTRICT=strip mirror
 SLOT=0
-SRC_URI=!minimal? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/misc/FontPack910_xtd_i486-linux.tar.bz2 ) linguas_ja? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/misc/FontPack910_jpn_i486-linux.tar.bz2 ) linguas_ko? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/misc/FontPack910_kor_i486-linux.tar.bz2 ) linguas_zh_CN? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/misc/FontPack910_chs_i486-linux.tar.bz2 ) linguas_zh_TW? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/misc/FontPack910_cht_i486-linux.tar.bz2 )
+SRC_URI=!minimal? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/misc/FontPack910_xtd_i486-linux.tar.bz2 ) l10n_ja? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/misc/FontPack910_jpn_i486-linux.tar.bz2 ) l10n_ko? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/misc/FontPack910_kor_i486-linux.tar.bz2 ) l10n_zh-CN? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/misc/FontPack910_chs_i486-linux.tar.bz2 ) l10n_zh-TW? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/misc/FontPack910_cht_i486-linux.tar.bz2 )
 _eclass_exported_funcs=src_install:-
 _eclasses_=confutils	18995f74ac4ffafb7ad853dfe133f209	eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=108d359d73efa7f1b6d48184e73f67cb
+_md5_=f4b9fb6f4bca74698b7fb4fbeca1cde2
diff --git a/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1 b/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1
index a0872cfead46..69959b2d5e0b 100644
--- a/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1
+++ b/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1
@@ -2,11 +2,10 @@ DEFINED_PHASES=-
 DESCRIPTION=Meta package for infinality-ultimate with fonts
 EAPI=5
 HOMEPAGE=http://bohoomil.com/
-IUSE=minimal +latin +free ms linguas_as linguas_bn linguas_brx linguas_bo linguas_doi linguas_dz linguas_gu linguas_hi linguas_ja linguas_km linguas_kn_IN linguas_ko linguas_kok linguas_ks linguas_mai linguas_ml linguas_mr linguas_ne linguas_or linguas_pa_IN linguas_sa_IN linguas_sat linguas_sd linguas_si linguas_syc linguas_ta linguas_te linguas_zh
+IUSE=minimal +latin +free ms l10n_as l10n_bn l10n_bo l10n_brx l10n_doi l10n_dz l10n_gu l10n_hi l10n_ja l10n_km l10n_kn l10n_ko l10n_kok l10n_ks l10n_mai l10n_ml l10n_mr l10n_ne l10n_or l10n_pa l10n_sa l10n_sat l10n_sd l10n_si l10n_syc l10n_ta l10n_te l10n_zh
 KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
-RDEPEND=media-libs/fontconfig-ultimate free? ( media-fonts/noto media-fonts/heuristica media-fonts/liberation-fonts media-fonts/wqy-microhei latin? ( media-fonts/courier-prime media-fonts/dejavu media-fonts/signika media-fonts/symbola media-fonts/tex-gyre !minimal? ( media-fonts/cantarell media-fonts/droid media-fonts/font-bh-ttf media-fonts/font-cursor-misc media-fonts/open-sans media-fonts/source-pro media-fonts/ubuntu-font-family media-fonts/urw-fonts ) ) linguas_brx? ( media-fonts/lohit-devanagari ) linguas_doi? ( media-fonts/lohit-devanagari ) linguas_dz? ( media-fonts/dzongkha-fonts ) linguas_hi? ( media-fonts/lohit-devanagari ) linguas_ja? ( media-fonts/ja-ipafonts ) linguas_km? ( media-fonts/khmer ) linguas_ko? ( media-fonts/unfonts ) linguas_kok? ( media-fonts/lohit-devanagari ) linguas_ks? ( media-fonts/lohit-devanagari ) linguas_mai? ( media-fonts/lohit-devanagari ) linguas_mr? ( media-fonts/lohit-devanagari ) linguas_ne? ( media-fonts/lohit-devanagari ) linguas_or? ( media-fonts/lohit-odia ) linguas_sa_IN? ( media-fonts/lohit-devanagari ) linguas_sat? ( media-fonts/lohit-devanagari ) linguas_sd? ( media-fonts/lohit-devanagari ) linguas_si? ( media-fonts/lklug ) linguas_syc? ( media-fonts/font-misc-meltho ) !minimal? ( linguas_as? ( media-fonts/lohit-assamese ) linguas_bn? ( media-fonts/lohit-bengali ) linguas_bo? ( media-fonts/tibetan-machine-font ) linguas_gu? ( media-fonts/lohit-gujarati ) linguas_ja? ( media-fonts/ipaex media-fonts/koruri media-fonts/mplus-fonts media-fonts/vlgothic ) linguas_kn_IN? ( media-fonts/lohit-kannada ) linguas_ko? ( media-fonts/nanum ) linguas_ml? ( media-fonts/lohit-malayalam ) linguas_mr? ( media-fonts/lohit-marathi ) linguas_ne? ( media-fonts/lohit-nepali ) linguas_pa_IN? ( media-fonts/lohit-gurmukhi ) linguas_ta? ( media-fonts/lohit-tamil media-fonts/lohit-tamil-classical ) linguas_te? ( media-fonts/lohit-telugu ) linguas_zh? ( media-fonts/wqy-zenhei ) ) ) ms? ( media-fonts/corefonts !minimal? ( media-fonts/dejavu media-fonts/droid media-fonts/inconsolata media-fonts/open-sans media-fonts/paratype ) )
+RDEPEND=media-libs/fontconfig-ultimate free? ( media-fonts/noto media-fonts/heuristica media-fonts/liberation-fonts media-fonts/wqy-microhei latin? ( media-fonts/courier-prime media-fonts/dejavu media-fonts/signika media-fonts/symbola media-fonts/tex-gyre !minimal? ( media-fonts/cantarell media-fonts/droid media-fonts/font-bh-ttf media-fonts/font-cursor-misc media-fonts/open-sans media-fonts/source-pro media-fonts/ubuntu-font-family media-fonts/urw-fonts ) ) l10n_brx? ( media-fonts/lohit-devanagari ) l10n_doi? ( media-fonts/lohit-devanagari ) l10n_dz? ( media-fonts/dzongkha-fonts ) l10n_hi? ( media-fonts/lohit-devanagari ) l10n_ja? ( media-fonts/ja-ipafonts ) l10n_km? ( media-fonts/khmer ) l10n_ko? ( media-fonts/unfonts ) l10n_kok? ( media-fonts/lohit-devanagari ) l10n_ks? ( media-fonts/lohit-devanagari ) l10n_mai? ( media-fonts/lohit-devanagari ) l10n_mr? ( media-fonts/lohit-devanagari ) l10n_ne? ( media-fonts/lohit-devanagari ) l10n_or? ( media-fonts/lohit-odia ) l10n_sa? ( media-fonts/lohit-devanagari ) l10n_sat? ( media-fonts/lohit-devanagari ) l10n_sd? ( media-fonts/lohit-devanagari ) l10n_si? ( media-fonts/lklug ) l10n_syc? ( media-fonts/font-misc-meltho ) !minimal? ( l10n_as? ( media-fonts/lohit-assamese ) l10n_bn? ( media-fonts/lohit-bengali ) l10n_bo? ( media-fonts/tibetan-machine-font ) l10n_gu? ( media-fonts/lohit-gujarati ) l10n_ja? ( media-fonts/ipaex media-fonts/koruri media-fonts/mplus-fonts media-fonts/vlgothic ) l10n_kn? ( media-fonts/lohit-kannada ) l10n_ko? ( media-fonts/nanum ) l10n_ml? ( media-fonts/lohit-malayalam ) l10n_mr? ( media-fonts/lohit-marathi ) l10n_ne? ( media-fonts/lohit-nepali ) l10n_pa? ( media-fonts/lohit-gurmukhi ) l10n_ta? ( media-fonts/lohit-tamil media-fonts/lohit-tamil-classical ) l10n_te? ( media-fonts/lohit-telugu ) l10n_zh? ( media-fonts/wqy-zenhei ) ) ) ms? ( media-fonts/corefonts !minimal? ( media-fonts/dejavu media-fonts/droid media-fonts/inconsolata media-fonts/open-sans media-fonts/paratype ) )
 SLOT=0
 _eclass_exported_funcs=-
-_eclasses_=l10n	e26ea0642846685782f1813642e7ff0f
-_md5_=c6ef8c42535b3e46938f24599579ba27
+_md5_=9786968a3078d5ab2f4c964dddc705a4
diff --git a/metadata/md5-cache/media-fonts/source-han-sans-1.001 b/metadata/md5-cache/media-fonts/source-han-sans-1.001
index 5474b83c3f40..cd6058f06d75 100644
--- a/metadata/md5-cache/media-fonts/source-han-sans-1.001
+++ b/metadata/md5-cache/media-fonts/source-han-sans-1.001
@@ -3,13 +3,13 @@ DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
 DESCRIPTION=Pan-CJK OpenType/CFF font family
 EAPI=5
 HOMEPAGE=https://github.com/adobe-fonts/source-han-sans/
-IUSE=linguas_ja linguas_ko +linguas_zh_CN linguas_zh_TW X
+IUSE=l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW X
 KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x64-macos
 LICENSE=Apache-2.0
-REQUIRED_USE=|| ( linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW )
+REQUIRED_USE=|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=linguas_ja? ( https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-ja-1.001.tar.xz ) linguas_ko? ( https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-ko-1.001.tar.xz ) linguas_zh_CN? ( https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-zh_CN-1.001.tar.xz ) linguas_zh_TW? ( https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-zh_TW-1.001.tar.xz )
+SRC_URI=l10n_ja? ( https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-ja-1.001.tar.xz ) l10n_ko? ( https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-ko-1.001.tar.xz ) l10n_zh-CN? ( https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-zh_CN-1.001.tar.xz ) l10n_zh-TW? ( https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-zh_TW-1.001.tar.xz )
 _eclass_exported_funcs=pkg_postrm:font pkg_postinst:font pkg_setup:font src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	font	cd7790315ca5b8c505e1e0513df6acce	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=1bd0507349b77507350ac164610eda65
+_md5_=ae53204579dbc43298de9786c248682f
diff --git a/metadata/md5-cache/media-fonts/source-han-sans-1.001-r1 b/metadata/md5-cache/media-fonts/source-han-sans-1.001-r1
deleted file mode 100644
index 66a979c5dcc1..000000000000
--- a/metadata/md5-cache/media-fonts/source-han-sans-1.001-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=Pan-CJK OpenType/CFF font family
-EAPI=5
-HOMEPAGE=https://github.com/adobe-fonts/source-han-sans/
-IUSE=cjk linguas_ja linguas_ko +linguas_zh_CN linguas_zh_TW X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos
-LICENSE=Apache-2.0
-REQUIRED_USE=|| ( cjk linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=cjk? ( https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-ja-1.001.tar.xz https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-ko-1.001.tar.xz https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-zh_CN-1.001.tar.xz https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-zh_TW-1.001.tar.xz ) linguas_ja? ( https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-ja-1.001.tar.xz ) linguas_ko? ( https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-ko-1.001.tar.xz ) linguas_zh_CN? ( https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-zh_CN-1.001.tar.xz ) linguas_zh_TW? ( https://dev.gentoo.org/~yngwin/distfiles/source-han-sans-zh_TW-1.001.tar.xz )
-_eclass_exported_funcs=pkg_postrm:font pkg_postinst:font pkg_setup:font src_install:-
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	font	cd7790315ca5b8c505e1e0513df6acce	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=e9538870539dad1a0d56b6e2e40bef83