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

Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/opera: ChangeLog opera-10.00_rc4583.ebuild opera-10.00_rc4570.ebuild
Date: Fri, 28 Aug 2009 23:22:56
Message-Id: E1MhFbc-0006CL-BD@stork.gentoo.org
1 jer 09/08/29 04:32:00
2
3 Modified: ChangeLog opera-10.00_rc4570.ebuild
4 Added: opera-10.00_rc4583.ebuild
5 Log:
6 Version bump <http://my.opera.com/desktopteam/blog/2009/08/28/opera-10-0-release-candidate-2>.
7 (Portage version: 2.2_rc40/cvs/Linux i686)
8
9 Revision Changes Path
10 1.380 www-client/opera/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?rev=1.380&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?rev=1.380&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?r1=1.379&r2=1.380
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v
19 retrieving revision 1.379
20 retrieving revision 1.380
21 diff -u -r1.379 -r1.380
22 --- ChangeLog 25 Aug 2009 12:03:17 -0000 1.379
23 +++ ChangeLog 29 Aug 2009 04:31:59 -0000 1.380
24 @@ -1,6 +1,14 @@
25 # ChangeLog for www-client/opera
26 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.379 2009/08/25 12:03:17 jer Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.380 2009/08/29 04:31:59 jer Exp $
29 +
30 +*opera-10.00_rc4583 (29 Aug 2009)
31 +
32 + 29 Aug 2009; Jeroen Roovers <jer@g.o> opera-10.00_rc4570.ebuild,
33 + +opera-10.00_rc4583.ebuild:
34 + Version bump
35 + <http://my.opera.com/desktopteam/blog/2009/08/28/opera-10-0-release-candid
36 + ate-2>.
37
38 *opera-10.00_rc4570 (25 Aug 2009)
39
40
41
42
43 1.2 www-client/opera/opera-10.00_rc4570.ebuild
44
45 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.00_rc4570.ebuild?rev=1.2&view=markup
46 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.00_rc4570.ebuild?rev=1.2&content-type=text/plain
47 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.00_rc4570.ebuild?r1=1.1&r2=1.2
48
49 Index: opera-10.00_rc4570.ebuild
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_rc4570.ebuild,v
52 retrieving revision 1.1
53 retrieving revision 1.2
54 diff -u -r1.1 -r1.2
55 --- opera-10.00_rc4570.ebuild 25 Aug 2009 12:03:17 -0000 1.1
56 +++ opera-10.00_rc4570.ebuild 29 Aug 2009 04:32:00 -0000 1.2
57 @@ -1,6 +1,6 @@
58 # Copyright 1999-2009 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_rc4570.ebuild,v 1.1 2009/08/25 12:03:17 jer Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_rc4570.ebuild,v 1.2 2009/08/29 04:32:00 jer Exp $
62
63 EAPI="2"
64
65 @@ -138,6 +138,7 @@
66 epatch "${FILESDIR}/${PN}-gentoo.patch"
67 epatch "${FILESDIR}/${PN}-simplify-desktop.patch"
68 epatch "${FILESDIR}/${PN}-freedesktop.patch"
69 + epatch "${FILESDIR}/${PN}-java.patch"
70
71 # bug #181300:
72 if use elibc_FreeBSD; then
73
74
75
76 1.1 www-client/opera/opera-10.00_rc4583.ebuild
77
78 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.00_rc4583.ebuild?rev=1.1&view=markup
79 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.00_rc4583.ebuild?rev=1.1&content-type=text/plain
80
81 Index: opera-10.00_rc4583.ebuild
82 ===================================================================
83 # Copyright 1999-2009 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85 # $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_rc4583.ebuild,v 1.1 2009/08/29 04:32:00 jer Exp $
86
87 EAPI="2"
88
89 GCONF_DEBUG="no"
90
91 inherit eutils gnome2
92
93 DESCRIPTION="A standards-compliant graphical Web browser"
94 HOMEPAGE="http://www.opera.com/"
95
96 SLOT="0"
97 LICENSE="OPERA-10.00"
98 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
99
100 RESTRICT="mirror strip test"
101 QA_DT_HASH="opt/${PN}/.*"
102
103 IUSE="elibc_FreeBSD gnome ia32 qt3 qt-static"
104 MY_LINGUAS="be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk zh-CN zh-HK zh-TW"
105
106 for MY_LINGUA in ${MY_LINGUAS}; do
107 IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
108 done
109
110 O_U="http://snapshot.opera.com/unix/snapshot-${PV/*_rc}/"
111
112 # 1) Please check for missing (qt3/qt-static) builds
113 # 2) and only then update the build number manually
114 OPERABUILD="4583"
115
116 if [ "${PV/*_rc}" = "${OPERABUILD}" ]; then
117 O_P="${P/_rc*/}-${OPERABUILD}"
118 else
119 O_P="SET_OPERABUILD_IN_THE_EBUILD"
120 fi
121
122 SRC_URI="
123 amd64? (
124 !ia32? (
125 qt-static? ( ${O_U}x86_64-linux/${O_P}.gcc4-bundled-qt4.x86_64.tar.bz2 )
126 !qt-static? (
127 qt3? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
128 !qt3? ( ${O_U}x86_64-linux/${O_P}.gcc4-qt4.x86_64.tar.bz2 )
129 )
130 )
131 ia32? (
132 qt-static? ( ${O_U}intel-linux/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 )
133 !qt-static? (
134 qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
135 !qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
136 )
137 )
138 )
139 ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
140 x86? (
141 qt-static? ( ${O_U}intel-linux/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 )
142 !qt-static? (
143 qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
144 !qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
145 )
146 )
147 x86-fbsd? ( ${O_U}intel-freebsd/${O_P}.freebsd7-shared-qt3.i386.tar.bz2 )
148 "
149
150 DEPEND=">=sys-apps/sed-4"
151
152 RDEPEND="
153 media-libs/jpeg
154 media-libs/libexif
155 >=media-libs/fontconfig-2.1.94-r1
156 x11-libs/libXrandr
157 x11-libs/libXp
158 x11-libs/libXmu
159 x11-libs/libXi
160 x11-libs/libXft
161 x11-libs/libXext
162 x11-libs/libXcursor
163 x11-libs/libX11
164 x11-libs/libSM
165 x11-libs/libICE
166 amd64? (
167 ia32? (
168 qt-static? ( media-libs/nas )
169 !qt-static? (
170 qt3? ( =x11-libs/qt-3*[-immqt] )
171 !qt3? ( x11-libs/qt-core x11-libs/qt-gui )
172 )
173 )
174 !ia32? (
175 qt-static? ( media-libs/nas )
176 !qt-static? (
177 qt3? ( =x11-libs/qt-3*[-immqt] )
178 !qt3? ( x11-libs/qt-core x11-libs/qt-gui )
179 )
180 )
181 )
182 ppc? ( =x11-libs/qt-3*[-immqt] )
183 x86? (
184 qt-static? ( media-libs/nas )
185 !qt-static? (
186 qt3? ( =x11-libs/qt-3*[-immqt] )
187 !qt3? ( x11-libs/qt-core x11-libs/qt-gui )
188 )
189 )
190 x86-fbsd? ( =x11-libs/qt-3*[-immqt] )
191 "
192
193 opera_linguas() {
194 # Remove unwanted LINGUAS:
195 local LINGUA
196 local LNGDIR="${D}/opt/opera/share/opera/locale"
197 einfo "Keeping these locales: ${LINGUAS}."
198 for LINGUA in ${MY_LINGUAS}; do
199 if ! use linguas_${LINGUA/-/_}; then
200 LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
201 rm -r "${LINGUA}"
202 fi
203 done
204 }
205
206 pkg_setup() {
207 elog "${WARN}If you seek support, please file a bug report at${NORMAL}"
208 elog "${WARN}https://bugs.gentoo.org and post the output of${NORMAL}"
209 elog "${WARN} \`emerge --info =${CATEGORY}/${P}'${NORMAL}"
210 }
211
212 src_unpack() {
213 unpack ${A}
214 if [[ ! -d ${S} ]]; then
215 cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
216 S="$(pwd)"
217 einfo "Setting WORKDIR to ${S}"
218 fi
219 }
220
221 src_prepare() {
222 epatch "${FILESDIR}/${PN}-gentoo.patch"
223 epatch "${FILESDIR}/${PN}-simplify-desktop.patch"
224 epatch "${FILESDIR}/${PN}-freedesktop.patch"
225 epatch "${FILESDIR}/${PN}-java.patch"
226
227 # bug #181300:
228 if use elibc_FreeBSD; then
229 epatch "${FILESDIR}/${PN}-10.00-pluginpath-fbsd.patch"
230 else
231 epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
232 fi
233
234 sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
235 -e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
236 -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
237 -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
238 install.sh || die "sed failed"
239 }
240
241 # These workarounds are sadly needed because gnome2.eclass doesn't check
242 # whether a configure/Makefile script exists.
243 src_configure() { :; }
244 src_compile() { :; }
245
246 src_install() {
247 # Prepare installation directories for Opera's installer script.
248 dodir /etc
249
250 # Opera's native installer.
251 ./install.sh --prefix="${D}"/opt/opera || die "install.sh failed"
252
253 einfo "It is safe to ignore warnings about failed checksums"
254 einfo "and about files that would be ignored ..."
255 einfo "Completing the installation where install.sh abandoned us ..."
256
257 # java workaround
258 sed -i -e 's:LD_PRELOAD="${OPERA_JAVA_DIR}/libawt.so":LD_PRELOAD="$LD_PRELOAD"\:"${OPERA_JAVA_DIR}/libawt.so":' "${D}"/opt/opera/bin/opera
259
260 dosed /opt/opera/bin/opera
261 dosed /opt/opera/share/opera/java/opera.policy
262
263 # Adapt desktop file to Gnome when needed
264 use gnome && sed -i -e s:"GenericName\[":"Comment\[": "${D}"/usr/share/applications/opera.desktop
265
266 # Install a symlink /usr/bin/opera
267 dodir /usr/bin
268 dosym /opt/opera/bin/opera /usr/bin/opera
269
270 dodir /etc/revdep-rebuild
271 echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > "${D}"/etc/revdep-rebuild/90opera
272
273 # Change libz.so.3 to libz.so.1 for gentoo/freebsd
274 if use elibc_FreeBSD; then
275 scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${PN}/ | \
276 while read i; do
277 if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
278 then
279 export SANITY_CHECK_LIBZ_FAILED=1
280 break
281 fi
282 sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
283 done
284 [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
285 fi
286
287 # Add the Opera man dir to MANPATH:
288 insinto /etc/env.d
289 echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera
290
291 [[ -z MY_LINGUAS ]] || opera_linguas
292 }
293
294 pkg_postinst() {
295 use gnome && gnome2_pkg_postinst
296
297 elog "To change the UI language, choose [Tools] -> [Preferences], open the"
298 elog "[General] tab, click on [Details...] then [Choose...] and point the"
299 elog "file chooser at /opt/opera/share/opera/locale/, then enter the"
300 elog "directory for the language you want and [Open] the .lng file."
301
302 elog
303 elog "To use the spellchecker (USE=spell) for languages other than English, do:"
304 elog " emerge app-dicts/myspell-[your language]"
305 elog " mkdir \${HOME}/.opera/dictionaries"
306 elog " cd \${HOME}/.opera/dictionaries"
307 elog " ln -s /usr/share/myspell/*.{aff,dic} ."
308 elog "A future release of Opera 10 should remedy this inconvenience."
309
310 if use elibc_FreeBSD; then
311 elog
312 elog "To improve shared memory usage please set:"
313 elog "$ sysctl kern.ipc.shm_allow_removed=1"
314 fi
315
316 elog
317 elog "The current Opera builds may still have issues with plugins, notably"
318 elog "www-plugins/adobe-flash. See also https://bugs.gentoo.org/198162"
319 }
320
321 pkg_postrm() {
322 use gnome && gnome2_pkg_postrm
323 }
Report Message
Find on MARC Find on Google Groups