Add back ruby18 support from my overlay and skip the few tests failing due to hash ordering.

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

3 files changed, 25 insertions, 12 deletions

diff --git a/dev-ruby/rails_autolink/ChangeLog b/dev-ruby/rails_autolink/ChangeLog
index 491630368430..7dead94a0a4d 100644
--- a/dev-ruby/rails_autolink/ChangeLog
+++ b/dev-ruby/rails_autolink/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rails_autolink
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails_autolink/ChangeLog,v 1.1 2013/01/25 20:50:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails_autolink/ChangeLog,v 1.2 2013/03/03 12:48:35 graaff Exp $
+
+  03 Mar 2013; Hans de Graaff <graaff@gentoo.org> rails_autolink-1.0.9.ebuild:
+  Add back ruby18 support from my overlay and skip the few tests failing due to
+  hash ordering.
 
 *rails_autolink-1.0.9 (25 Jan 2013)
 
diff --git a/dev-ruby/rails_autolink/Manifest b/dev-ruby/rails_autolink/Manifest
index ca5ccaf40e24..d45868e0efe3 100644
--- a/dev-ruby/rails_autolink/Manifest
+++ b/dev-ruby/rails_autolink/Manifest
@@ -3,17 +3,13 @@ Hash: SHA256
 
 AUX rails_autolink-1.0.9-fixes.patch 1231 SHA256 aae537d66b9c7e2d3a445513917630cd2dfc50b047395f440d80a2fe306f824b SHA512 bf7c6040f38957bc313de54307bfc4502078ce9ec7fb8b1f9622dcdb7759526582475dcd04dc27d803b0f6fa9caf707776a9c0d8c4559fd7a32aaefb2c74fcbe WHIRLPOOL ed97cbd93ad715c79fbce78f9fd640843e466dcbeb9432dac1587424d56d9dcf8275958db976721181f58b3489a7aca09cbb7fee32788d29edc1eca7debfea00
 DIST rails_autolink-1.0.9.gem 11264 SHA256 1c96b45727fddeb250b2f28096d21439e741329ea466e2ba0512f56b906c111f SHA512 527431fd4efa522dc13a46ae268fd223d97e9544f4ea498e0f148db16a961d8d9c059a19183d5fbb24d795386a020eb5114e197e5c1630d5f20ed08fc08167a0 WHIRLPOOL d9ef60c636929b1dcaebd906512bb3192e76c7803014eae5256ba7e5d8ba0037575b46afb8ac7e9bbf69fda498ecf67769625bd4c6dcd8e02848b86b192de933
-EBUILD rails_autolink-1.0.9.ebuild 737 SHA256 378449833b834bef36de11eb924dc183a06aa6c781a192712a022a89d760dfd7 SHA512 153a43f4a82a26f1e0050774fe00ce5cc55d2aad49c928a3d66ece6e2c69c7755c3760627f88000646c3a9f8b2427730541f58afbb4e7233faf9264b6c0fb64d WHIRLPOOL 288e94e466ec975e8a9d1bb0c23aa34d1bbf2f604bec19058d362fe98d8f6502baf7ed56a4a66caa608d7876a10ae4be3aff92f457074f72ff09fbeaefdb33b9
-MISC ChangeLog 609 SHA256 261d7608cdced0ebf4e27c0e079271efef8bb72800cd0f169c74bc9c6faad691 SHA512 59b44c7cd28ccce02bcca593f9435d9659f699f632b5419dffc8b0dbe27cd2443f2a1f23468a49bf137580e90c3a14b3b2fe85dda54f9de83aceba9a63e23521 WHIRLPOOL 6d26941d6424fb8d60425dfb23b12a1051fb5470cb12e1b2060e442c83d0cc63e9b728a1afd538f82d36bf2f3fdcb351db21c2566e2d37844c1730c846600bf5
+EBUILD rails_autolink-1.0.9.ebuild 1059 SHA256 cf092f2f45380681043257779dd9d2229349a574d4877381fa2af14ad4b09cbd SHA512 71c829052a683d30272fce0e9f3bd1b35fb6ceb7b412a3cd7e41906ce75473eacb97e92b89c9ce3a22729b4384e53d8d2d2c2fe1669e944982466e3473de1c49 WHIRLPOOL b11ade8da4346fb12020becbb1233de9097b4f8c956d07eb1542aec4cc91e240f1363a897cea68676e3e5d71ddb3837b1b0ff56688f7fabdc75dafe01113b896
+MISC ChangeLog 783 SHA256 df31bd396be3e750570a515acfc588b2aa7adf9923d6a02f17dd23ccd1b5766c SHA512 2c900113311342fee55b89c918e7f7fedceb36b821f4863ce8dccfb8c395be8f1e143b5b8923595e3405e33b8fe3f5d194ed95e5da32cd073ff1b54783f2063d WHIRLPOOL 61f7378a04e34322b0bd5b48341dd1f18c45c3e023c63abb7d9cba0a28c0f4b4bfdaf9506dfd949c34afda543222a11944671babb348da0a300a71693696698f
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRAvAWAAoJEBzRPIrUMBNC2gcH/ROzVyBF9jU4+gCa3lNCEYQf
-6HikBIx8oPAOkMIG30wSplOb2OmWMkaEasQyzzZoxNurBDKArMrIf7XzNm6DC1xp
-zLfLGcx7zYFVRXuZO4W0eje84f6PELMG1LV5KiZuKsxr7xeEDLOXCL/+yqACQcXz
-QtoRW3ArQh8YNfwOelIzLxqTK/NFhYyL/Mb2rJLF1pNckCV5RP5U5P97gUJL0Pp7
-Nynghigbd4VXNrG92wkWy8sMmefaKKaGbT5fe9npHSHvESKWN2jVM4sxisumP3cs
-I33/ad2anysSS7+/5I1EbWoABy6FzT8jhwncjkCZ2FNw76q3W7gnfdFb2TqnEJE=
-=C1eK
+iF4EAREIAAYFAlEzRqcACgkQiIP6VqMIqNdMbgD/YK5bnYwDMci/OapQcg1bBHJF
+Ms9uw9JQygGuNuMekPkBAJNWynF9qa3M4zJvIptLxuo6Bb5Q1cAAOOk50iyeyUev
+=kKPv
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rails_autolink/rails_autolink-1.0.9.ebuild b/dev-ruby/rails_autolink/rails_autolink-1.0.9.ebuild
index 38fb3223f950..223359450556 100644
--- a/dev-ruby/rails_autolink/rails_autolink-1.0.9.ebuild
+++ b/dev-ruby/rails_autolink/rails_autolink-1.0.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails_autolink/rails_autolink-1.0.9.ebuild,v 1.1 2013/01/25 20:50:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails_autolink/rails_autolink-1.0.9.ebuild,v 1.2 2013/03/03 12:48:35 graaff Exp $
 
 EAPI=5
-USE_RUBY="ruby19"
+USE_RUBY="ruby18 ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -24,6 +24,19 @@ ruby_add_bdepend "test? ( dev-ruby/minitest )"
 
 ruby_add_rdepend ">=dev-ruby/rails-3.1"
 
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby18)
+			sed -e '/auto_link_with_block_with_html/,/^  end/ s:^:#:' \
+				-e '/auto_link_should_sanitize_input_with_sanitize_options/,/^  end/ s:^:#:' \
+				-e '/auto_link_already_linked/,/^  end/ s:^:#:' \
+				-i test/test_rails_autolink.rb || die
+			;;
+		*)
+			;;
+	esac
+}
+
 each_ruby_test() {
 	${RUBY} -Ilib test/test_*.rb || die "tests failed"
 }