Fix WANT_AUTOMAKE. Bug #143432

Package-Manager: portage-2.1.1_pre4-r4

3 files changed, 14 insertions, 21 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index bcac85d24007..4201debdd4a6 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.142 2006/07/23 15:57:52 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.143 2006/08/11 20:40:37 dang Exp $
+
+  11 Aug 2006; <dang@gentoo.org> gnome-session-2.14.2.ebuild:
+  Fix WANT_AUTOMAKE.  Bug #143432
 
   23 Jul 2006; Daniel Gryniewicz <dang@gentoo.org>
   -gnome-session-2.14.0.ebuild, -gnome-session-2.14.1.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 2891890cc59d..12cacf28d511 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Gnome 2464 RMD160 07fe125890d825fdf95fe532aeec07c2718cf64e SHA1 9d64837491953dd8c38142e50e0cd36d015db583 SHA256 a1214ba383eb6dbd32b34eb89c7e00df08f9284b7a2b8a82f291cb29e865ba02
 MD5 b10dbd1b6388f5fdf9feee0e56525ea5 files/Gnome 2464
 RMD160 07fe125890d825fdf95fe532aeec07c2718cf64e files/Gnome 2464
@@ -41,14 +38,14 @@ EBUILD gnome-session-2.12.0.ebuild 1967 RMD160 98103228a6a9cb90cace252c724c204a9
 MD5 0a98b57bc02653aed9053602f513fab3 gnome-session-2.12.0.ebuild 1967
 RMD160 98103228a6a9cb90cace252c724c204a96e62929 gnome-session-2.12.0.ebuild 1967
 SHA256 5923e4c4fa00db4b2069baf8a67ea4853eaca66c27426c4a46c896bb06228014 gnome-session-2.12.0.ebuild 1967
-EBUILD gnome-session-2.14.2.ebuild 2193 RMD160 21f4451ff8035b883170f2e7acc171bf55b67b7e SHA1 15fee60bb78b543ccadf5ddeb756417d63aad497 SHA256 9dc1fa1fd27c9f95d46f6de6da1978155a0ce3372eaacb4740def4ed822f8bb0
-MD5 f2f4cd114af006d8122679c638b04749 gnome-session-2.14.2.ebuild 2193
-RMD160 21f4451ff8035b883170f2e7acc171bf55b67b7e gnome-session-2.14.2.ebuild 2193
-SHA256 9dc1fa1fd27c9f95d46f6de6da1978155a0ce3372eaacb4740def4ed822f8bb0 gnome-session-2.14.2.ebuild 2193
-MISC ChangeLog 18898 RMD160 15ce59c0dff13099feb1750a81bfd8b39a9dab81 SHA1 d8a305adb5041f0ecabecf4012b9ed2ce170bea7 SHA256 5362b196ad640fa72ce6b2b002e0395e66892afa867c158fc1349738c6d568bb
-MD5 cceb1795568460e5a9e71bd43d9c6b23 ChangeLog 18898
-RMD160 15ce59c0dff13099feb1750a81bfd8b39a9dab81 ChangeLog 18898
-SHA256 5362b196ad640fa72ce6b2b002e0395e66892afa867c158fc1349738c6d568bb ChangeLog 18898
+EBUILD gnome-session-2.14.2.ebuild 2191 RMD160 617a8eacd4e8fe82c28e65eef1bcb6015e4fdf2d SHA1 c6f6cb85c6965661e8cced18423d9c1b5ae9752f SHA256 cb0126c2134b473e0ebdcf31f028e4b1e2c30cd54b0bf4e3aaaf76dfbdc5c79c
+MD5 65221a6d5de953aa2b0d2f6208b908fe gnome-session-2.14.2.ebuild 2191
+RMD160 617a8eacd4e8fe82c28e65eef1bcb6015e4fdf2d gnome-session-2.14.2.ebuild 2191
+SHA256 cb0126c2134b473e0ebdcf31f028e4b1e2c30cd54b0bf4e3aaaf76dfbdc5c79c gnome-session-2.14.2.ebuild 2191
+MISC ChangeLog 18995 RMD160 38a9f453b4aa0f73e76cd545a901642b443634e7 SHA1 e46b58d9d6531242326bf5a93c2710c296408e7a SHA256 3db523a65550eee1d271e7724163e87baff0fcf7668c8289d415ebed60566f79
+MD5 036a7b3af3e109300121de6a62f9900c ChangeLog 18995
+RMD160 38a9f453b4aa0f73e76cd545a901642b443634e7 ChangeLog 18995
+SHA256 3db523a65550eee1d271e7724163e87baff0fcf7668c8289d415ebed60566f79 ChangeLog 18995
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -62,10 +59,3 @@ SHA256 898dcef80e9216eac8633aba87b97b94c37ce99f87868d00949f8322cccad994 files/di
 MD5 cca983ceb868ade31a28e9c676448bff files/digest-gnome-session-2.14.2 494
 RMD160 b85af9af157b55dac4263f1cfe673b013979ff2e files/digest-gnome-session-2.14.2 494
 SHA256 4aaaf01b6bba1d51e2acf0e333e1bcd52333ffe46452815393034e137a271731 files/digest-gnome-session-2.14.2 494
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEw5xromPajV0RnrERAsN4AJ9P8aGo9I/bNKuSn9k2irrTTjzQQQCeJuCo
-bohVU9sF/feBwD0Zt4aCCHY=
-=pkSG
------END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/gnome-session-2.14.2.ebuild b/gnome-base/gnome-session/gnome-session-2.14.2.ebuild
index 31b615937305..36075ca8e5ef 100644
--- a/gnome-base/gnome-session/gnome-session-2.14.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.14.2.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/gnome-base/gnome-session/gnome-session-2.14.2.ebuild,v 1.6 2006/07/17 18:03:53 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.14.2.ebuild,v 1.7 2006/08/11 20:40:38 dang Exp $
 
 inherit eutils gnome2
 
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.10.40
 	>=dev-util/pkgconfig-0.17
 	dev-util/intltool
+	=sys-devel/automake-1.9*
 	!gnome-base/gnome-core"
 
 # gnome-base/gnome-core overwrite /usr/bin/gnome-session
@@ -53,7 +54,6 @@ src_unpack() {
 	#support notification support at this time
 	epatch ${FILESDIR}/${PN}-2.14.0-no_libnotify.patch
 
-	export WANT_AUTOMAKE=1.9.6
 	cp aclocal.m4 old_macros.m4
 	aclocal -I . || die "aclocal failed"
 	autoconf || die "autoconf failed"