Version bump for bug #353405. Remove unnecessary eautoreconf call and fix wxwidgets QA warning.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

3 files changed, 86 insertions, 9 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 91f33c1d6099..69ea8bcab596 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.135 2011/01/21 17:51:38 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.136 2011/02/02 07:17:35 radhermit Exp $
+
+*mkvtoolnix-4.5.0 (02 Feb 2011)
+
+  02 Feb 2011; Tim Harder <radhermit@gentoo.org> mkvtoolnix-4.4.0.ebuild,
+  +mkvtoolnix-4.5.0.ebuild:
+  Version bump for bug #353405. Remove unnecessary eautoreconf call and fix
+  wxwidgets QA warning.
 
   21 Jan 2011; Dror Levin <spatz@gentoo.org> -mkvtoolnix-3.2.0.ebuild,
   -mkvtoolnix-3.3.0.ebuild, -files/mkvtoolnix-4.0.0-qt4.patch,
diff --git a/media-video/mkvtoolnix/mkvtoolnix-4.4.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-4.4.0.ebuild
index e9700a1e9068..c6fcf51fc881 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-4.4.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-4.4.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-4.4.0.ebuild,v 1.2 2011/01/21 17:51:38 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-4.4.0.ebuild,v 1.3 2011/02/02 07:17:35 radhermit Exp $
 
 EAPI=3
 
-inherit autotools
+inherit wxwidgets
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
 HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
@@ -33,15 +33,16 @@ DEPEND="${RDEPEND}
 	dev-ruby/rake
 "
 
-src_prepare() {
-	eautoreconf
-}
-
 src_configure() {
 	local myconf
 
-	use pch       || myconf="${myconf} --disable-precompiled-headers"
-	use wxwidgets && myconf="${myconf} --with-wx-config=${WX_CONFIG}"
+	use pch || myconf="${myconf} --disable-precompiled-headers"
+
+	if use wxwidgets ; then
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+		myconf="${myconf} --with-wx-config=${WX_CONFIG}"
+	fi
 
 	econf \
 		$(use_enable lzo) \
diff --git a/media-video/mkvtoolnix/mkvtoolnix-4.5.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-4.5.0.ebuild
new file mode 100644
index 000000000000..0209375c98a9
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-4.5.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-4.5.0.ebuild,v 1.1 2011/02/02 07:17:35 radhermit Exp $
+
+EAPI=3
+
+inherit wxwidgets
+
+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.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="bzip2 debug lzo pch wxwidgets"
+
+RDEPEND="
+	>=dev-libs/libebml-1.2.0
+	>=media-libs/libmatroska-1.1.0
+	dev-libs/boost
+	dev-libs/expat
+	media-libs/flac
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	lzo? ( dev-libs/lzo )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] )
+"
+DEPEND="${RDEPEND}
+	dev-ruby/rake
+"
+
+src_configure() {
+	local myconf
+
+	use pch || myconf="${myconf} --disable-precompiled-headers"
+
+	if use wxwidgets ; then
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+		myconf="${myconf} --with-wx-config=${WX_CONFIG}"
+	fi
+
+	econf \
+		$(use_enable lzo) \
+		$(use_enable bzip2 bz2) \
+		$(use_enable wxwidgets) \
+		$(use_enable debug) \
+		--disable-qt \
+		${myconf} \
+		--with-boost-regex=boost_regex \
+		--with-boost-filesystem=boost_filesystem \
+		--with-boost-system=boost_system
+}
+
+src_compile() {
+	rake || die "rake failed"
+}
+
+src_install() {
+	# Don't run strip while installing stuff, leave to portage the job.
+	DESTDIR="${D}" rake install || die
+
+	dodoc AUTHORS ChangeLog README TODO || die
+	doman doc/man/*.1 || die
+}