Version bump.

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

3 files changed, 125 insertions, 9 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index ba7b0f114ca4..a2769ff11f42 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,11 @@
 # 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.207 2014/10/23 01:48:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.208 2014/12/13 05:04:43 radhermit Exp $
+
+*mkvtoolnix-7.4.0 (13 Dec 2014)
+
+  13 Dec 2014; Tim Harder <radhermit@gentoo.org> +mkvtoolnix-7.4.0.ebuild:
+  Version bump.
 
 *mkvtoolnix-7.3.0 (23 Oct 2014)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index e74814714d46..4d650a4c9846 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -10,6 +10,7 @@ DIST mkvtoolnix-6.9.1.tar.xz 5198388 SHA256 a874afcf61c4d6235c789be07417dfebe992
 DIST mkvtoolnix-7.0.0.tar.xz 5182348 SHA256 2bbdf060e193d4a7f961f84d28b28d67d859be66e3f2cdf8ee4ae380f8d15725 SHA512 73fb61ddb2b4b0bb106462fd3b8008f4d21959fb0b509c8e370a648f3bb944c41725206842efb3e73183a0a8ee50009a6444e587b981aea7507d766afa84bc36 WHIRLPOOL 8c1962d3d4e8d32d11d59b927e264c0e27a01d52685001565d24c74d7aa14db8283d1603bf4361aded5a877b451c43920eec741ef3e185244793e9e859705196
 DIST mkvtoolnix-7.2.0.tar.xz 5215812 SHA256 613fc364e6afad2163bc1b65259e6d4b0a9327b9634b1cd366916ce1cf68f5ae SHA512 cc855f1fb11f4c62ad0596bf8e06f344fd0627d4b7723e4fc8b0f41fc720d91fecf5178cd5a17cc9f61a68c94a41cb3aff1e030e7c7b22ba4d7e343391d92276 WHIRLPOOL d2809d82c72dacc3668ef88079f6cb2a4035b6a72a385388007b565faa0152f4801e1c41b36f174bfdb1f23cd5d03b5f5232a2f9a6241fc32af870c445cca915
 DIST mkvtoolnix-7.3.0.tar.xz 5225524 SHA256 2cb09f926d16bfa8091a9f8fcbd63f6490bf1f2ce3280001f8d5c4798979d420 SHA512 e725d8bbc97ca0cef0e281f8cfb3477555640bef5ce31fc9cf62d1ce36b95b895cbe757d983a9081ca626025eef3f7ae9052e810d2541d98808e09a5793d2e8f WHIRLPOOL a2ff376e540e709d029cccfd77979971fa7987e475da6a2af9fdf0ee5a85fa4caa32c563baa7a43c94b9d5b5ee7f817ae331641af429aac77e5027c5cb0ea5b5
+DIST mkvtoolnix-7.4.0.tar.xz 5267412 SHA256 6bdfec2ca4fd7ce379660289c800be91fe963bfaf2f6e167fb11d9666d1640fe SHA512 2588281125c81be37eccc33b7277be0a0dff99b7aa8e820b68f4faecbd706b53a6363a54d427b5f36bfbdc773504e4de9e2ce187c271ee0142798db7e1a5fde8 WHIRLPOOL c878fdab9d99072bf514f968e0f697c5b73e2611ab7e27bdab80f8f6d32d331321b9697ac67f948842199eb68464726961c1064e4fc26bac62a3b6437dc60dc5
 EBUILD mkvtoolnix-5.0.1-r1.ebuild 1826 SHA256 82d52db276aa01eb04ba51dcf62bfb35b92d35e565568488601be74ceb63da9d SHA512 f173ff8c50635bf8731723e953ede5bfdd488775adb22012a8bb32a02b51d83692438afa82a383a42872d49623682468f4e1a4e3b0a6e9c2ee1dabbec7070b2a WHIRLPOOL 78fa80620ef232bb3829bdd7de7666edd37b80dececb032fd07eb4033e81344c0957c6c42f4c13b4f43662e3e17efec6d9b4a45db255e3e5c5774e08d7922aaf
 EBUILD mkvtoolnix-6.6.0.ebuild 2124 SHA256 d85a5cf968972ea40fe08ae64e5c86a18e6ccbd62787a908f4e30524c5701d86 SHA512 b3c22836b30bdc1bfd60c4b4969ddfa09fa11fb57f3e6184a68ca4f398b4cead7d72cdb5df7394996c95e23b6c83a2373c838efda4d3b07d9c4064687dd70981 WHIRLPOOL 1dbcb589914de13a7b5631350abaa185f281ee47a309cad0c7816addbcbd07b8fbc6fd04f91d960072a7739e352bb5cd4dce634b4d676393a41af2462ced9009
 EBUILD mkvtoolnix-6.7.0.ebuild 2141 SHA256 a3966d9508e1819a34089331f5803f33881035036bf50dc93d2d9871870f425a SHA512 91e9b4165bbf311ec3fc58b91158ee4c9d15a896675d72da5e4d2b7b8a7e4d709f5a019fdf0f202c670cda759dbe8e444975be2edafc3695bf200987f7ea2dab WHIRLPOOL 40b0ca8bda26223e21b1aef36bf72b27c9c1cd786491246c0f41d1cb2c0eee1d1380623c322a4dafa593946a5e64bfae97da69892bfded8a56303ef702df80ab
@@ -17,16 +18,17 @@ EBUILD mkvtoolnix-6.9.1.ebuild 2826 SHA256 addcb3e0258d6c68c902214561f05fa805f46
 EBUILD mkvtoolnix-7.0.0.ebuild 2826 SHA256 673a675d6c65390cebf93b67c94f50e571c68eb19aaf1d575255f12259d05974 SHA512 7b20a712717fe718727006d0472fb9f1c9e39bd443afae5ffaa5736d92dc8ce983e90c78502b2b7d8061d5aef8675c234ad783777b49bd80fa1c92b0c2441a55 WHIRLPOOL dda6a8cd45225e348a332b9519675789379da59e301b219356bc36ec80b8307b9d1d0637421ef710882ff75df0fa04e36dfde1e29726e1559ac2cb3e745212b3
 EBUILD mkvtoolnix-7.2.0.ebuild 2826 SHA256 04b09d030b89097235876866e898a37b5584507403c87d12e027430bb4cfd6be SHA512 f36253574eeac9c1e4fba1fd8268cead033feb29bba8ee88bf230bd7e6e74345ab725015a4679e5ae1e3550ca1dfb958c48258dd8534d1558d42d961f5856a19 WHIRLPOOL 7d9ba4ec971f562cae12b6c42b932f81474512ad47f17584e897b5ee8df20fed4f14d619f10d742c5075b78d798f57d4ef8580aa152f9ef2280df484f7741e53
 EBUILD mkvtoolnix-7.3.0.ebuild 2829 SHA256 2a5d60dbd2ae6e8d6d80a5bbd9fe528111d783e3e85fe8f38f32c3fcc5355aed SHA512 5886347781106926d94ef6fa4106692ecd299f9b491429bbccef6344eae9e364a40d72393420c437f4001242ce91a6246c1bae1813f26d26eb81663c8c3574d5 WHIRLPOOL 7c70d5e5ac4b965e1faadc00858c3fdd7a520fa105d2f9a3bdbd11fefb47eadac3278299a4b109187977821a33e9d06d47e405ec401d3368876d15fe2287f05e
-MISC ChangeLog 30340 SHA256 fd97de4b23a56508f32e4cb96f07519775f828269c32dfd0895b152c5ad3a0d9 SHA512 703615b5aedb6e8900e4cbafaed5cc05d03e9d33ec361b81f63945f53c7526332185af3ecc9ca9fa79043a0b235e4ff1fb03ab0f92d629da11f23a2a432a6107 WHIRLPOOL 15b7135e9b5d4980f563928b7dbc61273dbf86e261179a1fe6595537caafdc7154812cf418038846f5a2534491896218c755b91f194a7859313fb11d32512f96
+EBUILD mkvtoolnix-7.4.0.ebuild 2778 SHA256 13e135d6330846d2291d157dee38669bf77bb5b3379f10677488908efa61c9be SHA512 18cb15ff50f844518e4f1ee477906fe1c9399f13b8997448f00525beb83b45264c2e82843f39581efeca44960a8baf730cd91f50130d39f5eedb160ed66411af WHIRLPOOL 626165afa5b90bfbe4aca1782d74b6a9cc90e76d7c795ad37bb1e4682a3479af1976c4e0dffb1742c519863db04930e0caadf252d070b934c1d5c0e12c8b4114
+MISC ChangeLog 30465 SHA256 b4ca2999b7b4caa69517ddca05e78ce3876ca41284cb1ec913c07050f48e63bf SHA512 1937cb9579fd0b3cb5d2a58e8d3f350266905c1b2930b8cbbe529121a5a7861727c14f7c7b551ecddcc4a711b4fa51c8f775ca35dad5bb35d6d6f2a713aa0e74 WHIRLPOOL c89522cd826b55ba2396b12bad817457d5225564312cf4d1e94afe21ef8376b9dbcfe39184e6f78b117b4a013a6c402ac76e13fd5644b3f3f5508228595075f2
 MISC metadata.xml 158 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 SHA512 0bfb0265d3c42ba1958f8e589316112dba381e7701773668443cf0afe678a8d80675392efb2713e3d376b85b03a5b2bfb390c94411e0c6cf8a223b26aa9a04ca WHIRLPOOL 447b37b9f46058b1adc8d30a57460a8ab6b5ec149870c5ea385956cae9dd10a99b36e63526f2d13cabf13a4185f8b4e22a78156ab141a6e397bba298ab7efb2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUSF5kAAoJEEqz6FtPBkyj8DQH/1pxcT0udZOBcffNBoLLKk4z
-y+XNwPV3espMbsL8VIdSEMV+RPlYC7cwDc/4mhKUSEL8HhzligrTUV1QAfO+zy1I
-269IK8orUgX0FSHBUBMlQJoNGc7QcVaV18Z9Vk4Hue3kPJRUZoC3zd8RtOMm7syw
-s1Ly5rmKWPWoSypVbTSQz3Su77LHCQ6+ozMqNbjeCRs2UkIQKO217EFT/bzRusIX
-uXGqXAPHLxSz5GpLeY9uCzPYxVYe7nNkT1QiFWOode8T3V1HINwh5cHWeGLDLcor
-B0rCVlqSPPPL7qZspNStbd3iRiWa9O2XN+7L2lXOPLHgl6lWEGJSegMDXb+cm9M=
-=tmMO
+iQEcBAEBCAAGBQJUi8j4AAoJEEqz6FtPBkyjkO4H+wfiX2AWOQjEWovrKkOeh2NP
+3mmQ8DVDIIBRALCYryb8yYi2BXvDLqEqeYqlEv2wTeE4PGxxa3Ey6lUptocM/ECk
+B3Ztrrm9dC0jwKo49uwVzwIl4Xpcpx3hQ+qoksbHb4b0rjuBLxA7nktVx9nsdQr9
+/39Paevo9BHV2Ehe+2m1NDfJy19kjugCxIWcL816iWQUHLlvTnyo2bKT5b2ZpVFl
+hJHNEqyHqkFo5H2W1pEFjqHNiej0oKRbzO0FOHxMzyNYDjLYfeTR6haVKYWAk4an
+41zbOSqYjE2ijRyAxIdtjyq3LeLgXQ+9yI/LSjZGf5Y3svUpm550D+99WvOzRQY=
+=FIne
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.4.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.4.0.ebuild
new file mode 100644
index 000000000000..e19602355eeb
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-7.4.0.ebuild
@@ -0,0 +1,109 @@
+# 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-7.4.0.ebuild,v 1.1 2014/12/13 05:04:43 radhermit Exp $
+
+EAPI=5
+WX_GTK_VER="3.0"
+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"
+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 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:=
+	>=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
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+"
+DEPEND="${RDEPEND}
+	|| ( ${RUBY_BDEPS} )
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+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_prepare() {
+	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-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 qt5 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.md TODO
+	doman doc/man/*.1
+
+	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
+}