Add patch to properly load plugins on Ruby 1.9.

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

5 files changed, 91 insertions, 11 deletions

diff --git a/dev-ruby/bones/Manifest b/dev-ruby/bones/Manifest
index 5bd717d40baa..d9367b5d97b3 100644
--- a/dev-ruby/bones/Manifest
+++ b/dev-ruby/bones/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 DIST bones-3.2.0.gem 32768 RMD160 e949e65237fde9253e668e512719ed4d1686a4e4 SHA1 0630cc6293d1b31dcd076fce20e3b6a76d078fe2 SHA256 9d4d2d941ee5e4f3ed33d2b044094de75dc717daf7e052adbf70793724c24ef8
 DIST bones-3.2.1.gem 32768 RMD160 32393cb2a6eb6b59c38f14960edbf77141053ec6 SHA1 0cf7d749f7265dff72a00d88ce469ec484d65b1b SHA256 117a1e4126f150884cee10ee539e7df1898457c5e15d8b5962ef7b79edc61b19
+DIST bones-3.4.1.gem 32768 RMD160 a01a45693b976bfd34aa9a1ba3ecc5f70c27be18 SHA1 7e4d67679ccb75aff24ddd230edab506da2f828f SHA256 b7cbbf813f77951082daa747303758910a299c7d8bd0041f78560fc9750be11d
 EBUILD bones-3.2.0.ebuild 840 RMD160 5812aa28e0f78739a85cfc733ebc9f7d8598abbb SHA1 51ff95774dda1ed3552ae8b1dc4d17b3ae3785b1 SHA256 ebfe101d3ce07c5996511c3312cd0ee3c20444df4856cde62be24f4df630953b
 EBUILD bones-3.2.1.ebuild 840 RMD160 4ce2624615f026e319021abe92b658496d8d055b SHA1 ad34fab2b9b9ec84782b9e17e32d3c0229f6baf3 SHA256 7ed9aa3399a7affed644c033dbad2da31fb48a202abae5b360beac48e31ec429
-MISC ChangeLog 501 RMD160 e8aafa71cf3181d36d3d6c6ada2f47053dc3f412 SHA1 8f13771466d8d02d16918d047fd40d2e4fd9b344 SHA256 fe39430161f6a1c0e1aea7edfc86f6a503920e40c58141076c345db2993b359e
+EBUILD bones-3.4.1.ebuild 879 RMD160 ce768961891cd9837a4d1fa7825e05c5ff1bc924 SHA1 bf9d3fba622dff3d42eff4dedca45d6cc02b338a SHA256 12e7cfc3ca06a2ede04a228b22f7e223eda2c4e5423dd6fc24eafaf453c25eea
+MISC ChangeLog 623 RMD160 398b5c2f220f67f6f1795b26a2f9df341411c944 SHA1 6a952493094c73c1f58dedfbad6d26fa7e38150c SHA256 d0acb6c56b8af875b35264cf6521c3715c09d1bafeec8c6c89718ffa07a32dd3
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAktoKEEACgkQAiZjviIA2Xje2wCfQu70zJ1FAaa9ifk8fWswJW+9
-YkIAoLJzqF/2wDWqpV+G64l/bt/5l9XP
-=CBHP
+iEYEARECAAYFAkvMtwkACgkQAiZjviIA2Xj2tACg3JIIGwQgVjSOvQ8P4nsGFhAS
+8xUAn1rnUhBwjxatowbATK4Vv8CXghzE
+=V/gB
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/little-plugger/ChangeLog b/dev-ruby/little-plugger/ChangeLog
index 23937ebcf6ec..c7113038278d 100644
--- a/dev-ruby/little-plugger/ChangeLog
+++ b/dev-ruby/little-plugger/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/little-plugger
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/little-plugger/ChangeLog,v 1.2 2010/02/02 13:14:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/little-plugger/ChangeLog,v 1.3 2010/04/19 20:02:28 flameeyes Exp $
+
+*little-plugger-1.1.2-r1 (19 Apr 2010)
+
+  19 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +little-plugger-1.1.2-r1.ebuild,
+  +files/little-plugger-1.1.2-rubylib.patch:
+  Add patch to properly load plugins on Ruby 1.9.
 
 *little-plugger-1.1.2 (02 Feb 2010)
 
diff --git a/dev-ruby/little-plugger/Manifest b/dev-ruby/little-plugger/Manifest
index 63aa671cc3f1..64f59b04780c 100644
--- a/dev-ruby/little-plugger/Manifest
+++ b/dev-ruby/little-plugger/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX little-plugger-1.1.2-rubylib.patch 1333 RMD160 bd52573ec9c1791ecb70337b47eb35fc68fc06f2 SHA1 80b8916e2a2eb19f72450e679649f19e3db21fc2 SHA256 cd0325e3a41198dbfd18ceddb6c683a6ddbd034adf08c1106894e22e98acb61d
 DIST little-plugger-1.1.1.gem 9216 RMD160 bc76aa1bc9088ff871818370302d94650145d203 SHA1 174c0384ee31d3f735b92c5ada28f89204529573 SHA256 6ef1d9ef1b89935c4f8acbb02a62a6f4e12b922e4fbaca75b7423b5b0c36a823
 DIST little-plugger-1.1.2.gem 9216 RMD160 272dd8f3a572823e97f7281786722b2ecd364b93 SHA1 29642d70fda1774f16d80aa3e2ec8bd151297e51 SHA256 d68eb201e50f732a23eb7c56af24db9b61fb5fdc6b3dbb742123a0fbc0c8f914
 EBUILD little-plugger-1.1.1.ebuild 721 RMD160 fd46bb23118c37cda90d928ddd6ba123771dfd58 SHA1 45729d74100c153b62a7dd9d3346fb48835af850 SHA256 567f47960e5f759940064fd6c439536d88bfad937ad6fdb8c71e929b4ee95aba
+EBUILD little-plugger-1.1.2-r1.ebuild 884 RMD160 a9a662b3f1c92b67d154cb7242bfeb3fa7176625 SHA1 5cc09d852d34d87f43eaada38bf2885202d7165a SHA256 6264c37f4d0a156abd89728de4787443643eedf47cd157f43e3e48a98ea09f1a
 EBUILD little-plugger-1.1.2.ebuild 721 RMD160 c23ee93d94f0c96edf7e5cfce9f8be9a963a7ce6 SHA1 50428ae4664bee763aa1f5df2238a5bc833e84a7 SHA256 0b77bcb61db50c962182582b5c43fbd1d7742f90d434e46690caab8c8348755a
-MISC ChangeLog 557 RMD160 5685a2c55d58e20a30b81f17195b16d87d2f9f28 SHA1 88fa3a9434c5c685dbc962479b43021524590073 SHA256 5da009e0dab8e939b39fd87ac2b29abd24708493c72014359b905e325391baf7
+MISC ChangeLog 784 RMD160 02fe925aac9d5c7a72a2bc9b27c04ae63b9d7487 SHA1 639c17d89b2b999405c2253cc50eeb47b9916ec4 SHA256 aab5bfb186f0fe7cf98668d609e2d1ad58f21c13e6d01983e7424989048d438b
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAktoJVkACgkQAiZjviIA2XhKYQCfZUiDi1k3Oys5nhw/OsfeVkjz
-7xsAn37AETh0ajbymWqAO8gnD/IbMvJO
-=WeUO
+iEYEARECAAYFAkvMtukACgkQAiZjviIA2XgreACgzK5DuIZSuih5vSxP0s1o55dU
+CRkAoNjAWvwJh8YwU3gYlZsCPLDmEKH0
+=zRZt
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/little-plugger/files/little-plugger-1.1.2-rubylib.patch b/dev-ruby/little-plugger/files/little-plugger-1.1.2-rubylib.patch
new file mode 100644
index 000000000000..438a05ce38b1
--- /dev/null
+++ b/dev-ruby/little-plugger/files/little-plugger-1.1.2-rubylib.patch
@@ -0,0 +1,36 @@
+From 20803ae92c846590640c7213b43138022bfe912f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Mon, 19 Apr 2010 21:49:17 +0200
+Subject: [PATCH] Search within the Ruby library path before the gems.
+
+Older RubyGems versions as shipped with Ruby 1.9 will not search within
+paths provided as library paths (RUBYLIB environment variable or -I
+option), so will be unable to find locally-present libraries.
+
+To avoid bad interactions with those versions, explicitly search the
+library path first, and only then run the command through Gem.
+---
+ lib/little-plugger.rb |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/lib/little-plugger.rb b/lib/little-plugger.rb
+index 17e1be3..fc95adb 100644
+--- a/lib/little-plugger.rb
++++ b/lib/little-plugger.rb
+@@ -188,6 +188,13 @@ module LittlePlugger
+       @loaded ||= {}
+       found = {}
+ 
++      $:.each do |libdir|
++        Dir.glob(File.join(libdir, plugin_path, '*.rb')).each do |path|
++          name = File.basename(path, '.rb').to_sym
++          found[name] = path unless found.key? name
++        end
++      end
++
+       Gem.find_files(File.join(plugin_path, '*.rb')).each do |path|
+         name = File.basename(path, '.rb').to_sym
+         found[name] = path unless found.key? name
+-- 
+1.7.0.4
+
diff --git a/dev-ruby/little-plugger/little-plugger-1.1.2-r1.ebuild b/dev-ruby/little-plugger/little-plugger-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..a0e993cb43b6
--- /dev/null
+++ b/dev-ruby/little-plugger/little-plugger-1.1.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/little-plugger/little-plugger-1.1.2-r1.ebuild,v 1.1 2010/04/19 20:02:28 flameeyes Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="spec:specdoc"
+
+RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
+RUBY_FAKEGME_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Module that provides Gem based plugin management"
+HOMEPAGE="http://github.com/TwP/${PN}"
+
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_bdepend doc "dev-ruby/bones dev-ruby/bones-extras"
+ruby_add_bdepend test "dev-ruby/bones dev-ruby/bones-extras"
+
+all_ruby_prepare() {
+	# needed for proper work with Ruby 1.9, without updated RubyGems;
+	# reported upstream
+	epatch "${FILESDIR}"/${P}-rubylib.patch
+}