[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, www-client/seamonkey/

[Lars Wendler]

commit:     222fe9889f31b68a401014c59350e42fc0ad46f7
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 04:03:43 2011 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 04:03:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=222fe988

seamonkey: updated enigmail version

---
 www-client/seamonkey/Manifest                      |    9 +++++----
 .../enigmail-1.2-seamonkey-2.2-versionfix.patch    |   11 +++++++++++
 www-client/seamonkey/seamonkey-2.1.ebuild          |    3 +--
 www-client/seamonkey/seamonkey-2.2_beta1.ebuild    |    4 ++--
 .../seamonkey/seamonkey-2.2_beta2_pre2.ebuild      |    4 ++--
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index e07a662..fe3af79 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -3,11 +3,12 @@ AUX 2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff 744 RMD160 7c9b
 AUX all-gentoo.js 788 RMD160 08464d4a78e2126dce9e482988af1720d54a087d SHA1 74aed071070a8d896b655fd975da67329939339c SHA256 3ca0cbee6ca3d8857e7afadcfe76f65bd9c4130936602a1dbabb484406df0f45
 AUX enigmail/enigmail-1.1.2-20110124-makefile.diff 1572 RMD160 3840707bebdc8785ea08689cc95e0b762ca116f5 SHA1 0b607adf7af0d4d9a969b2c14abb19e1c9e94888 SHA256 9fc6c5d59864d53536ff755a2245ec60c61a4ffa2a81920c869687e5604f3144
 AUX enigmail/enigmail-1.1.2-seamonkey-2.1rc1-versionfix.patch 386 RMD160 54acaf1f87ea3bc65d7e5027b074dcee93b6a1a0 SHA1 18b91e45c263ec1cacce63b2c0eeb266d6a69196 SHA256 5b6e504403aac97a083979e270ec874595d5ef9c5fdc60af067c20ec8f58a4f5
+AUX enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch 392 RMD160 77802eeb8849aa996ce6c27fc6f32ab7b55f8744 SHA1 cc7a8758e4efdd8556a2c8e2812de89fceaa3242 SHA256 37cca51c4f7b05644576ee758c1fa34e36708e4117520f5744f8b94e719d5cf7
 AUX enigmail/enigmail-1.2a2-seamonkey-2.2b1-versionfix.patch 386 RMD160 0ecafbbace7acefdf63f5b57ca90d70f31b56a2f SHA1 e83f76194e408b3ae3b4cb34e02a99a972354fc3 SHA256 6b9131ae198a8964504bece6004e2ea671df8f8a11af1fce25f45d3934b548b6
 AUX icon/seamonkey.desktop 288 RMD160 c9f56aed280a3ff68f0c40ae453fc24351daeea6 SHA1 87254c3cbfad672309e4b1fa408d08b74be31056 SHA256 524ae39ffc10b2a950aa344ae6c3f3d9b4a21009697edfd52ec47aa850d795d0
 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
+DIST enigmail-1.2.tar.gz 1326482 RMD160 868c73aa28566895d4b6c6b9cbf4602d75df0a73 SHA1 05fb80a99544f95bfa2531e6cd5cac8cf1e78780 SHA256 e5e51685d09eb5a87bd21f80b4b64eeb8d75d6424b21cfeaea7b9c16723c9cc4
 DIST enigmail-1.2a1_pre-20110513.tar.xz 777568 RMD160 3657239cc1f3896881b852d141a8fbea1d4bb1bb SHA1 86548076b2b180cc3fa25cf121dde2ef37c95e68 SHA256 6bd68993292df117024cc3a6b6f324241f78efcaf140ff8b2c6f406b149890a9
-DIST enigmail-1.2a2.tar.gz 1325188 RMD160 aee1ba267c3bebbdee29b41d8932f1ba6348cc79 SHA1 1fede56bbc447750f6543179368c8e1038a7a793 SHA256 18863773132340ed66884e1f825899d624a21d89e37dec3417b9cbc8af617f87
 DIST seamonkey-2.1-be.xpi 795039 RMD160 b89a3a0a2fee13a819c2e02efcb57c6006766845 SHA1 37241e3ae3fa291256720b3dd840dec3958d5943 SHA256 87f5ab012318254ecf5e334e296f2e65695078b45db32aaac6b8ce871dbc6472
 DIST seamonkey-2.1-ca.xpi 814609 RMD160 270d8e566e8593228447164d507b6b1f42802128 SHA1 3f398531292c41720a5f7280e712230e85392379 SHA256 0816f4417b0f8649d88fd901935e089aa3ba1321c303b7ab19060d7f071c404f
 DIST seamonkey-2.1-cs.xpi 817990 RMD160 d81a6e3e244488c59ed769d4a9e2ef8928fedb39 SHA1 f8c54b25cf6b34a51882ce8e6a89f259609ae865 SHA256 000d71f5e81dba3c8b9303ba99f0acb6e8dd058d93d13d81dd8ff7ff68e53c4d
@@ -86,7 +87,7 @@ DIST seamonkey-2.2b1-patches-01.tar.xz 17104 RMD160 d82c7d464be8bd3f593570529910
 DIST seamonkey-2.2b1-ru.xpi 889516 RMD160 c03cfdca92558d4eac4e254a718f2b17309c83a4 SHA1 d4c5b485efd0565e908c724f4d6bc4759666d087 SHA256 4778f575201d82daab127d9505a1b901d5a5b78ed422b496bdc9ea7a87cdba50
 DIST seamonkey-2.2b1-sk.xpi 840212 RMD160 c0229531c487e489c909c00ffaf05dfd1c6306b4 SHA1 fb6cc53327baae982cae4e4187fa37c087256334 SHA256 69c3af3aef1e4ce83e9274124fc60b457bc12fb06382fe322568357e395de6a6
 DIST seamonkey-2.2b1.source.tar.bz2 87668841 RMD160 52f18e3f4445244eeeec2b5cbb2049a2552c3c8d SHA1 b17568d5e045852690938129933ef956c0fdfea7 SHA256 c5f655e2d916149513b613f8d522e4a0e9cff2a9a2549c93c8ade10a3e0b6d84
-EBUILD seamonkey-2.1.ebuild 9195 RMD160 6317e5c4791ca14097db26bcec30533916411fb2 SHA1 16fe0a63f4a6840b5133ce701169f644672e5779 SHA256 5adf1c4dc32ecd36c3be025715d49bc32c70b85b44cb6caf0465a231c28bbc90
+EBUILD seamonkey-2.1.ebuild 9112 RMD160 5916f51d520732a0fcca7502efc995e3dd64695f SHA1 02b756f08edabf59d9d89633d8457ce333e4a1c0 SHA256 3488411edac8eeef4ddb8c1ab2e665142753e4e2272e94d354f40d241f05dd5a
 EBUILD seamonkey-2.1_rc2_pre1.ebuild 9310 RMD160 10f4f54ba31e90286932cabd8a30e2b7ec945a9e SHA1 3d6eb075f73f9a3424ff66a7d076595ce88ba86a SHA256 3bcbd48eff61456be7c3c59d64528c642c1abdea3d82f74d47395c5507016c23
-EBUILD seamonkey-2.2_beta1.ebuild 9184 RMD160 b3a0676f8673023447b4c73060a2e9f76f031b91 SHA1 1a7ca96dd814314c7de75a995e15a139044f91af SHA256 9d70acc23dc895f47618b32ed2cf297e0eb3ae42d1917d0e2c923cd04b23f663
-EBUILD seamonkey-2.2_beta2_pre2.ebuild 9342 RMD160 9f0ac220895fd0c75728d5c8c0ce72d45ce4cf1a SHA1 b5363351288e51b49b2e302b079f683431c30afa SHA256 9263fd9b49e50ec27e118e6dd1647f484f4ed4a70820cc07d1aba5efa1b77086
+EBUILD seamonkey-2.2_beta1.ebuild 9178 RMD160 07bb65e48eb9686165969218aee110c4475dba1c SHA1 82610ecfc85df405478c17fa001cbfea7c10c295 SHA256 4801f00a24b272d192d83faecf7122462f16dc4ec9e76e0847f3f6e36e7ad7cf
+EBUILD seamonkey-2.2_beta2_pre2.ebuild 9336 RMD160 0240d3a22bead897e9e1f9861cea5ddfa976cd54 SHA1 9ce31258b363fd0ffc69581cf51521fccbd11266 SHA256 8461fd44ac2f7b647d82520d220f6c218bee29c37fad2f13d352b68e3b17766d

diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch
new file mode 100644
index 0000000..91524aa
--- /dev/null
+++ b/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch
@@ -0,0 +1,11 @@
+--- enigmail/package/install.rdf
++++ enigmail/package/install.rdf
+@@ -24,7 +24,7 @@
+       <Description>
+         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+         <em:minVersion>2.1a1pre</em:minVersion>
+-        <em:maxVersion>2.1.*</em:maxVersion>
++        <em:maxVersion>2.2.*</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+     <!-- em:targetApplication>

diff --git a/www-client/seamonkey/seamonkey-2.1.ebuild b/www-client/seamonkey/seamonkey-2.1.ebuild
index bb72f67..8dc7cdc 100644
--- a/www-client/seamonkey/seamonkey-2.1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.1.ebuild
@@ -8,7 +8,7 @@ WANT_AUTOCONF="2.1"
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
 
 PATCH="${PN}-2.1rc1-patches-01"
-EMVER="1.2a2"
+EMVER="1.2"
 
 LANGS="be ca cs de en en-GB en-US es-AR es-ES fi fr it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr"
 NOSHORTLANGS="en-GB en-US es-AR"
@@ -139,7 +139,6 @@ src_prepare() {
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
 		cd "${S}"/mailnews/extensions/enigmail || die
-		epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-seamonkey-2.1rc1-versionfix.patch
 		epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-20110124-makefile.diff
 		eautomake
 		makemake2

diff --git a/www-client/seamonkey/seamonkey-2.2_beta1.ebuild b/www-client/seamonkey/seamonkey-2.2_beta1.ebuild
index aca6e63..8de3fc7 100644
--- a/www-client/seamonkey/seamonkey-2.2_beta1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.2_beta1.ebuild
@@ -8,7 +8,7 @@ WANT_AUTOCONF="2.1"
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
 
 PATCH="${PN}-2.2b1-patches-01"
-EMVER="1.2a2"
+EMVER="1.2"
 
 LANGS="ca cs de en en-GB en-US es-AR es-ES fr it ja lt nl ru sk"
 NOSHORTLANGS="en-GB en-US es-AR"
@@ -141,7 +141,7 @@ src_prepare() {
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
 		cd "${S}"/mailnews/extensions/enigmail || die
-		epatch "${FILESDIR}"/enigmail/enigmail-1.2a2-seamonkey-2.2b1-versionfix.patch
+		epatch "${FILESDIR}"/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch
 		epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-20110124-makefile.diff
 		eautomake
 		makemake2

diff --git a/www-client/seamonkey/seamonkey-2.2_beta2_pre2.ebuild b/www-client/seamonkey/seamonkey-2.2_beta2_pre2.ebuild
index 00b8dcb..c1b65d3 100644
--- a/www-client/seamonkey/seamonkey-2.2_beta2_pre2.ebuild
+++ b/www-client/seamonkey/seamonkey-2.2_beta2_pre2.ebuild
@@ -8,7 +8,7 @@ WANT_AUTOCONF="2.1"
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
 
 PATCH="${PN}-2.2b1-patches-01"
-EMVER="1.2a2"
+EMVER="1.2"
 
 LANGS="ca cs de en en-GB en-US es-AR es-ES fr it ja lt nl pl ru sk sv-SE"
 NOSHORTLANGS="en-GB en-US es-AR"
@@ -145,7 +145,7 @@ src_prepare() {
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
 		cd "${S}"/mailnews/extensions/enigmail || die
-		epatch "${FILESDIR}"/enigmail/enigmail-1.2a2-seamonkey-2.2b1-versionfix.patch
+		epatch "${FILESDIR}"/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch
 		epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-20110124-makefile.diff
 		eautomake
 		makemake2