| 1 |
jer 08/06/23 01:15:47 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: opera-9.50-r1.ebuild |
| 5 |
Log: |
| 6 |
Revision bump to add support for the ia32 USE flag to install a 32-bit Opera on AMD64 (bug #227339). |
| 7 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r2-JeR i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.248 www-client/opera/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?rev=1.248&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?rev=1.248&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?r1=1.247&r2=1.248 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v |
| 19 |
retrieving revision 1.247 |
| 20 |
retrieving revision 1.248 |
| 21 |
diff -u -r1.247 -r1.248 |
| 22 |
--- ChangeLog 23 Jun 2008 00:48:35 -0000 1.247 |
| 23 |
+++ ChangeLog 23 Jun 2008 01:15:46 -0000 1.248 |
| 24 |
@@ -1,6 +1,12 @@ |
| 25 |
# ChangeLog for www-client/opera |
| 26 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.247 2008/06/23 00:48:35 jer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.248 2008/06/23 01:15:46 jer Exp $ |
| 29 |
+ |
| 30 |
+*opera-9.50-r1 (23 Jun 2008) |
| 31 |
+ |
| 32 |
+ 23 Jun 2008; Jeroen Roovers <jer@g.o> +opera-9.50-r1.ebuild: |
| 33 |
+ Revision bump to add support for the ia32 USE flag to install a 32-bit Opera |
| 34 |
+ on AMD64 (bug #227339). |
| 35 |
|
| 36 |
*opera-9.51_pre2050 (23 Jun 2008) |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 www-client/opera/opera-9.50-r1.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-9.50-r1.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-9.50-r1.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: opera-9.50-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2008 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.50-r1.ebuild,v 1.1 2008/06/23 01:15:46 jer Exp $ |
| 51 |
|
| 52 |
GCONF_DEBUG="no" |
| 53 |
|
| 54 |
inherit eutils gnome2 |
| 55 |
|
| 56 |
DESCRIPTION="A standards-compliant graphical Web browser" |
| 57 |
HOMEPAGE="http://www.opera.com/" |
| 58 |
|
| 59 |
SLOT="0" |
| 60 |
LICENSE="OPERA-9.0" |
| 61 |
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" |
| 62 |
|
| 63 |
RESTRICT="strip test" |
| 64 |
|
| 65 |
IUSE="elibc_FreeBSD gnome ia32 qt-static spell" |
| 66 |
MY_LINGUAS="be bg cs da de el en en-GB es-ES es-LA fi fr fr-CA fy hi |
| 67 |
hr hu it ja ka ko lt mk nb nl nn pl pt pt-BR ru sv tr zh-CN zh-TW" |
| 68 |
|
| 69 |
for MY_LINGUA in ${MY_LINGUAS}; do |
| 70 |
IUSE="${IUSE} linguas_${MY_LINGUA/-/_}" |
| 71 |
done |
| 72 |
|
| 73 |
O_URI="mirror://opera/" |
| 74 |
O_FTP="/950/final/en/" |
| 75 |
O_SUFF="2042" |
| 76 |
|
| 77 |
SRC_URI=" |
| 78 |
amd64? ( |
| 79 |
ia32? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 ) |
| 80 |
!ia32? ( ${O_URI}linux${O_FTP}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 ) |
| 81 |
) |
| 82 |
ppc? ( ${O_URI}linux${O_FTP}ppc/shared/${P}.gcc4-shared-qt3.ppc.tar.bz2 ) |
| 83 |
x86-fbsd? ( ${O_URI}unix/freebsd${O_FTP}shared/${P}-freebsd5-shared-qt3.i386.tar.bz2 ) |
| 84 |
qt-static? ( |
| 85 |
x86? ( ${O_URI}linux${O_FTP}i386/${P}.gcc4-qt4.i386.tar.bz2 ) |
| 86 |
) |
| 87 |
!qt-static? ( |
| 88 |
x86? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 ) |
| 89 |
) |
| 90 |
" |
| 91 |
|
| 92 |
DEPEND=">=sys-apps/sed-4" |
| 93 |
|
| 94 |
RDEPEND="media-libs/libexif |
| 95 |
media-libs/jpeg |
| 96 |
>=media-libs/fontconfig-2.1.94-r1 |
| 97 |
x11-libs/libXrandr |
| 98 |
x11-libs/libXp |
| 99 |
x11-libs/libXmu |
| 100 |
x11-libs/libXi |
| 101 |
x11-libs/libXft |
| 102 |
x11-libs/libXext |
| 103 |
x11-libs/libXcursor |
| 104 |
x11-libs/libX11 |
| 105 |
x11-libs/libSM |
| 106 |
x11-libs/libICE |
| 107 |
!qt-static? ( =x11-libs/qt-3* ) |
| 108 |
amd64? ( =x11-libs/qt-3* ) |
| 109 |
ppc? ( =x11-libs/qt-3* ) |
| 110 |
spell? ( app-text/aspell ) |
| 111 |
x86-fbsd? ( =x11-libs/qt-3* =virtual/libstdc++-3* )" |
| 112 |
|
| 113 |
pkg_setup() { |
| 114 |
if use amd64; then |
| 115 |
if use ia32; then |
| 116 |
S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.x86_64" |
| 117 |
else |
| 118 |
S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.i386" |
| 119 |
fi |
| 120 |
fi |
| 121 |
use ppc && S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.ppc" |
| 122 |
use x86-fbsd && S="${WORKDIR}/${P}-${O_SUFF}-freebsd5-shared-qt3.i386" |
| 123 |
if use x86; then |
| 124 |
if use qt-static; then |
| 125 |
S="${WORKDIR}/${P}-${O_SUFF}.gcc4-qt4.i386" |
| 126 |
else |
| 127 |
S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.i386" |
| 128 |
fi |
| 129 |
fi |
| 130 |
} |
| 131 |
|
| 132 |
src_unpack() { |
| 133 |
unpack ${A} |
| 134 |
cd "${S}" |
| 135 |
|
| 136 |
epatch "${FILESDIR}/${PN}-9.00-install.patch" |
| 137 |
|
| 138 |
# bug #181300: |
| 139 |
use elibc_FreeBSD || epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch" |
| 140 |
use elibc_FreeBSD && epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.patch" |
| 141 |
|
| 142 |
sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \ |
| 143 |
-e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \ |
| 144 |
-e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \ |
| 145 |
-e "s:/usr/share/icons:${D}/usr/share/icons:g" \ |
| 146 |
-e "s:/etc/X11:${D}/etc/X11:g" \ |
| 147 |
-e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \ |
| 148 |
-e "s:/opt/gnome/share:${D}/opt/gnome/share:g" \ |
| 149 |
-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \ |
| 150 |
-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \ |
| 151 |
-e 's:read str_answer:return 0:' \ |
| 152 |
-e "s:/opt/kde:${D}/usr/kde:" \ |
| 153 |
-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \ |
| 154 |
install.sh || die "sed failed" |
| 155 |
|
| 156 |
} |
| 157 |
|
| 158 |
src_compile() { |
| 159 |
# This workaround is sadly needed because gnome2.eclass doesn't check |
| 160 |
# whether a configure script or Makefile exists. |
| 161 |
true |
| 162 |
} |
| 163 |
|
| 164 |
src_install() { |
| 165 |
# Prepare installation directories for Opera's installer script. |
| 166 |
dodir /etc |
| 167 |
|
| 168 |
# Opera's native installer. |
| 169 |
./install.sh --prefix="${D}"/opt/opera || die "install.sh failed" |
| 170 |
|
| 171 |
einfo "It is safe to ignore warnings about failed checksums" |
| 172 |
einfo "and about files that would be ignored ..." |
| 173 |
einfo "Completing the installation where install.sh abandoned us ..." |
| 174 |
|
| 175 |
# java workaround |
| 176 |
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 |
| 177 |
|
| 178 |
dosed /opt/opera/bin/opera |
| 179 |
dosed /opt/opera/share/opera/java/opera.policy |
| 180 |
|
| 181 |
# Install the icons |
| 182 |
insinto /usr/share/pixmaps |
| 183 |
doins usr/share/pixmaps/opera.xpm |
| 184 |
|
| 185 |
local res |
| 186 |
for res in 16x16 22x22 32x32 48x48 ; do |
| 187 |
insinto /usr/share/icons/hicolor/${res}/apps |
| 188 |
doins usr/share/icons/hicolor/${res}/apps/opera.png |
| 189 |
done |
| 190 |
|
| 191 |
# Install the menu entry |
| 192 |
make_desktop_entry opera Opera /usr/share/pixmaps/opera.xpm 'Network;WebBrowser;Email;FileTransfer;IRCClient' |
| 193 |
|
| 194 |
# Install a symlink /usr/bin/opera |
| 195 |
dodir /usr/bin |
| 196 |
dosym /opt/opera/bin/opera /usr/bin/opera |
| 197 |
|
| 198 |
# fix plugin path |
| 199 |
echo "Plugin Path=/opt/opera/lib/opera/plugins" >> "${D}"/etc/opera6rc |
| 200 |
|
| 201 |
# enable spellcheck |
| 202 |
if use spell; then |
| 203 |
if use qt-static; then |
| 204 |
DIR=${P}.1 |
| 205 |
else |
| 206 |
use sparc && DIR=${P}.2 || DIR=${P}.5 |
| 207 |
fi |
| 208 |
echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> "${D}"/opt/opera/share/opera/ini/spellcheck.ini |
| 209 |
fi |
| 210 |
|
| 211 |
dodir /etc/revdep-rebuild |
| 212 |
echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > "${D}"/etc/revdep-rebuild/90opera |
| 213 |
|
| 214 |
# Change libz.so.3 to libz.so.1 for gentoo/freebsd |
| 215 |
if use elibc_FreeBSD; then |
| 216 |
scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${PN}/ | \ |
| 217 |
while read i; do |
| 218 |
if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]]; |
| 219 |
then |
| 220 |
export SANITY_CHECK_LIBZ_FAILED=1 |
| 221 |
break |
| 222 |
fi |
| 223 |
sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i" |
| 224 |
done |
| 225 |
[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1" |
| 226 |
fi |
| 227 |
|
| 228 |
# Add the Opera man dir to MANPATH: |
| 229 |
insinto /etc/env.d |
| 230 |
echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera |
| 231 |
|
| 232 |
# Remove unwanted LINGUAS: |
| 233 |
local LINGUA |
| 234 |
local LNGDIR="${D}/opt/opera/share/opera/locale" |
| 235 |
einfo "Keeping these locales: ${LINGUAS}." |
| 236 |
for LINGUA in ${MY_LINGUAS}; do |
| 237 |
if ! use linguas_${LINGUA/-/_}; then |
| 238 |
LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-}) |
| 239 |
rm -r "${LINGUA}" |
| 240 |
fi |
| 241 |
done |
| 242 |
} |
| 243 |
|
| 244 |
pkg_postinst() { |
| 245 |
use gnome && gnome2_pkg_postinst |
| 246 |
|
| 247 |
elog "To change the UI language, choose [Tools] -> [Preferences], open the" |
| 248 |
elog "[General] tab, click on [Details...] then [Choose...] and point the" |
| 249 |
elog "file chooser at /opt/opera/share/opera/locale/, then enter the" |
| 250 |
elog "directory for the language you want and [Open] the .lng file." |
| 251 |
elog |
| 252 |
elog "To use the spellchecker (USE=spell) for non-English simply do" |
| 253 |
elog "$ emerge app-dicts/aspell-[your language]." |
| 254 |
|
| 255 |
if use elibc_FreeBSD; then |
| 256 |
elog |
| 257 |
elog "To improve shared memory usage please set:" |
| 258 |
elog "$ sysctl kern.ipc.shm_allow_removed=1" |
| 259 |
fi |
| 260 |
|
| 261 |
elog "The Opera betas may still have issues with plugins, notably" |
| 262 |
elog "net-www/netscape-flash. See also https://bugs.gentoo.org/198162" |
| 263 |
} |
| 264 |
|
| 265 |
pkg_postrm() { |
| 266 |
use gnome && gnome2_pkg_postrm |
| 267 |
} |
| 268 |
|
| 269 |
|
| 270 |
|
| 271 |
-- |
| 272 |
gentoo-commits@l.g.o mailing list |
Archives