gentoo resync : 06.01.2018

3 files changed, 12 insertions, 13 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index b3190ebc4d1f..79fcd15daa3f 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest
index 4544b92b2553..21b211d121e9 100644
--- a/mail-client/mail-notification/Manifest
+++ b/mail-client/mail-notification/Manifest
@@ -2,5 +2,5 @@ AUX mail-notification-5.4-remove-ubuntu-special-case.patch 952 BLAKE2B 0449dea5b
 AUX mail-notification-dont-link-against-bsd-compat.patch 477 BLAKE2B f3a30b2452da1150fa158e441023cd29efd34b08491885df998ea3071b14e45d8a79143b4b6fb9aa2e728ba0df158decf266b0309efd09d10b5e591b675841ad SHA512 cb8ae9570b8dc83d843bafec6abac07cb78bcb1f2dc9ef7e849b939105707e09fc6346d16a87b3cf07f672ba95c99f1092aa0ee6c531d8ce5a2cb27d74ea0b57
 AUX mail-notification-jb-gcc-format.patch 668 BLAKE2B 7abdc34537205a803b3336a75825910a66fb0437103098e896fce574cb2fcc617ea43da29bc1f811e2686d5ade60d74baa39347db5d19c49adc4db8802fa45cf SHA512 40bde5e2dbc5e2416bd36aaac2197d135bc2265dc0f24d7ac96ec34326c1a01caad740d88264a04d201d937f0d7590abf943ab5c4915bb0e81e2f484dfbca283
 DIST mail-notification-9ae8768.tar.gz 573948 BLAKE2B 03ca4d8007aa0ec2d0caa01934c1e127b629c3c41e28e88fb24bc3fae21052a0c315e4784162afd7e0aac524b1f6510f897895bd37d7684ca6f2a81e1247ffeb SHA512 57ddeb63816dd1db1b732dd13fedeb366e1d82f070feb3f9cf854a85a0e66ab2a60a92126fa57cdc338df699e304007dd84593ea1d6185b08c21a018e441629b
-EBUILD mail-notification-5.4-r10.ebuild 3122 BLAKE2B 3d1cdfe9c464f2348aef78385bee514cb1c942d8f2fd787c79fab84257b252e6d369fa130c57502cd6daa2e1aa534ebdce63bc81e86b484dac13b0d46fd068e8 SHA512 584de214ef5600ad6dd8b38a5a3503238c774242e996774fbe9c7a511e69cfcd65020249f2672448d8fa4b91a706ab13dcd72de1c8d08accbe60b8c57d0f86fc
+EBUILD mail-notification-5.4-r10.ebuild 3114 BLAKE2B f3fa3748906453608274bbd7bd84816c9d4cfa07d16dc2b155818a23807579a137be608fd10df8b3bd9fd0946c35e553da45ab2771482f6b27e071762c4d8b6e SHA512 8e0ae64ec2ec9107d2d7ac239015633e1e173aacdaeab826f76ba0915dd7717c21be52d25826ffbfe0213708bf1c152dd9e7f257f93c97bf9ad9931e8f7eccec
 MISC metadata.xml 566 BLAKE2B bd3360ebd91fdc62ec30eeadd48d3ee225957f456b904b729f8276c0695c9fe01cfd9aac00730773b97e9754d6d2fe077630980b6acd4b34f1ff5663e3e898bf SHA512 dcaefe0f36ab078b2c26d0b4caace768d44a61305e5d3f8356f404cddfb99de7605addfd79e92dd7f9c235b27e201ea1869599328d26e1ce896b92a9920e7440
diff --git a/mail-client/mail-notification/mail-notification-5.4-r10.ebuild b/mail-client/mail-notification/mail-notification-5.4-r10.ebuild
index 6a021824142e..4c0b026eefaf 100644
--- a/mail-client/mail-notification/mail-notification-5.4-r10.ebuild
+++ b/mail-client/mail-notification/mail-notification-5.4-r10.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,9 +17,6 @@ LICENSE="GPL-3"
 IUSE="+gnome-keyring libressl sasl ssl sylpheed"
 
 LANGS="bg ca cs de es fr ja nl pl pt pt_BR ru sr sr@Latn sv"
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
 
 # gmime is actually optional, but it's used by so much of the package
 # it's pointless making it optional. gnome-keyring is required for
@@ -100,12 +97,14 @@ src_install() {
 	einstalldocs
 	rm -rf "${ED}/var/lib/scrollkeeper"
 
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${D}"/usr/share/locale/"${lang}" || die
-	done
+	if [[ -n ${LINGUAS+set} ]]; then
+		einfo "Cleaning up locales..."
+		for lang in ${LANGS}; do
+			if has ${lang} ${LINGUAS}; then
+				einfo "- keeping ${lang}"
+			else
+				rm -Rf "${D}"/usr/share/locale/"${lang}" || die
+			fi
+		done
+	fi
 }