Fix numerous cock-ups. Thanks to Ed Catmur <ed@catmur.co.uk> in bug #164072.

Package-Manager: portage-2.1.2-r4

3 files changed, 14 insertions, 13 deletions

diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog
index e4bd56450500..b54de8e64459 100644
--- a/mail-client/mail-notification/ChangeLog
+++ b/mail-client/mail-notification/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/mail-notification
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.39 2007/01/27 12:26:43 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.40 2007/01/29 21:57:08 slarti Exp $
+
+  29 Jan 2007; Tom Martin <slarti@gentoo.org> mail-notification-4.0.ebuild:
+  Fix numerous cock-ups. Thanks to Ed Catmur <ed@catmur.co.uk> in bug #164072.
 
 *mail-notification-4.0 (27 Jan 2007)
 
diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest
index 4dfb3ebc01f1..aa45a28a62b1 100644
--- a/mail-client/mail-notification/Manifest
+++ b/mail-client/mail-notification/Manifest
@@ -41,18 +41,18 @@ EBUILD mail-notification-3.0.ebuild 2473 RMD160 8d4efa28faa08cb9d4a67200415482ef
 MD5 54abb4c7a0c86608603e220aa69af857 mail-notification-3.0.ebuild 2473
 RMD160 8d4efa28faa08cb9d4a67200415482efda2b9645 mail-notification-3.0.ebuild 2473
 SHA256 d000b07a0d6b7c05dbdc20796c3db915a1cb42ec25f16efe10b68fbc2c599ae9 mail-notification-3.0.ebuild 2473
-EBUILD mail-notification-4.0.ebuild 2348 RMD160 af9c3b7d06278d267d63d65ae22f4c02d7b66596 SHA1 64f444898b1c1f789a260923f4a0c82555bd11a9 SHA256 4c9daee88e50bd1363e6f9c706ea125fa7cdf0534091078245bac753b5106ee3
-MD5 19c20f5da5b01633b7641c9135e93b3b mail-notification-4.0.ebuild 2348
-RMD160 af9c3b7d06278d267d63d65ae22f4c02d7b66596 mail-notification-4.0.ebuild 2348
-SHA256 4c9daee88e50bd1363e6f9c706ea125fa7cdf0534091078245bac753b5106ee3 mail-notification-4.0.ebuild 2348
+EBUILD mail-notification-4.0.ebuild 2315 RMD160 78721f1831fdf246a6550228810a8a8ac2d3ccd3 SHA1 a9fcbbf7bafcf4f6535a014253ddb000ec5ec314 SHA256 0dc63c26b3bdd8906a108c4e8ad61b2bda490d8f06219c60ea3535396db4d8e2
+MD5 7559bd4d702be0451d31a35daa592bd8 mail-notification-4.0.ebuild 2315
+RMD160 78721f1831fdf246a6550228810a8a8ac2d3ccd3 mail-notification-4.0.ebuild 2315
+SHA256 0dc63c26b3bdd8906a108c4e8ad61b2bda490d8f06219c60ea3535396db4d8e2 mail-notification-4.0.ebuild 2315
 EBUILD mail-notification-4.0_rc2.ebuild 2412 RMD160 dd68c3747dbd2408d87998c1f2b42deec3975419 SHA1 139d99596015824fadf978946aa33b1ac4744787 SHA256 55e5eea23b4f31124f6953c1fe4c14fff4e05ba162293e58ed0c2684fbb76f7b
 MD5 eb38243457395e6b4bf949319ba16ac6 mail-notification-4.0_rc2.ebuild 2412
 RMD160 dd68c3747dbd2408d87998c1f2b42deec3975419 mail-notification-4.0_rc2.ebuild 2412
 SHA256 55e5eea23b4f31124f6953c1fe4c14fff4e05ba162293e58ed0c2684fbb76f7b mail-notification-4.0_rc2.ebuild 2412
-MISC ChangeLog 7232 RMD160 491a2f4015d3658bb3bbd45c391255846835faa8 SHA1 bd1b6570efc3a2c85a1934d088b1bc085fd5be86 SHA256 e9d4c652562af4b3dc6ad1496b3adf4555e9e12c64057dfb30cfdf66f81f58c6
-MD5 7feacab3cfbb42066d14c6af12f51461 ChangeLog 7232
-RMD160 491a2f4015d3658bb3bbd45c391255846835faa8 ChangeLog 7232
-SHA256 e9d4c652562af4b3dc6ad1496b3adf4555e9e12c64057dfb30cfdf66f81f58c6 ChangeLog 7232
+MISC ChangeLog 7388 RMD160 bcdfdb1e04e04f7a9b68f3b7117c1bdab656079a SHA1 9ab10589f4d15d38cee2566a3a09a8a01b879842 SHA256 da83266c8db342ac116462690d769bc577a1587ad90aa842546807a0d4a752c5
+MD5 2ba5426ec50563017b069afe36e9917f ChangeLog 7388
+RMD160 bcdfdb1e04e04f7a9b68f3b7117c1bdab656079a ChangeLog 7388
+SHA256 da83266c8db342ac116462690d769bc577a1587ad90aa842546807a0d4a752c5 ChangeLog 7388
 MISC metadata.xml 249 RMD160 dce0c80c556a885e8059693e236acc50c67e7163 SHA1 46390b9a149c8e26b8f083394c79a490f7df0d6e SHA256 e7a2ee2e040e05b0780ea52daab475449bd2e93e9aaef741b65a7eb9cf33b4c5
 MD5 5d240c2111a6535d744ec8bbc7cc692c metadata.xml 249
 RMD160 dce0c80c556a885e8059693e236acc50c67e7163 metadata.xml 249
diff --git a/mail-client/mail-notification/mail-notification-4.0.ebuild b/mail-client/mail-notification/mail-notification-4.0.ebuild
index ded2ba343d67..6ca4f6ec4cb7 100644
--- a/mail-client/mail-notification/mail-notification-4.0.ebuild
+++ b/mail-client/mail-notification/mail-notification-4.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-4.0.ebuild,v 1.1 2007/01/27 12:26:43 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-4.0.ebuild,v 1.2 2007/01/29 21:57:08 slarti Exp $
 
-inherit eutils gnome2 multilib flag-o-matic
+inherit eutils gnome2 multilib flag-o-matic versionator
 
 DESCRIPTION="A GNOME trayicon which checks for email. Supports mbox, MH,
 Maildir, IMAP, Sylpheed, POP3, Gmail and Evolution.  Authenticates via
@@ -55,9 +55,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	S=${WORKDIR}/${PN}-${MY_PV}
 	gnome2_src_unpack
-	gnome2_omf_fix
 
 	sed -i -e 's:gtk-update-icon-cache:true:' ./art/Makefile.in
 }