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.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

5 files changed, 35 insertions, 26 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/Manifest b/dev-ruby/coderay/Manifest
index 58144d00c8a2..fbca77fe9ae6 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -2,19 +2,19 @@
 Hash: SHA1
 
 DIST coderay-0.9.6.gem 104448 RMD160 5aaf41ca1c9942bcd2ce36f00dad571081d737c1 SHA1 5bce0af0a905759214ccda5570be56600d3a5bff SHA256 7e50806d2157b081822de9cb293bb0ae00efe1ee125db09f7be982e865f19f14
-DIST coderay-0.9.7.gem 104960 RMD160 23b98bbd1166cfb2c21b2a3c4122a89eec5ab8d6 SHA1 cef1e58aad0afec1985cc3e5602ea0e032750478 SHA256 6f0b48fab7df1575dc31e870fdd75ca145bb6bbc66adb8f52d8d69d9db59aedf
 DIST coderay-0.9.8.gem 97792 RMD160 82e8c8d9da56ea47785486e26d4e873e602b06ee SHA1 36bb1b8aa8f0f1285ab912d7f13690bef19da3c6 SHA256 1522e8b2d73dfead95d7f195dce63411c59b4b7cb120c6589d6474ccf207d38c
 DIST coderay-1.0.0.tgz 906933 RMD160 2c9fee6e2f883d0721d996f519fc289372e35cbd SHA1 d0b837ce0b25efa6c290b06b9182a6a0d9c2e51f SHA256 0d9c51d458cbacfb09841fbafb66a2963bcebb663f807085aaf2b81bede2f9ff
+DIST coderay-1.0.4.tgz 906967 RMD160 711a235c55a7f4e62fe149a5b3dfa3879b244503 SHA1 41bc7a96670462fbd614555660931a6d4057b693 SHA256 dbac1f763b1fd869d8b06a5cb2b7829f3ebc51cf5452cd31de6e6232cee6b84b
 EBUILD coderay-0.9.6.ebuild 1102 RMD160 b94e7ea7a81646196b062cce4e73d53d147faa97 SHA1 04f3aacbc748eefed85d8791b270c180329fa55c SHA256 984af2cd984f90bcf0a782110207b445718cc60351aaf11bed00f3f316398a2b
-EBUILD coderay-0.9.7.ebuild 1117 RMD160 7caafd7606e2e7841020456f1bb8199274eeb19e SHA1 56079cb927e868a11069a0292697b67daf23ea16 SHA256 7434e97c694d38c07991552c70b1158d954cfbcf069dd4b3e7e29fa50d81c0d4
-EBUILD coderay-0.9.8.ebuild 1117 RMD160 0ef3a93bafd6c03858726b90f7ac78a0ef9fc47b SHA1 6b0544e863b57dc28058ef6c4ae99db97e9bc101 SHA256 4a3d0e7716e5b5333caf0a591092af881dd3b1be8c6944ce5f18e3e038e5d053
-EBUILD coderay-1.0.0.ebuild 1741 RMD160 e71aa460177c1cb3703e7d843464a73a5191d587 SHA1 cad386c683afb6d52b296fdea3f0abc319cadf08 SHA256 7f78b56f696102823c75338c42bd99a11905df05f28dee64b5aa0c6bdafb3b0e
-MISC ChangeLog 5425 RMD160 fb3ef4457f2f1e69a7dc1cf562276b82d2c96f07 SHA1 662d03cd18baa29e85136fab6cf1531a8f7c1e7c SHA256 670d83a0c4255027a9bab416695f957ea17fddf2a317ffd29f1d2b323c8c0437
+EBUILD coderay-0.9.8.ebuild 936 RMD160 2b163602d40f65d6a1ad59fdb431654521578240 SHA1 07e9dffefb0fb36e975bbac6c18cf8b5ee8a08ff SHA256 b3cad052bf97246151dde9ddbce4122d3c4d17edd016f10179b7af2396acc072
+EBUILD coderay-1.0.0.ebuild 1567 RMD160 35de3abb1610ee830203ba0a86b3ee150c47286d SHA1 ae1a1ae3e34c9a2e24a1243367b1fab0fb17433a SHA256 7c51540558dc0a563e60a6d0cf1e32ea1ab94c5f0f9d03499625e603895c575c
+EBUILD coderay-1.0.4.ebuild 1284 RMD160 635f98e2b42339a6f92db40f57e3504437cc9edd SHA1 be6c5844bbf10b78c99c7ab7dc80fbaf8ce1473b SHA256 707294ff40ed5e7bdd15aefce81073bb34e52230f2cde551b0552169fec0072f
+MISC ChangeLog 5795 RMD160 2b2eb564d916dc61f09df9fe63e3e18939d87d0d SHA1 a040b24786b742e6d6b7962fd5813015302b0e17 SHA256 0662e1e5e33494a7398a868b8feb8854572fbf9ae4d8ad45f44a9254068eed18
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6KFOMACgkQVWmRsqeSphMH+ACeNkWz/8VpN/XWZDDE2UhtTpao
-u+oAniqL2j0u7oCVT9LlyJGigXfamDmV
-=kU+X
+iEYEARECAAYFAk7hFRYACgkQAiZjviIA2XjMPQCfYtHzfdw/SjXFSccEiYsg5KLO
+q0UAn38Rfl0S/eNXAOvmybgAsrHCsq1/
+=MCPo
 -----END PGP SIGNATURE-----
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 )"