Convert to ruby-fakegem. Fixed to work with ruby19.

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

diff --git a/dev-ruby/facter/ChangeLog b/dev-ruby/facter/ChangeLog
index 8dc53f4bd5a73d4ecf99b82b9c09623e51d7faa7..b0836799fc5f5a21d1218ff6d05b97b336f98b7f 100644 (file)
--- a/dev-ruby/facter/ChangeLog
+++ b/dev-ruby/facter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/facter
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.25 2010/04/30 07:16:17 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.26 2010/06/11 00:41:41 matsuu Exp $
+
+*facter-1.5.7-r2 (11 Jun 2010)
+
+  11 Jun 2010; MATSUU Takuto <matsuu@gentoo.org> +facter-1.5.7-r2.ebuild,
+  +files/facter-1.5.7-ruby19.patch:
+  Convert to ruby-fakegem. Fixed to work with ruby19.
 
   30 Apr 2010; Hans de Graaff <graaff@gentoo.org> facter-1.5.7-r1.ebuild:
   Update HOMEPAGE.

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 4a11c1e6318b3b6fbf3d986ce334377dfdc6a543..62a74a9a56fb32c35541293ff8021e73de39311e 100644 (file)
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -3,20 +3,33 @@ Hash: SHA1
 
 AUX facter-1.5.2-virtual.patch 953 RMD160 3dfecee1c84e11679c3787b57d1d8dbf7abf7950 SHA1 6bd4783ac9445bf9f6b78fea0123ddfc7773e1d3 SHA256 ec6d004544ae30cad301e15bb01366872d8b937e6c009743449a005481309c31
 AUX facter-1.5.7-fqdn.patch 2543 RMD160 af1a66178ffc471ecdb7a63adf486a0ba87cea97 SHA1 92502adcc136b1d94ff4888fc0bf740c56c68e9c SHA256 45023c1d89d16bf2d7b34b8017d9307155938d178baae8bd6b65d7af662aee45
+AUX facter-1.5.7-ruby19.patch 1990 RMD160 05f8340b0a896e4b0014bbee1ecb586267c21869 SHA1 36be6ca4cf666a100c675d98ffaee004a1f7eb76 SHA256 2bcb71fa3df001197da7f2da34fe507b72321fad680e517edf2450b885220409
 AUX facter-1.5.7-virtual.patch 443 RMD160 479427563fc366ca0774d0307fef4a4403e57f1a SHA1 c1c026b13c0b5e4eb308844be5b3afbf08262bfb SHA256 1e299f05f5af715e4ffac68ed432f8c94f96126db53516485e315e40471be3e4
 DIST facter-1.5.2.tgz 48857 RMD160 0574f2cc4a934c0f4cd1a8e2d8a0554002ea1f31 SHA1 2fc1ce89b3fc0041a072b4c7899cd805d9572ffe SHA256 b9d0dda8e35028f0d56bcc8951a86b2143169174545a2fb0818054e7f88085a9
 DIST facter-1.5.6.tar.gz 66356 RMD160 c0dbe660aae09758290230b6264d2ee18a072fef SHA1 a48d7e6e86199db16a647343e0dc05e143f00db4 SHA256 54caf94e3d429a39c29632919e7926636685682c69113585673136701dfc2b4c
+DIST facter-1.5.7.gem 75776 RMD160 7b5d48384ea59e606c6f17c91dcbc802c84e07a1 SHA1 30e412bcc217d697f029eee71883475011dde18c SHA256 179bb7426fdbd17e0359d83fe3aae008750fb3ac2d85f304e54bfbcd5ada633e
 DIST facter-1.5.7.tar.gz 73343 RMD160 98855a5129868a3d695c45daf80f8badaa90c566 SHA1 d904d1d02341d12df5ae8183f5552bd7fab18be6 SHA256 87723af2e73def42c04c8e2d1e728e5749ac9fabea8c681ebb5b46f2096329e0
 EBUILD facter-1.5.2-r1.ebuild 723 RMD160 517856dcd93e795c3c4d40cc9694b5cab97a2f81 SHA1 428bff19872422529c42207b8a76c17f78437bff SHA256 f2f47e562961a704813bd8e3d99f561288dbda96ebd4745a8288a5d5f9e3de46
 EBUILD facter-1.5.6.ebuild 702 RMD160 b7fd31b18a499608c2f9e18ce24cb04a7801dda5 SHA1 4b315b67bce0cdd49712c20e521f89d1b44eb9f8 SHA256 18e3a4684ec8bed1a2ac7d118c04baac20d31d962ce50543d18df56f904c71f5
 EBUILD facter-1.5.7-r1.ebuild 845 RMD160 d89eaeafd1c89e585c4ae9111dd51823819728e8 SHA1 0be7e98306c6f85d43bdeee9bb84ce7337a02bbf SHA256 c7ba88a4e4eb905b13c46310bd97d81ec588a2c6cce195c526a449ecab53c72a
+EBUILD facter-1.5.7-r2.ebuild 842 RMD160 00f249199be3f2c42aa29a06c0569dff983c1567 SHA1 4081af249e63d0c71cf791f7c19a5d35170e00b4 SHA256 42451525a77446a3c1a89672247e7279fba64fb34cbf833ab05b49392cbebd5d
 EBUILD facter-1.5.7.ebuild 788 RMD160 db01a64f02afb370f7bd6039e2127102383cee3a SHA1 696baa485821482bcbd716fe4d14a41a5ea91562 SHA256 643bcac67179206d7e00dafbbf34a5b8e5d3e13fa05b7fee38ad776dc69cab22
-MISC ChangeLog 3318 RMD160 e36290d29778acb13daf2a58b0a04f25bb20c49b SHA1 a2f7b6fbe950e25e393014441f1aa10c65f1557f SHA256 72927ed87c9f5f195f0721771b41438fa6290530c3205d59bbf96b0ec8fc677a
+MISC ChangeLog 3515 RMD160 a243e6cf378790ec4a1a4b3c4c7b1594cdae1f21 SHA1 e2f4145df6826d9867083c5ec0665d29bbec26ce SHA256 6e026f8bd29f0dedfaa6068516ff07c20581881bf64be7de8f9e5f919ca1299d
 MISC metadata.xml 222 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 SHA1 a5d1e2317ae207bbd664aebe986687948fdd984a SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvag8wACgkQeM7EJeUH71OWPwCfUH97laSrmlkqimEZHY5u+JGI
-bDMAnjJxkbO09N0gXTRvFDqqry0WT2Jv
-=DTg0
+iQIcBAEBAgAGBQJMEYZOAAoJECaGw+YFKA1pKLwQAJbw0Oyg3CjRtZ3v4mqnWkZ3
+9VDq5M521tVqyL9L9hwNXNh++m31XdjBRVAYeryZHZvbzLNmJ/iPYCF0S5pQjJGz
+wOyEpFciYRzRvKbtxKsjcTKLpMrRXSyEjDFi1kA1mUVVtxRUlxlFAkQ80Rv6IaoP
+o0bGP+9v4ffPfFzsaYm7Qv5v8DxLoZg1uAaNP+f6MFmsqz2HYSVO96UlW8oSyenu
+V9KHv95nZi39PbjdIOT+Wn518G51BV3qpGgUeAxKIFkn0yhPlnTCrVCNwyKOPFv2
+FONiIWeJF7jvJzwE5zSPgRbi1AFG7XvqAoVs01kV7+N6CxPLNNoG5RBkeMzIzrQU
+d+mQyC1wX/f8RG16GkBcaFFMtPYOhu5Tz0W/6zEVM4Guk78BShqd3YUqltWDi45C
+TOJiCR7sixmhiWbfrlGtv+wS01378p4ScAMcmIW93CAfOWOlhHXxJ2KEd/UHy3Tn
+rzCr5kpsWSB2y9XHb9NEqPD/81+fayvM6toHZ/DUH8rl8KoCVIiXvH5HBw/o6Q2O
+pd01ovWOymJx1n7Jc/ur+IHKcYEHsZI8v5B0CZsRQsyCPoj9a2v0J7iRhN5vTf5F
+lsQd7+d541HcKM6LS6A1ShZqst8W4u3AYFp+/k3ovu80i09MAnAXedVlRGykCiR1
+7mi/R5SMqIGgfsMT4qCh
+=v86N
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/facter/facter-1.5.7-r2.ebuild b/dev-ruby/facter/facter-1.5.7-r2.ebuild
new file mode 100644 (file)
index 0000000..bd2c60b
--- /dev/null
+++ b/dev-ruby/facter/facter-1.5.7-r2.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/facter/facter-1.5.7-r2.ebuild,v 1.1 2010/06/11 00:41:41 matsuu Exp $
+
+EAPI="2"
+# jruby failed to install
+USE_RUBY="ruby18 ruby19 ree18"
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG ChangeLog README* TODO"
+RUBY_FAKEGEM_BINWRAP="facter"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+
+RUBY_PATCHES=(
+       "${FILESDIR}/${P}-fqdn.patch"
+       "${FILESDIR}/${P}-virtual.patch"
+       "${FILESDIR}/${P}-ruby19.patch"
+)

diff --git a/dev-ruby/facter/files/facter-1.5.7-ruby19.patch b/dev-ruby/facter/files/facter-1.5.7-ruby19.patch
new file mode 100644 (file)
index 0000000..9bba6eb
--- /dev/null
+++ b/dev-ruby/facter/files/facter-1.5.7-ruby19.patch
@@ -0,0 +1,61 @@
+diff -Naur facter-1.5.7.orig/install.rb facter-1.5.7/install.rb
+--- facter-1.5.7.orig/install.rb       2009-09-11 13:26:07.000000000 +0900
++++ facter-1.5.7/install.rb    2010-06-05 12:32:12.000000000 +0900
+@@ -35,11 +35,18 @@
+ require 'rbconfig'
+ require 'find'
+ require 'fileutils'
+-require 'ftools' # apparently on some system ftools doesn't get loaded
+ require 'optparse'
+ require 'ostruct'
+ 
+ begin
++    require 'ftools' # apparently on some system ftools doesn't get loaded
++    $haveftools = true
++rescue LoadError
++    puts "ftools not found.  Using FileUtils instead.."
++    $haveftools = false
++end
++
++begin
+     require 'rdoc/rdoc'
+     $haverdoc = true
+ rescue LoadError
+@@ -91,9 +98,15 @@
+     libs.each do |lf|
+         olf = File.join(InstallOptions.site_dir, lf.gsub(/#{strip}/, ''))
+         op = File.dirname(olf)
+-        File.makedirs(op, true)
+-        File.chmod(0755, op)
+-        File.install(lf, olf, 0644, true)
++        if $haveftools
++            File.makedirs(op, true)
++            File.chmod(0755, op)
++            File.install(lf, olf, 0644, true)
++        else
++            FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
++            FileUtils.chmod(0755, op)
++            FileUtils.install(lf, olf, {:mode => 0644, :verbose => true})
++        end
+     end
+ end
+ 
+@@ -101,9 +114,15 @@
+     man.each do |mf|
+         omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
+         om = File.dirname(omf)
+-        File.makedirs(om, true)
+-        File.chmod(0644, om)
+-        File.install(mf, omf, 0644, true)
++        if $haveftools
++            File.makedirs(om, true)
++            File.chmod(0644, om)
++            File.install(mf, omf, 0644, true)
++        else
++            FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
++            FileUtils.chmod(0755, om)
++            FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
++        end
+         gzip = %x{which gzip}
+         gzip.chomp!
+         %x{#{gzip} -f #{omf}}