gentoo resync : 28.12.2017

3 files changed, 2 insertions, 82 deletions

diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 47267c62c44a..b388fe46412a 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,7 +1,5 @@
-DIST iso-codes-3.74.tar.xz 3455148 BLAKE2B 2bab64ae23c6706df472e7e0150b4f5022781375d7d5932697ec4fe459b52df0628dbbb531e1fb9270533728393221edb64a9c153139a4e2d4aa2bc2c5f0e8be SHA512 b4d583a6aee331c2cdf7cdd68a0ef5e7c3b291c4afa9a9a636e9fe2aef54e784cec070f5b8fafb31e8c84b278e1a9b08d7f925187882f7382378b66778e0d9cb
 DIST iso-codes-3.75.tar.xz 3461424 BLAKE2B 5548307415b45d2a149fa3868521a464522c9a34e19607faea64aec3e2ff68d331872ff7de3c5807f7ae431a489fede42b6b59f068c5f22132aad4a0f1de8f87 SHA512 157899048cec091864ad8a7723314e28a0ccc4a0e1a5c2101bb630baf1a034bf117e38263e3c95e0135ba9d3a4d76635c8201c50a54e25f6af24c87253b8b40e
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
-EBUILD iso-codes-3.74.ebuild 2414 BLAKE2B bb7a2128daf4b2c6c1ce1e93c323df45301604d51d9b135a1f4f932dc9c06eb9f74175c1f765a801ff83cd7450aa8981f8acc9b8c52471488ee6480a66425f6c SHA512 0080d32cb19f1b72d007f1738997c22eac368a8182c2e07f6cffedcc006cdfdd97c8c6ab80ff8a48d5355831ba5e0fefbbaffd328fc660ab583b31ba9dfebfca
-EBUILD iso-codes-3.75.ebuild 2415 BLAKE2B 438eeb0eb56156ebc9de4871eb71cd6eb30351a3e6e5dc524bc93b60f1c6cee008d352ad6f28811f3b98aba32c80da050e0d8eaca9c308dd0bda1fa4a45394d6 SHA512 a1a285a45f7810b5a5a3adeb67b68b3716f00800bcde9ff2296b616c2200f499b1703dad4e68a65b4b92aa57440f74918531afd9e27887e64779fdc99a1db999
+EBUILD iso-codes-3.75.ebuild 2414 BLAKE2B bb7a2128daf4b2c6c1ce1e93c323df45301604d51d9b135a1f4f932dc9c06eb9f74175c1f765a801ff83cd7450aa8981f8acc9b8c52471488ee6480a66425f6c SHA512 0080d32cb19f1b72d007f1738997c22eac368a8182c2e07f6cffedcc006cdfdd97c8c6ab80ff8a48d5355831ba5e0fefbbaffd328fc660ab583b31ba9dfebfca
 EBUILD iso-codes-3.76.ebuild 2423 BLAKE2B 6a115745a5a6a551971fb18a8f03f13dc7d14d3a38ff64ffee1cc8f0342f59644c6fe36e08d2bfb6f49cb33aa6fe2a5f45edbf275988a9024337fe6221b12e71 SHA512 f8dc62420ddbd98b03a8e03fe54dd13c364fefd48084a177e8f5c3982c5a74521da2993792421a94ede39d9a7f2727ed45bfcb54360d54a4c4bfc599e936a700
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.74.ebuild b/app-text/iso-codes/iso-codes-3.74.ebuild
deleted file mode 100644
index 7b19bfc4b0e9..000000000000
--- a/app-text/iso-codes/iso-codes-3.74.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
-
-inherit eutils l10n python-any-r1
-
-DESCRIPTION="ISO language, territory, currency, script codes and their translations"
-HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
-SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${PYTHON_DEPS}
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-
-# This ebuild does not install any binaries.
-RESTRICT="binchecks strip"
-
-# l10n_find_plocales_changes doesn't support multiple directories,
-# so need to do the update scan ourselves.
-check_existing_locales() {
-	local std loc all_locales=()
-
-	ebegin "Looking for new locales"
-	for std in "${all_stds[@]}"; do
-		pushd "${std}" >/dev/null || die
-		for loc in *.po; do
-			all_locales+=( "${loc%.po}" )
-		done
-		popd >/dev/null
-	done
-
-	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
-	if [[ ${PLOCALES} != "${all_locales}" ]]; then
-		eend 1
-		eerror "There are changes in locales! This ebuild should be updated to:"
-		eerror "PLOCALES=\"${all_locales}\""
-		die "Update PLOCALES in the ebuild"
-	else
-		eend 0
-	fi
-}
-
-src_prepare() {
-	default
-
-	local std loc mylinguas
-	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
-
-	check_existing_locales
-
-	# Modify the Makefiles so they only install requested locales.
-	for std in "${all_stds[@]}"; do
-		einfo "Preparing ${std} ..."
-		pushd "${std}" >/dev/null || die
-		mylinguas=()
-		for loc in *.po; do
-			if use "linguas_${loc%.po}"; then
-				mylinguas+=( "${loc}" )
-			fi
-		done
-
-		sed \
-			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
-			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
-			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
-		popd >/dev/null
-	done
-}
diff --git a/app-text/iso-codes/iso-codes-3.75.ebuild b/app-text/iso-codes/iso-codes-3.75.ebuild
index 0455731e45f5..7b19bfc4b0e9 100644
--- a/app-text/iso-codes/iso-codes-3.75.ebuild
+++ b/app-text/iso-codes/iso-codes-3.75.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""