summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2011-04-29 14:33:13 +0000
committerLars Wendler <polynomial-c@gentoo.org>2011-04-29 14:33:13 +0000
commit2816cb5e35d95687d828ce2f49917639d730ca5c (patch)
tree562d841307fadbb5cb5bc7cbb499fc4d1ac4132e /www-client/firefox-bin
parentx86 stable per bug 365125 (diff)
downloadgentoo-2-2816cb5e35d95687d828ce2f49917639d730ca5c.tar.gz
gentoo-2-2816cb5e35d95687d828ce2f49917639d730ca5c.tar.bz2
gentoo-2-2816cb5e35d95687d828ce2f49917639d730ca5c.zip
Version bump. Removed old
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'www-client/firefox-bin')
-rw-r--r--www-client/firefox-bin/ChangeLog8
-rw-r--r--www-client/firefox-bin/firefox-bin-3.6.17.ebuild (renamed from www-client/firefox-bin/firefox-bin-3.6.15.ebuild)14
2 files changed, 18 insertions, 4 deletions
diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index 58187e8c8c23..5dec9002f0fd 100644
--- a/www-client/firefox-bin/ChangeLog
+++ b/www-client/firefox-bin/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/firefox-bin
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.54 2011/04/27 16:18:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.55 2011/04/29 14:33:13 polynomial-c Exp $
+
+*firefox-bin-3.6.17 (29 Apr 2011)
+
+ 29 Apr 2011; Lars Wendler <polynomial-c@gentoo.org>
+ -firefox-bin-3.6.15.ebuild, +firefox-bin-3.6.17.ebuild:
+ Version bump. Removed old.
27 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
files/firefox-bin.desktop:
diff --git a/www-client/firefox-bin/firefox-bin-3.6.15.ebuild b/www-client/firefox-bin/firefox-bin-3.6.17.ebuild
index b249dd859485..e83d20e36ab8 100644
--- a/www-client/firefox-bin/firefox-bin-3.6.15.ebuild
+++ b/www-client/firefox-bin/firefox-bin-3.6.17.ebuild
@@ -1,6 +1,7 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.15.ebuild,v 1.4 2011/03/27 13:07:33 nirbheek Exp $
+# $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 $
+
EAPI="2"
inherit eutils mozilla-launcher multilib mozextension
@@ -19,11 +20,12 @@ MY_P="${MY_PN}-${MY_PV}"
DESCRIPTION="Firefox Web Browser"
REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
-SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2"
+SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2
+ mirror://gentoo/libnotify.so.1.bz2"
HOMEPAGE="http://www.mozilla.com/firefox"
RESTRICT="strip mirror"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
SLOT="0"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
IUSE="startup-notification"
@@ -92,6 +94,7 @@ linguas() {
src_unpack() {
unpack ${MY_P}.tar.bz2
+ unpack libnotify.so.1.bz2
linguas
for X in ${linguas}; do
@@ -160,6 +163,11 @@ fi
rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins
dosym /usr/"$(get_libdir)"/nsbrowser/plugins ${MOZILLA_FIVE_HOME}/plugins || die
+
+ # This is a copy of 32bit libnotify.so.1 from app-emulation/emul-linux-x86-gtklibs-20110129.
+ # http://bugs.gentoo.org/show_bug.cgi?id=360443.
+ exeinto /opt/firefox
+ doexe "${WORKDIR}"/libnotify.so.1 || die
}
pkg_postinst() {