Version bump.

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

3 files changed, 108 insertions, 9 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index f2ebcd00b394..3b5188d40865 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.182 2013/01/05 08:17:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.183 2013/01/21 04:47:17 radhermit Exp $
+
+*mkvtoolnix-6.0.0 (21 Jan 2013)
+
+  21 Jan 2013; Tim Harder <radhermit@gentoo.org> +mkvtoolnix-6.0.0.ebuild:
+  Version bump.
 
   05 Jan 2013; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Remove redundant maintainer from metadata.
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 77431d4d71e9..f7c76c7e2107 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -6,19 +6,21 @@ AUX mkvtoolnix-5.8.0-system-pugixml.patch 2435 SHA256 1e0111dc929dec691808db015c
 DIST mkvtoolnix-5.0.1.tar.bz2 2155095 SHA256 eecc48d17c0583b6b071e710bfe88ae09439bd99bb90c694a2fed0651bb08f19 SHA512 5ac0077bdef7426fc4f978bae5965f868dcc5b5a78982580a441b55390f900babd8863a215e5bfddbf0c93087c36d93e5a6cb473e1d9b156622b85f8baec8e91 WHIRLPOOL dc8e98d823f56e75f93a3603aab2b4374a91d273ffd7d4acad0ec248da99885802cb876b10707799a09a5be14acf5651d66a9190d78db9f241067cad20cf1434
 DIST mkvtoolnix-5.8.0.tar.bz2 4454971 SHA256 3c9ec7e4c035b82a35850c5ada98a29904edc44a0d1c9b900ed05d56e6274960 SHA512 c24850a8e5c68b06eec006028e7e53c92cff91e748c71bd3799f14e2299e23730043005ce3bd45271848c899df6a44c0f9bc84928c72ba886e8dd894c4b704f3 WHIRLPOOL 6e98c340bb80be55756f3d24272d712e2301f1eb8e314eababa59cf602cab7d27ea6f8ee3aa048db369abec1cfba8c5bdd2b679a0662741cea0c6cfdb5db7886
 DIST mkvtoolnix-5.9.0.tar.bz2 4493517 SHA256 d913f531331c3332d2fb334c872ea19bfea7293dfedc4bf33ae7162e4efcbde1 SHA512 d186e799ee6d95699d0ed4c820be3c7255e77e02b9330d4832cd114714a6a3f2c8fc27f7615f5e8da99ee5c7bb1cfca6b838954b58aff2d3739dbe3ecea203fc WHIRLPOOL ac68adfe914496ef60e255259edf0370559310f2100283383a438a4378986c09f69a2de1f51677ba8044f9918fb689f6a2c26d506155addaa9f053830c7043da
+DIST mkvtoolnix-6.0.0.tar.xz 3766204 SHA256 84ddefb079aeef2b3b2ac418e3d5461e670a15771e90d5eab98a88b0f5417bf0 SHA512 8d4816d0eac634c803bfb33ecf8dc177e97947a7d535966e1dfc7c346f37239146d7fad3fabef69138b0db37ee4928e9b822df1aa27eab28b8f46b445811e24b WHIRLPOOL b2f6c5a02d3577334693728b0b11fd245b9ede8c670345271789fef762ccfb92935ff125b0e8f2fc9e7cc7990aa309f02a411f32a80e6c215e298d9a513a6eec
 EBUILD mkvtoolnix-5.0.1-r1.ebuild 1826 SHA256 82d52db276aa01eb04ba51dcf62bfb35b92d35e565568488601be74ceb63da9d SHA512 f173ff8c50635bf8731723e953ede5bfdd488775adb22012a8bb32a02b51d83692438afa82a383a42872d49623682468f4e1a4e3b0a6e9c2ee1dabbec7070b2a WHIRLPOOL 78fa80620ef232bb3829bdd7de7666edd37b80dececb032fd07eb4033e81344c0957c6c42f4c13b4f43662e3e17efec6d9b4a45db255e3e5c5774e08d7922aaf
 EBUILD mkvtoolnix-5.8.0.ebuild 2234 SHA256 889f0525fab44fdb79e84d8ce76dfd1524f8b136fd09ab63cc2e148ce3237e52 SHA512 a41f2b763accf6b64753d41cfe2f78d46f8dcf3ba9a7a5fdc534d874a705cfc25751668bf3193ff1cdb993dd34835c3c24d361ce3d5a3a68902c6db85315d7f3 WHIRLPOOL 04cc5f2fa2787848665cd2dc1db2ab4791e2c28d0aeb202f04918cbc7c802d471aa0b10e2b21a4f78d4e707a1b6d8a2a6de0a2c9fefd76679eeee5c0ad87ec6c
 EBUILD mkvtoolnix-5.9.0.ebuild 2244 SHA256 5ba84215eb369d35fcf8df6231ff511ffb1fcde63846fbc83ac3ba17000cab22 SHA512 48c86fc97e2f3a061cb358270698126d5cecfa282e776d5e7c8fb4714c460f37df8197cfe771b5af9be792bffa9b1a2b5fbee077cd7fe204c4192f4caae5bf47 WHIRLPOOL 433667c671bc38997c863aac57d7392ff6b75452b050a90ef427976c8e60400bed0264ee63497d9b879ddb0b4a30002d5fcd59ddfeceaf8945eb3eae6aba9503
-MISC ChangeLog 26802 SHA256 6a9412be1db0f81cd9c33e6f0e00765c0918c9497cc7b4303c844260f9b5700f SHA512 3f9f55e8b469d0d33dee551e62ef4018e83b295fd866bfe598cb1e82f2530fd5bc60cea0e228b145b98da64706f9fe1db62761f7e62951354d748bb0c8a822df WHIRLPOOL 8c098e6361f2cbed84d7725a7696d3abdcc5a678c8c75b2a3007c30f25989c807e8531e3873a6760ad18b6b4ef6f511cdc23276f4203742b9d575d3ca568d6dc
+EBUILD mkvtoolnix-6.0.0.ebuild 2243 SHA256 537f6a692c8de541eb940573b4463af48b2258c2048580c61155a469f564d20b SHA512 dcfc34554f49222b92e00c1356bc17d7b89304fe766d5fba3a5ff901e48f3fdedf0a10005969d09678fcc905b99b7319520c7eb4c8b6c1dddef15ceed7a1db6f WHIRLPOOL 733a4424c2d3db44e44c2e1643750ed5afdba385a09a270b07467c9f86f91bd48a5994b85c1458a7053fde2054c44633c446d515433c87f50d07c9c40b7391e2
+MISC ChangeLog 26927 SHA256 5ffeeddd4b4ab1d82bb14113abf3e4fc619ce77ecfe89303d6ef7a8282392348 SHA512 678c8c6a8d17403d6e76b5264f1faf177e80b5d9a00fbdf81155f74f75ea5971b9e1f8a5c1428299e22633eb935bf5f5355241203058a4beb5db958e649c6650 WHIRLPOOL 117429017275df9ba5f0e3e6c7a80a306a3a34045e36d8ce34dbab80d921b70d34f84e1966096f8566aa1f8b69563d6e481b44574aeaabc889521e7b2618c7c9
 MISC metadata.xml 158 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 SHA512 0bfb0265d3c42ba1958f8e589316112dba381e7701773668443cf0afe678a8d80675392efb2713e3d376b85b03a5b2bfb390c94411e0c6cf8a223b26aa9a04ca WHIRLPOOL 447b37b9f46058b1adc8d30a57460a8ab6b5ec149870c5ea385956cae9dd10a99b36e63526f2d13cabf13a4185f8b4e22a78156ab141a6e397bba298ab7efb2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ5+G4AAoJEEqz6FtPBkyj7VgH/A9NasP9Bi7JNKli4Iz08doi
-MJvzkSuRTlNt7VlQlx6xRqbVSMD4mVCw/aVBPkWrDMuMEM7YMVbLkAboFiG/hq4d
-zM4yzgITAbkHxsRpc0Y7CP0GgBV1wMtgFkQBRz5un9V1yPNALTcJUW2g/B/y8VUt
-ILLgMsnNeeJhnMBz8zPn54PJaatc/QbjgyZ/MbnzNkpdq7WOC1A27lUbsk6fmvgj
-btPd43A/nqfB++FyHShreb2hzyYY3O6moP6GV82C6GFK0jG/0F3BUYzbzCvVxxOe
-puH5K58sFsjdhUxukc/l6wudIS9IfR+hps19ormVnUkdLWMUh/l1Q0SgJ0bXnr0=
-=WjGh
+iQEcBAEBCAAGBQJQ/MhZAAoJEEqz6FtPBkyjS7wH/j2Us3gB72iCwze3a1ym8i1V
+ve5NtLSnepRYsPzmnPCeQ35SrOhjoXiuPdG8tsoEBDjOL1UCncZH8RHu2wEy+EmK
++A+6re6bR+h3dqHigrQzlTqqdI08798PGkqjAyHnvezgMFdnWwS+clI++MghYwG4
+DMU5Lmc7S4WA36GaSqCUN9/hXNsVKvZlVn3C24MHj82rTFJ0ys5AQIDLah0FSSgD
+yQriRboQHeEqMg0lBoKZgj9VD0Q5LbZEJEQ40gTd66xqwprFUXb32b65ZTPSDnJ2
+goc1OkGymWYox7oEv7+r3DU5P8GONShOP1DbRp+Pn6fhkGHnkkoce9YVy4RSUMM=
+=JxaX
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/mkvtoolnix-6.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-6.0.0.ebuild
new file mode 100644
index 000000000000..b785b0789702
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-6.0.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.0.0.ebuild,v 1.1 2013/01/21 04:47:17 radhermit Exp $
+
+EAPI=5
+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="bzip2 debug lzo pch qt4 wxwidgets"
+
+RDEPEND="
+	>=dev-libs/libebml-1.2.2
+	>=media-libs/libmatroska-1.3.0
+	>=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
+	bzip2? ( app-arch/bzip2 )
+	lzo? ( dev-libs/lzo )
+	qt4? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+	)
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/ruby
+	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() {
+	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
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+		myconf="--with-wx-config=${WX_CONFIG}"
+	fi
+
+	econf \
+		$(use_enable bzip2 bz2) \
+		$(use_enable debug) \
+		$(use_enable lzo) \
+		$(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() {
+	./drake V=1 -j$(makeopts_jobs) || die
+}
+
+src_install() {
+	DESTDIR="${D}" ./drake -j$(makeopts_jobs) install || die
+
+	dodoc AUTHORS ChangeLog README TODO
+	doman doc/man/*.1
+
+	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
+}