QA: make dependencies behave as they are intended, which also means fixing breakage after coderay 0.9.7 was removed. Also drop the mysql/postgres/sqlite3 USE flags that are vastly unbound and that should not be checked for in pkg_setup.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

4 files changed, 42 insertions, 39 deletions

diff --git a/www-apps/redmine/ChangeLog b/www-apps/redmine/ChangeLog
index 979c55ab7b4d..1f43d92ccd5e 100644
--- a/www-apps/redmine/ChangeLog
+++ b/www-apps/redmine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/redmine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.24 2011/11/14 15:34:15 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.25 2011/12/09 11:57:12 flameeyes Exp $
+
+  09 Dec 2011; Diego E. Pettenò <flameeyes@gentoo.org> redmine-1.1.3.ebuild,
+  redmine-1.2.1-r1.ebuild, redmine-1.2.2.ebuild:
+  QA: make dependencies behave as they are intended, which also means fixing
+  breakage after coderay 0.9.7 was removed. Also drop the mysql/postgres/sqlite3
+  USE flags that are vastly unbound and that should not be checked for in
+  pkg_setup.
 
 *redmine-1.2.2 (14 Nov 2011)
 
diff --git a/www-apps/redmine/redmine-1.1.3.ebuild b/www-apps/redmine/redmine-1.1.3.ebuild
index 8ee9726a0980..7bec1ac3d151 100644
--- a/www-apps/redmine/redmine-1.1.3.ebuild
+++ b/www-apps/redmine/redmine-1.1.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.1.3.ebuild,v 1.1 2011/05/12 16:14:10 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.1.3.ebuild,v 1.2 2011/12/09 11:57:12 flameeyes Exp $
 
 EAPI="3"
 USE_RUBY="ruby18"
-inherit eutils confutils depend.apache ruby-ng
+inherit eutils depend.apache ruby-ng
 
 DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
 HOMEPAGE="http://www.redmine.org/"
@@ -13,23 +13,22 @@ SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
+IUSE="cvs darcs fastcgi git imagemagick mercurial openid passenger subversion"
 
-ruby_add_rdepend "~dev-ruby/coderay-0.9.7
-	>=dev-ruby/rubygems-1.3.5
+ruby_add_rdepend "virtual/rubygems
+	=dev-ruby/coderay-0.9*
 	>=dev-ruby/ruby-net-ldap-0.0.4
 	~dev-ruby/i18n-0.4.2
 	~dev-ruby/rack-1.0.1
-	dev-ruby/rake"
+	dev-ruby/rake
+	fastcgi? ( dev-ruby/ruby-fcgi )
+	imagemagick? ( dev-ruby/rmagick )
+	openid? ( dev-ruby/ruby-openid )
+	passenger? ( www-apache/passenger )"
 #ruby_add_rdepend ~dev-ruby/rails-2.3.5:2.3
 #ruby_add_rdepend "dev-ruby/activerecord:2.3[mysql?,postgres?,sqlite3?]"
-ruby_add_rdepend fastcgi dev-ruby/ruby-fcgi
-ruby_add_rdepend imagemagick dev-ruby/rmagick
-ruby_add_rdepend openid dev-ruby/ruby-openid
-ruby_add_rdepend passenger www-apache/passenger
 
 RDEPEND="${RDEPEND}
-	dev-ruby/activerecord:2.3[mysql?,postgres?,sqlite3?]
 	cvs? ( >=dev-vcs/cvs-1.12 )
 	darcs? ( dev-vcs/darcs )
 	git? ( dev-vcs/git )
@@ -39,7 +38,6 @@ RDEPEND="${RDEPEND}
 REDMINE_DIR="/var/lib/${PN}"
 
 pkg_setup() {
-	confutils_require_any mysql postgres sqlite3
 	enewgroup redmine
 	# home directory is required for SCM.
 	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
diff --git a/www-apps/redmine/redmine-1.2.1-r1.ebuild b/www-apps/redmine/redmine-1.2.1-r1.ebuild
index 76877b409dac..bb9fcf0c6d98 100644
--- a/www-apps/redmine/redmine-1.2.1-r1.ebuild
+++ b/www-apps/redmine/redmine-1.2.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.2.1-r1.ebuild,v 1.1 2011/09/29 00:40:09 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.2.1-r1.ebuild,v 1.2 2011/12/09 11:57:12 flameeyes Exp $
 
 EAPI="3"
 USE_RUBY="ruby18"
-inherit eutils confutils depend.apache ruby-ng
+inherit eutils depend.apache ruby-ng
 
 DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
 HOMEPAGE="http://www.redmine.org/"
@@ -14,22 +14,21 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 #IUSE="bazaar cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
-IUSE="fastcgi imagemagick mysql openid passenger postgres sqlite3"
+IUSE="fastcgi imagemagick openid passenger"
 
-RDEPEND="$(ruby_implementation_depend ruby18 '>=' -1.8.6)[ssl]"
-
-ruby_add_rdepend "~dev-ruby/coderay-0.9.7
-	>=dev-ruby/rubygems-1.3.7
+ruby_add_rdepend "virtual/ruby-ssl
+	virtual/rubygems
+	=dev-ruby/coderay-0.9*
 	>=dev-ruby/ruby-net-ldap-0.0.4
 	~dev-ruby/i18n-0.4.2
 	~dev-ruby/rack-1.1.0
-	dev-ruby/rake"
+	dev-ruby/rake
+	fastcgi? ( dev-ruby/ruby-fcgi )
+	imagemagick? ( dev-ruby/rmagick )
+	openid? ( dev-ruby/ruby-openid )
+	passenger? ( www-apache/passenger )"
 #ruby_add_rdepend ~dev-ruby/rails-2.3.11:2.3
 #ruby_add_rdepend "~dev-ruby/activerecord-2.3.11:2.3[mysql?,postgres?,sqlite3?]"
-ruby_add_rdepend fastcgi dev-ruby/ruby-fcgi
-ruby_add_rdepend imagemagick dev-ruby/rmagick
-ruby_add_rdepend openid dev-ruby/ruby-openid
-ruby_add_rdepend passenger www-apache/passenger
 
 #RDEPEND="${RDEPEND}
 #	bazaar ( dev-vcs/bazaar )
@@ -42,7 +41,6 @@ ruby_add_rdepend passenger www-apache/passenger
 REDMINE_DIR="/var/lib/${PN}"
 
 pkg_setup() {
-	confutils_require_any mysql postgres sqlite3
 	enewgroup redmine
 	# home directory is required for SCM.
 	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
diff --git a/www-apps/redmine/redmine-1.2.2.ebuild b/www-apps/redmine/redmine-1.2.2.ebuild
index eca305fc71f4..7b657bc933d3 100644
--- a/www-apps/redmine/redmine-1.2.2.ebuild
+++ b/www-apps/redmine/redmine-1.2.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.2.2.ebuild,v 1.1 2011/11/14 15:34:15 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.2.2.ebuild,v 1.2 2011/12/09 11:57:12 flameeyes Exp $
 
 EAPI="3"
 USE_RUBY="ruby18"
-inherit eutils confutils depend.apache ruby-ng
+inherit eutils depend.apache ruby-ng
 
 DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
 HOMEPAGE="http://www.redmine.org/"
@@ -14,22 +14,23 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 #IUSE="bazaar cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
-IUSE="fastcgi imagemagick mysql openid passenger postgres sqlite3"
+IUSE="fastcgi imagemagick openid passenger"
 
 RDEPEND="$(ruby_implementation_depend ruby18 '>=' -1.8.6)[ssl]"
 
-ruby_add_rdepend "~dev-ruby/coderay-0.9.7
-	>=dev-ruby/rubygems-1.3.7
+ruby_add_rdepend "virtual/ruby-ssl
+	virtual/rubygems
+	=dev-ruby/coderay-0.9*
 	>=dev-ruby/ruby-net-ldap-0.0.4
 	~dev-ruby/i18n-0.4.2
 	~dev-ruby/rack-1.1.0
-	dev-ruby/rake"
-ruby_add_rdepend dev-ruby/rails:2.3
-ruby_add_rdepend dev-ruby/activerecord:2.3[mysql?,postgres?,sqlite3?]
-ruby_add_rdepend fastcgi dev-ruby/ruby-fcgi
-ruby_add_rdepend imagemagick dev-ruby/rmagick
-ruby_add_rdepend openid dev-ruby/ruby-openid
-ruby_add_rdepend passenger www-apache/passenger
+	dev-ruby/rake
+	dev-ruby/rails:2.3
+	dev-ruby/activerecord:2.3
+	fastcgi? ( dev-ruby/ruby-fcgi )
+	imagemagick? ( dev-ruby/rmagick )
+	openid? ( dev-ruby/ruby-openid )
+	passenger? ( www-apache/passenger )"
 
 #RDEPEND="${RDEPEND}
 #	bazaar ( dev-vcs/bazaar )
@@ -42,7 +43,6 @@ ruby_add_rdepend passenger www-apache/passenger
 REDMINE_DIR="/var/lib/${PN}"
 
 pkg_setup() {
-	confutils_require_any mysql postgres sqlite3
 	enewgroup redmine
 	# home directory is required for SCM.
 	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine