gentoo resync : 07.01.2018

3 files changed, 10 insertions, 32 deletions

diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 650c75d4953c..f2d1492572c2 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -6,8 +6,8 @@ DIST gammu-1.33.0.tar.bz2 6535262 BLAKE2B 4a5c22dccfec22f1c4158ac3a98376c7c98776
 DIST gammu-1.36.8.tar.bz2 2095289 BLAKE2B 1c04bc1add840c337499d15c2086155bfb122018cf5b1c6b4c9537a9491f59f57c67b0816c5d3d142fa1d68d6801d3d03468cbde0c228ebd6ebe6830e1f9099f SHA512 4ac86b783570db0105e18ef05fc9408e85d1234ab7de720a232a416ad867d3afbe89db7ed408c06d57f8bb38a2e272f86386f11a89e56f1d750da9e9b579ba09
 DIST gammu-1.38.4.tar.bz2 2132767 BLAKE2B 0780ff2694f7afbe63c5b4c9102005e5f0494932929b635c0252aed52c12e3a3158674b6c49db45459606e77abbe75d8ffb24d52d91ca215b8fae8ba927b7ea6 SHA512 1d4a8e34d3bbc7e4d9797db1acd9be2e92eaec57a87e856ebd168444228a1e89942e69baf1569a0e5645dadea6947338d9e55ae96f632885e95ec1ce74d121ff
 DIST gammu-1.38.5.tar.bz2 2138742 BLAKE2B 7a72a7b67475f73dc3580d618dee379893dc82d7950599b41ed1f7efb5fecd80af3a42a0cc0742cb73d055a4a778eaa4d42037c5be74d9b61a4b53cfe827bd00 SHA512 89a6b3872dfd9b4ebaf8b0f51265fec7e7ef72a42178f85846c7f52d926e96b3087bbe6650c4246e66c2624822021c5803b1bb6ca8ac90f3e5c109a644c0ee80
-EBUILD gammu-1.33.0-r1.ebuild 2625 BLAKE2B 63b27508dca02f32c7535de0c1a9d8f1d62a86d8dc8202ae60f0d1b397c4e1df798803d8412e11dfb8e1ebdc9a7f96d3be40397e23e4ecc47e82d5f31864fb65 SHA512 2402b3fd0578f2ba3be10658d8875e3f7c66cc1320a3744e69977af5708ffb1531f665a35b1f1d9752596e686af9f0bb3b0d44dbdeee5a980bb37b32fa42ff19
-EBUILD gammu-1.36.8.ebuild 2267 BLAKE2B e3e900b1c7abe0dcf30db45116154b79bcc19ac842018bd4fcb4c0cdd19993dbc4e2322c22681bc3c194f021cfbd080b4e6dd5bbc411f001e5f7ba85cf566de0 SHA512 edd340232d300d24382cac2eb4200309d5b654c131e37fea1636796d6057a3ef95aa9db2ee6842b36976a9402cbaeb58b0263fb343d1f242152367a608f264ae
+EBUILD gammu-1.33.0-r1.ebuild 2270 BLAKE2B 6eef098acf0508c5b9b18ed0f309f035de0b10108899762a377fd385871eafaa248bac6f0213c5d90655ff5414a95bbd48055680be89e8014945af4c8ce80fcd SHA512 1c95ed281b6fdfee455398bbf9a4032a10d742362d3063fb6532a2863995dac5ca7016d49b2c0003c1b3a9e00f5820d562b38199c9b34b133f05e2da89e0aa6f
+EBUILD gammu-1.36.8.ebuild 1912 BLAKE2B 83e6abe718efd33889357315945fe3883b7bea5c5b90df3c3a9c2d0c28918a7d8eb49cd4f4d5023b232a960f175cf6b65f711cb8255b6aefef18b030f513b07a SHA512 10b381df708e852bd14f34caf6a6af9090387602f8173e299d5ca1c7b37bd751a9343fa761c1005ff33b7fe9ae63ba10249b3e2af93ecbddcf4355ab42c5461c
 EBUILD gammu-1.38.4.ebuild 1423 BLAKE2B 981a3c92cc9e1a98037cd97302d104ae239e66e3fd54f1050099619b199e46eb6d460d9aa713edbfe1a4677fab13c9f2a31ab28123f6696fa1e0a0b872fc3821 SHA512 9c3934d7c2ebd9132da1f5c5719206f24f4a07bdda3b61600b03c1ed6e9bf9013486800d04c92fd56cef5fd94510efa2d07b1a7b537ae9eb6b693077f3df70b5
 EBUILD gammu-1.38.5.ebuild 1372 BLAKE2B ba3de529a6a705efcc6402ade24eadaee9efcad06257f395ef31ec04a15c43a62c645ad6b5c02b2a51d2e428d29c29ac546e2ab5a20429b6e215b8c3390102a2 SHA512 5d9f020a52ff488f42e50880e7b1ee00c436a7ebbb3d3708219781e4ad377868d49e222237b0ad55942ba038b83565900eb14ad0440cdbe2d109d1716c2c7064
 MISC metadata.xml 981 BLAKE2B 6918eb352c71db64a9ca356408687888123437160f3cf190e0fca10aa31e614b67aad461884fe7f562a036e8ffe500c49e78afa2ab9070e2a32141adf9a55d21 SHA512 9e50aa06f539259b2f8e5eb8c2b8114435e37a4d84965b86c0629d4933d4dd6a3c1e4e62b7dc5c0e653e3194d5ac0fe50bc7b95b26d0ccea5c02e79d19163595
diff --git a/app-mobilephone/gammu/gammu-1.33.0-r1.ebuild b/app-mobilephone/gammu/gammu-1.33.0-r1.ebuild
index f447b749a0bf..f625885a66b4 100644
--- a/app-mobilephone/gammu/gammu-1.33.0-r1.ebuild
+++ b/app-mobilephone/gammu/gammu-1.33.0-r1.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=5
@@ -34,9 +34,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # sys-devel/gettext is needed for creating .mo files
 # Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
 MY_AVAILABLE_LINGUAS=" af ar bg ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ru sk sv sw tr zh_CN zh_TW"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-skip-locktest.patch"
@@ -50,21 +48,12 @@ pkg_setup() {
 src_prepare() {
 	cmake-utils_src_prepare
 
-	local lang support_linguas=no
+	local lang
 	for lang in ${MY_AVAILABLE_LINGUAS} ; do
-		if use linguas_${lang} ; then
-			support_linguas=yes
-			break
+		if ! has ${lang} ${LINGUAS-${lang}} ; then
+			rm -rf locale/${lang} || die
 		fi
 	done
-	# install all languages when all selected LINGUAS aren't supported
-	if [ "${support_linguas}" = "yes" ]; then
-		for lang in ${MY_AVAILABLE_LINGUAS} ; do
-			if ! use linguas_${lang} ; then
-				rm -rf locale/${lang} || die
-			fi
-		done
-	fi
 }
 
 src_configure() {
diff --git a/app-mobilephone/gammu/gammu-1.36.8.ebuild b/app-mobilephone/gammu/gammu-1.36.8.ebuild
index 0f6cb475dc5d..c9f4dafca20e 100644
--- a/app-mobilephone/gammu/gammu-1.36.8.ebuild
+++ b/app-mobilephone/gammu/gammu-1.36.8.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=5
@@ -36,9 +36,7 @@ RDEPEND="
 
 # sys-devel/gettext is needed for creating .mo files
 # Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
 MY_AVAILABLE_LINGUAS=" af ar bg bn ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ro ru sk sv sw tr zh_CN zh_TW"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-skip-locktest.patch"
@@ -48,21 +46,12 @@ PATCHES=(
 src_prepare() {
 	cmake-utils_src_prepare
 
-	local lang support_linguas=no
+	local lang
 	for lang in ${MY_AVAILABLE_LINGUAS} ; do
-		if use linguas_${lang} ; then
-			support_linguas=yes
-			break
+		if ! has ${lang} ${LINGUAS-${lang}} ; then
+			rm -rf locale/${lang} || die
 		fi
 	done
-	# install all languages when all selected LINGUAS aren't supported
-	if [ "${support_linguas}" = "yes" ]; then
-		for lang in ${MY_AVAILABLE_LINGUAS} ; do
-			if ! use linguas_${lang} ; then
-				rm -rf locale/${lang} || die
-			fi
-		done
-	fi
 }
 
 src_configure() {