New version from anarchy.

Package-Manager: portage-2.1.2_pre3-r7

4 files changed, 271 insertions, 5 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 0deb58d8ca9f..fbb894cd2c8a 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.137 2006/10/10 21:49:27 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.138 2006/10/23 22:25:38 peper Exp $
+
+*mozilla-thunderbird-2.0_alpha1 (23 Oct 2006)
+
+  23 Oct 2006; Piotr Jaroszyński <peper@gentoo.org>
+  +mozilla-thunderbird-2.0_alpha1.ebuild:
+  New version from anarchy.
 
   10 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
   mozilla-thunderbird-1.5.0.7.ebuild:
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 755c83d4d25d..7766b3d9dccc 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -72,10 +72,12 @@ DIST mozilla-jslibmath-alpha.patch 625 RMD160 25215a45e8c97259666252dcfb3ad90c54
 DIST mozilla-thunderbird-1.5.0.4-patches-0.2.tar.bz2 30684 RMD160 82a4da8cf5dad04c1bedc9425d31f33a8eedf31f SHA1 2fa562bbd2ad69a56af57e02e85c2bc697c29ec6 SHA256 6f707b64a4e1ca1b36287f45f018cb70b6e04d7e0580cba7805b403ae1092f93
 DIST mozilla-thunderbird-1.5.0.5-patches-0.1.tar.bz2 30684 RMD160 82a4da8cf5dad04c1bedc9425d31f33a8eedf31f SHA1 2fa562bbd2ad69a56af57e02e85c2bc697c29ec6 SHA256 6f707b64a4e1ca1b36287f45f018cb70b6e04d7e0580cba7805b403ae1092f93
 DIST mozilla-thunderbird-1.5.0.7-patches-0.1.tar.bz2 30715 RMD160 a86a745963ad911da7c4e30eb9a673f1b657c5af SHA1 8e6f9fff11d06ee5f9f441527d466e6e1862263b SHA256 1f7af196a2342a27ebd37c1deed0ec6fb2e028d4b55faa9e3c5e761716b3352d
+DIST mozilla-thunderbird-2.0_alpha1-patches-1.0.tar.bz2 23402 RMD160 28aa536c70aacedafaf8a136e6b390ec08f08229 SHA1 5d718f217891983752418e2f1a7ba7b632fcdfde SHA256 a3d0fc16b8d0f87e8e34dc8849e6b481a4ee2b4635a22bec3a46ede9e7b1bb76
 DIST thunderbird-1.0.7-source.tar.bz2 33385665 RMD160 4f040dfe2468ee33d69ccffe3abc31eccc59899e SHA256 6b964fb220a46438adf6ec37082da66332a3ce74ca4913b863b17d9ab720681f
 DIST thunderbird-1.5.0.4-source.tar.bz2 35872600 RMD160 27e88578d8857e48b46ee4dff2900f27b8a0f447 SHA1 492dd76460fc14543a70349263b64b0a2803bee9 SHA256 b665c89bfc18a84c57d85370889973cfc547e1e942aba5798321ea34e4ddbca7
 DIST thunderbird-1.5.0.5-source.tar.bz2 35998778 RMD160 aa32d59efa7d55eb516d967c1fb4cc6cc13f874b SHA1 475ae30ead41847120c36f432b3359f0d60ea9da SHA256 b6fc27b79d0a4dabb30011cc6ba6161080f991ccadae12e5214cac86d009b005
 DIST thunderbird-1.5.0.7-source.tar.bz2 35994957 RMD160 b8948723e4a96e22409e6a2cb3cd1b6512bef189 SHA1 9e5acff9bd098979dd798c0111805dc8d67479ad SHA256 99f67c50a94af48bc738c19cda390561ec518b5fec4bc4f1f43e65337b645fc9
+DIST thunderbird-2.0a1-source.tar.bz2 36476408 RMD160 40e6552f5dd397ddbd37f07852d87346b1b25c45 SHA1 63c91d9fda28c283d53a9b146fbb92c622580b52 SHA256 f62eb7e40d76df3001f6a46e3ffee0c83fad75887fb87007cf3ecc251cb16078
 DIST thunderbird-bg-1.5.0.7.xpi 220540 RMD160 25e64e5772832917f28a6b685941c3834bb7ca44 SHA1 dd9098c8810a61dcf0755e327cec83f64de553c7 SHA256 349ba0d030793371d30327c15e939bcd92066311ac31a4f3f1cafa800422cc45
 DIST thunderbird-ca-1.5.0.7.xpi 183076 RMD160 952eadbb38b0d4ec73faa89ea4320ee71f510550 SHA1 6f1e1486ad2f781149cd50902b190399b20e0aca SHA256 742184613c949779bd8f4e530cb4e4559ba34d3a3c3988fb8d09e8fe3fd9a289
 DIST thunderbird-cs-1.5.0.7.xpi 191276 RMD160 aa8e061ded76af834361306469797d53a5a86c03 SHA1 88472fccb6731056cf27752ee33836e5e8e08286 SHA256 6a2db54b0c6998541b3cadf7cdf72c9811cb5471c3809ddcee34bdfd1bd4cf1c
@@ -124,10 +126,14 @@ EBUILD mozilla-thunderbird-1.5.0.7.ebuild 7458 RMD160 0de887b34461524f99b554af17
 MD5 11c44351c5582ada543abc3247fb2658 mozilla-thunderbird-1.5.0.7.ebuild 7458
 RMD160 0de887b34461524f99b554af178daad732cc3c42 mozilla-thunderbird-1.5.0.7.ebuild 7458
 SHA256 d65526df998afc662d2c6147c04a67a8018b98ed2128f583af9046ddf957ac6b mozilla-thunderbird-1.5.0.7.ebuild 7458
-MISC ChangeLog 21484 RMD160 8566bca6e91b334431f8c3e64fa96c062218c149 SHA1 9b292dd3b5c8858916142e04ac58fcd3e4ea8bc9 SHA256 e17358b46ffa728d461749df4aa36c52c01eaa46eff854407044fd35a532a68d
-MD5 7828c4334ad926f7ebfa311a44f9c303 ChangeLog 21484
-RMD160 8566bca6e91b334431f8c3e64fa96c062218c149 ChangeLog 21484
-SHA256 e17358b46ffa728d461749df4aa36c52c01eaa46eff854407044fd35a532a68d ChangeLog 21484
+EBUILD mozilla-thunderbird-2.0_alpha1.ebuild 7536 RMD160 9d5fa854711d9a9eab613f3e4badfda22cc9d3d4 SHA1 1f25b5f34a0831cc18e5b76606cb3860f8cdb0e3 SHA256 f3dca98f9a94ee447e62d872b461da4b585bdf35a29038c18d40ce767a5b547e
+MD5 d7c46ce2d3c27bd9da6174b5152c3ce4 mozilla-thunderbird-2.0_alpha1.ebuild 7536
+RMD160 9d5fa854711d9a9eab613f3e4badfda22cc9d3d4 mozilla-thunderbird-2.0_alpha1.ebuild 7536
+SHA256 f3dca98f9a94ee447e62d872b461da4b585bdf35a29038c18d40ce767a5b547e mozilla-thunderbird-2.0_alpha1.ebuild 7536
+MISC ChangeLog 21654 RMD160 bde38738808ad787cc3c40945fc6e0fbab538358 SHA1 2cea715c5cf638ae436cee20c7ca58f718b48074 SHA256 51408ed2d9ca2f89022ea6fafb11c76e0f82f555a2fe8af98f2ea8ab48262b9f
+MD5 af83030d1b93614cf76900c44f5e01ed ChangeLog 21654
+RMD160 bde38738808ad787cc3c40945fc6e0fbab538358 ChangeLog 21654
+SHA256 51408ed2d9ca2f89022ea6fafb11c76e0f82f555a2fe8af98f2ea8ab48262b9f ChangeLog 21654
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
@@ -144,3 +150,6 @@ SHA256 f2d6b456efae0224092cab8506fac7885817fbd822415e0b6964901e2e03a033 files/di
 MD5 577245b874881acf1e3a2f072fff99bb files/digest-mozilla-thunderbird-1.5.0.7 8986
 RMD160 f8284040b383d99466740380a605d7cf32c16ab7 files/digest-mozilla-thunderbird-1.5.0.7 8986
 SHA256 822811c4f3f27dbf0e0d94b786ed266e65498edc0c0f794be79f3ed3565f46f7 files/digest-mozilla-thunderbird-1.5.0.7 8986
+MD5 a3bec770b467ab10fce673a8384bb5aa files/digest-mozilla-thunderbird-2.0_alpha1 611
+RMD160 2fb783ba32db5c2d5628229d3e86bed68b871dc9 files/digest-mozilla-thunderbird-2.0_alpha1 611
+SHA256 5ca5785d980c7bbf1b82cb578bccd3d2f5ef4b79f18a64fc0d9cd6e01a6e6c09 files/digest-mozilla-thunderbird-2.0_alpha1 611
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0_alpha1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0_alpha1
new file mode 100644
index 000000000000..c6e84682ddd1
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0_alpha1
@@ -0,0 +1,6 @@
+MD5 3dc083017f58607b4704278455559540 mozilla-thunderbird-2.0_alpha1-patches-1.0.tar.bz2 23402
+RMD160 28aa536c70aacedafaf8a136e6b390ec08f08229 mozilla-thunderbird-2.0_alpha1-patches-1.0.tar.bz2 23402
+SHA256 a3d0fc16b8d0f87e8e34dc8849e6b481a4ee2b4635a22bec3a46ede9e7b1bb76 mozilla-thunderbird-2.0_alpha1-patches-1.0.tar.bz2 23402
+MD5 70adf3ca4838d114f8b6dffc6e004388 thunderbird-2.0a1-source.tar.bz2 36476408
+RMD160 40e6552f5dd397ddbd37f07852d87346b1b25c45 thunderbird-2.0a1-source.tar.bz2 36476408
+SHA256 f62eb7e40d76df3001f6a46e3ffee0c83fad75887fb87007cf3ecc251cb16078 thunderbird-2.0a1-source.tar.bz2 36476408
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_alpha1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_alpha1.ebuild
new file mode 100644
index 000000000000..29882887ab29
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_alpha1.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2006 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_alpha1.ebuild,v 1.1 2006/10/23 22:25:38 peper Exp $
+
+#
+# There are no linguas supported in alpha builds
+# Anarchy ( Jory A. Pratt )
+#
+
+unset ALLOWED_FLAGS	 # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools mozextension
+
+#LANGS="bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE gu-IN he hu it ja ko lt mk nb-NO nl pa-IN pl pt-BR ru sk sl sv-SE tr zh-CN"
+#SHORTLANGS="es-ES ga-IE nb-NO sv-SE"
+PVER="1.0"
+MY_PV=${PV/_alpha1/a1}
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MY_PV}/source/thunderbird-${MY_PV}-source.tar.bz2
+	http://gentooexperimental.org/~genstef/dist/${P}-patches-${PVER}.tar.bz2"
+
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="ldap crypt branding mozdom"
+
+#for X in ${LANGS} ; do
+#	SRC_URI="${SRC_URI} linguas_${X/-/_}? ( mirror://gentoo/thunderbird-${X}-${PV}.xpi )"
+#	IUSE="${IUSE} linguas_${X/-/_}"
+#done
+
+#for X in ${SHORTLANGS} ; do
+#	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( mirror://gentoo/thunderbird-${X}-${PV}.xpi )"
+#	IUSE="${IUSE} linguas_${X%%-*}"
+#done
+
+RDEPEND=">=www-client/mozilla-launcher-1.39
+	>=dev-libs/nss-3.10
+	>=dev-libs/nspr-4.6.1
+	~sys-devel/autoconf-2.13"
+
+PDEPEND="crypt? ( x11-plugins/enigmail )"
+
+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 BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+export MOZ_CO_PROJECT=mail
+
+#linguas() {
+#	linguas=
+#	local LANG
+#	for LANG in ${LINGUAS}; do
+#		if hasq ${LANG} en en_US; then
+#			hasq en ${linguas} || \
+#				linguas="${linguas:+"${linguas} "}en"
+#			continue
+#		elif hasq ${LANG} ${LANGS//-/_}; then
+#			hasq ${LANG//_/-} ${linguas} || \
+#				linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+#			continue
+#		else
+#			local SLANG
+#			for SLANG in ${SHORTLANGS}; do
+#				if [[ ${LANG} == ${SLANG%%-*} ]]; then
+#					hasq ${SLANG} ${linguas} || \
+#						linguas="${linguas:+"${linguas} "}${SLANG}"
+#					continue 2
+#				fi
+#			done
+#		fi
+#		ewarn "Sorry, but mozilla-thunderbird does not support the ${LANG} LINGUA"
+#	done
+#}
+
+src_unpack() {
+	unpack thunderbird-${MY_PV}-source.tar.bz2 ${P}-patches-${PVER}.tar.bz2
+
+#	linguas
+#	for X in ${linguas}; do
+#		[[ ${X} != en ]] && xpi_unpack thunderbird-${X}-${PV}.xpi
+#	done
+
+	cd ${S} || die "cd failed"
+
+	# Apply our patches
+	EPATCH_FORCE="yes" epatch "${WORKDIR}"/patch
+
+	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+	# PowerPC, because with that configuration, it detects a ppc64 system.
+	# -- hansmi, 2005-11-13
+	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
+		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
+			${S}/configure
+		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
+			${S}/security/coreconf/arch.mk
+	fi
+
+	WANT_AUTOCONF="2.1" \
+		eautoreconf || die "failed running autoreconf"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# tb-specific settings
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+
+	# Bug #72667
+	if use mozdom; then
+		mozconfig_annotate '' --enable-extensions=default,inspector
+	else
+		mozconfig_annotate '' --enable-extensions=default
+	fi
+
+	if use branding; then
+		mozconfig_annotate '' --enable-official-branding
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, which breaks us
+	gcc-specs-ssp && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+	append-flags -freorder-blocks -fno-reorder-functions
+
+	CPPFLAGS="${CPPFLAGS}" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die "econf failed"
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die "emake failed"
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	echo ""
+	einfo "Removing old installs though some really ugly code.  It potentially"
+	einfo "eliminates any problems during the install, however suggestions to"
+	einfo "replace this are highly welcome.  Send comments and suggestions to"
+	einfo "mozilla@gentoo.org"
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+	echo ""
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Most of the installation happens here
+	dodir ${MOZILLA_FIVE_HOME}
+	cp -RL "${S}/dist/bin/"* "${D}${MOZILLA_FIVE_HOME}" || die "Copy of files failed"
+
+#	linguas
+#	for X in ${linguas}; do
+#		[[ ${X} != en ]] && xpi_install ${WORKDIR}/thunderbird-${X}-${PV}
+#	done
+
+#	local LANG=${linguas%% *}
+#	if [[ ${LANG} != "" && ${LANG} != "en" ]]; then
+#		ebegin "Setting default locale to ${LANG}"
+#		sed -i "s:pref(\"general.useragent.locale\", \"en-US\"):pref(\"general.useragent.locale\", \"${LANG}\"):" \
+#			${D}${MOZILLA_FIVE_HOME}/defaults/pref/all-thunderbird.js \
+#			${D}${MOZILLA_FIVE_HOME}/defaults/pref/all-l10n.js
+#		eend $? || die "sed failed to change locale"
+#	fi
+
+	# Create directory structure to support portage-installed extensions.
+	# See update_chrome() in mozilla-launcher
+	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
+
+	# Create /usr/bin/thunderbird
+	install_mozilla_launcher_stub thunderbird ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/thunderbird-icon.png
+
+	# Fix bug 54179: Install .desktop file into /usr/share/applications
+	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozillathunderbird.desktop
+
+	####################################
+	#
+	# Install files necessary for applications to build against firefox
+	#
+	####################################
+
+	ewarn "Installing includes and idl files..."
+	dodir ${MOZILLA_FIVE_HOME}/idl ${MOZILLA_FIVE_HOME}/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include || die "failed to copy"
+	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl || die "failed to copy"
+
+	# Dirty hack to get some applications using this header running
+	dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \
+		/usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	update_mozilla_launcher_symlinks
+}