Security bumps: 3.1.16, 8.0. Remove old.

(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)

3 files changed, 169 insertions, 5 deletions

diff --git a/mail-client/thunderbird-bin/ChangeLog b/mail-client/thunderbird-bin/ChangeLog
index 70443d26d38b..7cbad222db14 100644
--- a/mail-client/thunderbird-bin/ChangeLog
+++ b/mail-client/thunderbird-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/thunderbird-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.41 2011/09/04 00:39:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.42 2011/11/14 15:33:14 nirbheek Exp $
+
+*thunderbird-bin-8.0 (14 Nov 2011)
+*thunderbird-bin-3.1.16 (14 Nov 2011)
+
+  14 Nov 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -thunderbird-bin-3.1.11.ebuild, +thunderbird-bin-3.1.16.ebuild,
+  +thunderbird-bin-8.0.ebuild:
+  Security bumps: 3.1.16, 8.0. Remove old.
 
   04 Sep 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   thunderbird-bin-3.1.12.ebuild:
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-3.1.11.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-3.1.16.ebuild
index e60fd112afcb..c672467f752d 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-3.1.11.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-3.1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-3.1.11.ebuild,v 1.1 2011/06/23 14:13:51 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-3.1.16.ebuild,v 1.1 2011/11/14 15:33:14 nirbheek Exp $
 
 EAPI="2"
 
@@ -8,9 +8,9 @@ inherit eutils multilib mozextension
 
 # Can be updated using scripts/get_langs.sh from mozilla overlay
 # '\' at EOL is needed for ${LANG} matching in linguas() below
-LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \
-fy-NL ga-IE he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru \
-si sk sl sq sv-SE tr uk zh-CN zh-TW"
+LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi \
+fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR \
+pt-PT ro ru si sk sl sq sr sv-SE tr uk vi zh-CN zh-TW"
 NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
 
 MY_PN="${PN/-bin}"
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-8.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-8.0.ebuild
new file mode 100644
index 000000000000..40e86e2ac96e
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-8.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-8.0.ebuild,v 1.1 2011/11/14 15:33:14 nirbheek Exp $
+
+EAPI="3"
+
+inherit eutils multilib mozextension
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+LANGS=(ar be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr
+fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm
+ro ru si sk sl sq sv-SE ta-LK tr uk vi zh-CN zh-TW)
+
+MY_PN="${PN/-bin}"
+MY_PV="${PV/_beta/b}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Thunderbird Mail Client"
+FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
+SRC_URI="
+	amd64? ( ${FTP_URI}/${MY_PV}/linux-x86_64/en-US/${MY_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${FTP_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.mozilla.com/firefox"
+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
+	# en and en_US are handled internally
+	if [[ ${X} != en ]] && [[ ${X} != en-US ]]; then
+		SRC_URI="${SRC_URI}
+			linguas_${X/-/_}? ( ${FTP_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin}-${X}.xpi )"
+	fi
+	IUSE="${IUSE} linguas_${X/-/_}"
+	# Install all the specific locale xpis if there's no generic locale xpi
+	# Example: there's no pt.xpi, so install all pt-*.xpi
+	if ! has ${X%%-*} "${LANGS[@]}"; then
+		SRC_URI="${SRC_URI}
+			linguas_${X%%-*}? ( ${FTP_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin}-${X}.xpi )"
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+DEPEND="app-arch/unzip"
+RDEPEND="x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
+
+	>=x11-libs/gtk+-2.2:2
+	net-misc/curl[nss]
+"
+
+S="${WORKDIR}/thunderbird"
+
+# TODO: Move all the linguas crap to an eclass
+linguas() {
+	# Generate the list of language packs called "linguas"
+	# This list is used to install the xpi language packs
+	local LINGUA
+	for LINGUA in ${LINGUAS}; do
+		if has ${LINGUA} en en_US; then
+			# For mozilla products, en and en_US are handled internally
+			continue
+		# If this language is supported by ${P},
+		elif has ${LINGUA} "${LANGS[@]//-/_}"; then
+			# Add the language to linguas, if it isn't already there
+			has ${LINGUA//_/-} "${linguas[@]}" || linguas+=(${LINGUA//_/-})
+			continue
+		# For each short LINGUA that isn't in LANGS,
+		# add *all* long LANGS to the linguas list
+		elif ! has ${LINGUA%%-*} "${LANGS[@]}"; then
+			for LANG in "${LANGS[@]}"; do
+				if [[ ${LANG} == ${LINGUA}-* ]]; then
+					has ${LANG} "${linguas[@]}" || linguas+=(${LANG})
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but ${P} does not support the ${LINGUA} locale"
+	done
+}
+
+src_unpack() {
+	unpack ${A}
+
+	linguas
+	for X in "${linguas[@]}"; do
+		xpi_unpack "${P/-bin}-${X}.xpi"
+	done
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/opt/${MY_PN}"
+
+	# Install thunderbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
+
+	linguas
+	for X in "${linguas[@]}"; do
+		xpi_install "${WORKDIR}/${P/-bin}-${X}"
+	done
+
+	# Create /usr/bin/thunderbird-bin
+	dodir /usr/bin/
+	cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
+exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# 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}"/10${PN}
+
+	# 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/"
+
+	if use x86; then
+		if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' ; then
+			einfo
+			einfo "For using the crashreporter, you need gnome-base/gconf,"
+			einfo "gnome-base/orbit and net-misc/curl emerged."
+			einfo
+		fi
+	else
+		einfo
+		einfo "NB: You just installed a 32-bit thunderbird"
+		einfo
+		einfo "Crashreporter won't work on amd64"
+		einfo
+	fi
+
+	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"'
+}