gentoo resync : 08.01.2018

2 files changed, 20 insertions, 13 deletions

diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
index cb6c077b7d48..007462d917e2 100644
--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@@ -1,4 +1,4 @@
 AUX tagainijisho-1.0.3-sqlite.patch 425 BLAKE2B 0d14c8619933ca9218ccae185c21d57453b95ec96d7ce7fcd64b0596fd6746df8f9f5d98429c799a9e5a00795875ca7ea0d029b0a888969681f13a2ba0800498 SHA512 aca8593bc860f3bb640134e49898106414ff57b1cd6a39be5371151ed32e8bdb45a0747535f5f0d4710367919cf329fc2c308df38731b3c94be16f4992d7d174
 DIST tagainijisho-1.0.3.tar.gz 24816175 BLAKE2B fbe9e671675b2a938aa13aaae87af7f076f4f20c6024d90fa70f2c86f5e1964998d83047b69473e4f9a43e46eacde6b61bc6620b5cfb13c1b4d12a3b1317a280 SHA512 3afd75cc27e8701d93df54a2244b83090770cc80ac20ab8fb843d2ab925ab575f73d731a2ce736179fb7361af68e94694ec91f813d186c87e730368c41535c53
-EBUILD tagainijisho-1.0.3-r1.ebuild 1624 BLAKE2B b6ff7391a3045bd5b66cf8eaed635c413ecc27204f6bd4574c1bf61f656f22b06ed1aca735207162be42e2aa2850ee43da45c78990eb475189a25678a2a5e942 SHA512 57a5953302286754b34a5a0396ebf96b47604b4277e7b1801810cfd2431e528afd32b401aad8d9fdec402c341ad1f460807d5646c8da3694aec21ca1ef7b8049
+EBUILD tagainijisho-1.0.3-r1.ebuild 1750 BLAKE2B 806074d83e8c60b5e1a2b1651655e34dcbe2e9065a32a7598b7f2fc05524e133adefac68206c80ac4da08cc601b829e38106f5ecf5e52ad9f74e21a7e3b8011f SHA512 3063dbebd0b86d27afe05507270d1d2f681f13a748c46490c49db38f21eae5c9653233678b2c503d3203b07b5d0992162fac738aa77e9116f86745ebdbda4262
 MISC metadata.xml 993 BLAKE2B b628e44a061d94a8f800c97d31a780bb028e04b0e74f3ea1896b0d2eee51d7d6253a1df2c81ac63807ec96256c01d8b8a255f511dd630276198caa5fc8424859 SHA512 04b51cecbf4cd124c47707ade93e4b314e106b4384eff831466030a6b58e081bef6c4f00d66a1658eb4e07828ec8fba2f980869ee7a65982c47f201fe232a412
diff --git a/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild b/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
index d278aa6107ff..6b4b8db7eed2 100644
--- a/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,31 +18,38 @@ DEPEND="dev-qt/qtcore:4
 	>=dev-db/sqlite-3.11:3"
 RDEPEND="${DEPEND}"
 
-pkg_linguas=( ar cs de es fa_IR fi_FI fr hu id it nb nl pl pt ru sv th tr vi )
-IUSE+=" ${pkg_linguas[@]/#/linguas_}"
+pkg_langs=( ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr vi )
+IUSE+=" ${pkg_langs[@]/#/l10n_}"
 
-PATCHES=( "${FILESDIR}"/${P}-*.patch )
+PATCHES=( "${FILESDIR}"/${P}-sqlite.patch )
 
 src_configure() {
 	# GUI linguae
 	# en is not optional, and build fails if none other then en is set, so adding ja as non-optional too
 	# linguae undeclared in IUSE will trigger an error, which is a handy check
-	for lingua in $(ls -1 i18n/*.ts | sed -e 's/.*tagainijisho_\(.*\)\.ts/\1/' | grep -v en | grep -v ja); do
-		if ! use linguas_${lingua}; then
-			rm i18n/tagainijisho_${lingua}.ts || die
+	local lang use_lang
+	for lang in i18n/*.ts; do
+		lang=${lang#i18n/tagainijisho_}
+		lang=${lang%.ts}
+		case ${lang} in
+			fa_IR|fi_FI) use_lang=${lang%%_*} ;; # use generic tags instead
+			*) use_lang=${lang} ;;
+		esac
+		if [[ ${lang} != en && ${lang} != ja ]] && ! use l10n_${use_lang}; then
+			rm i18n/tagainijisho_${lang}.ts || die
 		fi
 	done
 
 	# Dictionary linguae
 	# en is not optional here either, but nothing special needs to be done
 	# here too, linguae undeclared in IUSE will trigger an error
-	local cmake_linguas
-	for lingua in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do
-		if use linguas_${lingua}; then
-			cmake_linguas+=";${lingua}"
+	local cmake_langs
+	for lang in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do
+		if use l10n_${lang}; then
+			cmake_langs+=";${lang}"
 		fi
 	done
-	mycmakeargs=( -DDICT_LANG="${cmake_linguas};" )
+	mycmakeargs=( -DDICT_LANG="${cmake_langs};" )
 
 	cmake-utils_src_configure
 }