Version bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 134 insertions, 5 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 35775437eb13..3b701449c2e3 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.220 2015/07/18 18:45:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.221 2015/07/19 10:20:14 pacho Exp $
+
+*mkvtoolnix-8.2.0 (19 Jul 2015)
+
+  19 Jul 2015; Pacho Ramos <pacho@gentoo.org> +mkvtoolnix-8.2.0.ebuild:
+  Version bump
 
   18 Jul 2015; Pacho Ramos <pacho@gentoo.org>
   +files/mkvtoolnix-6.6.0-boost-1.56.patch, mkvtoolnix-6.6.0.ebuild:
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 7643ee8c393c..c6304c4658b0 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -12,6 +12,7 @@ DIST mkvtoolnix-7.6.0.tar.xz 5304932 SHA256 74de3298133a491ad8b28868273635385c14
 DIST mkvtoolnix-7.7.0.tar.xz 5336448 SHA256 191d8892b8fb36ac492c710134d419d7578ba802e812a32eb90ae02d4b13c028 SHA512 2ab9999ce0db189e03be130aa0eb5964ff0714da010255d84a7bd4164107dd86e7d5025c87ffc7328e0f7e899dcbc3e85a1094f7765e7393c1f4490eab4f426e WHIRLPOOL 1d18e5d690291636eb00fdbb990fc158652378eadcb3a4d34e075325396a3ac63c8a01dfb0ee0c2de4d38fe45d38b3f116e787be334238110e1fcb47310b6933
 DIST mkvtoolnix-7.8.0.tar.xz 5361192 SHA256 4ea13a75db2170944e95e180aaab97e3f0d42c04d88a0d4baadacd554248fe54 SHA512 6a56013da749fc6c661ade68a5d0fe50e710e2194f756d92cf47ccec471eb49206c14482ba1ccffedaf1ca164d3da49c3ea7f62296957bad7099baef8c7a083a WHIRLPOOL 171b09e9c5c54ce8e7b147cc5dcd28978db4d004c529af44f7900c09bf624de3fbacbae14f32c01e8cf47c4d0050c6fa3f2d7b6ba226ad68fff02e9b6c29b496
 DIST mkvtoolnix-8.1.0.tar.xz 5784428 SHA256 715d88411e23860c085639ebdc9163b4498df7f30169583a9a572add72b572e5 SHA512 00cae7c61ae1d7e9ac0eeb6756c253d05f6192bceacdffc87d7f2b01b589b158f6d76e00632d117452fa9595a93e27503877ab3d1775efbce1c0a97a78aeea99 WHIRLPOOL ad89d9e266d7d3651524b3af8be9cb61441e9eaf12fc640e509c7c18a7493786ca47f4b684dbb30f231f9f803c7c50c929aef186c488d603d85a2bcdf1da681e
+DIST mkvtoolnix-8.2.0.tar.xz 5856988 SHA256 eb6d3d7a0254bb4326dccc9983418801783198cdf4a259f31261dab4e843a5c4 SHA512 200fad08f6912081d7aabbae9330dc41b90af8d6fdce592090b9fedf2325a91f70d3a85ff40b03b57b0682a075050b6b73307872c1e716e8261849c3fb97968b WHIRLPOOL 1b25cd8913eb02018d62de369171ee1a48d31cbce6684c0c7febd2f88c3286bbf386c825ddeae54ef411dc14cc128c9e833408f9b0ac9cb1d5e525ba34aaa4ae
 EBUILD mkvtoolnix-6.6.0.ebuild 2173 SHA256 a9a7aac11c97dcb68a4b4452656ea5ce4fcf8c45241edeb48915bb5fd6b0711c SHA512 ed2995a33968acc34a3e52ea8d2b074afee47f297bb3a29d4ce7ce7f54bd20350213695b69cdb1c726825dfd93102754ad49259a813cc15f0c369d50e6a26336 WHIRLPOOL 205e4c8eb0a8ae62a8a702917d80da3f0aa9c2882fe43f59abd60a5d3ffdcd98a4726a8944bd7e99a489b596e4aed139f66ef70e9ab32fedd743853ed8e92a2b
 EBUILD mkvtoolnix-7.3.0.ebuild 2829 SHA256 2a5d60dbd2ae6e8d6d80a5bbd9fe528111d783e3e85fe8f38f32c3fcc5355aed SHA512 5886347781106926d94ef6fa4106692ecd299f9b491429bbccef6344eae9e364a40d72393420c437f4001242ce91a6246c1bae1813f26d26eb81663c8c3574d5 WHIRLPOOL 7c70d5e5ac4b965e1faadc00858c3fdd7a520fa105d2f9a3bdbd11fefb47eadac3278299a4b109187977821a33e9d06d47e405ec401d3368876d15fe2287f05e
 EBUILD mkvtoolnix-7.4.0-r1.ebuild 2822 SHA256 1da6ab90ee31b8e6763446f099467fce1a22061f00a9caadfc2abd28c84aaadb SHA512 52eef643f6a65e367914c78ba6523cb4f05b5e0628b3d99d6212c03d219a823de495d73529124b1459fc959c60977b5d271d5d1ec84a5da0c0ed4f3e180625b7 WHIRLPOOL 01b165eb0fffe95f88b9bf32b5efcd40e0a5bc1913f1d1848569359cfdb72c50afb5904a75878aea9f5c8fc654f8714fef795820563de01c704ed5f8ffe07125
@@ -20,12 +21,13 @@ EBUILD mkvtoolnix-7.6.0.ebuild 3127 SHA256 af880186f346b0881015eedc39e45b8f7d11c
 EBUILD mkvtoolnix-7.7.0.ebuild 3127 SHA256 55486802d2812e2ce24bf4f1a40b967f4de371412731a58bb79b9155aa3fe1c6 SHA512 58d3e30a9312c636b8130b1ab1ad95f0e8eba3afda52306cf26dab2df03f48a9c7cb95bce1d1ed6ffb9ae89e788ce60164c67375beda3447a797af586a2b3210 WHIRLPOOL 5353617ab7820d8c23da8a0ab8017463dc373c4ecf465bd736df9e180287195923c87731e8921d5ae0366c1f0567a0c399fb49bd7bc928b994eedb0a762376d4
 EBUILD mkvtoolnix-7.8.0.ebuild 3127 SHA256 08c54641a52dff43bd97f38fd4bf1ed6855401f78e18ad761067eefdfdc3ab2e SHA512 18509f19b0fdb5a47f77c3d0783d5f21638e31de9e91b84af8e07b0fa66286ca0e7d0868c116abec4cb1df4d435a27706c79ec2aa5c1f4f68dfac3eef9f04b17 WHIRLPOOL 3ac7e0eb2db149216d55f65300cca20fa3032a7f14213f06d398f453fd10720e5685fc1b71a3f05e468af56071d73cfc65eb72d2774641bba029bce75592fdf5
 EBUILD mkvtoolnix-8.1.0.ebuild 3145 SHA256 c53b05f5b692e4d031c85b862dcb4550a32188e58a4a9bada04a74729f6ff15e SHA512 e1f77f77a9e5609fe66f46652a68895a6fa4d0c8e2ce0e3321b247d0df0753315b449deb1d447a9b19b2f8fcab6d6fde87fd505b785899278b76f3d170d6911c WHIRLPOOL 3451e306edd9564399b3b05d298e8fc87d6eacf969567ff8676b5a93cb5f40d0d920f488e8fff46a57b3114273a61857ef3b577e04ce6cace7786c8a5fb34034
-MISC ChangeLog 32291 SHA256 6fcc65f5aa210f4c18daab3f864012abd8ef5649a3b8a08c600d6f4143da729e SHA512 cf2e18f08684252303d7f4cdfec067f55115c4399a67dd92208e139bc781d4dceaeb1a0451f545801e28e5de1bc1068a0847df3b7fff027c7d347d47ac9a7ab2 WHIRLPOOL c3c522801e4a6b23efaebf36d4cec665e71045a7bdce84b9a0e691f9a4dfdfc3bc94bb2ac421868c0177fca9c246eaa903ec5f6fb47f1c86dfef8581d6f5d947
+EBUILD mkvtoolnix-8.2.0.ebuild 3144 SHA256 3484a4224c52a07c4d45d17cf79b61db0ab1741165ac2956d33e886731518106 SHA512 6e6da69ccaba229ba47eb1e2f284aa9f436da9851ffdd54b7c7be61ce463c974f333567afdd93bd473ae1251fd8d83a5e69f7b8a8e77211723b84b3196aa5277 WHIRLPOOL 51c703fb8c7d398350b42f2811f056918d27167cf467a03ce2b1a5aaca103b77f8f3c69014d29b1a9ffe611050c68e3ffc3b6e6a85a44bfe916a6ca2872a1452
+MISC ChangeLog 32412 SHA256 bd410bd9e9d86f9d0341c3c6a57e01a511405048816da6624edb95e55271f6be SHA512 c94099c97edca32b0adb47a33add90b866b13f88ff4c3b5c050cb48c8aa0d2b50d4305974bbe9db82d62c562b8820196e589605d47900485db99f2797c3c0eea WHIRLPOOL 4f811124a5c36fced9d8d7c55f646210b77a92e301b182de570a4e735827d5edc3d3bcb5da83ccd781c325285f98c327a469686b5d031effa666d6963f858fe7
 MISC metadata.xml 158 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 SHA512 0bfb0265d3c42ba1958f8e589316112dba381e7701773668443cf0afe678a8d80675392efb2713e3d376b85b03a5b2bfb390c94411e0c6cf8a223b26aa9a04ca WHIRLPOOL 447b37b9f46058b1adc8d30a57460a8ab6b5ec149870c5ea385956cae9dd10a99b36e63526f2d13cabf13a4185f8b4e22a78156ab141a6e397bba298ab7efb2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWqnsQACgkQCaWpQKGI+9RT3QCfaFZ/QPodKiLlF840RpuHmOHM
-4gEAnAh2cwSVCuMvqtx4XoJMn3Y6exPD
-=OOJx
+iEYEAREIAAYFAlWreeAACgkQCaWpQKGI+9TQlACfc+hE046aBkl6nC/tYeOEM0aw
+VNUAn1eS3Syntl2tTk7yLcYQWeSNGTI5
+=c0y4
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.2.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.2.0.ebuild
new file mode 100644
index 000000000000..07ee8d0cb00a
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-8.2.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-8.2.0.ebuild,v 1.1 2015/07/19 10:20:14 pacho 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=( ruby22 ruby21 ruby20 )
+RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
+	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
+
+RDEPEND="
+	>=dev-libs/boost-1.46.0:=
+	>=dev-libs/libebml-1.3.1:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.2:=
+	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
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets: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 qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myconf+=(
+			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
+			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
+			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
+			--with-mkvtoolnix-gui
+		)
+	fi
+
+	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
+}