Fix USE=doc with ruby19 as main interpreter, bug 427856. Add tests but restrict them due to failures for now.

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

3 files changed, 21 insertions, 7 deletions

diff --git a/dev-ruby/maruku/ChangeLog b/dev-ruby/maruku/ChangeLog
index be573dff31da..a0a596e7ec46 100644
--- a/dev-ruby/maruku/ChangeLog
+++ b/dev-ruby/maruku/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/maruku
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/maruku/ChangeLog,v 1.17 2012/07/25 06:11:32 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/maruku/ChangeLog,v 1.18 2012/07/25 06:25:49 graaff Exp $
+
+  25 Jul 2012; Hans de Graaff <graaff@gentoo.org> maruku-0.6.0-r2.ebuild:
+  Fix USE=doc with ruby19 as main interpreter, bug 427856. Add tests but
+  restrict them due to failures for now.
 
   25 Jul 2012; Hans de Graaff <graaff@gentoo.org> -maruku-0.6.0-r1.ebuild:
   Cleanup.
diff --git a/dev-ruby/maruku/Manifest b/dev-ruby/maruku/Manifest
index ad1e35573a8c..ebee355ee322 100644
--- a/dev-ruby/maruku/Manifest
+++ b/dev-ruby/maruku/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST maruku-0.6.0.gem 151040 SHA256 dfd87f9b262521bad2b71290f36ec0548d32dc438c701ece2ed407fec8fb314c SHA512 a042afe5ceb06776b16b60fab51fbaac543a3d72b3a9a356bc63942757b860656389d093919379d818000999fdde766699556f45e1564069f2382e886f9d7b87 WHIRLPOOL 192db6476d0c695370171ca5ddb7989f6b0b50373a322400a5551d317993ef7134280ba93bca9e312f0c49395f722df17c408a9367b7061a1c89fb860ac0b957
-EBUILD maruku-0.6.0-r2.ebuild 1170 SHA256 0aa356de06c5d8709aa5ea28238752333a3732fc5ca32187fd2fc8b25f62bf42 SHA512 7fe414d1f79714e8ea59eb1009f0cfc4e1e0320addc9c00b3a469a3f17416e650b98c41b0ffeb95a1bfdc36e547acf5eb38b208c9791ad7af40a1ceff3c4f2b7 WHIRLPOOL 1b2d945dba262ea6b3e6e054f2f6a857ae2092371ee2f891ea9bed008ae50934670954109dfa981f77e7d92a9215cfa25ff4868365501a0b195b9cec31cc1747
-MISC ChangeLog 2441 SHA256 b00c6854d605afd659664d50a0f4ee335abdfefb230bfb38647db3025a1f39ae SHA512 6cfe7a435572e43bf56d64d4f01251224abc10aab442ef981db4aa247bac67ba33baca0a7ce7cee8b9f80d7bb6b6da46da53a5c08ea670a031e846a71270f985 WHIRLPOOL c7f7209035e2f6b966b4f6ac65ce092e1bf25b0ac5caec924577fc101688d8eea3721bafa25947258ffd3cc4af78dcf31bb33cbc97b24bd6cc54ef05fad5d6e2
+EBUILD maruku-0.6.0-r2.ebuild 1499 SHA256 2089aff9e23baf20d0e5492bc9f526e5a720eb452abddf7c1482b5858b1340d9 SHA512 5f948741056c71b108bbbbb56a889386894a60f9ae0bcfe60620aada6b74ffdcd5d353b12591a1435b736a60c3764e45ddcacf87f3ae5be796cb19d95f1c9b5b WHIRLPOOL 3ff4a083aac0072a5e5850c2f52c620ebb201aa90f2e884ad167291212d0985ac95448a75eed3fdd58d471a262e663b9232da474c77d93e4299bb8f477ba0635
+MISC ChangeLog 2630 SHA256 ff0d07e4a935097b334b8d75c2b1f15e4598c79f313bfa1ea4ba18dd171774cc SHA512 ff32191e157970bd713aae14ff940fa8fcb38b9713f1f4d3de6637a1486628c54a748d4e741f3c9e1fdb5faeb8255ca02ef5c965a25ecf9566920e029884facd WHIRLPOOL e1b0a325df0f12ad783951663ffd9de4fc1ce62ee7b1542aa751c15b3c8d7e32591bd02c07fb4d7b38bed821ed92f3ac647f5f684b8193d0b855308d28dd4859
 MISC metadata.xml 158 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032 SHA512 a9ab7b665b00f8a0619ffb3cf5260438a6f47fe997bc9cfbd5410d074b92e473dd1484d79a4afd736f52dc1277af42f6439953c696c35a92c75d94f4eb591baa WHIRLPOOL e8e518ad3cc7f0230aa7a43b82e730310527bd3b22033f13563a7c0630668bb0fa935ce64a3345c84b3fa2623fd14697c2ae0289266ae1fbc97bf032133a4aa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAPjiEACgkQiIP6VqMIqNdn0AD/cm+Gem5PtSJM0L8KSZ1T1Skb
-u09ZD8XM5mIAEZYSN7cA/1n7fWlDvTsMjeQAox2hQFsUpywPVJ2EWKNReJkqyrKO
-=istV
+iF4EAREIAAYFAlAPkXMACgkQiIP6VqMIqNfmggD7BIxrlAlGlg0hIkoT4yd7WHJ1
+Q6j4Clzh9ZtOAzhkTL8A/1hVrbuB5HP4yxjRB7vDqvrHJ/JeigxJRK7F41l/jrZq
+=hLVT
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/maruku/maruku-0.6.0-r2.ebuild b/dev-ruby/maruku/maruku-0.6.0-r2.ebuild
index 200adff613b0..691170389bb7 100644
--- a/dev-ruby/maruku/maruku-0.6.0-r2.ebuild
+++ b/dev-ruby/maruku/maruku-0.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/maruku/maruku-0.6.0-r2.ebuild,v 1.5 2012/05/01 18:24:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/maruku/maruku-0.6.0-r2.ebuild,v 1.6 2012/07/25 06:25:49 graaff Exp $
 
 EAPI=2
 
@@ -8,6 +8,7 @@ USE_RUBY="ruby18 ruby19 ree18 jruby"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
+RUBY_FAKEGEM_TASK_DOC="-I. rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="docs/changelog.md docs/div_syntax.md docs/entity_test.md
 	docs/markdown_syntax.md docs/maruku.md docs/math.md docs/other_stuff.md
@@ -23,6 +24,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
+# Tests fail in various ways, possibly due to missing
+# dependencies. Since we shipped this without any tests for over a year
+# just restrict them for now and revisit for the next version.
+RESTRICT=test
+
 ruby_add_rdepend dev-ruby/syntax
 
 all_ruby_prepare() {
@@ -32,6 +38,10 @@ all_ruby_prepare() {
 		Rakefile
 }
 
+each_ruby_test() {
+	${RUBY} -Ilib bin/marutest $(find tests/unittest -name '*.md') || die
+}
+
 pkg_postinst() {
 	elog
 	elog "You need to emerge app-text/texlive and dev-tex/latex-unicode if"