Put versions of arel in slots since they are not compatible, bug 372047.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 15 insertions, 11 deletions

diff --git a/dev-ruby/arel/ChangeLog b/dev-ruby/arel/ChangeLog
index 6a72936e38ac..150a86873fab 100644
--- a/dev-ruby/arel/ChangeLog
+++ b/dev-ruby/arel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/arel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/arel/ChangeLog,v 1.3 2011/05/21 04:42:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/arel/ChangeLog,v 1.4 2011/06/20 05:46:26 graaff Exp $
+
+  18 Jun 2011; Hans de Graaff <graaff@gentoo.org> arel-2.0.4.ebuild,
+  arel-2.1.1.ebuild:
+  Put versions of arel in slots since they are not compatible, bug 372047.
 
 *arel-2.1.1 (21 May 2011)
 
diff --git a/dev-ruby/arel/Manifest b/dev-ruby/arel/Manifest
index 8dc86498b7ef..f07337323473 100644
--- a/dev-ruby/arel/Manifest
+++ b/dev-ruby/arel/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 DIST arel-2.0.4.gem 31744 RMD160 f29dbd6627d6efb27e67af8873b7cce3af436414 SHA1 e241ef9ca93cae95794580d1e067299d56078108 SHA256 b653a3ba3921bc28426397d654b34560e4934daad3c5fca71662e9179942b19d
 DIST arel-2.1.1.gem 41472 RMD160 f9ee11688c405f5750380233cdba63229ad59531 SHA1 716067b0e1713d5da9670e34d438d90d4efaf7df SHA256 db38b7a96eb0707cd612e51b9f55c05dd636ed221061e6496ff0f6e3c9490a43
-EBUILD arel-2.0.4.ebuild 641 RMD160 a3b383b217fe30dc2c3141558ac00d1afd3faadd SHA1 d6b4e41adfa4a401168fe1774163bec85c3e4f78 SHA256 672586e923632005b8225278d63ea3036249df963b0298a9ad0a489dd6a49b43
-EBUILD arel-2.1.1.ebuild 742 RMD160 20d8d489c38394c70926fdccd40e5baffff0549a SHA1 96cabc9d0b42511e9eed3018c28d9da7c0eca23c SHA256 3f0b809056fae8e9cfccafbcb96be9bcf8ca3694c760bc960a0c570506f8c360
-MISC ChangeLog 573 RMD160 c1e32148478cd4a3a04ae9728f44c22c6b30c594 SHA1 eb413f00773f1dfae4a7348b983602cac135062f SHA256 5be1d7b44fe9b6190f7585945cfb83321c7355196e7587710756bc9e6300e5fe
+EBUILD arel-2.0.4.ebuild 644 RMD160 ebf9e7f0b3bd01391f6f74e740e8dead8144be51 SHA1 bf714113ded53350dd2c3ca6dd1b05b7da5b4875 SHA256 5dac309a958c21bcc423102f4b1ce3f47bd1d63161175c664e8edbb9077f9d87
+EBUILD arel-2.1.1.ebuild 744 RMD160 3ec1bdcea7a7f45fa96325ddca30de53bb85d865 SHA1 0d316168fd84146ea3e35310b4ed71b5a569779e SHA256 9158a2c981253f7d3bb04aeb7d2b7c85ed93f3a239e4d027cd821b7844c37d94
+MISC ChangeLog 739 RMD160 8b7adb1bce95c533dc9d9eb998da48283c325ddc SHA1 aca4ae96637fb760b164c504fb3395be93d20cf8 SHA256 8d0501d74a65a849d9287b529f768f35b288c4d2e4d2a2003962c37f11b27cea
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3XQrcACgkQrnu0mw69Jkpw+wD+Ilnc2dRZP2FQgfS5iyYTFw4B
-tYJZHqeLzH6QESIM6LEA/2NMv1Y+K2D7Gs2pSWfSKSH6U5vdnYYRcz7ecrB7KMca
-=lV7T
+iF4EAREIAAYFAk3+3r4ACgkQrnu0mw69JkouuwD+LmLqB6r8UYTHdDcJtcIQIsGE
+DwNpwkTScEiXmt8EoF8A/0/ZhsIlZCzSq0D3eolzCv6+V0HmYgfFmPw7z18N0YC2
+=6L/8
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/arel/arel-2.0.4.ebuild b/dev-ruby/arel/arel-2.0.4.ebuild
index 75fe4a773310..12918b1b56b9 100644
--- a/dev-ruby/arel/arel-2.0.4.ebuild
+++ b/dev-ruby/arel/arel-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/arel/arel-2.0.4.ebuild,v 1.2 2011/02/13 21:21:55 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/arel/arel-2.0.4.ebuild,v 1.3 2011/06/20 05:46:26 graaff Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ree18 jruby"
@@ -14,7 +14,7 @@ inherit ruby-fakegem
 DESCRIPTION="Arel is a Relational Algebra for Ruby."
 HOMEPAGE="http://github.com/rails/arel"
 LICENSE="MIT"
-SLOT="0"
+SLOT="2.0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/dev-ruby/arel/arel-2.1.1.ebuild b/dev-ruby/arel/arel-2.1.1.ebuild
index da1d646c606d..9ac221f91fcc 100644
--- a/dev-ruby/arel/arel-2.1.1.ebuild
+++ b/dev-ruby/arel/arel-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/arel/arel-2.1.1.ebuild,v 1.1 2011/05/21 04:42:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/arel/arel-2.1.1.ebuild,v 1.2 2011/06/20 05:46:26 graaff Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ree18 jruby"
@@ -17,7 +17,7 @@ inherit ruby-fakegem
 DESCRIPTION="Arel is a Relational Algebra for Ruby."
 HOMEPAGE="http://github.com/rails/arel"
 LICENSE="MIT"
-SLOT="0"
+SLOT="2.1"
 KEYWORDS="~amd64 ~x86"
 IUSE=""