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

From:	"Ulrich Müller" <ulm@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-print/adobeps/
Date:	Sat, 25 Jun 2016 11:53:28
Message-Id:	`1466855577.afec825f3597521a72e43bcc1c312f83ad557886.ulm@gentoo`

1

commit:     afec825f3597521a72e43bcc1c312f83ad557886

2

Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>

3

AuthorDate: Sat Jun 25 11:52:57 2016 +0000

4

Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>

5

CommitDate: Sat Jun 25 11:52:57 2016 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afec825f

7

8

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

9

10

Package-Manager: portage-2.3.0

11

12

 net-print/adobeps/Manifest                |  1 +

13

 net-print/adobeps/adobeps-1.0.6-r1.ebuild | 45 ++++++++++++++++---------------

14

 2 files changed, 25 insertions(+), 21 deletions(-)

15

16

diff --git a/net-print/adobeps/Manifest b/net-print/adobeps/Manifest

17

index ad500f8..6e5de25 100644

18

--- a/net-print/adobeps/Manifest

19

+++ b/net-print/adobeps/Manifest

20

@@ -1,6 +1,7 @@

21

 DIST Winstchs.exe 7763014 SHA256 4af84c26ad901cde09571930b7d228dfc88327711b5360f6441147443afcbcad SHA512 cf8041b9212adcabff6c3d5e547b9bb5d9c2d36ecec175cb7fff71185e8805909dc6ec7b42e68f794d66b5a4f3ce6d5b7f602c42926ffea57674f0f4597665e8 WHIRLPOOL 0d2c6613e27682fff5fc1528cc764eed67b165a4ca1cdeee6691b554859b754c858e88d453790c06bb6bbfb74e8af2f6ae6a15c28ff47901feab38d91ac1d911

22

 DIST winstDan.exe 7815273 SHA256 a95c420208cb90be6d741214c56d130793eaad415a6fcece120516c993f5340f SHA512 7981fe9655c798210de58a797227c7891c3355d29df8bd525bc99f8dacb7d235b1599e6b6a12136d78d63729827481edc2f8bb7eb60b728f0ae05861d925320a WHIRLPOOL 5cbef4a5c8724ea01241b0c4f05e2b0e5ad5e83250605434045ed004222fb49af9f89ba32a3d4258622de6bb7bc04fefd6e89624bd896c24fbae3b946710481f

23

 DIST winstbrz.exe 7820627 SHA256 4585b2749e1bc227cabcfebdd1729183deb769ba4c18f12df58defc59545559d SHA512 72f24812841945d49d0d1ccb99e2f906062f37ff9c0764b9ac58d999c85ce6e8c0348d09c638c01a82f68dc99dbb17abdbc11f0d1f712d2ee6b181d611d3b413 WHIRLPOOL 997bb2463f039cf58a732331c6c9b585e335d316bf485e21192ccac94fe62ab52ca2566507e93867ab02b4f29d18b8a79fcf879b1f5757a8df28153cd15bb0d2

24

+DIST winstcht.exe 7780767 SHA256 9142da863b63dda763bc850472133097f7312f2a500cbea2060314b80b30633b SHA512 61d7957560edbe19928be5a55709156e3c55dc671bb0bbe4ddad0b0529a483281a24d6b37d29d2d202d672457a705715c1b52bb6e2187de353666bd4e2649dbc WHIRLPOOL bc4a1c5d69bfc6ab77058a5f23fa8c914209fa7c2e4bb281d9b3e2923366f405914e78657bf34e2189e43059224ed0c8003bc92d22e035bf89a0eb980dab15c2

25

 DIST winstdut.exe 7835281 SHA256 bd82ad3616c3572262c03590832f19cd872afb07b8eea4e6540d33a6906ac815 SHA512 0a125d98fb12a2ac7eb47d5a2e8649f09c9e4bb50803b68b891b9403d5655debeb22cca35d29b7544494ad71a6b5eb28efa2d9b1a34856584afeac1ed86c600d WHIRLPOOL 29fa339cd635fa6edc3618c6f8346c501ce04ce4b0750ae2bc736b83a080152bdf20252b27c6c70ac42b6b7082aaeab6e9bd77a3449a624c5f9bbe3cdfef8c9f

26

 DIST winsteng.exe 7740765 SHA256 45a66f17f7c34e268fac4f40e829a3fb676c50d137e38fdee225ee1bcda189d0 SHA512 4da2460a85b9d86acdef20ed564ca1e19213f125487ec197eae9c88caf540fce123d2c2decf32978c2a3e55f52a5441cacd7826a7e916557087678532296f889 WHIRLPOOL 0206472a1ac133ddfa967f6c42e8c6399a428f5b01df65ff71e3b8b5d4cb761c09073ccf0779cf1c3ac1a9b1dbf8929d442e3bca89ba380982efd9b8fb41453d

27

 DIST winstfin.exe 7821985 SHA256 ecd28749632525287b562817580eea81e3cdef31c585d8a81a25bdca013e79d7 SHA512 6eaf6ae2ff0e476cee3b75d476bf56078dad2c04194eb17e780add94c1a667836e950737054e0efd7a274e46f966852f3b2dcdeb26742a5c8fbdaa404d686224 WHIRLPOOL 054f378f2da3faab47db74f1796c1fb2c24fd21bace350b01ba41225350fa5d9f04d3eaeed0d8b26019a8effbbe4dc3bee945a423d41368ce1f0cfb745a48cfb

28

29

diff --git a/net-print/adobeps/adobeps-1.0.6-r1.ebuild b/net-print/adobeps/adobeps-1.0.6-r1.ebuild

30

index 9e6dee7..fef00ed 100644

31

--- a/net-print/adobeps/adobeps-1.0.6-r1.ebuild

32

+++ b/net-print/adobeps/adobeps-1.0.6-r1.ebuild

33

@@ -20,17 +20,17 @@ IUSE="cups"

34

 DEPEND="app-arch/cabextract"

35

 RDEPEND="cups? ( >=net-print/cups-1.2 )"

36

37

-IUSE_LINGUAS=( en da de es fi fr it ja ko nl no pt_BR sv zh_CN )

38

+IUSE_L10N=( en da de es fi fr it ja ko nl no pt-BR sv zh-CN zh-TW )

39

 IUSE_FILES=( winsteng winstDan winstger winstspa winstfin winstfre winstita

40

-	winstjpn winstkor winstdut winstnor winstbrz winstswe Winstchs ) # winstcht

41

+	winstjpn winstkor winstdut winstnor winstbrz winstswe Winstchs winstcht )

42

43

 IUSE_LANGS=""

44

 IUSE_CLOSE=""

45

-for ((X=0; X < ${#IUSE_LINGUAS[*]}; X++)); do

46

-	IUSE="${IUSE} linguas_${IUSE_LINGUAS[X]}"

47

-	SRC_URI="${SRC_URI} linguas_${IUSE_LINGUAS[X]}? ( ${SRC_URI_BASE}/${IUSE_FILES[X]}.exe )"

48

-	IUSE_LANGS="${IUSE_LANGS} !linguas_${IUSE_LINGUAS[X]}? ("

49

-	IUSE_CLOSE="${IUSE_CLOSE} )"

50

+for (( X=0; X < ${#IUSE_L10N[@]}; X++ )); do

51

+	IUSE+=" l10n_${IUSE_L10N[X]}"

52

+	SRC_URI+=" l10n_${IUSE_L10N[X]}? ( ${SRC_URI_BASE}/${IUSE_FILES[X]}.exe )"

53

+	IUSE_LANGS+=" !l10n_${IUSE_L10N[X]}? ("

54

+	IUSE_CLOSE+=" )"

55

 done

56

 SRC_URI="${SRC_URI} ${IUSE_LANGS} ${SRC_URI_BASE}/${IUSE_FILES[0]}.exe${IUSE_CLOSE}"

57

58

@@ -39,14 +39,16 @@ S="${WORKDIR}"

59

 pkg_setup() {

60

 	local X L=""

61

 	ADOBEPS_LANG=""

62

-	for X in ${LINGUAS}; do

63

-		if [[ " ${IUSE_LINGUAS[*]} " =~ " ${X} " ]]; then

64

-			[ -z "${ADOBEPS_LANG}" ] && ADOBEPS_LANG="${X}"

65

-			L="${L} ${X}"

66

+	for X in "${IUSE_L10N[@]}"; do

67

+		if use l10n_"${X}"; then

68

+			L+=" ${X}"

69

+			[[ -z ${ADOBEPS_LANG} ]] && ADOBEPS_LANG="${X}"

70

fi

71

 	done

72

-	if [ -z "${ADOBEPS_LANG}" ]; then

73

-		L="${IUSE_LINGUAS[0]}"; ADOBEPS_LANG="${L}"

74

+	# default to English if no L10N flags are set

75

+	if [[ -z ${ADOBEPS_LANG} ]]; then

76

+		L="en"

77

+		ADOBEPS_LANG="en"

78

fi

79

 	elog "Selected languages:" ${L}

80

 	use cups && elog "CUPS drivers language: ${ADOBEPS_LANG}"

81

@@ -54,10 +56,10 @@ pkg_setup() {

82

83

 src_unpack() {

84

 	local X L

85

-	for ((X=0; X < ${#IUSE_LINGUAS[*]}; X++)); do

86

-		L="${IUSE_LINGUAS[X]}"

87

-		if use linguas_${L} || [ "${L}" = "${ADOBEPS_LANG}" ]; then

88

-			cabextract -Lq -d "${S}/${IUSE_LINGUAS[X]}" \

89

+	for (( X=0; X < ${#IUSE_L10N[@]}; X++ )); do

90

+		L="${IUSE_L10N[X]}"

91

+		if use l10n_"${L}" || [[ ${L} = "${ADOBEPS_LANG}" ]]; then

92

+			cabextract -Lq -d "${S}/${IUSE_L10N[X]}" \

93

 				"${DISTDIR}/${IUSE_FILES[X]}.exe" || die "unpack failed"

94

fi

95

 	done

96

@@ -65,10 +67,10 @@ src_unpack() {

97

98

 src_install() {

99

 	local X

100

-	for X in ${IUSE_LINGUAS[*]}; do

101

-		if use linguas_${X} || [ "${X}" = "${ADOBEPS_LANG}" ]; then

102

+	for X in "${IUSE_L10N[@]}"; do

103

+		if use l10n_"${X}" || [[ ${X} = "${ADOBEPS_LANG}" ]]; then

104

 			# files and filenames taken from cupsaddsmb man-page

105

-			insinto "/usr/share/${PN}/${X}"

106

+			insinto "/usr/share/${PN}/${X/-/_}"

107

 			# Windows 2000 and higher

108

 			doins ${X}/winxp/{ps5ui.dll,pscript.hlp,pscript.ntf,pscript5.dll}

109

 			# Windows 95, 98, and Me

110

@@ -84,7 +86,8 @@ src_install() {

111

 		dodir /usr/share/cups/drivers

112

 		for X in ps5ui.dll pscript.hlp pscript.ntf pscript5.dll \

113

 			ADFONTS.MFM ADOBEPS4.DRV ADOBEPS4.HLP ICONLIB.DLL PSMON.DLL; do

114

-			dosym "../../${PN}/${ADOBEPS_LANG}/${X}" "/usr/share/cups/drivers/${X}"

115

+			dosym "../../${PN}/${ADOBEPS_LANG/-/_}/${X}" \

116

+				"/usr/share/cups/drivers/${X}"

117

 		done

118

fi

119

}

1	commit: afec825f3597521a72e43bcc1c312f83ad557886
2	Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3	AuthorDate: Sat Jun 25 11:52:57 2016 +0000
4	Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5	CommitDate: Sat Jun 25 11:52:57 2016 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afec825f
7
8	net-print/adobeps: Migrate from LINGUAS to L10N.
9
10	Package-Manager: portage-2.3.0
11
12	net-print/adobeps/Manifest \| 1 +
13	net-print/adobeps/adobeps-1.0.6-r1.ebuild \| 45 ++++++++++++++++---------------
14	2 files changed, 25 insertions(+), 21 deletions(-)
15
16	diff --git a/net-print/adobeps/Manifest b/net-print/adobeps/Manifest
17	index ad500f8..6e5de25 100644
18	--- a/net-print/adobeps/Manifest
19	+++ b/net-print/adobeps/Manifest
20	@@ -1,6 +1,7 @@
21	DIST Winstchs.exe 7763014 SHA256 4af84c26ad901cde09571930b7d228dfc88327711b5360f6441147443afcbcad SHA512 cf8041b9212adcabff6c3d5e547b9bb5d9c2d36ecec175cb7fff71185e8805909dc6ec7b42e68f794d66b5a4f3ce6d5b7f602c42926ffea57674f0f4597665e8 WHIRLPOOL 0d2c6613e27682fff5fc1528cc764eed67b165a4ca1cdeee6691b554859b754c858e88d453790c06bb6bbfb74e8af2f6ae6a15c28ff47901feab38d91ac1d911
22	DIST winstDan.exe 7815273 SHA256 a95c420208cb90be6d741214c56d130793eaad415a6fcece120516c993f5340f SHA512 7981fe9655c798210de58a797227c7891c3355d29df8bd525bc99f8dacb7d235b1599e6b6a12136d78d63729827481edc2f8bb7eb60b728f0ae05861d925320a WHIRLPOOL 5cbef4a5c8724ea01241b0c4f05e2b0e5ad5e83250605434045ed004222fb49af9f89ba32a3d4258622de6bb7bc04fefd6e89624bd896c24fbae3b946710481f
23	DIST winstbrz.exe 7820627 SHA256 4585b2749e1bc227cabcfebdd1729183deb769ba4c18f12df58defc59545559d SHA512 72f24812841945d49d0d1ccb99e2f906062f37ff9c0764b9ac58d999c85ce6e8c0348d09c638c01a82f68dc99dbb17abdbc11f0d1f712d2ee6b181d611d3b413 WHIRLPOOL 997bb2463f039cf58a732331c6c9b585e335d316bf485e21192ccac94fe62ab52ca2566507e93867ab02b4f29d18b8a79fcf879b1f5757a8df28153cd15bb0d2
24	+DIST winstcht.exe 7780767 SHA256 9142da863b63dda763bc850472133097f7312f2a500cbea2060314b80b30633b SHA512 61d7957560edbe19928be5a55709156e3c55dc671bb0bbe4ddad0b0529a483281a24d6b37d29d2d202d672457a705715c1b52bb6e2187de353666bd4e2649dbc WHIRLPOOL bc4a1c5d69bfc6ab77058a5f23fa8c914209fa7c2e4bb281d9b3e2923366f405914e78657bf34e2189e43059224ed0c8003bc92d22e035bf89a0eb980dab15c2
25	DIST winstdut.exe 7835281 SHA256 bd82ad3616c3572262c03590832f19cd872afb07b8eea4e6540d33a6906ac815 SHA512 0a125d98fb12a2ac7eb47d5a2e8649f09c9e4bb50803b68b891b9403d5655debeb22cca35d29b7544494ad71a6b5eb28efa2d9b1a34856584afeac1ed86c600d WHIRLPOOL 29fa339cd635fa6edc3618c6f8346c501ce04ce4b0750ae2bc736b83a080152bdf20252b27c6c70ac42b6b7082aaeab6e9bd77a3449a624c5f9bbe3cdfef8c9f
26	DIST winsteng.exe 7740765 SHA256 45a66f17f7c34e268fac4f40e829a3fb676c50d137e38fdee225ee1bcda189d0 SHA512 4da2460a85b9d86acdef20ed564ca1e19213f125487ec197eae9c88caf540fce123d2c2decf32978c2a3e55f52a5441cacd7826a7e916557087678532296f889 WHIRLPOOL 0206472a1ac133ddfa967f6c42e8c6399a428f5b01df65ff71e3b8b5d4cb761c09073ccf0779cf1c3ac1a9b1dbf8929d442e3bca89ba380982efd9b8fb41453d
27	DIST winstfin.exe 7821985 SHA256 ecd28749632525287b562817580eea81e3cdef31c585d8a81a25bdca013e79d7 SHA512 6eaf6ae2ff0e476cee3b75d476bf56078dad2c04194eb17e780add94c1a667836e950737054e0efd7a274e46f966852f3b2dcdeb26742a5c8fbdaa404d686224 WHIRLPOOL 054f378f2da3faab47db74f1796c1fb2c24fd21bace350b01ba41225350fa5d9f04d3eaeed0d8b26019a8effbbe4dc3bee945a423d41368ce1f0cfb745a48cfb
28
29	diff --git a/net-print/adobeps/adobeps-1.0.6-r1.ebuild b/net-print/adobeps/adobeps-1.0.6-r1.ebuild
30	index 9e6dee7..fef00ed 100644
31	--- a/net-print/adobeps/adobeps-1.0.6-r1.ebuild
32	+++ b/net-print/adobeps/adobeps-1.0.6-r1.ebuild
33	@@ -20,17 +20,17 @@ IUSE="cups"
34	DEPEND="app-arch/cabextract"
35	RDEPEND="cups? ( >=net-print/cups-1.2 )"
36
37	-IUSE_LINGUAS=( en da de es fi fr it ja ko nl no pt_BR sv zh_CN )
38	+IUSE_L10N=( en da de es fi fr it ja ko nl no pt-BR sv zh-CN zh-TW )
39	IUSE_FILES=( winsteng winstDan winstger winstspa winstfin winstfre winstita
40	- winstjpn winstkor winstdut winstnor winstbrz winstswe Winstchs ) # winstcht
41	+ winstjpn winstkor winstdut winstnor winstbrz winstswe Winstchs winstcht )
42
43	IUSE_LANGS=""
44	IUSE_CLOSE=""
45	-for ((X=0; X < ${#IUSE_LINGUAS[*]}; X++)); do
46	- IUSE="${IUSE} linguas_${IUSE_LINGUAS[X]}"
47	- SRC_URI="${SRC_URI} linguas_${IUSE_LINGUAS[X]}? ( ${SRC_URI_BASE}/${IUSE_FILES[X]}.exe )"
48	- IUSE_LANGS="${IUSE_LANGS} !linguas_${IUSE_LINGUAS[X]}? ("
49	- IUSE_CLOSE="${IUSE_CLOSE} )"
50	+for (( X=0; X < ${#IUSE_L10N[@]}; X++ )); do
51	+ IUSE+=" l10n_${IUSE_L10N[X]}"
52	+ SRC_URI+=" l10n_${IUSE_L10N[X]}? ( ${SRC_URI_BASE}/${IUSE_FILES[X]}.exe )"
53	+ IUSE_LANGS+=" !l10n_${IUSE_L10N[X]}? ("
54	+ IUSE_CLOSE+=" )"
55	done
56	SRC_URI="${SRC_URI} ${IUSE_LANGS} ${SRC_URI_BASE}/${IUSE_FILES[0]}.exe${IUSE_CLOSE}"
57
58	@@ -39,14 +39,16 @@ S="${WORKDIR}"
59	pkg_setup() {
60	local X L=""
61	ADOBEPS_LANG=""
62	- for X in ${LINGUAS}; do
63	- if [[ " ${IUSE_LINGUAS[*]} " =~ " ${X} " ]]; then
64	- [ -z "${ADOBEPS_LANG}" ] && ADOBEPS_LANG="${X}"
65	- L="${L} ${X}"
66	+ for X in "${IUSE_L10N[@]}"; do
67	+ if use l10n_"${X}"; then
68	+ L+=" ${X}"
69	+ [[ -z ${ADOBEPS_LANG} ]] && ADOBEPS_LANG="${X}"
70	fi
71	done
72	- if [ -z "${ADOBEPS_LANG}" ]; then
73	- L="${IUSE_LINGUAS[0]}"; ADOBEPS_LANG="${L}"
74	+ # default to English if no L10N flags are set
75	+ if [[ -z ${ADOBEPS_LANG} ]]; then
76	+ L="en"
77	+ ADOBEPS_LANG="en"
78	fi
79	elog "Selected languages:" ${L}
80	use cups && elog "CUPS drivers language: ${ADOBEPS_LANG}"
81	@@ -54,10 +56,10 @@ pkg_setup() {
82
83	src_unpack() {
84	local X L
85	- for ((X=0; X < ${#IUSE_LINGUAS[*]}; X++)); do
86	- L="${IUSE_LINGUAS[X]}"
87	- if use linguas_${L} \|\| [ "${L}" = "${ADOBEPS_LANG}" ]; then
88	- cabextract -Lq -d "${S}/${IUSE_LINGUAS[X]}" \
89	+ for (( X=0; X < ${#IUSE_L10N[@]}; X++ )); do
90	+ L="${IUSE_L10N[X]}"
91	+ if use l10n_"${L}" \|\| [[ ${L} = "${ADOBEPS_LANG}" ]]; then
92	+ cabextract -Lq -d "${S}/${IUSE_L10N[X]}" \
93	"${DISTDIR}/${IUSE_FILES[X]}.exe" \|\| die "unpack failed"
94	fi
95	done
96	@@ -65,10 +67,10 @@ src_unpack() {
97
98	src_install() {
99	local X
100	- for X in ${IUSE_LINGUAS[*]}; do
101	- if use linguas_${X} \|\| [ "${X}" = "${ADOBEPS_LANG}" ]; then
102	+ for X in "${IUSE_L10N[@]}"; do
103	+ if use l10n_"${X}" \|\| [[ ${X} = "${ADOBEPS_LANG}" ]]; then
104	# files and filenames taken from cupsaddsmb man-page
105	- insinto "/usr/share/${PN}/${X}"
106	+ insinto "/usr/share/${PN}/${X/-/_}"
107	# Windows 2000 and higher
108	doins ${X}/winxp/{ps5ui.dll,pscript.hlp,pscript.ntf,pscript5.dll}
109	# Windows 95, 98, and Me
110	@@ -84,7 +86,8 @@ src_install() {
111	dodir /usr/share/cups/drivers
112	for X in ps5ui.dll pscript.hlp pscript.ntf pscript5.dll \
113	ADFONTS.MFM ADOBEPS4.DRV ADOBEPS4.HLP ICONLIB.DLL PSMON.DLL; do
114	- dosym "../../${PN}/${ADOBEPS_LANG}/${X}" "/usr/share/cups/drivers/${X}"
115	+ dosym "../../${PN}/${ADOBEPS_LANG/-/_}/${X}" \
116	+ "/usr/share/cups/drivers/${X}"
117	done
118	fi
119	}

Gentoo Archives: gentoo-commits