Fixed DEPEND/RDEPEND issue.

(Portage version: 2.0.51.22-r1)

9 files changed, 39 insertions, 25 deletions

diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 615938154391..244dcc1a5fed 100644
--- a/sys-apps/pcmcia-cs/ChangeLog
+++ b/sys-apps/pcmcia-cs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/pcmcia-cs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.96 2005/07/05 13:20:19 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.97 2005/07/07 10:47:47 brix Exp $
+
+  07 Jul 2005; <brix@gentoo.org> pcmcia-cs-3.2.7-r3.ebuild,
+  pcmcia-cs-3.2.7-r4.ebuild, pcmcia-cs-3.2.8.ebuild,
+  pcmcia-cs-3.2.8-r1.ebuild, pcmcia-cs-3.2.8-r2.ebuild:
+  Fixed DEPEND/RDEPEND issue.
 
   05 Jul 2005; <brix@gentoo.org> pcmcia-cs-3.2.7-r3.ebuild,
   pcmcia-cs-3.2.7-r4.ebuild:
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r3.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r3.ebuild
index 9ad930c5b259..8f59712047c2 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r3.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r3.ebuild,v 1.4 2005/07/05 13:20:19 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r3.ebuild,v 1.5 2005/07/07 10:47:47 brix Exp $
 
 inherit linux-info eutils
 
@@ -14,10 +14,10 @@ SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
 
 HOMEPAGE="http://pcmcia-cs.sourceforge.net"
 IUSE="X trusted build apm pnp nocardbus"
-DEPEND="virtual/os-headers
+RDEPEND="!sys-apps/pcmcia-cs-cis
 		>=sys-apps/sed-4
 		X? ( virtual/x11 )"
-RDEPEND="!sys-apps/pcmcia-cs-cis"
+DEPEND="${RDEPEND} virtual/os-headers"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ppc amd64"
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r4.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r4.ebuild
index dc77d5cb30ff..9ea4798abfe8 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r4.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r4.ebuild,v 1.4 2005/07/05 13:20:19 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r4.ebuild,v 1.5 2005/07/07 10:47:47 brix Exp $
 
 inherit eutils linux-info
 
@@ -14,10 +14,10 @@ SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
 
 HOMEPAGE="http://pcmcia-cs.sourceforge.net"
 IUSE="X trusted build apm pnp nocardbus"
-DEPEND="virtual/os-headers
+RDEPEND="!sys-apps/pcmcia-cs-cis
 		>=sys-apps/sed-4
 		X? ( virtual/x11 )"
-RDEPEND="!sys-apps/pcmcia-cs-cis"
+DEPEND="${RDEPEND} virtual/os-headers"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r1.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r1.ebuild
index 48ff16075b0d..6554e6bb9790 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r1.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r1.ebuild,v 1.3 2005/06/30 09:11:47 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r1.ebuild,v 1.4 2005/07/07 10:47:47 brix Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -13,14 +13,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="gtk gtk2 vanilla trusted X xforms"
-DEPEND="virtual/linux-sources
-		>=sys-apps/sed-4"
 RDEPEND="!sys-apps/pcmcia-cs-cis
 			X? ( virtual/x11
 			gtk? ( gtk2? ( =x11-libs/gtk+-2*
 						   dev-util/pkgconfig )
 				    !gtk2? ( =x11-libs/gtk+-1* ) )
 			xforms? ( x11-libs/xforms ) )"
+DEPEND="${RDEPEND}
+		virtual/linux-sources
+		>=sys-apps/sed-4"
 PROVIDE="virtual/pcmcia"
 
 pkg_setup() {
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild
index 53f9527eb29e..d7a0b08e2d25 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild,v 1.1 2005/07/02 19:05:23 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild,v 1.2 2005/07/07 10:47:47 brix Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -13,14 +13,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="gtk gtk2 vanilla trusted X xforms"
-DEPEND="virtual/linux-sources
-		>=sys-apps/sed-4"
 RDEPEND="!sys-apps/pcmcia-cs-cis
 			X? ( virtual/x11
 			gtk? ( gtk2? ( =x11-libs/gtk+-2*
 						   dev-util/pkgconfig )
 				    !gtk2? ( =x11-libs/gtk+-1* ) )
 			xforms? ( x11-libs/xforms ) )"
+DEPEND="${RDEPEND}
+		virtual/linux-sources
+		>=sys-apps/sed-4"
 PROVIDE="virtual/pcmcia"
 
 pkg_setup() {
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild
index 03843ef66558..2aed04408aa6 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild,v 1.10 2005/06/30 09:11:47 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild,v 1.11 2005/07/07 10:47:47 brix Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -13,14 +13,15 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 
 IUSE="gtk gtk2 trusted X xforms"
-DEPEND="virtual/linux-sources
-		>=sys-apps/sed-4"
 RDEPEND="!sys-apps/pcmcia-cs-cis
 			X? ( virtual/x11
 			gtk? ( gtk2? ( =x11-libs/gtk+-2*
 						   dev-util/pkgconfig )
 				    !gtk2? ( =x11-libs/gtk+-1* ) )
 			xforms? ( x11-libs/xforms ) )"
+DEPEND="${RDEPEND}
+		virtual/linux-sources
+		>=sys-apps/sed-4"
 PROVIDE="virtual/pcmcia"
 
 pkg_setup() {
diff --git a/sys-apps/pcmciautils/ChangeLog b/sys-apps/pcmciautils/ChangeLog
index ad15bfd327b9..47b46dc23308 100644
--- a/sys-apps/pcmciautils/ChangeLog
+++ b/sys-apps/pcmciautils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pcmciautils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.2 2005/07/03 13:18:15 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.3 2005/07/07 10:48:50 brix Exp $
+
+  07 Jul 2005; <brix@gentoo.org> pcmciautils-004.ebuild,
+  pcmciautils-005.ebuild:
+  Fixed DEPEND/RDEPEND issue.
 
 *pcmciautils-005 (03 Jul 2005)
 
diff --git a/sys-apps/pcmciautils/pcmciautils-004.ebuild b/sys-apps/pcmciautils/pcmciautils-004.ebuild
index a100d17b9d59..f60508169b29 100644
--- a/sys-apps/pcmciautils/pcmciautils-004.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-004.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-004.ebuild,v 1.1 2005/06/30 09:21:50 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-004.ebuild,v 1.2 2005/07/07 10:48:50 brix Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -14,14 +14,15 @@ SLOT="0"
 KEYWORDS="~x86"
 
 IUSE="cis debug staticsocket"
-DEPEND="dev-util/yacc
-		sys-devel/flex
-		sys-apps/sed"
 RDEPEND=">=sys-fs/sysfsutils-1.2.0-r1
 		>=sys-apps/module-init-tools-3.2_pre4
 		>=sys-apps/hotplug-20040920
 		>=sys-apps/coldplug-20040920
 		cis? ( sys-apps/pcmcia-cs-cis )"
+DEPEND="${RDEPEND}
+		dev-util/yacc
+		sys-devel/flex
+		sys-apps/sed"
 PROVIDE="virtual/pcmcia"
 
 CONFIG_CHECK="PCMCIA"
diff --git a/sys-apps/pcmciautils/pcmciautils-005.ebuild b/sys-apps/pcmciautils/pcmciautils-005.ebuild
index cabef448cee1..939681a1496c 100644
--- a/sys-apps/pcmciautils/pcmciautils-005.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-005.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-005.ebuild,v 1.1 2005/07/03 13:18:15 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-005.ebuild,v 1.2 2005/07/07 10:48:50 brix Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -14,14 +14,15 @@ SLOT="0"
 KEYWORDS="~x86"
 
 IUSE="cis debug staticsocket"
-DEPEND="dev-util/yacc
-		sys-devel/flex
-		sys-apps/sed"
 RDEPEND=">=sys-fs/sysfsutils-1.2.0-r1
 		>=sys-apps/module-init-tools-3.2_pre4
 		>=sys-apps/hotplug-20040920
 		>=sys-apps/coldplug-20040920
 		cis? ( sys-apps/pcmcia-cs-cis )"
+DEPEND="${RDEPEND}
+		dev-util/yacc
+		sys-devel/flex
+		sys-apps/sed"
 PROVIDE="virtual/pcmcia"
 
 CONFIG_CHECK="PCMCIA"