10 files changed, 28 insertions, 832 deletions
diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 3b701449c2e3..ca1812c35105 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,16 @@
 # 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.221 2015/07/19 10:20:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.222 2015/07/20 05:24:17 yngwin Exp $
+
+*mkvtoolnix-8.2.0-r1 (20 Jul 2015)
+
+  20 Jul 2015; Ben de Groot <yngwin@gentoo.org>
+  +files/mkvtoolnix-8.2.0-fix-curl-support.patch, +mkvtoolnix-8.2.0-r1.ebuild,
+  -mkvtoolnix-7.3.0.ebuild, -mkvtoolnix-7.4.0-r1.ebuild,
+  -mkvtoolnix-7.5.0.ebuild, -mkvtoolnix-7.6.0.ebuild, -mkvtoolnix-7.7.0.ebuild,
+  -mkvtoolnix-7.8.0.ebuild, -mkvtoolnix-8.1.0.ebuild, -mkvtoolnix-8.2.0.ebuild:
+  Add upstream curl patch and introduce curl useflag (bug #555340). Remove old
+  and broken ebuilds.
 
 *mkvtoolnix-8.2.0 (19 Jul 2015)
 
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch b/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch
new file mode 100644
index 000000000000..67ce30fdbbc6
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch
@@ -0,0 +1,11 @@
+--- a/src/mkvtoolnix-gui/main_window/main_window.cpp
++++ b/src/mkvtoolnix-gui/main_window/main_window.cpp
+@@ -118,7 +118,7 @@ MainWindow::setupMenu() {
+ #if defined(HAVE_CURL_EASY_H)
+   connect(ui->actionHelpCheckForUpdates,       &QAction::triggered,             this, &MainWindow::checkForUpdates);
+ #else
+-  ui->actionGUICheckForUpdates->setVisible(false);
++  ui->actionHelpCheckForUpdates->setVisible(false);
+ #endif  // HAVE_CURL_EASY_H
+ }
+ 
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.3.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.3.0.ebuild
deleted file mode 100644
index 17037cfad986..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-7.3.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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.3.0.ebuild,v 1.1 2014/10/23 01:48:14 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.md TODO
-	doman doc/man/*.1
-
-	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.4.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.4.0-r1.ebuild
deleted file mode 100644
index af3d485bfeb0..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-7.4.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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-7.4.0-r1.ebuild,v 1.2 2015/01/19 20:26:40 graaff 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=( 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/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
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild
deleted file mode 100644
index 10c836bce91e..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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-7.5.0.ebuild,v 1.5 2015/02/08 23:45:37 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=( 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/libebml-1.3.1:=
-	>=media-libs/libmatroska-1.4.2:=
-	>=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
-		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
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.6.0.ebuild
deleted file mode 100644
index da119601be59..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-7.6.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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-7.6.0.ebuild,v 1.1 2015/02/08 23:54:40 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=( 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/libebml-1.3.1:=
-	>=media-libs/libmatroska-1.4.2:=
-	>=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
-		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
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.7.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.7.0.ebuild
deleted file mode 100644
index 6e33ab33a3ce..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-7.7.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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-7.7.0.ebuild,v 1.1 2015/03/02 01:25:15 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=( 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/libebml-1.3.1:=
-	>=media-libs/libmatroska-1.4.2:=
-	>=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
-		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
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.8.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.8.0.ebuild
deleted file mode 100644
index 25ba58e01556..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-7.8.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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-7.8.0.ebuild,v 1.1 2015/04/04 18:40:03 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=( 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/libebml-1.3.1:=
-	>=media-libs/libmatroska-1.4.2:=
-	>=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
-		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
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild
index ad0b05c3c17d..3aa11c64e102 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-8.1.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.0.ebuild,v 1.1 2015/07/06 15:56:32 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild,v 1.1 2015/07/20 05:24:17 yngwin Exp $
 
 EAPI=5
 WX_GTK_VER="3.0"
@@ -13,7 +13,7 @@ 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"
+IUSE="curl debug pch qt5 wxwidgets"
 
 ruby_atom() {
 	local ruby_slot=${1/ruby/}
@@ -70,10 +70,11 @@ src_prepare() {
 			break
 		fi
 	done
-
 	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
 
 	epatch "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
+	epatch "${FILESDIR}"/${P}-fix-curl-support.patch #555340
+	epatch_user
 	eautoreconf
 }
 
@@ -99,13 +100,13 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable qt5 qt) \
 		$(use_enable wxwidgets) \
+		$(use_with curl) \
 		$(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
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
 }
 
 src_compile() {
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.2.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.2.0.ebuild
deleted file mode 100644
index 07ee8d0cb00a..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-8.2.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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
-}