version bump for thunderbird-3, cleanup of old builds.

(Portage version: 2.1.7.15/cvs/Linux x86_64)

4 files changed, 36 insertions, 164 deletions

diff --git a/mail-client/mozilla-thunderbird-bin/ChangeLog b/mail-client/mozilla-thunderbird-bin/ChangeLog
index 1961dfec85fb..c6dc140145d4 100644
--- a/mail-client/mozilla-thunderbird-bin/ChangeLog
+++ b/mail-client/mozilla-thunderbird-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/mozilla-thunderbird-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.136 2009/11/04 11:21:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.137 2009/12/20 19:21:16 anarchy Exp $
+
+*mozilla-thunderbird-bin-3.0 (20 Dec 2009)
+
+  20 Dec 2009; Jory A. Pratt <anarchy@gentoo.org>
+  -mozilla-thunderbird-bin-2.0.0.22.ebuild,
+  -mozilla-thunderbird-bin-3.0_beta4.ebuild,
+  +mozilla-thunderbird-bin-3.0.ebuild,
+  +files/thunderbird-gentoo-default-prefs.js:
+  version bump for thunderbird-3.0
 
   04 Nov 2009; Markus Meier <maekke@gentoo.org>
   mozilla-thunderbird-bin-2.0.0.23.ebuild:
diff --git a/mail-client/mozilla-thunderbird-bin/files/thunderbird-gentoo-default-prefs.js b/mail-client/mozilla-thunderbird-bin/files/thunderbird-gentoo-default-prefs.js
new file mode 100644
index 000000000000..5d26710a4f43
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/files/thunderbird-gentoo-default-prefs.js
@@ -0,0 +1,11 @@
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+pref("browser.display.use_system_colors",   true);
+pref("intl.locale.matchOS", true);
+pref("mail.shell.checkDefaultClient", false);
+
+# Disable global indexing by default
+pref("mailnews.database.global.indexer.enabled", false);
+
+# Do not switch to Smart Folders after upgrade to 3.0b4
+pref("mail.folder.views.version", "1")
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.22.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.22.ebuild
deleted file mode 100644
index 0c6695745c03..000000000000
--- a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.22.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.22.ebuild,v 1.3 2009/06/28 11:53:12 maekke Exp $
-
-inherit eutils mozilla-launcher multilib mozextension
-
-LANGS="af be bg ca cs da de el en-GB en-US es-AR es-ES eu fi fr ga-IE he hu it ja ko lt mk nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr uk zh-CN zh-TW"
-NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/linux-i686/en-US/thunderbird-${PV}.tar.gz"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE=""
-
-for X in ${LANGS} ; do
-	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
-		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
-	fi
-	IUSE="${IUSE} linguas_${X/-/_}"
-	# english is handled internally
-	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
-		if [ "${X}" != "en-US" ]; then
-			SRC_URI="${SRC_URI}
-				linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
-DEPEND="app-arch/unzip"
-RDEPEND="x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	x86? (
-		>=x11-libs/gtk+-2.2
-		=virtual/libstdc++-3.3
-	)
-	amd64? (
-		>=app-emulation/emul-linux-x86-baselibs-1.0
-		>=app-emulation/emul-linux-x86-gtklibs-1.0
-		app-emulation/emul-linux-x86-compat
-	)
-	>=www-client/mozilla-launcher-1.41"
-
-S="${WORKDIR}/thunderbird"
-
-pkg_setup() {
-	# This is a binary x86 package => ABI=x86
-	# Please keep this in future versions
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-	has_multilib_profile && ABI="x86"
-}
-
-linguas() {
-	local LANG SLANG
-	for LANG in ${LINGUAS}; do
-		if has ${LANG} en en_US; then
-			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
-			continue
-		elif has ${LANG} ${LANGS//-/_}; then
-			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-			continue
-		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
-			for X in ${LANGS}; do
-				if [[ "${X}" == "${LANG}-"* ]] && \
-					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
-					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
-	done
-}
-
-src_unpack() {
-	unpack thunderbird-${PV}.tar.gz
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != en ]] && xpi_unpack ${P/-bin}-${X}.xpi
-	done
-	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
-		einfo "Selected language packs (first will be default): ${linguas}"
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/thunderbird"
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != en ]] && xpi_install ${WORKDIR}/${P/-bin}-${X}
-	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
-
-	# Install /usr/bin/thunderbird-bin
-	install_mozilla_launcher_stub thunderbird-bin ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10thunderbird-bin
-
-	# install ldpath env.d
-	doenvd "${FILESDIR}"/71thunderbird-bin
-}
-
-pkg_postinst() {
-	elog "For enigmail, please see instructions at"
-	elog "  http://enigmail.mozdev.org/"
-
-	use amd64 && einfo "NB: You just installed a 32-bit thunderbird"
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-3.0_beta4.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-3.0.ebuild
index 5c2e6cd47278..f665732f3089 100644
--- a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-3.0_beta4.ebuild
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-3.0_beta4.ebuild,v 1.3 2009/11/02 08:20:36 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-3.0.ebuild,v 1.1 2009/12/20 19:21:16 anarchy Exp $
 EAPI="2"
 
-inherit eutils mozilla-launcher multilib mozextension
+inherit eutils multilib mozextension
 
 LANGS="af ar be ca cs de el en-US es-AR es-ES et eu fi fr fy-NL ga-IE hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR ro ru si sk sv-SE uk"
 NOSHORTLANGS="es-AR"
@@ -89,9 +89,6 @@ src_unpack() {
 	for X in ${linguas}; do
 		[[ ${X} != en ]] && xpi_unpack "${P/-bin}-${X}.xpi"
 	done
-	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
-		einfo "Selected language packs (first will be default): ${linguas}"
-	fi
 }
 
 src_install() {
@@ -106,17 +103,9 @@ src_install() {
 		[[ ${X} != en ]] && xpi_install ${WORKDIR}/${P/-bin}-${X}
 	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
-
-	# Install /usr/bin/thunderbird-bin
-	make_wrapper thunderbird-bin "${MOZILLA_FIVE_HOME}/thunderbird"
+	# Create symbolic link /usr/bin/thunderbird-bin
+	dodir /usr/bin
+	dosym "${MOZILLA_FIVE_HOME}/thunderbird" /usr/bin/thunderbird-bin
 
 	# Install icon and .desktop for menu entry
 	doicon "${FILESDIR}"/icon/${PN}-icon.png
@@ -128,15 +117,17 @@ src_install() {
 
 	# install ldpath env.d
 	doenvd "${FILESDIR}"/71thunderbird-bin
+
+	# Enable very specific settings for thunderbird-3
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
+		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
+		die "failed to cp thunderbird-gentoo-default-prefs.js"
 }
 
 pkg_postinst() {
 	#elog "For enigmail, please see instructions at"
 	#elog "  http://enigmail.mozdev.org/"
 
-	ewarn "Enigmail or probably any other extension won't work"
-	ewarn "with Thunderbird 3.0."
-
 	if use x86; then
 		if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
 			|| ! has_version 'net-misc/curl'; then
@@ -159,9 +150,10 @@ pkg_postinst() {
 		einfo "Crashreporter won't work on amd64"
 		einfo
 	fi
-	update_mozilla_launcher_symlinks
-}
 
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
+	einfo
+	elog "We have moved away from mozilla-launcher, as it has major design flaws."
+	elog "You will need to update your symlinks to use thunderbird-bin as the executable"
+	elog "to launch thunderbird-bin. If you are used to just typing thunderbird to start, you"
+	elog "can create an alias in your ${HOME}/.bashrc. Example: alias thunderbird="thunderbird-bin""
 }