diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-08-18 10:47:37 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-08-18 10:47:37 +0000 |
| commit | eafc21f6985dde428b85b07b1337a90bc6af8312 (patch) | |
| tree | b0c81554abc9a7121ea7c7efe4ace09d63162ec2 /dev-ruby/actionpack | |
| parent | Update ebuild; apply webrick security patch; unbundle minitest, rdoc 2 and th... (diff) | |
| download | gentoo-2-eafc21f6985dde428b85b07b1337a90bc6af8312.tar.gz gentoo-2-eafc21f6985dde428b85b07b1337a90bc6af8312.tar.bz2 gentoo-2-eafc21f6985dde428b85b07b1337a90bc6af8312.zip | |
Block test-unit-2.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/actionpack')
| -rw-r--r-- | dev-ruby/actionpack/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ruby/actionpack/actionpack-2.3.8-r1.ebuild | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog index 6f7d4bb68ce7..b3f86c268497 100644 --- a/dev-ruby/actionpack/ChangeLog +++ b/dev-ruby/actionpack/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/actionpack # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.155 2010/06/04 13:37:32 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.156 2010/08/18 10:47:37 flameeyes Exp $ + + 18 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> + actionpack-2.3.8-r1.ebuild: + Block test-unit-2. *actionpack-2.3.8-r1 (04 Jun 2010) diff --git a/dev-ruby/actionpack/actionpack-2.3.8-r1.ebuild b/dev-ruby/actionpack/actionpack-2.3.8-r1.ebuild index b54272bb21fd..ea418fbb9ef3 100644 --- a/dev-ruby/actionpack/actionpack-2.3.8-r1.ebuild +++ b/dev-ruby/actionpack/actionpack-2.3.8-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/dev-ruby/actionpack/actionpack-2.3.8-r1.ebuild,v 1.1 2010/06/04 13:37:32 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-2.3.8-r1.ebuild,v 1.2 2010/08/18 10:47:37 flameeyes Exp $ EAPI=2 @@ -27,7 +27,12 @@ RUBY_PATCHES=( "${P}-custom-cookie-fix.patch" ) ruby_add_rdepend "~dev-ruby/activesupport-${PV} >=dev-ruby/rack-1.1.0" -ruby_add_bdepend test "dev-ruby/activerecord:${SLOT} dev-ruby/actionmailer:${SLOT}" +ruby_add_bdepend " + test? ( + dev-ruby/activerecord:${SLOT} + dev-ruby/actionmailer:${SLOT} + !dev-ruby/test-unit:2 + )" all_ruby_prepare() { # Custom template not found in package |