Bump patchset for g/fbsd wrt bug 169825

Package-Manager: portage-2.1.2.2

4 files changed, 31 insertions, 22 deletions

diff --git a/app-office/mozilla-sunbird/ChangeLog b/app-office/mozilla-sunbird/ChangeLog
index d6e82d8ff88a..6cd3827e907b 100644
--- a/app-office/mozilla-sunbird/ChangeLog
+++ b/app-office/mozilla-sunbird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/mozilla-sunbird
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/ChangeLog,v 1.6 2007/03/07 13:36:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/ChangeLog,v 1.7 2007/03/08 21:56:45 armin76 Exp $
+
+  08 Mar 2007; Raúl Porcel <armin76@gentoo.org>
+  mozilla-sunbird-0.3.1.ebuild:
+  Bump patchset for g/fbsd wrt bug 169825
 
   07 Mar 2007; Raúl Porcel <armin76@gentoo.org>
   -files/mozilla-sunbird-0.3-add-missing-LDFLAGS.patch,
diff --git a/app-office/mozilla-sunbird/Manifest b/app-office/mozilla-sunbird/Manifest
index f46d76630cce..91fa89b0f7d9 100644
--- a/app-office/mozilla-sunbird/Manifest
+++ b/app-office/mozilla-sunbird/Manifest
@@ -14,7 +14,7 @@ AUX icon/mozilla-sunbird.desktop 185 RMD160 1801880f5b591989f2f3969f130fcda2b484
 MD5 f3fedf0b7ee7f9f1676f61f99697fbcc files/icon/mozilla-sunbird.desktop 185
 RMD160 1801880f5b591989f2f3969f130fcda2b484a9a7 files/icon/mozilla-sunbird.desktop 185
 SHA256 976d28d8faa05ab43636a0188e9b7bdf00c91f1542ec62e12dd86bc3bf3c6133 files/icon/mozilla-sunbird.desktop 185
-DIST mozilla-sunbird-0.3.1-patches-0.1.tar.bz2 7278 RMD160 9581a3e0e5c4046b66c3c55b9ac0e6450236cc17 SHA1 8cfe1847fb2e102e9cbb7898788641ae96860c43 SHA256 17db0a41a69f27314863224ced2ddaf969b25ec8fb1655a1658322cf7c8dcfc2
+DIST mozilla-sunbird-0.3.1-patches-0.2.tar.bz2 7794 RMD160 230616837cf7b5dcddc5db45a9fda522bfb7f0ad SHA1 9e3fa6168d8c7f6e9dc2fc5d83eea0179ec3c9d7 SHA256 ef19f1a5ee87c3982f6a3463acde7e55e4327ca421a02c1520053ba543739c16
 DIST sunbird-0.3.1.ca.langpack.xpi 97999 RMD160 6fd1af114e4f07931e6e32d43bc7a9bc330e8ee1 SHA1 aa35b5eb3d907243e55641b984d44e349135b765 SHA256 b84be9cb13e964b5dc1da857df19c78b946f4b4e4b4f8967527582873b9857ae
 DIST sunbird-0.3.1.cs.langpack.xpi 98057 RMD160 e4b31720187548342031f3e29bca0c7b1e7106a8 SHA1 fddd89ddf6bd0611d59c9d70184ca4e18d495612 SHA256 96e14ff8ddf254ddef8a997bb682a73d9d0de915dc928ce1e69600fe7d351676
 DIST sunbird-0.3.1.da.langpack.xpi 95991 RMD160 0d7f94a1ebb7dcd90c12bd3a6f2ade16a68b1cc9 SHA1 5df50a460b13ca33ec0a68cf0397dfd588dd95fa SHA256 ef39c0f14f05ab74e676282a8c3d4381d335daa9ee46a1950d97ad6c48879696
@@ -31,18 +31,18 @@ DIST sunbird-0.3.1.ru.langpack.xpi 106451 RMD160 9f572d0f0fbd9154d5546d2e7eff24a
 DIST sunbird-0.3.1.sk.langpack.xpi 102414 RMD160 fe54e5596d14164daeeb9f8fe89ee26ccedabbdb SHA1 9769e17981d49958021a5a6e5bda2fdbebc0efbb SHA256 19c66831cce0683c1025228f49f461252210fea566e3047c9cab3aa1ea59a01a
 DIST sunbird-0.3.1.sl.langpack.xpi 97817 RMD160 7c4fc023bb209bbc0aab1725bfe57f2a21a238bd SHA1 a2445d5b6f77247b8e946a5df7e53ada7c3301ee SHA256 bab139be5765516c3807f420b56154b6ccba8475eb152247e69e6bcdd13d52c4
 DIST sunbird-0.3.1.source.tar.bz2 44088609 RMD160 b2fe3d03ce20500641e18da07fafda031d7b882e SHA1 f8a397746f0e3abf15273de5232c447746a8d370 SHA256 4cf4eb5b26c5199af1332432264f82f920b1728bf150fd8172eec21ca073ff5b
-EBUILD mozilla-sunbird-0.3.1.ebuild 6121 RMD160 40576881582a0f5bd3f62e6264f1a4b0af888546 SHA1 2ef7b45b9514e7b9d78c85c99372c842d0afed8d SHA256 4c8713f633990caf34c75c4139858831c83d305107a16bc8c540aaa7dfe1cb04
-MD5 46457e4d68a2b63f56d3540a6e42f7b2 mozilla-sunbird-0.3.1.ebuild 6121
-RMD160 40576881582a0f5bd3f62e6264f1a4b0af888546 mozilla-sunbird-0.3.1.ebuild 6121
-SHA256 4c8713f633990caf34c75c4139858831c83d305107a16bc8c540aaa7dfe1cb04 mozilla-sunbird-0.3.1.ebuild 6121
-MISC ChangeLog 1398 RMD160 01058218db5a8a503e38d0ea4f5fdf2b84725c6b SHA1 0582dcbc6e144f047f948760bdf1ddaccccb14af SHA256 eefe3fc0fbfa2887941516403420d57ed8fa829e0802c76f783bcc792def4145
-MD5 750a01879a596fbde10b69f8a109f053 ChangeLog 1398
-RMD160 01058218db5a8a503e38d0ea4f5fdf2b84725c6b ChangeLog 1398
-SHA256 eefe3fc0fbfa2887941516403420d57ed8fa829e0802c76f783bcc792def4145 ChangeLog 1398
+EBUILD mozilla-sunbird-0.3.1.ebuild 6302 RMD160 ee8bee15927074da6655eadf0daf93e5fbd7c4a9 SHA1 122d84c01564a5bebc6aa5f4963d49b3c838ce89 SHA256 71e54b41f5fd0c6bc60b69a4ddab75722a87aa923a04defc6ffa2fc9da031417
+MD5 cd165099fc424a22aa92aabc238286b0 mozilla-sunbird-0.3.1.ebuild 6302
+RMD160 ee8bee15927074da6655eadf0daf93e5fbd7c4a9 mozilla-sunbird-0.3.1.ebuild 6302
+SHA256 71e54b41f5fd0c6bc60b69a4ddab75722a87aa923a04defc6ffa2fc9da031417 mozilla-sunbird-0.3.1.ebuild 6302
+MISC ChangeLog 1522 RMD160 81f5990c287514c5254f10d167a658dd089ddf6b SHA1 82d65ac3eae3d34ba1566546b271ae49b8c2879b SHA256 d5796b74bb1545df3045b28573c2d63e25e8f45d9b11df9b4bde9c30634c3e4d
+MD5 2368038659f702a837880baf84d1727b ChangeLog 1522
+RMD160 81f5990c287514c5254f10d167a658dd089ddf6b ChangeLog 1522
+SHA256 d5796b74bb1545df3045b28573c2d63e25e8f45d9b11df9b4bde9c30634c3e4d ChangeLog 1522
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata.xml 160
-MD5 7f88fc8361535a32c08a9cb6f3ae4913 files/digest-mozilla-sunbird-0.3.1 4571
-RMD160 d49549f1fd85da6e4e0ed091d0ebcce11250af29 files/digest-mozilla-sunbird-0.3.1 4571
-SHA256 635b6957ad11496c504a8a9d8066f7772564189e88bbe9c0b168eeb393592746 files/digest-mozilla-sunbird-0.3.1 4571
+MD5 e3ea6287b6802270b4acb3f5b301900f files/digest-mozilla-sunbird-0.3.1 4571
+RMD160 e0d62ee6d201114b40345fda5756e9f1bc03aa2a files/digest-mozilla-sunbird-0.3.1 4571
+SHA256 36e1015d1248bdc47da335d86cfbe4d13c217ca85c914badca27725220c9109e files/digest-mozilla-sunbird-0.3.1 4571
diff --git a/app-office/mozilla-sunbird/files/digest-mozilla-sunbird-0.3.1 b/app-office/mozilla-sunbird/files/digest-mozilla-sunbird-0.3.1
index 8f124cafd8c9..43e566807e69 100644
--- a/app-office/mozilla-sunbird/files/digest-mozilla-sunbird-0.3.1
+++ b/app-office/mozilla-sunbird/files/digest-mozilla-sunbird-0.3.1
@@ -1,6 +1,6 @@
-MD5 179b471c6c4b3291333ea3f9054a5abb mozilla-sunbird-0.3.1-patches-0.1.tar.bz2 7278
-RMD160 9581a3e0e5c4046b66c3c55b9ac0e6450236cc17 mozilla-sunbird-0.3.1-patches-0.1.tar.bz2 7278
-SHA256 17db0a41a69f27314863224ced2ddaf969b25ec8fb1655a1658322cf7c8dcfc2 mozilla-sunbird-0.3.1-patches-0.1.tar.bz2 7278
+MD5 94db864e0916092cdc9e2c30cfb62108 mozilla-sunbird-0.3.1-patches-0.2.tar.bz2 7794
+RMD160 230616837cf7b5dcddc5db45a9fda522bfb7f0ad mozilla-sunbird-0.3.1-patches-0.2.tar.bz2 7794
+SHA256 ef19f1a5ee87c3982f6a3463acde7e55e4327ca421a02c1520053ba543739c16 mozilla-sunbird-0.3.1-patches-0.2.tar.bz2 7794
 MD5 742c4b70cbef579fa99e0409156c0bb3 sunbird-0.3.1.ca.langpack.xpi 97999
 RMD160 6fd1af114e4f07931e6e32d43bc7a9bc330e8ee1 sunbird-0.3.1.ca.langpack.xpi 97999
 SHA256 b84be9cb13e964b5dc1da857df19c78b946f4b4e4b4f8967527582873b9857ae sunbird-0.3.1.ca.langpack.xpi 97999
diff --git a/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild b/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild
index f0d36c3f178c..9915f4970450 100644
--- a/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild
+++ b/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild,v 1.5 2007/03/07 13:36:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild,v 1.6 2007/03/08 21:56:45 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
 
-PATCH="${P}-patches-0.1"
+PATCH="${P}-patches-0.2"
 LANGS="ca cs da de es-ES eu fr hu it mn nl pl ru sk sl"
 
 MY_PN="${PN/mozilla-}"
@@ -29,10 +29,18 @@ SLOT="0"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 
 RDEPEND=">=www-client/mozilla-launcher-1.44
-	>=dev-libs/nss-3.10"
+	>=dev-libs/nss-3.11.3"
 
 S="${WORKDIR}/mozilla"
 
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export MOZ_CO_PROJECT=calendar
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+
+
 linguas() {
 	local LANG SLANG
 	for LANG in ${LINGUAS}; do
@@ -110,9 +118,6 @@ src_compile() {
 		mozconfig_annotate '' --enable-official-branding
 	fi
 
-	# Add build variables
-	mozconfig_build_opts
-
 	# Finalize and report settings
 	mozconfig_final