From: Tim Harder <radhermit@gentoo.org>
Date: Tue, 6 Jan 2015 16:21:50 +0000 (+0000)
Subject: Add build support for ruby-2.2 (bug #535738).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d801b0523da0793b967fe968e897a096563bea14;p=gentoo.git

Add build support for ruby-2.2 (bug #535738).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3
---

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index bfcde3987e3e..57694fb6f660 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.211 2015/01/05 01:44:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.212 2015/01/06 16:21:49 radhermit Exp $
+
+  06 Jan 2015; Tim Harder <radhermit@gentoo.org> mkvtoolnix-7.5.0.ebuild:
+  Add build support for ruby-2.2 (bug #535738).
 
 *mkvtoolnix-7.5.0 (05 Jan 2015)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 19385196f3b8..55b0613b2aec 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -10,17 +10,17 @@ DIST mkvtoolnix-7.5.0.tar.xz 5266996 SHA256 17baf799c7a047c9d7026db237b7e7020296
 EBUILD mkvtoolnix-6.6.0.ebuild 2124 SHA256 d85a5cf968972ea40fe08ae64e5c86a18e6ccbd62787a908f4e30524c5701d86 SHA512 b3c22836b30bdc1bfd60c4b4969ddfa09fa11fb57f3e6184a68ca4f398b4cead7d72cdb5df7394996c95e23b6c83a2373c838efda4d3b07d9c4064687dd70981 WHIRLPOOL 1dbcb589914de13a7b5631350abaa185f281ee47a309cad0c7816addbcbd07b8fbc6fd04f91d960072a7739e352bb5cd4dce634b4d676393a41af2462ced9009
 EBUILD mkvtoolnix-7.3.0.ebuild 2829 SHA256 2a5d60dbd2ae6e8d6d80a5bbd9fe528111d783e3e85fe8f38f32c3fcc5355aed SHA512 5886347781106926d94ef6fa4106692ecd299f9b491429bbccef6344eae9e364a40d72393420c437f4001242ce91a6246c1bae1813f26d26eb81663c8c3574d5 WHIRLPOOL 7c70d5e5ac4b965e1faadc00858c3fdd7a520fa105d2f9a3bdbd11fefb47eadac3278299a4b109187977821a33e9d06d47e405ec401d3368876d15fe2287f05e
 EBUILD mkvtoolnix-7.4.0-r1.ebuild 2811 SHA256 d170012f8e332abf8bee4d1cba9d8e6eebf5c990cb313f7e8d617f996377ff3b SHA512 95d06e451364d7de3d493a440a87b13641a54abaf7ba627924d847766c69c239bb8c99ac0b3920c925f659fcbd482f2bec44b0e21de44552b4e4f6e3c98707a6 WHIRLPOOL 27aff273d7fa19180ea3deeeb37b34b1614f5a7873366a44989862ccbdace8fc256467f21e70e4aad74ae7cef7a4a3c520c4fcca35e1eedfcb12c7ba66e3aeb2
-EBUILD mkvtoolnix-7.5.0.ebuild 2808 SHA256 d801c81f9c250bc4a0a66cef0942f56bb69f34357bf2a94967aca0097ebab1b7 SHA512 d7bc9404ada596d588c58381a020d4a8fd2b59bb4cc169adfd7b41fee19099829d5bd63fb15dd460865025ef921ce0bf513be79372f27246076f56661ee41059 WHIRLPOOL 41eaf5dff411f3aecd01e3b1dd9bf2c4d1e5b08b5ee7f4a45d9b37ad3f6ec1a72dcdf05498a3590f2e512e78115896cee1c92d85ff3c22b0b1634a480ed19ca9
-MISC ChangeLog 30999 SHA256 b97b784bf807df7eca18524b89e33d5a25040d1af566142ab4f5ed39836a9b36 SHA512 ced88c353ca98d99b5e15c73af19bbdb5bbed76e6175bcfb3f7e9c0752de2f23c7a20db3e4378be687af21d57e969ceb4534b71e651a3a6c2defa35f464f31b7 WHIRLPOOL d5f9c7d77621f2dbb4c9f826df192e78f10d12eb9696462688e431ac671fd4cd4377f78fc1f419308783cdbce9b8b2590238b555567272b8fab375532eb15d86
+EBUILD mkvtoolnix-7.5.0.ebuild 2815 SHA256 a94f0637fc66315444d2619992ba13dc828e64cf25054f24aa42153cb4136369 SHA512 e3a2589b84acce45161ac810e13d6f3889b0bd86a014a817570754d8eaf540df77e9f242ac609422c54bd1f732911a0bfae135cdf8c5fe149300c8e67985e50f WHIRLPOOL 27c37ea8fadcdc43c36daea53b41dbd9e217cce36a34519311292b19cf83f144ac16c5e712533f50e5df419d35dc932f23717f4360c45e78d925f54bf4ee4289
+MISC ChangeLog 31122 SHA256 6beaa7f0634d43025b094d493e8e4ba0e8298387ba2cd6449788877ef3fdb38d SHA512 cb942debf62b5992b85f3c5218ae0a71d9fd9cd1cbd19dae7f82d9f1141b8a65302e84b5c7c399b0334ec9d41aa04e4475a0997edbae1f9da6950c388614a783 WHIRLPOOL c987189629dffba6977616861278a73e7b0d79843b6005e5476042b078c8b5eec0501d20edaac287653e13cf052560f7b9509040ed42bc5f7340ed86e29e66ca
 MISC metadata.xml 158 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 SHA512 0bfb0265d3c42ba1958f8e589316112dba381e7701773668443cf0afe678a8d80675392efb2713e3d376b85b03a5b2bfb390c94411e0c6cf8a223b26aa9a04ca WHIRLPOOL 447b37b9f46058b1adc8d30a57460a8ab6b5ec149870c5ea385956cae9dd10a99b36e63526f2d13cabf13a4185f8b4e22a78156ab141a6e397bba298ab7efb2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUqeyqAAoJEEqz6FtPBkyjboQH/ivRLm85YH2jZlEEEG5qut/Q
-+uSdYPkKr2uXkVc4Ny/bdpN8dC8hUVtq6fdWX1tde4iUySuTW7p1gQCWhe2nvet3
-7FG3+Cn3LwLJT3sivKLLyGHrPNZmR5hdpZGh5U/p0j3dU42ltoUuMjH4NCWb3o2K
-nmEDQVHQ8HrEWssvJII11qF9Se1Op3jL3w1bTWNrfM/mn+EHq9/K9q9infm+FQjG
-ikqizglxtkOAQ/Jtie8rEw+eWgKXtCDU9lg1FqD156BLr1JWpaD51jO38eaOoM0V
-VtklX4Xkrq37pHKoGN98NfMQsQvSA1/a554tg5K/96zcneq3uYotyXRS8V+BD4g=
-=fr7n
+iQEcBAEBCAAGBQJUrAurAAoJEEqz6FtPBkyjTHMH/A8L5wao026CGhPC8l2d/lEr
+64Li8Y/53B0NcxDoHqvKO19AdPM8dpoF2wY0WJRVjjtTled2Lryduot4tg/IRVky
+7FwBJ1EsjXVNoVRMCtUbtr8pIy4ZxaguYd6J3n4AZvlKMKZ2gBOgRdH/fNjttcKy
+xbc1jq65yK1x+NOxXNp8dTqNuAffuzQm+rYgiCH5sfC07QRV8o17UHjF2/GRAqri
+f9NRoDOEd6zdyO5luwJ1lq1nm55P/JflWQ+pEfCqPOcUwqRJiiw51TMCkAWe2u3D
+RyAOKqBtv0kEMxa3/AVO0wTHNUlJrZxTbzeGhdt9xSBo006rDKsCqAeOPVq6Dhs=
+=8GJ4
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild
index b33d9cfbd978..e7fe493965dd 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v 1.1 2015/01/05 01:44:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v 1.2 2015/01/06 16:21:49 radhermit Exp $
 
 EAPI=5
 WX_GTK_VER="3.0"
@@ -23,7 +23,7 @@ ruby_atom() {
 
 # hacks to avoid using the ruby eclasses since this requires something similar
 # to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby21 ruby20 )
+RUBY_IMPLS=( ruby22 ruby21 ruby20 )
 RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
 	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems:${ruby_impl} )"; done)"