From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/
Date: Mon, 6 Jun 2011 14:16:21 +0000 (UTC) [thread overview]
Message-ID: <5c93e126a3e94506b918907a8f3e322b2c68c900.anarchy@gentoo> (raw)
commit: 5c93e126a3e94506b918907a8f3e322b2c68c900
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 14:12:57 2011 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 14:12:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=5c93e126
update thunderbird for new beta
---
mail-client/thunderbird/Manifest | 9 +-
.../enigmail-1.1.2-20110124-locale-fixup.diff | 8 --
...pha3-r2.ebuild => thunderbird-5.0_beta1.ebuild} | 133 ++++++++++----------
3 files changed, 73 insertions(+), 77 deletions(-)
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index e31d46d..39b3049 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,8 +1,7 @@
-AUX enigmail-1.1.2-20110124-locale-fixup.diff 125 RMD160 8704469817cd93c99665a35655fa626b74253920 SHA1 708e101ae0576f99d6f10ac778fbc2b76c3ff6ea SHA256 60627ed65b032e33935d14eea4c7224f940641c4a11ab8bdf2c5d6056a76bfda
AUX icon/thunderbird-unbranded.desktop 277 RMD160 49301b139cddf8c88d7168fa94229581e89f57fa SHA1 d8a6a4b41b7e62cf8b2e69d24f22c30dc80dfa29 SHA256 e31c806e820e33ed56d3ca112443c39b8506140c82bb57dd1a84c03b45fec598
AUX icon/thunderbird.desktop 267 RMD160 109313e3ae88d0cd991e831cafbb3f4856b84478 SHA1 861c4cd25a936078597b909bd444164fbf38c82c SHA256 d1e91cf5596d3044e6a1089ce7e97b431eb1fb93afd7b353c6587fc8c4fc2a6f
AUX thunderbird-gentoo-default-prefs-1.js 387 RMD160 5d7362448204c7ea6cf81b06446373097e358d44 SHA1 b3e706e3c24eda4d87e3f13bd4a43dfb45a3dfb3 SHA256 ecf4bafbf81675abb01c3e0f0ab9fdf3c5722868ed0440670e2a530ca85f219c
-DIST enigmail-1.2a1-20110316.tar.bz2 905604 RMD160 57bb867f70f6b37ee11d426a8e155f2ccf5d56d2 SHA1 371e3c8bd7157ed8aee7648a271df591db75f8c2 SHA256 113db06ab1621328635c5394174afe02bef9c154c46b62ea7c605ac0a0b2beba
-DIST thunderbird-3.3-patches-0.3.tar.bz2 5460 RMD160 6df630946d3e5ac19aa0ae88d13d696cc3327f1d SHA1 fd533e694e5046f0024af1e0331b4fad0b6b8948 SHA256 ff92a0298112e00b71e2804e69be6461d97509703bf4293f1b794fd5e70eb750
-DIST thunderbird-3.3a3.source.tar.bz2 83692340 RMD160 79ec91e73d6f1e64f16efae9c6ec333a2e54b220 SHA1 416c085e92a04c12c49b7f1ad41effb7ef24ece9 SHA256 7f5487449023a68784d800fdd38c25d30356972b27b0a23c2ba162c149161618
-EBUILD thunderbird-3.3_alpha3-r2.ebuild 7858 RMD160 4d57358b4eed3e85bfeeed09021997518e224299 SHA1 d337b9ac9a3c7c4416876848609ceae26c176dfe SHA256 f5840cf2f3f7d4dc975b5c253d207e07718acfc6ea318ff6be174b53da16694e
+DIST enigmail-1.2a2-20110606.tar.bz2 925807 RMD160 ca2dcbb26970fa68ca1a70649adb5f857c4bacca SHA1 6498fd008d6e781f4db28c9be5570c7c899b776b SHA256 c0b2dbe040db273ccc70ec7e2ac7eac839664c08f51d66f21ef238bc80039f58
+DIST thunderbird-5.0-patches-0.1.tar.bz2 2660 RMD160 6a09ee90ace5c19a99f1dcd8041adc62b7003976 SHA1 a52d2bc593bf5f905cb61a3279fe61aee2a14247 SHA256 89ac374408b4c8350cf09af5ce844ea1173546187018f588992a8ee48f339e36
+DIST thunderbird-5.0b1.source.tar.bz2 86519368 RMD160 2428eec8dd6d63b0f19530efd95b4c4fc287e8a1 SHA1 1bb7891a53b825c2c172cd9ebd76f15110751767 SHA256 5c45d276ec5c6df1e6cd1fad7fbb5a4fe2c930f085067383f99b053aca1640a7
+EBUILD thunderbird-5.0_beta1.ebuild 7781 RMD160 ead71cdb66e1162cc557ed5572bad91b05b59fe1 SHA1 e308368e6396e7ae121540430996cfe3634ef71e SHA256 1f085b97604555e9bf5c67cfaf2c6d89fdd8fcda1545862feb41f5472367615f
diff --git a/mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff b/mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff
deleted file mode 100644
index e5e52f1..0000000
--- a/mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- enigmail/lang/current-languages.txt
-+++ enigmail/lang/current-languages.txt
-@@ -1,5 +1,4 @@
- ar
--bg-BG
- ca
- cs-CZ
- de-AT
diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha3-r2.ebuild b/mail-client/thunderbird/thunderbird-5.0_beta1.ebuild
similarity index 72%
rename from mail-client/thunderbird/thunderbird-3.3_alpha3-r2.ebuild
rename to mail-client/thunderbird/thunderbird-5.0_beta1.ebuild
index 7da339a..edd790a 100644
--- a/mail-client/thunderbird/thunderbird-3.3_alpha3-r2.ebuild
+++ b/mail-client/thunderbird/thunderbird-5.0_beta1.ebuild
@@ -1,21 +1,15 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.6.ebuild,v 1.1 2010/10/28 15:40:01 polynomial-c Exp $
+# $Header: $
EAPI="3"
WANT_AUTOCONF="2.1"
inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools pax-utils python
-# This list can be updated using get_langs.sh from the mozilla overlay
-#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"
-#NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
-
-MY_PV="${PV/_alpha/a}"
-MY_P="${P/_alpha/a}"
-EMVER="1.2a1"
+TB_PV="${PV/_beta/b}"
+TB_P="${PN}-${TB_PV}"
+EMVER="1.2a2"
DESCRIPTION="Thunderbird Mail Client"
HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
@@ -24,28 +18,36 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linu
SLOT="0"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom"
-PATCH="${PN}-3.3-patches-0.3"
+PATCH="${PN}-5.0-patches-0.1"
REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"
-SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2
- crypt? ( http://dev.gentoo.org/~anarchy/mozilla/firefox/enigmail-${EMVER}-20110316.tar.bz2 )
+SRC_URI="${REL_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2
+ crypt? ( http://dev.gentoo.org/~anarchy/mozilla/firefox/enigmail-${EMVER}-20110606.tar.bz2 )
http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-#for X in ${LANGS} ; do
-# if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
-# SRC_URI="${SRC_URI}
-# linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${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%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-# fi
-# IUSE="${IUSE} linguas_${X%%-*}"
-# fi
-#done
+if ! [[ ${PV} =~ alpha|beta ]]; then
+ # This list can be updated using get_langs.sh from the mozilla overlay
+ 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"
+ NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
+
+ for X in ${LANGS} ; do
+ if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+ SRC_URI="${SRC_URI}
+ linguas_${X/-/_}? ( ${REL_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${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%%-*}? ( ${REL_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+ fi
+ IUSE="${IUSE} linguas_${X%%-*}"
+ fi
+ done
+fi
RDEPEND=">=sys-devel/binutils-2.16.1
>=dev-libs/nss-3.12.9
@@ -66,29 +68,29 @@ RDEPEND=">=sys-devel/binutils-2.16.1
DEPEND="${RDEPEND}"
-S="${WORKDIR}"/comm-central
-
-#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
-#}
+S="${WORKDIR}"/comm-miramar
+
+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
+}
pkg_setup() {
moz_pkgsetup
@@ -104,14 +106,16 @@ pkg_setup() {
src_unpack() {
unpack ${A}
-# linguas
-# for X in ${linguas}; do
-# # FIXME: Add support for unpacking xpis to portage
-# [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
-# done
-# if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
-# einfo "Selected language packs (first will be default): ${linguas}"
-# fi
+ if ! [[ ${PV} =~ alpha|beta ]]; then
+ linguas
+ for X in ${linguas}; do
+ # FIXME: Add support for unpacking xpis to portage
+ [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+ done
+ if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+ einfo "Selected language packs (first will be default): ${linguas}"
+ fi
+ fi
}
src_prepare() {
@@ -123,7 +127,6 @@ src_prepare() {
if use crypt ; then
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
cd "${S}"/mailnews/extensions/enigmail || die
- epatch "${FILESDIR}"/enigmail-1.1.2-20110124-locale-fixup.diff
./makemake -r 2&> /dev/null
sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in
cd "${S}"
@@ -244,10 +247,12 @@ src_install() {
unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi
fi
-# linguas
-# for X in ${linguas}; do
-# [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
-# done
+ if ! [[ ${PV} =~ alpha|beta ]]; then
+ linguas
+ for X in ${linguas}; do
+ [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+ done
+ fi
if ! use bindist; then
newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
next reply other threads:[~2011-06-06 14:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-06 14:16 Jory Pratt [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-08-30 14:14 [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/ Jory Pratt
2018-11-30 20:09 Ian Stakenvicius
2018-10-22 20:15 Ian Stakenvicius
2018-08-15 21:11 Ian Stakenvicius
2017-01-08 21:19 Jory Pratt
2016-10-06 16:31 Ian Stakenvicius
2015-06-10 1:31 Jory Pratt
2013-12-14 0:48 Jory Pratt
2013-09-23 21:14 Jory Pratt
2012-02-01 2:33 Jory Pratt
2011-12-11 22:50 Jory Pratt
2011-11-11 13:44 Jory Pratt
2011-10-02 23:48 Jory Pratt
2011-04-16 13:00 Jory Pratt
2011-04-10 20:01 Jory Pratt
2011-04-04 2:41 Jory Pratt
2011-03-28 20:12 Jory Pratt
2011-03-17 2:53 Jory Pratt
2011-03-06 2:42 Jory Pratt
2011-02-04 5:57 anarchy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5c93e126a3e94506b918907a8f3e322b2c68c900.anarchy@gentoo \
--to=anarchy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox