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.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

5 files changed, 49 insertions, 56 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/Manifest b/www-apps/redmine/Manifest
index 26714961f6b5..63485b153c6e 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -7,25 +7,15 @@ AUX redmine.initd 1092 RMD160 bf656e18a7c03f096459dd66ba149dbcf632b9b3 SHA1 c4aa
 DIST redmine-1.1.3.tar.gz 4837121 RMD160 cb1a750ee6d5532dcead4de9b48a5d24b852db6a SHA1 6d8eb536a8bad6404a092b1f1efd9292759a2442 SHA256 9e8a914852dc4262e2718d44fc6a06ce6e943d715921b8d8d48bf87e432f5a46
 DIST redmine-1.2.1.tar.gz 9633744 RMD160 a2bf5237dc5f68560dc16dc707e7f59a461dcafb SHA1 5458fb394cfeffb5fb832db589f49fc10fa2c07f SHA256 16fb74b95c3b523bbdca7d71bcad1ffcc08c1e6b10552da9c3452e29179de221
 DIST redmine-1.2.2.tar.gz 6301292 RMD160 620efbdcf3cf8ff1e86af93b08321d973f21bd4a SHA1 ab6b0f5e449ae13a38f85b0122e67d0600c9364f SHA256 3db0788a55ccf2ac18cbd50a5716233a0ef860faa677d0231d7baeeb416e95ca
-EBUILD redmine-1.1.3.ebuild 5142 RMD160 abf246b1431f5c202897e5f800436907f6e5d141 SHA1 a239d722095a5fd38729e5919b3f54cb6f42257a SHA256 2eb00cea2817d5c9b4a3760d182319d329e91b4e19412f491a2446add87d9e08
-EBUILD redmine-1.2.1-r1.ebuild 5383 RMD160 30ba2fea50912b84557b1fd016802f4f07ea5c77 SHA1 330c3f3de88cc9a08a5c8eda1dcfc9386d58e40d SHA256 b50c6f6af7cabbf1963bfcee09a2d00342ba15503afee409de5f90e915812dd4
-EBUILD redmine-1.2.2.ebuild 5477 RMD160 beddb4aead65af49a1d4cea565c4a268af3074e4 SHA1 ba7ca283bc598fe0587cfb6d657be40f16ce55c6 SHA256 3cc2a3adb172f5324b01289fea3859efc5256bc7f7e9b3f0953a8b558cda5959
-MISC ChangeLog 4299 RMD160 306fd465e2e0057dd94139bb981440d3fa539ed6 SHA1 b2600fdd724691d46aab2fea68852a761adf33bb SHA256 79ec0bb3399706ea79e56d0acc79d260c1c9913f028d102b6ee8901e74f3e1a3
+EBUILD redmine-1.1.3.ebuild 4958 RMD160 4143bd9fbe5ca8f2d65d46dc0a707d6c32000519 SHA1 88eb4aa4374be929918b6225d049767c6b562477 SHA256 3679c0965eabd5dc8dd5159fd87eccb0460ff41d88e161dd6f740d97db327ee8
+EBUILD redmine-1.2.1-r1.ebuild 5206 RMD160 a0776fbd5c6ed83f6064a119bd29ac2acc88b8da SHA1 5950afbf31a53533c908a43a3ffa290ecc51097f SHA256 c286f5b3cbe1bd2a8396382c50b7de786252f79ed1b678eff2ececf038843e28
+EBUILD redmine-1.2.2.ebuild 5306 RMD160 d6f61041a09f1d212e2398aa7eeb4e19f8c97ae1 SHA1 4067e7930d88e2bfcd616b8441835168b8eca24b SHA256 5c3ef71e052d982b808c57e50d383ad4231c7ee6497fde45d9bf7663a12473ef
+MISC ChangeLog 4675 RMD160 6cdf70fc314914a93d6ef010702b242dbb2ca2ce SHA1 1d632980bb9a0d717e303c88d6b70844e70772cc SHA256 3208fe91f4ad6e8c852683d71345205f70ec732742ec0bf4c6668eee3d56a786
 MISC metadata.xml 618 RMD160 f79e44b9a0dabbe58db6623b335f12cc2a70fd7f SHA1 9308b667a2be99c124948dfcd82de67a301422b6 SHA256 a4a25fbf4e75e2853c36057c5dc8f4c4e77bff791f732dbe61e298df2d670a10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOwTUBAAoJECaGw+YFKA1pxgwQAIultYPTpF65gubVvXbX7WHL
-Hodk/zdrIz4DpYkMoc8X80eaq4V8eMT8eAqL+X+GMOhgIPrdfatNP2WbGaaj+3WL
-LtknNDxWbBcSHDNqARcV3gpig6TiUa+K7ph2lU9QsFtD96ZnrnZ06E5FzoHtjFud
-SuqLpscraevVYaUb+9FW+xyQCb9elVSWbTelfrTpDhWLr951CdC2Jgb5KEyMvSyI
-+URq0omGpDbjI+bLtLBFWHiT48dyIV/k5zV6VeqolsQdRHwzuuStpTQPpEr6r6Ir
-35jcb8yW2q2CEmiyS1kdEJPFqEox9dGe/Im0mLvr6Div3890+TcFOl9UZNRdecOs
-tQePHT2ANCKFq8wiot6GVemTTqxGkeNg3shSe1LxycYyG83bEAX86/n3pUHR7Yr0
-QrAeHmdUe/wYDsPtqP2XMpoGSh00dEsof4/hrk7sBJnM+yfwickSoPYHqzkwx0IO
-rxsg5YCZWhxPOBU04uuE/9OXTDdMKYxsJ3po0ymHCKlHuzZq/5ZqMfIMHs7RihdY
-yG1vTuTYgMAfl5yU8ofIio845B2/6VVY32uy1kU6BU8Abyxh698h61EXmjm3LOk+
-OLpZkQnD6GVEoJ15pkK3nLwOhlLu58aIDpTESIvijkx6+6/WDNAClUPF0EE5Ixwt
-2GSHBq1/V8bQKEtueqzH
-=qH5T
+iEYEARECAAYFAk7h95kACgkQAiZjviIA2XiqnQCgiEHPZawImj/si7OroKvxkyVG
+/4MAoK4plyagvY617YtvI4v+SYbYE0wy
+=j2wL
 -----END PGP SIGNATURE-----
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