Add sys-devel/gettext to DEPEND (bug #508966) and drop ruby-ng eclass usage (fixes bug #508968).

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

3 files changed, 38 insertions, 27 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 8d589f0e4c35..874c3126f3a2 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.201 2014/04/26 09:46:20 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.202 2014/04/28 19:48:01 radhermit Exp $
+
+  28 Apr 2014; Tim Harder <radhermit@gentoo.org> mkvtoolnix-6.9.1.ebuild:
+  Add sys-devel/gettext to DEPEND (bug #508966) and drop ruby-ng eclass usage
+  (fixes bug #508968).
 
 *mkvtoolnix-6.9.1 (26 Apr 2014)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 8ecfb5c8bc46..ba36843bad7a 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -10,17 +10,17 @@ DIST mkvtoolnix-6.9.1.tar.xz 5198388 SHA256 a874afcf61c4d6235c789be07417dfebe992
 EBUILD mkvtoolnix-5.0.1-r1.ebuild 1826 SHA256 82d52db276aa01eb04ba51dcf62bfb35b92d35e565568488601be74ceb63da9d SHA512 f173ff8c50635bf8731723e953ede5bfdd488775adb22012a8bb32a02b51d83692438afa82a383a42872d49623682468f4e1a4e3b0a6e9c2ee1dabbec7070b2a WHIRLPOOL 78fa80620ef232bb3829bdd7de7666edd37b80dececb032fd07eb4033e81344c0957c6c42f4c13b4f43662e3e17efec6d9b4a45db255e3e5c5774e08d7922aaf
 EBUILD mkvtoolnix-6.6.0.ebuild 2129 SHA256 b2575787ec0e0f4c8685ba70b6f0ec105c2a392c065fe268bfc884f8b4a3ede0 SHA512 afa11750ece2d4eb6e4be7d069d27f1d65250922506af02c42abc5a73e92ed3d7f76e58851b1cd071f324d9865cb730aa5970cf2625ef9f8727dabe8395972a3 WHIRLPOOL c9418a8ba856c6e17059d15d1e871bd1f4448065c548b1a4771fce2ce99c880d41ae42db87d8e4ba1c6de75a2f69ae961bfe2366f1358e1e68ee0f190f2dd7c8
 EBUILD mkvtoolnix-6.7.0.ebuild 2141 SHA256 a3966d9508e1819a34089331f5803f33881035036bf50dc93d2d9871870f425a SHA512 91e9b4165bbf311ec3fc58b91158ee4c9d15a896675d72da5e4d2b7b8a7e4d709f5a019fdf0f202c670cda759dbe8e444975be2edafc3695bf200987f7ea2dab WHIRLPOOL 40b0ca8bda26223e21b1aef36bf72b27c9c1cd786491246c0f41d1cb2c0eee1d1380623c322a4dafa593946a5e64bfae97da69892bfded8a56303ef702df80ab
-EBUILD mkvtoolnix-6.9.1.ebuild 2586 SHA256 f3de66027e7f6dd0fde30f6d1d5d60b4283df69dbd75a303443c37a905758a08 SHA512 d672dda9c5301cb83dcd64d8cb1f37f41dac29b03b4db7dd5039b8f7f80d8819139b69aa25cbdd053543af3b7da805b28b66ed5f43c31ddc78b6891c2011dd60 WHIRLPOOL 60ee0560f7498ae7cee91cdc206e11a9006d6034056ec3b088bf69889230886ae63fd34409e0f4fa6e5b70c3c3b3855b014a9c71877d4665e778820bc2f2f546
-MISC ChangeLog 29561 SHA256 46c43def30db24d69a49c30005261c2ba19fa9f1076b50ed111ede523b445bb0 SHA512 47382a788a293e13df278d6b9e6ad2e803dcc66927601561cf885d8192d2a16d6cd010566f73585c1c47bd12d8a1646d9764659a585b2cfeeece18b309e29db0 WHIRLPOOL 9c74351e02f2b7523ce1df0f4fed8af6471314c4230f0c5975ad5b79b7fba4174f0e3b339af489738e86e4c78ba237e9caf83a2271281483b329247a92b3032a
+EBUILD mkvtoolnix-6.9.1.ebuild 2826 SHA256 addcb3e0258d6c68c902214561f05fa805f462091bfdc37f0c7afe3959c54672 SHA512 db86d4b2fecd3331cbcdd314c3d0ad290c0bca5490f30c745ea0a3faa9c97d1cbefa555aae934046fa90998bbf4a3de050449aa062a15724266dc1ae95b99df7 WHIRLPOOL f5fcdcae1adb6fdd0036edb598aa62232a376d1cb4a154df454b0cad0026e86f7791b5dabe6139e9f1452f4ee6ec2520d3d99073ea7dedca65f2d68e3295b2ce
+MISC ChangeLog 29737 SHA256 f0a121b4407db496e8afdaa353fedf93d1f31b31e43572af79f826b72a177ba8 SHA512 fd8e7cd25cf5f60bbd1691787666530cc7da6dfe31403c5213aaa7f45e676478c05ed88fe0b4177db23d9b014249d0ad54487502c4331d2fdbc7cbffb5779992 WHIRLPOOL be41cb8caeafe58dd81bcf9d22a5c16512be2f41a148e7ae2fbcbdca41e8f4cc75ef46310b7dd12b3f7bbe1c9e5cf4207d1e8786b2ff393f37867a9c831acc44
 MISC metadata.xml 158 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 SHA512 0bfb0265d3c42ba1958f8e589316112dba381e7701773668443cf0afe678a8d80675392efb2713e3d376b85b03a5b2bfb390c94411e0c6cf8a223b26aa9a04ca WHIRLPOOL 447b37b9f46058b1adc8d30a57460a8ab6b5ec149870c5ea385956cae9dd10a99b36e63526f2d13cabf13a4185f8b4e22a78156ab141a6e397bba298ab7efb2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTW4BxAAoJEEqz6FtPBkyjGYsH/2UZnwyqnNrYSBzd1C5uUgJH
-TZ6w4A0M4t46l0Y+sqeobuhwAPwe1d4anHobB+jq1ygZK2eKEPSIcDWdVTqWDkAk
-bRM7VxIUDUnSzhHtT4u+oaZWJaXo8AFMx4axLBa/ZQ1i4jWc7RB/53u06e7dEqtE
-nRN0bcXL+iL93OK7K/w5+AjDVvxMrO7KXag1NK3+m7o0EmN19Bz2QuVQ9uYExWBL
-M25vOk1TnrGbJtRXG4wTs3YLwzjUYVyICJr6/cxWYeaxDNAbN94jW9Zs4elkLXVX
-EX34ewXAK601ezsAlhxZyHc5bVVJu7o9+TTUReh0Gw4dgNluK8dqMg8XquJ5+QA=
-=jMJV
+iQEcBAEBCAAGBQJTXrB1AAoJEEqz6FtPBkyjLbEIAJTGNeYnJMZyfs4A6XoLfzpg
+Yw/lRPcy+0izF6+bI7DnXR3MIBWsYmso4GYPvlWycVHlHfFh30hnZksA197/E99Y
+OhaXdVQ+c2BB2fE5Q9mzQV+JD1aKTTX6pFHDHex/cY0/kfg0nU9wHWXP2ulWlunV
+1z2X0WK1BByDQ0GCzlBwyWprVEwuP16u2D9ZcaasB0W3OvtPUBSwp2aANmZVQ7g+
+wt+1lbOZaYphNE81rFtjPo5xWkIJMd0w6ooR1OoV1uasaK5LyQZ/z8X2bAoQKmFE
+iHLL0j/FVnNTwHuYfDCOTtL/Es29Nmw6rsMpBsPlAiBFrB7theyleQj9mrup9Uo=
+=AZEx
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild
index 4c4708e18dd7..5c1427875900 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild
@@ -1,13 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild,v 1.1 2014/04/26 09:46:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild,v 1.2 2014/04/28 19:48:01 radhermit Exp $
 
 EAPI=5
 WX_GTK_VER="3.0"
-USE_RUBY="ruby19 ruby20 ruby21"
-# don't add ruby to RDEPEND
-RUBY_OPTIONAL=yes
-inherit eutils ruby-ng multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
+inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
 HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
@@ -18,6 +15,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug pch qt5 wxwidgets"
 
+ruby_atom() {
+	local ruby_slot=${1/ruby/}
+	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
+	echo "dev-lang/ruby:${ruby_slot}"
+}
+
+# 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=( ruby19 ruby20 ruby21 )
+RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do echo $(ruby_atom ${ruby_impl}); done)"
+
 RDEPEND="
 	>=dev-libs/libebml-1.3.0:=
 	>=media-libs/libmatroska-1.4.1:=
@@ -36,13 +44,11 @@ RDEPEND="
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
 "
 DEPEND="${RDEPEND}
-	|| ( $(ruby_implementations_depend) )
+	|| ( ${RUBY_BDEPS} )
+	sys-devel/gettext
 	virtual/pkgconfig
 "
 
-# workaround to override ruby-ng
-S=${WORKDIR}/${P}
-
 pkg_pretend() {
 	# http://bugs.gentoo.org/419257
 	local ver=4.6
@@ -53,15 +59,16 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	# workaround to override ruby-ng
-	default
-}
-
 src_prepare() {
-	# hack from ruby-ng eclass to determine ruby version to build with
-	local ruby_implementations=$(ruby_get_use_implementations)
-	export RUBY="$(ruby_implementation_command ${ruby_implementations[0]})"
+	local ruby_impl
+	for ruby_impl in "${RUBY_IMPLS[@]}"; do
+		if has_version "$(ruby_atom ${ruby_impl})"; then
+			export RUBY=${ruby_impl}
+			break
+		fi
+	done
+
+	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
 
 	epatch "${FILESDIR}"/${PN}-5.8.0-system-pugixml.patch \
 		"${FILESDIR}"/${PN}-5.8.0-boost-configure.patch