Move branding USE-flag to mozbranding, bug 157335

Package-Manager: portage-2.1.2-r5

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 1a56ed37855de4559ed128608fc7385a1a6b7061..21db3333f0468f40271c70ce74ca90522ee43268 100644 (file)
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.165 2007/01/11 15:44:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.166 2007/01/30 22:40:23 armin76 Exp $
+
+  30 Jan 2007; Raúl Porcel <armin76@gentoo.org>
+  mozilla-thunderbird-2.0_beta1.ebuild:
+  Move branding USE-flag to mozbranding, bug 157335
 
   11 Jan 2007; Raúl Porcel <armin76@gentoo.org>
   mozilla-thunderbird-1.5.0.8.ebuild, mozilla-thunderbird-1.5.0.9.ebuild,

diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 1bff0d7e5c3e3282deccc325c3057d6c053d83ee..02b70320c0ea5fbcc217aba4d74e066029d1f5f5 100644 (file)
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -83,14 +83,14 @@ EBUILD mozilla-thunderbird-1.5.0.9.ebuild 8054 RMD160 9348f129c20ce20e3d122ff55a
 MD5 28a2105e6016aa3965cf45e3c89960d1 mozilla-thunderbird-1.5.0.9.ebuild 8054
 RMD160 9348f129c20ce20e3d122ff55ae38324ed650617 mozilla-thunderbird-1.5.0.9.ebuild 8054
 SHA256 42cdd94e8b3c1a034692493a8019836865a247139ad701d9aaa7f8930ef4f130 mozilla-thunderbird-1.5.0.9.ebuild 8054
-EBUILD mozilla-thunderbird-2.0_beta1.ebuild 7895 RMD160 0fb5bcd159634f297f6bbef5ebef56657a7dcb1e SHA1 be958b0f7273458a3d01e2cdd22a0f3ba9bdaac9 SHA256 a74a6a2a5b08e88e36ecfc6e3c3f9a85d560e7982fff7ccd9fc49652459b189d
-MD5 652f53c1b97c38b71b48659a8c1677ec mozilla-thunderbird-2.0_beta1.ebuild 7895
-RMD160 0fb5bcd159634f297f6bbef5ebef56657a7dcb1e mozilla-thunderbird-2.0_beta1.ebuild 7895
-SHA256 a74a6a2a5b08e88e36ecfc6e3c3f9a85d560e7982fff7ccd9fc49652459b189d mozilla-thunderbird-2.0_beta1.ebuild 7895
-MISC ChangeLog 25981 RMD160 8af2828deeb2e326eedac4e6f7b63309b17e8fff SHA1 ef6db02a51b3ae46fc57f9d6cf005ad954057642 SHA256 292778fea12d4d7203a87200b19412f590c3238d50f6c25c9082ddf6a7ec2353
-MD5 4fd7875161467db42f058b56e462ef33 ChangeLog 25981
-RMD160 8af2828deeb2e326eedac4e6f7b63309b17e8fff ChangeLog 25981
-SHA256 292778fea12d4d7203a87200b19412f590c3238d50f6c25c9082ddf6a7ec2353 ChangeLog 25981
+EBUILD mozilla-thunderbird-2.0_beta1.ebuild 7901 RMD160 f4002999e757ed87e3aac29cd94e1c43ac6a21ac SHA1 023935e8a6a874f1ec51255587cb8f1833cee9de SHA256 94bac8aa7cd99c710008252417dc78a750a7d96b13eedf01c7df1ae12e1675e2
+MD5 fe0c17905f5e603761449945dbae1546 mozilla-thunderbird-2.0_beta1.ebuild 7901
+RMD160 f4002999e757ed87e3aac29cd94e1c43ac6a21ac mozilla-thunderbird-2.0_beta1.ebuild 7901
+SHA256 94bac8aa7cd99c710008252417dc78a750a7d96b13eedf01c7df1ae12e1675e2 mozilla-thunderbird-2.0_beta1.ebuild 7901
+MISC ChangeLog 26123 RMD160 209cc91dc1401148472ef01eca37f3544754a36b SHA1 7fa216d9ebf0ee5aa4433cf79beaac6a301362eb SHA256 c0b1c11f5191b9195e4a6f3b8e5399d58310a4662492317a03c0d8cb9b83efb4
+MD5 6f00105d5f15e51c7687ab7ca066a6e6 ChangeLog 26123
+RMD160 209cc91dc1401148472ef01eca37f3544754a36b ChangeLog 26123
+SHA256 c0b1c11f5191b9195e4a6f3b8e5399d58310a4662492317a03c0d8cb9b83efb4 ChangeLog 26123
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160

diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild
index fcf6ff48e4ac7254377c7e358c1b248f72d32358..d8fce4d29034220f406f032433a2d156e9cf6aad 100644 (file)
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.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/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild,v 1.4 2007/01/11 15:44:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild,v 1.5 2007/01/30 22:40:23 armin76 Exp $
 
 #
 # There are no linguas supported in alpha builds
@@ -24,7 +24,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/${MY_PV}-can
 KEYWORDS="~amd64 ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ldap crypt branding mozdom replytolist"
+IUSE="ldap crypt mozbranding mozdom replytolist"
 
 #for X in ${LANGS} ; do
 #      SRC_URI="${SRC_URI} linguas_${X/-/_}? ( mirror://gentoo/thunderbird-${X}-${PV}.xpi )"
@@ -137,7 +137,7 @@ src_compile() {
                mozconfig_annotate '' --enable-extensions=default
        fi
 
-       if use branding; then
+       if use mozbranding; then
                mozconfig_annotate '' --enable-official-branding
        fi