summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Østergaard <kloeri@gentoo.org>2006-10-15 16:20:31 +0000
committerBryan Østergaard <kloeri@gentoo.org>2006-10-15 16:20:31 +0000
commit857ab1a3a40e456586b79761d6b9dc8ab0b3609d (patch)
tree4be68bbe553f569ec95a2dd436a59366ee34926e /www-client
parentRemoved unused patch. (diff)
downloadgentoo-2-857ab1a3a40e456586b79761d6b9dc8ab0b3609d.tar.gz
gentoo-2-857ab1a3a40e456586b79761d6b9dc8ab0b3609d.tar.bz2
gentoo-2-857ab1a3a40e456586b79761d6b9dc8ab0b3609d.zip
Add branding USE flag.
(Portage version: 2.1.2_pre3-r1)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/mozilla-firefox/ChangeLog6
-rw-r--r--www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild17
2 files changed, 19 insertions, 4 deletions
diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index b06b34497d82..3268c815324e 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/mozilla-firefox
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.193 2006/10/09 09:52:40 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.194 2006/10/15 16:20:31 kloeri Exp $
+
+ 15 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
+ mozilla-firefox-2.0_rc2.ebuild:
+ Add branding USE flag.
09 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
mozilla-firefox-2.0_rc2.ebuild:
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild
index 2579d275cf4b..1849ec0dff9b 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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_rc2.ebuild,v 1.5 2006/10/14 14:47:37 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild,v 1.6 2006/10/15 16:20:31 kloeri Exp $
inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.mozilla.org/projects/firefox/"
KEYWORDS="~alpha ~amd64 ~sparc ~x86"
SLOT="0"
LICENSE="MPL-1.1 NPL-1.1"
-IUSE="java mozdevelop"
+IUSE="java mozdevelop branding"
MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}"
SRC_URI="${MOZ_URI}/source/firefox-${MY_PV}-source.tar.bz2
@@ -74,6 +74,14 @@ linguas() {
einfo "Selected language packs (first will be default): $linguas"
}
+pkg_setup(){
+ if use branding; 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"
+ fi
+}
+
src_unpack() {
unpack ${A%bz2*}bz2
@@ -112,7 +120,10 @@ src_compile() {
mozconfig_annotate '' --enable-canvas
mozconfig_annotate '' --with-system-nspr
mozconfig_annotate '' --with-system-nss
- mozconfig_annotate '' --enable-official-branding
+
+ if use branding; then
+ mozconfig_annotate '' --enable-official-branding
+ fi
# Bug 60668: Galeon doesn't build without oji enabled, so enable it
# regardless of java setting.