Version bump, remove now-obsoleted patch. Now use gem for packaging. Add ~x86 as it's tested in a development guest.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 40 insertions, 84 deletions

diff --git a/dev-ruby/shotgun/ChangeLog b/dev-ruby/shotgun/ChangeLog
index 00469528c9ca..549d22a8abc9 100644
--- a/dev-ruby/shotgun/ChangeLog
+++ b/dev-ruby/shotgun/ChangeLog
@@ -1,6 +1,13 @@
 # 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.1 2010/01/25 18:55:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shotgun/ChangeLog,v 1.2 2010/01/28 16:27:38 flameeyes Exp $
+
+*shotgun-0.6 (28 Jan 2010)
+
+  28 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> -shotgun-0.5.ebuild,
+  -files/shotgun-0.5-optional-launchy.patch, +shotgun-0.6.ebuild:
+  Version bump, remove now-obsoleted patch. Now use gem for packaging. Add
+  ~x86 as it's tested in a development guest.
 
 *shotgun-0.5 (25 Jan 2010)
 
diff --git a/dev-ruby/shotgun/Manifest b/dev-ruby/shotgun/Manifest
index 6a8fbd997f67..0099eed37b2d 100644
--- a/dev-ruby/shotgun/Manifest
+++ b/dev-ruby/shotgun/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX shotgun-0.5-optional-launchy.patch 1030 RMD160 99202f5cf5e3a7484bcef934cbb2ac9cf8d1d32e SHA1 8b0db8bc5d9809c95eecc6b1dd892dabf14b8414 SHA256 869751dd6b7f2bddc30d51b5985afc84c9f9f3bf07cb3d19208c203af4e6287c
-DIST shotgun-git-0.5.tgz 5045 RMD160 a782a04b04d327afcc1aa7d87ccc12f28faa4431 SHA1 475cfc338ce99512aaa591a38519a7a9953166b5 SHA256 7ddad404bc0495ef27868e510f0858955251b0e5dc62b36b780bdc0922c958b1
-EBUILD shotgun-0.5.ebuild 1424 RMD160 b7eee2aeaff45cfbadb7780f0393bdaea5efe315 SHA1 d0d9ffd42913221aba7ad1bae2c6fc7aca19653f SHA256 8d35953b30df0e516f963ae89157e2b112bdadacfdbecc4feff5af37953087b9
-MISC ChangeLog 440 RMD160 d5dae7ef9154b7855a70d627ced4deddb6479486 SHA1 95d68cfa92ed9dbf0ff8f38b7fe2e06a1be8cb08 SHA256 eebd1bee60b98f23f7e1f6229b806195d1d995724a1900e25e863277398f46e9
+DIST shotgun-0.6.gem 8192 RMD160 e96d5c59f05e31bafa63d533c873784dae707304 SHA1 575893ec5b8afe2796892123cd94e1fd7a0d1490 SHA256 6ee1afdfaa648f326f5e0da163e4e76edfe377581f5dbc0c08c49c264bd5128b
+EBUILD shotgun-0.6.ebuild 716 RMD160 3ddd31595f9a1e226cdfacfd9ad1b8c724b81b4a SHA1 870e8d6bfe94602fd2f46c933f5732086ad18a8f SHA256 9307b5247e140ea1c5eb9f3b679cca23a755c26aa2525e61d569ea468652c327
+MISC ChangeLog 733 RMD160 cd7f860453dd7d997b17cb28fc9026a7be2ca5a4 SHA1 23e5cc338bc5c8bde04f94db1db0ff73b6486d9c SHA256 5dec36daf0108893f93433684658ea6a317da102b2137e32dd7b4f746070e3d7
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktd6RwACgkQAiZjviIA2Xh+dACfbyawLdeNFcpfB1MOOKduu2+/
-s24An2dChW++sUGf0OeOinccawOH0a48
-=lw/9
+iEYEARECAAYFAkthur4ACgkQAiZjviIA2Xic6wCeMFdKTPC8LGKURGao/PHwHK4l
+tyoAnik8UvrIySf/WJrgaSCzxLFrrRXd
+=0gfG
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/shotgun/files/shotgun-0.5-optional-launchy.patch b/dev-ruby/shotgun/files/shotgun-0.5-optional-launchy.patch
deleted file mode 100644
index a060234a4299..000000000000
--- a/dev-ruby/shotgun/files/shotgun-0.5-optional-launchy.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7d571983f5794f88c92560f1fc5061aa4ac12bac Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Mon, 25 Jan 2010 19:09:53 +0100
-Subject: [PATCH] Don't fail away if launchy could not be loaded.
-
-Since it's just a minor feature, make launchy optional this way.
----
- bin/shotgun |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/bin/shotgun b/bin/shotgun
-index d618d29..e12c4d8 100755
---- a/bin/shotgun
-+++ b/bin/shotgun
-@@ -137,7 +137,11 @@ server.run app, options do |inst|
-   puts "== Shotgun starting #{server.to_s} on http://#{options[:Host]}:#{options[:Port]}"
- 
-   if browse
--    require 'launchy'
--    Launchy.open("http://#{options[:Host]}:#{options[:Port]}#{options[:Path]}")
-+    begin
-+      require 'launchy'
-+      Launchy.open("http://#{options[:Host]}:#{options[:Port]}#{options[:Path]}")
-+    rescue LoadError
-+      $stderr.puts "Unable to load 'launchy', the browser won't be launched."
-+    end
-   end
- end
--- 
-1.6.6.1
-
diff --git a/dev-ruby/shotgun/shotgun-0.5.ebuild b/dev-ruby/shotgun/shotgun-0.5.ebuild
deleted file mode 100644
index c01fd4117488..000000000000
--- a/dev-ruby/shotgun/shotgun-0.5.ebuild
+++ /dev/null
@@ -1,45 +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.5.ebuild,v 1.1 2010/01/25 18:55:56 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/"
-
-GITHUB_USER="rtomayko"
-# Untagged, but should correspond to 0.5 release
-TREE_HASH="91f76ba3a75a22f60121b1403881aec70f35d75f"
-
-SRC_URI="http://github.com/${GITHUB_USER}/${PN}/tarball/${TREE_HASH} -> ${PN}-git-${PV}.tgz"
-S="${WORKDIR}/${GITHUB_USER}-${PN}-${TREE_HASH:0:7}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-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 :/
-# Has a runtime dependency over launchy, but it's not striclty needed,
-# so we'll patch it and announce its possible requirement.
-ruby_add_rdepend '=dev-ruby/rack-1.0*'
-ruby_add_bdepend test dev-ruby/bacon
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${P}-optional-launchy.patch
-}
-
-pkg_postinst() {
-	elog "${PN} can also launch your browser at startup, but to do so it needs"
-	elog "the dev-ruby/launchy package that is currently available just on the Ruby"
-	elog "project's overlay for dependency/license issues."
-}
diff --git a/dev-ruby/shotgun/shotgun-0.6.ebuild b/dev-ruby/shotgun/shotgun-0.6.ebuild
new file mode 100644
index 000000000000..e1058f8e1d44
--- /dev/null
+++ b/dev-ruby/shotgun/shotgun-0.6.ebuild
@@ -0,0 +1,26 @@
+# 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