Version bump. Remove part of patches that got applied upstream.

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

diff --git a/dev-ruby/session/ChangeLog b/dev-ruby/session/ChangeLog
index 6464adfbd1fe9dbdc5d2d51683806cf4e4fc50fb..0c5689a2fdcf767cc40d35ae540fa5b71cbd8a92 100644 (file)
--- a/dev-ruby/session/ChangeLog
+++ b/dev-ruby/session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/session
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/ChangeLog,v 1.6 2010/07/17 17:15:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/ChangeLog,v 1.7 2010/07/19 09:30:44 graaff Exp $
+
+*session-3.1.0 (19 Jul 2010)
+
+  19 Jul 2010; Hans de Graaff <graaff@gentoo.org> +session-3.1.0.ebuild,
+  +files/session-3.1.0-jruby.patch:
+  Version bump. Remove part of patches that got applied upstream.
 
   17 Jul 2010; Raúl Porcel <armin76@gentoo.org> session-2.4.0.ebuild:
   Add ~sparc wrt #322053

diff --git a/dev-ruby/session/Manifest b/dev-ruby/session/Manifest
index 209f673d334dfa797855e9ecba2baf7be85ea4a5..2bd08ce80894f29e054aea0dd9cbc37fddfbd2a2 100644 (file)
--- a/dev-ruby/session/Manifest
+++ b/dev-ruby/session/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX session-2.4.0-jruby.patch 2184 RMD160 2e7fd1d1eadcb63716756f001eeaf0f88735a10a SHA1 138bec7bc19758d5e48709de1856589ce3b613a8 SHA256 fcd11849744be46bf0c0a88f751bff8f874a2dbb39876a2e67796aff83b0e303
+AUX session-3.1.0-jruby.patch 950 RMD160 5019ec6f3ebae81a3109e911753b327f82178c87 SHA1 b2601623c9cd82686c2479ab846cf2d431373557 SHA256 dabfbff72320eeb75191df06b49010ba3f47120476618238d9e94c2e9058675d
 DIST session-2.4.0.tgz 20709 RMD160 350689fe4d382d10a50342366f5b4105418a618b SHA1 3c56d563d6461129312590d77bc33778ae44be46 SHA256 67a8977e458aaa469dc24d90b7163690315b71b45eca99e98a0843d1c9e97c78
+DIST session-3.1.0.gem 15872 RMD160 b76e67ff794dce273f7332d9a5e3246bf9baa21d SHA1 5b9d634848b01fa5ff5c12fa6ed2f4dcd3c92731 SHA256 4be736d4d0110dbac8cf0e5b0c08278c7ae017308b04267179e9ef0769089869
 EBUILD session-2.4.0.ebuild 1210 RMD160 5c8454b41119a4a2833a0670efabfeec19aa3f5f SHA1 b43b231d062b7c6c22ed5af844e63fd0a5e120d3 SHA256 beb8f1b04e89f2e417c5f2cc760e2cf4c3e0270ef2ba994392f9c3a4467f3d29
-MISC ChangeLog 1045 RMD160 4ef1f5256d7dd9416c98586206356c84b23d3f94 SHA1 e38f1797281d54f99b7e38a192992be79846e1c7 SHA256 fba758cbb4ab9867f7537136d05c19923c275dc03f5077296407cc9346b22c59
+EBUILD session-3.1.0.ebuild 1197 RMD160 59fda46afa0a6b692ba2b439412e587385c041eb SHA1 7654df8e719ada08a83a8925172b2725cb443a47 SHA256 c80f3a28f53071604d276d335153a875f0de44c41140393ecc73e80fb2c4c89c
+MISC ChangeLog 1250 RMD160 37fea0f981c3adbc9314b14ee28147f96977d333 SHA1 8ef22ed2ef35452b9cd0eada6cf4cf09a0a022f3 SHA256 5281530bc54029c69ceb19689f76a323343de14cecf485f0e977cf5c75cdfc12
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkxEG0oACgkQZihJkut28SvpWAD8C+xh8Yq+HUCyZ6I7CxXnq54I
+/MWpUxq4cp2RI3qpS0IA/23MgyFQp9uOXWr2W7QExd2QaMA8Bli6AKudgXznlUt3
+=5wW5
+-----END PGP SIGNATURE-----

diff --git a/dev-ruby/session/files/session-3.1.0-jruby.patch b/dev-ruby/session/files/session-3.1.0-jruby.patch
new file mode 100644 (file)
index 0000000..230f315
--- /dev/null
+++ b/dev-ruby/session/files/session-3.1.0-jruby.patch
@@ -0,0 +1,25 @@
+From 879f701c35699d194890c288a036b0037f6b3424 Mon Sep 17 00:00:00 2001
+From: Charles Oliver Nutter <headius@headius.com>
+Date: Thu, 14 Jan 2010 15:23:57 -0600
+Subject: [PATCH] Modifications to get session tests running green under JRuby.
+
+---
+ lib/session.rb  |   16 +++++++++++-----
+ test/session.rb |    3 +++
+ 2 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/lib/session.rb b/lib/session.rb
+index dffa1f3..824c76f 100755
+--- a/lib/session.rb
++++ b/lib/session.rb
+@@ -86,7 +86,9 @@ module Session
+     class << self
+       def default_prog
+         return @default_prog if defined? @default_prog and @default_prog
+-        if defined? self::DEFAULT_PROG
++        # Workaround for http://jira.codehaus.org/browse/JRUBY-4479
++        if (self::DEFAULT_PROG rescue nil)
++#        if defined? self::DEFAULT_PROG
+           return @default_prog = self::DEFAULT_PROG 
+         else
+           @default_prog = ENV["SESSION_#{ self }_PROG"]

diff --git a/dev-ruby/session/session-3.1.0.ebuild b/dev-ruby/session/session-3.1.0.ebuild
new file mode 100644 (file)
index 0000000..7313e33
--- /dev/null
+++ b/dev-ruby/session/session-3.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/session-3.1.0.ebuild,v 1.1 2010/07/19 09:30:44 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A set of classes to drive external programs via pipe"
+HOMEPAGE="http://codeforpeople.com/lib/ruby/session/"
+#SRC_URI="http://codeforpeople.com/lib/ruby/session/${P}.tgz"
+
+# License info based on http://github.com/ahoward/session as indicated
+# by author.
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
+
+all_ruby_prepare() {
+       # needed to void a collision with the Timeout::Error alias in Ruby
+       # 1.8.7 at least.
+       sed -i -e 's:TimeoutError:SessionTimeoutError:' test/session.rb || die
+}
+
+each_ruby_prepare() {
+       case ${RUBY} in
+               *jruby)
+                       epatch "${FILESDIR}"/${P}-jruby.patch
+                       ;;
+       esac
+}
+
+each_ruby_test() {
+       ${RUBY} -Ilib test/*.rb || die "tests failed"
+}
+
+all_ruby_install() {
+       all_fakegem_install
+
+       docinto examples
+       dodoc sample/* || die
+}