fix test fixing to actually be in the right place

Package-Manager: portage-2.1.3.19

4 files changed, 56 insertions, 42 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 9092e896dc0f..fe1c7e26beb9 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.208 2007/11/06 17:08:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.209 2007/11/19 13:50:55 eva Exp $
+
+  19 Nov 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  evolution-2.12.0.ebuild, evolution-2.12.1.ebuild:
+  fix test fixing to actually be applied in the right place
 
   06 Nov 2007; Raúl Porcel <armin76@gentoo.org> evolution-2.10.3.ebuild:
   sparc stable wrt #193339
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 9f0649cb22d0..1cd4905a41c9 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX evolution-2.10-fix-maildir-account.patch 3160 RMD160 30fdcbee921c9972e2957219be7779553d3a9da4 SHA1 9ae1d966c6ac2b9d55a7ee2a2b6839a85a04bfb4 SHA256 89422e8ae2b9b7cce86d2a8103e8aa1aa1fb5f00293b8a019bb838fc57d75bf7
 MD5 07b44e96c4a62ac451c7089636c005e7 files/evolution-2.10-fix-maildir-account.patch 3160
 RMD160 30fdcbee921c9972e2957219be7779553d3a9da4 files/evolution-2.10-fix-maildir-account.patch 3160
@@ -72,22 +75,22 @@ EBUILD evolution-2.10.3.ebuild 6979 RMD160 148defd852353961243d719234bdbdbe7d7b0
 MD5 9e94dfef1363c7e660f94a9c5dae690d evolution-2.10.3.ebuild 6979
 RMD160 148defd852353961243d719234bdbdbe7d7b03f6 evolution-2.10.3.ebuild 6979
 SHA256 8c40916e6d2acbdcd5917f8591dde24be6c6bbc65f3c4082486ee4656c70d894 evolution-2.10.3.ebuild 6979
-EBUILD evolution-2.12.0.ebuild 5706 RMD160 b8da765dc26ce3165b34f58dc8c2207df06f4def SHA1 69cfece328fc9ecda2997d0453637e6d6cabdd03 SHA256 6e3314fd8aefebb6d14216685aaaa435436df164b78c1ebfe8edbd9f61fea644
-MD5 ab541f6fe7a2a8fdc34d42576b78c3c2 evolution-2.12.0.ebuild 5706
-RMD160 b8da765dc26ce3165b34f58dc8c2207df06f4def evolution-2.12.0.ebuild 5706
-SHA256 6e3314fd8aefebb6d14216685aaaa435436df164b78c1ebfe8edbd9f61fea644 evolution-2.12.0.ebuild 5706
-EBUILD evolution-2.12.1.ebuild 5790 RMD160 3be8fd4ab46b98470f6e4305a0836bc05b51ecb8 SHA1 68facc38f431cc85cad846e44711f7f6300c8aa8 SHA256 fb1a7f2bd75b3d45c404f48eb10fd8a4beb14f67e626f4ec01f8eeabbcd73ffd
-MD5 2d5a7b8e07bbf36c6adf6a20d00b34d9 evolution-2.12.1.ebuild 5790
-RMD160 3be8fd4ab46b98470f6e4305a0836bc05b51ecb8 evolution-2.12.1.ebuild 5790
-SHA256 fb1a7f2bd75b3d45c404f48eb10fd8a4beb14f67e626f4ec01f8eeabbcd73ffd evolution-2.12.1.ebuild 5790
+EBUILD evolution-2.12.0.ebuild 5703 RMD160 8e800599233b33173d297a4d377af7ac6867db2a SHA1 ba8046c7bf1e465adf4566d020d8d772ff621c79 SHA256 e459a24ff6fda70648dfe4aaa95be70bb20dae13a4ef202f196042f019f56ce2
+MD5 742086552428f921edefe80ef3bc9bff evolution-2.12.0.ebuild 5703
+RMD160 8e800599233b33173d297a4d377af7ac6867db2a evolution-2.12.0.ebuild 5703
+SHA256 e459a24ff6fda70648dfe4aaa95be70bb20dae13a4ef202f196042f019f56ce2 evolution-2.12.0.ebuild 5703
+EBUILD evolution-2.12.1.ebuild 5787 RMD160 a0e375da2f5fa36dd403f9e5e0e3811289962dc9 SHA1 21f77d1f8fbc46852fb4f327778159f848aa291a SHA256 2a886357f27d42ae81848b2dfef54d570350ea6f4ef3110e25cb20b96a14b4a4
+MD5 60c629f50540d8b05aceee5f37dacb63 evolution-2.12.1.ebuild 5787
+RMD160 a0e375da2f5fa36dd403f9e5e0e3811289962dc9 evolution-2.12.1.ebuild 5787
+SHA256 2a886357f27d42ae81848b2dfef54d570350ea6f4ef3110e25cb20b96a14b4a4 evolution-2.12.1.ebuild 5787
 EBUILD evolution-2.8.3-r2.ebuild 6832 RMD160 dba664223761a50a0d65c2f41ddb51633053a68e SHA1 33bb2845bb2c1d5cbdef6b193ded61f67eecee08 SHA256 a485e37af8bf3c5b75001ae2dc33983ae7cb9fd855214d7f7249910c97c4c970
 MD5 9510860d0d184ba331684ba64c172dad evolution-2.8.3-r2.ebuild 6832
 RMD160 dba664223761a50a0d65c2f41ddb51633053a68e evolution-2.8.3-r2.ebuild 6832
 SHA256 a485e37af8bf3c5b75001ae2dc33983ae7cb9fd855214d7f7249910c97c4c970 evolution-2.8.3-r2.ebuild 6832
-MISC ChangeLog 48286 RMD160 0b0a6d465ba70d2630d8cfe89139a57199689d64 SHA1 c5b48eb371170725d593fadf82a4b93014b04b82 SHA256 dceb12d19c7ccd517503905945c446d1953cd367a548b3ea213d34d1a50c8814
-MD5 d0de58233573333aba5cea6c11711d5c ChangeLog 48286
-RMD160 0b0a6d465ba70d2630d8cfe89139a57199689d64 ChangeLog 48286
-SHA256 dceb12d19c7ccd517503905945c446d1953cd367a548b3ea213d34d1a50c8814 ChangeLog 48286
+MISC ChangeLog 48449 RMD160 24ee3923ad53f18f2f527d489b2e155bf262c626 SHA1 4450322b49e5770a3cdbd0a22e8315790feb2711 SHA256 f121ea0216b277101c80ef1c3e39702d5ff223d87dbd7ae6f9eba9cfe32e5718
+MD5 d14983842f42e3855a0b90ca782cf69b ChangeLog 48449
+RMD160 24ee3923ad53f18f2f527d489b2e155bf262c626 ChangeLog 48449
+SHA256 f121ea0216b277101c80ef1c3e39702d5ff223d87dbd7ae6f9eba9cfe32e5718 ChangeLog 48449
 MISC metadata.xml 166 RMD160 77916dbe8cde7cbd9b894b2874da250319837fa9 SHA1 4033789b47b24264672f0c72b1298f5e29e99cf4 SHA256 e76aa203f78388331856db0a1b1a48fc056c21e19c579dbea9e1a89a4d132abe
 MD5 df8719c5946032d4644134e05f9afa40 metadata.xml 166
 RMD160 77916dbe8cde7cbd9b894b2874da250319837fa9 metadata.xml 166
@@ -107,3 +110,10 @@ SHA256 55925ed5f5a0a003194e932762a0a530de162b8b567306f5e97be9b99534b824 files/di
 MD5 4baf69f8a0985f0b493a39c1e5f2920e files/digest-evolution-2.8.3-r2 533
 RMD160 0aca45717cdcb1e57839b1826d465c3f96ebd8b5 files/digest-evolution-2.8.3-r2 533
 SHA256 4a580168c5f139e4e65dec026d9c27358a0caad314d78b403d51b38e6fb7a424 files/digest-evolution-2.8.3-r2 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHQZTS1fmVwcYIWAYRAid2AKCblc6eAIK/SZ2oNU6QoqRdjeIsGgCfeVEE
+PolT1Ms0UdGzDFvdBeiKPgw=
+=2tvv
+-----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.12.0.ebuild b/mail-client/evolution/evolution-2.12.0.ebuild
index 9215448ba708..0dfd516015d4 100644
--- a/mail-client/evolution/evolution-2.12.0.ebuild
+++ b/mail-client/evolution/evolution-2.12.0.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/mail-client/evolution/evolution-2.12.0.ebuild,v 1.5 2007/11/02 15:58:10 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.12.0.ebuild,v 1.6 2007/11/19 13:50:55 eva Exp $
 
 inherit gnome2 flag-o-matic
 
@@ -98,6 +98,18 @@ pkg_setup() {
 		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
 	fi
 
+	# dang - I've changed this to do --enable-plugins=experimental.  This will autodetect
+	# new-mail-notify and exchange, but that cannot be helped for the moment.
+	# They should be changed to depend on a --enable-<foo> like mono is.  This
+	# cleans up a ton of crap from this ebuild.
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Mail-remote doesn't build
+	epatch "${FILESDIR}"/${PN}-2.11.90-mail-remote-broken.patch
+
 	# Fix tests (again)
 	echo "evolution-addressbook.xml" >> "${S}"/po/POTFILES.in
 	echo "evolution-calendar.xml" >> "${S}"/po/POTFILES.in
@@ -116,18 +128,6 @@ pkg_setup() {
 	echo "evolution-task-editor.xml" >> "${S}"/po/POTFILES.in
 	echo "evolution-tasks.xml" >> "${S}"/po/POTFILES.in
 	echo "evolution.xml" >> "${S}"/po/POTFILES.in
-
-	# dang - I've changed this to do --enable-plugins=experimental.  This will autodetect
-	# new-mail-notify and exchange, but that cannot be helped for the moment.
-	# They should be changed to depend on a --enable-<foo> like mono is.  This
-	# cleans up a ton of crap from this ebuild.
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Mail-remote doesn't build
-	epatch "${FILESDIR}"/${PN}-2.11.90-mail-remote-broken.patch
 }
 
 src_compile() {
diff --git a/mail-client/evolution/evolution-2.12.1.ebuild b/mail-client/evolution/evolution-2.12.1.ebuild
index 471b56e5efdd..f16ebe33f639 100644
--- a/mail-client/evolution/evolution-2.12.1.ebuild
+++ b/mail-client/evolution/evolution-2.12.1.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/mail-client/evolution/evolution-2.12.1.ebuild,v 1.5 2007/11/02 15:58:10 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.12.1.ebuild,v 1.6 2007/11/19 13:50:55 eva Exp $
 
 inherit gnome2 flag-o-matic
 
@@ -98,6 +98,21 @@ pkg_setup() {
 		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
 	fi
 
+	# dang - I've changed this to do --enable-plugins=experimental.  This will autodetect
+	# new-mail-notify and exchange, but that cannot be helped for the moment.
+	# They should be changed to depend on a --enable-<foo> like mono is.  This
+	# cleans up a ton of crap from this ebuild.
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Mail-remote doesn't build
+	epatch "${FILESDIR}"/${P}-mail-remote-broken.patch
+
+	# Fix timezone offsets on fbsd.  bug #183708
+	epatch "${FILESDIR}"/${PN}-2.10.2-fbsd.patch
+
 	# Fix tests (again)
 	echo "evolution-addressbook.xml" >> "${S}"/po/POTFILES.in
 	echo "evolution-calendar.xml" >> "${S}"/po/POTFILES.in
@@ -116,21 +131,6 @@ pkg_setup() {
 	echo "evolution-task-editor.xml" >> "${S}"/po/POTFILES.in
 	echo "evolution-tasks.xml" >> "${S}"/po/POTFILES.in
 	echo "evolution.xml" >> "${S}"/po/POTFILES.in
-
-	# dang - I've changed this to do --enable-plugins=experimental.  This will autodetect
-	# new-mail-notify and exchange, but that cannot be helped for the moment.
-	# They should be changed to depend on a --enable-<foo> like mono is.  This
-	# cleans up a ton of crap from this ebuild.
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Mail-remote doesn't build
-	epatch "${FILESDIR}"/${P}-mail-remote-broken.patch
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.10.2-fbsd.patch
 }
 
 src_compile() {