Version bump, remove JRuby support due to the known-broken tests; drop ruby 1.9 support from coderay 0.9.8 so that we can ask stable. Replace the old syntax for ruby_add_bdepend.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

4 files changed, 26 insertions, 17 deletions

diff --git a/dev-ruby/coderay/ChangeLog b/dev-ruby/coderay/ChangeLog
index 06992added3a..e89aa1b70ac5 100644
--- a/dev-ruby/coderay/ChangeLog
+++ b/dev-ruby/coderay/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/coderay
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/ChangeLog,v 1.41 2011/10/03 20:02:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/ChangeLog,v 1.42 2011/12/08 19:50:44 flameeyes Exp $
+
+*coderay-1.0.4 (08 Dec 2011)
+
+  08 Dec 2011; Diego E. Pettenò <flameeyes@gentoo.org> +coderay-1.0.4.ebuild,
+  -coderay-0.9.7.ebuild, coderay-0.9.8.ebuild, coderay-1.0.0.ebuild:
+  Version bump, remove JRuby support due to the known-broken tests; drop ruby
+  1.9 support from coderay 0.9.8 so that we can ask stable. Replace the old
+  syntax for ruby_add_bdepend.
 
   03 Oct 2011; Jeroen Roovers <jer@gentoo.org> coderay-0.9.6.ebuild:
   Stable for HPPA (bug #385149).
diff --git a/dev-ruby/coderay/coderay-0.9.8.ebuild b/dev-ruby/coderay/coderay-0.9.8.ebuild
index 67c4061b8938..d3a3d7923f77 100644
--- a/dev-ruby/coderay/coderay-0.9.8.ebuild
+++ b/dev-ruby/coderay/coderay-0.9.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/coderay-0.9.8.ebuild,v 1.1 2011/05/01 07:30:45 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/coderay-0.9.8.ebuild,v 1.2 2011/12/08 19:50:44 flameeyes Exp $
 
 EAPI=2
 
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ree18 jruby"
 
 RUBY_FAKEGEM_TASK_DOC="doc"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -25,6 +25,4 @@ IUSE=""
 # dependency to ensure that we get at least a version that works: bug
 # 330621. We use this convoluted way because redcloth isn't available
 # yet for jruby.
-USE_RUBY=ruby18 ruby_add_bdepend "ruby_targets_ruby18 test" ">=dev-ruby/redcloth-4.2.2"
-USE_RUBY=ruby19 ruby_add_bdepend "ruby_targets_ruby19 test" ">=dev-ruby/redcloth-4.2.2"
-USE_RUBY=ree18 ruby_add_bdepend "ruby_targets_ree18 test" ">=dev-ruby/redcloth-4.2.2"
+USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( >=dev-ruby/redcloth-4.2.2 )"
diff --git a/dev-ruby/coderay/coderay-1.0.0.ebuild b/dev-ruby/coderay/coderay-1.0.0.ebuild
index a324f1889daa..b45648f5ca67 100644
--- a/dev-ruby/coderay/coderay-1.0.0.ebuild
+++ b/dev-ruby/coderay/coderay-1.0.0.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/coderay/coderay-1.0.0.ebuild,v 1.1 2011/09/27 17:51:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/coderay-1.0.0.ebuild,v 1.2 2011/12/08 19:50:44 flameeyes Exp $
 
 EAPI=4
 
@@ -32,9 +32,7 @@ IUSE=""
 # dependency to ensure that we get at least a version that works: bug
 # 330621. We use this convoluted way because redcloth isn't available
 # yet for jruby.
-USE_RUBY=ruby18 ruby_add_bdepend "ruby_targets_ruby18 test" ">=dev-ruby/redcloth-4.2.2"
-USE_RUBY=ruby19 ruby_add_bdepend "ruby_targets_ruby19 test" ">=dev-ruby/redcloth-4.2.2"
-USE_RUBY=ree18 ruby_add_bdepend "ruby_targets_ree18 test" ">=dev-ruby/redcloth-4.2.2"
+USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( >=dev-ruby/redcloth-4.2.2 )"
 
 all_ruby_prepare() {
 	# Don't run two tests that are known to break on jruby 1.5. We
diff --git a/dev-ruby/coderay/coderay-0.9.7.ebuild b/dev-ruby/coderay/coderay-1.0.4.ebuild
index 865d23393b19..f747329f7ae6 100644
--- a/dev-ruby/coderay/coderay-0.9.7.ebuild
+++ b/dev-ruby/coderay/coderay-1.0.4.ebuild
@@ -1,20 +1,27 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/coderay-0.9.7.ebuild,v 1.3 2011/09/21 19:08:48 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/coderay-1.0.4.ebuild,v 1.1 2011/12/08 19:50:44 flameeyes Exp $
 
-EAPI=2
+EAPI=4
 
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ree18 ruby19"
+
+# The test target also contains test:exe but that requires
+# shoulda-context which we do not have packaged yet.
+RUBY_FAKEGEM_TASK_TEST="test:functional test:units"
 
 RUBY_FAKEGEM_TASK_DOC="doc"
 RUBY_FAKEGEM_DOCDIR="doc"
 
-RUBY_FAKEGEM_EXTRADOC="lib/README"
+RUBY_FAKEGEM_EXTRADOC="Changes-pre-1.0.textile Changes.textile FOLDERS IDEA README_INDEX.rdoc README.textile TODO"
 
 inherit ruby-fakegem
 
 DESCRIPTION="A Ruby library for syntax highlighting."
 HOMEPAGE="http://coderay.rubychan.de/"
+SRC_URI="https://github.com/rubychan/coderay/tarball/v${PV} -> ${P}.tgz"
+
+RUBY_S="rubychan-coderay-*"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -25,6 +32,4 @@ IUSE=""
 # dependency to ensure that we get at least a version that works: bug
 # 330621. We use this convoluted way because redcloth isn't available
 # yet for jruby.
-USE_RUBY=ruby18 ruby_add_bdepend "ruby_targets_ruby18 test" ">=dev-ruby/redcloth-4.2.2"
-USE_RUBY=ruby19 ruby_add_bdepend "ruby_targets_ruby19 test" ">=dev-ruby/redcloth-4.2.2"
-USE_RUBY=ree18 ruby_add_bdepend "ruby_targets_ree18 test" ">=dev-ruby/redcloth-4.2.2"
+USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( >=dev-ruby/redcloth-4.2.2 )"