Straighten out RDEPEND as suggested by Kevin Pyle in bug #339638

Package-Manager: portage-2.2.01.16711-prefix/cvs/SunOS i386

6 files changed, 28 insertions, 19 deletions

diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index db017a2fbe8a..bb426987f991 100644
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/tcsh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.97 2010/01/24 10:18:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.98 2010/10/06 07:45:27 grobian Exp $
+
+  06 Oct 2010; Fabian Groffen <grobian@gentoo.org> tcsh-6.14-r5.ebuild,
+  tcsh-6.15-r2.ebuild, tcsh-6.16.ebuild, tcsh-6.17-r1.ebuild:
+  Straighten out RDEPEND as suggested by Kevin Pyle in bug #339638
 
 *tcsh-6.17-r1 (24 Jan 2010)
 
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 61d8dcba6995..0d27d5fac12d 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -11,9 +11,9 @@ DIST tcsh-6.16.00.tar.gz 886468 RMD160 ed23351273bb737c184658235f33869488e64696
 DIST tcsh-6.17.00.tar.gz 890084 RMD160 2cc41a895799ade6d62640f877bb626f136dac35 SHA1 9bf67d5ce1b406178e9ba535ecd34553fe0d4d36 SHA256 575266122bc2bc351c84a7f858020c0e6b6f95a64ad4de3ce95e340f57e4a9a9
 DIST tcsh-config-1.6.tar.bz2 2352 RMD160 28bc4d50211ee247f7202a4b49267d745142ef6e SHA1 5056d00da21cfad4550028821ebde49574244d87 SHA256 af86d79921c446b1ad4f8d665168ff6fd3fb24a875abde81e336ba91644c5160
 DIST tcsh-gentoo-patches-r1.8.tar.bz2 2484 RMD160 d2ac41730bbbdfb8db77a67a0104edc08bb4570e SHA1 9059e209f433a023f264907d84d55824ec6854f0 SHA256 77fa4ae60090ad5a6ec50185eec9070757eedb798b1c29327d27fc582cb59f37
-EBUILD tcsh-6.14-r5.ebuild 1850 RMD160 89490fdfd3ea32d7376c6bca456f0c2c52fdd890 SHA1 9193c2c73fe99eff2cf04c7a5f61156e8ae0c686 SHA256 f4cc6d5b8aa6878ac38ab090e945292871b2fbb6e9db06cf70623100326f453d
-EBUILD tcsh-6.15-r2.ebuild 2081 RMD160 7c3c62264463fb1a55bfa8ea0ef2795fdae92b35 SHA1 665b93c2dcdadc3ce73a986ac428122b66cd2636 SHA256 8bf3f8f3f884b115675b9338d35fe1a52f6b99095404bfc22e91e8ff89341e2c
-EBUILD tcsh-6.16.ebuild 2642 RMD160 de811469dd14ab91f817359bc00b84119fd71bab SHA1 aff1746557b90db2a09561f298682f7516424c83 SHA256 0e333f5b9685c4a501728991a36972d89df5c4f220ad81eac57cc40c44dfec3f
-EBUILD tcsh-6.17-r1.ebuild 2701 RMD160 03ef9e6ec8950a703b1c4b10dd44d7bce862c2d0 SHA1 55978ddb9c8c9ace41340bd2aa969ae4a58b0801 SHA256 9826800108f12f653f65d0fe3fd1c8d07bde6bb68c387072977d72318908510c
-MISC ChangeLog 14501 RMD160 8467c30fab28e51b1ff64228fc5105ea1e9881fb SHA1 06f4bb3c8f1087675526454b401aadfe7cb0e9a5 SHA256 7c6673845107e36de40ddc82afb3d04f411518e8f496b4eb228db982ae0f8754
+EBUILD tcsh-6.14-r5.ebuild 1871 RMD160 6665ba481944e7f3f8dd8ca9142f6c04f667c55f SHA1 3b07f6f86dace5700d7206134ade426ce2c03b13 SHA256 1932e60386b6c5a09b15c682cbe32a661c495c10db507d86286bb75531ee47e2
+EBUILD tcsh-6.15-r2.ebuild 2102 RMD160 4b381495911acea7b730f14cd3fbf32c9e50ba1f SHA1 2c8c48bca1160514da5120909d3e8b3838150131 SHA256 6b1a433a07cf9e3c0a23321c442c149ab825c70693daaa03d83647b26f981ba2
+EBUILD tcsh-6.16.ebuild 2682 RMD160 ea7c9bd37eaebdf35548ea73c04a5555d2a85c1b SHA1 d5f93cb80b5e7bdf4da7777148bcbc0705b77907 SHA256 47be421f833e819477a8a40bf0c3738627e13f457d31240e59bf35eb9d4b7560
+EBUILD tcsh-6.17-r1.ebuild 2731 RMD160 ea77cdf59e8c8abfeeffaa804352b47fb20b2c5d SHA1 3c12cd8cda69314e53c4ea3b9fb769c6d4a870b4 SHA256 e0ee2a4ee093399032f4c08dfeecfe76260573f3f46340ff74b9e90b1b92b387
+MISC ChangeLog 14703 RMD160 26bc37357c76b23be0002b8eac8e1c80cf274853 SHA1 fb804e0928e0d951528acfe64517b2834b5c99a3 SHA256 8444ed83df122ab9c4366d9e536727a5dbed5b7317020fbfddeadf9fbc5d806b
 MISC metadata.xml 728 RMD160 c51803104a894333f5a72d04295b412759c22625 SHA1 0861e219b4c1aa25f4813e70fdc4b6f427ba4ba2 SHA256 2bed723ea437a754e4e189c2456afb40193190c5126bf88008a8b234a62f44f1
diff --git a/app-shells/tcsh/tcsh-6.14-r5.ebuild b/app-shells/tcsh/tcsh-6.14-r5.ebuild
index dcba0beebf13..9a2881fcbbbf 100644
--- a/app-shells/tcsh/tcsh-6.14-r5.ebuild
+++ b/app-shells/tcsh/tcsh-6.14-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.14-r5.ebuild,v 1.5 2009/03/17 21:14:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.14-r5.ebuild,v 1.6 2010/10/06 07:45:27 grobian Exp $
 
 inherit eutils
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="perl catalogs"
 
-DEPEND=">=sys-libs/ncurses-5.1
+RDEPEND=">=sys-libs/ncurses-5.1"
+DEPEND="${RDEPEND}
 	perl? ( dev-lang/perl )
 	!app-shells/csh" # bug #119703
 
diff --git a/app-shells/tcsh/tcsh-6.15-r2.ebuild b/app-shells/tcsh/tcsh-6.15-r2.ebuild
index ca3583dc7cf5..779b0143793a 100644
--- a/app-shells/tcsh/tcsh-6.15-r2.ebuild
+++ b/app-shells/tcsh/tcsh-6.15-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.15-r2.ebuild,v 1.13 2009/03/17 21:14:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.15-r2.ebuild,v 1.14 2010/10/06 07:45:27 grobian Exp $
 
 inherit eutils
 
@@ -19,7 +19,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-f
 IUSE="perl catalogs"
 RESTRICT="test"
 
-DEPEND=">=sys-libs/ncurses-5.1
+RDEPEND=">=sys-libs/ncurses-5.1"
+DEPEND="${RDEPEND}
 	perl? ( dev-lang/perl )
 	!app-shells/csh" # bug #119703
 
diff --git a/app-shells/tcsh/tcsh-6.16.ebuild b/app-shells/tcsh/tcsh-6.16.ebuild
index 2de51f3a3c7a..3045dbc9d5ff 100644
--- a/app-shells/tcsh/tcsh-6.16.ebuild
+++ b/app-shells/tcsh/tcsh-6.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.16.ebuild,v 1.9 2009/09/30 20:13:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.16.ebuild,v 1.10 2010/10/06 07:45:27 grobian Exp $
 
 inherit eutils flag-o-matic autotools prefix
 
@@ -19,7 +19,9 @@ IUSE="perl catalogs"
 RESTRICT="test"
 
 # we need gettext because we run autoconf
-DEPEND=">=sys-libs/ncurses-5.1
+RDEPEND=">=sys-libs/ncurses-5.1
+	virtual/libiconv"
+DEPEND="${RDEPEND}
 	sys-devel/gettext
 	perl? ( dev-lang/perl )"
 RDEPEND="${DEPEND}"
diff --git a/app-shells/tcsh/tcsh-6.17-r1.ebuild b/app-shells/tcsh/tcsh-6.17-r1.ebuild
index ebcade35a4fa..4504751197a2 100644
--- a/app-shells/tcsh/tcsh-6.17-r1.ebuild
+++ b/app-shells/tcsh/tcsh-6.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.17-r1.ebuild,v 1.1 2010/01/24 10:18:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.17-r1.ebuild,v 1.2 2010/10/06 07:45:27 grobian Exp $
 
 inherit eutils flag-o-matic autotools prefix
 
@@ -18,11 +18,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="catalogs doc"
 RESTRICT="test"
 
-# we need gettext because we run autoconf
-DEPEND=">=sys-libs/ncurses-5.1
+# we need gettext because we run autoconf (AM_ICONV)
+RDEPEND=">=sys-libs/ncurses-5.1
+	virtual/libiconv"
+DEPEND="${RDEPEND}
 	sys-devel/gettext
 	doc? ( dev-lang/perl )"
-RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}