Fix compatibility with newer versions of rubygems. Fix provided by Tomoh K. in bug 391059.

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

4 files changed, 97 insertions, 6 deletions

diff --git a/dev-ruby/ruby-gettext/ChangeLog b/dev-ruby/ruby-gettext/ChangeLog
index 9d458c738772..a372d8a047b4 100644
--- a/dev-ruby/ruby-gettext/ChangeLog
+++ b/dev-ruby/ruby-gettext/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/ruby-gettext
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ChangeLog,v 1.75 2011/10/23 15:53:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ChangeLog,v 1.76 2011/11/28 19:33:58 graaff Exp $
+
+*ruby-gettext-2.1.0_p20100728-r3 (28 Nov 2011)
+
+  28 Nov 2011; Hans de Graaff <graaff@gentoo.org>
+  +ruby-gettext-2.1.0_p20100728-r3.ebuild,
+  +files/ruby-gettext-rubygems-load-path.patch:
+  Fix compatibility with newer versions of rubygems. Fix provided by Tomoh K.
+  in bug 391059.
 
   23 Oct 2011; Raúl Porcel <armin76@gentoo.org>
   ruby-gettext-2.1.0_p20100728-r1.ebuild:
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 781b8c0d79bf..e27e2080d874 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX ruby-gettext-rubygems-load-path.patch 655 RMD160 5fc634de16ca59ac2a4f7f74f577df769f2269e3 SHA1 c01c85f35a3842f28c148bc619f191b7d6530d9a SHA256 968be86509d4fa9cbaebc2ffc6cbbfd2a4ab3fb6ca54aca084e811bb5fdeaa6e
 DIST gettext-2.1.0.gem 199168 RMD160 91f94bc8e87157730628c963b11c39c7f1bd0c76 SHA1 e12577608e2150ec9895e7dfac4816dd8e3d43cc SHA256 9f77e2c5e9792c509452107b22b7824255ab96165c161ac26003be731f22e09d
 DIST ruby-gettext-2.1.0_p20100728.tar.bz2 139060 RMD160 59571e534b57309e0c5a24bc8814871dd3352c10 SHA1 0d5a7970c4392335865277515556a2a8e7e39ce6 SHA256 ba6656321ac6ed549afc5271e7e4911097852b136c4bebc96cdd771726fcbf2f
 EBUILD ruby-gettext-2.1.0.ebuild 686 RMD160 5b0bb65f89618975777f542938e95297fb8a8e76 SHA1 34558c5bacd70aa86a7e50935e877995566f22b4 SHA256 b135042ee320b3b99c5cc6ea790239be84644e2eda5ad09067634d0edb70dbb7
 EBUILD ruby-gettext-2.1.0_p20100728-r1.ebuild 1503 RMD160 d0c415491fc548719d405019777c216e2b72a41e SHA1 37807c88284e4cb4e554244c2c699415ce1f2785 SHA256 92bb910590de9c5b473c572817651a8d26e3aa4ea40bf3e79b087d598080d9ef
 EBUILD ruby-gettext-2.1.0_p20100728-r2.ebuild 1513 RMD160 f7cd4f2e0933987b0f524fbe7bd7be7da3185b4b SHA1 a9d682a90fe0ce5712933335c0fb9c3def063106 SHA256 e1b2c12fcdfc837e9d62040d1f0b172b374a7c8775c4e631ad33fe924e0bcfa6
-MISC ChangeLog 10515 RMD160 5cce29d864e02fdcd99fbfa2a67230ef53a0321f SHA1 3a407f72bd287734a6bb3662b7454049eca23a92 SHA256 d9dce9411fb9b9c23f1205460ea961a656d26e33565a0b86f8a34f9a14b18395
+EBUILD ruby-gettext-2.1.0_p20100728-r3.ebuild 1567 RMD160 355627d104aa74da4eee2be8ab075f2b382c8395 SHA1 11bca356706e1d81dc771393bdd333baa134245e SHA256 69d9b798fa34bfa53d0581eb7575879611e15e0af40cc8cc3aec80cb465ffd08
+MISC ChangeLog 10799 RMD160 85680c5d35fcb721adffa0f1f0e7e0dc3fc2d757 SHA1 14095c98e502d9288e9f52c5ee8099d2883a5e5a SHA256 4009502af698dd9cf56882bca26a3d5435206525570a0a717834992f1362e451
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6kOGwACgkQuQc30/atMkCT2wCeOlGERMj7hiq5wrnXonb+4Og1
-xD8An2Za4vrvlA7qnRtWahN+XI+lsMuU
-=XqEN
+iF4EAREIAAYFAk7T4isACgkQiIP6VqMIqNeOPAD/UrLXm5dOCi5boIv8Iyb/pbYm
+nmJe1UihLi6rjtEWayMA/R9pSZvnKC3sEsx1cKgpgCyPvN5vyUB5DaZn2yOn+s0N
+=SoDF
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-gettext/files/ruby-gettext-rubygems-load-path.patch b/dev-ruby/ruby-gettext/files/ruby-gettext-rubygems-load-path.patch
new file mode 100644
index 000000000000..8ee97702e0a1
--- /dev/null
+++ b/dev-ruby/ruby-gettext/files/ruby-gettext-rubygems-load-path.patch
@@ -0,0 +1,21 @@
+Fix compatibility with newer rubygems versions. Patch provided by
+Tomoh K. in bug 391059.
+
+--- lib/gettext/runtime/locale_path.rb.orig
++++ lib/gettext/runtime/locale_path.rb
+@@ -52,7 +52,14 @@
+        
+         load_path = $LOAD_PATH.dup
+         if defined? ::Gem
+-          load_path += Gem.all_load_paths
++          begin
++            load_path +=Gem::Specification.map{|s|s.gem_dir}
++          rescue NoMethodError
++            begin
++              load_path +=Gem.all_load_paths
++            rescue NoMethodError
++            end
++          end
+         end
+         load_path.map!{|v| v.match(/(.*?)(\/lib)*?$/); $1}
+         load_path.each {|path|
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-2.1.0_p20100728-r3.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-2.1.0_p20100728-r3.ebuild
new file mode 100644
index 000000000000..8251851cbb90
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-2.1.0_p20100728-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-2.1.0_p20100728-r3.ebuild,v 1.1 2011/11/28 19:33:58 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19 jruby ree18"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_TASK_DOC="rerdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog ChangeLog-1 NEWS-1 README.rdoc"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
+HOMEPAGE="http://www.yotabanana.com/hiki/ruby-gettext.html"
+SRC_URI="http://dev.a3li.li/gentoo/distfiles/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-macos"
+IUSE=""
+SLOT="0"
+LICENSE="Ruby"
+
+ruby_add_rdepend ">=dev-ruby/locale-2.0.5"
+
+RDEPEND="${RDEPEND}
+	sys-devel/gettext"
+DEPEND="${DEPEND}
+	sys-devel/gettext"
+
+ruby_add_bdepend "test? ( || ( virtual/ruby-test-unit dev-ruby/test-unit:2 ) )"
+
+all_ruby_prepare() {
+	# Allison 2.0.3 produces illegal HTML which markaby doesn't like.
+	sed -i '/allison/d' Rakefile || die
+
+	epatch "${FILESDIR}/${PN}-rubygems-load-path.patch"
+}
+
+each_ruby_test() {
+	# Upstream tries to daisy-chain rake calls but they fail badly
+	# with our setup, so run it manually.
+	pushd test
+	${RUBY} -S rake test || die "tests failed"
+	popd
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r samples || die
+}