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

Package-Manager: portage-2.1.4.4

4 files changed, 44 insertions, 20 deletions

diff --git a/app-office/mozilla-sunbird/ChangeLog b/app-office/mozilla-sunbird/ChangeLog
index 4eb533b33b98..13daf7b2fc52 100644
--- a/app-office/mozilla-sunbird/ChangeLog
+++ b/app-office/mozilla-sunbird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/mozilla-sunbird
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/ChangeLog,v 1.28 2008/04/08 10:04:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/ChangeLog,v 1.29 2008/04/19 16:18:58 armin76 Exp $
+
+  19 Apr 2008; Raúl Porcel <armin76@gentoo.org> mozilla-sunbird-0.7.ebuild,
+  mozilla-sunbird-0.8.ebuild:
+  We need pango built with X use-flag bug #216377, fix linguas, bug #218147
 
 *mozilla-sunbird-0.8 (08 Apr 2008)
 
diff --git a/app-office/mozilla-sunbird/Manifest b/app-office/mozilla-sunbird/Manifest
index 5ab3c316e065..68c9ca5312ba 100644
--- a/app-office/mozilla-sunbird/Manifest
+++ b/app-office/mozilla-sunbird/Manifest
@@ -62,7 +62,7 @@ DIST mozilla-sunbird-0.8-sv-SE.xpi 108696 RMD160 ff3e08d2e83be6cd618724f7dee086a
 DIST mozilla-sunbird-0.8-tr.xpi 99990 RMD160 ea556609e19c704efa511ce350bd5eea025e08d8 SHA1 c9e2c76b82fda591f7617f6ebe332fce557387f1 SHA256 3c9d921c5f6ac70eac823e29f5a09c67ed4d4d68be63ac3df28b8711251de7db
 DIST mozilla-sunbird-0.8-uk.xpi 108041 RMD160 2f254e9c10f7623d8860c8054bfe5a5385e6655a SHA1 5aacf29178d6ba55595c288189df285613086dc2 SHA256 68cb11d0437f89b90e77700d87a0d63b90ae416d67f0dce3a86a0b31865cace7
 DIST mozilla-sunbird-0.8-zh-CN.xpi 99526 RMD160 1c3b9fab504a002b3c820921e7491b8bf5ebe73b SHA1 d35cd7690a5787ca5809b7f85109dc61cdf12eea SHA256 7d4bb10104e7db761966a22efa6ba65e3a844f8c8c8c7eb6e7667a5fb4f0fa27
-EBUILD mozilla-sunbird-0.7.ebuild 7071 RMD160 f2c4636e4b642dc8527f13a6b01fcbe37b656599 SHA1 37460d01e3380799d96e135198d3d627321d2278 SHA256 dcc54c88b509668c2863b26ac41a087c16adf13e341d2de72b99c61e3152d89b
-EBUILD mozilla-sunbird-0.8.ebuild 7084 RMD160 641ac15336081d9c5bc30070ff7aa7605a93f82a SHA1 32eb1568e7d32d8442fcea5caf8d274214d201ef SHA256 54a12ef61cdf8c27844cc86bc08f78d9ba768f78b3ba439934e27bdb4f373d9f
-MISC ChangeLog 4176 RMD160 b7e0ccb3044688fc5b4f31707ac9c59f6f68bf42 SHA1 98190531caff645141d7e285d31eb1a840bf1fb9 SHA256 1ebe0c83e70e4a681fafe3dd9057633330229c98f42eb4a0b0caa9fab6656332
+EBUILD mozilla-sunbird-0.7.ebuild 7360 RMD160 f505251070c84c70825a2238489f4cd0effb41ae SHA1 7218626d5f40a4859765fe7998b2dcb00e34fbb5 SHA256 f6c02eeb1716dabd4247b87a65e81005ddee31df7c9551c9a3abdfddbe437785
+EBUILD mozilla-sunbird-0.8.ebuild 7373 RMD160 17e3ddabb645b06d926ee644e2b65ba3031e4c7d SHA1 2fac6209781804a4bd59b9ef07e71200be9d1cd3 SHA256 852478dbe1e87229447513a15d6fa2cf7eceb1e919263507d03938acc0780445
+MISC ChangeLog 4360 RMD160 fa3299a976cf3154c95af3a6e93e6725b43b192a SHA1 39f8b904215b26424eb3669a9a3fabf543383487 SHA256 869a6b1a9610b54797e620a708810818ae4ef7ebc43da79826229bd6beb10a4d
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
diff --git a/app-office/mozilla-sunbird/mozilla-sunbird-0.7.ebuild b/app-office/mozilla-sunbird/mozilla-sunbird-0.7.ebuild
index a5f0d8a1bdb4..245d6973660d 100644
--- a/app-office/mozilla-sunbird/mozilla-sunbird-0.7.ebuild
+++ b/app-office/mozilla-sunbird/mozilla-sunbird-0.7.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/app-office/mozilla-sunbird/mozilla-sunbird-0.7.ebuild,v 1.11 2008/03/17 12:13:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.7.ebuild,v 1.12 2008/04/19 16:18:58 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
 
 PATCH="${P}-patches-0.5"
-LANGS="ca cs da de es-AR es-ES eu fr ga-IE hu it ka lt mk nb-NO nl pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr zh-CN"
+LANGS="ca cs da de en-US es-AR es-ES eu fr ga-IE hu it ka lt mk nb-NO nl pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr zh-CN"
 NOSHORTLANGS="es-AR pt-BR zh-TW"
 
 MY_PN="${PN/mozilla-}"
@@ -24,13 +24,17 @@ SRC_URI="http://releases.mozilla.org/pub/mozilla.org/calendar/${MY_PN}/releases/
 #
 # for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done
 for X in ${LANGS} ; do
-	SRC_URI="${SRC_URI}
-		linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
+	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/-bin}-xpi/${P/-bin/}-${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
@@ -80,6 +84,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"
@@ -96,8 +106,8 @@ src_unpack() {
 	for X in ${linguas}; do
 		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
 	done
-	if [[ ${linguas} != "" ]]; then
-		elog "Selected language packs (first will be default): ${linguas}"
+	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+		einfo "Selected language packs (first will be default): ${linguas}"
 	fi
 
 	# Apply our patches
diff --git a/app-office/mozilla-sunbird/mozilla-sunbird-0.8.ebuild b/app-office/mozilla-sunbird/mozilla-sunbird-0.8.ebuild
index 0b5e8f166547..a4c4f8e1e596 100644
--- a/app-office/mozilla-sunbird/mozilla-sunbird-0.8.ebuild
+++ b/app-office/mozilla-sunbird/mozilla-sunbird-0.8.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/app-office/mozilla-sunbird/mozilla-sunbird-0.8.ebuild,v 1.1 2008/04/08 10:04:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.8.ebuild,v 1.2 2008/04/19 16:18:58 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
 
 PATCH="${P}-patches-0.1"
-LANGS="ca cs da de es-AR es-ES eu fr ga-IE hu it ja ka ko lt mk mn nb-NO nl pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr uk zh-CN"
+LANGS="ca cs da de en-US es-AR es-ES eu fr ga-IE hu it ja ka ko lt mk mn nb-NO nl pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr uk zh-CN"
 NOSHORTLANGS="es-AR pt-BR zh-TW"
 
 MY_PN="${PN/mozilla-}"
@@ -24,13 +24,17 @@ SRC_URI="http://releases.mozilla.org/pub/mozilla.org/calendar/${MY_PN}/releases/
 #
 # for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done
 for X in ${LANGS} ; do
-	SRC_URI="${SRC_URI}
-		linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
+	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/-bin}-xpi/${P/-bin/}-${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
@@ -80,6 +84,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"
@@ -96,8 +106,8 @@ src_unpack() {
 	for X in ${linguas}; do
 		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
 	done
-	if [[ ${linguas} != "" ]]; then
-		elog "Selected language packs (first will be default): ${linguas}"
+	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+		einfo "Selected language packs (first will be default): ${linguas}"
 	fi
 
 	# Apply our patches