Changed eselect-rails from PDEPEND to DEPEND. Moved blockers from eselect-rails to here. Should address bug #172812.

(Portage version: 2.1.3.7)

9 files changed, 34 insertions, 17 deletions

diff --git a/dev-ruby/rails/ChangeLog b/dev-ruby/rails/ChangeLog
index 9d22151ee08a..bf7d103aa469 100644
--- a/dev-ruby/rails/ChangeLog
+++ b/dev-ruby/rails/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/rails
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.74 2007/09/01 05:35:18 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.75 2007/09/03 21:14:44 nichoj Exp $
+
+  03 Sep 2007; Joshua Nichols <nichoj@gentoo.org> rails-1.1.6.ebuild,
+  rails-1.1.6-r1.ebuild, rails-1.1.6-r2.ebuild, rails-1.2.0.ebuild,
+  rails-1.2.1.ebuild, rails-1.2.2.ebuild, rails-1.2.3.ebuild,
+  rails-1.2.3-r1.ebuild:
+  Changed eselect-rails from PDEPEND to DEPEND. Moved blockers from
+  eselect-rails to here. Should address bug #172812.
 
 *rails-1.2.3-r1 (01 Sep 2007)
 *rails-1.1.6-r2 (01 Sep 2007)
diff --git a/dev-ruby/rails/rails-1.1.6-r1.ebuild b/dev-ruby/rails/rails-1.1.6-r1.ebuild
index 9db5928a5d2a..5532561d2efa 100644
--- a/dev-ruby/rails/rails-1.1.6-r1.ebuild
+++ b/dev-ruby/rails/rails-1.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.1.6-r1.ebuild,v 1.2 2007/02/10 03:17:43 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.1.6-r1.ebuild,v 1.3 2007/09/03 21:14:44 nichoj Exp $
 
 inherit ruby gems
 
@@ -25,7 +25,10 @@ DEPEND=">=dev-lang/ruby-1.8.2
 	sqlite? ( >=dev-ruby/sqlite-ruby-2.2.2 )
 	sqlite3? ( dev-ruby/sqlite3-ruby )
 	mysql? ( >=dev-ruby/mysql-ruby-2.7 )
-	postgres? ( >=dev-ruby/ruby-postgres-0.7.1 )"
+	postgres? ( >=dev-ruby/ruby-postgres-0.7.1 )
+	!~dev-ruby/rails-1.2.0
+	!~dev-ruby/rails-1.2.1
+	!=dev-ruby/rails-1.2.3"
 
 src_install() {
 	gems_src_install
diff --git a/dev-ruby/rails/rails-1.1.6-r2.ebuild b/dev-ruby/rails/rails-1.1.6-r2.ebuild
index 07015461b669..01391da8cfe7 100644
--- a/dev-ruby/rails/rails-1.1.6-r2.ebuild
+++ b/dev-ruby/rails/rails-1.1.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.1.6-r2.ebuild,v 1.1 2007/09/01 05:35:18 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.1.6-r2.ebuild,v 1.2 2007/09/03 21:14:44 nichoj Exp $
 
 inherit ruby gems
 
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 
 IUSE="mysql sqlite sqlite3 postgres fastcgi"
 DEPEND=">=dev-lang/ruby-1.8.2
+	app-admin/eselect-rails
 	>=dev-ruby/rake-0.7.1
 	=dev-ruby/activerecord-1.14.4
 	=dev-ruby/actionmailer-1.2.5
@@ -26,7 +27,6 @@ DEPEND=">=dev-lang/ruby-1.8.2
 	sqlite3? ( dev-ruby/sqlite3-ruby )
 	mysql? ( >=dev-ruby/mysql-ruby-2.7 )
 	postgres? ( >=dev-ruby/ruby-postgres-0.7.1 )"
-PDEPEND="app-admin/eselect-rails"
 
 src_install() {
 	gems_src_install
diff --git a/dev-ruby/rails/rails-1.1.6.ebuild b/dev-ruby/rails/rails-1.1.6.ebuild
index c8baf863b15c..0733349bb9fb 100644
--- a/dev-ruby/rails/rails-1.1.6.ebuild
+++ b/dev-ruby/rails/rails-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.1.6.ebuild,v 1.3 2007/02/10 03:17:43 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.1.6.ebuild,v 1.4 2007/09/03 21:14:44 nichoj Exp $
 
 inherit ruby gems
 
@@ -25,4 +25,7 @@ DEPEND=">=dev-lang/ruby-1.8.2
 	sqlite? ( >=dev-ruby/sqlite-ruby-2.2.2 )
 	sqlite3? ( dev-ruby/sqlite3-ruby )
 	mysql? ( >=dev-ruby/mysql-ruby-2.7 )
-	postgres? ( >=dev-ruby/ruby-postgres-0.7.1 )"
+	postgres? ( >=dev-ruby/ruby-postgres-0.7.1 )
+	!~dev-ruby/rails-1.2.0
+	!~dev-ruby/rails-1.2.1
+	!=dev-ruby/rails-1.2.3"
diff --git a/dev-ruby/rails/rails-1.2.0.ebuild b/dev-ruby/rails/rails-1.2.0.ebuild
index bbffbcb20041..d59b5ff69c4d 100644
--- a/dev-ruby/rails/rails-1.2.0.ebuild
+++ b/dev-ruby/rails/rails-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.2.0.ebuild,v 1.2 2007/02/10 03:17:43 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.2.0.ebuild,v 1.3 2007/09/03 21:14:44 nichoj Exp $
 
 inherit ruby gems
 
@@ -18,7 +18,8 @@ DEPEND=">=dev-lang/ruby-1.8.5
 	>=dev-ruby/rake-0.7.1
 	=dev-ruby/activerecord-1.15.1
 	=dev-ruby/actionmailer-1.3.1
-	=dev-ruby/actionwebservice-1.2.1"
+	=dev-ruby/actionwebservice-1.2.1
+	!<dev-ruby/rails-1.1.6-r1"
 
 RDEPEND="${DEPEND}
 	fastcgi? ( >=dev-ruby/ruby-fcgi-0.8.6 )
diff --git a/dev-ruby/rails/rails-1.2.1.ebuild b/dev-ruby/rails/rails-1.2.1.ebuild
index 18233a528b96..ce6e7bafd035 100644
--- a/dev-ruby/rails/rails-1.2.1.ebuild
+++ b/dev-ruby/rails/rails-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.2.1.ebuild,v 1.2 2007/02/10 03:17:43 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.2.1.ebuild,v 1.3 2007/09/03 21:14:44 nichoj Exp $
 
 inherit ruby gems
 
@@ -18,7 +18,8 @@ DEPEND=">=dev-lang/ruby-1.8.5
 	>=dev-ruby/rake-0.7.1
 	=dev-ruby/activerecord-1.15.1
 	=dev-ruby/actionmailer-1.3.1
-	=dev-ruby/actionwebservice-1.2.1"
+	=dev-ruby/actionwebservice-1.2.1
+	!<dev-ruby/rails-1.1.6-r1"
 
 RDEPEND="${DEPEND}
 	fastcgi? ( >=dev-ruby/ruby-fcgi-0.8.6 )
diff --git a/dev-ruby/rails/rails-1.2.2.ebuild b/dev-ruby/rails/rails-1.2.2.ebuild
index 728a880bb43d..2f9e924ff988 100644
--- a/dev-ruby/rails/rails-1.2.2.ebuild
+++ b/dev-ruby/rails/rails-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.2.2.ebuild,v 1.1 2007/02/11 20:20:45 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.2.2.ebuild,v 1.2 2007/09/03 21:14:44 nichoj Exp $
 
 inherit ruby gems
 
@@ -18,7 +18,8 @@ DEPEND=">=dev-lang/ruby-1.8.5
 	>=dev-ruby/rake-0.7.1
 	=dev-ruby/activerecord-1.15.2
 	=dev-ruby/actionmailer-1.3.2
-	=dev-ruby/actionwebservice-1.2.2"
+	=dev-ruby/actionwebservice-1.2.2
+	!<dev-ruby/rails-1.1.6-r1"
 
 RDEPEND="${DEPEND}
 	fastcgi? ( >=dev-ruby/ruby-fcgi-0.8.6 )
diff --git a/dev-ruby/rails/rails-1.2.3-r1.ebuild b/dev-ruby/rails/rails-1.2.3-r1.ebuild
index e669beb3a347..c1158100d98d 100644
--- a/dev-ruby/rails/rails-1.2.3-r1.ebuild
+++ b/dev-ruby/rails/rails-1.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.2.3-r1.ebuild,v 1.1 2007/09/01 05:35:18 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.2.3-r1.ebuild,v 1.2 2007/09/03 21:14:44 nichoj Exp $
 
 inherit ruby gems
 
@@ -15,13 +15,13 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 
 IUSE="mysql sqlite sqlite3 postgres fastcgi"
 DEPEND=">=dev-lang/ruby-1.8.5
+	app-admin/eselect-rails
 	>=dev-ruby/rake-0.7.2
 	=dev-ruby/activerecord-1.15.3
 	=dev-ruby/actionmailer-1.3.3
 	=dev-ruby/actionwebservice-1.2.3
 	=dev-ruby/activesupport-1.4.2
 	=dev-ruby/actionpack-1.13.3"
-PDEPEND="app-admin/eselect-rails"
 
 RDEPEND="${DEPEND}
 	fastcgi? ( >=dev-ruby/ruby-fcgi-0.8.6 )
diff --git a/dev-ruby/rails/rails-1.2.3.ebuild b/dev-ruby/rails/rails-1.2.3.ebuild
index 942160ba2abd..8b3c5bb52b0d 100644
--- a/dev-ruby/rails/rails-1.2.3.ebuild
+++ b/dev-ruby/rails/rails-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.2.3.ebuild,v 1.2 2007/03/14 14:49:26 rbrown Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.2.3.ebuild,v 1.3 2007/09/03 21:14:44 nichoj Exp $
 
 inherit ruby gems
 
@@ -20,7 +20,8 @@ DEPEND=">=dev-lang/ruby-1.8.5
 	=dev-ruby/actionmailer-1.3.3
 	=dev-ruby/actionwebservice-1.2.3
 	=dev-ruby/activesupport-1.4.2
-	=dev-ruby/actionpack-1.13.3"
+	=dev-ruby/actionpack-1.13.3
+	!<dev-ruby/rails-1.1.6-r1"
 
 RDEPEND="${DEPEND}
 	fastcgi? ( >=dev-ruby/ruby-fcgi-0.8.6 )