diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2009-03-15 01:10:51 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2009-03-15 01:10:51 +0000 |
| commit | 6da486f5f101a0c36711df8afa704a6e6444a707 (patch) | |
| tree | 87e1e660cd8e2eec8c79beca6dd29ac0541cdacf /dev-ruby/actionmailer | |
| parent | Bump to 2.6.8. Bug fixes. (diff) | |
| download | gentoo-2-6da486f5f101a0c36711df8afa704a6e6444a707.tar.gz gentoo-2-6da486f5f101a0c36711df8afa704a6e6444a707.tar.bz2 gentoo-2-6da486f5f101a0c36711df8afa704a6e6444a707.zip | |
Fix slot conflict: =dev-ruby/actionpack-2.1.2 required by ('installed', '/', 'dev-ruby/actionmailer-2.1.2', 'nomerge')
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/actionmailer')
| -rw-r--r-- | dev-ruby/actionmailer/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-ruby/actionmailer/actionmailer-2.1.2.ebuild | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/dev-ruby/actionmailer/ChangeLog b/dev-ruby/actionmailer/ChangeLog index 7ab499749165..340130ba93de 100644 --- a/dev-ruby/actionmailer/ChangeLog +++ b/dev-ruby/actionmailer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-ruby/actionmailer # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.97 2009/01/10 16:31:08 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.98 2009/03/15 01:10:51 robbat2 Exp $ + + 15 Mar 2009; Robin H. Johnson <robbat2@gentoo.org> + actionmailer-2.1.2.ebuild: + Fix slot conflict: =dev-ruby/actionpack-2.1.2 required by ('installed', + '/', 'dev-ruby/actionmailer-2.1.2', 'nomerge') 10 Jan 2009; Raúl Porcel <armin76@gentoo.org> actionmailer-2.2.2.ebuild: ia64 stable wrt #253425 diff --git a/dev-ruby/actionmailer/actionmailer-2.1.2.ebuild b/dev-ruby/actionmailer/actionmailer-2.1.2.ebuild index a0b2d2f4369a..a4f301663ca7 100644 --- a/dev-ruby/actionmailer/actionmailer-2.1.2.ebuild +++ b/dev-ruby/actionmailer/actionmailer-2.1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-2.1.2.ebuild,v 1.6 2008/11/15 18:12:36 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-2.1.2.ebuild,v 1.7 2009/03/15 01:10:51 robbat2 Exp $ inherit ruby gems @@ -12,5 +12,5 @@ SLOT="2.1" KEYWORDS="amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="" -DEPEND="=dev-ruby/actionpack-2.1.2 +DEPEND="~dev-ruby/actionpack-2.1.2 >=dev-lang/ruby-1.8.5" |