Remove the need for rake-compiler to fix bug 391687. Also remove some unneeded change...

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

diff --git a/dev-ruby/racc/ChangeLog b/dev-ruby/racc/ChangeLog
index 764a335146b42f10235008b0e10a20bb568db80e..f46c4d11cc52cf670a162399ac92512b4b80fce8 100644 (file)
--- a/dev-ruby/racc/ChangeLog
+++ b/dev-ruby/racc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/racc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/ChangeLog,v 1.63 2011/10/20 06:09:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/ChangeLog,v 1.64 2011/11/27 19:24:55 graaff Exp $
+
+  27 Nov 2011; Hans de Graaff <graaff@gentoo.org> racc-1.4.7.ebuild:
+  Remove the need for rake-compiler to fix bug 391687. Also remove some
+  unneeded changes in all_ruby_prepare.
 
 *racc-1.4.7 (20 Oct 2011)
 

diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index 46752f468c9bef4871c666027bc910dc44ef0dc0..2363e6d690b4397501b7242402d471793db6707a 100644 (file)
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -6,13 +6,13 @@ DIST racc-1.4.6.gem 110592 RMD160 b755cc948519a22b5fc7fbf4d0b1a6519db6415b SHA1
 DIST racc-1.4.7.gem 109056 RMD160 9a4bf32b6aec22f49ea59fb89be7f25074aa3bea SHA1 aa66dbad48bb449d3a32629718aa43a96f0f44b6 SHA256 0468f784a7f98bc2498d0e14596fc694182d957f9f1831309c6e94d075055f6f
 EBUILD racc-1.4.6-r1.ebuild 2067 RMD160 f7e5bbc0141356aa73d539643e53b7ca27a033aa SHA1 0c3558a7a31fef9c886a0067affef7b45f7a1495 SHA256 93a399eb2256a512f817cae46557b06b5365e74d6e95bdfaf44f0bf90da98520
 EBUILD racc-1.4.6.ebuild 2035 RMD160 77986e915fbef82bac2267efb58d85ea29d2b6af SHA1 c23d4b221380e4110045a3fb86ed6a1089d48443 SHA256 0ff8dbb3d918b0b384e77727af8b373de040755cce1cb4ba3e4fb9a5a69117f7
-EBUILD racc-1.4.7.ebuild 1845 RMD160 e84ef2706fd90767a0988e5a151f510628d975e5 SHA1 d8dcfec895c3d8afc7a1351e446d70f7c32f308a SHA256 43b27350d6c77a93dbc5d1303c1c94718cb0657518df276572289d60c99e244d
-MISC ChangeLog 7337 RMD160 87f7b5bbfee516552ad84852784ef0685c3062ce SHA1 a530617468fccd13e4a2af7b3dd4a25ffdc4c03d SHA256 b1c09887cf13d7598dadd8992a8610465ff02eed0af1173a36f0784561962057
+EBUILD racc-1.4.7.ebuild 1940 RMD160 069ffc5494c3881ae6890905582566c0e81d0f9e SHA1 932f57f64905975b35a80bbcb88eae3141847369 SHA256 13d7ee0da639222bbabfbf275dc49bf658c5954af1b9ad7e462d7f1bb82504ae
+MISC ChangeLog 7519 RMD160 4d7e41e844c3f789218a1e54b66f8b60484fb97d SHA1 bc84a537ad333bb78dbd813b27529edb38d80b7e SHA256 d3b6382e5813cbc0fbce4b8519a77127d8ec97516c6fc822be9ad17f9923a51f
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6fuxcACgkQiIP6VqMIqNeXVwEAk6D+ajOPJm+Gt8QM+v8OA79x
-fNoij2Df2+cEmnPG0yUA/RiEEJtwod8xPIa27kSOHwGnh8wVC0xZa7qrtWAdZY2E
-=82k6
+iF4EAREIAAYFAk7SjpQACgkQiIP6VqMIqNfmMgD8CUTtVWpdsTFl06yIks1/fZ1r
+jkTX/CsygtGIPNSr/DAA/jbZ2LlT2rcsd1IK4wI+Atw5lB6iFMXaBexIXnC2TgLE
+=UJNp
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/racc/racc-1.4.7.ebuild b/dev-ruby/racc/racc-1.4.7.ebuild
index d4d97e66e4bd2bd1cbddb7ce0a7a738a614cec6d..479bf478783f38b9ac6471234f05c7ec9d4f0983 100644 (file)
--- a/dev-ruby/racc/racc-1.4.7.ebuild
+++ b/dev-ruby/racc/racc-1.4.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.7.ebuild,v 1.1 2011/10/20 06:09:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.7.ebuild,v 1.2 2011/11/27 19:24:55 graaff Exp $
 
 EAPI=4
 
 USE_RUBY="ree18 ruby18 ruby19 jruby"
 
-RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
 
 inherit multilib ruby-fakegem
@@ -20,14 +20,16 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
-ruby_add_bdepend "dev-ruby/rake"
+ruby_add_bdepend "dev-ruby/rake
+       doc? ( dev-ruby/hoe )"
 
 all_ruby_prepare() {
-       # for Ruby 1.9.2 compatibility
-       sed -i -e '1i $: << "."' Rakefile || die
-
-       sed -i -e '/tasks\/email/s:^:#:' Rakefile || die "rakefile fix failed"
        sed -i -e 's|/tmp/out|${TMPDIR:-/tmp}/out|' test/helper.rb || die "tests fix failed"
+
+       # Avoid depending on rake-compiler since we don't use it to compile
+       # the extension.
+       sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile
+       sed -i -e '/ExtensionTask/,/^  end/ s:^:#:' Rakefile
 }
 
 each_ruby_prepare() {