| 1 |
commit: e5d4683b70fb317c084e1ec0abf1abd4a17d8105 |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 4 05:56:57 2011 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 4 05:56:57 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=e5d4683b70fb317c084e1ec0abf1abd4a17d8105 |
| 7 |
|
| 8 |
add enigmail support for tb-3.3a2 |
| 9 |
|
| 10 |
--- |
| 11 |
mail-client/thunderbird/Manifest | 4 +- |
| 12 |
.../enigmail-1.1.2-20110124-locale-fixup.diff | 8 +++ |
| 13 |
.../thunderbird/thunderbird-3.3_alpha2.ebuild | 47 ++++++++++++++++++-- |
| 14 |
3 files changed, 54 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest |
| 17 |
index 0b59fb5..f135ed8 100644 |
| 18 |
--- a/mail-client/thunderbird/Manifest |
| 19 |
+++ b/mail-client/thunderbird/Manifest |
| 20 |
@@ -2,12 +2,14 @@ AUX 1001-xulrunner_fix_jemalloc_vs_aslr.patch 1936 RMD160 4edd9e5ab5082f86cb66ad |
| 21 |
AUX 2000-thunderbird_gentoo_install_dirs.patch 813 RMD160 802697aab947df43693d7330f5d83700a62a6b50 SHA1 d2621bc80130239d7d65562ce8de8488dcbf60e2 SHA256 f663f3e59ac1752d681ed5d09bd599693009a65f603c89fa6d2e851b3487a8c4 |
| 22 |
AUX bug-606109.patch 1259 RMD160 6d3f5d354524268e34293e9ce2d8b173c47163af SHA1 e1488807cc61ec04b2caa50019c000ba5d077450 SHA256 f2e645dfaa03cabcf46703be5bdeff8ee021694896465d3d263b038682dc0395 |
| 23 |
AUX cups-1.4.4-fixup.patch 5439 RMD160 e907f65012a88b0810979c0beda4244e817835e6 SHA1 4099626a22b61802c958faad8171d506a95f9fca SHA256 501f95e278c2fdf3dec2b5586a2dc5ae35d78557a0db9939a1501c4782e54be5 |
| 24 |
+AUX enigmail-1.1.2-20110124-locale-fixup.diff 125 RMD160 8704469817cd93c99665a35655fa626b74253920 SHA1 708e101ae0576f99d6f10ac778fbc2b76c3ff6ea SHA256 60627ed65b032e33935d14eea4c7224f940641c4a11ab8bdf2c5d6056a76bfda |
| 25 |
AUX icon/thunderbird-unbranded.desktop 277 RMD160 49301b139cddf8c88d7168fa94229581e89f57fa SHA1 d8a6a4b41b7e62cf8b2e69d24f22c30dc80dfa29 SHA256 e31c806e820e33ed56d3ca112443c39b8506140c82bb57dd1a84c03b45fec598 |
| 26 |
AUX icon/thunderbird.desktop 267 RMD160 109313e3ae88d0cd991e831cafbb3f4856b84478 SHA1 861c4cd25a936078597b909bd444164fbf38c82c SHA256 d1e91cf5596d3044e6a1089ce7e97b431eb1fb93afd7b353c6587fc8c4fc2a6f |
| 27 |
AUX libpng-1.4-support.patch 669 RMD160 88e3de516a1d30c42f12f6f9225f36c0b2ec7c68 SHA1 0dad51d35b16ae36f3fc7a17b8c2ad9329eeba1f SHA256 81d60906b103b7d58213c5ef4d4c9e53ea9c5d46b6dcbd993a3cd54d25627417 |
| 28 |
AUX system-cairo-fixup.patch 3364 RMD160 e823edc67c7d0984fed7645b09c417b93eb663ed SHA1 62b3f66be453a2fb13e2504858849aaef72bbb44 SHA256 fac11adcee4f506a005725a5741f55ba55810f7bcfc82fce5fba4317c84f4be5 |
| 29 |
AUX thunderbird-gentoo-default-prefs-1.js 387 RMD160 5d7362448204c7ea6cf81b06446373097e358d44 SHA1 b3e706e3c24eda4d87e3f13bd4a43dfb45a3dfb3 SHA256 ecf4bafbf81675abb01c3e0f0ab9fdf3c5722868ed0440670e2a530ca85f219c |
| 30 |
AUX thunderbird-respect-ldflags.patch 1640 RMD160 889a63b2fb04878e99b2a14d47713e47621ab334 SHA1 fec674ca325de52a547af336864b66e113fb2df7 SHA256 3db9aea0cdfc77c6c7de20591a44b92eecb9636fdb6c45676a173905a8bd7ae1 |
| 31 |
+DIST enigmail-1.1.2-20110124.tar.bz2 862291 RMD160 6b7b4a9a4295c5d0b0ff149d3750b3c059e29d47 SHA1 a4d81224def58e68ca6b8fc291b93d3598279096 SHA256 89c24933ccdf765d5a0928127a5139e3f800a2b5bf7c20020d0870e78e70f044 |
| 32 |
DIST thunderbird-3.1-patches-1.2.tar.bz2 3427 RMD160 354d9003e8132e0aaf7069aec84459ff28237f61 SHA1 36ad5f9af77eaacc02c7df744b5d2563fb54bed8 SHA256 6586cf569b035bd1b9179036678a0cbedbf3def88ca7d69852451542b52693a0 |
| 33 |
DIST thunderbird-3.1.7-af.xpi 210611 RMD160 f14882bffe66cd8f41fc819e12f385870268e42a SHA1 8d2042974e99cdae13873ffdba675fc43b485937 SHA256 6ab42b6e69e0da306d165414ff3fe9fb51b124d29a41a3cf102a4c823257fb85 |
| 34 |
DIST thunderbird-3.1.7-ar.xpi 230312 RMD160 dd0f3a50977811eceb6ee0b71839a5f673e04ad0 SHA1 cae652843c60fc2f769b9b94377b3e200cb76de7 SHA256 48073e7d016781302283818fb3c2f34c8996e7fea76ec041c591ed73246cc45c |
| 35 |
@@ -57,4 +59,4 @@ DIST thunderbird-3.1.7-zh-TW.xpi 220637 RMD160 0b4268075f3e625f0f3a1ebc87605fd54 |
| 36 |
DIST thunderbird-3.1.7.source.tar.bz2 65948060 RMD160 c5e25004565decf1467a9b452139c0aedec4299e SHA1 c2d6cdedfe399c1ab41c00045e4fce835cc0b36f SHA256 800fe263b3889d4e602ff48889036ad56e940fc792894aca10fa07db28b6e662 |
| 37 |
DIST thunderbird-3.3a2.source.tar.bz2 81657866 RMD160 c3378e9b97992665e3f2a152c058fb2fa1a2fb6f SHA1 e9fb755875b49b0fb42554065840c59ddf6389be SHA256 226f3406e934f82085897671d042b7c0b2b07bfe697f49086f71d8a13e646b12 |
| 38 |
EBUILD thunderbird-3.1.7-r2.ebuild 7831 RMD160 4619228769a31891bf0ae3b002045f18f1f3bc44 SHA1 faefa67d3b1d223383ce0fc9328f523e663e7071 SHA256 b5ef015484c4d67a77e5c9b2a6c7f1a5ee4fd61b97a586dd07c735314185483f |
| 39 |
-EBUILD thunderbird-3.3_alpha2.ebuild 7811 RMD160 b7501875d7988aa489c80e04b13c0583be49da4c SHA1 85a367d847c9b3f693493e75b0f117d8046e967a SHA256 571b7abfa4ade9759cc1b0b0312041fefe42a7dc3a1553d0e280ba00b7119f41 |
| 40 |
+EBUILD thunderbird-3.3_alpha2.ebuild 9018 RMD160 406e3ac74ca2d0797931f97365d02c4579742787 SHA1 2632b1798136df348b149ebf5e446cc8e9df5a2b SHA256 5564b4be84365808158ef9675f08c9dc081d16e5f7d21ee575699432f792afa4 |
| 41 |
|
| 42 |
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 |
| 43 |
new file mode 100644 |
| 44 |
index 0000000..e5e52f1 |
| 45 |
--- /dev/null |
| 46 |
+++ b/mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff |
| 47 |
@@ -0,0 +1,8 @@ |
| 48 |
+--- enigmail/lang/current-languages.txt |
| 49 |
++++ enigmail/lang/current-languages.txt |
| 50 |
+@@ -1,5 +1,4 @@ |
| 51 |
+ ar |
| 52 |
+-bg-BG |
| 53 |
+ ca |
| 54 |
+ cs-CZ |
| 55 |
+ de-AT |
| 56 |
|
| 57 |
diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild |
| 58 |
index f3a0dae..f3fd549 100644 |
| 59 |
--- a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild |
| 60 |
+++ b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild |
| 61 |
@@ -15,6 +15,7 @@ inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozext |
| 62 |
|
| 63 |
MY_PV="${PV/_alpha/a}" |
| 64 |
MY_P="${P/_alpha/a}" |
| 65 |
+EMVER="1.1.2" |
| 66 |
|
| 67 |
DESCRIPTION="Thunderbird Mail Client" |
| 68 |
HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/" |
| 69 |
@@ -26,7 +27,8 @@ IUSE="+alsa +crypt bindist libnotify +lightning mozdom system-sqlite wifi" |
| 70 |
#PATCH="${PN}-3.1-patches-1.2" |
| 71 |
|
| 72 |
REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases" |
| 73 |
-SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2" |
| 74 |
+SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2 |
| 75 |
+ crypt? ( http://dev.gentoo.org/~polynomial-c/mozilla/enigmail-${EMVER}-20110124.tar.bz2 )" |
| 76 |
# http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" |
| 77 |
|
| 78 |
#for X in ${LANGS} ; do |
| 79 |
@@ -56,9 +58,16 @@ RDEPEND=">=sys-devel/binutils-2.16.1 |
| 80 |
libnotify? ( >=x11-libs/libnotify-0.4 ) |
| 81 |
system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify] ) |
| 82 |
wifi? ( net-wireless/wireless-tools ) |
| 83 |
- !x11-plugins/lightning" |
| 84 |
- |
| 85 |
-PDEPEND="crypt? ( >=x11-plugins/enigmail-1.1 )" |
| 86 |
+ !x11-plugins/lightning |
| 87 |
+ crypt? ( || ( |
| 88 |
+ ( >=app-crypt/gnupg-2.0 |
| 89 |
+ || ( |
| 90 |
+ app-crypt/pinentry[gtk] |
| 91 |
+ app-crypt/pinentry[qt4] |
| 92 |
+ ) |
| 93 |
+ ) |
| 94 |
+ =app-crypt/gnupg-1.4* |
| 95 |
+ ) )" |
| 96 |
|
| 97 |
S="${WORKDIR}"/comm-central |
| 98 |
|
| 99 |
@@ -114,6 +123,16 @@ src_prepare() { |
| 100 |
epatch "${FILESDIR}/2000-thunderbird_gentoo_install_dirs.patch" |
| 101 |
epatch "${FILESDIR}/system-cairo-fixup.patch" |
| 102 |
|
| 103 |
+ if use crypt ; then |
| 104 |
+ mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail |
| 105 |
+ cd "${S}"/mailnews/extensions/enigmail || die |
| 106 |
+ epatch "${FILESDIR}"/enigmail-1.1.2-20110124-locale-fixup.diff |
| 107 |
+ cd enigmail |
| 108 |
+ ./makemake -r |
| 109 |
+ sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in |
| 110 |
+ cd "${S}" |
| 111 |
+ fi |
| 112 |
+ |
| 113 |
# Allow user to apply any additional patches without modifing ebuild |
| 114 |
epatch_user |
| 115 |
|
| 116 |
@@ -142,6 +161,10 @@ src_configure() { |
| 117 |
# It doesn't compile on alpha without this LDFLAGS |
| 118 |
use alpha && append-ldflags "-Wl,--no-relax" |
| 119 |
|
| 120 |
+ if use crypt ; then |
| 121 |
+ # omni.jar breaks enigmail |
| 122 |
+ mozconfig_annotate '' --enable-chrome-format=jar |
| 123 |
+ fi |
| 124 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
| 125 |
mozconfig_annotate '' --enable-application=mail |
| 126 |
mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}" |
| 127 |
@@ -193,6 +216,12 @@ src_compile() { |
| 128 |
# Should the build use multiprocessing? Not enabled by default, as it tends to break |
| 129 |
[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1" |
| 130 |
emake ${jobs} || die |
| 131 |
+ |
| 132 |
+ # Only build enigmail extension if crypt enabled. |
| 133 |
+ if use crypt ; then |
| 134 |
+ emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed" |
| 135 |
+ emake -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed" |
| 136 |
+ fi |
| 137 |
} |
| 138 |
|
| 139 |
src_install() { |
| 140 |
@@ -200,6 +229,16 @@ src_install() { |
| 141 |
|
| 142 |
emake DESTDIR="${D}" install || die "emake install failed" |
| 143 |
|
| 144 |
+ if use crypt ; then |
| 145 |
+ cd "${T}" || die |
| 146 |
+ unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die |
| 147 |
+ emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) |
| 148 |
+ |
| 149 |
+ dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die |
| 150 |
+ cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die |
| 151 |
+ unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die |
| 152 |
+ fi |
| 153 |
+ |
| 154 |
if use lightning ; then |
| 155 |
declare emid emd1 emid2 |
Archives