Add patch to reduce dependency over RDoc 2, closes bug #315585. Add ruby19 and jruby as compatible targets.

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

4 files changed, 47 insertions, 9 deletions

diff --git a/dev-ruby/plist/ChangeLog b/dev-ruby/plist/ChangeLog
index c14f34532540..efdc77172f7b 100644
--- a/dev-ruby/plist/ChangeLog
+++ b/dev-ruby/plist/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/plist
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/plist/ChangeLog,v 1.4 2010/02/24 07:15:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/plist/ChangeLog,v 1.5 2010/04/16 13:02:46 flameeyes Exp $
+
+  16 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org> plist-3.1.0.ebuild,
+  +files/plist-3.1.0-nordoc.patch:
+  Add patch to reduce dependency over RDoc 2, closes bug #315585. Add ruby19
+  and jruby as compatible targets.
 
 *plist-3.1.0 (24 Feb 2010)
 
diff --git a/dev-ruby/plist/Manifest b/dev-ruby/plist/Manifest
index 595e2d37b9e6..dbb347f4edf0 100644
--- a/dev-ruby/plist/Manifest
+++ b/dev-ruby/plist/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX plist-3.1.0-nordoc.patch 756 RMD160 241c138bdc941d342fc0e8ce2ac4ff84cb69adcb SHA1 23ad830050fed82a91c19a0954dc0304b62ad6d5 SHA256 45b2bc5a850fd1549d96a9c0267145892fda00134ea2fd499ec2f9ab00e1de6c
 DIST plist-3.0.0.gem 35840 RMD160 84ee757b65b1a51a646b6eda21ef26491255a720 SHA1 e4af43c18f19a6c43b0b8149516ed2fedca43705 SHA256 c664748e3b0180aa351901e7fe3cd16e3171d591a38f41945efb0d90e4b5474c
 DIST plist-3.1.0.gem 37888 RMD160 00afd5cf5677ecb6f38e20c2def7d74d885d1a6b SHA1 8a5b74ba1dcf32e42c850723c7768963813e8bda SHA256 9ae1a010cab13bb533af87d5a1aca23958e5dae8911317244248f9c65bb30866
 EBUILD plist-3.0.0-r1.ebuild 960 RMD160 c8b5e20d5d54354eec13ee5f927e1e805f61f8ce SHA1 253b768182cd5af547a052e54488224141330766 SHA256 b47caf9c1d0162233278fb0ecabca495fff27f0cb64014420a7afc5d32621b25
 EBUILD plist-3.0.0.ebuild 567 RMD160 788766821e43071c07567ccaa8171daf84cdb776 SHA1 d28597d0eb08ed55f737e1c5ecde84c7109520f5 SHA256 bbac75a15e03ac2a834ffac81512be97eb3aa38a356e1bd22f9ba5eb054fed1a
-EBUILD plist-3.1.0.ebuild 619 RMD160 2f275f9f69a1792ce6671aaa53db6212d83a2fd5 SHA1 4e3c0eaa8e99cc7232d5ac463e91c61cf6d3587f SHA256 1b1f08dc0c33fd7c626c329b967f8b40c2f53fddedd02a9c0d7105f9a4177512
-MISC ChangeLog 723 RMD160 50e4a3223b8fd64fbfff2574c4a11f9754dcac03 SHA1 7edd92797de765d441c7dd766dd56dbee1340bf3 SHA256 f390386f674402807e84409efcdfc04ceafc4073952641e9458c2c562702b2f6
+EBUILD plist-3.1.0.ebuild 706 RMD160 73716e47695c9af32ea34b7975d3ca0caa9a86c2 SHA1 6fc4c6d2742f4ab37584c5cebf3dd5bc2ec76dc6 SHA256 3b74b8a75b4b9827a2183d07d43e574df3c69e7cee378a7d15c779d942ab4aee
+MISC ChangeLog 950 RMD160 3b3c280a69240593ff405b81701adf0447f8d377 SHA1 9eacd563d5540e3f6aa97ff3a2edad355ce2e7c5 SHA256 eb072b661f3350f3b14976f34d6f5931bd7a304dacd69014d9c008c5c41f27b8
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuE0jQACgkQeM7EJeUH71N7owCePYWs8mkL1EosLMzYjOAVYnI2
-eGoAn3NLTQlZiQpmDrMHofWiNKeq0pYd
-=1+aG
+iEYEARECAAYFAkvIYAkACgkQAiZjviIA2XjnfQCglkh0x6yuK4ikCjsAOqsV6ihE
+56EAoIKdOquph9dtoy1nHcJi2DJJuZTm
+=7gjk
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/plist/files/plist-3.1.0-nordoc.patch b/dev-ruby/plist/files/plist-3.1.0-nordoc.patch
new file mode 100644
index 000000000000..30f289efae22
--- /dev/null
+++ b/dev-ruby/plist/files/plist-3.1.0-nordoc.patch
@@ -0,0 +1,28 @@
+Index: plist-3.1.0/Rakefile
+===================================================================
+--- plist-3.1.0.orig/Rakefile
++++ plist-3.1.0/Rakefile
+@@ -15,7 +15,13 @@ require 'rake/testtask'
+ require 'rake/packagetask'
+ require 'rake/gempackagetask'
+ require 'rake/contrib/rubyforgepublisher'
+-require 'rdoc/task'
++begin
++  require 'rdoc/task'
++  doctask = RDoc::Task
++rescue LoadError
++  require 'rake/rdoctask'
++  doctask = Rake::RDocTask
++end
+ 
+ $:.unshift(File.dirname(__FILE__) + "/lib")
+ require 'plist'
+@@ -104,7 +110,7 @@ task :update_rdoc => [ :rdoc ] do
+ end
+ 
+ # Genereate the RDoc documentation
+-RDoc::Task.new do |rdoc|
++doctask.new do |rdoc|
+   rdoc.title = "All-purpose Property List manipulation library"
+   rdoc.main  = "README.rdoc"
+ 
diff --git a/dev-ruby/plist/plist-3.1.0.ebuild b/dev-ruby/plist/plist-3.1.0.ebuild
index 929879d2a317..76a78144e73d 100644
--- a/dev-ruby/plist/plist-3.1.0.ebuild
+++ b/dev-ruby/plist/plist-3.1.0.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/plist/plist-3.1.0.ebuild,v 1.1 2010/02/24 07:15:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/plist/plist-3.1.0.ebuild,v 1.2 2010/04/16 13:02:46 flameeyes Exp $
 
 EAPI="2"
-USE_RUBY="ruby18"
+USE_RUBY="ruby18 ruby19 jruby"
 
 RUBY_FAKEGEM_DOCDIR="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
 
-inherit ruby-fakegem
+inherit ruby-fakegem eutils
 
 DESCRIPTION="A library to manipulate Property List files, also known as plists"
 HOMEPAGE="http://plist.rubyforge.org/"
@@ -19,3 +19,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 IUSE=""
 
 ruby_add_bdepend test virtual/ruby-test-unit
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}/${P}-nordoc.patch"
+}