Version bump, adds ISO 639-5 codes. Use l10n eclass (since we are explicitly managing the list of translations in the ebuild, that list should be in IUSE) and update license.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 92 insertions, 9 deletions

diff --git a/app-text/iso-codes/ChangeLog b/app-text/iso-codes/ChangeLog
index f6b54855baae..45e2a3d0d262 100644
--- a/app-text/iso-codes/ChangeLog
+++ b/app-text/iso-codes/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/iso-codes
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/ChangeLog,v 1.162 2014/04/23 20:56:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/ChangeLog,v 1.163 2014/06/14 19:32:06 tetromino Exp $
+
+*iso-codes-3.54 (14 Jun 2014)
+
+  14 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  iso-codes-3.51.ebuild, +iso-codes-3.54.ebuild:
+  Version bump, adds ISO 639-5 codes. Use l10n eclass (since we are explicitly
+  managing the list of translations in the ebuild, that list should be in IUSE)
+  and update license.
 
   23 Apr 2014; Pacho Ramos <pacho@gentoo.org> -iso-codes-3.40.ebuild,
   -iso-codes-3.45.ebuild:
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 94de2617e3a8..a3f895d729a4 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -2,13 +2,19 @@
 Hash: SHA256
 
 DIST iso-codes-3.51.tar.xz 3626932 SHA256 5222f79d92ac021a56c7080616c13655c50f7b1ff1a31ec0308da14a684ad77f SHA512 03029f32a69f701875a3bacdc9c73a3b87f0ead62430ab4f913b3c69701f8fe7dc36e8d84e0ec32a66d3638835938ecbca024bbca1b56371ff26212afc9ea100 WHIRLPOOL 91a1e951bc8b279f434d8bc22618a9832764dfac5abcd4ae5fef7244294598257eb1ac0072b8594e60e17bb55914fd594318735139e2c3088326ef0f7810ae5d
-EBUILD iso-codes-3.51.ebuild 1393 SHA256 b68ba8187cfc00225b047f63096044582bddeb20617c1b84f0c3d6077eab7d8d SHA512 721b34798aad17696803053b9ba718709986e009f85b7031bac09099f63a17d39427df4b109b3713fef944c0ae1f5b272e6438bd78677c6e7359811c47c59d90 WHIRLPOOL 8668c21dee0feeea3777cff824568128ef376e75cabe87f944250ab9e05ceb95eea0d89cf97952ca4cc1553209761606f9bf43f69bcc97a7e0d9e62a8331559b
-MISC ChangeLog 19937 SHA256 a5001222bc0491aa2df306a75efa00deec59c1f976f52764df1f2bf28c0f716f SHA512 6db30d601a8d7b97650c7c69a46f54feb5ff019fee0216187e33098bb5aebb0165b37bf65435e0af4d3b0f3fe5a71b47ffa5ee4abcdee5a8ba4e5dfa97095ae9 WHIRLPOOL fe4699940358459729ff848d1b4c5955404c8ae2b638397d12653562eca7ec082ee10893719b1146c917191e91b1696cc7765bdfcbc1cf01ee14763f2839bf1b
+DIST iso-codes-3.54.tar.xz 3766812 SHA256 1fe06e68dff821a4fcc3c9da9dd6674ffd9e847ad4048bc1b3fde85b58f118b6 SHA512 bcab34a8c6f9b9ea92917c5dbc8b63d250e6e18edb763433a3b361b4f425e8cb847ed50080abdbe82150fb7c730a883a60c93c547cf9651d4803df10140d2324 WHIRLPOOL c837bbb8be40941b7bd40b4446f3f72b042d35c8496b9d39865c7cb0f7d1a0a265321561a546fd4c1ff16fdc77d512da23dc5a0e2acfcd339b6330d2c487ebb2
+EBUILD iso-codes-3.51.ebuild 1400 SHA256 b0156331873ca82b4c3d6dbb50635142a9e976613796dfa6826aad16dab6e882 SHA512 5f85f45c43a89296dfe85840188be3b71212b2d7349407d54fd74afaa74c54964762a41af301e67febc40ffce461d7948a74fd75828220a9cee122828aa2ff50 WHIRLPOOL 559fe813e0597fde5c2fc77ab7093301807e6354e30c1a9ca9347734320493528cee79639cb2fbadd72e4f7ced14efe80140d429382693a17637854e89aec789
+EBUILD iso-codes-3.54.ebuild 2401 SHA256 1107109a0a2002e2bf30e3652e8446804eeddafe5218e927d18a6fe04427cdbe SHA512 62da362da1d1df6a0d6502627e3a1be43fb193e8daab1910209c559f83aa98ae1db458780b949077efb8416bdfe7952dc03513244f2f9fe8242bce629f38803a WHIRLPOOL 388bf2dea37a6a96889ac3aedd704cf67067dac2b6d1b9c8b994e9ccb9d1e1067b60304d6ece884397d9e90115e1c72dcf21609ff4e77939570dbdf94f30ceaf
+MISC ChangeLog 20262 SHA256 ea0b5492435654b4f4cdef632acff0394d6bab4c2841d911703b4d18e7ee3ba5 SHA512 8609f4f0f1026342a42fe62ff305d931c732267f0e7975835808a8ed083396302c39587e8102baa4a98082ea311a9200c76a0c7648408465b6172556ea1c839e WHIRLPOOL befc698fb2f3ceca72dd91eacdd1cc75bd3d5fd187449df50852b3a54939857539e7424c5ac4b290745d66a41cc4cb4f5139d5f5c0343e8654f6a539349d5946
 MISC metadata.xml 387 SHA256 d5252ca9dce95b72fa3153d212126bfa4594a1cf6868bff0dc205e46891a05e8 SHA512 fe1255bac7852aa3a93b5e0da7025f32d4b633f9d29c441501e5f7c30dafdd963ef00d62e68567f6a6b6fc15eb370ab4326bb6a7cc66681cca79e1767c791a94 WHIRLPOOL c4d465b7b0d6a7f0582ca0cb74c44a57d369c18a45bb81854c879398d0b5c0745ec300f2770e79e279833c8622920036a3b6bd8ae07d92ef3d8c8b02d3f1e3c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNYKP0ACgkQCaWpQKGI+9RSdgCfTqUo6N32h59g5rzTROEuvDvf
-LOAAnRr0wZWA3pfho6VIQ7hSbmxTDvTf
-=AMWU
+iQEcBAEBCAAGBQJTnKL2AAoJEJ0WA1zPCt1hgP4H/2sLT052bpjx6PzmjOYyk7cS
+uYNYazkFcPmhp1mFRfplZ5d+w85R6e+57kcSO5waNogOSnlW67fNy3imjyZNmkFo
+5vih6MrbGFgD7asPP2BtuEzZkO4aDujfFYlmHKa6pYlXOBz/1XV+7llBMgzbZDdF
+iYvePUJIqQfpYA/YGc8CAL8ktX9bfkaSl7BpPy4/Y2eqd30taAS6P4EdpClZ6/Gt
+1qhImA5jHFxbZ/+2EFd26wUYbF2043PaQrg7pl9qgOnhA13dz1/DM8LI8LSdSntc
+bUWiOKEJUGR6cWjgYOr+4CfNFH62p5LgWWBT3Zs0tu9d6z6+s+vAP0iSgfjAQnk=
+=/Qau
 -----END PGP SIGNATURE-----
diff --git a/app-text/iso-codes/iso-codes-3.51.ebuild b/app-text/iso-codes/iso-codes-3.51.ebuild
index 26d5ac101b23..856776baa055 100644
--- a/app-text/iso-codes/iso-codes-3.51.ebuild
+++ b/app-text/iso-codes/iso-codes-3.51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-3.51.ebuild,v 1.12 2014/04/21 10:28:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-3.51.ebuild,v 1.13 2014/06/14 19:32:06 tetromino Exp $
 
 EAPI="5"
 inherit eutils
@@ -9,7 +9,7 @@ DESCRIPTION="ISO language, territory, currency, script codes and their translati
 HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
 SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
diff --git a/app-text/iso-codes/iso-codes-3.54.ebuild b/app-text/iso-codes/iso-codes-3.54.ebuild
new file mode 100644
index 000000000000..425211947af0
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.54.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-3.54.ebuild,v 1.1 2014/06/14 19:32:06 tetromino Exp $
+
+EAPI="5"
+
+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
+
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	local norm loc all_locales mylinguas
+	local all_norms="iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3 iso_639_5"
+
+	# l10n_find_plocales_changes doesn't support multiple directories
+	einfo "Looking for new locales ..."
+	for norm in ${all_norms}; do
+		pushd "${norm}" > /dev/null || die
+		for loc in *.po; do
+			all_locales+="${loc%.po} "
+		done
+		popd > /dev/null
+	done
+
+	all_locales=$(echo "${all_locales}" | sed 's/ /\n/g' | sort | uniq)
+	all_locales=${all_locales//[[:space:]]/ }
+	all_locales=${all_locales#[[:space:]]}
+	all_locales=${all_locales%[[:space:]]}
+	if [[ ${PLOCALES} != ${all_locales} ]]; then
+		einfo "There are changes in locales! This ebuild should be updated to:"
+		einfo "PLOCALES=\"${all_locales}\""
+	else
+		einfo "Done"
+	fi
+
+	for norm in ${all_norms}; do
+		einfo "Preparing ${norm} ..."
+		pushd "${norm}" > /dev/null || die
+		mylinguas=
+		for loc in *.po; do
+			if use "linguas_"${loc%.po}; then
+				mylinguas+="${loc} "
+			fi
+		done
+
+		sed -e "s:pofiles =.*:pofiles = ${mylinguas} ${NULL}:" \
+			-e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo} ${NULL}:" \
+			-i Makefile.am Makefile.in || die "sed in ${norm} folder failed"
+		popd > /dev/null
+	done
+}