Remove mozbranding and add bindist, enabling branding by default, bug 168409

Package-Manager: portage-2.1.2-r13

3 files changed, 18 insertions, 24 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/Manifest b/www-client/mozilla-firefox/Manifest
index 0134789c08f1..13cd2d0a808c 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be1987451117820744ecc67fa411facdc653a12 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7
 MD5 6a7a2240dc5864e7f8ee444e34e84461 files/firefox.1 2538
 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 files/firefox.1 2538
@@ -299,14 +296,14 @@ EBUILD mozilla-firefox-2.0.0.1.ebuild 8880 RMD160 77d6fa2f47c693d090ac92dca6dd0e
 MD5 54b29b50efaa9bfc295ac8f1e63d849e mozilla-firefox-2.0.0.1.ebuild 8880
 RMD160 77d6fa2f47c693d090ac92dca6dd0e3ddbdae5d6 mozilla-firefox-2.0.0.1.ebuild 8880
 SHA256 dae02725d82f6b76c1ab0eb795a23e611697dd07e9d77be6eab98f7208905d01 mozilla-firefox-2.0.0.1.ebuild 8880
-EBUILD mozilla-firefox-2.0.0.2.ebuild 8903 RMD160 6b1b35c89a6abbeff96d65ad480e07af50b03b6b SHA1 4ea92c0b3bce9516689496139db14379ad4f8be3 SHA256 cb68ad4a6fc61a47ea563fc46a9b0ed6e467944a0fddb1c20f3c85269e385aea
-MD5 562518a1ec16ca396ff5f3a6940b206e mozilla-firefox-2.0.0.2.ebuild 8903
-RMD160 6b1b35c89a6abbeff96d65ad480e07af50b03b6b mozilla-firefox-2.0.0.2.ebuild 8903
-SHA256 cb68ad4a6fc61a47ea563fc46a9b0ed6e467944a0fddb1c20f3c85269e385aea mozilla-firefox-2.0.0.2.ebuild 8903
-MISC ChangeLog 63381 RMD160 9815ed6c898198dce80237be6ff8d46266a7e678 SHA1 05b86737a588b0396f03bb98989b68f2ef101137 SHA256 9c883375c0f35ae8e6eff1939debb8edfcd440218cbd615e063b9e12c4ffea95
-MD5 fa3ffa53ccf682e7a7a5fdcde70c9afc ChangeLog 63381
-RMD160 9815ed6c898198dce80237be6ff8d46266a7e678 ChangeLog 63381
-SHA256 9c883375c0f35ae8e6eff1939debb8edfcd440218cbd615e063b9e12c4ffea95 ChangeLog 63381
+EBUILD mozilla-firefox-2.0.0.2.ebuild 8893 RMD160 75f2c469c30f2303219c5ef8e7f3eff59750e3df SHA1 0ce18c77f145ddc364687dbf95edab60899dd32c SHA256 e126d5d26f18d88ac2092919cacd268686c4237ef478a535d75492176f9e1ff6
+MD5 4f67bc9969c4d362d70a5c8dc0bdbeac mozilla-firefox-2.0.0.2.ebuild 8893
+RMD160 75f2c469c30f2303219c5ef8e7f3eff59750e3df mozilla-firefox-2.0.0.2.ebuild 8893
+SHA256 e126d5d26f18d88ac2092919cacd268686c4237ef478a535d75492176f9e1ff6 mozilla-firefox-2.0.0.2.ebuild 8893
+MISC ChangeLog 63544 RMD160 1454a572a961208abc111ac11c1b48ba36b4dbb4 SHA1 0faa2bd07190efaf26374196275ca43020ad0e5c SHA256 0c90da93322bbdeb05b724cc3eb5aa17712329b72719c8435ba3848c1da6ec66
+MD5 c308b9c0ad073ea187afef631f7a9981 ChangeLog 63544
+RMD160 1454a572a961208abc111ac11c1b48ba36b4dbb4 ChangeLog 63544
+SHA256 0c90da93322bbdeb05b724cc3eb5aa17712329b72719c8435ba3848c1da6ec66 ChangeLog 63544
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
@@ -338,10 +335,3 @@ SHA256 a198fdcc398feb415e06c32dce2eea69449ad8274a3d855ffd1942a5a4ad546a files/di
 MD5 919e2aceb2253736081288e09bd316b4 files/digest-mozilla-firefox-2.0.0.2 12092
 RMD160 16eb94638ef313187ee772f8c86b6f3c3ad38e85 files/digest-mozilla-firefox-2.0.0.2 12092
 SHA256 5f3818fcc0c996c3ae7d089474b3c6365f76bc9b6d371cb955f22f635ed07341 files/digest-mozilla-firefox-2.0.0.2 12092
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFF5ghQ3og80iZgVQgRAgEmAKCGMwAA1fcU444SPAlUzbb+OFNDvgCfTNyG
-mO+F62+oXJqtKDC02ph5ejE=
-=gf3C
------END PGP SIGNATURE-----
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