[gentoo-commits] repo/gentoo:master commit in: net-print/adobeps/

[gentoo-commits] repo/gentoo:master commit in: net-print/adobeps/

[Ulrich Müller]

commit:     eb64c319abb89c39337c74b3dfdeb03b7394198d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 20 19:47:46 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 19:47:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb64c319

net-print/adobeps: Fix LINGUAS for Swedish, should be "sv" rather than "se".

Package-Manager: portage-2.3.0_rc1

 net-print/adobeps/adobeps-1.0.6-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/adobeps/adobeps-1.0.6-r1.ebuild b/net-print/adobeps/adobeps-1.0.6-r1.ebuild
index e6b0f8d..9e6dee7 100644
--- a/net-print/adobeps/adobeps-1.0.6-r1.ebuild
+++ b/net-print/adobeps/adobeps-1.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ IUSE="cups"
 DEPEND="app-arch/cabextract"
 RDEPEND="cups? ( >=net-print/cups-1.2 )"
 
-IUSE_LINGUAS=( en da de es fi fr it ja ko nl no pt_BR se zh_CN )
+IUSE_LINGUAS=( en da de es fi fr it ja ko nl no pt_BR sv zh_CN )
 IUSE_FILES=( winsteng winstDan winstger winstspa winstfin winstfre winstita
 	winstjpn winstkor winstdut winstnor winstbrz winstswe Winstchs ) # winstcht
 

[gentoo-commits] repo/gentoo:master commit in: net-print/adobeps/

[Ulrich Müller]

commit:     afec825f3597521a72e43bcc1c312f83ad557886
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 11:52:57 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 11:52:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afec825f

net-print/adobeps: Migrate from LINGUAS to L10N.

Package-Manager: portage-2.3.0

 net-print/adobeps/Manifest                |  1 +
 net-print/adobeps/adobeps-1.0.6-r1.ebuild | 45 ++++++++++++++++---------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/net-print/adobeps/Manifest b/net-print/adobeps/Manifest
index ad500f8..6e5de25 100644
--- a/net-print/adobeps/Manifest
+++ b/net-print/adobeps/Manifest
@@ -1,6 +1,7 @@
 DIST Winstchs.exe 7763014 SHA256 4af84c26ad901cde09571930b7d228dfc88327711b5360f6441147443afcbcad SHA512 cf8041b9212adcabff6c3d5e547b9bb5d9c2d36ecec175cb7fff71185e8805909dc6ec7b42e68f794d66b5a4f3ce6d5b7f602c42926ffea57674f0f4597665e8 WHIRLPOOL 0d2c6613e27682fff5fc1528cc764eed67b165a4ca1cdeee6691b554859b754c858e88d453790c06bb6bbfb74e8af2f6ae6a15c28ff47901feab38d91ac1d911
 DIST winstDan.exe 7815273 SHA256 a95c420208cb90be6d741214c56d130793eaad415a6fcece120516c993f5340f SHA512 7981fe9655c798210de58a797227c7891c3355d29df8bd525bc99f8dacb7d235b1599e6b6a12136d78d63729827481edc2f8bb7eb60b728f0ae05861d925320a WHIRLPOOL 5cbef4a5c8724ea01241b0c4f05e2b0e5ad5e83250605434045ed004222fb49af9f89ba32a3d4258622de6bb7bc04fefd6e89624bd896c24fbae3b946710481f
 DIST winstbrz.exe 7820627 SHA256 4585b2749e1bc227cabcfebdd1729183deb769ba4c18f12df58defc59545559d SHA512 72f24812841945d49d0d1ccb99e2f906062f37ff9c0764b9ac58d999c85ce6e8c0348d09c638c01a82f68dc99dbb17abdbc11f0d1f712d2ee6b181d611d3b413 WHIRLPOOL 997bb2463f039cf58a732331c6c9b585e335d316bf485e21192ccac94fe62ab52ca2566507e93867ab02b4f29d18b8a79fcf879b1f5757a8df28153cd15bb0d2
+DIST winstcht.exe 7780767 SHA256 9142da863b63dda763bc850472133097f7312f2a500cbea2060314b80b30633b SHA512 61d7957560edbe19928be5a55709156e3c55dc671bb0bbe4ddad0b0529a483281a24d6b37d29d2d202d672457a705715c1b52bb6e2187de353666bd4e2649dbc WHIRLPOOL bc4a1c5d69bfc6ab77058a5f23fa8c914209fa7c2e4bb281d9b3e2923366f405914e78657bf34e2189e43059224ed0c8003bc92d22e035bf89a0eb980dab15c2
 DIST winstdut.exe 7835281 SHA256 bd82ad3616c3572262c03590832f19cd872afb07b8eea4e6540d33a6906ac815 SHA512 0a125d98fb12a2ac7eb47d5a2e8649f09c9e4bb50803b68b891b9403d5655debeb22cca35d29b7544494ad71a6b5eb28efa2d9b1a34856584afeac1ed86c600d WHIRLPOOL 29fa339cd635fa6edc3618c6f8346c501ce04ce4b0750ae2bc736b83a080152bdf20252b27c6c70ac42b6b7082aaeab6e9bd77a3449a624c5f9bbe3cdfef8c9f
 DIST winsteng.exe 7740765 SHA256 45a66f17f7c34e268fac4f40e829a3fb676c50d137e38fdee225ee1bcda189d0 SHA512 4da2460a85b9d86acdef20ed564ca1e19213f125487ec197eae9c88caf540fce123d2c2decf32978c2a3e55f52a5441cacd7826a7e916557087678532296f889 WHIRLPOOL 0206472a1ac133ddfa967f6c42e8c6399a428f5b01df65ff71e3b8b5d4cb761c09073ccf0779cf1c3ac1a9b1dbf8929d442e3bca89ba380982efd9b8fb41453d
 DIST winstfin.exe 7821985 SHA256 ecd28749632525287b562817580eea81e3cdef31c585d8a81a25bdca013e79d7 SHA512 6eaf6ae2ff0e476cee3b75d476bf56078dad2c04194eb17e780add94c1a667836e950737054e0efd7a274e46f966852f3b2dcdeb26742a5c8fbdaa404d686224 WHIRLPOOL 054f378f2da3faab47db74f1796c1fb2c24fd21bace350b01ba41225350fa5d9f04d3eaeed0d8b26019a8effbbe4dc3bee945a423d41368ce1f0cfb745a48cfb

diff --git a/net-print/adobeps/adobeps-1.0.6-r1.ebuild b/net-print/adobeps/adobeps-1.0.6-r1.ebuild
index 9e6dee7..fef00ed 100644
--- a/net-print/adobeps/adobeps-1.0.6-r1.ebuild
+++ b/net-print/adobeps/adobeps-1.0.6-r1.ebuild
@@ -20,17 +20,17 @@ IUSE="cups"
 DEPEND="app-arch/cabextract"
 RDEPEND="cups? ( >=net-print/cups-1.2 )"
 
-IUSE_LINGUAS=( en da de es fi fr it ja ko nl no pt_BR sv zh_CN )
+IUSE_L10N=( en da de es fi fr it ja ko nl no pt-BR sv zh-CN zh-TW )
 IUSE_FILES=( winsteng winstDan winstger winstspa winstfin winstfre winstita
-	winstjpn winstkor winstdut winstnor winstbrz winstswe Winstchs ) # winstcht
+	winstjpn winstkor winstdut winstnor winstbrz winstswe Winstchs winstcht )
 
 IUSE_LANGS=""
 IUSE_CLOSE=""
-for ((X=0; X < ${#IUSE_LINGUAS[*]}; X++)); do
-	IUSE="${IUSE} linguas_${IUSE_LINGUAS[X]}"
-	SRC_URI="${SRC_URI} linguas_${IUSE_LINGUAS[X]}? ( ${SRC_URI_BASE}/${IUSE_FILES[X]}.exe )"
-	IUSE_LANGS="${IUSE_LANGS} !linguas_${IUSE_LINGUAS[X]}? ("
-	IUSE_CLOSE="${IUSE_CLOSE} )"
+for (( X=0; X < ${#IUSE_L10N[@]}; X++ )); do
+	IUSE+=" l10n_${IUSE_L10N[X]}"
+	SRC_URI+=" l10n_${IUSE_L10N[X]}? ( ${SRC_URI_BASE}/${IUSE_FILES[X]}.exe )"
+	IUSE_LANGS+=" !l10n_${IUSE_L10N[X]}? ("
+	IUSE_CLOSE+=" )"
 done
 SRC_URI="${SRC_URI} ${IUSE_LANGS} ${SRC_URI_BASE}/${IUSE_FILES[0]}.exe${IUSE_CLOSE}"
 
@@ -39,14 +39,16 @@ S="${WORKDIR}"
 pkg_setup() {
 	local X L=""
 	ADOBEPS_LANG=""
-	for X in ${LINGUAS}; do
-		if [[ " ${IUSE_LINGUAS[*]} " =~ " ${X} " ]]; then
-			[ -z "${ADOBEPS_LANG}" ] && ADOBEPS_LANG="${X}"
-			L="${L} ${X}"
+	for X in "${IUSE_L10N[@]}"; do
+		if use l10n_"${X}"; then
+			L+=" ${X}"
+			[[ -z ${ADOBEPS_LANG} ]] && ADOBEPS_LANG="${X}"
 		fi
 	done
-	if [ -z "${ADOBEPS_LANG}" ]; then
-		L="${IUSE_LINGUAS[0]}"; ADOBEPS_LANG="${L}"
+	# default to English if no L10N flags are set
+	if [[ -z ${ADOBEPS_LANG} ]]; then
+		L="en"
+		ADOBEPS_LANG="en"
 	fi
 	elog "Selected languages:" ${L}
 	use cups && elog "CUPS drivers language: ${ADOBEPS_LANG}"
@@ -54,10 +56,10 @@ pkg_setup() {
 
 src_unpack() {
 	local X L
-	for ((X=0; X < ${#IUSE_LINGUAS[*]}; X++)); do
-		L="${IUSE_LINGUAS[X]}"
-		if use linguas_${L} || [ "${L}" = "${ADOBEPS_LANG}" ]; then
-			cabextract -Lq -d "${S}/${IUSE_LINGUAS[X]}" \
+	for (( X=0; X < ${#IUSE_L10N[@]}; X++ )); do
+		L="${IUSE_L10N[X]}"
+		if use l10n_"${L}" || [[ ${L} = "${ADOBEPS_LANG}" ]]; then
+			cabextract -Lq -d "${S}/${IUSE_L10N[X]}" \
 				"${DISTDIR}/${IUSE_FILES[X]}.exe" || die "unpack failed"
 		fi
 	done
@@ -65,10 +67,10 @@ src_unpack() {
 
 src_install() {
 	local X
-	for X in ${IUSE_LINGUAS[*]}; do
-		if use linguas_${X} || [ "${X}" = "${ADOBEPS_LANG}" ]; then
+	for X in "${IUSE_L10N[@]}"; do
+		if use l10n_"${X}" || [[ ${X} = "${ADOBEPS_LANG}" ]]; then
 			# files and filenames taken from cupsaddsmb man-page
-			insinto "/usr/share/${PN}/${X}"
+			insinto "/usr/share/${PN}/${X/-/_}"
 			# Windows 2000 and higher
 			doins ${X}/winxp/{ps5ui.dll,pscript.hlp,pscript.ntf,pscript5.dll}
 			# Windows 95, 98, and Me
@@ -84,7 +86,8 @@ src_install() {
 		dodir /usr/share/cups/drivers
 		for X in ps5ui.dll pscript.hlp pscript.ntf pscript5.dll \
 			ADFONTS.MFM ADOBEPS4.DRV ADOBEPS4.HLP ICONLIB.DLL PSMON.DLL; do
-			dosym "../../${PN}/${ADOBEPS_LANG}/${X}" "/usr/share/cups/drivers/${X}"
+			dosym "../../${PN}/${ADOBEPS_LANG/-/_}/${X}" \
+				"/usr/share/cups/drivers/${X}"
 		done
 	fi
 }