From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QTabX-0004HV-30 for garchives@archives.gentoo.org; Mon, 06 Jun 2011 14:16:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97AC51C00F; Mon, 6 Jun 2011 14:16:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 580FD1C00F for ; Mon, 6 Jun 2011 14:16:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1A7C1B4015 for ; Mon, 6 Jun 2011 14:16:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E8BD78003C for ; Mon, 6 Jun 2011 14:16:21 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <5c93e126a3e94506b918907a8f3e322b2c68c900.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/ X-VCS-Repository: proj/mozilla X-VCS-Files: mail-client/thunderbird/Manifest mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff mail-client/thunderbird/thunderbird-3.3_alpha3-r2.ebuild mail-client/thunderbird/thunderbird-5.0_beta1.ebuild X-VCS-Directories: mail-client/thunderbird/ mail-client/thunderbird/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 5c93e126a3e94506b918907a8f3e322b2c68c900 Date: Mon, 6 Jun 2011 14:16:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 82ad37c7e41cfa22e778f14932a3889a commit: 5c93e126a3e94506b918907a8f3e322b2c68c900 Author: Jory A. Pratt gentoo org> AuthorDate: Mon Jun 6 14:12:57 2011 +0000 Commit: Jory Pratt gentoo org> CommitDate: Mon Jun 6 14:12:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D5c93e126 update thunderbird for new beta --- mail-client/thunderbird/Manifest | 9 +- .../enigmail-1.1.2-20110124-locale-fixup.diff | 8 -- ...pha3-r2.ebuild =3D> thunderbird-5.0_beta1.ebuild} | 133 ++++++++++--= -------- 3 files changed, 73 insertions(+), 77 deletions(-) diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/M= anifest 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 8704469817cd93c= 99665a35655fa626b74253920 SHA1 708e101ae0576f99d6f10ac778fbc2b76c3ff6ea S= HA256 60627ed65b032e33935d14eea4c7224f940641c4a11ab8bdf2c5d6056a76bfda AUX icon/thunderbird-unbranded.desktop 277 RMD160 49301b139cddf8c88d7168= fa94229581e89f57fa SHA1 d8a6a4b41b7e62cf8b2e69d24f22c30dc80dfa29 SHA256 e= 31c806e820e33ed56d3ca112443c39b8506140c82bb57dd1a84c03b45fec598 AUX icon/thunderbird.desktop 267 RMD160 109313e3ae88d0cd991e831cafbb3f48= 56b84478 SHA1 861c4cd25a936078597b909bd444164fbf38c82c SHA256 d1e91cf5596= d3044e6a1089ce7e97b431eb1fb93afd7b353c6587fc8c4fc2a6f AUX thunderbird-gentoo-default-prefs-1.js 387 RMD160 5d7362448204c7ea6cf= 81b06446373097e358d44 SHA1 b3e706e3c24eda4d87e3f13bd4a43dfb45a3dfb3 SHA25= 6 ecf4bafbf81675abb01c3e0f0ab9fdf3c5722868ed0440670e2a530ca85f219c -DIST enigmail-1.2a1-20110316.tar.bz2 905604 RMD160 57bb867f70f6b37ee11d4= 26a8e155f2ccf5d56d2 SHA1 371e3c8bd7157ed8aee7648a271df591db75f8c2 SHA256 = 113db06ab1621328635c5394174afe02bef9c154c46b62ea7c605ac0a0b2beba -DIST thunderbird-3.3-patches-0.3.tar.bz2 5460 RMD160 6df630946d3e5ac19aa= 0ae88d13d696cc3327f1d SHA1 fd533e694e5046f0024af1e0331b4fad0b6b8948 SHA25= 6 ff92a0298112e00b71e2804e69be6461d97509703bf4293f1b794fd5e70eb750 -DIST thunderbird-3.3a3.source.tar.bz2 83692340 RMD160 79ec91e73d6f1e64f1= 6efae9c6ec333a2e54b220 SHA1 416c085e92a04c12c49b7f1ad41effb7ef24ece9 SHA2= 56 7f5487449023a68784d800fdd38c25d30356972b27b0a23c2ba162c149161618 -EBUILD thunderbird-3.3_alpha3-r2.ebuild 7858 RMD160 4d57358b4eed3e85bfee= ed09021997518e224299 SHA1 d337b9ac9a3c7c4416876848609ceae26c176dfe SHA256= f5840cf2f3f7d4dc975b5c253d207e07718acfc6ea318ff6be174b53da16694e +DIST enigmail-1.2a2-20110606.tar.bz2 925807 RMD160 ca2dcbb26970fa68ca1a7= 0649adb5f857c4bacca SHA1 6498fd008d6e781f4db28c9be5570c7c899b776b SHA256 = c0b2dbe040db273ccc70ec7e2ac7eac839664c08f51d66f21ef238bc80039f58 +DIST thunderbird-5.0-patches-0.1.tar.bz2 2660 RMD160 6a09ee90ace5c19a99f= 1dcd8041adc62b7003976 SHA1 a52d2bc593bf5f905cb61a3279fe61aee2a14247 SHA25= 6 89ac374408b4c8350cf09af5ce844ea1173546187018f588992a8ee48f339e36 +DIST thunderbird-5.0b1.source.tar.bz2 86519368 RMD160 2428eec8dd6d63b0f1= 9530efd95b4c4fc287e8a1 SHA1 1bb7891a53b825c2c172cd9ebd76f15110751767 SHA2= 56 5c45d276ec5c6df1e6cd1fad7fbb5a4fe2c930f085067383f99b053aca1640a7 +EBUILD thunderbird-5.0_beta1.ebuild 7781 RMD160 ead71cdb66e1162cc557ed55= 72bad91b05b59fe1 SHA1 e308368e6396e7ae121540430996cfe3634ef71e SHA256 1f0= 85b97604555e9bf5c67cfaf2c6d89fdd8fcda1545862feb41f5472367615f 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-local= e-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/m= ail-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: $ =20 EAPI=3D"3" WANT_AUTOCONF=3D"2.1" =20 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multili= b mozextension autotools pax-utils python =20 -# This list can be updated using get_langs.sh from the mozilla overlay -#LANGS=3D"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=3D"en-GB es-AR pt-BR zh-TW" - -MY_PV=3D"${PV/_alpha/a}" -MY_P=3D"${P/_alpha/a}" -EMVER=3D"1.2a1" +TB_PV=3D"${PV/_beta/b}" +TB_P=3D"${PN}-${TB_PV}" +EMVER=3D"1.2a2" =20 DESCRIPTION=3D"Thunderbird Mail Client" HOMEPAGE=3D"http://www.mozilla.com/en-US/thunderbird/" @@ -24,28 +18,36 @@ KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~spa= rc ~x86 ~x86-fbsd ~amd64-linu SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE=3D"bindist gconf +crashreporter +crypt +ipc +lightning mozdom" -PATCH=3D"${PN}-3.3-patches-0.3" +PATCH=3D"${PN}-5.0-patches-0.1" =20 REL_URI=3D"http://releases.mozilla.org/pub/mozilla.org/${PN}/releases" -SRC_URI=3D"${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2 - crypt? ( http://dev.gentoo.org/~anarchy/mozilla/firefox/enigmail-${EMVE= R}-20110316.tar.bz2 ) +SRC_URI=3D"${REL_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2 + crypt? ( http://dev.gentoo.org/~anarchy/mozilla/firefox/enigmail-${EMVE= R}-20110606.tar.bz2 ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" =20 -#for X in ${LANGS} ; do -# if [ "${X}" !=3D "en" ] && [ "${X}" !=3D "en-US" ]; then -# SRC_URI=3D"${SRC_URI} -# linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> $= {P}-${X}.xpi )" -# fi -# IUSE=3D"${IUSE} linguas_${X/-/_}" -# # english is handled internally -# if [ "${#X}" =3D=3D 5 ] && ! has ${X} ${NOSHORTLANGS}; then -# if [ "${X}" !=3D "en-US" ]; then -# SRC_URI=3D"${SRC_URI} -# linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> = ${P}-${X}.xpi )" -# fi -# IUSE=3D"${IUSE} linguas_${X%%-*}" -# fi -#done +if ! [[ ${PV} =3D~ alpha|beta ]]; then + # This list can be updated using get_langs.sh from the mozilla overlay + LANGS=3D"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=3D"en-GB es-AR pt-BR zh-TW" + + for X in ${LANGS} ; do + if [ "${X}" !=3D "en" ] && [ "${X}" !=3D "en-US" ]; then + SRC_URI=3D"${SRC_URI} + linguas_${X/-/_}? ( ${REL_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> $= {P}-${X}.xpi )" + fi + IUSE=3D"${IUSE} linguas_${X/-/_}" + # english is handled internally + if [ "${#X}" =3D=3D 5 ] && ! has ${X} ${NOSHORTLANGS}; then + if [ "${X}" !=3D "en-US" ]; then + SRC_URI=3D"${SRC_URI} + linguas_${X%%-*}? ( ${REL_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> = ${P}-${X}.xpi )" + fi + IUSE=3D"${IUSE} linguas_${X%%-*}" + fi + done +fi =20 RDEPEND=3D">=3Dsys-devel/binutils-2.16.1 >=3Ddev-libs/nss-3.12.9 @@ -66,29 +68,29 @@ RDEPEND=3D">=3Dsys-devel/binutils-2.16.1 =20 DEPEND=3D"${RDEPEND}" =20 -S=3D"${WORKDIR}"/comm-central - -#linguas() { -# local LANG SLANG -# for LANG in ${LINGUAS}; do -# if has ${LANG} en en_US; then -# has en ${linguas} || linguas=3D"${linguas:+"${linguas} "}en" -# continue -# elif has ${LANG} ${LANGS//-/_}; then -# has ${LANG//_/-} ${linguas} || linguas=3D"${linguas:+"${linguas} "}$= {LANG//_/-}" -# continue -# elif [[ " ${LANGS} " =3D=3D *" ${LANG}-"* ]]; then -# for X in ${LANGS}; do -# if [[ "${X}" =3D=3D "${LANG}-"* ]] && \ -# [[ " ${NOSHORTLANGS} " !=3D *" ${X} "* ]]; then -# has ${X} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${X}" -# continue 2 -# fi -# done -# fi -# ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" -# done -#} +S=3D"${WORKDIR}"/comm-miramar + +linguas() { + local LANG SLANG + for LANG in ${LINGUAS}; do + if has ${LANG} en en_US; then + has en ${linguas} || linguas=3D"${linguas:+"${linguas} "}en" + continue + elif has ${LANG} ${LANGS//-/_}; then + has ${LANG//_/-} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${= LANG//_/-}" + continue + elif [[ " ${LANGS} " =3D=3D *" ${LANG}-"* ]]; then + for X in ${LANGS}; do + if [[ "${X}" =3D=3D "${LANG}-"* ]] && \ + [[ " ${NOSHORTLANGS} " !=3D *" ${X} "* ]]; then + has ${X} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${X}" + continue 2 + fi + done + fi + ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" + done +} =20 pkg_setup() { moz_pkgsetup @@ -104,14 +106,16 @@ pkg_setup() { src_unpack() { unpack ${A} =20 -# linguas -# for X in ${linguas}; do -# # FIXME: Add support for unpacking xpis to portage -# [[ ${X} !=3D "en" ]] && xpi_unpack "${P}-${X}.xpi" -# done -# if [[ ${linguas} !=3D "" && ${linguas} !=3D "en" ]]; then -# einfo "Selected language packs (first will be default): ${linguas}" -# fi + if ! [[ ${PV} =3D~ alpha|beta ]]; then + linguas + for X in ${linguas}; do + # FIXME: Add support for unpacking xpis to portage + [[ ${X} !=3D "en" ]] && xpi_unpack "${P}-${X}.xpi" + done + if [[ ${linguas} !=3D "" && ${linguas} !=3D "en" ]]; then + einfo "Selected language packs (first will be default): ${linguas}" + fi + fi } =20 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 =20 -# linguas -# for X in ${linguas}; do -# [[ ${X} !=3D "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" -# done + if ! [[ ${PV} =3D~ alpha|beta ]]; then + linguas + for X in ${linguas}; do + [[ ${X} !=3D "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" + done + fi =20 if ! use bindist; then newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png = thunderbird-icon.png