diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2007-03-02 17:54:53 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2007-03-02 17:54:53 +0000 |
| commit | 0662b6e55604ed6077ebfb2d801cfe550763a58f (patch) | |
| tree | 29a6f861679e9edaa65faac90467462c34b26235 /www-client | |
| parent | version bump; ebuild will add user 'vdr' to group 'lp' for full access to par... (diff) | |
| download | gentoo-2-0662b6e55604ed6077ebfb2d801cfe550763a58f.tar.gz gentoo-2-0662b6e55604ed6077ebfb2d801cfe550763a58f.tar.bz2 gentoo-2-0662b6e55604ed6077ebfb2d801cfe550763a58f.zip | |
Remove mozbranding and add bindist, enabling branding by default, bug 168409
(Portage version: 2.1.2-r13)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/mozilla-firefox/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog index 1e5c40ed9a63..7bebe0f7bb21 100644 --- a/www-client/mozilla-firefox/ChangeLog +++ b/www-client/mozilla-firefox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/mozilla-firefox # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.269 2007/02/28 23:07:18 yoswink Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.270 2007/03/02 17:54:53 armin76 Exp $ + + 02 Mar 2007; Raúl Porcel <armin76@gentoo.org> + mozilla-firefox-2.0.0.2.ebuild: + Remove mozbranding and add bindist, enabling branding by default, bug 168409 28 Feb 2007; Jose Luis Rivero <yoswink@gentoo.org> mozilla-firefox-2.0.0.2.ebuild: diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild index 8e34d94276f6..35794da3d93a 100644 --- a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild +++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild,v 1.12 2007/02/28 23:07:18 yoswink Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild,v 1.13 2007/03/02 17:54:53 armin76 Exp $ WANT_AUTOCONF="2.1" @@ -16,7 +16,7 @@ HOMEPAGE="http://www.mozilla.org/projects/firefox/" KEYWORDS="alpha amd64 ~arm hppa ~ia64 mips ppc ppc64 sparc x86" SLOT="0" LICENSE="MPL-1.1 GPL-2 LGPL-2.1" -IUSE="java mozdevelop mozbranding xforms restrict-javascript filepicker" +IUSE="java mozdevelop bindist xforms restrict-javascript filepicker" MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}" SRC_URI="${MOZ_URI}/source/firefox-${PV}-source.tar.bz2 @@ -82,7 +82,7 @@ pkg_setup(){ die "Cairo needs X" fi - if use mozbranding; then + if ! use bindist; then einfo "You are enabling official branding. You may not redistribute this build" einfo "to any users on your network or the internet. Doing so puts yourself into" einfo "a legal problem with mozilla foundation" @@ -134,7 +134,7 @@ src_compile() { echo "ac_cv_visibility_pragma=no" >> "${S}/.mozconfig" fi - if use mozbranding; then + if ! use bindist; then mozconfig_annotate '' --enable-official-branding fi @@ -221,7 +221,7 @@ src_install() { install_mozilla_launcher_stub firefox "${MOZILLA_FIVE_HOME}" # Install icon and .desktop for menu entry - if use mozbranding; then + if ! use bindist; then doicon "${FILESDIR}"/icon/firefox-icon.png newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \ mozilla-firefox-2.0.desktop |