Fix dependencies.

Package-Manager: portage-2.2_rc31/cvs/Linux i686

5 files changed, 30 insertions, 25 deletions

diff --git a/app-emacs/wanderlust/ChangeLog b/app-emacs/wanderlust/ChangeLog
index a52f44c41aa2..bd5a619d84c5 100644
--- a/app-emacs/wanderlust/ChangeLog
+++ b/app-emacs/wanderlust/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/wanderlust
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/ChangeLog,v 1.70 2009/05/05 08:13:03 fauli Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/ChangeLog,v 1.71 2009/05/05 17:21:00 ulm Exp $
+
+  05 May 2009; Ulrich Mueller <ulm@gentoo.org> wanderlust-2.14.0-r3.ebuild,
+  wanderlust-2.15.5_pre20070921.ebuild,
+  wanderlust-2.15.5_pre20071215.ebuild:
+  Fix dependencies, blocker belongs in RDEPEND only.
 
   05 May 2009; Christian Faulhammer <fauli@gentoo.org>
   wanderlust-2.14.0-r3.ebuild, wanderlust-2.15.5_pre20070921.ebuild,
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index 63351e1101dd..6d93e9838f7f 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -6,15 +6,15 @@ DIST wanderlust-2.15.5_pre20070921.tar.bz2 837135 RMD160 8319f90a1e048d774ff37ea
 DIST wanderlust-2.15.5_pre20071215.tar.bz2 869234 RMD160 49390b600a92ef04257d362591d27c8b917b63c8 SHA1 03f5700c333b6fb88dfc0a18f7fa81ccbf13903f SHA256 566f9a0ee683ab719edbd1589fc97e0eaa9a472e4d2fa44dfec15e1094f742fe
 DIST wl-2.14.0-20050405.diff 16123 RMD160 d88173f176ee8608f81369b6d4ac219cffe960f1 SHA1 5267739fcad7693ce24cdeda3461e19704b8a4d9 SHA256 09b1f4365756fd990f7c2d47e506ab5fa3186a423101380b2d26b617af2a213d
 DIST wl-2.14.0.tar.gz 1101505 RMD160 1a5aa025fc05cbcf2a7d390b1804cc1b22f5df2b SHA1 75b93013444cb27ca540462afbaefdce0e157b3f SHA256 883b61e7e9560aff35efcf7d0d48b0ddd7cde598895ffd111ff214072253eb1f
-EBUILD wanderlust-2.14.0-r3.ebuild 1450 RMD160 6f079b2218ed3867e713895ff72945b188272d8f SHA1 339e8ff734811c885a4d74058039f127b4159b80 SHA256 fdb87bbf12ba88b497d40bbd6130bb068f745b7e24ac9f689e3bf242cdcf9ac0
-EBUILD wanderlust-2.15.5_pre20070921.ebuild 1199 RMD160 6aa02439a3156e7638e94381c401e01fa838f217 SHA1 e169ab3b8e4d0d065c8e6076da5878c17055011f SHA256 9434e219d3f2a5b29399739fca27bc8cc8b842df5998cea3706f07d49bc6a6de
-EBUILD wanderlust-2.15.5_pre20071215.ebuild 1199 RMD160 00afdae10b58246b2035f828761e0160f8d14515 SHA1 37ccb6ea454942a921d0556f0ef2bcb909471811 SHA256 cb4eb3936fe9b0b3388d252bdea2f9789d15030293614c52adefaf466fd2d38f
-MISC ChangeLog 12595 RMD160 f046d054ff3ac9137ca31ac35b29e8c019d084ab SHA1 53c00761a220af2b6ad879e0e691106557df4eb6 SHA256 c1b8caa93f644950c12717c70eab4a550e63b04ec33433a75f81ce8d7eb8fcc9
+EBUILD wanderlust-2.14.0-r3.ebuild 1450 RMD160 e3319ba4af8c0ed92209b7b16713092e6a2c4dd7 SHA1 15a32e0308186434c0f021d69dcb37fe657bd133 SHA256 f308ca0c3c2453137a64e181a54eddea6bc7afaf4a6c99125830427bed7f9491
+EBUILD wanderlust-2.15.5_pre20070921.ebuild 1199 RMD160 2714bd0a823a81c079a2771fd4b116a4f7c77d15 SHA1 8750f063eb4c92e5af8bb79d5b6eea2e1c81a9bf SHA256 78214a30899ca9c9e5dfef4a31d085ede9cea1deed1f13c3dcd1225b77782ff3
+EBUILD wanderlust-2.15.5_pre20071215.ebuild 1199 RMD160 858f5cea991ff1fa389322802e0c939b88292a6f SHA1 a64cfbf43364b742a62904dd1f7dc5107a2b0392 SHA256 a4817eda4a934443a454b021cd2d7b207883b2d8a416a996d4dc773292e34704
+MISC ChangeLog 12803 RMD160 ba9a8e1692e4548afe1241cf2256259734519bc0 SHA1 aeec429b56c1db11acd28592fa394570fdf202b7 SHA256 aed8bf5d5c03673b324ac4b23106817c11ccf7b04b6a31f24e6ec24a58c3b98f
 MISC metadata.xml 266 RMD160 b7787ae5ebcbe57fb7b33da75bc77ae52c7aec16 SHA1 edaea015d5d4ace9ae690007b2a79d546d460915 SHA256 68c0b94c1833cd75c01e7d674be112b432874d7a2e4176481fab6b4db81b1426
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkn/9RUACgkQNQqtfCuFneOf5ACgjabCTKapSXnAYW0jRH8TBkXm
-Gr0AniFUKcQ9AOEFMQNBP/IrWL9M97rm
-=b6Yt
+iEYEARECAAYFAkoAddkACgkQOeoy/oIi7uwJGwCdHTdMZh7ZseRyL43PqZCQZvYh
+hdAAn0QNpL8M+wKpUedH3qAzAQyglf1F
+=ny8G
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/wanderlust/wanderlust-2.14.0-r3.ebuild b/app-emacs/wanderlust/wanderlust-2.14.0-r3.ebuild
index 7c74ca722cc3..d776112f2135 100644
--- a/app-emacs/wanderlust/wanderlust-2.14.0-r3.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.14.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.14.0-r3.ebuild,v 1.14 2009/05/05 08:13:03 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.14.0-r3.ebuild,v 1.15 2009/05/05 17:21:00 ulm Exp $
 
 inherit elisp eutils
 
@@ -20,12 +20,12 @@ IUSE="bbdb ssl"
 DEPEND=">=app-emacs/apel-10.6
 	virtual/flim
 	app-emacs/semi
-	bbdb? ( app-emacs/bbdb )
-	!app-emacs/wanderlust-cvs"
-RDEPEND="${DEPEND}"
+	bbdb? ( app-emacs/bbdb )"
+RDEPEND="!app-emacs/wanderlust-cvs
+	${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
-SITEFILE=70wl-gentoo.el
+SITEFILE="70wl-gentoo.el"
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
diff --git a/app-emacs/wanderlust/wanderlust-2.15.5_pre20070921.ebuild b/app-emacs/wanderlust/wanderlust-2.15.5_pre20070921.ebuild
index a441f78d028c..a954ea655d6d 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.5_pre20070921.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.5_pre20070921.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.5_pre20070921.ebuild,v 1.2 2009/05/05 08:13:03 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.5_pre20070921.ebuild,v 1.3 2009/05/05 17:21:00 ulm Exp $
 
 inherit elisp
 
@@ -16,11 +16,11 @@ IUSE="bbdb ssl"
 DEPEND=">=app-emacs/apel-10.6
 	virtual/flim
 	app-emacs/semi
-	bbdb? ( app-emacs/bbdb )
-	!app-emacs/wanderlust-cvs"
-RDEPEND="${DEPEND}"
+	bbdb? ( app-emacs/bbdb )"
+RDEPEND="!app-emacs/wanderlust-cvs
+	${DEPEND}"
 
-SITEFILE=70wl-gentoo.el
+SITEFILE="70wl-gentoo.el"
 
 src_compile() {
 	use ssl && echo "(setq wl-install-utils t)" >> WL-CFG
diff --git a/app-emacs/wanderlust/wanderlust-2.15.5_pre20071215.ebuild b/app-emacs/wanderlust/wanderlust-2.15.5_pre20071215.ebuild
index c0be3c824381..14a81feacd93 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.5_pre20071215.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.5_pre20071215.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.5_pre20071215.ebuild,v 1.2 2009/05/05 08:13:03 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.5_pre20071215.ebuild,v 1.3 2009/05/05 17:21:00 ulm Exp $
 
 inherit elisp
 
@@ -16,11 +16,11 @@ IUSE="bbdb ssl"
 DEPEND=">=app-emacs/apel-10.6
 	virtual/flim
 	app-emacs/semi
-	bbdb? ( app-emacs/bbdb )
-	!app-emacs/wanderlust-cvs"
-RDEPEND="${DEPEND}"
+	bbdb? ( app-emacs/bbdb )"
+RDEPEND="!app-emacs/wanderlust-cvs
+	${DEPEND}"
 
-SITEFILE=70wl-gentoo.el
+SITEFILE="70wl-gentoo.el"
 
 src_compile() {
 	use ssl && echo "(setq wl-install-utils t)" >> WL-CFG