version bump, security bug 509050 ; also fixed a deptree resolution issue on uclibc profiles for 17.x

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

3 files changed, 35 insertions, 21 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index aa2ef2a41337..7b81690b7676 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.276 2014/03/24 14:33:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.277 2014/04/30 17:46:03 axs Exp $
+
+*thunderbird-24.5.0 (30 Apr 2014)
+
+  30 Apr 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +thunderbird-24.5.0.ebuild, -thunderbird-24.3.0.ebuild,
+  thunderbird-17.0.9.ebuild:
+  version bump, security bug 509050 ; also fixed a deptree resolution issue on
+  uclibc profiles for 17.x
 
   24 Mar 2014; Agostino Sarubbo <ago@gentoo.org> thunderbird-24.4.0.ebuild:
   Stable for ppc64, wrt bug #505072
diff --git a/mail-client/thunderbird/thunderbird-17.0.9.ebuild b/mail-client/thunderbird/thunderbird-17.0.9.ebuild
index 4003060dd45e..a2d2403cf541 100644
--- a/mail-client/thunderbird/thunderbird-17.0.9.ebuild
+++ b/mail-client/thunderbird/thunderbird-17.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-17.0.9.ebuild,v 1.7 2013/09/22 06:58:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-17.0.9.ebuild,v 1.8 2014/04/30 17:46:03 axs Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -82,7 +82,7 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	) )"
 
 DEPEND="${RDEPEND}
-	!elibc_glibc? ( dev-libs/libexecinfo )
+	!elibc_glibc? ( !elibc_uclibc? ( dev-libs/libexecinfo ) )
 	virtual/pkgconfig
 	amd64? ( ${ASM_DEPEND}
 		virtual/opengl )
diff --git a/mail-client/thunderbird/thunderbird-24.3.0.ebuild b/mail-client/thunderbird/thunderbird-24.5.0.ebuild
index cfe3c5c77a75..d9ef2b0fdb1e 100644
--- a/mail-client/thunderbird/thunderbird-24.3.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.5.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.3.0.ebuild,v 1.8 2014/03/20 16:04:31 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.5.0.ebuild,v 1.1 2014/04/30 17:46:03 axs Exp $
 
-EAPI="3"
+EAPI=5
 WANT_AUTOCONF="2.1"
 MOZ_ESR=""
 MOZ_LIGHTNING_VER="2.6.2"
@@ -33,7 +33,7 @@ inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 
-KEYWORDS="~alpha amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist crypt gstreamer +jit ldap +lightning +minimal mozdom pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite"
@@ -56,8 +56,8 @@ SRC_URI="${SRC_URI}
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 RDEPEND="
-	>=dev-libs/nss-3.15.4
-	>=dev-libs/nspr-4.10.2
+	>=dev-libs/nss-3.16
+	>=dev-libs/nspr-4.10.4
 	>=dev-libs/glib-2.26:2
 	>=media-libs/mesa-7.10
 	>=media-libs/libpng-1.6.6[apng]
@@ -108,7 +108,9 @@ pkg_setup() {
 		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
 		elog
 	fi
+}
 
+pkg_pretend() {
 	# Ensure we have enough disk space to compile
 	CHECKREQS_DISK_BUILD="4G"
 	check-reqs_pkg_setup
@@ -267,15 +269,15 @@ src_configure() {
 src_compile() {
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
-	emake -f client.mk || die "emake failed"
+	emake -f client.mk
 
 	# Only build enigmail extension if crypt enabled.
 	if use crypt ; then
 		cd "${S}"/mailnews/extensions/enigmail || die
 		./makemake -r 2&> /dev/null
 		cd "${S}"/tbird/mailnews/extensions/enigmail
-		emake || die "make enigmail failed"
-		emake xpi || die "make enigmail xpi failed"
+		emake
+		emake xpi
 	fi
 }
 
@@ -289,17 +291,19 @@ src_install() {
 
 	# Copy our preference before omnijar is created.
 	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
-		"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die
+		"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
 
 	# Set default path to search for dictionaries.
 	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die
+		>> "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
 
 	# Pax mark xpcshell for hardened support, only used for startupcache creation.
 	pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
 
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
 	# Install language packs
 	mozlinguas_src_install
@@ -318,7 +322,8 @@ src_install() {
 
 	if use crypt ; then
 		cd "${T}" || die
-		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf || die
+		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf \
+		|| die
 		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
 
 		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
@@ -348,11 +353,12 @@ src_install() {
 
 		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
 		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning-*.xpi
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning-*.xpi \
+			|| die
 		# Install locales for lightning - each locale is a jar file
 		insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome
-		cd "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER}/chrome
+		cd "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER}/chrome || die
 		for l in "${mozlinguas[@]}"; do if [[ -e calendar-${l}.jar ]]; then
 			for c in calendar lightning; do
 				doins ${c}-${l}.jar
@@ -368,7 +374,7 @@ src_install() {
 		# This requires that the .desktop file was already installed earlier
 		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
 			-e "s:^\(Categories=\):\1Calendar;:" \
-			-i "${ED}"/usr/share/applications/${PN}.desktop
+			-i "${ED}"/usr/share/applications/${PN}.desktop || die
 	fi
 
 	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird}
@@ -378,7 +384,7 @@ src_install() {
 	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
 
 	if use minimal; then
-		rm -rf "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
+		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
 			die "Failed to remove sdk and headers"
 	fi
 }