Relax rack dependency. Shotgun seems to work fine with rack 1.1.0 and rack 1.2.1 installed.

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

4 files changed, 19 insertions, 39 deletions

diff --git a/dev-ruby/shotgun/ChangeLog b/dev-ruby/shotgun/ChangeLog
index 938a8afd9468..d3853797979a 100644
--- a/dev-ruby/shotgun/ChangeLog
+++ b/dev-ruby/shotgun/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/shotgun
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shotgun/ChangeLog,v 1.3 2010/07/19 10:00:50 graaff Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shotgun/ChangeLog,v 1.4 2011/01/22 16:38:07 graaff Exp $
+
+  22 Jan 2011; Hans de Graaff <graaff@gentoo.org> -shotgun-0.6.ebuild,
+  shotgun-0.8.ebuild:
+  Relax rack dependency. Shotgun seems to work fine with rack 1.1.0 and rack
+  1.2.1 installed.
+
+  22 Jan 2011; Hans de Graaff <graaff@gentoo.org> -shotgun-0.6.ebuild:
+  Remove old version.
 
 *shotgun-0.8 (19 Jul 2010)
 
diff --git a/dev-ruby/shotgun/Manifest b/dev-ruby/shotgun/Manifest
index 6a4ba6130193..046d8da233b1 100644
--- a/dev-ruby/shotgun/Manifest
+++ b/dev-ruby/shotgun/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST shotgun-0.6.gem 8192 RMD160 e96d5c59f05e31bafa63d533c873784dae707304 SHA1 575893ec5b8afe2796892123cd94e1fd7a0d1490 SHA256 6ee1afdfaa648f326f5e0da163e4e76edfe377581f5dbc0c08c49c264bd5128b
 DIST shotgun-0.8.gem 14336 RMD160 84561876a1e1b0f9d1ece4fc2e0f172b411cdacb SHA1 9caf570c30048944695a58ae425cde3583c06636 SHA256 8f04337bb4181342188dfe57570becb882d0197e1a18af047820568bb339fc54
-EBUILD shotgun-0.6.ebuild 716 RMD160 3ddd31595f9a1e226cdfacfd9ad1b8c724b81b4a SHA1 870e8d6bfe94602fd2f46c933f5732086ad18a8f SHA256 9307b5247e140ea1c5eb9f3b679cca23a755c26aa2525e61d569ea468652c327
-EBUILD shotgun-0.8.ebuild 780 RMD160 5429ff549fcbc91a6644bcf03438ba036b2aa6ee SHA1 480be4f03e12228c3daf8487c0eb540a80d644e6 SHA256 f240c07199c4c05ac15b3b2528cdbaebf376f294eb2f17fc6964cfd695d70b6a
-MISC ChangeLog 846 RMD160 7d39b3b943ec87d67cee89f4eecaceaa46a8e957 SHA1 e1ad2efde1bec672a3c7da9f7eae1b0456d0073d SHA256 c0588e1ca5b907e5bf8bb6dc4877d0553bf0e85e8cbc99065b2abf2508228a47
+EBUILD shotgun-0.8.ebuild 774 RMD160 a3d2e2441921dc12057ee37f97093d398291a62a SHA1 813ecd24ebebad1f1aceb9cf69e61bcaef9a6a6d SHA256 f71afffe6f4c9519d5b6d8751416ff0be4c8a065e4ac89d014513d3a459c9452
+MISC ChangeLog 1130 RMD160 eac18bad404bb9d7e5118967d04a2536d7465063 SHA1 ef3b2008cb097a1c6cfc749ab42dd8211f794df1 SHA256 c0e410f0340a45a2747c0182da25bc14426390ad0e8d0ca3e6b6ac3c757c6a5e
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxEIlgACgkQZihJkut28StADwD+PI+qEShydqKmOYgWBHAx54v1
-xEXWtW1CGMBOM3/N52MA/RURJHAiEQD2xTiWAjkM7q5T3IjOSJdiMmTClFrAM10R
-=AeEr
+iF4EAREIAAYFAk07B/oACgkQrnu0mw69JkqJpwD/QWommUyT4nEkPZTjqGe6hVOU
+z80N+Kd4I1Ay+1f/8hIA/iP96U0KujY/DkfzWh1G/MzwlZYv26aD4nuBDhEBJCZW
+=w52e
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/shotgun/shotgun-0.6.ebuild b/dev-ruby/shotgun/shotgun-0.6.ebuild
deleted file mode 100644
index e1058f8e1d44..000000000000
--- a/dev-ruby/shotgun/shotgun-0.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shotgun/shotgun-0.6.ebuild,v 1.1 2010/01/28 16:27:38 flameeyes Exp $
-
-EAPI=2
-USE_RUBY="ruby18"
-
-# No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Forking implementation of rackup"
-HOMEPAGE="http://rtomayko.github.com/shotgun/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Warning: the code does not use gem versioning to make sure to load
-# only the right rack version so we might need to patch it to work :/
-ruby_add_rdepend '=dev-ruby/rack-1.0*'
-ruby_add_bdepend test dev-ruby/bacon
diff --git a/dev-ruby/shotgun/shotgun-0.8.ebuild b/dev-ruby/shotgun/shotgun-0.8.ebuild
index 52d6fae11c50..0047e57a2f00 100644
--- a/dev-ruby/shotgun/shotgun-0.8.ebuild
+++ b/dev-ruby/shotgun/shotgun-0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shotgun/shotgun-0.8.ebuild,v 1.1 2010/07/19 10:00:50 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shotgun/shotgun-0.8.ebuild,v 1.2 2011/01/22 16:38:07 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18"
@@ -22,7 +22,7 @@ IUSE=""
 
 # Warning: the code does not use gem versioning to make sure to load
 # only the right rack version so we might need to patch it to work :/
-ruby_add_rdepend '=dev-ruby/rack-1.0*'
+ruby_add_rdepend 'dev-ruby/rack'
 ruby_add_bdepend test dev-ruby/bacon
 
 all_ruby_install() {