Add USE=nls to control translations, and clean up $LINGUAS processing.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 30 insertions, 28 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 3a348e076170..53f112e38ba4 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.276 2015/07/30 08:58:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.277 2015/08/06 05:47:07 vapier Exp $
+
+  06 Aug 2015; Mike Frysinger <vapier@gentoo.org>
+  sane-backends-1.0.25_pre20150628.ebuild:
+  Add USE=nls to control translations, and clean up $LINGUAS processing.
 
   30 Jul 2015; Mike Frysinger <vapier@gentoo.org>
   sane-backends-1.0.25_pre20150628.ebuild:
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index f0738d1392bf..cb3195b5d7d9 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -14,23 +14,23 @@ AUX saned.initd 411 SHA256 4dd4e7fa07bf2ab2d4f5753156f5df0ad2277523f6755b0eab3d2
 DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d SHA512 1e9f962bb9d27f17067eb662dabfc0a1aa0d06e16bec4bd28868124b468578d82f14f6d2c1f5de63d2cec57ca4584ec12d3b2c2b1de20f1199aece581453ebc5 WHIRLPOOL 19b939c920a3c157044c85a941debdc664d8781562fa3fc04f061b9d216b089be80edfd43479069382adf13e68160518fdbd5c84a5f4c506a46f8521d4ed2a1c
 DIST sane-backends-git20150628.tar.gz 5765552 SHA256 4cfd1245df8ade75cbfaedec91b1daaea6d30e0736e5d2f9afcd0a56fc357711 SHA512 8e8160b2337502a0b77724ffaa5bd65a6daaa3fa5587f1b72e2714c9253e8130e96170d7f1de38210e17c5524cbe0953ff0464d29db194354d4e9b7249782eaf WHIRLPOOL d9b9a4f44cb3fcda9c8099d5ed3a9764e0a961f80ae1a89dda4e0ec8e6c24c830ad0feebd13c28af848c133a99e50d21c2f01269e434af31b17164a377edbbff
 EBUILD sane-backends-1.0.24-r5.ebuild 7736 SHA256 c5eb8693b77737ce43fb64ff253fc7f56661a6dc166cf8557f4a842b124f8b7f SHA512 f50d72c1c225b4c4e1bfd141793f64f79f10c33cbe52a5356f6944def1a785c8c70184489e035f021a6f37b43fd0fe8dd656cdddd45c8cf322aa5cc84ff58dce WHIRLPOOL 91b061da5de7e0497e53e851d86f06545691f7af68e1449bec42ffd91b943cf8ec69144c25c1bd0d8c3eaa5c31100050a8b49bc420db91317a49179151f915a8
-EBUILD sane-backends-1.0.25_pre20150628.ebuild 7991 SHA256 33a6e96dcd1676a2c90f49f66a3097075111e7ba29503edae46169d04db97da2 SHA512 8f907674a9a8d135993fdce7d5d78d287d4f0aef8bf09719a82db4cd22899db6c2a2aef7a3ce44635eddc47fc4f3dd852a975b7a57208228fc2024a8bd8defc2 WHIRLPOOL 94ef0e718053dbcca4ee51eca303722080552cf50028fdeb90444d2c7f1c4b1e55d1881e33c6c568a63d1d03b88acfa26edd69b374d518e64ef79109841d8cf7
-MISC ChangeLog 47473 SHA256 ca3761fb953b6482a355b97818e29d25fb686e8bfff005ae5f758bcc494466b3 SHA512 ff0466d5bb67a9692e3fa95cedf16cb04bdbdbce362b17ce2e4187b815ba6d3ce32d9c087fec43f6fce60c6f94be2e4e3f6536d06e3434b14c150136a56adf0a WHIRLPOOL 7a48382e45449b12818b695a4d39b6f2d5a074fb70acdd1abbb59484651d7db1a72bef8b08c9a2134f5244fb23a61eee30ebaa8a2aacc24d36afd72e4b92e50e
+EBUILD sane-backends-1.0.25_pre20150628.ebuild 7944 SHA256 c6b4448e6e752441682c897a93a6d2ff39186ee55877c907a3817dc6661232b9 SHA512 7862f2daa77a13c35f0a40bca2d14606e01a9efc7257472c62a4e0c97ae222cecfe588c913d43ef283e4dabd076f05eff76741d6f751f7a199b3422b307df8df WHIRLPOOL 41977d3bf698ae065b9c7583a82433ffc4bbdc7cf11e0611b97bb7896c2eb77afeb1d2f891c7378671876fd76ef5a4680eb16f870663df2bb99895c74f322bcd
+MISC ChangeLog 47640 SHA256 c6257e3d197ffa048e4c1e7f01ba4a2516965237fb15dcee476cc914573d3114 SHA512 fbc5f5ca0c8e3c0ad1f2ec241c13dbd5a17d42bd8fd38541f1fccd2effa6e858a996fb4758dbe9a8afefb7586df42094d78de936f22986d5138fbf20241a9e37 WHIRLPOOL ad673ba6b449c6cf6f93cf536fb8fdc8230a24d61048430f9c65bfb1a0b61ecc09543f846b0a838734034a383fd3f190af580175a507802c3fac067f6c88ec20
 MISC metadata.xml 212 SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757 SHA512 85ac7770baae8cc7c2c52dcd077a448cfb394ec6585e274ffa01c8f92a862d22c6ba0553b71cf2ae6b6f28f6faa5c3d615537f35f9fe0da9f43a2c9043953784 WHIRLPOOL 221b2f4e9b984954eb7268028287339e8678c794c7b4e40ab2baaa037c8e87bac30c8b64473efade9b3ee1ce226aab4ad36760147eee5af7cfd7c081473c839b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVuec0AAoJEPGu1DbS6WIAUwMP/jHi0GU3IMyhiX1h3r1LJ/EO
-U8b3Jk0dbgCys9Utte7qYqN1MnJhb0yzrJPxvC21Jzle//piAwUJub9aRJ/vIcu6
-4iHRtFnVoqkvFYnxya0vo79ghIfqy+eYD/G1mCV7cxWtC4ihiyF55MI7eVjnzf2d
-TfgSeGhigyv7lFTwVOUOrKKKwtq7KBHU3z+fsAh1rXd+HCat+F5bkHQhmefoSWlU
-Dc81TsFoT1xmlGCFk1+GMxMwC9ovHb5VF8WYltiTrWD4uBJBJnpO4ybYP5r+7X1u
-cvIH9rQ9KLpHQy4LPN00EAjo8a0LzZSIT2MLKuggET+kR9H4TTmL6RA7nqvPhTHd
-FN76tOz4DwQWqwbHeoOZmzFAk2ML9saubm9zRXUM7yfIFRpnkrU+IJ3L4nJP6vnB
-tpSHGVviGOgHS7CcZdwOUHFMFZuTZq8GW3zL1o1vwJnK9jeSu/zEjkeJeKIQa3cm
-MAoBSdT23m2fLsfrpBolCl0yTgADcjNptbV+TUfqB3G//V2RnHLFU2D1t8amMdku
-3lF+Asd56GYzJV8g5zdYpdfujQiVxp1KOrOrsktN9Y09SNge/imJxb4u66W/Ntep
-zsPPCRB0SPRMc+JkRaZ3hPMPfELt9ydM46J5pIvGRQamP91fNNo5MqX0ppKL1QfY
-xS5gQOsAZVi40a2dsb6M
-=yUNv
+iQIcBAEBCAAGBQJVwvTnAAoJEPGu1DbS6WIANhQP/1gZi850p4VLQLUSDVWOVy/g
+mQ//J+I66xDVxnR/K3QB3KIFg1dpTdUthm0paMIf9luthoE8siPZXdbkXcJkDK/q
+nqodNkB0enqRANKl7zkQoXs1l+Mm3JEUL3M6jOpo50WZ7XzUFyNxU3z5qlKe8o1i
+axt2THLcoXKBOnBcRb/l3nnQtqVhzjdIi8r0AEYctgOjjf8y1FGaEmkK/u9SQBvb
+92Q/yD2GXOsrwwneyQDhpejREojvSiXOvQOmBUKzGv8s0XgzyDGyj7CjtzKEAwrK
+ag4PRY7LELiwhtAo9YPcTh6mhzcEeECo0+8/P19CcV/d3NX+MT/wr6T1NTruY+md
+O4f7g5Ag3f6Oow/sRBPj9mAH2Xn87i4RF1FUwE7sBQWup1vXUiPkLb8kkSFl1VBG
+dGqSIq/pkZxYL9vtxqWUk5CwWPSxt+GwcDyvbOp+fyGZzuBLgrmEgNUAKu25Dl00
+tK2BEAWuY0/NYFq9RkfWGWJjkzCoAtCuLE/FThqmSVNObgXSNvyLn3a1VwttcHpH
+lMo1HKga805dBXNay4rXicWl/YqQgDe3tdm38bmYzMG9NnbjbOn7TR6dLhnFBTE/
+fo9FtTEKT7kaA+IpcTMRbtxFGw0b13XSn1HpK+4cQ6dTPiQaXDwFYGizNi4gOr9u
+hZ0tqKXD/n9n38ncApCV
+=6kSN
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild
index e099bbc2bb6c..6e7107d25e3e 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild,v 1.3 2015/07/30 08:58:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild,v 1.4 2015/08/06 05:47:07 vapier Exp $
 
 EAPI="5"
 
@@ -94,7 +94,7 @@ IUSE_SANE_BACKENDS="
 	umax_pp
 	xerox_mfp"
 
-IUSE="avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp systemd"
+IUSE="avahi doc gphoto2 ipv6 nls snmp systemd threads usb v4l xinetd"
 
 for backend in ${IUSE_SANE_BACKENDS}; do
 	case ${backend} in
@@ -198,6 +198,13 @@ src_prepare() {
 src_configure() {
 	append-flags -fno-strict-aliasing
 
+	# if LINGUAS is set, just use the listed and supported localizations.
+	if [[ ${LINGUAS+set} == "set" ]]; then
+		mkdir -p po || die
+		strip-linguas -u po
+		printf '%s\n' ${LINGUAS} > po/LINGUAS
+	fi
+
 	multilib-minimal_src_configure
 }
 
@@ -231,16 +238,6 @@ multilib_src_configure() {
 	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then
 		myconf+=( sane_cv_use_libieee1284=no )
 	fi
-	# if LINGUAS is set, just use the listed and supported localizations.
-	if [ "${LINGUAS-NoLocalesSet}" != NoLocalesSet ]; then
-		mkdir -p po || die
-		echo > po/LINGUAS
-		for lang in ${LINGUAS}; do
-			if [ -a "${S}"/po/${lang}.po ]; then
-				echo ${lang} >> po/LINGUAS
-			fi
-		done
-	fi
 
 	# relative path must be used for tests to work properly
 	ECONF_SOURCE=../${MY_P} \
@@ -252,6 +249,7 @@ multilib_src_configure() {
 		$(use_with v4l) \
 		$(use_enable avahi) \
 		$(use_enable ipv6) \
+		$(use_enable nls translations) \
 		$(use_enable threads pthread) \
 		"${myconf[@]}"
 }