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, 28 Mar 2011 20:12:33 +0000 (UTC) [thread overview]
Message-ID: <6c742e005094beea67a78f837cd55faee94f7c40.anarchy@gentoo> (raw)
commit: 6c742e005094beea67a78f837cd55faee94f7c40
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 20:12:29 2011 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 20:12:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=6c742e00
fix automagic dep of gconf on thunderbird
---
mail-client/thunderbird/Manifest | 51 +----
.../thunderbird-3.3-gconf-config-update.patch | 50 ++++
mail-client/thunderbird/thunderbird-3.1.9.ebuild | 238 --------------------
...ha3.ebuild => thunderbird-3.3_alpha3-r1.ebuild} | 7 +-
4 files changed, 57 insertions(+), 289 deletions(-)
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 73381a2..2c75f90 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -6,55 +6,8 @@ AUX icon/thunderbird-unbranded.desktop 277 RMD160 49301b139cddf8c88d7168fa942295
AUX icon/thunderbird.desktop 267 RMD160 109313e3ae88d0cd991e831cafbb3f4856b84478 SHA1 861c4cd25a936078597b909bd444164fbf38c82c SHA256 d1e91cf5596d3044e6a1089ce7e97b431eb1fb93afd7b353c6587fc8c4fc2a6f
AUX libnotify-0.7.patch 1809 RMD160 5d88eedd2769b3cf318f759717df75444a823fcb SHA1 41c1c7f7b0259cf1857f9d38b1d5be0c1027c304 SHA256 97fb2338cd5e813afef08a128358c5702cb63e5399afca3004b20b863ab8281b
AUX libpng-1.4-support.patch 669 RMD160 88e3de516a1d30c42f12f6f9225f36c0b2ec7c68 SHA1 0dad51d35b16ae36f3fc7a17b8c2ad9329eeba1f SHA256 81d60906b103b7d58213c5ef4d4c9e53ea9c5d46b6dcbd993a3cd54d25627417
+AUX thunderbird-3.3-gconf-config-update.patch 1569 RMD160 e237530c4d95de84aa295927fd1c703d8a54b9a9 SHA1 6f78524f88fd7b3f4fef4eec1666eabe96c89992 SHA256 9da47f2752f7bb353297b93be3aaecf2d6004af3c91717d22e35a347ee6cf2a2
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.1-patches-1.2.tar.bz2 3427 RMD160 354d9003e8132e0aaf7069aec84459ff28237f61 SHA1 36ad5f9af77eaacc02c7df744b5d2563fb54bed8 SHA256 6586cf569b035bd1b9179036678a0cbedbf3def88ca7d69852451542b52693a0
-DIST thunderbird-3.1.9-af.xpi 210605 RMD160 c2d36af032e89c3422ffed329c81119a6323c1dc SHA1 c4c63c458ff0ee3ac159e6993cb3895deaf471d6 SHA256 e7c10eec1f1d75f4daf010d721aba50766a8be3e2c90248c69d412c2c3468255
-DIST thunderbird-3.1.9-ar.xpi 230363 RMD160 82cd47a2d3caa37442ba0734bc8958cfb0ab0ffb SHA1 14fe03fa047f764fc43dfb9853c48494c65d26b5 SHA256 88ebac284316a33b8a97a7528cde1b1b476cc2c8ec3804c53f1b6bd1f8f9b74c
-DIST thunderbird-3.1.9-be.xpi 194405 RMD160 68694e68eeacbf837e40f643a652a714cb00a35b SHA1 11cb3c542ee233bf52ff27b340dd3b1cbe85e34f SHA256 b082f4b12d565d465b062d28bf5f41a763cc2602cc706beab89c8f2bdaeca1a6
-DIST thunderbird-3.1.9-bg.xpi 235177 RMD160 479d1478f2f2e72ad40cbaa851783a2f1f5f7632 SHA1 8db7ab7219b3dfa4cb82a4c25f591521f90c88d9 SHA256 e26e6e2aa084744327073f5ce04c43c1723c4db1e75fb3641d1edf7b0aa00bb7
-DIST thunderbird-3.1.9-bn-BD.xpi 244795 RMD160 e254f4141f7ce2c0636467bf9c176d09bfeb915d SHA1 654db9ddd1feab8c03f1645c39d6803593592046 SHA256 d267ccaeb36cf64c8993f1492544e75652bc397d333b8e9ff5d512cf542e9fd8
-DIST thunderbird-3.1.9-ca.xpi 219304 RMD160 62eb12134a3e15a4f0126d4a3ce1b743f8a08538 SHA1 0d5fc7c0c11ee837116ffd1878b13a1cb59f6d75 SHA256 e35cf1156f1413d650d66103239e263e71b63ccdfde96edaf1b8e31a0c62e79f
-DIST thunderbird-3.1.9-cs.xpi 218173 RMD160 c0b82b64d49174e3c4d7830fc49d0a2c1993fd39 SHA1 579757beee8e1b3734e92daa4dbdbe7db39baf73 SHA256 90108dec5cecdefcd04ea86c1e57cdaa684f5353a2ddbdef56922229bcde1438
-DIST thunderbird-3.1.9-da.xpi 203183 RMD160 b3a8685a600d4263ddf33ca118ec39ec5f0b5361 SHA1 8176f12ecf7e680d649138d4711415aab60a3a5a SHA256 fc580a0740c38f924cdabbfa0005c344809375cc4f5e033e95f38d0c053e2aec
-DIST thunderbird-3.1.9-de.xpi 222766 RMD160 023f25533f30b3eb8f4ef0f7738a2cace5ab6d65 SHA1 cde1e01e9b174ab49f027465181a7b03869382ad SHA256 d8e65f743c842a0696ca51eef59ce9b3fcf7bf6181382569ee269f05aa810f52
-DIST thunderbird-3.1.9-el.xpi 210118 RMD160 0fdf49e4a3122c1f35ef474c99eecb9d68e4a34a SHA1 72e172d02553e0cacd8809d1605492ff9a1a2fcd SHA256 5e0ca68be63e3ac6faf0e39fd193e4ee71fd50dfc15c97ef01bc183c347a1e8b
-DIST thunderbird-3.1.9-en-GB.xpi 203621 RMD160 5b1ad9f6dfe7a037df86a3392ac9fc04ca5b3206 SHA1 39ba6b47464cfb5aed7444f4144e5ca2991c4d4d SHA256 35c7493a5e3e8cfea0a3ef49ef3591527dbe593a73e0faf27d5d59cd16408d88
-DIST thunderbird-3.1.9-es-AR.xpi 218630 RMD160 40a7d9589b40f036ea7f2706d751d0f45c6e5d6c SHA1 ffab52a9a90561882e1d27b4b550b6e5d7da705d SHA256 3a1a530035bdba2231ba29bdafd3fa36edbb13322d3aeddbead73ac007a08f3e
-DIST thunderbird-3.1.9-es-ES.xpi 172870 RMD160 f43a8b84dcb81e4276ceb83ea091a4eaa1c7d7e1 SHA1 3b26cb059fc554fa7365c6350d0b4607b2ba5c5c SHA256 27925c8fcb67381449304f6aa31a1406e4269d711ee74435f5aabf9131c9275e
-DIST thunderbird-3.1.9-et.xpi 221750 RMD160 15503f606389cad008515bbbf725caff5ba10298 SHA1 34ccb3cda1711909c521ea51a851ededa2761f37 SHA256 c75b3fe61301c189cb3179907eb508a672069abaff3d61a11aa64302974fe64e
-DIST thunderbird-3.1.9-eu.xpi 211280 RMD160 bc98a7b5aa8d6a1caa7bed5ad6faa32d8b83dd4c SHA1 3a01f921bf6a9df8772963c40c0ae02fcf896836 SHA256 332ce6aafd91e9d705fc9546a67cf277a03f78d600f6f891f498933d8b71618d
-DIST thunderbird-3.1.9-fi.xpi 219472 RMD160 b6a39c444668b8fa2094ceaae756281101e0d893 SHA1 e7c3a08da578dfd3e38a8007cd0e98c7e8233dc0 SHA256 db3881dfbb88f5648df2b826e0fce6db96ff6dfd7e75805d25c537e89ebf874f
-DIST thunderbird-3.1.9-fr.xpi 221707 RMD160 e9c9bec1f6f937485f8ee25fe37f4f043dd1d825 SHA1 4d8ad3b37a4c6a86017b68b164f27b521fb0067a SHA256 3da6453df46698984f9f7dbcbf0d2ca7cab819f2e6a51cc1882bb235d70371c4
-DIST thunderbird-3.1.9-fy-NL.xpi 220851 RMD160 ab8015f80f1a3cf2483eb00246084ee13d58ca1a SHA1 4549a80493409b0d26947ce8b02b8a769f2f1f0a SHA256 c9e6dc651480689f7a4ad70bbee8f828c7f858952c60dc61b66d43fda912c754
-DIST thunderbird-3.1.9-ga-IE.xpi 219424 RMD160 e2243bd59e8d38a0f4e93f3c182c4fdb81001be4 SHA1 1c6a1b8106286576030982c3f41116bc4466fc3a SHA256 3f15932c1b121ce03c72d2f60ea61fad171d0664277b4eec02cb05042598873b
-DIST thunderbird-3.1.9-he.xpi 204911 RMD160 18a4a551ed4ac4dcbf049dd927709f9dd42b80d8 SHA1 f6604002db2dcad339040e4548fb4841129d794d SHA256 1456b8319fb4e88ea0251699d7425e276e1a1ceaea9d889b86380ee350f05e0a
-DIST thunderbird-3.1.9-hu.xpi 226082 RMD160 9459b6762b0c6208330baaf01ad3fc0656aedba7 SHA1 d6d7023a2b09925d01d84a0cca83ec6454cd1673 SHA256 5fbceab200f0c59387582a5b341eadf3c842bd036141c354c151621a31878771
-DIST thunderbird-3.1.9-id.xpi 185890 RMD160 3f7825be46b926ab4711d26a0d51d5d799320969 SHA1 c97042852c5d6d53c8a0690d6054bb979a9e67f1 SHA256 830eb15912381c11446e52610e30c14194f9554c79f7eb81ae32a8195a8afa0b
-DIST thunderbird-3.1.9-is.xpi 214006 RMD160 cee5d4f3f26750ecab796036d626d065e016500d SHA1 4cef4c87f8197f7db94c6cd549da50ffc2e4b281 SHA256 dd4ece5d22e028520cc8889fa0d25b32229d935a7f4f3b43844164230fa0eb17
-DIST thunderbird-3.1.9-it.xpi 171390 RMD160 57711be79446d5e6742c7531a822f1ddcfe5baa9 SHA1 bf762028135bf55202f50d0fa454de51541b8f5f SHA256 3e1356acf6f6ae390050983a53513c585f3853ea9ca2c69ee766bb0a87a6cab2
-DIST thunderbird-3.1.9-ja.xpi 236562 RMD160 01049ca8e0d507e520410a6aac8448e8dedb7886 SHA1 437bf425c87461584424141d7030191148a523f5 SHA256 a3a5ddb49abbbfa5a6cd10f9d0943a529fc9737d669570e54012a3475faab570
-DIST thunderbird-3.1.9-ko.xpi 194723 RMD160 ed272bc9886519831466d37ae6a2719a480107e3 SHA1 b7e1c8a57f1f2ba4a12a40d3600d8f2cc424b611 SHA256 8125525b3f5f4632094a36ed124327d8fec0adbc358c0caacbe82f25588636aa
-DIST thunderbird-3.1.9-lt.xpi 235289 RMD160 f8df4fab497a1942bf1f264f15120302198f820e SHA1 1c08e652eedd5ce9a6cca729bd2565a5345a830a SHA256 5dd8935581ad778f9d265847d3840e82e433fdb92df92d18644b79e5214ffc2f
-DIST thunderbird-3.1.9-nb-NO.xpi 213870 RMD160 bfcd987ecd21db617b9a36ba05663bf7645c1923 SHA1 c01da35297885d21fd32424165d746208b25cc74 SHA256 6efd6cf6f030ec71a5cb32423815f4e7bb0782e866d8e8d62eeef89cc6dc25a7
-DIST thunderbird-3.1.9-nl.xpi 216627 RMD160 41025cbbb2cf439bfff94cd7094822963f40b1e8 SHA1 1695bcfffe6ee3e6d332c5ca253dccf44d5a3743 SHA256 47a39bbb1bbad0609f639d530184887061d1388aa16eb5593e884e8ac6facc8a
-DIST thunderbird-3.1.9-nn-NO.xpi 215631 RMD160 08aebe614c21135e25280e7244026dfcfe83a8e8 SHA1 f381a468471930fa40793d57aa3d019fd2246dd7 SHA256 af1771f8a8bd02120e841c4e112202958ae4feef3aeb532c738b3618360ca002
-DIST thunderbird-3.1.9-pa-IN.xpi 241097 RMD160 50c8ddfcf4f92a188c9448123688db3f3762fb2c SHA1 b9622a3bf85e5f20fa7c7c1b129a7423c5986cc9 SHA256 b7ac5f93603f89752a070688dad3eeb2dfbcc259a5a93b20243855e9c66963cd
-DIST thunderbird-3.1.9-pl.xpi 203928 RMD160 73ab4c18464a8dd1b508562f74ecb0e7b8ad1b5c SHA1 ffa7ac89aed5168b1203e2460e882a3ffbb65caf SHA256 cc0db5cd192624d19db3356dd7a2a4a121469c524641475255f08268eb968947
-DIST thunderbird-3.1.9-pt-BR.xpi 215015 RMD160 32703934ade8e0617eaa8db9e7b8bc158b37750a SHA1 cd8238b164c20a4533253aa335cc2a63f257ad19 SHA256 205cfd565a98a5155d6f9a6e0d52c4edf53e3974b2a72450d8a2efb7eddcba02
-DIST thunderbird-3.1.9-pt-PT.xpi 214278 RMD160 b3781bc650602f5e4003b6ab96b71a021be18c76 SHA1 213d21d63bc01491b1484e99c28e433f906dbeaa SHA256 9bbd81d0ab439ecf8c96ca3bbff758c539f94894a4013b4c0aafa8abbfafddd4
-DIST thunderbird-3.1.9-ro.xpi 221192 RMD160 acdcdbca982ac386f49fb6c08eae0c5239e368b2 SHA1 9f0a21893431c115b9010f40185df7088dd16821 SHA256 9df61bedf440a1d4b83d47cb7e45d9cdd22ec47e3f4f73b9f24f95878c603e38
-DIST thunderbird-3.1.9-ru.xpi 198135 RMD160 24d05d112707aaeece1d34cdab0e09765b309748 SHA1 ebd615f1b99d713484c05733867e0e4067fb242e SHA256 0ecf1ddec6ee8abe6b425c8dd9d7c132fa611413a5734d717ab1835bb23859d1
-DIST thunderbird-3.1.9-si.xpi 246147 RMD160 217a55bc273de84cf84a97e09f289936c7e45cbc SHA1 b19a9f9cdcbf1c3fdb996e9a91979a4fd9d2c122 SHA256 701e21102b04883bcc6a398d85b54a1c218f93e322d9563a496d05aea6c62f90
-DIST thunderbird-3.1.9-sk.xpi 224544 RMD160 6abf5e623d6bd573c65fb5d55a4ea258177bbb26 SHA1 dfae35b86280aa57bc9a1e774f4beef98b3e9b15 SHA256 82a6286bbe7fb28d294b1d05ab416d10e529fb2de80934035079981bb3753599
-DIST thunderbird-3.1.9-sl.xpi 218470 RMD160 30222dcd01e9a3575feee3446ae75e91ebe64b9b SHA1 c4d38c5277c8cad4cf49ceee57d8ff5c0655ec9e SHA256 67f2c184889df341f3174dc5e455f81b5a18587f243d84b51e6466955bd77dd1
-DIST thunderbird-3.1.9-sq.xpi 211241 RMD160 5c966d5e0cd414684628bc16a30a5ff8c4ccfd34 SHA1 e4eec499a7368a72197553fe7ad14bee468d9b88 SHA256 099372c70d4b01d94ae3406a65dba1eca0f4164f874e3b96cbeef86debac9bf7
-DIST thunderbird-3.1.9-sv-SE.xpi 221165 RMD160 1d988d15ba87ae402961bdea1d152ae91e9dbdce SHA1 c7ea922d053b1c99077dc87db08e2019b330ae0a SHA256 99306080067b73b0af98e26659513dad7b9c9e27bc13fe2574373fff9d56199c
-DIST thunderbird-3.1.9-tr.xpi 215742 RMD160 f02292921c5121b879d6e8f4280759b4171f0081 SHA1 d7e0561f906649072ca5bf4e116aff7f93115d80 SHA256 6f16ac87bbe6fceec53da967522d2ddcc5d02f00500e22d8942c39b98b6cc97d
-DIST thunderbird-3.1.9-uk.xpi 244831 RMD160 87f7f8ab4c93cc4afb10ae8b95e3402c3ce4ce4f SHA1 bd64d0ae92d19231d292d9bba62a87b721a2b825 SHA256 5198224eede7e5a9364c416fdff8e70b53a4df0c135ab6ee15bab73bc74d482e
-DIST thunderbird-3.1.9-zh-CN.xpi 219646 RMD160 a48694168186adec3841840390bbffd772e7211a SHA1 469270dd5b5f4c6efdfd9856b1cb438ae4806337 SHA256 c700b7b46fd66142a0b8afe979dc7eed86354a2d1f996aabb7f649e19511172a
-DIST thunderbird-3.1.9-zh-TW.xpi 220577 RMD160 d13efbae626df159e32e17b40134f082451d013d SHA1 41f064ed29960c57f4e0d2c9676d3e8557f43a2b SHA256 029e44c508e71056c9e6ce9045cc935cba40c714840755dff99bc9efc131a70a
-DIST thunderbird-3.1.9.source.tar.bz2 68760361 RMD160 9c85e4b76929792a7c2c8cbc0435c86cb9961a4d SHA1 22b153102939430180ae1873ce15ef52286ff08d SHA256 8b499ec3d81d3242b0cc2de27effb1891a07259adf7e5e4c06150f8c9f5254c2
DIST thunderbird-3.3a3.source.tar.bz2 83692340 RMD160 79ec91e73d6f1e64f16efae9c6ec333a2e54b220 SHA1 416c085e92a04c12c49b7f1ad41effb7ef24ece9 SHA256 7f5487449023a68784d800fdd38c25d30356972b27b0a23c2ba162c149161618
-EBUILD thunderbird-3.1.9.ebuild 6919 RMD160 be58947bcaa8cd79be14ca7d604f4dd87ee7e515 SHA1 99bf98735225e17cc80e92d880541ac82bd10426 SHA256 a91d1a32df6c36bae2533fd312d7b551776e885ebed44d675fa336c1159d553a
-EBUILD thunderbird-3.3_alpha3.ebuild 7695 RMD160 ef0813c9c83025c4434cfac88ea52c6c3f03e858 SHA1 0b9f27b8a07f9a49abef83f63460f944d7c76bbd SHA256 fc5707889ac439b615cd6e173e12a3b7cf6ea0cee5fae3cb44d723732c8fb48a
+EBUILD thunderbird-3.3_alpha3-r1.ebuild 7845 RMD160 274d36893468fc4fe20c80099d6982f1296c1de9 SHA1 6b9f4cd50a98fd6f96c15d9d36d1f54e7999dd39 SHA256 6861bc566c6301603bae14ac1e4c1267c82f87980a8704cba384d4871892a6bc
diff --git a/mail-client/thunderbird/files/thunderbird-3.3-gconf-config-update.patch b/mail-client/thunderbird/files/thunderbird-3.3-gconf-config-update.patch
new file mode 100644
index 0000000..8bb7237
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird-3.3-gconf-config-update.patch
@@ -0,0 +1,50 @@
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -5031,16 +5031,21 @@ then
+ fi
+ MOZ_ENABLE_GIO=
+ ])
+ fi
+
+ dnl ========================================================
+ dnl = GConf support module
+ dnl ========================================================
++ MOZ_ARG_DISABLE_BOOL(gconf,
++ [ --disable-gconf Disable Gconf support ],
++ MOZ_ENABLE_GCONF=,
++ MOZ_ENABLE_GCONF=force)
++
+ if test "$MOZ_ENABLE_GCONF"
+ then
+ PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
+ MOZ_ENABLE_GCONF=1
+ ],[
+ MOZ_ENABLE_GCONF=
+ ])
+ fi
+diff --git a/mozilla/configure.in b/mozilla/configure.in
+--- a/mozilla/configure.in
++++ b/mozilla/configure.in
+@@ -5701,16 +5701,21 @@ then
+
+ AC_SUBST(MOZ_ENABLE_GIO)
+ AC_SUBST(MOZ_GIO_CFLAGS)
+ AC_SUBST(MOZ_GIO_LIBS)
+
+ dnl ========================================================
+ dnl = GConf support module
+ dnl ========================================================
++ MOZ_ARG_DISABLE_BOOL(gconf,
++ [ --disable-gconf Disable Gconf support ],
++ MOZ_ENABLE_GCONF=,
++ MOZ_ENABLE_GCONF=force)
++
+ if test "$MOZ_ENABLE_GCONF"
+ then
+ PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
+ MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'`
+ MOZ_ENABLE_GCONF=1
+ ],[
+ if test "$MOZ_ENABLE_GCONF" = "force"
+ then
diff --git a/mail-client/thunderbird/thunderbird-3.1.9.ebuild b/mail-client/thunderbird/thunderbird-3.1.9.ebuild
deleted file mode 100644
index 9a9f975..0000000
--- a/mail-client/thunderbird/thunderbird-3.1.9.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.9.ebuild,v 1.1 2011/03/06 01:07:48 anarchy Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools python pax-utils
-
-# 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/_rc/rc}"
-MY_P="${P/_rc/rc}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="ldap bindist +crypt +lightning mozdom"
-PATCH="${PN}-3.1-patches-1.2"
-
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"
-SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.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
-
-RDEPEND=">=sys-devel/binutils-2.16.1
- >=dev-libs/nss-3.12.8
- >=dev-libs/nspr-4.8.6
- x11-libs/pango[X]
- media-libs/libpng[apng]
- !x11-plugins/lightning"
-
-DEPEND="${RDEPEND}"
-
-PDEPEND="crypt? ( >=x11-plugins/enigmail-1.1 )"
-
-S="${WORKDIR}"/comm-1.9.2
-
-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
-
- 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"
- elog "a legal problem with Mozilla Foundation"
- elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
- fi
-}
-
-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
-}
-
-src_prepare() {
- # Apply our patches
- EPATCH_EXCLUDE="1002-fix_hunspell_double_buffer.patch" \
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"
-
- epatch "${FILESDIR}/bug-606109.patch"
- epatch "${FILESDIR}/libpng-1.4-support.patch"
- epatch "${FILESDIR}/libnotify-0.7.patch"
-
- # Allow user to apply any additional patches without modifing ebuild
- epatch_user
-
- eautoreconf
-
- cd mozilla
- eautoreconf
- cd js/src
- eautoreconf
-}
-
-src_configure() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- MEXTENSIONS="default"
-
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- mozconfig_config
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
- mozconfig_annotate '' --with-user-appdir=.thunderbird
- mozconfig_annotate '' --with-system-png
-
- # Use enable features
- mozconfig_use_enable ldap
- mozconfig_use_enable ldap ldap-experimental
- mozconfig_use_enable lightning calendar
-
- # Bug #72667
- if use mozdom; then
- MEXTENSIONS="${MEXTENSIONS},inspector"
- fi
-
- # Finalize and report settings
- mozconfig_final
-
- ####################################
- #
- # Configure and build
- #
- ####################################
-
- # Disable no-print-directory
- MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-cxxflags -fno-stack-protector
- fi
-
- CPPFLAGS="${CPPFLAGS}" \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
- econf || die
-}
-
-src_compile() {
- # Should the build use multiprocessing? Not enabled by default, as it tends to break
- [ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
- emake ${jobs} || die
-}
-
-src_install() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
- emake DESTDIR="${D}" install || die "emake install failed"
-
- if use lightning ; then
- declare emid emd1 emid2
-
- emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
- dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
- cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
- unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
-
- emid1="calendar-timezones@mozilla.org"
- dodir ${MOZILLA_FIVE_HOME}/extensions/${emid1}
- cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid1}
- unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi
-
- emid2="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
- dodir ${MOZILLA_FIVE_HOME}/extensions/${emid2}
- cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid2}
- unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi
- fi
-
- linguas
- for X in ${linguas}; do
- [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
- done
-
- if ! use bindist; then
- newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
- domenu "${FILESDIR}"/icon/${PN}.desktop
- else
- newicon "${S}"/mail/branding/unofficial/content/icon48.png thunderbird-icon-unbranded.png
- newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
- ${PN}.desktop
-
- sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \
- "${D}"/usr/share/applications/${PN}.desktop
-
- fi
-
- # Warn user that remerging enigmail is neccessary on USE=crypt
- use crypt && ewarn "Please remerge x11-plugins/enigmail after updating ${PN}."
-
- # Enable very specific settings for thunderbird-3
- cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js \
- "${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
- die "failed to cp thunderbird-gentoo-default-prefs.js"
-
- pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
-}
diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha3.ebuild b/mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild
similarity index 97%
rename from mail-client/thunderbird/thunderbird-3.3_alpha3.ebuild
rename to mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild
index 56b250d..0dcba17 100644
--- a/mail-client/thunderbird/thunderbird-3.3_alpha3.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist +crashreporter +crypt +ipc +lightning mozdom"
+IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom"
#PATCH="${PN}-3.1-patches-1.2"
REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"
@@ -50,6 +50,7 @@ SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2
RDEPEND=">=sys-devel/binutils-2.16.1
>=dev-libs/nss-3.12.9
>=dev-libs/nspr-4.8.7
+ gconf? ( >=gnome-base/gconf-1.2.1:2 )
media-libs/libpng[apng]
!x11-plugins/lightning
!x11-plugins/enigmail
@@ -116,13 +117,14 @@ src_unpack() {
src_prepare() {
epatch "${FILESDIR}/1001-xulrunner_fix_jemalloc_vs_aslr.patch"
epatch "${FILESDIR}/2000-thunderbird_gentoo_install_dirs.patch"
+ epatch "${FILESDIR}/thunderbird-3.3-gconf-config-update.patch"
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
+ ./makemake -r 2> /dev/null
sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in
cd "${S}"
fi
@@ -165,6 +167,7 @@ src_configure() {
# Use enable features
mozconfig_use_enable lightning calendar
+ mozconfig_use_enable gconf
# Bug #72667
if use mozdom; then
next reply other threads:[~2011-03-28 20:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-28 20:12 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-06-06 14:16 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-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=6c742e005094beea67a78f837cd55faee94f7c40.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