Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Raul Porcel (armin76)" <armin76@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/mozilla-sunbird: mozilla-sunbird-0.8.ebuild mozilla-sunbird-0.7.ebuild ChangeLog
Date: Sat, 19 Apr 2008 16:19:08
Message-Id: E1JnFmF-0001Ry-DJ@stork.gentoo.org
1 armin76 08/04/19 16:18:59
2
3 Modified: mozilla-sunbird-0.8.ebuild
4 mozilla-sunbird-0.7.ebuild ChangeLog
5 Log:
6 We need pango built with X use-flag bug #216377, fix linguas, bug #218147
7 (Portage version: 2.1.4.4)
8
9 Revision Changes Path
10 1.2 app-office/mozilla-sunbird/mozilla-sunbird-0.8.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.8.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.8.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.8.ebuild?r1=1.1&r2=1.2
15
16 Index: mozilla-sunbird-0.8.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.8.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- mozilla-sunbird-0.8.ebuild 8 Apr 2008 10:04:11 -0000 1.1
23 +++ mozilla-sunbird-0.8.ebuild 19 Apr 2008 16:18:58 -0000 1.2
24 @@ -1,13 +1,13 @@
25 # Copyright 1999-2008 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.8.ebuild,v 1.1 2008/04/08 10:04:11 armin76 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.8.ebuild,v 1.2 2008/04/19 16:18:58 armin76 Exp $
29
30 WANT_AUTOCONF="2.1"
31
32 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
33
34 PATCH="${P}-patches-0.1"
35 -LANGS="ca cs da de es-AR es-ES eu fr ga-IE hu it ja ka ko lt mk mn nb-NO nl pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr uk zh-CN"
36 +LANGS="ca cs da de en-US es-AR es-ES eu fr ga-IE hu it ja ka ko lt mk mn nb-NO nl pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr uk zh-CN"
37 NOSHORTLANGS="es-AR pt-BR zh-TW"
38
39 MY_PN="${PN/mozilla-}"
40 @@ -24,13 +24,17 @@
41 #
42 # for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done
43 for X in ${LANGS} ; do
44 - SRC_URI="${SRC_URI}
45 - linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
46 + if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
47 + SRC_URI="${SRC_URI}
48 + linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
49 + fi
50 IUSE="${IUSE} linguas_${X/-/_}"
51 # english is handled internally
52 if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
53 - SRC_URI="${SRC_URI}
54 - linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
55 + if [ "${X}" != "en-US" ]; then
56 + SRC_URI="${SRC_URI}
57 + linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
58 + fi
59 IUSE="${IUSE} linguas_${X%%-*}"
60 fi
61 done
62 @@ -80,6 +84,12 @@
63 die "Cairo needs X"
64 fi
65
66 + if ! built_with_use x11-libs/pango X; then
67 + eerror "Pango is not built with X useflag."
68 + eerror "Please add 'X' to your USE flags, and re-emerge pango."
69 + die "Pango needs X"
70 + fi
71 +
72 if ! use bindist; then
73 elog "You are enabling official branding. You may not redistribute this build"
74 elog "to any users on your network or the internet. Doing so puts yourself into"
75 @@ -96,8 +106,8 @@
76 for X in ${linguas}; do
77 [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
78 done
79 - if [[ ${linguas} != "" ]]; then
80 - elog "Selected language packs (first will be default): ${linguas}"
81 + if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
82 + einfo "Selected language packs (first will be default): ${linguas}"
83 fi
84
85 # Apply our patches
86
87
88
89 1.12 app-office/mozilla-sunbird/mozilla-sunbird-0.7.ebuild
90
91 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.7.ebuild?rev=1.12&view=markup
92 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.7.ebuild?rev=1.12&content-type=text/plain
93 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.7.ebuild?r1=1.11&r2=1.12
94
95 Index: mozilla-sunbird-0.7.ebuild
96 ===================================================================
97 RCS file: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.7.ebuild,v
98 retrieving revision 1.11
99 retrieving revision 1.12
100 diff -u -r1.11 -r1.12
101 --- mozilla-sunbird-0.7.ebuild 17 Mar 2008 12:13:44 -0000 1.11
102 +++ mozilla-sunbird-0.7.ebuild 19 Apr 2008 16:18:58 -0000 1.12
103 @@ -1,13 +1,13 @@
104 # Copyright 1999-2008 Gentoo Foundation
105 # Distributed under the terms of the GNU General Public License v2
106 -# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.7.ebuild,v 1.11 2008/03/17 12:13:44 armin76 Exp $
107 +# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.7.ebuild,v 1.12 2008/04/19 16:18:58 armin76 Exp $
108
109 WANT_AUTOCONF="2.1"
110
111 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
112
113 PATCH="${P}-patches-0.5"
114 -LANGS="ca cs da de es-AR es-ES eu fr ga-IE hu it ka lt mk nb-NO nl pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr zh-CN"
115 +LANGS="ca cs da de en-US es-AR es-ES eu fr ga-IE hu it ka lt mk nb-NO nl pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr zh-CN"
116 NOSHORTLANGS="es-AR pt-BR zh-TW"
117
118 MY_PN="${PN/mozilla-}"
119 @@ -24,13 +24,17 @@
120 #
121 # for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done
122 for X in ${LANGS} ; do
123 - SRC_URI="${SRC_URI}
124 - linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
125 + if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
126 + SRC_URI="${SRC_URI}
127 + linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
128 + fi
129 IUSE="${IUSE} linguas_${X/-/_}"
130 # english is handled internally
131 if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
132 - SRC_URI="${SRC_URI}
133 - linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
134 + if [ "${X}" != "en-US" ]; then
135 + SRC_URI="${SRC_URI}
136 + linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
137 + fi
138 IUSE="${IUSE} linguas_${X%%-*}"
139 fi
140 done
141 @@ -80,6 +84,12 @@
142 die "Cairo needs X"
143 fi
144
145 + if ! built_with_use x11-libs/pango X; then
146 + eerror "Pango is not built with X useflag."
147 + eerror "Please add 'X' to your USE flags, and re-emerge pango."
148 + die "Pango needs X"
149 + fi
150 +
151 if ! use bindist; then
152 elog "You are enabling official branding. You may not redistribute this build"
153 elog "to any users on your network or the internet. Doing so puts yourself into"
154 @@ -96,8 +106,8 @@
155 for X in ${linguas}; do
156 [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
157 done
158 - if [[ ${linguas} != "" ]]; then
159 - elog "Selected language packs (first will be default): ${linguas}"
160 + if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
161 + einfo "Selected language packs (first will be default): ${linguas}"
162 fi
163
164 # Apply our patches
165
166
167
168 1.29 app-office/mozilla-sunbird/ChangeLog
169
170 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/mozilla-sunbird/ChangeLog?rev=1.29&view=markup
171 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/mozilla-sunbird/ChangeLog?rev=1.29&content-type=text/plain
172 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/mozilla-sunbird/ChangeLog?r1=1.28&r2=1.29
173
174 Index: ChangeLog
175 ===================================================================
176 RCS file: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/ChangeLog,v
177 retrieving revision 1.28
178 retrieving revision 1.29
179 diff -u -r1.28 -r1.29
180 --- ChangeLog 8 Apr 2008 10:04:11 -0000 1.28
181 +++ ChangeLog 19 Apr 2008 16:18:58 -0000 1.29
182 @@ -1,6 +1,10 @@
183 # ChangeLog for app-office/mozilla-sunbird
184 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
185 -# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/ChangeLog,v 1.28 2008/04/08 10:04:11 armin76 Exp $
186 +# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/ChangeLog,v 1.29 2008/04/19 16:18:58 armin76 Exp $
187 +
188 + 19 Apr 2008; Raúl Porcel <armin76@g.o> mozilla-sunbird-0.7.ebuild,
189 + mozilla-sunbird-0.8.ebuild:
190 + We need pango built with X use-flag bug #216377, fix linguas, bug #218147
191
192 *mozilla-sunbird-0.8 (08 Apr 2008)
193
194
195
196
197 --
198 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups