Support LINGUAS, bug #332751 by Nikoli <nikoli@lavabit.com>.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 129 insertions, 20 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e7155dcbd2a4..38310044359a 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.372 2011/05/27 10:00:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.373 2011/05/29 15:08:06 phajdan.jr Exp $
+
+  29 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-13.0.772.0-r1.ebuild, chromium-9999-r1.ebuild:
+  Support LINGUAS, bug #332751 by Nikoli <nikoli@lavabit.com>.
 
   27 May 2011; Markos Chandras <hwoarang@gentoo.org>
   chromium-11.0.696.71.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 045c2a7a57a5..47358be45134 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX chromium-cups-r0.patch 1237 RMD160 601fc9a46027580a1817a77abfb47b2b59e212ca SHA1 9826e90746229c7c12d767bb3b6cbdbc5c300041 SHA256 594af80456d977a19949909a7c79cae706964f7ced47634c9c9b19478dc089a2
@@ -23,24 +23,17 @@ EBUILD chromium-11.0.696.71.ebuild 10572 RMD160 648e467be38dbdee3d0cddfdb2ae0db0
 EBUILD chromium-12.0.742.60.ebuild 11561 RMD160 d034650f7a32b433c99d0d066abe55ba0b08c23b SHA1 c1cb4926f37910f6f40c39bee5db4a40642704d3 SHA256 da4fec3b131eacc0b2639a4757085778c0ac797e713f4caf7fc8d1776d8c74fb
 EBUILD chromium-12.0.742.68.ebuild 11565 RMD160 43f245f42d7b78167f306710382471f8875605e4 SHA1 7ab5daca1d056e4a0f1ec04e73b21a98e6d725f4 SHA256 2c3f753707277a8aef524856acc90a9166feec604a8bb01761c91ade8c909933
 EBUILD chromium-13.0.767.1.ebuild 11460 RMD160 c928125a1e5da05e8a054211365d3761aaad3386 SHA1 b84445f269c491ca001c6712edfb481f075e6663 SHA256 6a5bcd2dd51ab600086649e581c0d3098de3aa11cfca6783260dd6a257f462c8
-EBUILD chromium-13.0.772.0-r1.ebuild 11623 RMD160 2625c67757aac9d34315f31f8fd039a7c59729df SHA1 bc58b83d9d500e7378c54490c5fd5b48b6044c08 SHA256 7c1ccdd93404d72bb4804af16a542dbc01ae97e01f777ed9782402a763eb1731
-EBUILD chromium-9999-r1.ebuild 13660 RMD160 48ba5b249c7aa1285884ffcb6c40351daba139bc SHA1 8d3e8f165ada558e7c92afdab40f4370bafd1b1e SHA256 cf4452000abec45eace5c7f9493a7bf7c6f011690e7668ce29f372daf3f16ae5
-MISC ChangeLog 82682 RMD160 c8be125b4e6c3a386d1b4e8232f7393c7bf62f93 SHA1 3bdd0f23f19e8b4b615f2ce2e3b3ca3c28912885 SHA256 8805255cfceec1f514504cdf02a7e67f380a86619cb88a4bed22d9ab2641531c
+EBUILD chromium-13.0.772.0-r1.ebuild 13098 RMD160 a602532a5edb10c8ebf8e9df36943790cd615ac4 SHA1 512a981af9d9ac500e62fe78b58a1ac5a82ca78d SHA256 e65425eed6663524386c6f8ed752da755666736431a4a5bc8d6da71bd99769ad
+EBUILD chromium-9999-r1.ebuild 15135 RMD160 d04d474929142005ab27d3de535a8ab0c69f77bf SHA1 e5260b3d1f96e024eae2a3acf17bcce1e7b3ac1f SHA256 c71b406fbbb9e3eec6e8c65382188169ec426b6600224dfc56faf706170d02bc
+MISC ChangeLog 82861 RMD160 24d7c7db4ddbb8f2d50396db69bb200237c76c59 SHA1 f081634a61609bf60e49e58a415fa88488c1ee68 SHA256 a63e656e2ec18a6c7221f8967649327d999b350fe6e62ed53d2e5fec97b43112
+MISC chromium-13.0.772.0-r1.ebuild.rej 2619 RMD160 8250a34cfa742fe12fe1ef52caa107dee6d738d4 SHA1 7545bf7a442070b037eaf80c896f8bfa181dcb0b SHA256 8f27b5c8c10e38d44b92662c69ed6a4861ba30c5476d8fa4c166f231f99eac55
+MISC chromium-9999-r1.ebuild.orig 13660 RMD160 48ba5b249c7aa1285884ffcb6c40351daba139bc SHA1 8d3e8f165ada558e7c92afdab40f4370bafd1b1e SHA256 cf4452000abec45eace5c7f9493a7bf7c6f011690e7668ce29f372daf3f16ae5
+MISC chromium-9999-r1.ebuild.rej 5063 RMD160 69eb4a816fc095d260870a2e839492641dcd2c41 SHA1 94a4f5f1cc8febc044ab2a6618bbae2092814919 SHA256 82a7d23d68685d7f703834edd7c75a641e7b3417e36863ba299431dbc8fc7aec
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN33ZGAAoJEPqDWhW0r/LCMQEP/1ER3tIgdv7DOM7BF2BfrRDL
-LZbQo8b9gDE/TI/0Bh9Q+o6B2EFg14Ew0JWVcquTfU4Tm9tSGWgiFcZ03etiGJc8
-jyeQY1b9TqHxU6OapnjztLNrJr3p/pQ1z5cR5DVe1AN9s1crgJsMgnv8g9vzFT2F
-I5FPzZtV3MJfe0N4eFmXb9vxD7E/R4ngEkF7na9YVV3JWIBaNE5CitAXNYN5lLA1
-BXdepxQMeUTpG1xZyrs+WS+P6ya9uTsYpP/YHbRWYxGNCfrgRG/LdQHMPJz3Hube
-BYCn11PmGJcs0gUt+DC5VFVTq7gsKZ6jD7LXBMJpyvSffQ48pBVLKHnEWl6MB+A9
-ke2/pP33xJdR7ZBzrIYDw/VHPa5aMQe+CHD7//qeBhb+Ml4iFEq28It7pFuTyZjE
-stK4k83rOuON4aqq7xvIU9eFV83WfVd7X+KKUazuZORCXI/4fzmXrxoQDee/OHHg
-4nnvs4RrQv/UlvAodVmisAvLkseCbBWPrN7qYOJnZkyKBt9UijTcRNMuHN+XCmWY
-fcufWH+m6yPhafgS+Md3xr473E5XkW39Owo4Hfj54ngvG/i3mq8GK7L6GkYh/2S6
-YzAlVWRhXx+dcZ/veGMHJ3tCpHMbXmsTFY9zqs7hAT6ls/RoGT/qe3Fn1gvlCV6+
-p22yUUT7munEFkPwq6fw
-=TsMd
+iEYEARECAAYFAk3iYWIACgkQuUQtlDBCeQInvgCeK9ja8dKE9NbNF2Pe32X8EE8l
+B/cAnj5URBRDCSwDjEuSzeRoQCW/C4S1
+=eGJY
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-13.0.772.0-r1.ebuild b/www-client/chromium/chromium-13.0.772.0-r1.ebuild
index f6bd61ee6402..f8d987229190 100644
--- a/www-client/chromium/chromium-13.0.772.0-r1.ebuild
+++ b/www-client/chromium/chromium-13.0.772.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.772.0-r1.ebuild,v 1.1 2011/05/26 11:09:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.772.0-r1.ebuild,v 1.2 2011/05/29 15:08:06 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -17,6 +17,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="cups gnome gnome-keyring kerberos xinerama"
 
+# en_US is ommitted on purpose from the list below. It must always be available.
+LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
+hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th
+tr uk vi zh_CN zh_TW"
+for lang in ${LANGS}; do
+	IUSE+=" linguas_${lang}"
+done
+
 RDEPEND="app-arch/bzip2
 	dev-libs/dbus-glib
 	>=dev-libs/icu-4.4.1
@@ -71,6 +79,16 @@ egyp() {
 	"${@}"
 }
 
+# Chromium uses different names for some langs,
+# return Chromium name corresponding to a Gentoo lang.
+chromium_lang() {
+	if [[ "$1" == "es_LA" ]]; then
+		echo "es_419"
+	else
+		echo "$1"
+	fi
+}
+
 pkg_setup() {
 	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
 
@@ -294,6 +312,44 @@ src_install() {
 	insinto /etc/chromium
 	newins "${FILESDIR}/chromium.default" "default" || die
 
+	# Support LINGUAS, bug #332751.
+	local pak
+	for pak in out/Release/locales/*.pak; do
+		local pakbasename="$(basename ${pak})"
+		local pakname="${pakbasename%.pak}"
+		local langname="${pakname//-/_}"
+
+		# Do not issue warning for en_US locale. This is the fallback
+		# locale so it should always be installed.
+		if [[ "${langname}" == "en_US" ]]; then
+			continue
+		fi
+
+		local found=false
+		local lang
+		for lang in ${LANGS}; do
+			local crlang="$(chromium_lang ${lang})"
+			if [[ "${langname}" == "${crlang}" ]]; then
+				found=true
+				break
+			fi
+		done
+		if ! $found; then
+			ewarn "LINGUAS warning: no ${langname} in LANGS"
+		fi
+	done
+	local lang
+	for lang in ${LANGS}; do
+		local crlang="$(chromium_lang ${lang})"
+		local pakfile="out/Release/locales/${crlang//_/-}.pak"
+		if [ ! -f "${pakfile}" ]; then
+			ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)"
+		fi
+		if ! use linguas_${lang}; then
+			rm "${pakfile}" || die
+		fi
+	done
+
 	insinto "${CHROMIUM_HOME}"
 	doins out/Release/chrome.pak || die
 	doins out/Release/resources.pak || die
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 81aefc6afbb8..abcaf2d894b5 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.28 2011/05/26 11:09:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.29 2011/05/29 15:08:06 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -18,6 +18,14 @@ SLOT="live"
 KEYWORDS=""
 IUSE="cups gnome gnome-keyring kerberos xinerama"
 
+# en_US is ommitted on purpose from the list below. It must always be available.
+LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
+hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th
+tr uk vi zh_CN zh_TW"
+for lang in ${LANGS}; do
+	IUSE+=" linguas_${lang}"
+done
+
 RDEPEND="app-arch/bzip2
 	dev-libs/dbus-glib
 	>=dev-libs/icu-4.4.1
@@ -99,6 +107,16 @@ egyp() {
 	"${@}"
 }
 
+# Chromium uses different names for some langs,
+# return Chromium name corresponding to a Gentoo lang.
+chromium_lang() {
+	if [[ "$1" == "es_LA" ]]; then
+		echo "es_419"
+	else
+		echo "$1"
+	fi
+}
+
 pkg_setup() {
 	SUFFIX="-${SLOT}"
 	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${SUFFIX}"
@@ -326,6 +344,44 @@ src_install() {
 	insinto /etc/chromium
 	newins "${FILESDIR}/chromium.default" "default" || die
 
+	# Support LINGUAS, bug #332751.
+	local pak
+	for pak in out/Release/locales/*.pak; do
+		local pakbasename="$(basename ${pak})"
+		local pakname="${pakbasename%.pak}"
+		local langname="${pakname//-/_}"
+
+		# Do not issue warning for en_US locale. This is the fallback
+		# locale so it should always be installed.
+		if [[ "${langname}" == "en_US" ]]; then
+			continue
+		fi
+
+		local found=false
+		local lang
+		for lang in ${LANGS}; do
+			local crlang="$(chromium_lang ${lang})"
+			if [[ "${langname}" == "${crlang}" ]]; then
+				found=true
+				break
+			fi
+		done
+		if ! $found; then
+			ewarn "LINGUAS warning: no ${langname} in LANGS"
+		fi
+	done
+	local lang
+	for lang in ${LANGS}; do
+		local crlang="$(chromium_lang ${lang})"
+		local pakfile="out/Release/locales/${crlang//_/-}.pak"
+		if [ ! -f "${pakfile}" ]; then
+			ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)"
+		fi
+		if ! use linguas_${lang}; then
+			rm "${pakfile}" || die
+		fi
+	done
+
 	insinto "${CHROMIUM_HOME}"
 	doins out/Release/chrome.pak || die
 	doins out/Release/resources.pak || die