Move definition to global scope, so other ebuild functions find their way to correct...

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog
index fe605aaac8b84dcc637ada4fcdea52121fbf9fa4..ef7d112af8cbb40a7fee0a03d12d278611096522 100644 (file)
--- a/mail-client/mail-notification/ChangeLog
+++ b/mail-client/mail-notification/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mail-notification
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.37 2006/12/27 15:16:13 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.38 2006/12/28 16:20:36 ticho Exp $
+
+  28 Dec 2006; Andrej Kacian <ticho@gentoo.org>
+  mail-notification-4.0_rc2.ebuild:
+  Move definition to global scope, so other ebuild functions find their way to
+  correct dir. Closes bug #159241, reported by Fred Krogh <fkrogh at
+  mathalacarte.com>.
 
 *mail-notification-4.0_rc2 (27 Dec 2006)
 

diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest
index 096699b00de9f10ffe95e2f99c4d93f6f283cf41..547fda728a10c20614c37ea8f8b7287322f197bb 100644 (file)
--- a/mail-client/mail-notification/Manifest
+++ b/mail-client/mail-notification/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mail-notification-2.0-buildfix.diff 281 RMD160 49db75ab313415284ad4658c7b34cc42eb63deaf SHA1 fca300c74790ecfc8adb9cdcda2b77457e2eae6c SHA256 e48536498bdb7daf1e375de2bab7675941ff7cd044868d7e561f5b4f5c4810ca
 MD5 9b632ffa3d886c3829752ea656adf8f1 files/mail-notification-2.0-buildfix.diff 281
 RMD160 49db75ab313415284ad4658c7b34cc42eb63deaf files/mail-notification-2.0-buildfix.diff 281
@@ -40,14 +43,14 @@ 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_rc2.ebuild 2416 RMD160 c6c140a2c5446b1b94ca946836e879a45245334d SHA1 365aab2f0c8b3d881efb2fd188bbfebea279714e SHA256 edecd779dfadfab1abdc09b95b626ef8b8ff8b430c6b1508abe4453db0896bf4
-MD5 28bbb1145812536dc3f9951f1cfe1437 mail-notification-4.0_rc2.ebuild 2416
-RMD160 c6c140a2c5446b1b94ca946836e879a45245334d mail-notification-4.0_rc2.ebuild 2416
-SHA256 edecd779dfadfab1abdc09b95b626ef8b8ff8b430c6b1508abe4453db0896bf4 mail-notification-4.0_rc2.ebuild 2416
-MISC ChangeLog 6825 RMD160 e71eb26e6fa406c11acd22629935f47e2b4c81c8 SHA1 ab2e99326d99e4c2d9608bc7ea1741cfdbd2e058 SHA256 9fe053db566d229016a12604ae75df6077fba144d19ab3756f1a29b6246bfb7b
-MD5 93537ae29cb1eb2fd67df5a1b664efe2 ChangeLog 6825
-RMD160 e71eb26e6fa406c11acd22629935f47e2b4c81c8 ChangeLog 6825
-SHA256 9fe053db566d229016a12604ae75df6077fba144d19ab3756f1a29b6246bfb7b ChangeLog 6825
+EBUILD mail-notification-4.0_rc2.ebuild 2411 RMD160 e9bf3b12007c1795ea228211d851e6d8cc341c9c SHA1 18130a469766dc1912125372cab0103f58e8099d SHA256 a1390e4a5c6e78398f6b3cd0457b96d5aac74a51bd56ed42581059eaf260939f
+MD5 d460194780a1dc017ef1747054ab8b5f mail-notification-4.0_rc2.ebuild 2411
+RMD160 e9bf3b12007c1795ea228211d851e6d8cc341c9c mail-notification-4.0_rc2.ebuild 2411
+SHA256 a1390e4a5c6e78398f6b3cd0457b96d5aac74a51bd56ed42581059eaf260939f mail-notification-4.0_rc2.ebuild 2411
+MISC ChangeLog 7078 RMD160 f77394830c0ec237a0458c9a2c2cddab2b457954 SHA1 3f190208c49c84894ed8bafe66e1f54f2d3f0325 SHA256 e54b2c72689768d42428b681ee7a557df57ca8a730e4c88c449771e63eb9dcfa
+MD5 7adcebacb2776f396a1a5e48bd8bb6ea ChangeLog 7078
+RMD160 f77394830c0ec237a0458c9a2c2cddab2b457954 ChangeLog 7078
+SHA256 e54b2c72689768d42428b681ee7a557df57ca8a730e4c88c449771e63eb9dcfa ChangeLog 7078
 MISC metadata.xml 249 RMD160 dce0c80c556a885e8059693e236acc50c67e7163 SHA1 46390b9a149c8e26b8f083394c79a490f7df0d6e SHA256 e7a2ee2e040e05b0780ea52daab475449bd2e93e9aaef741b65a7eb9cf33b4c5
 MD5 5d240c2111a6535d744ec8bbc7cc692c metadata.xml 249
 RMD160 dce0c80c556a885e8059693e236acc50c67e7163 metadata.xml 249
@@ -70,3 +73,10 @@ SHA256 e322ac0f54954356d182797dc55b967664668951da99f743f57de81bb61b0e7b files/di
 MD5 e4679b5e39c8789c6cb7bf6320e0ce16 files/digest-mail-notification-4.0_rc2 277
 RMD160 9caadf636884ee87b9d89ae29b12910f5493fd36 files/digest-mail-notification-4.0_rc2 277
 SHA256 b4ef1679f6115ed0a622fecc42d606ef7f9109ebd5b2ba0501adc0fa80ad51c3 files/digest-mail-notification-4.0_rc2 277
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFk+7rQlM6RnzZP+IRAowyAJ42aabqv6u4rlI3JDrGhuojGzN+QACfeNJv
+LZJwar9hshC7/oOpI+SUz9U=
+=+Axc
+-----END PGP SIGNATURE-----

diff --git a/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild b/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild
index a64ebaa06618da0af1a9449cbdf1e21078edd00e..e120118218b76ae83e839661401eae92bb624e04 100644 (file)
--- a/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild
+++ b/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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_rc2.ebuild,v 1.1 2006/12/27 15:16:13 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild,v 1.2 2006/12/28 16:20:36 ticho Exp $
 
 inherit eutils gnome2 multilib flag-o-matic versionator
 
@@ -35,6 +35,8 @@ DEPEND=">=x11-libs/gtk+-2.6
        evolution? ( >=mail-client/evolution-2.6 )
        sylpheed? ( virtual/sylpheed )"
 
+S="${WORKDIR}/${P/_/-}"
+
 pkg_setup() {
        if use evolution ; then
                EVO_INSTALLED="$(best_version mail-client/evolution)"
@@ -57,7 +59,6 @@ pkg_setup() {
 }
 
 src_unpack() {
-       S=${WORKDIR}/${PN}-${MY_PV}
        gnome2_src_unpack
        gnome2_omf_fix