for tb-2.0, bump patchset to latest version, and fix patches not applying, thanks to Walter Meinl <wuno at lsvw dot de> in bug 170484

Package-Manager: portage-2.1.2.2

4 files changed, 26 insertions, 19 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index cd0358bc6c6a..c55c7a677baa 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/enigmail
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.51 2007/03/11 16:33:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.52 2007/03/11 21:18:44 armin76 Exp $
+
+  11 Mar 2007; Raúl Porcel <armin76@gentoo.org> enigmail-0.94.3-r1.ebuild:
+  for tb-2.0, bump patchset to latest version, and fix patches not applying,
+  thanks to Walter Meinl <wuno at lsvw dot de> in bug 170484
 
 *enigmail-0.94.3-r1 (11 Mar 2007)
 *enigmail-0.94.3 (11 Mar 2007)
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 4c89db617e7e..4600960b0b66 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -44,7 +44,7 @@ DIST enigmail-sv-SE-0.9x.xpi 30803 RMD160 5f4259a55e6753a6ec61a7a5eac64b365d3a19
 DIST enigmail-zh-CN-0.9x.xpi 31747 RMD160 a65e2a014777d1d13c9d45e14b6f9abec03b75f2 SHA1 8a6da45522b3853ce7bf6774d3ee5f2798591cff SHA256 628141041a7b316ede43cb0fda01d834dc02b344f6ad6b491d4329d2eead7512
 DIST mozilla-thunderbird-1.5.0.10-patches-0.1.tar.bz2 30777 RMD160 08da7a7dadfc731e5e18d86ca9aa2679eb14fa1d SHA1 7e9862eafbb41f603aa354eab8ccf7347afa71a2 SHA256 7bf7d7abe757cc1dc0ce67fe083c6663fedbcc6e6bdd65cc09ce543ac8e54b9c
 DIST mozilla-thunderbird-1.5.0.7-patches-0.1.tar.bz2 30715 RMD160 a86a745963ad911da7c4e30eb9a673f1b657c5af SHA1 8e6f9fff11d06ee5f9f441527d466e6e1862263b SHA256 1f7af196a2342a27ebd37c1deed0ec6fb2e028d4b55faa9e3c5e761716b3352d
-DIST mozilla-thunderbird-2.0_beta2-patches-0.2.tar.bz2 26151 RMD160 69590103844c3b8f2869843b4781ee2d37520ed1 SHA1 0ee3ccc8b72243872492da92bae2925a46140a4c SHA256 87d107b17745d1be1cfe488276bb9c70afdfbebb9d02a52ecdac43559e3324c8
+DIST mozilla-thunderbird-2.0_beta2-patches-0.4.tar.bz2 26971 RMD160 22b58906b2e9dcae0835046ef865c422e00d5e99 SHA1 ee80e1cf68f92a93e45f2ec0e4fcc553f86f4652 SHA256 d11820b6d25d0bf8f0788c920188458acd5f357c56dbd9ab5928509ce72ef21b
 DIST thunderbird-1.5.0.10-source.tar.bz2 36159990 RMD160 926484cd1880e7921bf10ba0774064e43acc9283 SHA1 a6467c946f9e668bcf7b3a06dcaeceb601b98fce SHA256 9b6a5a2b893594180863d4cb412a6920c698d68d8ea047c0eb38c9794e74338d
 DIST thunderbird-1.5.0.7-source.tar.bz2 35994957 RMD160 b8948723e4a96e22409e6a2cb3cd1b6512bef189 SHA1 9e5acff9bd098979dd798c0111805dc8d67479ad SHA256 99f67c50a94af48bc738c19cda390561ec518b5fec4bc4f1f43e65337b645fc9
 DIST thunderbird-2.0b2-source.tar.bz2 37092627 RMD160 8c4a3c950bbe8a52a9a901a48fb0d5f248b578f7 SHA1 cb5ee6baa2087908da56044f601e0aa5ffaec573 SHA256 9556338b782c93e737dc084f5096352cb5500a7ae839fa2e6a2d46ebad433b16
@@ -52,18 +52,18 @@ EBUILD enigmail-0.94.1.ebuild 5857 RMD160 836f959c129a5c3ccbd162e4f8678f39a36d95
 MD5 d5b2b4bae59aded6403021b596128a4f enigmail-0.94.1.ebuild 5857
 RMD160 836f959c129a5c3ccbd162e4f8678f39a36d95b6 enigmail-0.94.1.ebuild 5857
 SHA256 20a45ac21397e7e226ede1e1af3c280c9762b8d399497f5a23723c9a48adb897 enigmail-0.94.1.ebuild 5857
-EBUILD enigmail-0.94.3-r1.ebuild 5945 RMD160 286df23217b4b88785339274682ae6b2d8df0206 SHA1 091f52772054f0226965f92179f3a2755e366115 SHA256 01cdb0c4b535013bf7ba436886b3fc7a3075a8490e8d531633eb0ab85fbc5e73
-MD5 415f9d52e6b00cd5787ada825f48debc enigmail-0.94.3-r1.ebuild 5945
-RMD160 286df23217b4b88785339274682ae6b2d8df0206 enigmail-0.94.3-r1.ebuild 5945
-SHA256 01cdb0c4b535013bf7ba436886b3fc7a3075a8490e8d531633eb0ab85fbc5e73 enigmail-0.94.3-r1.ebuild 5945
+EBUILD enigmail-0.94.3-r1.ebuild 6003 RMD160 c63a367939ff7b2495d6cafc4cc9e4a38e562583 SHA1 7c7d76c43dc5a42bf5918c96e56bb9792153cac2 SHA256 50ce21498031f52f84b0e6da2efce83c958842f15ba608c531f1f0aaedc53422
+MD5 eb022c5098cc5e0afd268a85ec89d304 enigmail-0.94.3-r1.ebuild 6003
+RMD160 c63a367939ff7b2495d6cafc4cc9e4a38e562583 enigmail-0.94.3-r1.ebuild 6003
+SHA256 50ce21498031f52f84b0e6da2efce83c958842f15ba608c531f1f0aaedc53422 enigmail-0.94.3-r1.ebuild 6003
 EBUILD enigmail-0.94.3.ebuild 5865 RMD160 cc5a7c45229a25a05dc36018ddd0524afadfa4b5 SHA1 cb4747aac645e8b7a138409310c467ad16cb1928 SHA256 eb50011d1f9c53ad7d3515bc029716704f02298716b03c6a0d25b28aecb15e77
 MD5 29f7f6a91f689a26027ef2039efa06b3 enigmail-0.94.3.ebuild 5865
 RMD160 cc5a7c45229a25a05dc36018ddd0524afadfa4b5 enigmail-0.94.3.ebuild 5865
 SHA256 eb50011d1f9c53ad7d3515bc029716704f02298716b03c6a0d25b28aecb15e77 enigmail-0.94.3.ebuild 5865
-MISC ChangeLog 7895 RMD160 d8abca9fae8d24d29f6e713a3de80b8ed7ac2682 SHA1 072c27ae764c57dc0dc25f4b13ee9e44c90acbcb SHA256 d168f092e68d8934741ae2109281d80fbce481af54ea8a4262cf92c1239e45a0
-MD5 b3a3ee260d1568b1a01f94c58ec09459 ChangeLog 7895
-RMD160 d8abca9fae8d24d29f6e713a3de80b8ed7ac2682 ChangeLog 7895
-SHA256 d168f092e68d8934741ae2109281d80fbce481af54ea8a4262cf92c1239e45a0 ChangeLog 7895
+MISC ChangeLog 8110 RMD160 33b4a14c5fe5bd4df5cb3a9067a7fadc9e80178a SHA1 36bb5f8d8362dd13914524fd67c1781e6c9f546d SHA256 7e71194a6252046d6a4b77584697284f48bb230eea33ecb1cc42ebbf376242d6
+MD5 6e3508beb20c26bd695f3430c46bc4ac ChangeLog 8110
+RMD160 33b4a14c5fe5bd4df5cb3a9067a7fadc9e80178a ChangeLog 8110
+SHA256 7e71194a6252046d6a4b77584697284f48bb230eea33ecb1cc42ebbf376242d6 ChangeLog 8110
 MISC metadata.xml 238 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 SHA1 fb7dacf03f1ce8294d6d2f07d4c2d7ff69ee7525 SHA256 ef51e99b6b1ccee48a71906e90a4111f58793292fe1248934a811fcb02506036
 MD5 22a1feabf45dadbfa2268b7fff3ce66e metadata.xml 238
 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 metadata.xml 238
@@ -74,6 +74,6 @@ SHA256 9340bfbff19f3dc997c2b96f853b58bd6c2ebf56d3e014fe0ddd93a39429e056 files/di
 MD5 60e2836297a837965e32681fc4948067 files/digest-enigmail-0.94.3 6277
 RMD160 136f2efc75fe8eca282a7d0b3cfaf33e4499a6ff files/digest-enigmail-0.94.3 6277
 SHA256 f5b967596998bf04666e2b3bce66506db58c58edfc23514abe96eae924906e64 files/digest-enigmail-0.94.3 6277
-MD5 fd5595b8b9d2d86229c43e66bc0c9cb1 files/digest-enigmail-0.94.3-r1 6271
-RMD160 a7bfbd699004c3eb228de6ebf0cce901929b19ba files/digest-enigmail-0.94.3-r1 6271
-SHA256 68fae73f2d237be992cb9605e2a008ad1ed179b40dd39ceef0cc7ca1b1cd45b9 files/digest-enigmail-0.94.3-r1 6271
+MD5 a583f1bfe98cfa57918011471e321ea1 files/digest-enigmail-0.94.3-r1 6271
+RMD160 076bf0b85b7f7c6f903abe544da18d2aaa12137f files/digest-enigmail-0.94.3-r1 6271
+SHA256 45ea07bde44062e66628690415be716572bd35b2349b7802d70ce0d00ee1e00b files/digest-enigmail-0.94.3-r1 6271
diff --git a/x11-plugins/enigmail/enigmail-0.94.3-r1.ebuild b/x11-plugins/enigmail/enigmail-0.94.3-r1.ebuild
index a9ba4150e2c9..b0f535ef2284 100644
--- a/x11-plugins/enigmail/enigmail-0.94.3-r1.ebuild
+++ b/x11-plugins/enigmail/enigmail-0.94.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.94.3-r1.ebuild,v 1.1 2007/03/11 16:33:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.94.3-r1.ebuild,v 1.2 2007/03/11 21:18:44 armin76 Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 WANT_AUTOCONF=2.1
@@ -12,7 +12,7 @@ SHORTLANGS="ca-AD cs-CZ es-ES fi-FI fr-FR hu-HU it-IT ja-JP ko-KR nb-NO nl-NL pl
 EMVER=${PV}
 TBVER="2.0b2"
 MY_TBVER="2.0_beta2"
-TBPVER="0.2"
+TBPVER="0.4"
 
 DESCRIPTION="Gnupg encryption plugin for thunderbird."
 HOMEPAGE="http://enigmail.mozdev.org"
@@ -89,7 +89,10 @@ src_unpack() {
 	cd ${S} || die "cd failed"
 
 	# Apply our patches
-	EPATCH_FORCE="yes" epatch "${WORKDIR}"/patch
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
 
 	# Unpack the enigmail plugin
 	cd ${S}/mailnews/extensions || die
diff --git a/x11-plugins/enigmail/files/digest-enigmail-0.94.3-r1 b/x11-plugins/enigmail/files/digest-enigmail-0.94.3-r1
index 8107c82eb74d..062202854f67 100644
--- a/x11-plugins/enigmail/files/digest-enigmail-0.94.3-r1
+++ b/x11-plugins/enigmail/files/digest-enigmail-0.94.3-r1
@@ -67,9 +67,9 @@ SHA256 afa3b754d9372cc531752e83909c6147cdc10d7a5ef42f364dc8cbbc686af93c enigmail
 MD5 ea388891cc3e67a5c69345608e2ca127 enigmail-zh-CN-0.9x.xpi 31747
 RMD160 a65e2a014777d1d13c9d45e14b6f9abec03b75f2 enigmail-zh-CN-0.9x.xpi 31747
 SHA256 628141041a7b316ede43cb0fda01d834dc02b344f6ad6b491d4329d2eead7512 enigmail-zh-CN-0.9x.xpi 31747
-MD5 dcb39e065bd6820cc3d57dd654f1453c mozilla-thunderbird-2.0_beta2-patches-0.2.tar.bz2 26151
-RMD160 69590103844c3b8f2869843b4781ee2d37520ed1 mozilla-thunderbird-2.0_beta2-patches-0.2.tar.bz2 26151
-SHA256 87d107b17745d1be1cfe488276bb9c70afdfbebb9d02a52ecdac43559e3324c8 mozilla-thunderbird-2.0_beta2-patches-0.2.tar.bz2 26151
+MD5 ff7a931c994fcc68d50cbb10b32aa2dd mozilla-thunderbird-2.0_beta2-patches-0.4.tar.bz2 26971
+RMD160 22b58906b2e9dcae0835046ef865c422e00d5e99 mozilla-thunderbird-2.0_beta2-patches-0.4.tar.bz2 26971
+SHA256 d11820b6d25d0bf8f0788c920188458acd5f357c56dbd9ab5928509ce72ef21b mozilla-thunderbird-2.0_beta2-patches-0.4.tar.bz2 26971
 MD5 b633623c460ffef9ba805dd071729890 thunderbird-2.0b2-source.tar.bz2 37092627
 RMD160 8c4a3c950bbe8a52a9a901a48fb0d5f248b578f7 thunderbird-2.0b2-source.tar.bz2 37092627
 SHA256 9556338b782c93e737dc084f5096352cb5500a7ae839fa2e6a2d46ebad433b16 thunderbird-2.0b2-source.tar.bz2 37092627