Version bump, bug 141842.

Package-Manager: portage-2.1.1_pre3-r5

4 files changed, 210 insertions, 5 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 8860af74bb12..173f45ab39ff 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.121 2006/07/26 05:07:02 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.122 2006/07/28 21:04:50 kloeri Exp $
+
+*mozilla-thunderbird-1.5.0.5 (28 Jul 2006)
+
+  28 Jul 2006; Bryan Østergaard <kloeri@gentoo.org>
+  +mozilla-thunderbird-1.5.0.5.ebuild:
+  Version bump, bug 141842.
 
   26 Jul 2006; Joshua Kinard <kumba@gentoo.org>
   mozilla-thunderbird-1.5.0.4.ebuild:
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index fa59ebccfe1a..c57c6fc9ae9f 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -70,8 +70,10 @@ DIST mozilla-1.7.10-nsplugins-v2.patch 1968 RMD160 42f20651c93d904829fd80d4bf6bf
 DIST mozilla-firefox-1.0-4ft2.patch.bz2 5601 RMD160 b3ea2512d641d4aa0af4925ddab75351889c3c35 SHA256 10b20c0acf58650992c01e5481478304ebb709298d42748033cb252b40525b7f
 DIST mozilla-jslibmath-alpha.patch 625 RMD160 25215a45e8c97259666252dcfb3ad90c547d632f SHA256 5b2b47453bdcaba6970d3773a2d9882688c3e26e2f6d5a96192977c8b3cd5569
 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 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
 EBUILD mozilla-thunderbird-1.0.7.ebuild 5632 RMD160 8bd50c2ff4f286eb3d8712bfe438ec9c9ef17864 SHA1 c907a58139164d0dee1586bfc6f44c5ef7ec3295 SHA256 72668acde3d6f126b387f99b6ec45e23721618b4d1cd96dc728165d2f9a288c0
 MD5 55697b53bd932c2ea9c20d3d5e3b771e mozilla-thunderbird-1.0.7.ebuild 5632
 RMD160 8bd50c2ff4f286eb3d8712bfe438ec9c9ef17864 mozilla-thunderbird-1.0.7.ebuild 5632
@@ -80,10 +82,14 @@ EBUILD mozilla-thunderbird-1.5.0.4.ebuild 5673 RMD160 73293c8de63cd0cf922a8aa228
 MD5 8991d4e0a0796d86621d466a7240ffe8 mozilla-thunderbird-1.5.0.4.ebuild 5673
 RMD160 73293c8de63cd0cf922a8aa22846c9c7ffb63294 mozilla-thunderbird-1.5.0.4.ebuild 5673
 SHA256 f1e5e9932a196388c3da645231f39b678088c58c0d0ac84cd1f6773f9f8c8812 mozilla-thunderbird-1.5.0.4.ebuild 5673
-MISC ChangeLog 19428 RMD160 fa949b054aea741e8cb47e5f17ecd5e70d91b8df SHA1 df853ce9590d99abe3d020f1839a7243f7d927b9 SHA256 cc11dd3b59c697e41e264576f271562825b5ef0f1aa48ba9b5d66e8ff7421eb9
-MD5 32e78de393d64b964863852b7d14e9d3 ChangeLog 19428
-RMD160 fa949b054aea741e8cb47e5f17ecd5e70d91b8df ChangeLog 19428
-SHA256 cc11dd3b59c697e41e264576f271562825b5ef0f1aa48ba9b5d66e8ff7421eb9 ChangeLog 19428
+EBUILD mozilla-thunderbird-1.5.0.5.ebuild 5678 RMD160 a61f91b4466d8efaed51a8a19fdc202552f98346 SHA1 87e80839a24e6b11a2ff7559b5cd5242eeb4a871 SHA256 9fc63a79a53c784823439ad204dac5daad4ac62a5a4dbf6809ae5ff9f7d23d21
+MD5 b26baf15f18f97c4b486f1828cad27db mozilla-thunderbird-1.5.0.5.ebuild 5678
+RMD160 a61f91b4466d8efaed51a8a19fdc202552f98346 mozilla-thunderbird-1.5.0.5.ebuild 5678
+SHA256 9fc63a79a53c784823439ad204dac5daad4ac62a5a4dbf6809ae5ff9f7d23d21 mozilla-thunderbird-1.5.0.5.ebuild 5678
+MISC ChangeLog 19594 RMD160 693e8ca688407675853fe3d6199d297b01d51806 SHA1 2221ab4145433edd1e6b5da397ee3be452f05154 SHA256 d9ae96a0ba8f4daa4c4f6d87c68498c5a9b4f7311c1de8a907724dc304ac59da
+MD5 7ba213e44adc5940ff14a39eb586cfe5 ChangeLog 19594
+RMD160 693e8ca688407675853fe3d6199d297b01d51806 ChangeLog 19594
+SHA256 d9ae96a0ba8f4daa4c4f6d87c68498c5a9b4f7311c1de8a907724dc304ac59da ChangeLog 19594
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
@@ -94,3 +100,6 @@ SHA256 92e7f2e3654ca7df333c04e2e5adb9577746008bc13502f4eef6f4b47d2941fa files/di
 MD5 8529c30c10be147c2f1d7689b9554a58 files/digest-mozilla-thunderbird-1.5.0.4 608
 RMD160 83746cd207a110a6685835d0a2ecb54060712a5a files/digest-mozilla-thunderbird-1.5.0.4 608
 SHA256 840f839bd1d811ac0d414187866e5f4d0e579aa91c5e1e001dafcf6effae6ea0 files/digest-mozilla-thunderbird-1.5.0.4 608
+MD5 c39b90d8335cee64402474274fc2df5d files/digest-mozilla-thunderbird-1.5.0.5 608
+RMD160 a90a877f8e8f0b6005401d073baeeb95de41fa27 files/digest-mozilla-thunderbird-1.5.0.5 608
+SHA256 f2d6b456efae0224092cab8506fac7885817fbd822415e0b6964901e2e03a033 files/digest-mozilla-thunderbird-1.5.0.5 608
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5.0.5 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5.0.5
new file mode 100644
index 000000000000..89f086dca357
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5.0.5
@@ -0,0 +1,6 @@
+MD5 1a7192b65d270b4249558a1f32f191bf mozilla-thunderbird-1.5.0.5-patches-0.1.tar.bz2 30684
+RMD160 82a4da8cf5dad04c1bedc9425d31f33a8eedf31f mozilla-thunderbird-1.5.0.5-patches-0.1.tar.bz2 30684
+SHA256 6f707b64a4e1ca1b36287f45f018cb70b6e04d7e0580cba7805b403ae1092f93 mozilla-thunderbird-1.5.0.5-patches-0.1.tar.bz2 30684
+MD5 b09d29f912c2133a75b44f4801fc62b0 thunderbird-1.5.0.5-source.tar.bz2 35998778
+RMD160 aa32d59efa7d55eb516d967c1fb4cc6cc13f874b thunderbird-1.5.0.5-source.tar.bz2 35998778
+SHA256 b6fc27b79d0a4dabb30011cc6ba6161080f991ccadae12e5214cac86d009b005 thunderbird-1.5.0.5-source.tar.bz2 35998778
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.5.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.5.ebuild
new file mode 100644
index 000000000000..1b448b637081
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.5.ebuild
@@ -0,0 +1,184 @@
+# 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-1.5.0.5.ebuild,v 1.1 2006/07/28 21:04:50 kloeri Exp $
+
+unset ALLOWED_FLAGS	 # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools
+
+PVER="0.1"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2
+	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
+
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="ldap crypt"
+
+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
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die "cd failed"
+
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	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 '' --enable-extensions=default
+	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
+	mozconfig_annotate '' --enable-official-branding
+
+	# 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
+
+	# Export CPU_ARCH_TEST	as it is not exported by default.
+	case $(tc-arch) in
+	amd64) [[ ${ABI} == "x86" ]] && CPU_ARCH_TEST="x86" || CPU_ARCH_TEST="x86_64" ;;
+	ia64) CPU_ARCH_TEST="ia64" ;;
+	ppc) CPU_ARCH_TEST="ppc" ;;
+	*) CPU_ARCH_TEST=$(tc-arch) ;;
+	esac
+
+	export CPU_ARCH_TEST
+
+	CPPFLAGS="${CPPFLAGS}" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+}
+
+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"
+
+	# 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
+}