| 1 |
polynomial-c 11/04/29 14:33:13 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: firefox-bin-3.6.17.ebuild |
| 5 |
Removed: firefox-bin-3.6.15.ebuild |
| 6 |
Log: |
| 7 |
Version bump. Removed old |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.55 www-client/firefox-bin/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?rev=1.55&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?rev=1.55&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?r1=1.54&r2=1.55 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v |
| 21 |
retrieving revision 1.54 |
| 22 |
retrieving revision 1.55 |
| 23 |
diff -u -r1.54 -r1.55 |
| 24 |
--- ChangeLog 27 Apr 2011 16:18:24 -0000 1.54 |
| 25 |
+++ ChangeLog 29 Apr 2011 14:33:13 -0000 1.55 |
| 26 |
@@ -1,6 +1,12 @@ |
| 27 |
# ChangeLog for www-client/firefox-bin |
| 28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.54 2011/04/27 16:18:24 ssuominen Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.55 2011/04/29 14:33:13 polynomial-c Exp $ |
| 31 |
+ |
| 32 |
+*firefox-bin-3.6.17 (29 Apr 2011) |
| 33 |
+ |
| 34 |
+ 29 Apr 2011; Lars Wendler <polynomial-c@g.o> |
| 35 |
+ -firefox-bin-3.6.15.ebuild, +firefox-bin-3.6.17.ebuild: |
| 36 |
+ Version bump. Removed old. |
| 37 |
|
| 38 |
27 Apr 2011; Samuli Suominen <ssuominen@g.o> |
| 39 |
files/firefox-bin.desktop: |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 www-client/firefox-bin/firefox-bin-3.6.17.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.17.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.17.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: firefox-bin-3.6.17.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2011 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.17.ebuild,v 1.1 2011/04/29 14:33:13 polynomial-c Exp $ |
| 53 |
|
| 54 |
EAPI="2" |
| 55 |
|
| 56 |
inherit eutils mozilla-launcher multilib mozextension |
| 57 |
|
| 58 |
# Can be updated using scripts/get_langs.sh from mozilla overlay |
| 59 |
# '\' at EOL is needed for ${LANG} matching in linguas() below |
| 60 |
LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR \ |
| 61 |
es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it \ |
| 62 |
ja ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm \ |
| 63 |
ro ru si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW" |
| 64 |
NOSHORTLANGS="en-GB es-AR pt-BR zh-CN" |
| 65 |
|
| 66 |
MY_PV="${PV/_rc/rc}" |
| 67 |
MY_PN="${PN/-bin}" |
| 68 |
MY_P="${MY_PN}-${MY_PV}" |
| 69 |
|
| 70 |
DESCRIPTION="Firefox Web Browser" |
| 71 |
REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/" |
| 72 |
SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2 |
| 73 |
mirror://gentoo/libnotify.so.1.bz2" |
| 74 |
HOMEPAGE="http://www.mozilla.com/firefox" |
| 75 |
RESTRICT="strip mirror" |
| 76 |
|
| 77 |
KEYWORDS="-* ~amd64 ~x86" |
| 78 |
SLOT="0" |
| 79 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
| 80 |
IUSE="startup-notification" |
| 81 |
|
| 82 |
for X in ${LANGS} ; do |
| 83 |
if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then |
| 84 |
SRC_URI="${SRC_URI} |
| 85 |
linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )" |
| 86 |
fi |
| 87 |
IUSE="${IUSE} linguas_${X/-/_}" |
| 88 |
# english is handled internally |
| 89 |
if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then |
| 90 |
if [ "${X}" != "en-US" ]; then |
| 91 |
SRC_URI="${SRC_URI} |
| 92 |
linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )" |
| 93 |
fi |
| 94 |
IUSE="${IUSE} linguas_${X%%-*}" |
| 95 |
fi |
| 96 |
done |
| 97 |
|
| 98 |
DEPEND="app-arch/unzip" |
| 99 |
RDEPEND="dev-libs/dbus-glib |
| 100 |
x11-libs/libXrender |
| 101 |
x11-libs/libXt |
| 102 |
x11-libs/libXmu |
| 103 |
x86? ( |
| 104 |
>=x11-libs/gtk+-2.2:2 |
| 105 |
>=media-libs/alsa-lib-1.0.16 |
| 106 |
) |
| 107 |
amd64? ( |
| 108 |
>=app-emulation/emul-linux-x86-baselibs-20081109 |
| 109 |
>=app-emulation/emul-linux-x86-gtklibs-20081109 |
| 110 |
>=app-emulation/emul-linux-x86-soundlibs-20081109 |
| 111 |
)" |
| 112 |
|
| 113 |
S="${WORKDIR}/${MY_PN}" |
| 114 |
|
| 115 |
pkg_setup() { |
| 116 |
# This is a binary x86 package => ABI=x86 |
| 117 |
# Please keep this in future versions |
| 118 |
# Danny van Dyk <kugelfang@g.o> 2005/03/26 |
| 119 |
has_multilib_profile && ABI="x86" |
| 120 |
} |
| 121 |
|
| 122 |
linguas() { |
| 123 |
local LANG SLANG |
| 124 |
for LANG in ${LINGUAS}; do |
| 125 |
if has ${LANG} en en_US; then |
| 126 |
has en ${linguas} || linguas="${linguas:+"${linguas} "}en" |
| 127 |
continue |
| 128 |
elif has ${LANG} ${LANGS//-/_}; then |
| 129 |
has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" |
| 130 |
continue |
| 131 |
elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then |
| 132 |
for X in ${LANGS}; do |
| 133 |
if [[ "${X}" == "${LANG}-"* ]] && \ |
| 134 |
[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then |
| 135 |
has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" |
| 136 |
continue 2 |
| 137 |
fi |
| 138 |
done |
| 139 |
fi |
| 140 |
ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" |
| 141 |
done |
| 142 |
} |
| 143 |
|
| 144 |
src_unpack() { |
| 145 |
unpack ${MY_P}.tar.bz2 |
| 146 |
unpack libnotify.so.1.bz2 |
| 147 |
|
| 148 |
linguas |
| 149 |
for X in ${linguas}; do |
| 150 |
[[ ${X} != "en" ]] && xpi_unpack "${P/-bin/}-${X}.xpi" |
| 151 |
done |
| 152 |
if [[ ${linguas} != "" && ${linguas} != "en" ]]; then |
| 153 |
einfo "Selected language packs (first will be default): ${linguas}" |
| 154 |
fi |
| 155 |
} |
| 156 |
|
| 157 |
src_install() { |
| 158 |
declare MOZILLA_FIVE_HOME=/opt/${MY_PN} |
| 159 |
|
| 160 |
# Install icon and .desktop for menu entry |
| 161 |
newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png |
| 162 |
domenu "${FILESDIR}"/${PN}.desktop |
| 163 |
|
| 164 |
# Add StartupNotify=true bug 237317 |
| 165 |
if use startup-notification; then |
| 166 |
echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop |
| 167 |
fi |
| 168 |
|
| 169 |
# Install firefox in /opt |
| 170 |
dodir ${MOZILLA_FIVE_HOME%/*} |
| 171 |
mv "${S}" "${D}"${MOZILLA_FIVE_HOME} |
| 172 |
|
| 173 |
linguas |
| 174 |
for X in ${linguas}; do |
| 175 |
[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P/-bin/}-${X}" |
| 176 |
done |
| 177 |
|
| 178 |
local LANG=${linguas%% *} |
| 179 |
if [[ -n ${LANG} && ${LANG} != "en" ]]; then |
| 180 |
elog "Setting default locale to ${LANG}" |
| 181 |
sed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \ |
| 182 |
-i "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${MY_PN}.js \ |
| 183 |
-i "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${MY_PN}-l10n.js || \ |
| 184 |
die "sed failed to change locale" |
| 185 |
fi |
| 186 |
|
| 187 |
# Create /usr/bin/firefox-bin |
| 188 |
if use amd64 ; then |
| 189 |
dodir /usr/bin/ |
| 190 |
cat <<EOF >"${D}"/usr/bin/${PN} |
| 191 |
#!/bin/sh |
| 192 |
unset LD_PRELOAD |
| 193 |
LD_LIBRARY_PATH="/opt/firefox/" |
| 194 |
GTK_PATH=/usr/lib32/gtk-2.0/ |
| 195 |
exec /opt/${MY_PN}/${MY_PN} "\$@" |
| 196 |
EOF |
| 197 |
else |
| 198 |
dodir /usr/bin/ |
| 199 |
cat <<EOF >"${D}"/usr/bin/${PN} |
| 200 |
#!/bin/sh |
| 201 |
unset LD_PRELOAD |
| 202 |
LD_LIBRARY_PATH="/opt/firefox/" |
| 203 |
GTK_PATH=/usr/lib32/gtk-2.0/ |
| 204 |
exec /opt/${MY_PN}/${MY_PN} "\$@" |
| 205 |
EOF |
| 206 |
fi |
| 207 |
fperms 0755 /usr/bin/${PN} |
| 208 |
|
| 209 |
# revdep-rebuild entry |
| 210 |
insinto /etc/revdep-rebuild |
| 211 |
doins "${FILESDIR}"/10${PN} || die |
| 212 |
|
| 213 |
rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins |
| 214 |
dosym /usr/"$(get_libdir)"/nsbrowser/plugins ${MOZILLA_FIVE_HOME}/plugins || die |
| 215 |
|
| 216 |
# This is a copy of 32bit libnotify.so.1 from app-emulation/emul-linux-x86-gtklibs-20110129. |
| 217 |
# http://bugs.gentoo.org/show_bug.cgi?id=360443. |
| 218 |
exeinto /opt/firefox |
| 219 |
doexe "${WORKDIR}"/libnotify.so.1 || die |
| 220 |
} |
| 221 |
|
| 222 |
pkg_postinst() { |
| 223 |
if use x86; then |
| 224 |
if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \ |
| 225 |
|| ! has_version 'net-misc/curl'; then |
| 226 |
einfo |
| 227 |
einfo "For using the crashreporter, you need gnome-base/gconf," |
| 228 |
einfo "gnome-base/orbit and net-misc/curl emerged." |
| 229 |
einfo |
| 230 |
fi |
| 231 |
if has_version 'net-misc/curl[nss]'; then |
| 232 |
einfo |
| 233 |
einfo "Crashreporter won't be able to send reports" |
| 234 |
einfo "if you have curl emerged with the nss USE-flag" |
| 235 |
einfo |
| 236 |
fi |
| 237 |
else |
| 238 |
einfo |
| 239 |
einfo "NB: You just installed a 32-bit ${MY_P}" |
| 240 |
einfo |
| 241 |
einfo "Crashreporter won't work on amd64" |
| 242 |
einfo |
| 243 |
fi |
| 244 |
} |
| 245 |
|
| 246 |
pkg_postrm() { |
| 247 |
update_mozilla_launcher_symlinks |
| 248 |
} |
Archives