Version bump.

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

3 files changed, 127 insertions, 10 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 874c3126f3a2..ac82957f4d98 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.202 2014/04/28 19:48:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.203 2014/06/16 06:12:21 radhermit Exp $
+
+*mkvtoolnix-7.0.0 (16 Jun 2014)
+
+  16 Jun 2014; Tim Harder <radhermit@gentoo.org> +mkvtoolnix-7.0.0.ebuild:
+  Version bump.
 
   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
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index ba36843bad7a..1989d49affbc 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -7,20 +7,22 @@ DIST mkvtoolnix-5.0.1.tar.bz2 2155095 SHA256 eecc48d17c0583b6b071e710bfe88ae0943
 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.1.tar.xz 5198388 SHA256 a874afcf61c4d6235c789be07417dfebe992b68aaf4858920f9f3ac0d88b81e7 SHA512 f21543a02971ed4fac9487eac3c89c1004e4fc2fbb14adffa443958aba3978c98c9d185bcae086b445e615f1abbc794428a83478c3922915a8a9ac894027dceb WHIRLPOOL 4c939369647083871b038d6390388010f8447a50697d1c157057e942257bd27405fe53a537d011dcb1a44b52c8accd8a2606f8c830270906f9bed72f296f899d
+DIST mkvtoolnix-7.0.0.tar.xz 5182348 SHA256 2bbdf060e193d4a7f961f84d28b28d67d859be66e3f2cdf8ee4ae380f8d15725 SHA512 73fb61ddb2b4b0bb106462fd3b8008f4d21959fb0b509c8e370a648f3bb944c41725206842efb3e73183a0a8ee50009a6444e587b981aea7507d766afa84bc36 WHIRLPOOL 8c1962d3d4e8d32d11d59b927e264c0e27a01d52685001565d24c74d7aa14db8283d1603bf4361aded5a877b451c43920eec741ef3e185244793e9e859705196
 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 2826 SHA256 addcb3e0258d6c68c902214561f05fa805f462091bfdc37f0c7afe3959c54672 SHA512 db86d4b2fecd3331cbcdd314c3d0ad290c0bca5490f30c745ea0a3faa9c97d1cbefa555aae934046fa90998bbf4a3de050449aa062a15724266dc1ae95b99df7 WHIRLPOOL f5fcdcae1adb6fdd0036edb598aa62232a376d1cb4a154df454b0cad0026e86f7791b5dabe6139e9f1452f4ee6ec2520d3d99073ea7dedca65f2d68e3295b2ce
-MISC ChangeLog 29737 SHA256 f0a121b4407db496e8afdaa353fedf93d1f31b31e43572af79f826b72a177ba8 SHA512 fd8e7cd25cf5f60bbd1691787666530cc7da6dfe31403c5213aaa7f45e676478c05ed88fe0b4177db23d9b014249d0ad54487502c4331d2fdbc7cbffb5779992 WHIRLPOOL be41cb8caeafe58dd81bcf9d22a5c16512be2f41a148e7ae2fbcbdca41e8f4cc75ef46310b7dd12b3f7bbe1c9e5cf4207d1e8786b2ff393f37867a9c831acc44
+EBUILD mkvtoolnix-7.0.0.ebuild 2826 SHA256 673a675d6c65390cebf93b67c94f50e571c68eb19aaf1d575255f12259d05974 SHA512 7b20a712717fe718727006d0472fb9f1c9e39bd443afae5ffaa5736d92dc8ce983e90c78502b2b7d8061d5aef8675c234ad783777b49bd80fa1c92b0c2441a55 WHIRLPOOL dda6a8cd45225e348a332b9519675789379da59e301b219356bc36ec80b8307b9d1d0637421ef710882ff75df0fa04e36dfde1e29726e1559ac2cb3e745212b3
+MISC ChangeLog 29862 SHA256 fdcb23e28a872d38321ab8976277b048b522150fd809a62a18724f06b1210ffe SHA512 0a297bd814b34ea4a5ebafc79473fabe8c8b72b4383c43035acce39ebc0291cb3efeaedfeb0ce67ecef28e2d98e11dfc604168671860ee6900ced961fe1d4f91 WHIRLPOOL 0e4023c2c6d8968dc449e7f44df8bf9c31ef4a43436528c604337433c78aba4b7d045062453a669a6052ba23f6b764a6a7162cf06f3f2fa26f259f24bf29f11a
 MISC metadata.xml 158 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 SHA512 0bfb0265d3c42ba1958f8e589316112dba381e7701773668443cf0afe678a8d80675392efb2713e3d376b85b03a5b2bfb390c94411e0c6cf8a223b26aa9a04ca WHIRLPOOL 447b37b9f46058b1adc8d30a57460a8ab6b5ec149870c5ea385956cae9dd10a99b36e63526f2d13cabf13a4185f8b4e22a78156ab141a6e397bba298ab7efb2a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTXrB1AAoJEEqz6FtPBkyjLbEIAJTGNeYnJMZyfs4A6XoLfzpg
-Yw/lRPcy+0izF6+bI7DnXR3MIBWsYmso4GYPvlWycVHlHfFh30hnZksA197/E99Y
-OhaXdVQ+c2BB2fE5Q9mzQV+JD1aKTTX6pFHDHex/cY0/kfg0nU9wHWXP2ulWlunV
-1z2X0WK1BByDQ0GCzlBwyWprVEwuP16u2D9ZcaasB0W3OvtPUBSwp2aANmZVQ7g+
-wt+1lbOZaYphNE81rFtjPo5xWkIJMd0w6ooR1OoV1uasaK5LyQZ/z8X2bAoQKmFE
-iHLL0j/FVnNTwHuYfDCOTtL/Es29Nmw6rsMpBsPlAiBFrB7theyleQj9mrup9Uo=
-=AZEx
+iQEcBAEBCAAGBQJTnorGAAoJEEqz6FtPBkyjnxYH+wQpqQftCgy/HqAsXIF5Bcc3
+fOJpsNjnXuFUFXKyW2hFWeIlGGZt0ay5BGp1E9LCO2PHI0YAEVdfDNcOwLfV06Y0
+TpmQT9jxuKKnajd23J9YREalQSJIANZwJC4QZ2fwaR8Fu990JXtaH82RmaU/F2Q3
+bmTEOQZeuiChN36hrysBkTF9cdeg/PrEPGoOEOqXN6gPlyxHWLJYCHNOI5Ta+/jW
+QfKkYKyW98oaFw6qM5UQVadXE1JuondzslvpGoCWx2RwAzbNjebgf+5aINoNRjqa
+fBL4Cq9Q+G1GW6of8pGf+Ar3rd5cZ8J4jhZkMfgq+nXrbyrNwbM5ieKTjTgNhkU=
+=HwLL
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.0.0.ebuild
new file mode 100644
index 000000000000..ea7de5f68570
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-7.0.0.ebuild
@@ -0,0 +1,110 @@
+# 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.0.0.ebuild,v 1.1 2014/06/16 06:12:21 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-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 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 TODO
+	doman doc/man/*.1
+
+	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
+}