Version bump, use ruby-ng eclass to depend and run a specific ruby version for running drake.

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

3 files changed, 113 insertions, 16 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index d834cf2352aa..726598c7de1c 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,12 @@
 # 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.197 2014/03/27 11:34:41 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.198 2014/04/18 21:04:39 radhermit Exp $
+
+*mkvtoolnix-6.9.0 (18 Apr 2014)
+
+  18 Apr 2014; Tim Harder <radhermit@gentoo.org> +mkvtoolnix-6.9.0.ebuild:
+  Version bump, use ruby-ng eclass to depend and run a specific ruby version
+  for running drake.
 
   27 Mar 2014; Chema Alonso <nimiux@gentoo.org> mkvtoolnix-6.6.0.ebuild:
   Stable for amd64 wrt bug #496536
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index fa9eefaafc55..2c08da3c7de8 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX mkvtoolnix-5.8.0-boost-configure.patch 5428 SHA256 060ef650d7cdfe0f6de0c614750a90105665b1321be3a59ef3e1fbec7a46bfa5 SHA512 8965f2e4116fa340753a1414a1bd285ea26a0f38f48cb80b1a57608426d9f24958afff35756135051098edaebfcf0fe07521b59bad4f5193fe6833b0d6e1cd5b WHIRLPOOL 2aab1692234fb364043c07e94f39efd94ae6c57d46b12814626ea3be7afe59d3d5f79de24905fa23aed4b1446ccbc2fdfa86eb69cd2e3c0c2a6298bf5cb841b5
 AUX mkvtoolnix-5.8.0-system-pugixml.patch 2435 SHA256 1e0111dc929dec691808db015c0eddd1bfcd312e5d3bd548957fb0b37ccd3c6e SHA512 a1d4c838527f581dda01d7702a8d42dd1e53bf00103408c4d62d09dc1e1a12bca6fd63d3f740e7d67c858d79d520c5948673f849cf3d8a9698a95666692c64cb WHIRLPOOL 0c12ed938f5ca61de04175982cf756f8da7462182b597eb5c4a2d0f6010d09755ccc4f419ebedb9b1743c4aeb7da0885fd87481791c57e54ed693bd4bb034cbc
 DIST mkvtoolnix-5.0.1.tar.bz2 2155095 SHA256 eecc48d17c0583b6b071e710bfe88ae09439bd99bb90c694a2fed0651bb08f19 SHA512 5ac0077bdef7426fc4f978bae5965f868dcc5b5a78982580a441b55390f900babd8863a215e5bfddbf0c93087c36d93e5a6cb473e1d9b156622b85f8baec8e91 WHIRLPOOL dc8e98d823f56e75f93a3603aab2b4374a91d273ffd7d4acad0ec248da99885802cb876b10707799a09a5be14acf5651d66a9190d78db9f241067cad20cf1434
@@ -11,6 +8,7 @@ DIST mkvtoolnix-6.4.1.tar.xz 5119860 SHA256 76f24d792264a8c5aaa7ec7f3603bed458f0
 DIST mkvtoolnix-6.5.0.tar.xz 5167608 SHA256 a8ad5128cb87576857f239da0cbd4019d18ffdef489475b2587749bdd0417028 SHA512 f96bbdc4c53338dab3d7c62b2ea3e231d12a6f26146d203421c0a6d404f9727ff9541a98275f7cb68e82a4fa6f05493634900f4f0bb00e935d5b174c1cc5d60f WHIRLPOOL 0d19ba88e7ee2bf3faaa77ef3202a2eefd7b6ec70ec692bdea895f18b4ef9342dbe953d1a95b3d54f642caaf1190ca95a8370f00299efef05c2ddb6f9e517695
 DIST mkvtoolnix-6.6.0.tar.xz 5174424 SHA256 cb1f965617fe064cf78457d3fbd0685eb31ae5b7e205cf4c8e74b6f27f3399e3 SHA512 c86f10a0a919e6d28c2587b60663c38713cfa6ca0a5188524b81af2fd60e4ea626a01431d29c6ae5885eae05d71af93d857986c5008aec4963dacc3ead9dc26f WHIRLPOOL 55a15bb2fdb62af85e189c39b1a1391d33eb08b4ba116fc307965be6817a944b21d18c034b9a3da16a6e84e93544dbd59f3c7fe9406ab454e15cf8ee1eb815c3
 DIST mkvtoolnix-6.7.0.tar.xz 5119236 SHA256 82207c6ece01e76d51edcf6a330c9f0dc75e3bf4201fead3023c98bd7f323785 SHA512 e45621b2d68e8938731b89e2ac35d3811523896736d15c73acda283c61ae3414b459b881bcfe6764b3839a61e0d2f83ce23ea2ad94d329378d1904b0b97ac949 WHIRLPOOL 06ec4f2a4f2505b1a7c42224dd315031e3d0f43c1b11ca7e5fe3f6ab449582d75a7c95be7e4c31d29a703eb57d0bc08982213090089cf26f1168420925f51548
+DIST mkvtoolnix-6.9.0.tar.xz 5198128 SHA256 df2e3ab7412ecc3bbff0fd724aa6d3f9dd1456718dbc932d49577251c92b1bdd SHA512 086da14d13ba34cc1f731a56c4fa9b19db0a5df3db8bd969b8cf2f742d3b64549314d91b9a16f752f0a591e834430ba1a783d632519f1191ae1f6f52a143d4d1 WHIRLPOOL b365989f68266cb4db1d4eb3a4af2f7d97856b3e621cfe64a6fa30262be2bf28e680d4ab0821ae2504fe000f405ff6fff63dff8c99a314b4760a37dc95db25c6
 EBUILD mkvtoolnix-5.0.1-r1.ebuild 1826 SHA256 82d52db276aa01eb04ba51dcf62bfb35b92d35e565568488601be74ceb63da9d SHA512 f173ff8c50635bf8731723e953ede5bfdd488775adb22012a8bb32a02b51d83692438afa82a383a42872d49623682468f4e1a4e3b0a6e9c2ee1dabbec7070b2a WHIRLPOOL 78fa80620ef232bb3829bdd7de7666edd37b80dececb032fd07eb4033e81344c0957c6c42f4c13b4f43662e3e17efec6d9b4a45db255e3e5c5774e08d7922aaf
 EBUILD mkvtoolnix-6.1.0-r1.ebuild 2244 SHA256 9c19f46672a6c8dd32500ea7e76f2503b9a433d94dc30eb7d0de9ca0cb7ce4d1 SHA512 55b411a9818822d90e098635aee7321c50c06664babe49d91c20aa99d58d7ff7c4edb8784c4dc9ac4e63d7f0b646ef08c00c6056fbb71ba65a2737efb2040ac5 WHIRLPOOL 8e19cdfb0d41150e986f2e7d482b3b65e09cc46acd0b5dcb087fdbbe18cf0a8ce71c8943c7f7f66db3a452cab692ce28124868f9685f195bf9067c782c48ea42
 EBUILD mkvtoolnix-6.2.0.ebuild 2131 SHA256 a2f20dafbf007b63aa715b2cd0dc1fdb3e6fbd5cb48f13917cc5ed275720c12a SHA512 b08bfe20b350ba7a928b0e335d88854fbc73b8c31a72bf27968ac79c205e7978ee035201f62758aa0a0dbdd5dc85c6995bfa68f2441a40d3e26b97f1ea005cc1 WHIRLPOOL 2ad6fa4e29b43093d7039a0e79682a83c142156d451ad2ab9bf6d1eb0256e52b2b391f439db739e25c7cef9fa47a2855b493027b80fbb91ed5b9f5c7db92b316
@@ -19,16 +17,6 @@ EBUILD mkvtoolnix-6.4.1.ebuild 2133 SHA256 2783a0970ec94a7bf6ed2b5caf86c0b586489
 EBUILD mkvtoolnix-6.5.0.ebuild 2133 SHA256 3177ee3aec8af7927f2acfcbe1468c7d337cf101784a66cb10a55f25f2b22fc1 SHA512 0255895f8f850c379ad0fd83ca014104a4a6779d031191a59a9c8a4449c0a01b191ac4a85c333ab4735b35b65d22d921911c36ae2f84bf14de2b446f0442e851 WHIRLPOOL 7d3d2ba6101cc84a9cef984141c9785ea59b0da005d6bc573466b4b9f1961a0d55930b6fa65eb863cb5a7c301a5a879bdf246b3ef16873fa64f8c9d995d79283
 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
-MISC ChangeLog 28838 SHA256 ff2dc86e032be0ac6ebd7a06e40caa3eb0e63e191536afbfc6ae9a5f273f037b SHA512 19717a459aa9e4eb9031017cfef1bb4da843559ed6d91ce935fabdd47821f0c7304440b4623c84f04486b5f4d99419fcf5b310e8d576d2eefca366eea36be112 WHIRLPOOL ea294f28401929ad9cdf1dedb149c0b4573b763daa8c2ef52e8c9e1cb877cfa21af47f690a60f82ecddc8cc2a198b87d3ff6bd590d6190c34faf02719ec073b8
+EBUILD mkvtoolnix-6.9.0.ebuild 2586 SHA256 432dfdf2a2d79e09e620162aca443fcc61da3100c4c405c48355992293eb6922 SHA512 0e1556410f26563249a6af4a82c642b9398d677eceeeda4c75ba18053a9ec5bdab7e3e761326524328c152f62cd92370e529d2afefae4a57c456ba1f2ce76166 WHIRLPOOL 96136bc8c941b04fff8125144e66154f334297bd61bb011fcc7237f6d3f8036ac35983a8b271695d0b722ac246290e97bf4d59935c16826014bce4230cb2c2a7
+MISC ChangeLog 29048 SHA256 c6b9c3a8f7d1a0dc84c7447956f694c951c0a5a81740819306e698ff0cc157c3 SHA512 1d32cc8b95dedb2374ad271e4ed1e98139f47b0759e1d689036a1d1fa89dac46fe96a226f44a1c02b190a4ed3b0571c4f594c181fb5c7f9b596ef53248bb9611 WHIRLPOOL c9925aa4986b0ebe643d7eff80913bdfaac4ead77b0347b4cab4fdeef8394336b20789c39b204e2541c96b66788fb1643287531a278a22fc6235033c3969b5c5
 MISC metadata.xml 158 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 SHA512 0bfb0265d3c42ba1958f8e589316112dba381e7701773668443cf0afe678a8d80675392efb2713e3d376b85b03a5b2bfb390c94411e0c6cf8a223b26aa9a04ca WHIRLPOOL 447b37b9f46058b1adc8d30a57460a8ab6b5ec149870c5ea385956cae9dd10a99b36e63526f2d13cabf13a4185f8b4e22a78156ab141a6e397bba298ab7efb2a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAEBCAAGBQJTNA0IAAoJEA2sAkrWKOU2ZMsH/00mE/cE4MUIPHOSoHT16e8L
-KsVAeDPYblVTRFzpIGIgb085OT+xlsEaIgH/9F8mLLzRzXU9j2u5N0tBacUHVUC8
-/nCJ3xCylM7paSgkma9/1lJEVltSgmqtwjO9Gah+73fr/kCBBgCUvJDhXCugk7kG
-QAm4RTXImBeWsS1n6giWe9ffnVymX/sQOaIHeXzt0Rmbhdw10p3MYLqXnQe/d9h4
-V8mGE49EbrKvutd9fdOTfKpdwg/JeS0+W3ZyHzW/ERCFfz0qtXs4mME0rTT6bZ2+
-WfxPMzWJRdE6Cu4u7DEv8qNsn99hfc5Al3Zt9J//e3ILi2hyNa2CXsF1rLP3bNk=
-=9wwq
------END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/mkvtoolnix-6.9.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-6.9.0.ebuild
new file mode 100644
index 000000000000..a3eca8f6a1af
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-6.9.0.ebuild
@@ -0,0 +1,103 @@
+# 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.0.ebuild,v 1.1 2014/04/18 21:04:39 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
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
+SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug pch qt4 wxwidgets"
+
+RDEPEND="
+	>=dev-libs/libebml-1.3.0:=
+	>=media-libs/libmatroska-1.4.1:=
+	>=dev-libs/boost-1.46.0:=
+	dev-libs/pugixml
+	media-libs/flac
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	>=sys-devel/gcc-4.6
+	sys-libs/zlib
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+"
+DEPEND="${RDEPEND}
+	|| ( $(ruby_implementations_depend) )
+	virtual/pkgconfig
+"
+
+# workaround to override ruby-ng
+S=${WORKDIR}/${P}
+
+pkg_pretend() {
+	# http://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	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]})"
+
+	epatch "${FILESDIR}"/${PN}-5.8.0-system-pugixml.patch \
+		"${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use wxwidgets ; then
+		need-wxwidgets unicode
+		myconf="--with-wx-config=${WX_CONFIG}"
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt4 qt) \
+		$(use_enable wxwidgets) \
+		$(usex pch "" --disable-precompiled-headers) \
+		${myconf} \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--without-curl
+}
+
+src_compile() {
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
+}
+
+src_install() {
+	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
+
+	dodoc AUTHORS ChangeLog README TODO
+	doman doc/man/*.1
+
+	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
+}