Add ruby20. Work around even more brokenness in the tests with more recent jruby and ruby:1.8 versions.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 70 insertions, 17 deletions

diff --git a/dev-ruby/erubis/ChangeLog b/dev-ruby/erubis/ChangeLog
index 794e5eef39c3..f9519591a35e 100644
--- a/dev-ruby/erubis/ChangeLog
+++ b/dev-ruby/erubis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/erubis
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/erubis/ChangeLog,v 1.24 2013/07/27 22:21:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/erubis/ChangeLog,v 1.25 2013/11/17 12:07:02 graaff Exp $
+
+*erubis-2.7.0-r1 (17 Nov 2013)
+
+  17 Nov 2013; Hans de Graaff <graaff@gentoo.org> +erubis-2.7.0-r1.ebuild:
+  Add ruby20. Work around even more brokenness in the tests with more recent
+  jruby and ruby:1.8 versions.
 
   27 Jul 2013; Agostino Sarubbo <ago@gentoo.org> erubis-2.7.0.ebuild:
   Stable for x86, wrt bug #477454
diff --git a/dev-ruby/erubis/Manifest b/dev-ruby/erubis/Manifest
index f270da9d6a43..f2f10039a619 100644
--- a/dev-ruby/erubis/Manifest
+++ b/dev-ruby/erubis/Manifest
@@ -1,24 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST erubis-2.7.0.gem 173056 SHA256 63653f5174a7997f6f1d6f465fbe1494dcc4bdab1fb8e635f6216989fb1148ba SHA512 49b08b28656acaf3b0c88fe064bb0d5f79fd08b834d7eba9294217b0893c5a0244ac5dd54de0e52dd17e828a0110e54b29e8c2d75171d527da957917344a0f27 WHIRLPOOL f58bbb85bcd4182eb0301ead30138b948322015df6853e2ca2ea272dfda20c980108b032f29d1304e2bb17dd4b0ee22fb69e57f374588fac2428d5ea4df4dfff
+EBUILD erubis-2.7.0-r1.ebuild 1562 SHA256 f02ecf6442dcaa8fe6e7b358d0c338b9a333af35f0bfbcf47a803cc576b35cf9 SHA512 8b819c88480dd6c2d53e482639860fe33fc6925a59f2ad8da5b441675b9b56d657d39d273185aa39e8eef9420f4af8caecf11e2b240b1661a20ebc2d0982eac9 WHIRLPOOL ed63bb0b969876acc7f3be65af0c4a742f16766f87174095d6493108a5ff8d2561152e013d1f3587cec1cd73f9d2e5f3c7dada266136bf9af129d0e1a137d5db
 EBUILD erubis-2.7.0.ebuild 1639 SHA256 d35602d686d251771d943c1bdcdf2c341eef65e35d954a62c53ca803591f0aa2 SHA512 0a82f8e70219bdbe0622bc4020da917ddd4f4c5bd23c6617fe5ed9f48f253cda069de78727ca75050678456c40d284cd54a4badf020b3522473d3fd691aefcd8 WHIRLPOOL 13c79775aac97258a7d9424c6492a7e032ebe2f872f936b03d0a2980b0ad680e1079d77682d7bad191a7628558a78088426e7a62e6f4762b87b0d98aae231ce0
-MISC ChangeLog 2990 SHA256 0e3f4533664f489a507228b02ff213f751518b0d5b182985e40bd8897921ead8 SHA512 ff6fc228fc3785f8302de561b00ee7faf1a2a734032a67c346d4c664eba24197ca56b413e8a5b674b8f216f75f0569dd97adf0575ab2643b09985c726ec37c9b WHIRLPOOL 9412e8545106a69b3872b7bcde776e06e4de564adc2bc81cfb6d89e97c75289b38a303624c32ec64b79356619f65e5c89ce16a0a5600e764084931b4a08a4e4d
+MISC ChangeLog 3209 SHA256 552d115f76c42074bebb8aad5eba58df4142e9be757cec0f830d90b01dcf78ad SHA512 234b19ff775a16dfca14006eab5951a06b1f83d5a502559e669f517431bcfcfbe21dbb2fd5ab18368bd2307e65b95891db060bbdee16006e69ba25cfa9e1f1a8 WHIRLPOOL 2f86d7bcb960265590287f10b4560c5c50f3e6e94ef67a07e79515e846f246389449be937e09b17fc6f57257ebbd5de7a10794fea5289bfce7a85f415f51321d
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR9Ef/AAoJELp701BxlEWfxbkQAKL5UUOlPb9Oe4qum1kTpCU9
-P+AP3kWPHnJyYw6X4WLPA5GDgnr+jljGnf/osJaKUMQ6AFuL+53vOBv3gqgfasxD
-Zv1AwQeb4cr426xJy96S27B4ddpByG7YPlRCR252JDdBlzcwL4BKBBT5qqxK90jB
-UaZy8tBgIwT6TnOoJc4nd1/DR27239ecuCxWnvq7hGQLdbYK3tgELXZch9I9dLbo
-FG8+kqKCieef5giNn9/MZ9T/LWMHUrpIU+UrdWTptk6HdZbghcX2hqwb+OPop8EX
-JjqA3KWY7ygWWlSW0guNkFUcrfYlrl4zUpaWTO6Xt3+qpoRSJAZz/Nloq5ewESJb
-aGswDYK0WnKIbWTMSoLvdwKow8EJLE3kWzpm6Pos8SOaD+ydxCmN6ZSCgWHl45iY
-awOflUr3zsHeXZPb/h5fapTyTKKP0vfbF+vy7ocZE2+joZrokmJZi35h3gy2bscM
-we7eCDJxPSmYuzWsdWW20CYuRKmCUMAQTc03/auV/ozk2HA32pPWmeW33ygubV6o
-2iOyqvVFCrDlj6XcTNsDCgmgSWk4auWD5k8dDCbqZKvZCkDvFNUILvXX830an7QX
-J33stiHFa2Z1kjB1EEeKLr+UuAGNkO3eOUQn0ChoMjIvUZpU08RADiaCactis9ZW
-qHyVKMOHj0z0lDH9NVkB
-=368i
+iF4EAREIAAYFAlKIsW0ACgkQiIP6VqMIqNcPdAD/UYIsYaGfxSz42ujrm2WcH6ya
+GetAp9mzNo8YXd1H5wkA/i+gXP9GZCMxbG8Tf9bgzmZgZlOBhxDVuN/rYdHLMeom
+=Ssae
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/erubis/erubis-2.7.0-r1.ebuild b/dev-ruby/erubis/erubis-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..81e785bc119a
--- /dev/null
+++ b/dev-ruby/erubis/erubis-2.7.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/erubis/erubis-2.7.0-r1.ebuild,v 1.1 2013/11/17 12:07:02 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Erubis is an implementation of eRuby"
+HOMEPAGE="http://www.kuwata-lab.com/erubis/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/abstract-1.0.0"
+
+all_ruby_prepare() {
+	# These tests now fail due to other ordering and fact that sym
+	# are now returned.
+	rm test/test-users-guide.rb || die
+	sed -i -e '/test-users-guide/ s:^:#:' test/test.rb || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*jruby)
+			# Avoid test on jruby that fails different on syntax error.
+			sed -i -e '/test_syntax2/,/^  end/ s:^:#:' test/test-main.rb || die
+			;;
+	esac
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		# http://rubyforge.org/tracker/index.php?func=detail&aid=29484&group_id=1320&atid=5201
+		*ruby19)
+			einfo "Tests are not compatible with ruby 1.9.3 with Psych as YAML module."
+			;;
+		*ruby20)
+			einfo "Tests are not compatible with ruby 1.9.3 with Psych as YAML module."
+			;;
+		*)
+			PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -I. test/test.rb || die
+			;;
+	esac
+}