Backport upstream bug fix for missing require.

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

4 files changed, 41 insertions, 6 deletions

diff --git a/dev-ruby/syntax/ChangeLog b/dev-ruby/syntax/ChangeLog
index b0511b45813b..42dc4db11ae1 100644
--- a/dev-ruby/syntax/ChangeLog
+++ b/dev-ruby/syntax/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/syntax
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/syntax/ChangeLog,v 1.61 2014/10/29 19:04:24 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/syntax/ChangeLog,v 1.62 2014/12/28 07:58:53 graaff Exp $
+
+*syntax-1.2.0-r1 (28 Dec 2014)
+
+  28 Dec 2014; Hans de Graaff <graaff@gentoo.org> -syntax-1.2.0.ebuild,
+  +syntax-1.2.0-r1.ebuild, +files/syntax-1.2.0-require-set.patch:
+  Backport upstream bug fix for missing require.
 
   29 Oct 2014; Manuel Rüger <mrueg@gentoo.org> -syntax-1.0.0-r5.ebuild,
   syntax-1.0.0-r4.ebuild, syntax-1.2.0.ebuild:
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index 651a2e4626d4..b09d71daf20a 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX syntax-1.2.0-require-set.patch 379 SHA256 fdea7826711f1bcc7b17f4aacdaf19e5d09c86c0e22c2ed57d0a984d99d34f8e SHA512 18a8465164b52a0b39317b50fd69d08f5187f0bc25e709f3bc5ee5bc16a6d257e9e70763447c735615f3b01135c4e2095e0ae8194edf308edd78f4aae08f8d84 WHIRLPOOL 910a1fc92a30c3c0c3a43231fac6af8ffb31c0fbe9afb00ac34f0de9c304b6fb484ba879b9220e1b3c538e60fdadb4c5a9abfb7ef706e37e7e6e5e0d2cb680b3
 DIST syntax-1.0.0.gem 15360 SHA256 605e2f62770bad04e849b3a1a2234e45b2904a8592f2f4dcc0bb14dce09c23fd SHA512 196c0bd125903f3579d7a02528be16b09db75dbf91f6f8efbaa4cd69229a52a2ae00841343c3b17bada86e6bda51d6cc7c0c119615a5d779332f61976af96c04 WHIRLPOOL f41df19ef0adddf0ef0424bf9e1070c2b2417bacba5f4a1d37051a5a19f82a75ada729f2ebd41f70dac7b455722b5c4d5e94dde1f7ec8235ea15116a968a4b86
 DIST syntax-1.2.0.tar.gz 40797 SHA256 9cec12fac6b6dc4f3fee263f5765333880ae26d4194b9670f3de26d4674dde9b SHA512 69804ab94203e2260b4c585aacf68db6ad8e47cf2339ffeb1105ae39da5f1d456b1413eeeef29f1c450bff19780e815b9b1b966b171de3b24595f759b36e6548 WHIRLPOOL 4eb23d481dbd56878ac024643d10069f644ac182813dc744fa61ea44a418d04caa738915a7a60ca85aff5bf90c35e92187e18a1adf168cd17265c06f2b3a4e66
 EBUILD syntax-1.0.0-r4.ebuild 913 SHA256 c4ce86eaa8b9afe435c836b329152af5b1386cc272a15ab866e23f1ec3c61748 SHA512 c26f7d9ad6a1380e67062871bf652d34a667fb60ecea42a69f385083f730ee6c443b301a7330f85c96b68530383b3c6f72b814b3bbbd7a82aefe9ed6597cd95d WHIRLPOOL 09e8587f0df3788e9bfd33452e9d83196d1a6ff76520e84d6774c3575d6e8c7e344ec401964711acfc642f9497cbc42acaf06cc48cce4a848135c1191318a6e2
-EBUILD syntax-1.2.0.ebuild 769 SHA256 1de4c0ff9d7d3e38080c254b2de0e05e229a8b2edb734a628a34fcedec0adb94 SHA512 48bc292e8ae8a06b62816ed945afa5686743475a1452bebb09f910f72c83484d66f1b6e4acc9a750de4a4ba74921b648a71fc26ee79aaebd047a389da60a6a3c WHIRLPOOL 9ca5243c7e6dc1c53438b058e4d3bf2d520d0c7a487a8a161c54cfe7edc57bb4c5f05f8458dab405d76c159ee8f52dd0dded156d89045313baf9cfc0373a1c4d
-MISC ChangeLog 7236 SHA256 804aae3f270bb70916b3c7bf332905827e49a5aab5703158017de548ea9d1e75 SHA512 2c753a83ff4dd836c2ab26bf2e5dbbf1205a389cdb2590d22c6036ad7a99d905f4edb57e806e3af69fb64fa5b714551e2e926ac941577e46a15e915bb6eadf1c WHIRLPOOL f729fad4f704d6f3ae3e19f0ee01cb0952264d1b224e2a0444fce62bdaa33b7b54d4e8787ad3f6f04b9113f2840dac9e3c8ec4e9a8cd967865de87d935059b8e
+EBUILD syntax-1.2.0-r1.ebuild 829 SHA256 a21ef2d875bd5c1cc6650797cd057c3dadf99aba928a587bc08f76f2294fedea SHA512 fc879566ae60c947a147ab7cdf6b2814c7359b6936db8642637183df3f7ac8cae75339e0285aaad9f15b9e62388a08871705a37b23a1535ba2400aca4bb260a5 WHIRLPOOL bb4ad995cc35b9c3557373fb505ed4f4b10e2080cf31cd6a1ef4de30b7794167b75347967db2f356a7b32d3c458b966f498f5f340b49c5dfd7571026939968b1
+MISC ChangeLog 7457 SHA256 1d3f3980d04ad4c75950366512aee77f5fe7b565eaab426754d7d357c7602b75 SHA512 550457f56a41f24da6b2ba2656356b526b43378f4992bbd5bcbf0e4c732365cc586cf225771c3fefd191e2e3692a58115ef11deb08ecc74ce1a125e5a83ba636 WHIRLPOOL a3a930430972a0d68048ef4934d3e0fd0c0ca1938cd82d6b8f019f0bd2acc82d8f4741a4316cb874b651af9fffadb07e85c2677ae29dbfedd3543655545264fe
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlSfuD4ACgkQiIP6VqMIqNcSZQEAgDffiIub5KjPBr2zcUJT0OX/
+gHqrcuJEfxJZHeHgWJoA/iI5ALwSXf8JfCmmpZ1uLhnCz9ITV76QcZTV2F/mj3py
+=X5Wa
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/syntax/files/syntax-1.2.0-require-set.patch b/dev-ruby/syntax/files/syntax-1.2.0-require-set.patch
new file mode 100644
index 000000000000..34dec6c66506
--- /dev/null
+++ b/dev-ruby/syntax/files/syntax-1.2.0-require-set.patch
@@ -0,0 +1,16 @@
+commit 22430510b9662edd64e3792c560629daf8aebc82
+Author: Jan Berkel <jan@soundcloud.com>
+Date:   Tue Apr 1 07:00:17 2014 -0400
+
+    Explicitly require 'set'.
+
+diff --git a/lib/syntax/lang/ruby.rb b/lib/syntax/lang/ruby.rb
+index edccda0..90eca56 100644
+--- a/lib/syntax/lang/ruby.rb
++++ b/lib/syntax/lang/ruby.rb
+@@ -1,4 +1,5 @@
+ require 'syntax'
++require 'set'
+ 
+ module Syntax
+ 
diff --git a/dev-ruby/syntax/syntax-1.2.0.ebuild b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
index 4e693dde552a..ff1c9580e319 100644
--- a/dev-ruby/syntax/syntax-1.2.0.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/syntax/syntax-1.2.0.ebuild,v 1.2 2014/10/29 19:04:24 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/syntax/syntax-1.2.0-r1.ebuild,v 1.1 2014/12/28 07:58:53 graaff Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
-#RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
 inherit ruby-fakegem
 
@@ -19,4 +19,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test doc"
 
+PATCHES=( "${P}-require-set.patch" )
+
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"