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 | be56cace8144be1fcc1f4bdb8476cd2ed9c3df83 (patch) | |
| tree | dd738a27a1348b6ea52ecd2ba61e2fa6fbaf958e /dev-ruby/actionmailer | |
| parent | Bump to 2.6.8. Bug fixes. (diff) | |
| download | historical-be56cace8144be1fcc1f4bdb8476cd2ed9c3df83.tar.gz historical-be56cace8144be1fcc1f4bdb8476cd2ed9c3df83.tar.bz2 historical-be56cace8144be1fcc1f4bdb8476cd2ed9c3df83.zip | |
Fix slot conflict: =dev-ruby/actionpack-2.1.2 required by ('installed', '/', 'dev-ruby/actionmailer-2.1.2', 'nomerge')
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | dev-ruby/actionmailer/actionmailer-2.1.2.ebuild | 6 |
3 files changed, 11 insertions, 6 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/Manifest b/dev-ruby/actionmailer/Manifest index 1165b967e12a..1900eac9a886 100644 --- a/dev-ruby/actionmailer/Manifest +++ b/dev-ruby/actionmailer/Manifest @@ -4,7 +4,7 @@ DIST actionmailer-2.1.2.gem 108032 RMD160 9830fc3a741cef0d2803210f44293f1048091b DIST actionmailer-2.2.2.gem 109056 RMD160 9f896948661bbf66e0ec26dded72eced17ae8451 SHA1 a7f3d228cdc763886fd1fe8b5637c56795df3fd0 SHA256 164de36ca0e858ccc9bd3e33ae1ee3d3bb9f964f7d941621b3bec725945af5fe EBUILD actionmailer-1.3.6.ebuild 511 RMD160 9434125634f0bd067ff468336e02d4242736b338 SHA1 3c4ec1b357864f60823cb9a34ca927179ebc2919 SHA256 3ce71cb8b2d37857990bea78e76da37f4669c58adb6a255ea7398e1cb92bca7a EBUILD actionmailer-2.0.5.ebuild 512 RMD160 03d941bb68790ca68e094402e649aba1b6090b53 SHA1 c8624e4783f9ccea8e9c045e78ac2627428bead2 SHA256 34daf72ff11e78cb82f33d8c9fad9642aaf894ef008480a4f373a580e57141e2 -EBUILD actionmailer-2.1.2.ebuild 513 RMD160 5560e43a2e0bef6e91001e41d8ece36cce0412a7 SHA1 558b39cd7bf6a900f433494778334eade1f84970 SHA256 b81f8011b70ce847d47662abd69ad134acc027e0a9ee85bd193b15760ce51f1d +EBUILD actionmailer-2.1.2.ebuild 510 RMD160 227356fc3cf6d918d53ac5d43f66689a68193643 SHA1 ea6544c95544a4d9a2095a70d15d564009f3574e SHA256 8a10825a0ea70004289c62b65b759a58c321ed2e4f358b996d983f1414140fb1 EBUILD actionmailer-2.2.2.ebuild 510 RMD160 e4cdd7fb8fbe214ce3401a55b4869675d4c738d3 SHA1 3ff26960d96d54cdd2fc2d3897e88cde3d258337 SHA256 ddca682b431606d87df2c4a7127f8b13043bd4dbdf9c4b2c080064f777629206 -MISC ChangeLog 12879 RMD160 1a7969b469090b8fbfa6954ad1a6c9e17b63b37f SHA1 8ceadc9feb1f435e38c985898e908ddb1db08271 SHA256 626ef83b2d7b7b567a8351495a86146251ba659884d64917b590b324083a587e +MISC ChangeLog 13085 RMD160 049ba07ac5af386b11c57680d89d55decb860bfe SHA1 8125bfd8b85f7f6a7cf7f281cfe891b0f5f445fe SHA256 c674a4f13810d55cae01f9476416162e8585948c1146427aa057fbf763cf6302 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c 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" |