From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 174EE1387CA for ; Wed, 15 Oct 2014 13:43:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04C44E099B; Wed, 15 Oct 2014 13:43:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81E72E099B for ; Wed, 15 Oct 2014 13:43:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2EE2034043E for ; Wed, 15 Oct 2014 13:43:04 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 2305) id E69237ED7; Wed, 15 Oct 2014 13:43:02 +0000 (UTC) From: "Ian Stakenvicius (axs)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, axs@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in www-client/firefox-bin: firefox-bin-31.2.0.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: firefox-bin-31.2.0.ebuild ChangeLog X-VCS-Directories: www-client/firefox-bin X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20141015134302.E69237ED7@oystercatcher.gentoo.org> Date: Wed, 15 Oct 2014 13:43:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9bee4770-e049-425d-9f98-0ae3b90906aa X-Archives-Hash: d98d8a4c5bac512fb892cd9f403b8c87 axs 14/10/15 13:43:02 Modified: ChangeLog Added: firefox-bin-31.2.0.ebuild Log: version bumped 31.x ESR (restoring a 31.x version to the tree, bug 525486), security bug 525474 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED) Revision Changes Path 1.208 www-client/firefox-bin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?rev=1.208&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?rev=1.208&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?r1=1.207&r2=1.208 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- ChangeLog 14 Oct 2014 16:15:31 -0000 1.207 +++ ChangeLog 15 Oct 2014 13:43:02 -0000 1.208 @@ -1,6 +1,13 @@ # ChangeLog for www-client/firefox-bin # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.207 2014/10/14 16:15:31 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.208 2014/10/15 13:43:02 axs Exp $ + +*firefox-bin-31.2.0 (15 Oct 2014) + + 15 Oct 2014; Ian Stakenvicius (_AxS_) + +firefox-bin-31.2.0.ebuild: + version bumped 31.x ESR (restoring a 31.x version to the tree, bug 525486), + security bug 525474 *firefox-bin-33.0 (14 Oct 2014) 1.1 www-client/firefox-bin/firefox-bin-31.2.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-31.2.0.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-31.2.0.ebuild?rev=1.1&content-type=text/plain Index: firefox-bin-31.2.0.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-31.2.0.ebuild,v 1.1 2014/10/15 13:43:02 axs Exp $ EAPI="5" MOZ_ESR="1" # Can be updated using scripts/get_langs.sh from mozilla overlay MOZ_LANGS=(af ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lt lv mai mk ml mr nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te tr uk vi zh-CN zh-TW zu) # Convert the ebuild version to the upstream mozilla version, used by mozlinguas MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI MOZ_PN="${PN/-bin}" if [[ ${MOZ_ESR} == 1 ]]; then # ESR releases have slightly version numbers MOZ_PV="${MOZ_PV}esr" fi MOZ_P="${MOZ_PN}-${MOZ_PV}" # Upstream ftp release URI that's used by mozlinguas.eclass # We don't use the http mirror because it deletes old tarballs. MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/" inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins DESCRIPTION="Firefox Web Browser" MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases" SRC_URI="${SRC_URI} amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 ) x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )" HOMEPAGE="http://www.mozilla.com/firefox" RESTRICT="strip mirror" KEYWORDS="-* ~amd64 ~x86" SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="selinux startup-notification" DEPEND="app-arch/unzip selinux? ( sec-policy/selinux-mozilla )" RDEPEND="dev-libs/dbus-glib virtual/freedesktop-icon-theme x11-libs/libXrender x11-libs/libXt x11-libs/libXmu selinux? ( sec-policy/selinux-mozilla ) >=x11-libs/gtk+-2.2:2 >=media-libs/alsa-lib-1.0.16 " QA_PREBUILT=" opt/${MOZ_PN}/*.so opt/${MOZ_PN}/${MOZ_PN} opt/${MOZ_PN}/${PN} opt/${MOZ_PN}/crashreporter opt/${MOZ_PN}/webapprt-stub opt/${MOZ_PN}/plugin-container opt/${MOZ_PN}/mozilla-xremote-client opt/${MOZ_PN}/updater " S="${WORKDIR}/${MOZ_PN}" src_unpack() { unpack ${A} # Unpack language packs mozlinguas_src_unpack } src_install() { declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN} local size sizes icon_path icon name sizes="16 32 48" icon_path="${S}/browser/chrome/icons/default" icon="${PN}" name="Mozilla Firefox" # Install icons and .desktop for menu entry for size in ${sizes}; do insinto "/usr/share/icons/hicolor/${size}x${size}/apps" newins "${icon_path}/default${size}.png" "${icon}.png" || die done # The 128x128 icon has a different name insinto "/usr/share/icons/hicolor/128x128/apps" newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png domenu "${FILESDIR}"/${PN}.desktop sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \ "${ED}/usr/share/applications/${PN}.desktop" || die # Add StartupNotify=true bug 237317 if use startup-notification; then echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop fi # Install firefox in /opt dodir ${MOZILLA_FIVE_HOME%/*} mv "${S}" "${D}"${MOZILLA_FIVE_HOME} || die # Fix prefs that make no sense for a system-wide install insinto ${MOZILLA_FIVE_HOME}/defaults/pref/ doins "${FILESDIR}"/local-settings.js # Copy preferences file so we can do a simple rename. cp "${FILESDIR}"/all-gentoo-1.js "${D}"${MOZILLA_FIVE_HOME}/all-gentoo.js # Install language packs mozlinguas_src_install local LANG=${linguas%% *} if [[ -n ${LANG} && ${LANG} != "en" ]]; then elog "Setting default locale to ${LANG}" echo "pref(\"general.useragent.locale\", \"${LANG}\");" \ >> "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \ die "sed failed to change locale" fi # Create /usr/bin/firefox-bin dodir /usr/bin/ cat <<-EOF >"${D}"/usr/bin/${PN} #!/bin/sh unset LD_PRELOAD LD_LIBRARY_PATH="/opt/firefox/" GTK_PATH=/usr/lib/gtk-2.0/ exec /opt/${MOZ_PN}/${MOZ_PN} "\$@" EOF fperms 0755 /usr/bin/${PN} # revdep-rebuild entry insinto /etc/revdep-rebuild echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN} doins "${T}"/10${PN} || die # Plugins dir share_plugins_dir # Required in order to use plugins and even run firefox on hardened. pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container} } pkg_preinst() { gnome2_icon_savelist } pkg_postinst() { if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \ || ! has_version 'net-misc/curl'; then einfo einfo "For using the crashreporter, you need gnome-base/gconf," einfo "gnome-base/orbit and net-misc/curl emerged." einfo fi # Drop requirement of curl not built with nss as it's not necessary anymore #if has_version 'net-misc/curl[nss]'; then # einfo # einfo "Crashreporter won't be able to send reports" # einfo "if you have curl emerged with the nss USE-flag" # einfo #fi # Update mimedb for the new .desktop file fdo-mime_desktop_database_update gnome2_icon_cache_update } pkg_postrm() { gnome2_icon_cache_update }