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 1PlEfX-0000LK-TD for garchives@archives.gentoo.org; Fri, 04 Feb 2011 05:57:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42785E071C; Fri, 4 Feb 2011 05:57:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DC3CAE071C for ; Fri, 4 Feb 2011 05:57:11 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 60DBA1B407C for ; Fri, 4 Feb 2011 05:57:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 89A588006A for ; Fri, 4 Feb 2011 05:57:10 +0000 (UTC) To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Content-type: text/plain; charset=UTF-8 Message-ID: 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_alpha2.ebuild X-VCS-Directories: mail-client/thunderbird/ mail-client/thunderbird/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: e5d4683b70fb317c084e1ec0abf1abd4a17d8105 Date: Fri, 4 Feb 2011 05:57:10 +0000 (UTC) From: anarchy@gentoo.org 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: 27a3cd30d651a41d4c023fa948a92fc7 commit: e5d4683b70fb317c084e1ec0abf1abd4a17d8105 Author: Jory A. Pratt gentoo org> AuthorDate: Fri Feb 4 05:56:57 2011 +0000 Commit: Jory Pratt gentoo org> CommitDate: Fri Feb 4 05:56:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3De5d4683b70fb317c084e1ec0abf1abd4a17d8105 add enigmail support for tb-3.3a2 --- mail-client/thunderbird/Manifest | 4 +- .../enigmail-1.1.2-20110124-locale-fixup.diff | 8 +++ .../thunderbird/thunderbird-3.3_alpha2.ebuild | 47 ++++++++++++++= ++++-- 3 files changed, 54 insertions(+), 5 deletions(-) diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/M= anifest index 0b59fb5..f135ed8 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -2,12 +2,14 @@ AUX 1001-xulrunner_fix_jemalloc_vs_aslr.patch 1936 RMD1= 60 4edd9e5ab5082f86cb66ad AUX 2000-thunderbird_gentoo_install_dirs.patch 813 RMD160 802697aab947df= 43693d7330f5d83700a62a6b50 SHA1 d2621bc80130239d7d65562ce8de8488dcbf60e2 = SHA256 f663f3e59ac1752d681ed5d09bd599693009a65f603c89fa6d2e851b3487a8c4 AUX bug-606109.patch 1259 RMD160 6d3f5d354524268e34293e9ce2d8b173c47163a= f SHA1 e1488807cc61ec04b2caa50019c000ba5d077450 SHA256 f2e645dfaa03cabcf4= 6703be5bdeff8ee021694896465d3d263b038682dc0395 AUX cups-1.4.4-fixup.patch 5439 RMD160 e907f65012a88b0810979c0beda4244e8= 17835e6 SHA1 4099626a22b61802c958faad8171d506a95f9fca SHA256 501f95e278c2= fdf3dec2b5586a2dc5ae35d78557a0db9939a1501c4782e54be5 +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 libpng-1.4-support.patch 669 RMD160 88e3de516a1d30c42f12f6f9225f36c0= b2ec7c68 SHA1 0dad51d35b16ae36f3fc7a17b8c2ad9329eeba1f SHA256 81d60906b10= 3b7d58213c5ef4d4c9e53ea9c5d46b6dcbd993a3cd54d25627417 AUX system-cairo-fixup.patch 3364 RMD160 e823edc67c7d0984fed7645b09c417b= 93eb663ed SHA1 62b3f66be453a2fb13e2504858849aaef72bbb44 SHA256 fac11adcee= 4f506a005725a5741f55ba55810f7bcfc82fce5fba4317c84f4be5 AUX thunderbird-gentoo-default-prefs-1.js 387 RMD160 5d7362448204c7ea6cf= 81b06446373097e358d44 SHA1 b3e706e3c24eda4d87e3f13bd4a43dfb45a3dfb3 SHA25= 6 ecf4bafbf81675abb01c3e0f0ab9fdf3c5722868ed0440670e2a530ca85f219c AUX thunderbird-respect-ldflags.patch 1640 RMD160 889a63b2fb04878e99b2a1= 4d47713e47621ab334 SHA1 fec674ca325de52a547af336864b66e113fb2df7 SHA256 3= db9aea0cdfc77c6c7de20591a44b92eecb9636fdb6c45676a173905a8bd7ae1 +DIST enigmail-1.1.2-20110124.tar.bz2 862291 RMD160 6b7b4a9a4295c5d0b0ff1= 49d3750b3c059e29d47 SHA1 a4d81224def58e68ca6b8fc291b93d3598279096 SHA256 = 89c24933ccdf765d5a0928127a5139e3f800a2b5bf7c20020d0870e78e70f044 DIST thunderbird-3.1-patches-1.2.tar.bz2 3427 RMD160 354d9003e8132e0aaf7= 069aec84459ff28237f61 SHA1 36ad5f9af77eaacc02c7df744b5d2563fb54bed8 SHA25= 6 6586cf569b035bd1b9179036678a0cbedbf3def88ca7d69852451542b52693a0 DIST thunderbird-3.1.7-af.xpi 210611 RMD160 f14882bffe66cd8f41fc819e12f3= 85870268e42a SHA1 8d2042974e99cdae13873ffdba675fc43b485937 SHA256 6ab42b6= e69e0da306d165414ff3fe9fb51b124d29a41a3cf102a4c823257fb85 DIST thunderbird-3.1.7-ar.xpi 230312 RMD160 dd0f3a50977811eceb6ee0b71839= a5f673e04ad0 SHA1 cae652843c60fc2f769b9b94377b3e200cb76de7 SHA256 48073e7= d016781302283818fb3c2f34c8996e7fea76ec041c591ed73246cc45c @@ -57,4 +59,4 @@ DIST thunderbird-3.1.7-zh-TW.xpi 220637 RMD160 0b426807= 5f3e625f0f3a1ebc87605fd54 DIST thunderbird-3.1.7.source.tar.bz2 65948060 RMD160 c5e25004565decf146= 7a9b452139c0aedec4299e SHA1 c2d6cdedfe399c1ab41c00045e4fce835cc0b36f SHA2= 56 800fe263b3889d4e602ff48889036ad56e940fc792894aca10fa07db28b6e662 DIST thunderbird-3.3a2.source.tar.bz2 81657866 RMD160 c3378e9b97992665e3= f2a152c058fb2fa1a2fb6f SHA1 e9fb755875b49b0fb42554065840c59ddf6389be SHA2= 56 226f3406e934f82085897671d042b7c0b2b07bfe697f49086f71d8a13e646b12 EBUILD thunderbird-3.1.7-r2.ebuild 7831 RMD160 4619228769a31891bf0ae3b00= 2045f18f1f3bc44 SHA1 faefa67d3b1d223383ce0fc9328f523e663e7071 SHA256 b5ef= 015484c4d67a77e5c9b2a6c7f1a5ee4fd61b97a586dd07c735314185483f -EBUILD thunderbird-3.3_alpha2.ebuild 7811 RMD160 b7501875d7988aa489c80e0= 4b13c0583be49da4c SHA1 85a367d847c9b3f693493e75b0f117d8046e967a SHA256 57= 1b7abfa4ade9759cc1b0b0312041fefe42a7dc3a1553d0e280ba00b7119f41 +EBUILD thunderbird-3.3_alpha2.ebuild 9018 RMD160 406e3ac74ca2d0797931f97= 365d02c4579742787 SHA1 2632b1798136df348b149ebf5e446cc8e9df5a2b SHA256 55= 64b4be84365808158ef9675f08c9dc081d16e5f7d21ee575699432f792afa4 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 new file mode 100644 index 0000000..e5e52f1 --- /dev/null +++ b/mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.= diff @@ -0,0 +1,8 @@ +--- 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_alpha2.ebuild b/mail= -client/thunderbird/thunderbird-3.3_alpha2.ebuild index f3a0dae..f3fd549 100644 --- a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild +++ b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild @@ -15,6 +15,7 @@ inherit flag-o-matic toolchain-funcs eutils mozconfig-3= makeedit multilib mozext =20 MY_PV=3D"${PV/_alpha/a}" MY_P=3D"${P/_alpha/a}" +EMVER=3D"1.1.2" =20 DESCRIPTION=3D"Thunderbird Mail Client" HOMEPAGE=3D"http://www.mozilla.com/en-US/thunderbird/" @@ -26,7 +27,8 @@ IUSE=3D"+alsa +crypt bindist libnotify +lightning mozdo= m system-sqlite wifi" #PATCH=3D"${PN}-3.1-patches-1.2" =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" +SRC_URI=3D"${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2 + crypt? ( http://dev.gentoo.org/~polynomial-c/mozilla/enigmail-${EMVER}-= 20110124.tar.bz2 )" # http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" =20 #for X in ${LANGS} ; do @@ -56,9 +58,16 @@ RDEPEND=3D">=3Dsys-devel/binutils-2.16.1 libnotify? ( >=3Dx11-libs/libnotify-0.4 ) system-sqlite? ( >=3Ddev-db/sqlite-3.7.4[fts3,secure-delete,unlock-noti= fy] ) wifi? ( net-wireless/wireless-tools ) - !x11-plugins/lightning" - -PDEPEND=3D"crypt? ( >=3Dx11-plugins/enigmail-1.1 )" + !x11-plugins/lightning + crypt? ( || ( + ( >=3Dapp-crypt/gnupg-2.0 + || ( + app-crypt/pinentry[gtk] + app-crypt/pinentry[qt4] + ) + ) + =3Dapp-crypt/gnupg-1.4* + ) )" =20 S=3D"${WORKDIR}"/comm-central =20 @@ -114,6 +123,16 @@ src_prepare() { epatch "${FILESDIR}/2000-thunderbird_gentoo_install_dirs.patch" epatch "${FILESDIR}/system-cairo-fixup.patch" =20 + 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 + cd enigmail + ./makemake -r + sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in + cd "${S}" + fi + # Allow user to apply any additional patches without modifing ebuild epatch_user =20 @@ -142,6 +161,10 @@ src_configure() { # It doesn't compile on alpha without this LDFLAGS use alpha && append-ldflags "-Wl,--no-relax" =20 + if use crypt ; then + # omni.jar breaks enigmail=20 + mozconfig_annotate '' --enable-chrome-format=3Djar + fi mozconfig_annotate '' --enable-extensions=3D"${MEXTENSIONS}" mozconfig_annotate '' --enable-application=3Dmail mozconfig_annotate '' --with-default-mozilla-five-home=3D"${EPREFIX}${M= OZILLA_FIVE_HOME}" @@ -193,6 +216,12 @@ src_compile() { # Should the build use multiprocessing? Not enabled by default, as it t= ends to break [ "${WANT_MP}" =3D "true" ] && jobs=3D${MAKEOPTS} || jobs=3D"-j1" emake ${jobs} || die + + # Only build enigmail extension if crypt enabled. + if use crypt ; then + emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail fai= led" + emake -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail= xpi failed" + fi } =20 src_install() { @@ -200,6 +229,16 @@ src_install() { =20 emake DESTDIR=3D"${D}" install || die "emake install failed" =20 + if use crypt ; then + cd "${T}" || die + unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die + emid=3D$(sed -n '//!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) + + dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die + cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die + unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die + fi + if use lightning ; then declare emid emd1 emid2 =20