We need pango built with X use-flag bug #216377, fix linguas, bug #218147

(Portage version: 2.1.4.4)

2 files changed, 21 insertions, 8 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 8ef26d8e60cf..0f2ca3574526 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.253 2008/03/17 12:23:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.254 2008/04/19 16:04:27 armin76 Exp $
+
+  19 Apr 2008; Raúl Porcel <armin76@gentoo.org>
+  mozilla-thunderbird-2.0.0.12.ebuild:
+  We need pango built with X use-flag bug #216377, fix linguas, bug #218147
 
   17 Mar 2008; Raúl Porcel <armin76@gentoo.org>
   mozilla-thunderbird-1.5.0.8.ebuild, mozilla-thunderbird-1.5.0.14.ebuild,
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.12.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.12.ebuild
index e7d318021c6d..e46434b60db6 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.12.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.12.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 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.0.12.ebuild,v 1.7 2008/03/17 12:23:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.12.ebuild,v 1.8 2008/04/19 16:04:27 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib mozextension autotools
 
 PATCH="${P}-patches-0.1"
-LANGS="af be bg ca cs da de el en-GB 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"
+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"
@@ -27,15 +27,18 @@ SRC_URI="${MOZ_URI}/source/thunderbird-${PV}-source.tar.bz2
 #  http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${MY_PV}/linux-i686/xpi/
 #
 # for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done
-
 for X in ${LANGS} ; do
-	SRC_URI="${SRC_URI}
+	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+		SRC_URI="${SRC_URI}
 		linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
+	fi
 	IUSE="${IUSE} linguas_${X/-/_}"
 	# english is handled internally
 	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
-		SRC_URI="${SRC_URI}
-			linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
+		if [ "${X}" != "en-US" ]; then
+			SRC_URI="${SRC_URI}
+				linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
+		fi
 		IUSE="${IUSE} linguas_${X%%-*}"
 	fi
 done
@@ -85,6 +88,12 @@ pkg_setup(){
 		die "Cairo needs X"
 	fi
 
+	if ! built_with_use x11-libs/pango X; then
+		eerror "Pango is not built with X useflag."
+		eerror "Please add 'X' to your USE flags, and re-emerge pango."
+		die "Pango needs X"
+	fi
+
 	if ! use bindist; then
 		elog "You are enabling official branding. You may not redistribute this build"
 		elog "to any users on your network or the internet. Doing so puts yourself into"
@@ -102,7 +111,7 @@ src_unpack() {
 	for X in ${linguas}; do
 		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
 	done
-	if [[ ${linguas} != "" ]]; then
+	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
 		elog "Selected language packs (first will be default): ${linguas}"
 	fi