--- mozilla-firefox-2.0_rc2.ebuild	2006-10-10 14:06:21.000000000 -0500
+++ mozilla-firefox-2.0_rc2-r1.ebuild	2006-10-14 09:54:47.258627000 -0500
@@ -16,7 +16,7 @@
 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 @@
 	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 @@
 	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.
@@ -134,9 +145,6 @@
 	gcc-specs-ssp && append-flags -fno-stack-protector-all
 	filter-flags -fstack-protector -fstack-protector-all
 
-	# Don't know a reason for that so commented out /peper
-	#append-flags -freorder-blocks -fno-reorder-functions
-
 	#  Configure and build
 
 	CPPFLAGS="${CPPFLAGS} -DGENTOO_NSPLUGINS_DIR=\\\"/usr/$(get_libdir)/nsplugins\\\""